summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2012-11-03 16:04:49 +0000
committerAndrey Grozin <grozin@gentoo.org>2012-11-03 16:04:49 +0000
commitc57c4be98aed40487b0306e9d7add4abfa02394f (patch)
tree7b2cd1c04b11fd921ab11be86d411d259933e909 /media-gfx/fotoxx/files
parentMask unstable versions of sysvinit and coreutils on hardened/linux/uclibc/mips (diff)
downloadhistorical-c57c4be98aed40487b0306e9d7add4abfa02394f.tar.gz
historical-c57c4be98aed40487b0306e9d7add4abfa02394f.tar.bz2
historical-c57c4be98aed40487b0306e9d7add4abfa02394f.zip
Version bump
Package-Manager: portage-2.2.0_alpha142/cvs/Linux i686
Diffstat (limited to 'media-gfx/fotoxx/files')
-rw-r--r--media-gfx/fotoxx/files/fotoxx-12.11.patch (renamed from media-gfx/fotoxx/files/fotoxx-12.09.1.patch)24
1 files changed, 14 insertions, 10 deletions
diff --git a/media-gfx/fotoxx/files/fotoxx-12.09.1.patch b/media-gfx/fotoxx/files/fotoxx-12.11.patch
index d1ce6b3261fd..ddfe81f7a7bf 100644
--- a/media-gfx/fotoxx/files/fotoxx-12.09.1.patch
+++ b/media-gfx/fotoxx/files/fotoxx-12.11.patch
@@ -1,9 +1,9 @@
-diff -r -U1 fotoxx-12.03.orig/Makefile fotoxx-12.03/Makefile
---- fotoxx-12.03.orig/Makefile 2012-03-01 01:57:48.000000000 +0700
-+++ fotoxx-12.03/Makefile 2012-03-03 03:56:44.000000000 +0700
+diff -r -U1 fotoxx-12.11.orig/Makefile fotoxx-12.11/Makefile
+--- fotoxx-12.11.orig/Makefile 2012-11-01 17:20:02.000000000 +0700
++++ fotoxx-12.11/Makefile 2012-11-03 22:19:23.000000000 +0700
@@ -5,4 +5,4 @@
# defaults for parameters that may be pre-defined
--CXXFLAGS ?= -O3 -g -Wall -Wno-deprecated-declarations
+-CXXFLAGS ?= -O3 -g -Wall
-LDFLAGS ?= -O3 -g -Wall -rdynamic
+CXXFLAGS += -Wall -Wno-deprecated-declarations
+LDFLAGS += -rdynamic
@@ -18,17 +18,21 @@ diff -r -U1 fotoxx-12.03.orig/Makefile fotoxx-12.03/Makefile
-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
+CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0`
LIBS = `pkg-config --libs gtk+-3.0`
-@@ -77,5 +77,2 @@
+@@ -75,5 +75,2 @@
rm -f fotoxx.1.gz
- # menu (desktop) file
- cp -f desktop $(DESTDIR)$(MENUFILE)
- xdg-desktop-menu install $(DESTDIR)$(MENUFILE)
-diff -r -U1 fotoxx-12.03.orig/zfuncs.cc fotoxx-12.03/zfuncs.cc
---- fotoxx-12.03.orig/zfuncs.cc 2012-03-01 01:57:48.000000000 +0700
-+++ fotoxx-12.03/zfuncs.cc 2012-03-03 03:58:13.000000000 +0700
-@@ -3194,3 +3194,3 @@
+@@ -84,3 +81,2 @@
+ rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz
+- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
+ rm -f $(DESTDIR)$(MENUFILE)
+diff -r -U1 fotoxx-12.11.orig/zfuncs.cc fotoxx-12.11/zfuncs.cc
+--- fotoxx-12.11.orig/zfuncs.cc 2012-11-01 17:20:02.000000000 +0700
++++ fotoxx-12.11/zfuncs.cc 2012-11-03 22:21:34.000000000 +0700
+@@ -3278,3 +3278,3 @@
strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /prefix/share/appname/locales
- strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /prefix/share/doc/appname
-+ strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /prefix/share/doc/${PF}
++ strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /prefix/share/doc/$(PF)