summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2013-07-20 11:31:40 +0000
committerMichael Weber <xmw@gentoo.org>2013-07-20 11:31:40 +0000
commit6d94b9cf839ee1714a849dd3d78e69270544b2ab (patch)
tree425ddaeea53196f74d44bbd281b2cce8da0fd5c1 /app-text
parentApply upstream patch to use bsymbolic and prevent problems like bug #475954 (diff)
downloadhistorical-6d94b9cf839ee1714a849dd3d78e69270544b2ab.tar.gz
historical-6d94b9cf839ee1714a849dd3d78e69270544b2ab.tar.bz2
historical-6d94b9cf839ee1714a849dd3d78e69270544b2ab.zip
Add extra -lpthread for --as-needed
Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64 Manifest-Sign-Key: 0x62EEF090
Diffstat (limited to 'app-text')
-rw-r--r--app-text/mupdf/ChangeLog5
-rw-r--r--app-text/mupdf/Manifest10
-rw-r--r--app-text/mupdf/files/mupdf-9999-sys_curl.patch6
3 files changed, 12 insertions, 9 deletions
diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 0f78b2948a93..d0e1663786a1 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-text/mupdf
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.83 2013/07/20 10:29:40 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.84 2013/07/20 11:31:36 xmw Exp $
+
+ 20 Jul 2013; Michael Weber <xmw@gentoo.org> files/mupdf-9999-sys_curl.patch:
+ Add extra -lpthread for --as-needed
20 Jul 2013; Michael Weber <xmw@gentoo.org> +files/mupdf-9999-sys_curl.patch,
mupdf-9999.ebuild:
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 570d15c58e81..c228eb6cc390 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -12,7 +12,7 @@ AUX mupdf-9999-CFLAGS.patch 251 SHA256 c2fc5eb9e09527385dd73ced61bf4e5ce0102ee0f
AUX mupdf-9999-forward_back.patch 612 SHA256 e0ac626c00a21c607c158ed215fb8185dd01500af79727f48660170e761815d7 SHA512 42fec7eb1e5aa171ad6f7d8f1984a1804287fb1ad54bed7bcd0e3df6493955873ba376eeaf2ebd428d7cee2d1327d56002e3717ff8a7a74ea00ece51f9ab943f WHIRLPOOL 6246bf21953ea91f279240f86e98979b0f2d3ec5eafcb5c385d65172df10e91bcfac3f99d151afa7b594c540291b57d4e12d0642b4f7ee4bf9406071b111183a
AUX mupdf-9999-openjpeg2.patch 567 SHA256 64f0d8946d0fe037a95fd5a58b4622c913622f930b21dd6af39f030d282141e9 SHA512 0a43bc4eadf41bd0bf6a6f0e400d0cc0eb701575ac7fb44c271aa5f298071bfcd7b3c5d83709782c0c935721a27470c58cefd2b385178c2b121b620061a070f5 WHIRLPOOL 76e2a7d1146d8bf55819e0588863a9b21c2272566820d90c3779de00f33b9863995d2b1cab6804be2f42579bf1fa874a78e9380f575aa50461f2908dda3761b6
AUX mupdf-9999-pkg-config.patch 568 SHA256 409432fd7021cc353e0b72fdda891d0d0f0f7508f8514e735a2d9c7884199ebe SHA512 1ad447d5d6468a920cf71b3e12bce1862894734522b5c0e5f87871799b239582f56eca08d69b5d1b366369dda6f93037136dff07126398d2b7a746406a9fdc0e WHIRLPOOL 6f0df1978cf4ed97a92b6e681e5bbdd888e55a86ceb6b538a6269df0474d090de7c7ba924090eebee271261d2db237593f5ba226f1851a2a6830a9f50fc7f9f0
-AUX mupdf-9999-sys_curl.patch 341 SHA256 1a1b536d482362eecc3bf6d39a61ea931992d6a1492bd72989a8cf90e0ef7221 SHA512 b357687ab91c41a7560254a78667c4135eaecbe45ecb573e4fcb985c3e16615636e19da0fa60571d893db594d632cb0db291567f366893642775c5793083ce65 WHIRLPOOL 3dc01d0abc7651d8dcb0346cca761b7f7ef1c4cd69f8957527849621525c6be57140664c4241f0acb40726117c0cffc8b760fb4c3efbc3ee98509664ab9f459f
+AUX mupdf-9999-sys_curl.patch 274 SHA256 842d421c810ae0f94736e1e832573daf2a6e9b4014c385af65980f7c73f4ff88 SHA512 888e8c8a6591b00e6f459ff4c36b842765a8e7f06b9382d453466f15576d22d88e53a42b372d94cc4f74c7ab13c33ecd74da52f371e330ffbf092480844c5ea1 WHIRLPOOL 4901caf92900d129ef2d5ef820e1fa28cadecda92bed3f306dc0b670ba9e88f9b233453f906a911bf9c938cc4a0da23c3d997531087cfa8cf9dc01134efa1a26
AUX mupdf-9999-zoom-2.patch 216 SHA256 239f60b41a1afde0f01095c5d5052503491593887cb2338f201889ea0a1ef814 SHA512 caccead68c45f06b5f209330040d4afdb51da2506d5692f27c93ad96577d4f16fad27fc9a66097f09326d65225a3e2fe9206eef8698fb549d83c5a93a57fb396 WHIRLPOOL b8fac668373049887f06248800f39a239a133b905969ca1972bf4c6cb9529570a1df5b5816a367ad74dd3cdb49b59abff15d386524a65305564454fbfa48a8ae
DIST mupdf-1.0-source.tar.gz 4208530 SHA256 4f5e12625f7f827f6eb5606026c9a7a7dbdeaf935fcea3bc173ed8d469698ec2 SHA512 00f71288740a137fa3eb3537453f0465949a2dbc590a38651b3dd7a651dad6d0dc5070a3072988439f52729b12478cb467f202157ceb44e5a560431354567861 WHIRLPOOL b58166c37fa6ba81e946e53326dad50426886380b051943f2988657780e3c77e4970541f27ec3efc29ce6693012293bf3104dfd79dfc50f644c6f051431294f3
DIST mupdf-1.1-source.tar.gz 4281735 SHA256 e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34 SHA512 d61694041d28309e8119283fb97cef5e1f2effa6e93bfe5ad0b2a0b6b76e38a575a23b0ba367cb59efa77f35b131bf82667f2c7c8df29eb4cdbe3c12b0ad3a33 WHIRLPOOL 67ba7df6c0b94f3213b2e6a709fc3d9ec02945a0825169fb8833b2919b4bd4d8e6fd5f29b2b231df213f8e68d092526b59c152281b56d1c3a9064799ed35e60c
@@ -23,12 +23,12 @@ EBUILD mupdf-1.1.ebuild 1553 SHA256 5957e8e39a40c7bd80c60cc8964dc8cd6f77f5a61e9f
EBUILD mupdf-1.1_p20121127.ebuild 1488 SHA256 4e11b767db4d78de3d5b7e83ca1ec97880c30375249db419265100366fd20585 SHA512 fdbe754cf384c594f754a31e3d5153f25fc43966fc359f999e2852eb3eefbe13d1ca03a022dfbfd0a649a1b1a4f6d84fd5232005a5203ead16768eb12fa32f90 WHIRLPOOL 7b1e8e8b2b2c5209a5cd81de3bc70d0dae0d905d12006800618b1ac31212fe5b2bb0aef6a7e6dd8151052f1d56a1437d0687b10e635ddf2529e35eb9daedb6b8
EBUILD mupdf-1.2.ebuild 3266 SHA256 c872fc73b7f9ae250bf85ccc68cd7fb4fa3e991bea6843b751d154b49a6904b5 SHA512 f334e42f9edf370998169cdbf177267e78be07a050de91d9bf27369c28782eed67a94a19bd40a382657548a8467c81c7e690a01e94de666445c3a5ef3da26d08 WHIRLPOOL f647ab1dced46b023da7f1bb88dbcc00ff9eb3a48755e05ae5ce13f3e8fd8ac3315c2cb3780b1e106a6d90b2e8e2db6a28d8c674dcf876f876a424ddcf82911f
EBUILD mupdf-9999.ebuild 3581 SHA256 dda33f873c8fcccec942f1a59758a2e9bdd1cbad12253f478ffb91d4f9b7a0b0 SHA512 87ad4856b7f3a91017078b1e31e98690ea4bd8d1de7d74f7d6f31f24cb83f4d0611cbbf3d181061843ebba64cdb7e5b49890c93634c22272b07f14609acdd957 WHIRLPOOL ac62a4e59e4c76d05812376703596fbffed75e68c2d7d8c9bee43834dbcd7d151fcb50a68afbea9b858a5fb65a0910124476906880ffd61dcd8e80cf6ad07d6f
-MISC ChangeLog 13115 SHA256 82a6320abd2729b566a05a3be6e17119c9bdc6966aa618b84d2c2aaaab00cab5 SHA512 394c68eac5b7a265de11b0c00fe1ca5625dc39a035a2b2ff59e111e51b9a8964294ea4231f963b44ca6cefdd6b877433add5143904f3e37d0edc07d49e209e22 WHIRLPOOL fd4d464ed2475c1528ad34a293a60616c6070cb8e3fcc4c5e5356f393e8b673aebad739368289dcdcdeab196238e8ea7686c9a4ed09c12aa80dce3aac8f2745c
+MISC ChangeLog 13233 SHA256 7096f951beeebdbd62778d90f2e67fcd342c923de0990b1563114c4918ae5a18 SHA512 40d21121af494cc8beea44b44c5c144e537d1dafc3ce46b327632ea5074cfee2f6a1b470b6373a653e22b59e3e27885f3a01bb267fff079a3f1e95454d70ca1b WHIRLPOOL 4f75117dbeca534f063b1e57d4407db4afed76c938bee966ad21fbdbd86746ba833a08815e53bdde046cbb4395836ca566bc2cc072af806311bddf6f9dd0f2e7
MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iF4EAREIAAYFAlHqZpIACgkQknrdDGLu8JANVgD/ZTy0T/BFyr+67dwsfgAnB8eR
-gGCI8WtkdgS5YUomv28A/3xIGrOgl8pM78RPjMyvZotYH2ahvGav7skU2KBetdEp
-=pxsr
+iF4EAREIAAYFAlHqdRIACgkQknrdDGLu8JBKWAEAlySl6mtzhlYM+tdl6xUto1MD
+SDqLLhEg3YESXorvdzwA/0p5JiME4gVDH8cyvGYRzhkvBJH8RAilD8RYFzihm17f
+=A60f
-----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-9999-sys_curl.patch b/app-text/mupdf/files/mupdf-9999-sys_curl.patch
index 8a392a1691d4..1866dbdf7e59 100644
--- a/app-text/mupdf/files/mupdf-9999-sys_curl.patch
+++ b/app-text/mupdf/files/mupdf-9999-sys_curl.patch
@@ -1,11 +1,11 @@
---- mupdf-9999/Makerules.orig 2013-07-20 12:17:11.137748315 +0200
-+++ mupdf-9999/Makerules 2013-07-20 12:19:23.320095808 +0200
+--- mupdf-9999/Makerules
++++ mupdf-9999/Makerules
@@ -63,6 +63,8 @@
SYS_JBIG2DEC_LIBS = -ljbig2dec
SYS_JPEG_LIBS = -ljpeg
SYS_ZLIB_LIBS = -lz
+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
-+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
++SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) -lpthread
endif