From eb82fdc2eafc3d1b5f837fcda2c4903106d9d79a Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Mon, 22 Dec 2014 15:07:05 +0100 Subject: KDE 4.8.4 for Slackware 14.0 (07jun2012) --- kde/patch/kdelibs/kdelibs.fstab.patch | 47 ++++++++ kde/patch/kdelibs/kdelibs.klocale.numberfix.patch | 130 ---------------------- kde/patch/kdelibs/kdelibs.upnp_conditional.patch | 15 +++ 3 files changed, 62 insertions(+), 130 deletions(-) create mode 100644 kde/patch/kdelibs/kdelibs.fstab.patch delete mode 100644 kde/patch/kdelibs/kdelibs.klocale.numberfix.patch create mode 100644 kde/patch/kdelibs/kdelibs.upnp_conditional.patch (limited to 'kde/patch/kdelibs') diff --git a/kde/patch/kdelibs/kdelibs.fstab.patch b/kde/patch/kdelibs/kdelibs.fstab.patch new file mode 100644 index 0000000..a57662b --- /dev/null +++ b/kde/patch/kdelibs/kdelibs.fstab.patch @@ -0,0 +1,47 @@ +From: Alex Fiestas +Date: Tue, 05 Jun 2012 16:12:28 +0000 +Subject: Emit deviceRemoved/Added with the right deviceList set +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=19213a6c34e1b47a100815ccbfee8b5c70c3c12a +--- +Emit deviceRemoved/Added with the right deviceList set + +The problem is quite straightforward, deviceAdded is being emitted when +the m_deviceList has the OLD list, so the new device is still NOT in it. +If the user of the library instances a device Solid::Device(UDI) in the +slot after that signal, the device will be null because it will not be +found in m_deviceList. + +REVIEW: 105132 +--- + + +--- a/solid/solid/backends/fstab/fstabmanager.cpp ++++ b/solid/solid/backends/fstab/fstabmanager.cpp +@@ -116,17 +116,19 @@ void FstabManager::_k_updateDeviceList() + QSet newlist = deviceList.toSet(); + QSet oldlist = m_deviceList.toSet(); + +- foreach(const QString &device, newlist) { +- if ( !oldlist.contains(device) ) +- emit deviceAdded(udiPrefix() + "/" + device); +- } +- + foreach(const QString &device, oldlist) { +- if ( !newlist.contains(device) ) ++ if ( !newlist.contains(device) ) { + emit deviceRemoved(udiPrefix() + "/" + device); ++ } + } + + m_deviceList = deviceList; ++ ++ foreach(const QString &device, newlist) { ++ if ( !oldlist.contains(device) ) { ++ emit deviceAdded(udiPrefix() + "/" + device); ++ } ++ } + } + + void FstabManager::onMtabChanged() + + diff --git a/kde/patch/kdelibs/kdelibs.klocale.numberfix.patch b/kde/patch/kdelibs/kdelibs.klocale.numberfix.patch deleted file mode 100644 index d27c2a3..0000000 --- a/kde/patch/kdelibs/kdelibs.klocale.numberfix.patch +++ /dev/null @@ -1,130 +0,0 @@ -commit 2993b24bc21a340695ad35b4f014a684f4d0c651 -Author: John Layt -Date: Sat Dec 17 16:27:51 2011 +0000 - - 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 - -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()); -- 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() << 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() << 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); diff --git a/kde/patch/kdelibs/kdelibs.upnp_conditional.patch b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch new file mode 100644 index 0000000..3a19447 --- /dev/null +++ b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch @@ -0,0 +1,15 @@ +--- kdelibs-4.8.0/solid/solid/managerbase.cpp.orig 2011-07-27 20:34:39.000000000 +0200 ++++ kdelibs-4.8.0/solid/solid/managerbase.cpp 2012-01-26 09:17:49.409993419 +0100 +@@ -90,7 +90,11 @@ + # endif + + # if defined (HUPNP_FOUND) +- m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0); ++ bool solidUpnpEnabled ++ = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1; ++ if (solidUpnpEnabled) { ++ m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0); ++ } + # endif + } + } -- cgit v1.2.3