diff --git a/0004-choose-icon.ui-remove-no-longer-supported-property.patch b/0004-choose-icon.ui-remove-no-longer-supported-property.patch new file mode 100644 index 0000000..1c01376 --- /dev/null +++ b/0004-choose-icon.ui-remove-no-longer-supported-property.patch @@ -0,0 +1,42 @@ +From 72e0ca0aa2a90a05045eec9cdbc632fcedaac924 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Sun, 24 May 2015 00:28:49 +0900 +Subject: [PATCH] choose-icon.ui: remove no longer supported property + +GtkDialog.has_separator has been deprecated since +GTK+ 2.22 and no longer supported on GTK 3. +Note that the default is false, no removing this has +no effect. +https://developer.gnome.org/gtk2/stable/GtkDialog.html#GtkDialog--has-separator + +GtkIconView.orientation is deprecated since GTK+ 2.22 +and now item-orientation should be used. GTK 3 no longer +supports orientation. +--- + data/ui/choose-icon.ui | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/data/ui/choose-icon.ui b/data/ui/choose-icon.ui +index 32375b5..812c3a4 100644 +--- a/data/ui/choose-icon.ui ++++ b/data/ui/choose-icon.ui +@@ -16,7 +16,6 @@ + GDK_GRAVITY_NORTH_WEST + True + False +- False + + + True +@@ -164,7 +163,7 @@ + True + True + GTK_SELECTION_SINGLE +- GTK_ORIENTATION_VERTICAL ++ GTK_ORIENTATION_VERTICAL + False + + +-- +2.4.1 + diff --git a/libfm.spec b/libfm.spec index 0626f80..7c9b308 100644 --- a/libfm.spec +++ b/libfm.spec @@ -8,7 +8,7 @@ %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %global usegit 1 -%global mainrel 6 +%global mainrel 7 %global githash 577806e29d2ec27ce5fee9dc816566fb4e23b155 %global shorthash %(TMP=%githash ; echo ${TMP:0:10}) @@ -45,6 +45,8 @@ Patch101: 0001-Make-file-search-dialog-work-with-GTK3.patch Patch102: 0002-Fix-gdk_window_get_device_position-device-argument.patch # http://sourceforge.net/p/pcmanfm/bugs/961/ Patch103: 0003-exec-file.glade-remove-has_separator-property-from-G.patch +# http://sourceforge.net/p/pcmanfm/bugs/962/ +Patch104: 0004-choose-icon.ui-remove-no-longer-supported-property.patch BuildRequires: libexif-devel BuildRequires: gtk3-devel @@ -147,6 +149,7 @@ This package containg development documentation files for %{name}. %patch101 -p1 %patch102 -p1 %patch103 -p1 +%patch104 -p1 %if 0%{?usegit} >= 1 sh autogen.sh @@ -291,6 +294,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %endif %changelog +* Sun May 24 2015 Mamoru TASAKA - 1.2.3-7.D20150521git577806e29d +- Fix another GTK3 related bug + * Sat May 23 2015 Mamoru TASAKA - 1.2.3-6.D20150521git577806e29d - Fix two other GTK3 related bugs