From bf705b7849db3eb87a0fe1a5f81d23991c5ebea1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 10 Jun 2015 15:13:46 +0900 Subject: [PATCH] Update to the latest git --- .gitignore | 1 + libfm-1.2.3-right-click-sf926.patch | 15 --------------- libfm.spec | 16 ++++++++-------- sources | 2 +- 4 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 libfm-1.2.3-right-click-sf926.patch diff --git a/.gitignore b/.gitignore index 2302e48..f6c64d0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ libfm-0.1.12.tar.gz /libfm-1.2.3-699810d3bd0c5d9d508fcd9aa3a65442f2afee3f.tar.gz /libfm-1.2.3-577806e29d2ec27ce5fee9dc816566fb4e23b155.tar.gz /libfm-1.2.3-D20150525git8f38f90e04b648637509f2fa2d4208027ae59b5c.tar.gz +/libfm-1.2.3-D20150607gite1de98ccba316605e14d8cfc06df9a55752cdcec.tar.gz diff --git a/libfm-1.2.3-right-click-sf926.patch b/libfm-1.2.3-right-click-sf926.patch deleted file mode 100644 index db2062f..0000000 --- a/libfm-1.2.3-right-click-sf926.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- libfm-8f38f90e04b648637509f2fa2d4208027ae59b5c/src/gtk/fm-folder-view.c.sf926 2015-05-26 01:14:45.000000000 +0900 -+++ libfm-8f38f90e04b648637509f2fa2d4208027ae59b5c/src/gtk/fm-folder-view.c 2015-05-31 14:56:56.010343707 +0900 -@@ -1107,7 +1107,11 @@ - /* get all the relative coordinates */ - gtk_widget_get_allocation(widget, &a); - gdk_window_get_device_position(gtk_widget_get_window(widget), -- gtk_get_current_event_device(), &x2, &y2, NULL); -+ gdk_device_manager_get_client_pointer( -+ gdk_display_get_device_manager( -+ gdk_window_get_display( -+ gtk_widget_get_window(widget)))), -+ &x2, &y2, NULL); - gtk_widget_get_allocation(GTK_WIDGET(menu), &ma); - parent_window = gtk_widget_get_parent_window(widget); - screen = gtk_widget_get_screen(widget); diff --git a/libfm.spec b/libfm.spec index b1497ee..561ed92 100644 --- a/libfm.spec +++ b/libfm.spec @@ -8,12 +8,12 @@ %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') %global usegit 1 -%global mainrel 8 +%global mainrel 9 -%global githash 8f38f90e04b648637509f2fa2d4208027ae59b5c +%global githash e1de98ccba316605e14d8cfc06df9a55752cdcec %global shorthash %(TMP=%githash ; echo ${TMP:0:10}) -%global gitdate Mon, 25 May 2015 19:14:45 +0300 -%global gitdate_num 20150525 +%global gitdate Sun, 7 Jun 2015 02:02:49 +0900 +%global gitdate_num 20150607 %if 0%{?usegit} >= 1 %global fedorarel %{mainrel}.D%{gitdate_num}git%{shorthash} @@ -39,7 +39,6 @@ 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 -Patch101: libfm-1.2.3-right-click-sf926.patch BuildRequires: libexif-devel BuildRequires: gtk3-devel @@ -140,8 +139,6 @@ This package containg development documentation files for %{name}. #%%patch0 -p1 -b .orig %setup -q -n %{name}-%{githash} -%patch101 -p1 -b .sf926 - %if 0%{?usegit} >= 1 sh autogen.sh %endif @@ -285,8 +282,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %endif %changelog +* Wed Jun 10 2015 Mamoru TASAKA - 1.2.3-9.D20150607gite1de98ccba +- Update to the latest git + * Sun May 31 2015 Mamoru TASAKA - 1.2.3-8.D20150525git8f38f90e04 -- Update to the latest git, all removing patches applied upstream +- Update to the latest git, removing patches applied upstream * Sun May 24 2015 Mamoru TASAKA - 1.2.3-7.D20150521git577806e29d - Fix another GTK3 related bug diff --git a/sources b/sources index c783046..c4810b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62987faa02cfa185220f6c6f4a511d36 libfm-1.2.3-D20150525git8f38f90e04b648637509f2fa2d4208027ae59b5c.tar.gz +bb591d5f83aae4672c38f555bd10c20b libfm-1.2.3-D20150607gite1de98ccba316605e14d8cfc06df9a55752cdcec.tar.gz