diff --git a/0001-make-libfm-pref-apps-work-with-GTK-3.10.patch b/0001-make-libfm-pref-apps-work-with-GTK-3.10.patch new file mode 100644 index 0000000..01b94cc --- /dev/null +++ b/0001-make-libfm-pref-apps-work-with-GTK-3.10.patch @@ -0,0 +1,45 @@ +From 39e6c8420e0016cbc2a60ec7d431b0a6aec30496 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Thu, 21 May 2015 19:49:04 +0900 +Subject: [PATCH] make libfm-pref-apps work with GTK 3.10+ + +Use gtk_builder_new_from_file supported on GTK 3.10+. +has_separator property is no longer supported so just +drop this. +--- + data/ui/preferred-apps.glade | 1 - + src/tools/libfm-pref-apps.c | 4 ++++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/data/ui/preferred-apps.glade b/data/ui/preferred-apps.glade +index 84f26b5..327cb63 100644 +--- a/data/ui/preferred-apps.glade ++++ b/data/ui/preferred-apps.glade +@@ -7,7 +7,6 @@ + Preferred Applications + center + normal +- False + + + True +diff --git a/src/tools/libfm-pref-apps.c b/src/tools/libfm-pref-apps.c +index 584b587..dbdb59b 100644 +--- a/src/tools/libfm-pref-apps.c ++++ b/src/tools/libfm-pref-apps.c +@@ -47,8 +47,12 @@ int main(int argc, char** argv) + gtk_init(&argc, &argv); + fm_gtk_init(NULL); + ++#if GTK_CHECK_VERSION(3, 10, 0) ++ b = gtk_builder_new_from_file(PACKAGE_UI_DIR "/preferred-apps.ui"); ++#else + b = gtk_builder_new(); + gtk_builder_add_from_file(b, PACKAGE_UI_DIR "/preferred-apps.ui", NULL); ++#endif + dlg = GTK_DIALOG(gtk_builder_get_object(b, "dlg")); + browser = GTK_COMBO_BOX(gtk_builder_get_object(b, "browser")); + mail_client = GTK_COMBO_BOX(gtk_builder_get_object(b, "mail_client")); +-- +2.1.0 + diff --git a/libfm.spec b/libfm.spec index 7c78612..e8f0e75 100644 --- a/libfm.spec +++ b/libfm.spec @@ -8,7 +8,7 @@ %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %global usegit 1 -%global mainrel 2 +%global mainrel 3 %global githash 699810d3bd0c5d9d508fcd9aa3a65442f2afee3f %global shorthash %(TMP=%githash ; echo ${TMP:0:10}) @@ -39,6 +39,7 @@ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{mainver}%{?pr # Fedora specific patches # Firefox uses firefox.desktop for desktop name, drop #Patch0: libfm-0.1.9-pref-apps.patch +Patch10: 0001-make-libfm-pref-apps-work-with-GTK-3.10.patch BuildRequires: libexif-devel BuildRequires: gtk3-devel @@ -138,6 +139,7 @@ This package containg development documentation files for %{name}. #%%setup -q -n %{name}-%{version}%{?prever} #%%patch0 -p1 -b .orig %setup -q -n %{name}-%{githash} +%patch10 -p1 %if 0%{?usegit} >= 1 sh autogen.sh @@ -282,6 +284,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %endif %changelog +* Thu May 21 2015 Mamoru TASAKA - 1.2.3-3.D20150519git699810d3bd +- Make libfm-pref-apps work + * Thu May 21 2015 Mamoru TASAKA - 1.2.3-2.D20150519git699810d3bd - Try latest git (2015-05-19)