diff options
| author |   Andrey Grozin <grozin@gentoo.org> | 2013-03-22 06:20:18 +0000 |
|---|---|---|
| committer | Andrey Grozin <grozin@gentoo.org> | 2013-03-22 06:20:18 +0000 |
| commit | 7147696969506074a0017228696cc1641b5ec56a (patch) | |
| tree | 36a91774f84c3102ecff0fb61735671748df7eb9 /media-gfx/fotoxx | |
| parent | Bump (diff) | |
| download | gentoo-2-7147696969506074a0017228696cc1641b5ec56a.tar.gz gentoo-2-7147696969506074a0017228696cc1641b5ec56a.tar.bz2 gentoo-2-7147696969506074a0017228696cc1641b5ec56a.zip | |
Fix linking with gold (bug #462286), thanks to Adrian.Bassett@hotmail.co.uk
(Portage version: 2.2.0_alpha169/cvs/Linux i686, signed Manifest commit with key 00C6DAB1!)
Diffstat (limited to 'media-gfx/fotoxx')
| -rw-r--r-- | media-gfx/fotoxx/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-13.03.patch | 26 |
2 files changed, 18 insertions, 13 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog index 4488cbc1a97a..92c1b50b74f9 100644 --- a/media-gfx/fotoxx/ChangeLog +++ b/media-gfx/fotoxx/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/fotoxx # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.48 2013/03/19 06:15:21 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.49 2013/03/22 06:20:18 grozin Exp $ + + 22 Mar 2013; Andrey Grozin <grozin@gentoo.org> files/fotoxx-13.03.patch: + Fix linking with gold (bug #462286), thanks to Adrian.Bassett@hotmail.co.uk *fotoxx-13.03 (19 Mar 2013) diff --git a/media-gfx/fotoxx/files/fotoxx-13.03.patch b/media-gfx/fotoxx/files/fotoxx-13.03.patch index ddfe81f7a7bf..5d38be124cb4 100644 --- a/media-gfx/fotoxx/files/fotoxx-13.03.patch +++ b/media-gfx/fotoxx/files/fotoxx-13.03.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) |