Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at 2019-08-27 15:55:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amarok (Old) and /work/SRC/openSUSE:Factory/.amarok.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok" Tue Aug 27 15:55:26 2019 rev:116 rq:725141 version:2.9.70git.20190820T023444~600806141d Changes: -------- --- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2018-05-15 09:55:08.592469465 +0200 +++ /work/SRC/openSUSE:Factory/.amarok.new.7948/amarok.changes 2019-08-27 15:55:29.155608508 +0200 @@ -1,0 +2,69 @@ +Wed Aug 21 19:30:40 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Add 0001-Fix-a-crash-when-running-amarok-l-path-to-file.patch (kde#410870) + +------------------------------------------------------------------- +Wed Aug 21 19:29:24 UTC 2019 - [email protected] + +- Update to version 2.9.70git.20190820T023444~600806141d: + * Fix the CI build + * Use identical internet-services icon + +------------------------------------------------------------------- +Tue Jul 16 09:29:58 UTC 2019 - Stefan Brüns <[email protected]> + +- Remove the taglib runtime Requires, these are just examples and + are not used, the automatic library dependencies are sufficient. + +------------------------------------------------------------------- +Fri Jun 14 14:23:43 UTC 2019 - [email protected] + +- Update to version 2.9.70git.20190614T140058~cea336303a: + * Fix passing local file paths on the command line + +------------------------------------------------------------------- +Tue May 28 15:55:37 UTC 2019 - [email protected] + +- Add back gstreamer-plugins-ugly Recommends (if + phonon4qt5-backend-gstreamer is installed) to make mp3 playback + work out of the box +- Require libqt5-qtquickcontrols instead of libqt5-qtquickcontrols2 + as the former is used/needed too and the latter is required by + kirigami2 anyway + +------------------------------------------------------------------- +Tue May 14 09:53:55 UTC 2019 - [email protected] + +- Update to version 2.9.70git.20190510T121601~fc370bbebf: + * Set urgency to Low for track changes + * Add DesktopEntry to notifyrc + +------------------------------------------------------------------- +Tue May 14 09:53:35 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Add 0001-Work-around-QTBUG-75797-for-openQA.patch + +------------------------------------------------------------------- +Sat May 04 09:49:27 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Enable 'changesgenerate' in the _service file. + +------------------------------------------------------------------- +Mon Apr 22 14:41:32 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Use a git snapshot for amarok. +- Drop patches: + - Fix-build-with-gcc6.patch + - initial-preference.diff +- Refresh disable-web-plugins-by-default.patch +- Refresh flac_mimetype_bnc671581.diff +- Add amarok_mariadb.patch + +------------------------------------------------------------------- +Sat Apr 20 08:43:09 UTC 2019 - Markus S <[email protected]> + +- Replace some hardcoded package names with pkgconfig() ones. +- Tweak summary a bit: Amarok is not only for KDE. +- Remove GCC workaround for ancient and unsupported openSUSE versions. + +------------------------------------------------------------------- @@ -1309 +1378 @@ ----------------------------------------------------------------------------------- +------------------------------------------------------------------- Old: ---- Fix-build-with-gcc6.patch amarok-2.9.0.tar.xz initial-preference.diff New: ---- 0001-Fix-a-crash-when-running-amarok-l-path-to-file.patch 0001-Work-around-QTBUG-75797-for-openQA.patch _service _servicedata amarok-2.9.70git.20190820T023444~600806141d.tar.xz amarok-lang.tar.xz amarok_mariadb.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.6YukTW/_old 2019-08-27 15:55:30.283607568 +0200 +++ /var/tmp/diff_new_pack.6YukTW/_new 2019-08-27 15:55:30.287607564 +0200 @@ -1,7 +1,7 @@ # # spec file for package amarok # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,80 +12,100 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# Make sure to require at least the version used for linking to avoid undefined symbols at runtime -%define required_libtag %(rpm -qf `ldd $(type -P tagreader) | awk '/libtag.so.[0-9]/{ print $3 }'`) Name: amarok -Version: 2.9.0 +Version: 2.9.70git.20190820T023444~600806141d Release: 0 -Summary: Media Player for KDE -License: GPL-2.0+ +Summary: Media Player +License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Players -Url: http://amarok.kde.org/ -Source0: https://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz -# for reproducible builds -Source99: %{name}.changes -# PATCH-FIX-OPENSUSE initial-preference.diff bnc#605522 [email protected] -- Increase initial preference to be used for audio files instead of Kaffeine -Patch1: initial-preference.diff +URL: https://amarok.kde.org/ +Source0: %{name}-%{version}.tar.xz +Source1: %{name}-lang.tar.xz +# PATCH-FIX-OPENSUSE +Patch0: amarok_mariadb.patch # PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 [email protected] -- Support for the changed mimetype for flac files -Patch2: flac_mimetype_bnc671581.diff +Patch1: flac_mimetype_bnc671581.diff +# PATCH-FIX-OPENSUSE +Patch2: disable-web-plugins-by-default.patch # PATCH-FIX-OPENSUSE -Patch3: disable-web-plugins-by-default.patch +Patch3: 0001-Work-around-QTBUG-75797-for-openQA.patch # PATCH-FIX-UPSTREAM -Patch4: Fix-build-with-gcc6.patch -# Required for the fdupes macro +Patch4: 0001-Fix-a-crash-when-running-amarok-l-path-to-file.patch +BuildRequires: extra-cmake-modules BuildRequires: fdupes +BuildRequires: fftw-devel BuildRequires: gdk-pixbuf-devel -BuildRequires: kf5-filesystem BuildRequires: libcurl-devel BuildRequires: libgcrypt-devel BuildRequires: libgpod-devel >= 0.7.0 -BuildRequires: libkde4-devel >= 4.6.0 -BuildRequires: liblastfm-devel -BuildRequires: libmtp-devel -BuildRequires: libmygpo-qt-devel >= 1.0.5 +BuildRequires: liblastfm-qt5-devel +BuildRequires: libmtp-devel >= 1.0.0 +BuildRequires: libmygpo-qt5-devel BuildRequires: libmysqlclient-devel BuildRequires: libmysqld-devel BuildRequires: libofa-devel -BuildRequires: openssl-devel -BuildRequires: libqca2-devel -BuildRequires: libqjson-devel -BuildRequires: libqt4-devel >= 4.8.2 +BuildRequires: libqca-qt5-devel BuildRequires: libxml2-devel BuildRequires: loudmouth-devel -%if 0%{?is_opensuse} -BuildRequires: breeze5-icons -%else -BuildRequires: oxygen-icon-theme -%endif -BuildRequires: qt4-qtscript -BuildRequires: taglib -BuildRequires: taglib-devel >= 1.7 -BuildRequires: taglib-extras-devel >= 1.0 -BuildRequires: tcpd-devel +BuildRequires: mysql +BuildRequires: openssl-devel +BuildRequires: pkgconfig BuildRequires: update-desktop-files +BuildRequires: cmake(KF5Archive) +BuildRequires: cmake(KF5Codecs) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5Crash) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5DNSSD) +BuildRequires: cmake(KF5Declarative) +BuildRequires: cmake(KF5GlobalAccel) +BuildRequires: cmake(KF5GuiAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5KCMUtils) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Kirigami2) +BuildRequires: cmake(KF5NewStuff) +BuildRequires: cmake(KF5Notifications) +BuildRequires: cmake(KF5NotifyConfig) +BuildRequires: cmake(KF5Package) +BuildRequires: cmake(KF5Solid) +BuildRequires: cmake(KF5TextEditor) +BuildRequires: cmake(KF5ThreadWeaver) +BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(Phonon4Qt5) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Qml) +BuildRequires: cmake(Qt5QuickControls2) +BuildRequires: cmake(Qt5QuickWidgets) +BuildRequires: cmake(Qt5Script) +BuildRequires: cmake(Qt5ScriptTools) +BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5Svg) +BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5WebEngine) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5Xml) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(taglib) +BuildRequires: pkgconfig(taglib-extras) +# needed by the context view +Requires: kirigami2 +Requires: libqt5-qtquickcontrols Requires: libtag-extras1 >= 1.0 -Requires: phonon-backend -Requires: taglib >= 1.7 -Requires(post): shared-mime-info -Requires(postun): shared-mime-info Recommends: %{name}-lang = %{version} -Recommends: clamz -Recommends: qt4-qtscript -Recommends: kio_audiocd4 -Recommends: gstreamer-plugins-ugly -Provides: kde4-amarok = 2.0.90 -Obsoletes: kde4-amarok <= 2.0.89 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%requires_ge %{required_libtag} -%kde4_runtime_requires +Recommends: (gstreamer-plugins-ugly if phonon4qt5-backend-gstreamer) +Recommends: moodbar %description Amarok is a media player for all kinds of media. This includes MP3, Ogg @@ -95,135 +115,71 @@ %lang_package %prep -: required_libtag '%{required_libtag}' -%setup -q -%patch1 -%patch2 -%patch3 -p1 -%patch4 -p1 - -# Remove build time references so build-compare can do its work -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE99} '+%%b %%e %%Y') -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/main.cpp +%autosetup -a1 -p1 +cat >> CMakeLists.txt << EOF +ki18n_install(po) +EOF %build %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -# force not to use MYSQLCONFIG as mariadb_config provided by mariadb-connector-c doesn't support "--libmysqld-libs" option anymore -%if 0%{?suse_version} >= 1500 -%cmake_kde4 -d build -- -DMYSQLCONFIG_EXECUTABLE:BOOL=OFF -DWITH_QTWEBKIT=OFF -%else -%cmake_kde4 -d build -- -DMYSQLCONFIG_EXECUTABLE:BOOL=OFF -%endif +%cmake_kf5 -d build %make_jobs %install -%kde4_makeinstall -C build - -# Remove *.so files (not needed), fix "devel-file-in-non-devel-package" rpmlint warning -# "libampache_account_login.so" should not be removed -rm -f %{buildroot}%{_kde4_libdir}/libamarok{core,lib,ocsclient,pud,shared,-sqlcollection,-transcoding}.so - -#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 -do - mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/actions - cp %{_kde4_iconsdir}/breeze/actions/${i}/download.svg %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/actions/ -done -%else -# Copy the icon for amzdownloader over from oxygen -for i in 16 22 32 48 -do - mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/actions - cp %{_kde4_iconsdir}/oxygen/${i}x${i}/actions/download.png %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/actions/ -done -%endif +%kf5_makeinstall -C build -# Symlink service menu to the KF5 location -mkdir -p %{buildroot}%{_kf5_servicesdir}/ServiceMenus -ln -s %{_kde4_servicesdir}/ServiceMenus/amarok_append.desktop %{buildroot}/%{_kf5_servicesdir}/ServiceMenus/ +%find_lang amarok %{name}.lang +%find_lang amarokcollectionscanner_qt %{name}.lang +%find_lang amarokpkg %{name}.lang -%suse_update_desktop_file org.kde.amarok Qt KDE AudioVideo Audio Player -%suse_update_desktop_file -r amzdownloader Qt KDE AudioVideo Audio Player +%suse_update_desktop_file org.kde.amarok +%suse_update_desktop_file org.kde.amarok_containers %fdupes -s %{buildroot} -%find_lang amarok -%find_lang amarokcollectionscanner_qt amarok.lang -%find_lang amarokpkg amarok.lang - -%kde_post_install - %post /sbin/ldconfig -%mime_database_post +%mime_database_post %{_kf5_sharedir}/mime %postun /sbin/ldconfig -%mime_database_postun +%mime_database_postun %{_kf5_sharedir}/mime %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING* ChangeLog README TODO -%{_kde4_bindir}/amarok -%{_kde4_bindir}/amarok_afttagger -%{_kde4_bindir}/amarokcollectionscanner -%{_kde4_bindir}/amarokmp3tunesharmonydaemon -%{_kde4_bindir}/amarokpkg -%{_kde4_bindir}/amzdownloader -%{_kde4_modulesdir}/amarok_* -%{_kde4_modulesdir}/kcm_amarok_service_* -%{_kde4_libdir}/libamarok-sqlcollection.so.* -%{_kde4_libdir}/libamarok-transcoding.so.* -%{_kde4_libdir}/libamarokcore.so.* -%{_kde4_libdir}/libamaroklib.so.* -%{_kde4_libdir}/libamarokocsclient.so.* -%{_kde4_libdir}/libamarokpud.so.* -%{_kde4_libdir}/libamarokshared.so.* -%{_kde4_libdir}/libampache_account_login.so -%{_kde4_libdir}/libamarok_service_lastfm_shared.so -%{_kde4_applicationsdir}/org.kde.amarok.desktop -%{_kde4_applicationsdir}/org.kde.amarok_containers.desktop -%{_kde4_applicationsdir}/amzdownloader.desktop -%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml -%{_datadir}/dbus-1/interfaces/org.kde.amarok.App.xml -%{_datadir}/dbus-1/interfaces/org.kde.amarok.Collection.xml -%{_datadir}/dbus-1/interfaces/org.kde.amarok.Mpris1Extensions.Player.xml -%{_datadir}/dbus-1/interfaces/org.kde.amarok.Mpris2Extensions.Player.xml -%dir %{_datadir}/metainfo -%{_datadir}/metainfo/org.kde.amarok.appdata.xml -%{_datadir}/mime/packages/amzdownloader.xml -%{_kde4_iconsdir}/hicolor/*/apps/amarok.* -%{_kde4_iconsdir}/hicolor/*/actions/download.* -%{_kde4_appsdir}/amarok/ -%dir %{_kde4_appsdir}/desktoptheme -%dir %{_kde4_appsdir}/desktoptheme/default -%dir %{_kde4_appsdir}/desktoptheme/default/widgets -%{_kde4_appsdir}/desktoptheme/default/widgets/amarok-* -%{_kde4_appsdir}/kconf_update/amarok-2.4.1-tokens_syntax_update.pl -%{_kde4_appsdir}/kconf_update/amarok.upd -%{_kde4_sharedir}/config.kcfg/amarokconfig.kcfg -%{_kde4_configdir}/amarok* -%{_kde4_servicesdir}/ServiceMenus/amarok_append.desktop -%{_kde4_servicesdir}/amarok-* -%{_kde4_servicesdir}/amarok_* -%{_kde4_servicesdir}/amarok.protocol -%{_kde4_servicesdir}/amarok*.protocol -%{_kde4_servicetypesdir}/amarok_* -%dir %{_kf5_servicesdir}/ServiceMenus/ -%{_kf5_servicesdir}/ServiceMenus/amarok_append.desktop +%license COPYING* +%doc AUTHORS ChangeLog README TODO +%{_kf5_applicationsdir}/org.kde.amarok.desktop +%{_kf5_applicationsdir}/org.kde.amarok_containers.desktop +%{_kf5_appstreamdir}/org.kde.amarok.* +%{_kf5_bindir}/amarok +%{_kf5_bindir}/amarok_afttagger +%{_kf5_bindir}/amarokcollectionscanner +%{_kf5_bindir}/amarokpkg +%{_kf5_configdir}/* +%{_kf5_configkcfgdir}/ +%{_kf5_dbusinterfacesdir}/ +%{_kf5_iconsdir}/hicolor/*/*/* +%{_kf5_libdir}/libamarok-sqlcollection.so* +%{_kf5_libdir}/libamarok-transcoding.so* +%{_kf5_libdir}/libamarokcore.so* +%{_kf5_libdir}/libamaroklib.so* +%{_kf5_libdir}/libamarokpud.so* +%{_kf5_libdir}/libamarokshared.so* +%{_kf5_libdir}/libampache_account_login.so +%{_kf5_libdir}/libgpodder_service_config.so +%{_kf5_notifydir}/amarok.notifyrc +%{_kf5_plugindir}/amarok_*.so +%{_kf5_plugindir}/kcm_amarok_service_*.so +%{_kf5_qmldir}/org/kde/amarok/ +%{_kf5_servicesdir}/ +%{_kf5_servicetypesdir}/amarok*.desktop +%{_kf5_sharedir}/amarok/ +%{_kf5_sharedir}/kconf_update/ +%{_kf5_sharedir}/kpackage/ +%{_kf5_sharedir}/solid/ -%files lang -f amarok.lang -%defattr(-,root,root,-) +%files lang -f %{name}.lang %changelog ++++++ 0001-Fix-a-crash-when-running-amarok-l-path-to-file.patch ++++++ >From 6875f9656ef3f0abb3f076cf264cf7a2cc9c61eb Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Wed, 21 Aug 2019 20:36:15 +0200 Subject: [PATCH] Fix a crash when running 'amarok -l /path/to/file' Summary: BUG: 410870 Test Plan: amarok -l <somefile> Before: Assert "you need to call AmarokConfig::instance before using" After: the file is queued and played. Subscribers: #amarok, amarok-devel Differential Revision: https://phabricator.kde.org/D23326 --- src/App.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/App.cpp b/src/App.cpp index 3ac7fe7de1..ec5a729d5f 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -443,14 +443,13 @@ App::continueInit() PERF_LOG( "Begin App::continueInit" ) + AmarokConfig::instance( "amarokrc" ); newInstance(); const bool restoreSession = m_args->positionalArguments().isEmpty() || m_args->isSet( "append" ) || m_args->isSet( "queue" ) || Amarok::config().readEntry( "AppendAsDefault", false ); - AmarokConfig::instance( "amarokrc" ); - #ifdef DEBUG_BUILD_TYPE new DebugLogger( this ); #endif // DEBUG_BUILD_TYPE -- 2.23.0 ++++++ 0001-Work-around-QTBUG-75797-for-openQA.patch ++++++ >From aff6614f03590301f29cd670947cfd8116fccf00 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Tue, 14 May 2019 11:53:01 +0200 Subject: [PATCH] Work around QTBUG-75797 for openQA --- src/main.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index c8ce816d60..55b7df022f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,6 +29,7 @@ #include <QCommandLineParser> #include <QStandardPaths> +#include <QSurfaceFormat> #include <QtGlobal> #ifdef WITH_QT_WEBENGINE @@ -47,6 +48,11 @@ AMAROK_EXPORT OcsData ocsData; int main( int argc, char *argv[] ) { + QSurfaceFormat fmt = QSurfaceFormat::defaultFormat(); + if(fmt.redBufferSize() < 8) + fmt.setRedBufferSize(8); + QSurfaceFormat::setDefaultFormat(fmt); + App app(argc, argv); #ifdef WITH_QT_WEBENGINE -- 2.21.0 ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="changesgenerate">enable</param> <param name="versionformat">2.9.70git.%ci~%h</param> <param name="url">git://anongit.kde.org/amarok</param> <param name="scm">git</param> <param name="filename">amarok</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled" /> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://anongit.kde.org/amarok</param> <param name="changesrevision">600806141d6c1c22fdd28fe8d8e26837d5d71adc</param> </service> </servicedata>++++++ amarok_mariadb.patch ++++++ Add amarok_mariadb.patch (taken from Arch Linux) to make embedded MySQL server work with our mariadb Author: Wolfgang Bauer diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake index 7aab8ab..a6a59dc 100644 --- a/cmake/modules/FindMySQL.cmake +++ b/cmake/modules/FindMySQL.cmake @@ -42,7 +42,16 @@ if(MYSQLCONFIG_EXECUTABLE) # At least on OpenSUSE --libmysql-libs doesn't exist, so we just use # MYSQL_LIBRARIES for that. We'll see if that's enough when testing # below. - set(MYSQL_EMBEDDED_LIBRARIES ${MYSQL_LIBRARIES}) + # mysql-config removed --libmysql-libs, but amarok need libmysqld other + # than libmysqlclient to run mysql embedded server. + find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld libmysqld + PATHS + $ENV{MYSQL_DIR}/libmysql_r/.libs + $ENV{MYSQL_DIR}/lib + $ENV{MYSQL_DIR}/lib/mysql + PATH_SUFFIXES + mysql + ) else() set(MYSQL_EMBEDDED_LIBRARIES ${MC_MYSQL_EMBEDDED_LIBRARIES}) endif() ++++++ disable-web-plugins-by-default.patch ++++++ --- /var/tmp/diff_new_pack.6YukTW/_old 2019-08-27 15:55:30.359607505 +0200 +++ /var/tmp/diff_new_pack.6YukTW/_new 2019-08-27 15:55:30.359607505 +0200 @@ -2,11 +2,11 @@ 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 +diff --git a/src/services/lastfm/amarok_service_lastfm.desktop b/src/services/lastfm/amarok_service_lastfm.desktop +index 9f02d0e578..1c7276cfaa 100644 +--- a/src/services/lastfm/amarok_service_lastfm.desktop ++++ b/src/services/lastfm/amarok_service_lastfm.desktop +@@ -117,6 +117,6 @@ [email protected] X-KDE-PluginInfo-Version=1.0 X-KDE-PluginInfo-Category=Service X-KDE-PluginInfo-License=GPL @@ -14,11 +14,11 @@ +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 +diff --git a/src/services/magnatune/amarok_service_magnatunestore.desktop b/src/services/magnatune/amarok_service_magnatunestore.desktop +index 98fec83d53..5a3d4754e7 100644 +--- a/src/services/magnatune/amarok_service_magnatunestore.desktop ++++ b/src/services/magnatune/amarok_service_magnatunestore.desktop +@@ -123,7 +123,7 @@ [email protected] X-KDE-PluginInfo-Version=2.0 X-KDE-PluginInfo-Category=Service X-KDE-PluginInfo-License=GPL ++++++ flac_mimetype_bnc671581.diff ++++++ --- /var/tmp/diff_new_pack.6YukTW/_old 2019-08-27 15:55:30.367607498 +0200 +++ /var/tmp/diff_new_pack.6YukTW/_new 2019-08-27 15:55:30.367607498 +0200 @@ -1,8 +1,8 @@ -Index: src/org.kde.amarok.desktop -=================================================================== ---- src/org.kde.amarok.desktop.orig -+++ src/org.kde.amarok.desktop -@@ -188,7 +188,7 @@ Comment[zh_TW]=Amarok - 重新探索您 +diff --git a/src/org.kde.amarok.desktop b/src/org.kde.amarok.desktop +index f48d4ed7e5..38884f2705 100644 +--- a/src/org.kde.amarok.desktop ++++ b/src/org.kde.amarok.desktop +@@ -186,7 +186,7 @@ Comment[zh_TW]=Amarok - 重新探索您的音樂世界！ Icon=amarok # Add pure audio formats here, for other formats see amarok_*.desktop files # See bug 242292
