From: Caleb Tennis Date: Tue, 24 Apr 2007 17:01:42 +0000 (+0000) Subject: bump for utf8 encoding error from bug #174678 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a741011a929dbe8da9485fd2f15a0efb1dd2d4b1;p=gentoo.git bump for utf8 encoding error from bug #174678 Package-Manager: portage-2.1.2.4 --- diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog index 2e52e4fee399..22c2f391e10f 100644 --- a/kde-base/kdepim/ChangeLog +++ b/kde-base/kdepim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdepim # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.259 2007/04/24 10:55:07 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.260 2007/04/24 17:01:42 caleb Exp $ + +*kdepim-3.5.6-r3 (24 Apr 2007) + + 24 Apr 2007; Caleb Tennis +files/kmail-utf8.diff, + +kdepim-3.5.6-r3.ebuild: + bump for utf8 encoding error from bug #174678 24 Apr 2007; Bryan Østergaard kdepim-3.5.5-r3.ebuild: Stable on Alpha, bug 174216. diff --git a/kde-base/kdepim/files/digest-kdepim-3.5.6-r3 b/kde-base/kdepim/files/digest-kdepim-3.5.6-r3 new file mode 100644 index 000000000000..e27a0017b6a2 --- /dev/null +++ b/kde-base/kdepim/files/digest-kdepim-3.5.6-r3 @@ -0,0 +1,6 @@ +MD5 48f1592b07f784df47280baa0c8356b0 kdepim-3.5-patchset-03.tar.bz2 121475 +RMD160 e8aa4e812a3be3d4e13429d487e1e4d466e058b1 kdepim-3.5-patchset-03.tar.bz2 121475 +SHA256 30d4e8d7ac4e11f1a8209bbcb5b39beb044998d4b0d3fa810743a017b38b904b kdepim-3.5-patchset-03.tar.bz2 121475 +MD5 e37e6173fe9fd7f242c9502a4ae1d7de kdepim-3.5.6.tar.bz2 13643798 +RMD160 85f64349d8eedb531895a3591f6fee07c68bf1eb kdepim-3.5.6.tar.bz2 13643798 +SHA256 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55 kdepim-3.5.6.tar.bz2 13643798 diff --git a/kde-base/kdepim/files/kmail-utf8.diff b/kde-base/kdepim/files/kmail-utf8.diff new file mode 100644 index 000000000000..89b2346b9dd5 --- /dev/null +++ b/kde-base/kdepim/files/kmail-utf8.diff @@ -0,0 +1,15 @@ +Index: kmaccount.cpp +=================================================================== +--- kmail/kmaccount.cpp (revision 656120) ++++ kmail/kmaccount.cpp (working copy) +@@ -399,7 +399,9 @@ QString KMAccount::encryptStr(const QStr + { + QString result; + for (uint i = 0; i < aStr.length(); i++) +- result += (aStr[i].unicode() < 0x20) ? aStr[i] : ++ /* yes, no typo. can't encode ' ' or '!' because ++ they're the unicode BOM. stupid scrambling. stupid. */ ++ result += (aStr[i].unicode() <= 0x21 ) ? aStr[i] : + QChar(0x1001F - aStr[i].unicode()); + return result; + } diff --git a/kde-base/kdepim/kdepim-3.5.6-r3.ebuild b/kde-base/kdepim/kdepim-3.5.6-r3.ebuild new file mode 100644 index 000000000000..eeb3741c899c --- /dev/null +++ b/kde-base/kdepim/kdepim-3.5.6-r3.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.6-r3.ebuild,v 1.1 2007/04/24 17:01:42 caleb Exp $ + +inherit kde-dist + +SRC_URI="${SRC_URI} + mirror://gentoo/kdepim-3.5-patchset-03.tar.bz2" + +DESCRIPTION="KDE PIM (Personal Information Management) applications: KOrganizer, KMail, KNode,..." + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="crypt gnokii" + +# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises. +DEPEND="~kde-base/kdebase-${PV} + >=dev-libs/cyrus-sasl-2 + gnokii? ( app-mobilephone/gnokii ) + crypt? ( >=app-crypt/gpgme-1.1.2-r1 + || ( >=app-crypt/gnupg-2.0.1-r1 =app-pda/pilot-link-0.12.0 dev-libs/libmal ) + +RDEPEND="${DEPEND} + crypt? ( app-crypt/pinentry )" + +DEPEND="${DEPEND} + x11-proto/scrnsaverproto" + +PATCHES="${FILESDIR}/kmail-utf8.diff" + +src_unpack() { + kde_src_unpack + # Call Qt 3 designer + sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" "${S}"/libkdepim/kcmdesignerfields.cpp || die "sed failed" + + # disabling tests, see bug #164038 and bug #164097 + sed -e "s:SUBDIRS = libical versit tests:SUBDIRS = libical versit:" \ + -i libkcal/Makefile.am || die "sed failed" || die "sed failed" + sed -e "s:SUBDIRS = . plugins test:SUBDIRS = . plugins:" \ + -i kitchensync/libkonnector2/Makefile.am || die "sed failed" + sed -e "s:SUBDIRS = . tests test:SUBDIRS = .:" \ + -i kitchensync/libksync/Makefile.am || die "sed failed" +} + +src_compile() { + local myconf="--with-sasl $(use_with gnokii)" + use crypt && myconf="${myconf} --with-gpg=/usr/bin/gpg" + + # use pda || DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot" + DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot" + + kde_src_compile +}