Backport upstream fix for KLocale

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 460 insertions, 1 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 5ed8cd8d7a66..2aeb0ae9e718 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.823 2012/01/29 01:27:40 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.824 2012/01/30 22:47:31 dilfridge Exp $
+
+*kdelibs-4.7.4-r12 (30 Jan 2012)
+
+  30 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdelibs-4.7.4-r12.ebuild, +files/kdelibs-4.7.4-klocale.patch:
+  Backport upstream fix for KLocale
 
   29 Jan 2012; Johannes Huber <johu@gentoo.org> -kdelibs-4.8.0.ebuild:
   Remove old.
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.4-klocale.patch b/kde-base/kdelibs/files/kdelibs-4.7.4-klocale.patch
new file mode 100644
index 000000000000..4045279bedda
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.7.4-klocale.patch
@@ -0,0 +1,136 @@
+From 2993b24bc21a340695ad35b4f014a684f4d0c651 Mon Sep 17 00:00:00 2001
+From: John Layt <jlayt@kde.org>
+Date: Sat, 17 Dec 2011 16:27:51 +0000
+Subject: [PATCH] KLocale: Fix readNumber() and readMoney() for lenient group parsing
+
+Restore the old pre-4.7 behaviour of accepting as valid any numbers
+that do not contain any group separators but strictly enforce group
+rules when the number contains 1 or more group separators.
+
+Distro's will really want to backport this fix to all versions of 4.7
+as previously number entry for all KDE apps would have been seriously
+broken.
+
+I'm amazed I wasn't beaten up for this earlier!
+
+BUG: 288963
+FIXED-IN: 4.7.5
+CCMAIL: kde-packager@kde.org
+---
+ kdecore/localization/klocale_kde.cpp |   10 ++++++++--
+ kdecore/tests/klocaletest.cpp        |   34 +++++++++++++++++++++++++++++-----
+ 2 files changed, 37 insertions(+), 7 deletions(-)
+
+diff --git a/kdecore/localization/klocale_kde.cpp b/kdecore/localization/klocale_kde.cpp
+index 6cf85f9..6690f4a 100644
+--- a/kdecore/localization/klocale_kde.cpp
++++ b/kdecore/localization/klocale_kde.cpp
+@@ -1894,7 +1894,10 @@ double KLocalePrivate::readNumber(const QString &_str, bool * ok) const
+ 
+     // Remove group separators
+     bool groupOk = true;
+-    str = parseDigitGroup(str, thousandsSeparator(), decimalSymbol(), numericDigitGrouping(), &groupOk);
++    if(str.contains(thousandsSeparator())) {
++        str = parseDigitGroup(str, thousandsSeparator(), decimalSymbol(),
++                              numericDigitGrouping(), &groupOk);
++    }
+ 
+     if (!groupOk) {
+         if (ok) {
+@@ -2013,7 +2016,10 @@ double KLocalePrivate::readMoney(const QString &_str, bool *ok) const
+ 
+     // Remove group separators
+     bool groupOk = true;
+-    str = parseDigitGroup(str, monetaryThousandsSeparator(), monetaryDecimalSymbol(), monetaryDigitGrouping(), &groupOk);
++    if(str.contains(monetaryThousandsSeparator())) {
++        str = parseDigitGroup(str, monetaryThousandsSeparator(), monetaryDecimalSymbol(),
++                              monetaryDigitGrouping(), &groupOk);
++    }
+ 
+     if (!groupOk) {
+         if (ok) {
+diff --git a/kdecore/tests/klocaletest.cpp b/kdecore/tests/klocaletest.cpp
+index 97a3bce..f80de85 100644
+--- a/kdecore/tests/klocaletest.cpp
++++ b/kdecore/tests/klocaletest.cpp
+@@ -180,9 +180,13 @@ KLocaleTest::readNumber()
+     QVERIFY(!ok);
+     QCOMPARE(locale.readNumber(QString("123,456,789.01"), &ok), 0.0);
+     QVERIFY(!ok);
+-    QCOMPARE(locale.readNumber(QString("123456789"), &ok), 0.0);
++    QCOMPARE(locale.readNumber(QString("123456789"), &ok), 123456789.0);
++    QVERIFY(ok);
++    QCOMPARE(locale.readNumber(QString("123456789.01"), &ok), 123456789.01);
++    QVERIFY(ok);
++    QCOMPARE(locale.readNumber(QString("123456,789"), &ok), 0.0);
+     QVERIFY(!ok);
+-    QCOMPARE(locale.readNumber(QString("123456789.01"), &ok), 0.0);
++    QCOMPARE(locale.readNumber(QString("123456,789.01"), &ok), 0.0);
+     QVERIFY(!ok);
+ 
+     //Test it parses correctly with an empty separator.
+@@ -204,6 +208,14 @@ KLocaleTest::readNumber()
+     QVERIFY(ok);
+     QCOMPARE(locale.readNumber(QString("123 456 789.01"), &ok), 123456789.01);
+     QVERIFY(ok);
++    QCOMPARE(locale.readNumber(QString("123456789"), &ok), 123456789.0);
++    QVERIFY(ok);
++    QCOMPARE(locale.readNumber(QString("123456789.01"), &ok), 123456789.01);
++    QVERIFY(ok);
++    QCOMPARE(locale.readNumber(QString("123456 789"), &ok), 0.0);
++    QVERIFY(!ok);
++    QCOMPARE(locale.readNumber(QString("123456 789.01"), &ok), 0.0);
++    QVERIFY(!ok);
+     QCOMPARE(locale.readNumber(QString("123,456,789"), &ok), 0.0);
+     QVERIFY(!ok);
+     QCOMPARE(locale.readNumber(QString("123,456,789.01"), &ok), 0.0);
+@@ -479,6 +491,10 @@ void KLocaleTest::readMoney()
+     QVERIFY(ok);
+     QCOMPARE(locale.readMoney("$ 987,654,321.12", &ok), 987654321.12);
+     QVERIFY(ok);
++    QCOMPARE(locale.readMoney("$ 987654321.12", &ok), 987654321.12);
++    QVERIFY(ok);
++    QCOMPARE(locale.readMoney("$ 987654,321.12", &ok), 0.0);
++    QVERIFY(!ok);
+ 
+     QCOMPARE(locale.readMoney(          "$ -1.12", &ok),         -1.12);
+     QVERIFY(ok);
+@@ -498,6 +514,10 @@ void KLocaleTest::readMoney()
+     QVERIFY(ok);
+     QCOMPARE(locale.readMoney("$ -987,654,321.12", &ok), -987654321.12);
+     QVERIFY(ok);
++    QCOMPARE(locale.readMoney("$ -987654321.12", &ok), -987654321.12);
++    QVERIFY(ok);
++    QCOMPARE(locale.readMoney("$ -987654,321.12", &ok), 0.0);
++    QVERIFY(!ok);
+ 
+     // Test incomplete formats
+     QCOMPARE(locale.readMoney(          "$ 1", &ok),         1.00);
+@@ -521,17 +541,21 @@ void KLocaleTest::readMoney()
+ 
+     // Test Grouping
+     locale.d->setMonetaryDigitGrouping(QList<int>());
+-    QCOMPARE(locale.readMoney( "$ 987654321.12", &ok),  987654321.12);
++    QCOMPARE(locale.readMoney("$ 987654321.12", &ok),  987654321.12);
+     QVERIFY(ok);
+     QCOMPARE(locale.readMoney("$ -987654321.12", &ok), -987654321.12);
+     QVERIFY(ok);
+     locale.d->setMonetaryDigitGrouping(QList<int>() << 3 << 2);
+-    QCOMPARE(locale.readMoney( "$ 98,76,54,321.12", &ok),  987654321.12);
++    QCOMPARE(locale.readMoney("$ 98,76,54,321.12", &ok),  987654321.12);
+     QVERIFY(ok);
+     QCOMPARE(locale.readMoney("$ -98,76,54,321.12", &ok), -987654321.12);
+     QVERIFY(ok);
++    QCOMPARE(locale.readMoney("$ 987654321.12", &ok),  987654321.12);
++    QVERIFY(ok);
++    QCOMPARE(locale.readMoney("$ -987654321.12", &ok), -987654321.12);
++    QVERIFY(ok);
+     locale.d->setMonetaryDigitGrouping(QList<int>() << 3 << -1);
+-    QCOMPARE(locale.readMoney( "$ 987654,321.12", &ok),  987654321.12);
++    QCOMPARE(locale.readMoney("$ 987654,321.12", &ok),  987654321.12);
+     QVERIFY(ok);
+     QCOMPARE(locale.readMoney("$ -987654,321.12", &ok), -987654321.12);
+     QVERIFY(ok);
+-- 
+1.7.3.4
+
diff --git a/kde-base/kdelibs/kdelibs-4.7.4-r12.ebuild b/kde-base/kdelibs/kdelibs-4.7.4-r12.ebuild
new file mode 100644
index 000000000000..dfac8ba68ea3
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.7.4-r12.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.4-r12.ebuild,v 1.1 2012/01/30 22:47:31 dilfridge Exp $
+
+EAPI=4
+
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="optional"
+KDE_SCM="git"
+inherit kde4-base fdo-mime toolchain-funcs
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
+lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev
++udisks +upower upnp zeroconf"
+
+REQUIRED_USE="
+	udisks? ( udev )
+	upower? ( udev )
+"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.7.6
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	>=dev-libs/libattica-0.1.90
+	>=dev-libs/libdbusmenu-qt-0.3.2
+	dev-libs/libpcre[unicode]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/giflib
+	>=media-libs/libpng-1.4
+	>=media-libs/phonon-4.4.3
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-misc/shared-mime-info-0.60
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	!aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXcursor
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		x11-libs/libXtst
+		!kernel_SunOS? ( sys-libs/libutempter )
+	)
+	bzip2? ( app-arch/bzip2 )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	lzma? ( app-arch/xz-utils )
+	openexr? (
+		media-libs/openexr
+		media-libs/ilmbase
+	)
+	policykit? ( >=sys-auth/polkit-qt-0.99 )
+	semantic-desktop? (
+		>=dev-libs/shared-desktop-ontologies-0.6.50
+		>=dev-libs/soprano-2.6.51[dbus,raptor,redland]
+	)
+	spell? ( app-text/enchant )
+	ssl? ( dev-libs/openssl )
+	udev? ( sys-fs/udev )
+	upnp? ( media-libs/herqq )
+	zeroconf? (
+		|| (
+			net-dns/avahi[mdnsresponder-compat]
+			!bindist? ( net-misc/mDNSResponder )
+		)
+	)
+"
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMONDEPEND}
+	!x11-libs/qt-phonon
+	>=app-crypt/gnupg-2.0.11
+	app-misc/ca-certificates
+	$(add_kdebase_dep kde-env)
+	!aqua? (
+		x11-apps/iceauth
+		x11-apps/rgb
+		>=x11-misc/xdg-utils-1.0.2-r3
+		udisks? ( sys-fs/udisks )
+		upower? ( sys-power/upower )
+	)
+"
+PDEPEND="
+	$(add_kdebase_dep katepart)
+	|| ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils )
+	handbook? ( $(add_kdebase_dep khelpcenter) )
+	policykit? (
+		>=kde-misc/polkit-kde-kcmodules-0.98_pre20101127
+		>=sys-auth/polkit-kde-agent-0.99
+	)
+	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
+"
+
+# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
+add_blocker plasma-workspace 4.7.1
+
+# file collision, bug 394991
+add_blocker kcontrol 4.4.50
+
+PATCHES=(
+	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
+	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
+	"${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
+	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
+	"${FILESDIR}/${PN}-4.6.3-bytecode.patch"
+	"${FILESDIR}/${PN}-4.7.4-xinelib12x.patch"
+	"${FILESDIR}/${PN}-4.7.4-klocale.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	fi
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
+
+	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
+	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
+		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
+
+	if use aqua; then
+		sed -i -e \
+			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
+			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
+
+		#if [[ ${CHOST} == *-darwin8 ]]; then
+		sed -i -e \
+			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
+			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
+		#fi
+
+		# solid/solid/backends/iokit doesn't properly link, so disable it.
+		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
+			|| die "disabling solid/solid/backends/iokit failed"
+		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
+			|| die "disabling solid/solid/backends/iokit failed"
+
+		# There's no fdatasync on OSX and the check fails to detect that.
+		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
+			|| die "disabling fdatasync failed"
+
+		# Fix nameser include to nameser8_compat
+		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
+			|| die "fixing nameser include failed"
+		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
+
+		# Try to fix kkeyserver_mac
+		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch"
+		# getgrouplist not in solaris libc
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch"
+		# solaris has no d_type element in dir_ent
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch"
+	fi
+}
+
+src_configure() {
+	if use zeroconf; then
+		if has_version net-dns/avahi; then
+			mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
+		elif has_version net-misc/mDNSResponder; then
+			mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON)
+		else
+			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
+		fi
+	else
+		mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
+	fi
+	mycmakeargs+=(
+		-DWITH_HSPELL=OFF
+		-DWITH_ASPELL=OFF
+		-DKDE_DEFAULT_HOME=.kde4
+		-DKAUTH_BACKEND=POLKITQT-1
+		-DBUILD_libkactivities=OFF
+		$(cmake-utils_use_build handbook doc)
+		$(cmake-utils_use_has 3dnow X86_3DNOW)
+		$(cmake-utils_use_has altivec PPC_ALTIVEC)
+		$(cmake-utils_use_has mmx X86_MMX)
+		$(cmake-utils_use_has sse X86_SSE)
+		$(cmake-utils_use_has sse2 X86_SSE2)
+		$(cmake-utils_use_with acl)
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with fam)
+		$(cmake-utils_use_with jpeg2k Jasper)
+		$(cmake-utils_use_with kerberos GSSAPI)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with nls Libintl)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with policykit PolkitQt-1)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
+		$(cmake-utils_use_with spell ENCHANT)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with udev UDev)
+		$(cmake-utils_use_with upnp HUpnp)
+	)
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+
+	# The building of apidox is not managed anymore by the build system
+	if use doc; then
+		einfo "Building API documentation"
+		cd "${S}"/doc/api/
+		./doxygen.sh "${S}" || die "APIDOX generation failed"
+	fi
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# use system certificates
+	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
+	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
+
+	if use doc; then
+		einfo "Installing API documentation. This could take a bit of time."
+		cd "${S}"/doc/api/
+		docinto /HTML/en/kdelibs-apidox
+		dohtml -r ${P}-apidocs/*
+	fi
+
+	if use aqua; then
+		einfo "fixing ${PN} plugins"
+
+		local _PV=${PV:0:3}.0
+		local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
+
+		install_name_tool -id \
+			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
+
+		einfo "fixing ${PN} cmake detection files"
+		#sed -i -e \
+		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
+		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
+			"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
+			|| die "failed fixing FindXKB.cmake"
+	fi
+
+	einfo Installing environment file.
+	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
+	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
+	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
+	doenvd "${T}/77kde"
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+
+	if use zeroconf; then
+		echo
+		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
+		elog "is running."
+		echo
+		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
+		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
+		einfo "to include 'mdns', e.g.:"
+		einfo "	hosts: files mdns dns"
+		echo
+	fi
+
+	elog "Your homedir is set to \${HOME}/.kde4"
+	echo
+
+	kde4-base_pkg_postinst
+}
+
+pkg_prerm() {
+	# Remove ksycoca4 global database
+	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+
+	kde4-base_pkg_postrm
+}