diff options
author | Johannes Huber <johu@gentoo.org> | 2012-09-18 15:49:42 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2012-09-18 15:49:42 +0000 |
commit | 3f301e25006be40aaf94638dee9b987a4ed3e90d (patch) | |
tree | dc386ef1080a0c2f380aeacc341ae011b5b4d5f9 /app-office | |
parent | Version bump, drop old. (diff) | |
download | historical-3f301e25006be40aaf94638dee9b987a4ed3e90d.tar.gz historical-3f301e25006be40aaf94638dee9b987a4ed3e90d.tar.bz2 historical-3f301e25006be40aaf94638dee9b987a4ed3e90d.zip |
Add patch to fix build with media-libs/lcms-2.4 by Franz Fellner <alpine.art.de@googlemail.com> wrt bug #435392.
Package-Manager: portage-2.2.0_alpha129/cvs/Linux x86_64
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/calligra/ChangeLog | 7 | ||||
-rw-r--r-- | app-office/calligra/Manifest | 25 | ||||
-rw-r--r-- | app-office/calligra/calligra-2.5.2.ebuild | 4 | ||||
-rw-r--r-- | app-office/calligra/files/calligra-2.5.2-lcms24.patch | 13 |
4 files changed, 32 insertions, 17 deletions
diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog index 1842ea3568c3..999688c695c2 100644 --- a/app-office/calligra/ChangeLog +++ b/app-office/calligra/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/calligra # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.71 2012/09/13 19:36:29 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.72 2012/09/18 15:49:42 johu Exp $ + + 18 Sep 2012; Johannes Huber <johu@gentoo.org> + +files/calligra-2.5.2-lcms24.patch, calligra-2.5.2.ebuild: + Add patch to fix build with media-libs/lcms-2.4 by Franz Fellner + <alpine.art.de@googlemail.com> wrt bug #435392. 13 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> calligra-2.5.2.ebuild, calligra-2.5.49.9999.ebuild, calligra-9999.ebuild: diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index c812ea31fe47..c919c62fd8df 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -4,28 +4,23 @@ Hash: SHA256 AUX calligra-2.4.2-marble.patch 6663 SHA256 cf525eb2bc6f2e9f06b4f8376444bf22a137ca2b83889e831a1aedf69f5b5a58 SHA512 d611527ab0b144c50e97c34b50daa25175fd7f62cc2d37edd6603400a1e3998bb0f150869588549038b9f9b5a4f5110dbffae3af736283b17ddc6d1d6f8f8928 WHIRLPOOL a2175e279add5d452b1f176da9636da8fdb89132b1a8aa4817694cd77739483ba800b25316a27db89c1123075f0e5c1c2bbf28a8b2adcb8120ade214d0d3d5a0 AUX calligra-2.4.3-security-fix-buffer-overflow.patch 1117 SHA256 2c1bbff2695c4c3daa93bf6bd8f8a0b8e93dba911daa646e1c1cdab95814864e SHA512 61bfcb66b5e5628093bbc244e0b635ced96869d066ae083e83b4cf7efa6ea3532084f10c3bf9f9cf78889ab9bea3e98673b5eb2147d6d84de1cde391547a8f1e WHIRLPOOL bd73472213f51dfdcee5e3b21fa80c24c0db443185191d180ecfd0febddcf47e58faf7b18ef1cfb67b4ab1ed1c525722ce2349301dc16f9c143c8ca2f33cda67 AUX calligra-2.5.0-kexi-automagic.patch 953 SHA256 c0acf337441978b9098bd5fa8636d371f06638d9eacfd261c30365a85f6b735d SHA512 bd732cc5114d5f0ed219309d26c364d63fb812ddaf25b201e0e4260f46c3b4000b9db39147562922b9ab7ae85cd425ef058c6760cb3b576891acea56520210e6 WHIRLPOOL a17cd2853f23594041ae48361eef2a6c312ac9ee4ac1d64b4fe428be90ce125c3ed50ca547282ef792858fd698d9a6f4003227a0aedd5708fd8a9068ee9f1000 +AUX calligra-2.5.2-lcms24.patch 615 SHA256 c8ce91acd7cfd35316a09ee04bb29c2112e314265073e69306a5035244e0f93e SHA512 c62b7ebbf879c3595d0ce953ae08c9f7f193b5a1e672262b68a653a2dc52eecac0bba3e43a0f5e3b3526000e4dcf7ee6f7d0608e3463331bb6cef8d9e4e84b5f WHIRLPOOL a1bf312f3924105410a6adbc09b0c69c6004b0d9f4d4d4f58bcc6d9fd2ef6e2e8e6ac1df0c550a0c8a9d93fbd7e27d93f2b5ef48911412c253cb23da7b1ed930 DIST calligra-2.4.3.tar.bz2 119351575 SHA256 8a7dbefdd957217ca4280c1865b319f4fa6c3b38ec8f302e6131a21be8c5946a SHA512 7c8ab608a43d2f386086d4966462521c22d648e5e6f5d11cc88093c8d40d21b3c81d77f0b01ec3781c849560138c7c3d026c017c3653400c92ad8314d1615827 WHIRLPOOL fe5259c0ff220a9020647f686de5afecb7a9c0a2929259435d7f9b7c461a0da3c338d39fbd5bb7dcd53a0f79bab6ac312d68d46c241adab7916a89d86e869974 DIST calligra-2.5.2.tar.bz2 119280741 SHA256 4ea50791891de621caba4ddf1484539ab50a6a770ad21cbb428c66fa685689ca SHA512 8bff1aa2cd6d785c575dfa38ef6d680026ea6634fb6d6a994fc133754412530048e70ab62ffeeadc417e37b644ff821ea75aeeaf31bcb99f11c0f706e79b792d WHIRLPOOL d51008c83ee2240a6b5827995f1564c0e0cc8740ae8c9756d044513160a2009b35e0f56bb97f8c27b384626f06de84f5f5db8fe8900337a9f489e4e884eb1961 EBUILD calligra-2.4.3-r1.ebuild 6159 SHA256 bde60dff89b5879b129bd05cc9efb4d2ac6420493a6375700ad82830d02408c7 SHA512 77b63f062f165997b26e3ab4dd0f1d826c36d7629efa58acb2862a52b86105c08c47411d80a368de8553fdc473ee920a3940f3fd125fa77a0fc65b1999feee86 WHIRLPOOL 193a44b8d1fb745d4e62fc2cf6f5b78498b64d0ec6159f1e3009e773858e9df9b4518f1fd997d0d2553877c879ec5aed1e5aa47bb4e46b135f8aa793840cafcf -EBUILD calligra-2.5.2.ebuild 6593 SHA256 de90013c1ebbca0801dce23bdf9f20433961d6b801b64c06c5c678e6c269f038 SHA512 793fd343edde88a0f2a663f16a5105e3eb2530be219c2e1ddcdec5d6f3e002a561e0b329911475f8613cad964a5262d1687e5eba899dc063ee4cfda6c74c7794 WHIRLPOOL 8b7a5a897353d0d6a298c4a3b8898bebe46934b2e2b2973b4755009500887b5c861ac5089ffa829007499068de43b907766694584e21ff3149513c588476c79f +EBUILD calligra-2.5.2.ebuild 6640 SHA256 9f5894f26fb8742d832b1d24401c4958958f19f2a358f839160244106b964fd6 SHA512 08072ae85f1fdfb20584e0bd2ce64c6a170e86187f452c556e7fa9cae0423e36f3b80b5495323b9836221dd8d5ba9195dd79094877dd1688fb96d9165caa8a8b WHIRLPOOL f001c7aff1134dcf50139f1309cf4275e2e07d326b250a3031875dc8c2f9124bc09f1fd025b4c113e608bbf50517e726d1c6efb0b7ab0d383f30a908e8452497 EBUILD calligra-2.5.49.9999.ebuild 6627 SHA256 db5b1b7aa9be817fd9933a59e88e99ec139c5e4d7e282bc8717355522a7a34c6 SHA512 925362bb11b63a14d8b8c648e15af645b001c09a38572c86a4a28147e0a6491ce218d17efb62c3e1c9f1a19daae4ee929fd0d0591dbc95943f3dda8ef946dd34 WHIRLPOOL fe7686a54b084cd0fd840df53db6ff1203f833edd3d4428142ec76906e93cea08a92ac40c2c7d19bcd0697bcaebc487780402c7111b702d2525dc3b00e88abe4 EBUILD calligra-9999.ebuild 6593 SHA256 324492db2f9122038829a58025fd287d0470acb92d8dd9a28e5b6f4080dc95d0 SHA512 6195f492b6034618854e2ed2d78be8f0edeb4cfb48a2dfb98938e30ae88661d401eece6df951b613c4bdfd87c66e77eeb4a08440486b1e09d6d09bb45812d8c3 WHIRLPOOL e644df7d92af61542aa97535ac8c861ea1f939d9210ea9151c44ea38f3060b100c51be6edad203c34154519c3a64df2012894000a057e59e956a815656de436b -MISC ChangeLog 12569 SHA256 e2166445fdc3bd3e2784d510b968a6e6a534a89da38afac5606e8153b8f6811d SHA512 4ea80e1831b646d4ed64e617c781eff67425070e6a2508e94ba624cc00d0fa990097d9b7f91ffdeb319c70ebfbb8a8498daf68b134697205349aafcc8119a103 WHIRLPOOL d4b51a979efc2fc295277fc57408432dc37eaf9abf782cd9300f4086f5f61cc8872d4b05f7e4d277bedcebaa76e8d0b1565b7c3cd327eb515808bd7fab41d789 +MISC ChangeLog 12791 SHA256 b9130f6f8486761661e623b0157ed863e4444b74ccd5494fec36b4f880da2cf1 SHA512 59386c87b2c5419bd4223e8b7c3daa0393ca7d5ca128dc4d6e0145a71d37d8425e978e1ce56484468b4b6edd521c73f07f432d956fe9aad5608e3debc1ef1d31 WHIRLPOOL 32fa0c64e621ab3539979c78c19d64c6b4c2278eb2abdc4adf1396d72fb155efa92b94073af28fc9f6960b869c4461eb86fe7d2011cca5c1299472afb84d5fda MISC metadata.xml 1654 SHA256 af46ada2956a7b0ebccf1ccbb85508b2b7eb32068726e5a38c1438fe250568e7 SHA512 905f7624bc6125adc1b0d99ec02b3fb879643e053e2d7d459ed74b9fbfb82166a4f621afa51354d9baaef78d03ea1e1c279aea66e5bb8086bcfdd7b4bc2344c7 WHIRLPOOL 3ff4381e5f7f4ef5b478574a8a90b906a8be352b5336912ab106bb9c215afc13ac3517c22cfcc7796840cbf5ac8a184014915e25629320f2f307adc8747f5aaf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQUjXEAAoJEOSiRoyO7jvoHbAP/jFnod1kC1PFnVHGXQC0BF81 -jsWV2l1Vu5rv6c8wrzm/HttVJF1JMlvOhlClHkSCrYKnuwuHD+bSrHsi6MAlnQhy -7Hr6EMn81mXeKCf2zQj/AmRlkDgKYNCQZaWCsIMLicDwGL7LFwztEzbrbhr5qFJa -pIyCiMaQnzCUQJTbG0kcGTlSyE+BqddrxAryk/ONZsXiHF/dTOXbKLrznxKra3ve -n+YIqTRp85r8thw6yWPhHBsAt7oGuHSHhxilnlKpwLTX1cWanv3Cz7s52H57ytm3 -affhj6kzl97wnt4eJuHNJlvmLvX83mqqnJG5RJnL9i4U3J2yTsIcHvOofhrc6YRm -sn4/BTJ00xGtK4a+JexjXRQlyth9viMR8A/6liwzgDrYYNBnVItGwSJD4RGrmXKd -r2v35ErSWtpVTDheV+AAzCtFEihnSB38ZKqvzfk06PeiKCPsfDPgo/PzcZimGq9u -5XVuIrn9O0DnKmLDDNfte0WQnmuzjiLaFcN2daf/Pb8JdGgvt7TZAw6La2RecPMo -SC6pxNpySWmcFJD8m647OqZgdGejEPqiOqHbl+3Y6jZvyNSLpAn+alWbOwAb6yzr -3ogs9TBkbDAbGqNoXW8RoAmFuIbd1MXuCLOa7Zq4XjoonzApf00kDuFCusQI3cUR -5EqxRB6rtd2eRJYs74sA -=Ksbs +iQEcBAEBCAAGBQJQWJggAAoJEO+t9ga+3I3aEZwIAJ2+Nx7KJBga+boQfx10aRUq +GdnAZ/Zt5ImsPn2BFA6kuOQt8YOr7Vrn8ICgvS0DjFCFGlTOKLxbOdpgDs3QZa90 +yBnj90MWaqdJH/w6Crbhzg7hTTmkh92laz85Mu6rbzY5jy5W6EzzYCLyrQzwTh9y +JSJsdeAWAHUk45k/JssA+KBMIn9gf7IMThVX72v3YMIyvNABjn1zr8LgS9gEum9t +XZqlFoRE1WWHeJ/qgwpS9wv0pownYi7booIgBDpFK+4dA4IqLGIiKOMhSsEXgjXL +Fl2p7FuZ0YLo4ZnJIDc7iPO3WYZa0HLwMWNZ5c3HMgPECtLoWxnDScbifOTmYkc= +=quc5 -----END PGP SIGNATURE----- diff --git a/app-office/calligra/calligra-2.5.2.ebuild b/app-office/calligra/calligra-2.5.2.ebuild index 1a481c85db4d..d08f16a24bca 100644 --- a/app-office/calligra/calligra-2.5.2.ebuild +++ b/app-office/calligra/calligra-2.5.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.2.ebuild,v 1.3 2012/09/13 19:36:29 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.2.ebuild,v 1.4 2012/09/18 15:49:42 johu Exp $ # note: files that need to be checked for dependencies etc: # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt @@ -138,6 +138,8 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}" RESTRICT=test # bug 394273 +PATCHES=( "${FILESDIR}/${PN}-2.5.2-lcms24.patch" ) + src_configure() { local cal_ft diff --git a/app-office/calligra/files/calligra-2.5.2-lcms24.patch b/app-office/calligra/files/calligra-2.5.2-lcms24.patch new file mode 100644 index 000000000000..354f231d8b80 --- /dev/null +++ b/app-office/calligra/files/calligra-2.5.2-lcms24.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h b/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h +index 8250ea5..62c777f 100644 +--- a/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h ++++ b/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h +@@ -23,6 +23,8 @@ + #include <LcmsColorSpace.h> + #include <KoColorSpaceTraits.h> + ++#define TYPE_XYZA_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_XYZ)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4)) ++ + #include <KoColorModelStandardIds.h> + + class XyzF32ColorSpace : public LcmsColorSpace<KoXyzF32Traits> |