summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2013-04-03 14:41:20 +0000
committerAndrey Grozin <grozin@gentoo.org>2013-04-03 14:41:20 +0000
commit0ae3c1891e993b1325f4e72e8a7efb840e824b4a (patch)
treeacfd1bf9a5f097fb7ad9868fb39e0ea5733a7883 /media-gfx/fotoxx/files
parentTaking maintainership. Bump: Added required perl dependencies and two optiona... (diff)
downloadhistorical-0ae3c1891e993b1325f4e72e8a7efb840e824b4a.tar.gz
historical-0ae3c1891e993b1325f4e72e8a7efb840e824b4a.tar.bz2
historical-0ae3c1891e993b1325f4e72e8a7efb840e824b4a.zip
Version bump
Package-Manager: portage-2.2.0_alpha170/cvs/Linux i686 Manifest-Sign-Key: 0x3AFFCE974D34BD8C!
Diffstat (limited to 'media-gfx/fotoxx/files')
-rw-r--r--media-gfx/fotoxx/files/fotoxx-13.04.patch (renamed from media-gfx/fotoxx/files/fotoxx-13.02.patch)26
1 files changed, 14 insertions, 12 deletions
diff --git a/media-gfx/fotoxx/files/fotoxx-13.02.patch b/media-gfx/fotoxx/files/fotoxx-13.04.patch
index ddfe81f7a7bf..5d38be124cb4 100644
--- a/media-gfx/fotoxx/files/fotoxx-13.02.patch
+++ b/media-gfx/fotoxx/files/fotoxx-13.04.patch
@@ -1,6 +1,6 @@
-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
+diff -r -U1 fotoxx-13.03.orig/Makefile fotoxx-13.03/Makefile
+--- fotoxx-13.03.orig/Makefile 2013-03-01 13:33:56.000000000 +0700
++++ fotoxx-13.03/Makefile 2013-03-22 12:47:39.000000000 +0700
@@ -5,4 +5,4 @@
# defaults for parameters that may be pre-defined
-CXXFLAGS ?= -O3 -g -Wall
@@ -8,30 +8,32 @@ diff -r -U1 fotoxx-12.11.orig/Makefile fotoxx-12.11/Makefile
+CXXFLAGS += -Wall -Wno-deprecated-declarations
+LDFLAGS += -rdynamic
PREFIX ?= /usr
-@@ -14,3 +14,3 @@
+@@ -15,3 +15,3 @@
LOCALESDIR = $(SHAREDIR)/locales
-DOCDIR = $(PREFIX)/share/doc/fotoxx
+DOCDIR = $(PREFIX)/share/doc/$(PF)
MANDIR = $(PREFIX)/share/man/man1
-@@ -18,3 +18,3 @@
+@@ -19,4 +19,4 @@
-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
+-LIBS = `pkg-config --libs gtk+-3.0`
+CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0`
- LIBS = `pkg-config --libs gtk+-3.0`
-@@ -75,5 +75,2 @@
++LIBS = `pkg-config --libs gtk+-3.0` -lpthread
+
+@@ -84,5 +84,2 @@
rm -f fotoxx.1.gz
- # menu (desktop) file
- cp -f desktop $(DESTDIR)$(MENUFILE)
- xdg-desktop-menu install $(DESTDIR)$(MENUFILE)
-@@ -84,3 +81,2 @@
+@@ -93,3 +90,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 @@
+diff -r -U1 fotoxx-13.03.orig/zfuncs.cc fotoxx-13.03/zfuncs.cc
+--- fotoxx-13.03.orig/zfuncs.cc 2013-03-01 13:33:56.000000000 +0700
++++ fotoxx-13.03/zfuncs.cc 2013-03-22 12:46:16.000000000 +0700
+@@ -3917,3 +3917,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)