From 725e38f783f8d0f20513566734a1440a9f0752ec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Thu, 15 Dec 2011 23:59:19 +0000 Subject: [PATCH] Fix imap4 protocol regression, bug 382411. Yeah! Thanks to Luke-Jr! Package-Manager: portage-2.1.10.40/cvs/Linux x86_64 --- kde-base/kdepimlibs/ChangeLog | 8 +- kde-base/kdepimlibs/Manifest | 32 ++++---- .../files/kdepimlibs-4.7.4-size.patch | 13 ++++ .../kdepimlibs/kdepimlibs-4.7.4-r1.ebuild | 73 +++++++++++++++++++ 4 files changed, 110 insertions(+), 16 deletions(-) create mode 100644 kde-base/kdepimlibs/files/kdepimlibs-4.7.4-size.patch create mode 100644 kde-base/kdepimlibs/kdepimlibs-4.7.4-r1.ebuild diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog index 244c669784b4..1b51ff6af646 100644 --- a/kde-base/kdepimlibs/ChangeLog +++ b/kde-base/kdepimlibs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdepimlibs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.120 2011/12/12 01:09:42 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.121 2011/12/15 23:59:19 dilfridge Exp $ + +*kdepimlibs-4.7.4-r1 (15 Dec 2011) + + 15 Dec 2011; Andreas K. Huettel + +kdepimlibs-4.7.4-r1.ebuild, +files/kdepimlibs-4.7.4-size.patch: + Fix imap4 protocol regression, bug 382411. Yeah! Thanks to Luke-Jr! 12 Dec 2011; Jonathan Callen -files/kdepimlibs-4.6.2-encoding.patch: diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest index 4c0345dd7803..062cc33ed65e 100644 --- a/kde-base/kdepimlibs/Manifest +++ b/kde-base/kdepimlibs/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 +AUX kdepimlibs-4.7.4-size.patch 717 RMD160 47beaf96f15a084028dff875dba793bd6a36e338 SHA1 2995e1feb6ba2f1f9ed2ae85c16139bee19b0382 SHA256 0fcebe538099809e0ae336af6b153d774fec7767769dd952d892981f03c6fed5 DIST kdepimlibs-4.6.3.tar.bz2 3202266 RMD160 3e1298c358f82690351d849f977ea6a4464b9dde SHA1 370b4e98ab9e1f8ba18d36630d5c8bbff8da4883 SHA256 abac2ce510f16f0614be6bb07e11f979f427981f17ab674951510c83ea72b95d DIST kdepimlibs-4.6.5.tar.bz2 3201672 RMD160 fb3943a0d6c477cd48bf39c3a339c208656475ab SHA1 6bf82a0934d5a16223f193e848bf3696a40e4820 SHA256 f2033feac905a6bcd64060653e8d0d2f8ac28ba8039562ec1b2fad7c708a4477 DIST kdepimlibs-4.7.3.tar.bz2 3233484 RMD160 468d972ea73499c6cca6c10fdb3b6e84cee9aedf SHA1 b95822a3e38587744174308b629336cd3d0444f4 SHA256 11bec0a8d404bab11e0dd54d2c4e007812f675b85b3d9471a82abfcfb4925b87 @@ -8,23 +9,24 @@ DIST kdepimlibs-4.7.4.tar.bz2 3236435 RMD160 d7b879a4a24f1878f36d9b9418464b55cbc EBUILD kdepimlibs-4.6.3.ebuild 2168 RMD160 720422fcbf74ce80de9520dcde15d90312f6ac3c SHA1 b1a47bd45ca0bd1a485bda11c16891c803027a19 SHA256 8cf38ebb729b42a5b2185f62997f6b91f964684c0065a6a9cd7d48884ef035fb EBUILD kdepimlibs-4.6.5.ebuild 2169 RMD160 4c2c48cd56bf7234c9cb3e9536694e3d8f36dc38 SHA1 89d00bef83b75464774e811380135ee269acbe29 SHA256 46b9af85c625d6690b4057977b788439585acf0f65994321e2bae0a40a2132c6 EBUILD kdepimlibs-4.7.3.ebuild 2025 RMD160 85e0a1f7dfed279948593ca0bebd683028ecab58 SHA1 a2645ad1873fd9223137985b39ce9fb1384a56ec SHA256 ec1a4170475860f9d77888dd276ff83a5f9b86384598a1f2f5cf34a90d2bb336 +EBUILD kdepimlibs-4.7.4-r1.ebuild 2082 RMD160 f25420bc578d3edda5a11e1d2b37703b1eab3cdd SHA1 e4e0b831a58818e670db9571e59f0cd19938b5fe SHA256 8e995275869c7d859ea9af7f87a54e99c9e9cc3d66e2015318bf3e7c126f2af2 EBUILD kdepimlibs-4.7.4.ebuild 2025 RMD160 6fab03bd3ca9138242ce2992bf08dac2c4df4c2b SHA1 a48e64fe8b03a71c7f7c9608802e410a00fdf31c SHA256 bb79aec9df6bc1561a5ca0b790b5117ff923355ee4bdc0f41e14bbfee8dc4f8f -MISC ChangeLog 15458 RMD160 9a34eb4025f7b29d5f7a0b14028422062e876101 SHA1 2ebdc26224988e119edbbb94a5dc1ce2583228f0 SHA256 c23c8136ce47b3002a2e44d133177b5aadd96b719afb68e3867419bd8cb65301 +MISC ChangeLog 15694 RMD160 4374e5f1c816e9b28e83b304f285cb92b2d408c2 SHA1 09a8f391fe2b46a3c85365e7fcf8257406cf06ed SHA256 d490e1bff45c08b217da491f65c7bf97c5942af5c1e90cace018e0724809e1d1 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJO5VRcAAoJELHSF2kinlg4T5YP/0zi+7ijFprmoerAh6yTieVc -v8iz2BCUQ64Lhjfrvsr8NKMfRC/O7X54PRJTYgo3EFNZljZvaFGw2qEDTGO+eJAT -fTb8ZoM4Py+dto62IOwGl3z7RuE3yzs2e54qpEaVPxcfxU4TpcpkjgN/Ela/pCPC -SRLe4tJKH/VyrM0qy/4H/fZwRDFi+0LOz2SVPW36Eu0J9cKaIqZL8ERzDttyAESy -v9KVuSBqBuigZfw7pKIhVh9tLIQ7WflzxdYZ9lZDkFjVOAWgqNatCyBq+tIMOVk6 -A6QbKGk0WWnjRGoV2IuQtJlQkcQ/C/1Fr/Zx61Uk/vzxYDX7+C8e8g6ZprkmlbZl -7mfz/Ji5aF1jmPQrmDBLvi+HTFKqXax0sBO/yRCdeTeluT6a1qOk0SNe1IlUhR5N -Cnt8y1tQ+eEH0ZUUPekfwS+a/ZUk5HeFYKJtkGuC0Ru7khl1D8neD6CmDO2W68c8 -j3K6nY0or1rneUvoNY+4JQP0B+uVgVjetyDgum3+i6S2jHI5OLIo50ClOhb/PbPh -e5An8nl//T8Gmus0PV0ek1STmo71vI9rBV7UwxHjrVG+/mF/wRrmz3dJwY3QFR2S -5o543xYBPJtqmIoJ/tjOV9xr62dGi7QdgnEgKHvaZv6tW0atHZHsOfklNh9TY2gT -8FbhXqMauBV8x6B+2JnQ -=W6sG +iQIcBAEBCgAGBQJO6onnAAoJENwGBM22xffey9cP/Ah9DqU6drDkguK1coo5pPhs +mCYCJO834N3zPlJ9TQQoKSr+R+3yUyW6v3eX8zcpSL9h7lwEz7I7UffxKSc1hwp5 +OyxmKvSHeq8EUj0DBXKvt1qCdf1H9hpimfPCnd8X4ykpquOEtInSF0cS5vDeLKJb +NYwf+hNhLFADUi6eQL/V4vkW4qtT4XuNtlqU/vMJaIH0OSTn+CXrfZlduBXRibds +pDtPzNqaXLWEn968xobRXJT+YMcb6MCEMm8iwvpfbn06uW+Dc8U2XexueHstBW9I +eK/yCcSkzo5L4EBr8VyuPc0DE91ILIoV9j5Fdi5jD4aN7+ol2zT4g7Ts+noG09T8 +a+ErMBoQlNPr3BnAC3m42OXdC72yv4lzQ+y3JJTdV5EMZf1AOCCygFYCQX1LJUgW +eLHltrqkc/QncTVsc8D3ZA4OJpwHUvTR9u1DEXqKKaqGZmpMxZN2auswYq4i0Ue2 +L69BpJ2wCsj6H2TnwyuDKUR6zSDA+8xKmM6eU7g8o+VJ+NYTDf3br2EMffIpxJBl +CLVL4zTfC5WoeQ0LYI9O7a+DVe1BE9fpW71O6VETJobZirgJthCXRY5NvpVdaAQQ +A6E6FdjVS7Ybn/ugn79reFZ4YDAp0r4XClKq32qGNZlEJE5Fij1jp/zj6/x1nAF+ +Xq4Ph2Q8BsG1p+XZH7UJ +=5IoA -----END PGP SIGNATURE----- diff --git a/kde-base/kdepimlibs/files/kdepimlibs-4.7.4-size.patch b/kde-base/kdepimlibs/files/kdepimlibs-4.7.4-size.patch new file mode 100644 index 000000000000..ec5630d0eecf --- /dev/null +++ b/kde-base/kdepimlibs/files/kdepimlibs-4.7.4-size.patch @@ -0,0 +1,13 @@ +diff --git a/kioslave/imap4/imapcommand.cpp b/kioslave/imap4/imapcommand.cpp +index 43daccd..8256570 100644 +--- a/kioslave/imap4/imapcommand.cpp ++++ b/kioslave/imap4/imapcommand.cpp +@@ -231,7 +231,7 @@ CommandPtr + imapCommand::clientAppend (const QString & box, const QString & flags, + ulong size) + { +- QString tmp = QString(flags.isEmpty() ? QString("") : QString(('(' + flags + ") ")) + '{' + QString::number(size) + '}'); ++ QString tmp = QString((flags.isEmpty() ? QString("") : QString(('(' + flags + ") "))) + '{' + QString::number(size) + '}'); + return CommandPtr( new imapCommand ("APPEND", + "\"" + KIMAP::encodeImapFolderName (box) + "\" " + tmp)); + } diff --git a/kde-base/kdepimlibs/kdepimlibs-4.7.4-r1.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.7.4-r1.ebuild new file mode 100644 index 000000000000..2251add8932e --- /dev/null +++ b/kde-base/kdepimlibs/kdepimlibs-4.7.4-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.7.4-r1.ebuild,v 1.1 2011/12/15 23:59:19 dilfridge Exp $ + +EAPI=4 + +KDE_HANDBOOK="optional" +CPPUNIT_REQUIRED="optional" +KDE_SCM="git" +inherit kde4-base + +DESCRIPTION="Common library for KDE PIM apps." +HOMEPAGE="http://www.kde.org/" + +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +LICENSE="LGPL-2.1" +IUSE="debug ldap semantic-desktop" + +# some akonadi tests timeout, that probaly needs more work as its ~700 tests +RESTRICT="test" + +COMMON_DEPEND=" + >=app-crypt/gpgme-1.1.6 + dev-libs/libgpg-error + >=dev-libs/libical-0.43 + dev-libs/cyrus-sasl + $(add_kdebase_dep kdelibs 'semantic-desktop=') + semantic-desktop? ( + >=app-office/akonadi-server-1.5.80 + media-libs/phonon + x11-misc/shared-mime-info + ) + ldap? ( net-nds/openldap ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.35.0-r5 +" +RDEPEND="${COMMON_DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-4.7.4-size.patch" +) + +src_prepare() { + kde4-base_src_prepare + + # Disable hardcoded checks + sed -r -e '/find_package\((Akonadi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \ + -e '/macro_log_feature\((Akonadi|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \ + -e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \ + -i CMakeLists.txt || die + if ! use semantic-desktop; then + sed -e '/include(SopranoAddOntology)/s/^/#DISABLED /' \ + -i CMakeLists.txt || die + # More reliable than -DBUILD_akonadi=OFF + rm -r akonadi mailtransport || die + fi +} + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_build handbook doc) + $(cmake-utils_use_with ldap) + $(cmake-utils_use_with semantic-desktop Akonadi) + $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) + $(cmake-utils_use_with semantic-desktop Soprano) + $(cmake-utils_use_with semantic-desktop Nepomuk) + # $(cmake-utils_use_with prison) + -DWITH_Prison=NO + ) + + kde4-base_src_configure +} -- 2.26.2