From 6a97a00db5f4857128d4f77db4175463c7110c10 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Thu, 15 Sep 2011 11:27:39 +0000 Subject: [PATCH] Version bump to the latest beta. Drop alpha. Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64 --- app-office/calligra/ChangeLog | 10 ++++- app-office/calligra/Manifest | 41 +++++++++---------- ...a-2.3.74.ebuild => calligra-2.3.81.ebuild} | 7 +--- app-office/calligra/calligra-9999.ebuild | 3 +- .../files/calligra-2.3.74-jpeglcms-2.patch | 14 +++++-- .../files/calligra-2.3.74-jpeglcms.patch | 26 ------------ 6 files changed, 43 insertions(+), 58 deletions(-) rename app-office/calligra/{calligra-2.3.74.ebuild => calligra-2.3.81.ebuild} (97%) delete mode 100644 app-office/calligra/files/calligra-2.3.74-jpeglcms.patch diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog index 3afb4c15ae0e..d299442ae9a9 100644 --- a/app-office/calligra/ChangeLog +++ b/app-office/calligra/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-office/calligra # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.8 2011/08/26 20:53:46 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.9 2011/09/15 11:27:39 scarabeus Exp $ + +*calligra-2.3.81 (15 Sep 2011) + + 15 Sep 2011; Tomáš Chvátal -calligra-2.3.74.ebuild, + -files/calligra-2.3.74-jpeglcms.patch, + files/calligra-2.3.74-jpeglcms-2.patch, +calligra-2.3.81.ebuild, + calligra-9999.ebuild: + Version bump to the latest beta. Drop alpha. *calligra-9999 (26 Aug 2011) diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 081d0d654d4d..697eeaa63985 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,27 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 -AUX calligra-2.3.74-jpeglcms-2.patch 1014 RMD160 cd9532d322789aa655448fb89ffed5835d4e24ae SHA1 fd6770d6b88c360e6a5d0426d6ae0c1f19614720 SHA256 f4593796592cc5973685b1a9b25ca1e4f20b3ed3a64043582324eaa89b301de2 -AUX calligra-2.3.74-jpeglcms.patch 723 RMD160 07b5d22e1e2e27dd658c7ec8e10e093e11108f17 SHA1 11cae52b535f8d665ae48d8fa32aa35f7e745ecc SHA256 5cfcb207b7d963fd3c593b5c43bff5774238c69da7a95df20aadd017fa7b6cc1 -DIST calligra-2.3.74.tar.bz2 105902759 RMD160 95154039344ac07ec75323821afff8d2e60159ed SHA1 b1ac9f3036f5d52aacd7a9caaa168f7ef5eae8dc SHA256 686a8f5f7eac49c40c53cbdb8cfbb102e765790dd0cfe2d1843975c55921e447 -EBUILD calligra-2.3.74.ebuild 5626 RMD160 e2d99aea615eab8c0baa2a019d15c4c663703c99 SHA1 878736ee9745290fdcf87634461bee10a0cdc48f SHA256 6b21cf35ae71a67adf795c598006af10ace2305f510414ba50e7d675808543a8 -EBUILD calligra-9999.ebuild 5624 RMD160 e2d7697ce8f356dc204303f7f7e67296d1e728f4 SHA1 0676ad1c30b9bd7aa5dca7b64c170421f374e01d SHA256 613753b56ca5350272a374620bf67de410c3060f9f8b1f79ec53071e836d0fc7 -MISC ChangeLog 1534 RMD160 ac7331168522ca15249a9806336f6836c3ecf7ee SHA1 aebf062dab349579b5b07dd6a7d34bf80290b6d3 SHA256 73fb7e3293e2df6c5c8040ea1313ec4ed034c0ba5b0c4b88bc7d76e283fe1014 +AUX calligra-2.3.74-jpeglcms-2.patch 1363 RMD160 f30b29b5306a52838dd0bee7a58516ad63073736 SHA1 3832378d50ad2dc916354ed048e13cd686394844 SHA256 26a2287f414b4562b848c4f26430aebd89d199310d4ef5c8d2f8e7ef415e62ed +DIST calligra-2.3.81.tar.bz2 106703668 RMD160 6f1b272f6145cf7a8a42739ed41c684e28b0cdce SHA1 a5a6a15c1fc65d1076e3eb0b10a99ea0547f183d SHA256 accb7d0466037be9c58e24a397b75243e1ee83ce6621a2cbe1a8e197fd67a4b1 +EBUILD calligra-2.3.81.ebuild 5571 RMD160 a9573b992b774f4f01c8fc68158682773405d06a SHA1 af93c9b8e0b5d768770708433d946be724ed29d5 SHA256 44fd03595eac5e8ffbd9e0b181f60c8944549ed5925dd78c9fd710425eb3ca3b +EBUILD calligra-9999.ebuild 5581 RMD160 040dec9bc505c2224312fd4e459184dcdb3ead75 SHA1 d4115b22c834f06a1fcf0a2e6d4e8e52481f4295 SHA256 9be9764ecdd8c6ead2b4bc3a03ef7d52a88f362b996028a82dbed7899f48aadf +MISC ChangeLog 1826 RMD160 c0242c261a03e89b1b43e64e7f46bb009822bb57 SHA1 e3342d087210533ab0868d90f3ea3cf4b48d2c00 SHA256 c616908737fbbad2326d23bdcce1293a39cc1abc22f3ad71ea2090fa36f781c1 MISC metadata.xml 1413 RMD160 9e5d04607a8a3f6af1d9a4daa3a224d8baa6b772 SHA1 6db8d64d20d9af877e625e630e3a437651bee3a3 SHA256 5a28be7ce31d48f02f258becf5ebded580b0cf387bf353eb24ce2fccc5746659 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJOWAfuAAoJENwGBM22xffeEKcP/RTYD2CeEndks8jC3sDc5Mge -/vnKnwL8BypyMG2aox74gXDPlKzt1QCdRwCaVAXT67y7+vGE1MtMgU4bLZRKQmVD -MwxuJpzO3brbmOBy3ostyG7hpoWWK0v7HTkMJPh61UjkAQp1L6aL5H+Py+4jZq+X -MIuKeV8NbO7br41fJfwzBi6woHYCRPC7IkFKcv8X8Oh7gVfKNfVOiPn6O/knPfng -NCTnoeLJNPt93QGRg75H4HCTkVG6TY8RY6IYmaD8xxGaqArmQggZHKhUk3QUXw5w -RBATo1PqZJ+2Aaa87X2J1XTie0X/MfyHs0hs918dmvLBqplhhuZy7y9ZkXHUbCgw -VsknS+ZslN7CkTN1hn4Cz22efn4ts27j27EnbJtqAu10DD9Q19wp3Vbqf3mIorNh -aqUkXzdmDX4CgeDJQNcSOrcvALWKlgiOmqerV8LctmYO10Gf1zjEbQdDd7HKStZv -WNHPvI0d2IxLgJYHy5TJx+sVpnQlNojbAfYfYOTzuYTpa6InChctPMOAxhvr6NvM -yCkNk3R14TjLP5rZrzCq/frhFwry51Q3b2s25uGFdYggL/prA/1UEFe45/3lv7Te -66+JQ1/TvTouCqEv4uuas7vy7sO/VrtIP/tUy9kfECL+1qFPxqAV8DUUJXLQP8GT -4rmOeL3fzWc5wK2Aoqm/ -=oRgz +iQIcBAEBAgAGBQJOceFFAAoJEOSiRoyO7jvo1/kQAKrutaIrJNhFv6YROpq/Q4IQ +/+f+uu0iRb6pr9awxPx/li27CnX6raHHHSwZL0hrELADc1HeJXybc1HyxjOko665 +bjprZ+CArKr6I6165ncYL4trcH5yd5a0Weh3Y3hQJgLp+vLB1MfG6MeVdKo/htOT +p+FMVUjicpQSuUbvIJbdjmUoHZvSy1i8Bbw0tZ6hGaDdT7OsRRXHvSi1+fdCgcvw +CNJk2A2ihWgh4IfQmuzjZX7rufFCmh6Q2+8pIq6ADl7bBw42lQNG9QjGs1x9BIM9 +gOOLh0IbDmVgWd1OT520Y4OwR0WKAns5Zzjyuegt09NgeJWWNl2jW5yy7Yab1Rj+ +N9DAo0xXyAL6Kal1Ia0ze7q1CYqBXaoS77R+JxznC5MKPS+QePz4UnPbaxXZcuvA +Wx+sVOduu5SDIAP8VVk9aIoEuP4FH6oZXA3oY+5wSakneMTKrkrgAeQeRx/zDXWo +X0K/aGUz/YHg2mp60TIBGOiegnZXd6Ix29FQejLwUzqSrXC4ATGF5W9GRtQS5m5G +aJPmM3YS/8B14QfsYmYDZU4pX8zzc4Z1AgSv6LKBzZ8HHS+QRIbTYJf6S9VLfwKF +4jzSKnbDwuVKgHrAhDrU9WDvhlH3hKyUuTxQU+UQkW9osuO6UZXae+QqQR3l/cXQ +ZctyTLqRigq8Ba7adYvD +=S4Wi -----END PGP SIGNATURE----- diff --git a/app-office/calligra/calligra-2.3.74.ebuild b/app-office/calligra/calligra-2.3.81.ebuild similarity index 97% rename from app-office/calligra/calligra-2.3.74.ebuild rename to app-office/calligra/calligra-2.3.81.ebuild index 23ca37ec4b27..f19f04de52ca 100644 --- a/app-office/calligra/calligra-2.3.74.ebuild +++ b/app-office/calligra/calligra-2.3.81.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.74.ebuild,v 1.5 2011/08/26 20:46:55 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.81.ebuild,v 1.1 2011/09/15 11:27:39 scarabeus Exp $ # note: files that need to be checked for dependencies etc: # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt @@ -9,7 +9,7 @@ EAPI=4 KDE_SCM=git -KDE_MINIMAL=4.6.4 +KDE_MINIMAL=4.7.0 OPENGL_REQUIRED=optional KDE_HANDBOOK=optional KDE_LINGUAS_LIVE_OVERRIDE=true @@ -107,7 +107,6 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${PN}-2.3.74-jpeglcms.patch" "${FILESDIR}/${PN}-2.3.74-jpeglcms-2.patch" ) @@ -186,7 +185,5 @@ src_configure() { done mycmakeargs+=( $(cmake-utils_use_build test cstester) ) - # filters - kde4-base_src_configure } diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index 5a80563596df..2c9729165c51 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.1 2011/08/26 20:53:46 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.2 2011/09/15 11:27:39 scarabeus Exp $ # note: files that need to be checked for dependencies etc: # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt @@ -107,7 +107,6 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${PN}-2.3.74-jpeglcms.patch" "${FILESDIR}/${PN}-2.3.74-jpeglcms-2.patch" ) diff --git a/app-office/calligra/files/calligra-2.3.74-jpeglcms-2.patch b/app-office/calligra/files/calligra-2.3.74-jpeglcms-2.patch index 986139fcb2ed..d58c0834baa9 100644 --- a/app-office/calligra/files/calligra-2.3.74-jpeglcms-2.patch +++ b/app-office/calligra/files/calligra-2.3.74-jpeglcms-2.patch @@ -1,6 +1,14 @@ -diff -ruN calligra-2.3.74.orig/krita/plugins/formats/jpeg/CMakeLists.txt calligra-2.3.74/krita/plugins/formats/jpeg/CMakeLists.txt ---- calligra-2.3.74.orig/krita/plugins/formats/jpeg/CMakeLists.txt 2011-08-12 15:51:32.000000000 +0200 -+++ calligra-2.3.74/krita/plugins/formats/jpeg/CMakeLists.txt 2011-08-19 23:41:02.000000000 +0200 +diff -urN calligra-2.3.81.old/krita/plugins/formats/jpeg/CMakeLists.txt calligra-2.3.81/krita/plugins/formats/jpeg/CMakeLists.txt +--- calligra-2.3.81.old/krita/plugins/formats/jpeg/CMakeLists.txt 2011-09-15 13:13:23.521381587 +0200 ++++ calligra-2.3.81/krita/plugins/formats/jpeg/CMakeLists.txt 2011-09-15 13:13:51.571381250 +0200 +@@ -1,6 +1,6 @@ + add_subdirectory(tests) + +-include_directories( ${KRITA_INCLUDES} ${LCMS_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/krita/image/metadata ${EXIV2_INCLUDE_DIR}) ++include_directories( ${KRITA_INCLUDES} ${LCMS2_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/krita/image/metadata ${EXIV2_INCLUDE_DIR}) + + set(libkritaconverter_LIB_SRCS + kis_jpeg_converter.cc @@ -16,7 +16,7 @@ kde4_add_plugin(kritajpegimport ${kritajpegimport_PART_SRCS}) diff --git a/app-office/calligra/files/calligra-2.3.74-jpeglcms.patch b/app-office/calligra/files/calligra-2.3.74-jpeglcms.patch deleted file mode 100644 index 2f9810b5456c..000000000000 --- a/app-office/calligra/files/calligra-2.3.74-jpeglcms.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Boudewijn Rempt -Date: Tue, 16 Aug 2011 15:50:16 +0000 -Subject: Allow jpeg filter to build with both versions of lcms -X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=0b4a019f25a7098c8899d3920db2e1901833aaf7 ---- -Allow jpeg filter to build with both versions of lcms - -Use HAVE_LCMS, not LCMS_FOUND. ---- - - ---- a/krita/plugins/formats/CMakeLists.txt -+++ b/krita/plugins/formats/CMakeLists.txt -@@ -31,9 +31,9 @@ if(KDCRAW_FOUND) - add_subdirectory( raw ) - endif(KDCRAW_FOUND) - --if(JPEG_FOUND AND LCMS_FOUND) -+if(JPEG_FOUND AND HAVE_LCMS) - add_subdirectory(jpeg) --endif(JPEG_FOUND AND LCMS_FOUND) -+endif(JPEG_FOUND AND HAVE_LCMS) - - if(TIFF_FOUND) - add_subdirectory(tiff) - -- 2.26.2