diff options
author | Julian Ospald <hasufell@gentoo.org> | 2014-01-25 18:55:00 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2014-01-25 18:55:00 +0000 |
commit | 160173164b63065b85eea493d43ac4b63392a6e2 (patch) | |
tree | bca0285483e4f3d1c4f1cc59f836238bcb46c8e1 /media-gfx/gimp | |
parent | Stable for amd64, wrt bug #491150 (diff) | |
download | historical-160173164b63065b85eea493d43ac4b63392a6e2.tar.gz historical-160173164b63065b85eea493d43ac4b63392a6e2.tar.bz2 historical-160173164b63065b85eea493d43ac4b63392a6e2.zip |
fix build with clang wrt #449370
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'media-gfx/gimp')
-rw-r--r-- | media-gfx/gimp/ChangeLog | 6 | ||||
-rw-r--r-- | media-gfx/gimp/Manifest | 17 | ||||
-rw-r--r-- | media-gfx/gimp/files/gimp-2.8.10-clang.patch | 204 | ||||
-rw-r--r-- | media-gfx/gimp/gimp-2.8.10-r1.ebuild | 3 |
4 files changed, 222 insertions, 8 deletions
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog index fbf2a7338310..781066a447c5 100644 --- a/media-gfx/gimp/ChangeLog +++ b/media-gfx/gimp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/gimp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.422 2014/01/24 20:25:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.423 2014/01/25 18:54:54 hasufell Exp $ + + 25 Jan 2014; Julian Ospald <hasufell@gentoo.org> + +files/gimp-2.8.10-clang.patch, gimp-2.8.10-r1.ebuild: + fix build with clang wrt #449370 24 Jan 2014; Fabian Groffen <grobian@gentoo.org> gimp-2.8.10-r1.ebuild: Fix bashism in configure script, closing bug #494864 diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 58dc7bd35d17..2f001aca26ac 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -8,6 +8,7 @@ AUX gimp-2.6.12-CVE-2012-3403.patch 16268 SHA256 882c06f5726b96dbd442659e98729e1 AUX gimp-2.6.12-CVE-2012-3481.patch 1937 SHA256 eeb6fefb10280033dcd56d06d9b90e24c1c2c6689c1a54580c17e828384b5324 SHA512 27d05d7286d1a367a7696021420a0f932a59da4e3fa42c73fe4cd72296996e62aa8f47a2959138b0daa583d6b8da8a29a0e99df48a144c7382d82b870f103ab1 WHIRLPOOL 228398c4544358fb40d7360a93c9ae8109969de429478ea92004396206d4a3281e0a9dc73c96374e2a24fabdbe63adb06ff788eec572462ac342a5c89fa1a19e AUX gimp-2.6.12-potfiles-skip.patch 481 SHA256 1ed0292cab5bc744b3c4450827accc86f1719eb8e75416c282e84a8f65eb9f2f SHA512 2da1c43037898e077edef75838def6d94c2907f0c4f03a97689526edddda5e903deb3a8178b2f8c614d08dde46b3e5e700819fe9c26f4194b9f7510a8e3a2755 WHIRLPOOL 7cff9cb4c7eb083fd1fbb6ad263446131e2eb4aa64a50247558207eec4e0e75aac542b49d4302f037d9b855a86a19e865c8b3c5f07fd3fb2c9ef413adea59aa2 AUX gimp-2.7.4-no-deprecation.patch 1061 SHA256 fb9532406b62a6fa12f8598b142186fad1dc4e937328c8859cb4e8e76d2b19c7 SHA512 3454f3b1a7579b1da4c36b765ae2a54adab13f0a4ecf02c4c0c3c55a12ff7af57d6d0467f663d2ef3de6cda116095f5f662a29cb3d729e0533edd585731a1dc9 WHIRLPOOL 25b645c7e3f39cabe35155dd24c061a088a1800b0a4c154196ff89f4ccf3fc1950a1028d08eddf879cc482ca334bd99bc4c6cea8288e3bf36c0bed657485d984 +AUX gimp-2.8.10-clang.patch 7670 SHA256 a7f057002f7749cdcb07871c3ef69aa73ab28e688ed5782316d5cb1489a0af1e SHA512 772ee0837a214f3ef70e823662fe12e57ee8fd5f800c6508e757b86169b86a5cbd86695870993a66d3726c019d24f79616831bed8baabce3e1d247ecbfe204fc WHIRLPOOL 0baa2a9e7e3370d2b44a180f89c66306aa3f0a6fb4a675ae9fe3413032ce8b6a8a0bd03b33e86453a2a41340e504f641eead1c9b1e4461bb7133ecae713c52fc AUX gimp-2.8.6-uclibc.patch 1317 SHA256 09dcec105a741627c74214ea8dec1696f921be94d3b5492b417f9a68043979c7 SHA512 0e7da897f0d654d2be233880bc80c869f869698122db779bd23f7b995de53840553a3b877b50f0297e56fc8627888b98b3206c08c03a4d22e748feeabe92391a WHIRLPOOL 0e65f6b620c23b2ff2f9b13fd555fe3c070d73b50b3ba93c61446783861f2f0fd7ecdc2102887e9673077d691e9cfcf05bd848242565776931c7f5bff628396b AUX gimp-curl-headers.diff 358 SHA256 34c706af2ba690be90ef6d0f68fef552b90fdf3a6ff0290e7d5fc02024b76b6f SHA512 e3523be4a5eeb48e7941fe0ec1e261a3086c5a8d118565070555a62d42fcc4b4bf9fd70ac37419de843a5249870248e7268f900df7fcca490e7a7f8c805b1298 WHIRLPOOL 6b9effa0436ff885296bce5676651c6ae3238c92bd6c7cfcef419da21f710c23f73b67db6e3a1bfb84465bee2c8aefa1d8107c4b3c4621b114aac7cbe558d96b DIST gimp-2.6.11-underlinking.patch.xz 5544 SHA256 5e7f2f16b8fe9b186b94cbe4cea1cda6242b066c07d36ca4907e276e32976d56 SHA512 ea9e2bac2b00152d0cfe183fdd08d1298c17d18e0f80fda93494adbef336bcbbe9528d94d3ea73648324916142ebda2769d6a88e2eb58a32d64120cf840a6973 WHIRLPOOL f56b217a14239adf96cce031465f8b65cd2d3a7bf2b64ca1d2ba3c2ee8e73fc07a6c7be416cc6863654396e87d441021257f6b2dca5245a551759ffc49da3ca7 @@ -17,17 +18,21 @@ DIST gimp-2.8.10.tar.bz2 20343461 SHA256 e7fd8b19f989138d826003c75f56bd5b6f136ee DIST gimp-2.8.6.tar.bz2 20306442 SHA256 215865b0ff4534bbced551995ae3093ede1918246ead914984603a5c1a5be845 SHA512 2bed2f3521e01355fd0e820024a54f40ad215c4167d3dbbfee0730b67e4d8edb161b493c75a02bd9439dced25331b879fed7b6737f84b975003feee5c1fcf45f WHIRLPOOL 73ec3109b4005f09b0725d489c7d577ff3ccca695c6aa1105c2fab6fae35899c36c4872a5203486e63e50a8439915c5f66afce26a05dafd1e4e432ce4574e82f DIST gimp-2.8.8.tar.bz2 20345808 SHA256 74c4509bae55f07140bc46f16100fc1e0e052829c13d4d87dc31d07d3e696a67 SHA512 3c841c1d11ac41eb5a4ae9d039c339d91eec7b05a303efa6a10ea9cb1af3d56c9b8a55f752c8f4c50ddddca3fbe220949d6e22838c71d5f9dfba9fab922bf8c3 WHIRLPOOL b3c3f33449bb14dfed34189ec674c9b7fb52c52a5ab2ddf6bb481fe921aeaa7e5cd8de9107767d9a61476da1f9c6d6f15464372bad11e112739eb4216002e3f0 EBUILD gimp-2.6.12-r5.ebuild 4728 SHA256 8b54be2c26f65f310289a59ca001a50f63e98c3e2b8bb429766d88ada47a48af SHA512 0c384766fc6b6ca053dd4e96623fd9133d1b1b145f051f22176b932fec4dda357916bd67f5950ca85be519a2f30ac3de7eeb4ab43f3a7ce71b4c4333394fd917 WHIRLPOOL 991df8b5ca3dec6559cc29f532a7d1baca4e0027931a05e54b421512d5846cefcc08cfd24b7de3e72ea6dc03d766c464d56dedaf93572baf01c8eb938dcb9e82 -EBUILD gimp-2.8.10-r1.ebuild 4858 SHA256 cf26101fe1f7bf5d287dd49b7cc961c1e30d481c3c5587d079bee46152a383f0 SHA512 1b2a826d8aa2e57cda85373d83621db5294dc81f9293e069b1ad563d7c28d87c5c71d555a835665cc277b1e46c6685f28220a0741e3651a410cad01ba6da7e10 WHIRLPOOL 7136d5091e4b972e825c371a62fe6e3493515d9e0ea61b7824299e23945e8bbc93c42042f42743114c26c28a1363163957197852f1afad3514a0266bcbc37cd8 +EBUILD gimp-2.8.10-r1.ebuild 4930 SHA256 1fff7baa58be89ce4ba84821f19fc1e59af95869f7779e1d0c2a161866b3a5d9 SHA512 af5a2fbaf5e555d0e4bf7fe9986b228b2437d119eab09af871ef602c211d8008e29c6b9adcf5afe73ec379f23478d729570837d319391c8776434abdffcb9f75 WHIRLPOOL acd80162a0382a161e26236558519f6281f185aa2eb4a499ff5baeeed2dc3badfc04f3c4f1c4010c409fe35ad7bb97c0cb54c43afdf6ffc65f7a510f9b9e9dfa EBUILD gimp-2.8.10.ebuild 4827 SHA256 825ab0dfca1e9ab69b639c4c7a33be9595ac3f4b799a80bc78c19b9c5a5b39b2 SHA512 8712c538d4131f381f475ed185cc860be02479ac7bce5c0eb04d0c7f2b90474216105e9c5f0c075a022d3b9c963a312a85803ecc5edc60c728012512abf59d25 WHIRLPOOL 91bb2552423d7427b6ccf7a53b9884b095b442d56f2aadcef3f66272f23c8c95be6fab90230c63b46c58a66c9158f7aab771d04d7fee4d92ebb0ca94f3c352f9 EBUILD gimp-2.8.6.ebuild 4861 SHA256 09bf3b5983cd8ac8588e49ebb6202a23718776a3683db72dca92a2f3cf116c5e SHA512 674858b2af74fe538811d1c9c397e2a05ea1bd0f0eeccefbfddb8840340efbf0dfa567313246cf66f1a14a8d2dc2988f79e4a42fc5fdc1e89a66dd534d659b44 WHIRLPOOL 14390db623aeead2d0e14bf020093c42d4491d752c15248b24f478682bce4365c72adf51aa69626ef01ceccd8f962688d89998ee35ac020b039cfb5be87691be EBUILD gimp-2.8.8-r1.ebuild 4829 SHA256 1e19e740fdf46aad27ff58f065648c70990490f235ba92c95427415debdbc758 SHA512 dfa06cd4011ea3cad9337ee9ab57278ac71ee7ca5e264156255f2d7562c8b64499a28e72488b73f71a14ba0c839fd29fcd8a5db7b58ef9f61bac9ac143112400 WHIRLPOOL 1e3891775b142e8694cfcee8500eb12f19e3212cda20efe21d6950a8d9e151e1afb524b6218bfdf9fd51a761159a0cf381a723c581e9e3c447cfdf2ccf81231d EBUILD gimp-9999.ebuild 4003 SHA256 5186884e7125cfd226009ae2887ef8f68b02b4547373f17bb6f7dd20807eee3e SHA512 ceb5713ef7f3d7ca1f867171669253f5863e5710d928d2a63476655878eaab600915e1a783a85b0f560e844221e41dbabb6ac2b0667491e40b1f6da12b5cf432 WHIRLPOOL 004b5ae142a60d0022bcbc2a44423682662e2cc6759218e96e95b5692b18914b4521f3ce10b5a343ca9cd99830f428f5aca378b8cbdb7a6efb36f53af73dcd08 -MISC ChangeLog 60601 SHA256 4e09d33bb94ecfcf26863c7fbcf584166436d58d46ad0e7736bab293ab6ce814 SHA512 381ab0c506fb585eb01974d75ca12461b0c99769f0564058388ce36e8fbf3c215b7a5d0a32fc5fb60fd11807ad49e0d485603db4748653b94d9a7e29485717a3 WHIRLPOOL b56ff0b0dea7c18cb431da3c0f0fccd23244f0b3bd41712b7b11f7a8163cf9e0f39663626749beb1c2c53bf60671543f6cadd684a36152d129df395e3c8a6548 +MISC ChangeLog 60746 SHA256 a576fe7c475985373975f708677480e9c7c162952d201c8dbbb71617c95a9cba SHA512 858ad1c958b634cecd581e00302674db86dcbaa6bcc254a13942fe81cfe8797db6057b0cbd5e09efeb80b1839d459a093e64fae0fc457dd12a7d40070bdfd340 WHIRLPOOL ffd7441eb299f325f33273040b4731f4bc4b5e2918ebccb0cca7dd588ad2256e24f5021ea79524fb332c58453574285ff132ed6b43ad38b758a2b006b4ad970b MISC metadata.xml 285 SHA256 77c9767711868abab1e559504dd88eb8aef8cf395629d8ec8c7a5fdb3d29397e SHA512 0b1abe9749d79ed8644c2a34312ab70cff232e08f64c1a914185cbafe8c754e9c6442eac1e3a1c449057e52b076333b70ea8be7418570bfcbee69f69d455079e WHIRLPOOL 9f2199f149dd49efce83f4710f026fc235a9aed38b7c7e0ffbb5480ef6865dee6ac555178bb92a819071d016fb0ead581765697cc3035b829ed96126bc7e6053 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (Darwin) +Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlLizFgACgkQX3X2B8XHTok5LQCghhG2PhzYLar+0+BH6RmOH87s -+iMAn0M7bRP5Xn1KMjmiRDLLug7I7Sh6 -=qSQc +iQEcBAEBCAAGBQJS5AiEAAoJEFpvPKfnPDWzD4EH/0dw3r1YpTROBKZU5+mreuAo +aosKYc8/JD+ztwUp35b9i41O9ga/AcGq2GuerpXRMZjwwYh2pEX+PpxgnHqiylUi +B7dBL+wPPTVbGgh9wlZtFlxAEEVuzcQbXdUtn9t52X6GEn1zj0fHWoi7TfeMGKIB +ZtVr5g0blDepjMPIVCwJsxtBiC4/J8OQrCdj90pdcXQYcdsPSe8xmjUub2xnVfXk +/sB9CLoeWCnMfggEOcJNGcCrnMozBDLZjpNhcGy2mMPeNd/WmoUBVWkjLQFwyFZC +fUTJJzs3aD0v3VGEnH4+DBVWNA3fIIqv0CE0SdMS4JLJmhCcgFBgjEwa3afIqIk= +=VckV -----END PGP SIGNATURE----- diff --git a/media-gfx/gimp/files/gimp-2.8.10-clang.patch b/media-gfx/gimp/files/gimp-2.8.10-clang.patch new file mode 100644 index 000000000000..065c66b36139 --- /dev/null +++ b/media-gfx/gimp/files/gimp-2.8.10-clang.patch @@ -0,0 +1,204 @@ +--- app/Makefile.am ++++ app/Makefile.am +@@ -120,29 +120,29 @@ + + # FIXME: core should not depend on xcf + workaround_that_core_depends_on_xcf = \ +- -u $(SYMPREFIX)xcf_init ++ -Wl,-u,$(SYMPREFIX)xcf_init + + # FIXME: core should not depend on pdb + workaround_that_core_depends_on_pdb = \ +- -u $(SYMPREFIX)internal_procs_init \ +- -u $(SYMPREFIX)gimp_plug_in_manager_restore ++ -Wl,-u,$(SYMPREFIX)internal_procs_init \ ++ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore + + # FIXME: plug-in should not depend on pdb + workaround_that_plug_in_depends_on_pdb = \ +- -u $(SYMPREFIX)gimp_pdb_compat_param_spec ++ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec + + # FIXME: file should not depend on plug-in + workaround_that_file_depends_on_plug_in = \ +- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \ +- -u $(SYMPREFIX)gimp_image_map_config_get_type ++ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \ ++ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type + + # core, vectors and gegl are on the same architectural layer, prevent + # the linker from panicing + calm_down_linker = \ +- -u $(SYMPREFIX)gimp_vectors_undo_get_type \ +- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \ +- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \ +- -u $(SYMPREFIX)gimp_curve_map_pixels ++ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \ ++ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \ ++ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \ ++ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels + + AM_LDFLAGS = \ + $(munix) \ +--- app/Makefile.in ++++ app/Makefile.in +@@ -702,33 +702,33 @@ + + # FIXME: core should not depend on xcf + workaround_that_core_depends_on_xcf = \ +- -u $(SYMPREFIX)xcf_init ++ -Wl,-u,$(SYMPREFIX)xcf_init + + + # FIXME: core should not depend on pdb + workaround_that_core_depends_on_pdb = \ +- -u $(SYMPREFIX)internal_procs_init \ +- -u $(SYMPREFIX)gimp_plug_in_manager_restore ++ -Wl,-u,$(SYMPREFIX)internal_procs_init \ ++ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore + + + # FIXME: plug-in should not depend on pdb + workaround_that_plug_in_depends_on_pdb = \ +- -u $(SYMPREFIX)gimp_pdb_compat_param_spec ++ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec + + + # FIXME: file should not depend on plug-in + workaround_that_file_depends_on_plug_in = \ +- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \ +- -u $(SYMPREFIX)gimp_image_map_config_get_type ++ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \ ++ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type + + + # core, vectors and gegl are on the same architectural layer, prevent + # the linker from panicing + calm_down_linker = \ +- -u $(SYMPREFIX)gimp_vectors_undo_get_type \ +- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \ +- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \ +- -u $(SYMPREFIX)gimp_curve_map_pixels ++ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \ ++ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \ ++ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \ ++ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels + + AM_LDFLAGS = \ + $(munix) \ +--- app/tests/Makefile.am ++++ app/tests/Makefile.am +@@ -63,22 +63,22 @@ + # We need this due to circular dependencies, see more detailed + # comments about it in app/Makefile.am + AM_LDFLAGS = \ +- -u $(SYMPREFIX)xcf_init \ +- -u $(SYMPREFIX)base_init \ +- -u $(SYMPREFIX)internal_procs_init \ +- -u $(SYMPREFIX)gimp_plug_in_manager_restore \ +- -u $(SYMPREFIX)gimp_pdb_compat_param_spec \ +- -u $(SYMPREFIX)gui_init \ +- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \ +- -u $(SYMPREFIX)gimp_image_map_config_get_type \ +- -u $(SYMPREFIX)gimp_vectors_undo_get_type \ +- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \ +- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \ +- -u $(SYMPREFIX)actions_init \ +- -u $(SYMPREFIX)gimp_error_dialog_new \ +- -u $(SYMPREFIX)menus_save \ +- -u $(SYMPREFIX)gimp_tools_save \ +- -u $(SYMPREFIX)gimp_curve_map_pixels ++ -Wl,-u,$(SYMPREFIX)xcf_init \ ++ -Wl,-u,$(SYMPREFIX)base_init \ ++ -Wl,-u,$(SYMPREFIX)internal_procs_init \ ++ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ ++ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \ ++ -Wl,-u,$(SYMPREFIX)gui_init \ ++ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \ ++ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type \ ++ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \ ++ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \ ++ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \ ++ -Wl,-u,$(SYMPREFIX)actions_init \ ++ -Wl,-u,$(SYMPREFIX)gimp_error_dialog_new \ ++ -Wl,-u,$(SYMPREFIX)menus_save \ ++ -Wl,-u,$(SYMPREFIX)gimp_tools_save \ ++ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels + + # Note that we have some duplicate entries here too to work around + # circular dependencies and systems on the same architectural layer as +--- app/tests/Makefile.in ++++ app/tests/Makefile.in +@@ -1221,22 +1221,22 @@ + # We need this due to circular dependencies, see more detailed + # comments about it in app/Makefile.am + AM_LDFLAGS = \ +- -u $(SYMPREFIX)xcf_init \ +- -u $(SYMPREFIX)base_init \ +- -u $(SYMPREFIX)internal_procs_init \ +- -u $(SYMPREFIX)gimp_plug_in_manager_restore \ +- -u $(SYMPREFIX)gimp_pdb_compat_param_spec \ +- -u $(SYMPREFIX)gui_init \ +- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \ +- -u $(SYMPREFIX)gimp_image_map_config_get_type \ +- -u $(SYMPREFIX)gimp_vectors_undo_get_type \ +- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \ +- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \ +- -u $(SYMPREFIX)actions_init \ +- -u $(SYMPREFIX)gimp_error_dialog_new \ +- -u $(SYMPREFIX)menus_save \ +- -u $(SYMPREFIX)gimp_tools_save \ +- -u $(SYMPREFIX)gimp_curve_map_pixels ++ -Wl,-u,$(SYMPREFIX)xcf_init \ ++ -Wl,-u,$(SYMPREFIX)base_init \ ++ -Wl,-u,$(SYMPREFIX)internal_procs_init \ ++ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ ++ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \ ++ -Wl,-u,$(SYMPREFIX)gui_init \ ++ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \ ++ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type \ ++ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \ ++ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \ ++ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \ ++ -Wl,-u,$(SYMPREFIX)actions_init \ ++ -Wl,-u,$(SYMPREFIX)gimp_error_dialog_new \ ++ -Wl,-u,$(SYMPREFIX)menus_save \ ++ -Wl,-u,$(SYMPREFIX)gimp_tools_save \ ++ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels + + + # Note that we have some duplicate entries here too to work around +--- devel-docs/app/Makefile.am ++++ devel-docs/app/Makefile.am +@@ -62,10 +62,10 @@ + -UGTK_DISABLE_SINGLE_INCLUDES + + GTKDOC_LIBS = \ +- -u $(SYMPREFIX)xcf_init \ +- -u $(SYMPREFIX)internal_procs_init \ +- -u $(SYMPREFIX)gimp_coords_mix \ +- -u $(SYMPREFIX)gimp_plug_in_manager_restore \ ++ -Wl,-u,$(SYMPREFIX)xcf_init \ ++ -Wl,-u,$(SYMPREFIX)internal_procs_init \ ++ -Wl,-u,$(SYMPREFIX)gimp_coords_mix \ ++ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ + $(top_builddir)/app/app.o \ + $(top_builddir)/app/batch.o \ + $(top_builddir)/app/errors.o \ +--- devel-docs/app/Makefile.in ++++ devel-docs/app/Makefile.in +@@ -511,10 +511,10 @@ + -UGTK_DISABLE_SINGLE_INCLUDES + + GTKDOC_LIBS = \ +- -u $(SYMPREFIX)xcf_init \ +- -u $(SYMPREFIX)internal_procs_init \ +- -u $(SYMPREFIX)gimp_coords_mix \ +- -u $(SYMPREFIX)gimp_plug_in_manager_restore \ ++ -Wl,-u,$(SYMPREFIX)xcf_init \ ++ -Wl,-u,$(SYMPREFIX)internal_procs_init \ ++ -Wl,-u,$(SYMPREFIX)gimp_coords_mix \ ++ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ + $(top_builddir)/app/app.o \ + $(top_builddir)/app/batch.o \ + $(top_builddir)/app/errors.o \ diff --git a/media-gfx/gimp/gimp-2.8.10-r1.ebuild b/media-gfx/gimp/gimp-2.8.10-r1.ebuild index 07f324e73a3a..e6007107586a 100644 --- a/media-gfx/gimp/gimp-2.8.10-r1.ebuild +++ b/media-gfx/gimp/gimp-2.8.10-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r1.ebuild,v 1.3 2014/01/24 20:25:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r1.ebuild,v 1.4 2014/01/25 18:54:54 hasufell Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} ) @@ -119,6 +119,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695, comment 9 and 16 epatch "${DISTDIR}"/${P}-freetype251.patch # bug #493466 + epatch "${FILESDIR}"/${P}-clang.patch # bug 449370 compile with clang sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too |