Fix linking with gold (bug #462286), thanks to Adrian.Bassett@hotmail.co.uk

Package-Manager: portage-2.2.0_alpha169/cvs/Linux i686
Manifest-Sign-Key: 0x00C6DAB1!

3 files changed, 20 insertions, 15 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/Manifest b/media-gfx/fotoxx/Manifest
index 01e3e9c7ed37..4c6eef67c368 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,11 +1,11 @@
 AUX fotoxx-13.01.patch 1582 SHA256 f5d626d9df7a6fcf91345af1fd90804f2e2a3c2490adaa53cf63153797c97853 SHA512 2ec2f7bae3eba1c72e44f7c634a550f8601876910966aa00471026540f15b440b977c972ed4ccc1a899b4724e8e69f67dd28ece73bd12d1c61bb57b076c7b674 WHIRLPOOL b227d2c032a8ef4324354e82f023274cbb8e45b80634275a0bde83b4883d8828bc0749cbbeaac875d52aa1087c306890b27f9c6919ce28942ab0c1cacdc6cda2
 AUX fotoxx-13.02.patch 1582 SHA256 f5d626d9df7a6fcf91345af1fd90804f2e2a3c2490adaa53cf63153797c97853 SHA512 2ec2f7bae3eba1c72e44f7c634a550f8601876910966aa00471026540f15b440b977c972ed4ccc1a899b4724e8e69f67dd28ece73bd12d1c61bb57b076c7b674 WHIRLPOOL b227d2c032a8ef4324354e82f023274cbb8e45b80634275a0bde83b4883d8828bc0749cbbeaac875d52aa1087c306890b27f9c6919ce28942ab0c1cacdc6cda2
-AUX fotoxx-13.03.patch 1582 SHA256 f5d626d9df7a6fcf91345af1fd90804f2e2a3c2490adaa53cf63153797c97853 SHA512 2ec2f7bae3eba1c72e44f7c634a550f8601876910966aa00471026540f15b440b977c972ed4ccc1a899b4724e8e69f67dd28ece73bd12d1c61bb57b076c7b674 WHIRLPOOL b227d2c032a8ef4324354e82f023274cbb8e45b80634275a0bde83b4883d8828bc0749cbbeaac875d52aa1087c306890b27f9c6919ce28942ab0c1cacdc6cda2
+AUX fotoxx-13.03.patch 1631 SHA256 3691daeb18f7a8c451a95a07928634150802523de7c66a02799b44c80f67a84d SHA512 b270d133e052f34db5c22255b88dfc44e77eb3772a207eabf6d967fea7444547fe45877d8b2fe6f1bd7a4cb31f6bbc4633a2e73922098f1e5fcacfec664e87ca WHIRLPOOL e66e001bb6ecf16d4d217dffac9496679f3185f9cec200702f8b675d368d50f2852073cee41895ba010fcfa53a0e5e46c1a5dc2a960e31529ff49c1be31f603f
 DIST fotoxx-13.01.tar.gz 2131822 SHA256 9120e9e4a3328023e1aeba22da3d7eba0794442e7bbbd253894bd8d2911b30af SHA512 575eea86c4c05c6e2302df78adf0df54daf1c5b6999b9d85c79d1de0562250fb458e6b17d794be4355e962cbb9ad2423b927f96630d9034d1469a7f1684ab750 WHIRLPOOL c8b058fd9edc8a292c4a68686b7e7ced37d08e1d9379eb6cf24ed7e6a1a1c09c2fa9f2c1c476310082e6a32fe386fc9335b7f34efbf27acaba50f3db2ec07de3
 DIST fotoxx-13.02.tar.gz 2236036 SHA256 76ed2316a3ad7cb4024609720484c8152ff4ef1eab41645fa4c27a01ff27ff1f SHA512 ffa6bbcd892fb876029c7209b2a501dfbf87a9ce57c0eaf85ba570575b9be5f4efa8a8e779ef2fc6bf76980c7c155ad92ad2ac5eb88bceb7f37adae405907187 WHIRLPOOL 1a98d09ce6f12164587ee1c10366254d8bb4337f945acacb49b5dbdc64d2954cc31779e2698d7fd3a75fed9b9a10e7602d0d6e97eefbf7a1e10a0847083f531e
 DIST fotoxx-13.03.tar.gz 2289636 SHA256 f5a6a396cfaf5f3c78c8b0f3690d7d057c38e15dbf6de1927187cdec6146337e SHA512 7b39541cc53fa63a11dd116392eec96059bff8b54d41332708fc4d53d5b88d480a6c8a1afe41079471b6b490407efe374929e8ad0232d5815091f822edf59d45 WHIRLPOOL d7eb512cfd766ac6511665ca388702fbc32aa5ad60dec86fb9885a24ffda255b144273aba91aa68651ab18eb8a2bf3f61b3d17c7ac3bfadeea39427cfc2b60d5
 EBUILD fotoxx-13.01.ebuild 1282 SHA256 fef8d15267f761491f19b8862b2026c565030e187256bfe4189a903fd6778f93 SHA512 af57891d43cd038caf18c0a76613f5632396437eddb27dec934bc2436595779673380ab7545a7988cdff92ec3c7d3d836c08732ffcf07a259316f6e7a74b3091 WHIRLPOOL d0226aa774e16c58173ad9e35deba1bbd19777640fece941cda962d3f6adfbc5d128b0f8003b80ffe24ea2820b72c2b277d68982ab9e11c18c9f852cbff700a6
 EBUILD fotoxx-13.02.ebuild 1287 SHA256 871fef6338735b39b29651b3426ee248436770c4accf487d08825a85fa5507fe SHA512 97370ffdffeed3cd2595153811aea05fe9f6fa544d6ff2a3d8a74c976bb1b066991de596b825b7c58fe01cf808b2e4a63a38ced75a08955d27e969e60d694f19 WHIRLPOOL 5d2e0b9ff7ed5ef7e314021cf084935a184952bbbdc7a2ef2aa569c86ebb7e1075af86259a04cdad3b9d4f11f87fb6cc56d6811dbde57c9d41f8c1436161750b
 EBUILD fotoxx-13.03.ebuild 1287 SHA256 231c4c5d984b6d4908c8b52a0ecc7c8c2effb05efef702f33e8a84f7314972f8 SHA512 f76829de67e818e05926c471569aa842a8125d9b6c96818df529a7860dca0fd9a50aa5e14c398e70e5595657cae0992ae7e73fc6d918950fd65790ad51a13e25 WHIRLPOOL 61a1281983b73a25c23259003ead5b3b69de72c0b16e3bc93b27314c876b45480f6209024de0498117a91869217a9671af509cc4d2b2282aa1a5d4043fc384e1
-MISC ChangeLog 9125 SHA256 a0f266a08ffecc22270e47550a865329ae968e7cbb42f2d721f31179f8f1d4ee SHA512 92b60900ca4d1c5d7145c47516912f3d399104c24d2ad86e5d09f4d11af9daa26f34cd9513bfcc3b11d657501a4d3df8e6d478bf326ceed233003b707b14637b WHIRLPOOL f07cd6cdd1c7f11a1b5231ae2b185aa72e8ea2758f7db2361891ca5e2181a0c37f0b309b58071c7c13235059408e46f57d331080fd4f1d196e9eee7cfe21df63
+MISC ChangeLog 9279 SHA256 6d1d0f49f5943f39c525aa35cab6bb0fe30123ce0468c0168d6b971ca396c76b SHA512 a1216ef832df763cde9775e0b01206d0e63c0c5f2db76425d4d32ad3d78ad3aac3f123573e6ffbd7263a460d3e638f04c8bc0723001f8366ea77d27954a09865 WHIRLPOOL 8c547cb338fa303947b673e5ea53da8d4944bbf958b264a06b45eb9d15eef515e95ecc9cf038026157f6cb535b35ea151a6409dd9590ed33b5d4d20e40a19f83
 MISC metadata.xml 846 SHA256 ff01900af25b8eff99bd0e031c99608cd77d762a293a0432fd2161ad30aee020 SHA512 cf07ba54bbfab28b27ca0549bc09539eb585704b9e034cfaee10e571a911b47ded675cc15a0e8b456a9684f9affb5f2cabe7167f6ccac8e8754b7dbcb6cc304e WHIRLPOOL b61518a0d0092d54bb88bd13ee3bff05eb2a94d8445607e3d9e09ae35a742fa3708c1efae7ef6cd54202095a16087c5e420729e30655d348aa6933df9db6750c
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)