[packages/gnome-commander] - rediff, some flags patch parts obsolete

qboosh qboosh at pld-linux.org
Fri Apr 2 21:53:07 CEST 2021


commit cb2e4df52d2974bd2382c29dd162c5e270c6bf5b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Apr 2 21:52:49 2021 +0200

    - rediff, some flags patch parts obsolete

 gnome-commander-am.patch    |  8 ++++----
 gnome-commander-flags.patch | 31 -------------------------------
 gnome-commander.spec        |  2 +-
 3 files changed, 5 insertions(+), 36 deletions(-)
---
diff --git a/gnome-commander.spec b/gnome-commander.spec
index 50332cc..d933d26 100644
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -63,7 +63,7 @@ kilka dodatkowych jak np. klienta FTP.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
 
 %build
diff --git a/gnome-commander-am.patch b/gnome-commander-am.patch
index cbf661a..d1021d0 100644
--- a/gnome-commander-am.patch
+++ b/gnome-commander-am.patch
@@ -1,11 +1,11 @@
---- configure.ac~	2013-04-17 15:41:41.649305953 +0100
-+++ configure.ac	2013-04-17 15:43:19.396804363 +0100
+--- gnome-commander-1.12.0/configure.ac.orig	2021-04-02 21:45:34.957633296 +0200
++++ gnome-commander-1.12.0/configure.ac	2021-04-02 21:46:03.789121762 +0200
 @@ -7,7 +7,7 @@
- GNOME_DOC_INIT
+ YELP_HELP_INIT
  
  AM_MAINTAINER_MODE
 -AM_CONFIG_HEADER(config.h)
 +AC_CONFIG_HEADERS([config.h])
  
- AC_GNU_SOURCE
+ AC_USE_SYSTEM_EXTENSIONS
  
diff --git a/gnome-commander-flags.patch b/gnome-commander-flags.patch
index 223fd9c..27a0ae1 100644
--- a/gnome-commander-flags.patch
+++ b/gnome-commander-flags.patch
@@ -1,34 +1,3 @@
---- gnome-commander-1.10.2/libgcmd/Makefile.am.orig	2019-11-28 18:39:39.931001008 +0100
-+++ gnome-commander-1.10.2/libgcmd/Makefile.am	2019-11-28 18:53:32.773155781 +0100
-@@ -6,6 +6,8 @@
- AM_CPPFLAGS = \
- 	$(GNOMEUI_CFLAGS) \
- 	$(GNOMEVFS_CFLAGS) \
-+	$(GNOME_CFLAGS) \
-+	$(GTK_CFLAGS) \
- 	-DGTK_DISABLE_SINGLE_INCLUDES \
- 	-DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
- 
---- gnome-commander-1.10.2/src/Makefile.am.orig	2019-04-13 12:03:20.000000000 +0200
-+++ gnome-commander-1.10.2/src/Makefile.am	2019-11-28 18:59:10.237994244 +0100
-@@ -14,6 +14,7 @@
- 	$(GNOME_KEYRING_CFLAGS) \
- 	$(UNIQUE_CFLAGS) \
- 	$(PYTHON_CFLAGS) \
-+	$(IPTCDATA_CFLAGS) \
- 	-DGTK_DISABLE_SINGLE_INCLUDES \
- 	-DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
- 	-DDATADIR=\""$(datadir)"\"\
-@@ -107,7 +108,8 @@
- 	$(GSF_LIBS) \
- 	$(POPPLER_LIBS) \
- 	$(PYTHON_LIBS) \
--	$(PYTHON_EXTRA_LIBS)
-+	$(PYTHON_EXTRA_LIBS) \
-+	$(IPTCDATA_LIBS)
- 
- CLEANFILES = \
- 	gnome-cmd-advrename-lexer.cc
 --- gnome-commander-1.10.3/libgcmd/Makefile.am.orig	2020-06-19 16:28:11.056464167 +0200
 +++ gnome-commander-1.10.3/libgcmd/Makefile.am	2020-06-19 16:29:17.959435056 +0200
 @@ -1,6 +1,6 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-commander.git/commitdiff/cb2e4df52d2974bd2382c29dd162c5e270c6bf5b



More information about the pld-cvs-commit mailing list