diff options
| author |   Andrey Grozin <grozin@gentoo.org> | 2011-09-22 11:31:17 +0000 |
|---|---|---|
| committer | Andrey Grozin <grozin@gentoo.org> | 2011-09-22 11:31:17 +0000 |
| commit | 45a620ec36f1518bd1421b2cc1a34167c32b9781 (patch) | |
| tree | a1de2f7281cb2fc6fbc89c507bb54ab55c815835 /media-gfx/fotoxx/files | |
| parent | ppc keywords dropped wrt #307437 (diff) | |
| download | historical-45a620ec36f1518bd1421b2cc1a34167c32b9781.tar.gz historical-45a620ec36f1518bd1421b2cc1a34167c32b9781.tar.bz2 historical-45a620ec36f1518bd1421b2cc1a34167c32b9781.zip | |
Version bump
Package-Manager: portage-2.2.0_alpha59/cvs/Linux i686
Diffstat (limited to 'media-gfx/fotoxx/files')
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-11.07-docdir.patch | 8 | ||||
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-11.07-makefile.patch | 20 | ||||
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-11.09.patch | 36 |
3 files changed, 36 insertions, 28 deletions
diff --git a/media-gfx/fotoxx/files/fotoxx-11.07-docdir.patch b/media-gfx/fotoxx/files/fotoxx-11.07-docdir.patch deleted file mode 100644 index 4c54ba3169a5..000000000000 --- a/media-gfx/fotoxx/files/fotoxx-11.07-docdir.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -r -U1 fotoxx-11.06.orig/zfuncs.cc fotoxx-11.06/zfuncs.cc ---- fotoxx-11.06.orig/zfuncs.cc 2011-06-04 20:53:41.000000000 +0700 -+++ fotoxx-11.06/zfuncs.cc 2011-06-07 03:25:04.000000000 +0700 -@@ -2999,3 +2999,3 @@ - strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /installoc/share/appname/locales -- strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /installoc/share/doc/appname -+ strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /installoc/share/doc/appname - diff --git a/media-gfx/fotoxx/files/fotoxx-11.07-makefile.patch b/media-gfx/fotoxx/files/fotoxx-11.07-makefile.patch deleted file mode 100644 index 7f5f07842823..000000000000 --- a/media-gfx/fotoxx/files/fotoxx-11.07-makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -r -U1 fotoxx-11.07.orig/Makefile fotoxx-11.07/Makefile ---- fotoxx-11.07.orig/Makefile 2011-07-02 00:05:59.000000000 +0700 -+++ fotoxx-11.07/Makefile 2011-07-14 22:30:30.000000000 +0700 -@@ -6,4 +6,4 @@ - # defaults for parameters that may be pre-defined --CXXFLAGS ?= -O3 -g -Wall --LDFLAGS ?= -O3 -g -Wall -rdynamic -+CXXFLAGS += -Wall -+LDFLAGS += -rdynamic - PREFIX ?= /usr -@@ -16,3 +16,3 @@ - LOCALESDIR = $(SHAREDIR)/locales --DOCDIR = $(PREFIX)/share/doc/fotoxx -+DOCDIR = $(PREFIX)/share/doc/$(PF) - MANDIR = $(PREFIX)/share/man/man1 -@@ -53,3 +53,3 @@ - zfuncs.o: zfuncs.cc -- $(CXX) $(CFLAGS) zfuncs.cc -+ $(CXX) $(CFLAGS) -DPF=\"$(PF)\" zfuncs.cc - diff --git a/media-gfx/fotoxx/files/fotoxx-11.09.patch b/media-gfx/fotoxx/files/fotoxx-11.09.patch new file mode 100644 index 000000000000..325910bdce57 --- /dev/null +++ b/media-gfx/fotoxx/files/fotoxx-11.09.patch @@ -0,0 +1,36 @@ +diff -r -U1 fotoxx-11.09.orig/Makefile fotoxx-11.09/Makefile +--- fotoxx-11.09.orig/Makefile 2011-09-05 05:32:59.000000000 +0700 ++++ fotoxx-11.09/Makefile 2011-09-22 18:20:29.000000000 +0700 +@@ -5,4 +5,4 @@ + # defaults for parameters that may be pre-defined +-CXXFLAGS ?= -O3 -g -Wall +-LDFLAGS ?= -O3 -g -Wall -rdynamic ++CXXFLAGS += -Wall ++LDFLAGS += -rdynamic + PREFIX ?= /usr +@@ -15,3 +15,3 @@ + LOCALESDIR = $(SHAREDIR)/locales +-DOCDIR = $(PREFIX)/share/doc/fotoxx ++DOCDIR = $(PREFIX)/share/doc/$(PF) + MANDIR = $(PREFIX)/share/man/man1 +@@ -19,3 +19,3 @@ + +-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0` ++CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-2.0` + LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` +@@ -71,7 +71,2 @@ + rm -f fotoxx.1.gz +- # menu (desktop) file (absolute paths to get around rpmbuild problem) +- cp -f data/desktop $(DESTDIR)$(MENUFILE) +- echo Exec=/usr/bin/fotoxx >> $(DESTDIR)$(MENUFILE) +- echo Icon=/usr/share/fotoxx/icons/fotoxx.png >> $(DESTDIR)$(MENUFILE) +- xdg-desktop-menu install $(DESTDIR)$(MENUFILE) + +diff -r -U1 fotoxx-11.09.orig/zfuncs.cc fotoxx-11.09/zfuncs.cc +--- fotoxx-11.09.orig/zfuncs.cc 2011-09-05 05:32:59.000000000 +0700 ++++ fotoxx-11.09/zfuncs.cc 2011-09-22 18:14:46.000000000 +0700 +@@ -3066,3 +3066,3 @@ + strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /installoc/share/appname/locales +- strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /installoc/share/doc/appname ++ strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /installoc/share/doc/appname + |