Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at 2018-01-09 14:46:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amarok (Old) and /work/SRC/openSUSE:Factory/.amarok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok" Tue Jan 9 14:46:35 2018 rev:113 rq:559635 version:2.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2017-12-21 11:24:35.557448558 +0100 +++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2018-01-09 14:46:36.374332094 +0100 @@ -1,0 +2,9 @@ +Sat Dec 23 14:44:56 UTC 2017 - [email protected] + +- Add patch to avoid automatic network requests (boo#1070899): + * disable-web-plugins-by-default.patch +- Also disable all scripts by default +- Fix loading of scripts: + * load-scrips-without-qca.patch + +------------------------------------------------------------------- New: ---- disable-web-plugins-by-default.patch load-scrips-without-qca.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.2W7N7u/_old 2018-01-09 14:46:39.034207372 +0100 +++ /var/tmp/diff_new_pack.2W7N7u/_new 2018-01-09 14:46:39.042206996 +0100 @@ -69,6 +69,10 @@ Patch113: Fix-crash-during-musicbrainz-search.patch # PATCH-FIX-UPSTREAM amarok-2.8.0-find_mysql.patch -- Fix obvious typo in paths definition in find_library() Patch114: amarok-2.8.0-find_mysql.patch +# PATCH-FIX-OPENSUSE +Patch200: load-scrips-without-qca.patch +# PATCH-FIX-OPENSUSE +Patch201: disable-web-plugins-by-default.patch # Required for the fdupes macro BuildRequires: fdupes BuildRequires: gdk-pixbuf-devel @@ -152,6 +156,8 @@ %patch112 -p1 %patch113 -p1 %patch114 -p1 +%patch200 -p1 +%patch201 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE99} '+%%b %%e %%Y') @@ -175,6 +181,9 @@ #bnc722284 amarok is not really a good player for audio-cds, remove the action for solid rm -f %{buildroot}%{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop +# Disable all scripts by default (boo#1070899) +sed -i"" "s/X-KDE-PluginInfo-EnabledByDefault=true/X-KDE-PluginInfo-EnabledByDefault=false/g" %{buildroot}%{_kde4_appsdir}/amarok/scripts/*/script.spec + %if 0%{?is_opensuse} # Copy the icon for amzdownloader over from breeze for i in 16 22 24 ++++++ disable-web-plugins-by-default.patch ++++++ From: Fabian Vogt <[email protected]> Subject: Disable plugins which cause automatic network requests by default References: boo#1070899 Index: amarok-2.8.0/src/services/lastfm/amarok_service_lastfm.desktop =================================================================== --- amarok-2.8.0.orig/src/services/lastfm/amarok_service_lastfm.desktop +++ amarok-2.8.0/src/services/lastfm/amarok_service_lastfm.desktop @@ -119,6 +119,6 @@ X-KDE-PluginInfo-Email=kde@dontletsstart X-KDE-PluginInfo-Version=1.0 X-KDE-PluginInfo-Category=Service X-KDE-PluginInfo-License=GPL -X-KDE-PluginInfo-EnabledByDefault=true +X-KDE-PluginInfo-EnabledByDefault=false X-KDE-Library=amarok_service_lastfm X-KDE-PluginInfo-Name=amarok_service_lastfm Index: amarok-2.8.0/src/services/magnatune/amarok_service_magnatunestore.desktop =================================================================== --- amarok-2.8.0.orig/src/services/magnatune/amarok_service_magnatunestore.desktop +++ amarok-2.8.0/src/services/magnatune/amarok_service_magnatunestore.desktop @@ -126,7 +126,7 @@ X-KDE-PluginInfo-Email=nhnFreespirit@gma X-KDE-PluginInfo-Version=2.0 X-KDE-PluginInfo-Category=Service X-KDE-PluginInfo-License=GPL -X-KDE-PluginInfo-EnabledByDefault=true +X-KDE-PluginInfo-EnabledByDefault=false X-KDE-Library=amarok_service_magnatunestore X-KDE-PluginInfo-Name=amarok_service_magnatunestore ++++++ load-scrips-without-qca.patch ++++++ From: Fabian Vogt <[email protected] Subject: Also load scripts without QCA available If QCA2 was not found, it skipped loading all scripts... Index: amarok-2.8.0/src/ScriptManager.cpp =================================================================== --- amarok-2.8.0.orig/src/ScriptManager.cpp +++ amarok-2.8.0/src/ScriptManager.cpp @@ -171,7 +171,6 @@ void ScriptManager::updateAllScripts() // SLOT { // note: we can't update scripts without the QtCryptoArchitecture, so don't even try -#ifdef QCA2_FOUND DEBUG_BLOCK // find all scripts (both in $KDEHOME and /usr) QStringList foundScripts = KGlobal::dirs()->findAllResources( "data", "amarok/scripts/*/main.js", @@ -179,6 +178,7 @@ ScriptManager::updateAllScripts() // SLO KStandardDirs::NoDuplicates ); m_nScripts = foundScripts.count(); +#ifdef QCA2_FOUND // get timestamp of the last update check KConfigGroup config = Amarok::config( "ScriptManager" ); const uint lastCheck = config.readEntry( "LastUpdateCheck", QVariant( 0 ) ).toUInt(); @@ -205,6 +205,7 @@ ScriptManager::updateAllScripts() // SLO } // last update was pretty recent, don't check again else +#endif { debug() << "ScriptUpdater: Skipping update check"; for ( int i = 0; i < m_nScripts; i++ ) @@ -213,7 +214,6 @@ ScriptManager::updateAllScripts() // SLO } configChanged( true ); } -#endif } void
