gentoo resync : 14.04.2018

3 files changed, 158 insertions, 1 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index cbdd20264a92..9d995e58117a 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -4,9 +4,10 @@ AUX plasma-workspace-5.10-startplasmacompositor-script.patch 1213 BLAKE2B 2558a4
 AUX plasma-workspace-5.10.4-unused-dep.patch 804 BLAKE2B 7c77a4f64185f718da3e8a64540cf651f860ed6312423fce6e42ce0e86f8c7d3c4759acf206bdeeb4df5d4221c937e6771d32bb2fca05fb6cfc311f2fe2b1b96 SHA512 9718f0577ca468a6ec1eed7a665d3c0de236408b7aac442775daef4795040104a422b3c8325e5f2b9bc9e38da3f6d0dedf13826f49d3921a84960a0833557528
 AUX plasma-workspace-5.11.5-CVE-2018-6790.patch 17967 BLAKE2B e9c65a902dc68f579f8b9a1f99400ae9d9b70c9c9e3e3692fd2f8d7c67638dd6527ea863ea6bfcd3afcc797ad4926a48a1de690ff7b066e547a1501481306106 SHA512 84e84b54e12ed696644ed87891056c923bafc1aa311b6f18970656e6942388557f330867a87f803c55aa212fde24fb5906e23e1d2931506ee21c0c1ca44dc2aa
 AUX plasma-workspace-5.11.5-CVE-2018-6791.patch 1087 BLAKE2B d388f92343bca64a810da32a12ff2572e6c2100b1ef86107f43b4e7f8e29a36764c272ba5814228c45ac671b31e35d67135e8e5d4e8df4c92037985d0f800a29 SHA512 dcdc58fe65f72325c851ff361cf47f5521f0b58e8ba2fe0715b8dc0e214b7cbff2c2e653cd06189e394c0bcdf980395942d06dbc281eb8131e228739fbdf3777
+AUX plasma-workspace-5.12.4-bbc-weather.patch 7492 BLAKE2B b1bd0bb323eeaf8cd2dfa6a70113cd5be6973c20d67f300b45c17eb7871e3527bdba74e5c79439c4f348413473c3eae11d9252d78170b5ad95a5e05d975dc667 SHA512 1de05138db5c4e94a4e76f0e2ac6c87b12999def967032d89daeb8888937de6d718e4b4dfb85ceaea6aec8a2cd3d3f3d7a3363f1b5b5aac89fda05c6cdb32065
 AUX plasma-workspace-5.4-startkde-script.patch 1090 BLAKE2B bb2b0f20bbc2ed467994c98840ffeefc71d4f621713e413ff09a855689bde66b81a61e607457b3fa1ae51a67a3a3e47049193fec530448483c6f87e63f713981 SHA512 45149d5a3db48d77da7a74fd0a5faf14c8f99aaceddc725c9056cac315fd3bae78506e7cd74f6548045e4daf73bf2a605a712311018ff11a4a26c7d9f2afee84
 DIST plasma-workspace-5.11.5.tar.xz 6494360 BLAKE2B de4e3608382ab827f68d61b5095d05168a03fe8da65b219ec5b53e28506e21d5105fce0874d840eb23be1253f3bd3fb3e4ee7d0e3c5e15c895fb4b9f133c062d SHA512 6f15e529665a5fbe24ee0420d1c8fe96ff97dbd2788ae120cd1834889b307b5979ca2aedd4f97d3cadcc7ed5cdb06c0e5f9c704ec732468db4b8ecf89270826f
 DIST plasma-workspace-5.12.4.tar.xz 4556108 BLAKE2B 57bc47e266f09dbeb07196b42d668ee4042d08f6853c02368aa6b96a222d72a77111048870e8019b5f391b098472ae158a04fa62f6aa74b872550d535324be91 SHA512 629f0286fffd1e90cf68611a3b14a8934e9770dd821b4c6de25549af00fefd305c848342f55559a9223199433ed8f180975ceac38765904de95179d1980fc3f5
 EBUILD plasma-workspace-5.11.5-r1.ebuild 4830 BLAKE2B c55b1354329cc9b2f7904d1674886085e3c352ede25fd4b9d66fce858bf62c0b285df59ceaac4db68736228389fa3ff4d797f5b5a7e43ae5378b66e5cbd4124b SHA512 2ecfe5362eba94ada58fcb747ec4d497a8f3a56a8bf5a03d06b4bae0d0b23d9678882b2ad3b4e6914f73f75e6794e369eb4d0bb57116572061ef64715f1f18ca
-EBUILD plasma-workspace-5.12.4.ebuild 4716 BLAKE2B ef1e4b20cfe702aad3818205ea79398f770734ed979842e0f2654dfe3c3ea0ae339a3e454962b943272083dc4c25f35c8bfbcee10bc7ca174272671c77699789 SHA512 b1dec91c549f8e048ce988347989a55b9548e35ba863ca5368e7740acd808b90a88ae737fefb4e7c7abe315053cfe0a114bbc406c7a01a1f553b40f30935ddaa
+EBUILD plasma-workspace-5.12.4-r1.ebuild 4754 BLAKE2B 8fe32cef78f8a3e7f60ee2db215431021c34348f84f1166cf01568faa4cf411ce624b58c74fe351fa98158ebf145d5915765e11342cb21d79e06f4fd78a4e732 SHA512 a041997c9cc616ecf83754fda8950491d4aae8e0279b71f5ce90b488ddcacac24c4921cbbf7761196abfd3a673d5f11e50f7769db9bd1cee50d362e0da51bc01
 MISC metadata.xml 583 BLAKE2B f9b40b080569e6ec92f7a4f23bd6c7e7fb7711b44d3a00cef525478e9ad9a1b2eda3fe0a4686d625cf8530b6f7aa36b6f70eb71401a06ef2856ef3d0c068e11f SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.4-bbc-weather.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.4-bbc-weather.patch
new file mode 100644
index 000000000000..01b18e1c4c08
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.4-bbc-weather.patch
@@ -0,0 +1,155 @@
+From 558a29efc4c9f055799d23ee6c75464e24489e5a Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Fri, 30 Mar 2018 17:10:32 +0200
+Subject: [weather dataengine] Fix BBC provider to adapt to change RSS feed
+
+Summary:
+The urls of the BBC weather feeds seem to have changed, resulting in the
+dataengine to use no longer existing urls.
+...
+BUG: 392510
+...
+
+Differential Revision: https://phabricator.kde.org/D11808
+---
+ dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp | 47 +++++++++++++---------
+ dataengines/weather/ions/bbcukmet/ion_bbcukmet.h   |  4 +-
+ 2 files changed, 31 insertions(+), 20 deletions(-)
+
+diff --git a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
+index 6acaa9b..fcf0bae 100644
+--- a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
++++ b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
+@@ -266,7 +266,19 @@ bool UKMETIon::updateIonSource(const QString& source)
+                 setData(source, QStringLiteral("validate"), QStringLiteral("bbcukmet|malformed"));
+                 return true;
+             }
+-            m_place[QStringLiteral("bbcukmet|") +sourceAction[2]].XMLurl = sourceAction[3];
++
++            XMLMapInfo& place = m_place[QStringLiteral("bbcukmet|") + sourceAction[2]];
++
++            // backward compatibility after rss feed url change in 2018/03
++            place.sourceExtraArg = sourceAction[3];
++            if (place.sourceExtraArg.startsWith(QLatin1String("http://open.live.bbc.co.uk/"))) {
++                // Old data source id stored the full (now outdated) observation feed url
++                // http://open.live.bbc.co.uk/weather/feeds/en/STATIOID/observations.rss
++                // as extra argument, so extract the id from that
++                place.stationId = place.sourceExtraArg.section(QLatin1Char('/'), -2, -2);
++            } else {
++                place.stationId = place.sourceExtraArg;
++            }
+             getXMLData(sourceAction[0] + QLatin1Char('|') + sourceAction[2]);
+             return true;
+         }
+@@ -288,7 +300,7 @@ void UKMETIon::getXMLData(const QString& source)
+         }
+     }
+ 
+-    const QUrl url(m_place[source].XMLurl);
++    const QUrl url(QStringLiteral("https://weather-broker-cdn.api.bbci.co.uk/en/observation/rss/") + m_place[source].stationId);
+ 
+     KIO::TransferJob* getJob = KIO::get(url, KIO::Reload, KIO::HideProgressInfo);
+     getJob->addMetaData(QStringLiteral("cookies"), QStringLiteral("none")); // Disable displaying cookies
+@@ -328,13 +340,8 @@ void UKMETIon::findPlace(const QString& place, const QString& source)
+ void UKMETIon::getFiveDayForecast(const QString& source)
+ {
+     XMLMapInfo& place = m_place[source];
+-    QUrl xmlMap(place.forecastHTMLUrl);
+-
+-    const QString stationID = xmlMap.path().section(QLatin1Char('/'), -1);
+-
+-    place.XMLforecastURL = QStringLiteral("http://open.live.bbc.co.uk/weather/feeds/en/") + stationID + QStringLiteral("/3dayforecast.rss") + xmlMap.query();
+ 
+-    const QUrl url(place.XMLforecastURL);
++    const QUrl url(QStringLiteral("https://weather-broker-cdn.api.bbci.co.uk/en/forecast/rss/3day/") + place.stationId);
+ 
+     KIO::TransferJob* getJob = KIO::get(url, KIO::Reload, KIO::HideProgressInfo);
+     getJob->addMetaData(QStringLiteral("cookies"), QStringLiteral("none")); // Disable displaying cookies
+@@ -362,8 +369,6 @@ void UKMETIon::readSearchHTMLData(const QString& source, const QByteArray& html)
+             const QString fullName = result.value(QStringLiteral("fullName")).toString();
+ 
+             if (!id.isEmpty() && !fullName.isEmpty()) {
+-                const QString url = QStringLiteral("http://open.live.bbc.co.uk/weather/feeds/en/") + id + QStringLiteral("/observations.rss");
+-
+                 QString tmp = QStringLiteral("bbcukmet|") + fullName;
+ 
+                 // Duplicate places can exist
+@@ -372,7 +377,7 @@ void UKMETIon::readSearchHTMLData(const QString& source, const QByteArray& html)
+                     counter++;
+                 }
+                 XMLMapInfo& place = m_place[tmp];
+-                place.XMLurl = url;
++                place.stationId = id;
+                 place.place = fullName;
+                 m_locations.append(tmp);
+             }
+@@ -561,6 +566,9 @@ void UKMETIon::parseWeatherForecast(const QString& source, QXmlStreamReader& xml
+         if (xml.isStartElement()) {
+             if (elementName == QLatin1String("item")) {
+                 parseFiveDayForecast(source, xml);
++            } else if (elementName == QLatin1String("link") &&
++                       xml.namespaceUri().isEmpty()) {
++                m_place[source].forecastHTMLUrl = xml.readElementText();
+             } else {
+                 parseUnknownElement(xml);
+             }
+@@ -644,9 +652,6 @@ void UKMETIon::parseWeatherObservation(const QString& source, WeatherData& data,
+                     }
+                 }
+ 
+-            } else if (elementName == QLatin1String("link")) {
+-                m_place[source].forecastHTMLUrl = xml.readElementText();
+-
+             } else if (elementName == QLatin1String("description")) {
+                 QString observeString = xml.readElementText();
+                 const QStringList observeData = observeString.split(QLatin1Char(':'));
+@@ -871,7 +876,7 @@ void UKMETIon::validate(const QString& source)
+     QString placeList;
+     for (const QString& place : qAsConst(m_locations)) {
+         const QString p = place.section(QLatin1Char('|'), 1, 1);
+-        placeList.append(QStringLiteral("|place|") + p + QStringLiteral("|extra|") + m_place[place].XMLurl);
++        placeList.append(QStringLiteral("|place|") + p + QStringLiteral("|extra|") + m_place[place].stationId);
+     }
+     if (m_locations.count() > 1) {
+         setData(source, QStringLiteral("validate"),
+@@ -897,12 +902,18 @@ void UKMETIon::updateWeather(const QString& source)
+     QString weatherSource = source;
+     // TODO: why the replacement here instead of just a new string?
+     weatherSource.replace(QStringLiteral("bbcukmet|"), QStringLiteral("bbcukmet|weather|"));
+-    weatherSource.append(QLatin1Char('|') + place.XMLurl);
++    weatherSource.append(QLatin1Char('|') + place.sourceExtraArg);
+ 
+     Plasma::DataEngine::Data data;
+ 
+-    data.insert(QStringLiteral("Place"), weatherData.stationName);
+-    data.insert(QStringLiteral("Station"), weatherData.stationName);
++    // work-around for buggy observation RSS feed missing the station name
++    QString stationName = weatherData.stationName;
++    if (stationName.isEmpty() || stationName == QLatin1String(",")) {
++        stationName = source.section(QLatin1Char('|'), 1, 1);
++    }
++
++    data.insert(QStringLiteral("Place"), stationName);
++    data.insert(QStringLiteral("Station"), stationName);
+     if (weatherData.observationDateTime.isValid()) {
+         data.insert(QStringLiteral("Observation Timestamp"), weatherData.observationDateTime);
+     }
+diff --git a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h
+index a1026f4..d9d3ad3 100644
+--- a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h
++++ b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h
+@@ -155,10 +155,10 @@ private:
+ 
+ private:
+     struct XMLMapInfo {
++        QString stationId;
+         QString place;
+-        QString XMLurl;
+         QString forecastHTMLUrl;
+-        QString XMLforecastURL;
++        QString sourceExtraArg;
+     };
+ 
+     // Key dicts
+-- 
+cgit v0.11.2
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.12.4-r1.ebuild
index 0fbd6e358b41..6ed2c658078a 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.12.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.12.4-r1.ebuild
@@ -125,6 +125,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
 	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
 	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
+	"${FILESDIR}/${P}-bbc-weather.patch"
 )
 
 RESTRICT+=" test"