summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-06-08 06:46:34 +0000
committerJustin Lecher <jlec@gentoo.org>2015-06-08 06:46:34 +0000
commit1dd82111fd72a6b1308cc5cd1d7c9d47149d4f2a (patch)
tree704a37e582a1f1be7ff28c67c192da53c3a78327 /app-office
parentUpdating remote-id in metadata.xml (diff)
downloadhistorical-1dd82111fd72a6b1308cc5cd1d7c9d47149d4f2a.tar.gz
historical-1dd82111fd72a6b1308cc5cd1d7c9d47149d4f2a.tar.bz2
historical-1dd82111fd72a6b1308cc5cd1d7c9d47149d4f2a.zip
Handle fPIC for hppa, bug #551452
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xE9402A79B03529A2!
Diffstat (limited to 'app-office')
-rw-r--r--app-office/scribus/ChangeLog5
-rw-r--r--app-office/scribus/Manifest32
-rw-r--r--app-office/scribus/files/scribus-1.5.0-fpic.patch35
3 files changed, 41 insertions, 31 deletions
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 9ab9451a6899..d54984066380 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/scribus
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.211 2015/06/01 08:59:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.212 2015/06/08 06:46:33 jlec Exp $
+
+ 08 Jun 2015; Justin Lecher <jlec@gentoo.org> files/scribus-1.5.0-fpic.patch:
+ Handle fPIC for hppa, bug #551452
01 Jun 2015; Justin Lecher <jlec@gentoo.org>
+files/scribus-1.5.0-QObject.patch, scribus-1.5.0-r1.ebuild:
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 0a8f1ad29557..1fea36398c74 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -7,7 +7,7 @@ AUX scribus-1.4.4-ppc64-fpic.patch 1137 SHA256 6fddac38cc50624b51403c1828a6dddd3
AUX scribus-1.5.0-QObject.patch 596 SHA256 3bc002fb9fbb62b32bd2651d9645b2552a1f42d005eb1d3d6d6d3526a1a6cbef SHA512 97d21d7c301baaf2b610a8adb626401214c174a8f377547ce1484a341bc06a712bcd4009ee8ebc987fd35affb3cb870fc4855843f5f94097dcefa52ab1369c7d WHIRLPOOL 8c828da9bf555c9f6525d510b22d8908f0c570d3710b5286a0b0b763db1359cbb26bf4e1abfa2a99bcae16e0bb42c390a46a6ec184f117435dd6b93a4c884b13
AUX scribus-1.5.0-docdir.patch 1573 SHA256 ce825d9b85b585f322dda4aa7b9fb71269cc7e84338108a24a66e75b0f802c57 SHA512 fd65a84a2d1f3c432b776b722f68d28b4471b27c8e49dfbc6b616d6ff7f02c96e9c73ff94df3c4aa055b6868dc2a8e80dd6367c474c353f96b55359abff0844a WHIRLPOOL 3ba14965c68ab2f5772ef19af6d46bc7b4c825455be6170826994d278ebfdd9eb1a49124f21543d7317a7112b2defa0641ccd0b636907145e939be5d03284698
AUX scribus-1.5.0-docs.patch 916 SHA256 083fddac4b6ad08cf8859a95d425f8c70831fa19f86491baac600b86939aab1d SHA512 be5c86466490414724f4293450200fbcbb10c69d7a23e3589591f38c2e333af76227a01575836fb4bb28409366aac6b8d2c2b1b881ed7439c81e1739835723b8 WHIRLPOOL 38159673d5410186088011417eb9f6671e98662e86af3925da05dd8564eb52b898403f7ec7f6648971c14d2377c9a56c67dddaa52850447d9dd8fb2d85ec9679
-AUX scribus-1.5.0-fpic.patch 6215 SHA256 b27693eb12bcbffa6b4e7a61ca609435c4165a641f745a46194093fea9d78038 SHA512 c8f67816b9d9c81bee05cb3c743a6dfef0f229ba56e9af2d104d9b22b97a96b2dd80fbe368b38dd1bdb8ffc21d9c45205f35376300e6d7a90fb54ee348998dc2 WHIRLPOOL 62ccba0c8a924a50abc28a389c3252e1213a13d7cdbefe7d9f31249adff51a998bdb541cd7d8c341282710d593bbedb5851979652456535839311b78124aa191
+AUX scribus-1.5.0-fpic.patch 6395 SHA256 5a2f697ffa3601b9a582d7683402470c4b2db7c47b37bf429afad656f8ba40f6 SHA512 b26e921271656d579b4578a6118fc26fc77557e4842e24231ba7702b024aac0f43954d46857ac2056ee992a485565cc781dbfe0ec9b3eb993429924b6a76f501 WHIRLPOOL 1ca43d27bb68dde90c992c1f6c4212e86062f3aefb0cf385024cac8028199beae1e0fe487d3d6d06698ab06c49b79a8888d3bf440a01ab73ffea1e6659f8b46a
DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948
DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca
@@ -17,24 +17,24 @@ EBUILD scribus-1.4.5.ebuild 4120 SHA256 075b656f0f695f4951f72cd7e69d8adb3996686e
EBUILD scribus-1.5.0-r1.ebuild 5902 SHA256 6bdc67a22544cf199c1267ea105154951400d43a5ce4a9377481c8b4eabf83fb SHA512 917f64bc3dae90e404b403c821ef52a7b3e8bb7900f3741b8322f42748dced37c2a7a34921c2abc47c392249efc883a511d775220c9ad38a82a65ffb0a07fb93 WHIRLPOOL 6db75acdb993d992272ab6392ca15600aef04b4e3fe2f7cf0a38d93234a66a5a576d1fe9993aa19ab74888b70fdbbe6ed3e608d6dd8f20468545b24e60604771
EBUILD scribus-1.5.0.ebuild 5828 SHA256 aba34ce3f7392c8a60e526c5d6c6974a2a5b5667ac350f44741d2bed11912303 SHA512 f2858ee5186fc8489bf6518c7451351b155b8edad3cc5d98929608b20097b71621651f809fb775d5ff71b3ef459ef17bd2b5b4d272f21b07103d56a5b5876555 WHIRLPOOL 5cdad215bff48b5d551056879834d9bda7656fa10db15ae0eb20cfcba03fd6894707fd6c129bc5564e05623b3ae9280de947b1ec6580caf4ff722453ecc63920
EBUILD scribus-9999.ebuild 5882 SHA256 8ed20081d674a646d586b8b179193e2a0129389f6cbd304ab683742657031c52 SHA512 05dc3357309c9e137de78f16bc9e5cd1820baef76ceaada06042736d2654cda915e2f3f5094612ad40d9cb44950d14437eea1ce4d803f0db8c0f7e3140b024e5 WHIRLPOOL becd04fb6a976d455eca7d1f93d2d9501f78caaef7b873824678928d25491d08ba7641f331f3382b0a989051a1c3547ab942feac8bb43e13257a2a3f284b8634
-MISC ChangeLog 28686 SHA256 ecd7560090c378fb15b35d68ba79435f2c938340470b72c8c84257e2ffd0c5cb SHA512 c0ecb2b63f839a425c20e5757b997aa040d4edf143ad8f4dcedc05f7ee6ffe16edfa9c3012b49570f18442404eabda0cdbf68c10d858e1447a26128d2fa9a337 WHIRLPOOL 905907df5c47ea952e809e8feb9aa6b3b7b4f83cde14d554e417e142f9eec41a22902c5161a798d0081e46a23b696b7527f58e853a3e5214f512366e19793625
+MISC ChangeLog 28802 SHA256 e7423b3a9c80221a3b4b88df359c1222a6ca6406cde01339327f92470017dfa9 SHA512 b9b23741a92b507dd0bc539f5db444cdf39c76535e7a6f1b15b5c8b7663f4c07cdcca567d5fca04ca30d9794830143d945684f09722f240114b8704fc4688945 WHIRLPOOL 6861b4d489e7aef7239e354dc0bbe6c5cecef815465f1f174916e11c4d963e168d0d35650082a6c9e238407d849bd1607cff752b3543b8e6c781f3ebab975729
MISC metadata.xml 900 SHA256 279e9a6f69c420d77bf8859a68f81638032fbf83c0d61d084d68dcbb52830dde SHA512 89d13f2a0a895bfe0b01e30839483d96e25b26164c5a5566bc18fcbb92a2e56a8daef5fbc4478d35aecdad327c7905393f2299007cbf866bdd0543b2eaab30f7 WHIRLPOOL b31847ab5b0274431dc4b3bceab9b5d22235fca15b261046d80f5df661d831f19297cc792e07fe373b157617b65da7f591e231e5a85b34fb78bd67324296b491
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCgBmBQJVbB7gXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVdTpEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLrAQALR1/fi1YLO/L4fZxk4QAyJf
-A/e80EsCyWRke29/HHcdcSUKEoS3nRlew2qfB9VqgeDIdoZ5Vyy0u5wF/P8V3chi
-ifwGFUZ2UKuCYimLJP0sna6TcWONhaFGsZYOqR7eR5IW2Pge2GwrKfnklKP+RteN
-V/dX9ajABoUzcNzJ5tWkfenGmGiTsj2lPjAuR7X+7PNe9O6EYMUKfBc3gDL9Q0CA
-OO1656Ar1DBk3JwTz201KOCQSOmRu45H6730HRd4WHLF+3lcFl7zFGUzWQSSKJrM
-Y+aLle5l7o2PXohFKZoST3WIoTxCjCPaIoBdunn9e0CXwZT4q79MIjMY7CfpFfuH
-St27yCPKy0N62qBdNod5Yczl9Ruk0yk0+x662YsnOCs3alggbw6zcQGjuc7DHLCK
-trXpMm+pNUlBePBgJYNdAj2QlGYGeBjQ5y+RsTMoccoy5LCbRb/RUHbUM6n2TVaG
-N6IMDKfvBbeaT8nd2iZ81lb4E+l8OchY5ZD8LIA+oIjjNTuwSxZWRw4nG2He3RUZ
-YeStUdxgAVnZSjPhUxTERDB1Wxnqlr6xkeNy0Nf27QBf8O5I/SFJ+GBS8mPQSZhx
-QxqRATXyEWa+hvC7T7j4ytBw5aK5UsODQBwy3alVMQ8Ie1q2MZ5Oh2ex9PeTnimf
-G3qM/KOd1cpEXKuIQVsW
-=a8rU
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmidk0QAKqx4M3FGvWtNqMvRRSzZfPi
+HAnby5GLGJcbxCKzr/sTO5IYJQciWq6IHDdIsHRUeVAo5ut5vo03dbOs4JEbfW0s
+IGKFfqOBFJPKMevwKAU726CbzH+rv1PkrswdseOPkRta/DRLUOK3EeV3rnoDncqF
+XESwmWZY7wfNUtZxhyf3dkGDRn8aimfDb8cSOSGPkdcPtDA2GOKhwdLU/0SpuhWw
+Kzcf1J0feZe5spU2O2jybxJmdo0UPhWYRIxsmo4eQcLH0CVf/PmNTGCLVneC4MF0
+0Nrp7gactcGGBXr9eA3p5H2wDuVVEYhCoq8bcs74OsjZtdG0AY7VPK4rYYC1XRlm
+owLkpDnZMnDxn/txqOYGQRFz0OwXnPqi4s/cSa4JXilnoJsv0FLkDAT17mCMnV0S
+CfxkbUyNPUuPlPa28TLDz0h3WWFT31N6UQlNdr96LDXR6bDA/e2Y1XCLCh9qWNkW
+qpFADkuJiBO9NN2BEssPtNd370afTJilFNBbfAfmUwXwQVCIQAl+NYnTCGTWXPhb
+Ue1MFqbOMw9Pvmqj8bv+/PAPrLkD28TXG3fy57LGQiLqZqyiOKBqAQHEB7mQlyef
+P7PeUAYth+cB4Urmz6Jy7m/V8GJjrCb8VQ7ejNSpHAzkShvszYW5vZNimIVpQVJj
+dIp0H8qfTuzYbICohdcJ
+=HS7q
-----END PGP SIGNATURE-----
diff --git a/app-office/scribus/files/scribus-1.5.0-fpic.patch b/app-office/scribus/files/scribus-1.5.0-fpic.patch
index 0c33a9c81c8b..9f6a6c4e0aba 100644
--- a/app-office/scribus/files/scribus-1.5.0-fpic.patch
+++ b/app-office/scribus/files/scribus-1.5.0-fpic.patch
@@ -1,24 +1,31 @@
- CMakeLists.txt | 8 ++++++++
- scribus/colormgmt/CMakeLists.txt | 2 ++
- scribus/desaxe/CMakeLists.txt | 1 +
- scribus/fonts/CMakeLists.txt | 1 +
- scribus/styles/CMakeLists.txt | 2 ++
- scribus/text/CMakeLists.txt | 1 +
- scribus/third_party/lib2geom/CMakeLists.txt | 8 +-------
- scribus/third_party/pgf/CMakeLists.txt | 2 ++
- scribus/third_party/prc/CMakeLists.txt | 2 ++
- scribus/third_party/wpg/CMakeLists.txt | 7 ++++---
- scribus/third_party/zip/CMakeLists.txt | 2 ++
- 11 files changed, 26 insertions(+), 10 deletions(-)
+ CMakeLists.txt | 15 +++++++++++++++
+ scribus/colormgmt/CMakeLists.txt | 2 ++
+ scribus/desaxe/CMakeLists.txt | 1 +
+ scribus/fonts/CMakeLists.txt | 1 +
+ scribus/styles/CMakeLists.txt | 2 ++
+ scribus/text/CMakeLists.txt | 1 +
+ scribus/third_party/lib2geom/CMakeLists.txt | 8 +-------
+ scribus/third_party/pgf/CMakeLists.txt | 2 ++
+ scribus/third_party/prc/CMakeLists.txt | 2 ++
+ scribus/third_party/wpg/CMakeLists.txt | 7 ++++---
+ scribus/third_party/zip/CMakeLists.txt | 2 ++
+ 11 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 29d66f3..62d145f 100644
+index 29d66f3..a92da7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -131,6 +131,14 @@ IF (_machine_sparc64)
+@@ -131,6 +131,21 @@ IF (_machine_sparc64)
SET(ARCH64BIT 1)
ENDIF (_machine_sparc64)
++STRING(REGEX MATCH "(hppa*)" _machine_hppa "${MACHINE}")
++IF (_machine_hppa)
++ MESSAGE(STATUS "Found target Hppa")
++ SET(ARCH_HPPA 1)
++ENDIF (_machine_hppa)
++
++
+# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
+# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133