[neon/extras/amarok/Neon/unstable] debian: new alpha release qt5
Jonathan Riddell
null at kde.org
Mon Feb 15 16:53:44 GMT 2021
Git commit ead634a74dfdb6f24cfd4707c5d3c79e3404c294 by Jonathan Riddell.
Committed on 15/02/2021 at 16:53.
Pushed by jriddell into branch 'Neon/unstable'.
new alpha release qt5
M +6 -0 debian/changelog
M +9 -5 debian/control
D +0 -19 debian/patches/debian_clamz_is_runtime_dependency.diff
D +0 -16 debian/patches/debian_find_mysql_fix.diff
D +0 -59 debian/patches/debian_mysqle_amarok_local_errmsg_feature.diff
D +0 -30 debian/patches/debian_mysqle_force_defaults_file.diff
D +0 -19 debian/patches/no-mp3tunes.diff
D +0 -7 debian/patches/series
D +0 -17 debian/patches/use-secrure-URLs.diff
D +0 -12 debian/patches/valgrind_uninitialized_value
https://invent.kde.org/neon/extras/amarok/commit/ead634a74dfdb6f24cfd4707c5d3c79e3404c294
diff --git a/debian/changelog b/debian/changelog
index 3005260e..11a95b32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+amarok (2.9.71-0neon) UNRELEASED; urgency=medium
+
+ * alpha
+
+ -- Jonathan Riddell <jr at jriddell.org> Mon, 15 Feb 2021 16:32:51 +0000
+
amarok (2.9.0-2) unstable; urgency=medium
[ Boris Pek ]
diff --git a/debian/control b/debian/control
index 5ea3fea4..5c8dd9f0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,13 @@ Uploaders: Modestas Vainius <modax at debian.org>,
Diane Trout <diane at debian.org>
Build-Depends: cmake (>= 2.6.2),
debhelper (>= 12~),
+ kirigami2-dev,
libaio-dev [linux-any],
libavformat-dev (>= 4:0.5),
libcurl4-gnutls-dev,
libgcrypt20-dev,
libglib2.0-dev,
+ libgmock-dev,
libgpod-dev (>= 0.7.0),
libgtk2.0-dev,
libkf5archive-dev,
@@ -36,21 +38,21 @@ Build-Depends: cmake (>= 2.6.2),
libkf5notifyconfig-dev,
libkf5package-dev,
libkf5solid-dev,
+ libkf5syntaxhighlighting-dev,
libkf5texteditor-dev,
libkf5threadweaver-dev,
libkf5widgetsaddons-dev,
libkf5windowsystem-dev,
- liblastfm-dev (>= 1.0.3),
libloudmouth1-dev,
libmariadb-dev,
- libmariadbclient-dev
- libwrap0-dev,
+ libmariadbclient-dev,
+ libmariadbd-dev,
libmtp-dev (>= 1.0.0),
+ libmygpo-qt-dev,
libofa0-dev,
- libqca2-dev,
- libqjson-dev,
libtag-extras-dev (>= 1.0.1),
libtag1-dev (>= 1.8),
+ libwrap0-dev,
libxml2-dev,
pkg-kde-tools (>= 0.5),
qtbase5-dev
@@ -64,6 +66,8 @@ Package: amarok
Architecture: any
Depends: amarok-common (= ${source:Version}),
amarok-utils (= ${binary:Version}),
+ qml-module-org-kde-kirigami2,
+ qml-module-qtquick-controls2,
${misc:Depends},
${shlibs:Depends}
Recommends: clamz, kio-audiocd
diff --git a/debian/patches/debian_clamz_is_runtime_dependency.diff b/debian/patches/debian_clamz_is_runtime_dependency.diff
deleted file mode 100644
index a2206c4a..00000000
--- a/debian/patches/debian_clamz_is_runtime_dependency.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: Do not check for clamz at build-time
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2018-05-18
-
-Clamz is a runtime dependency. There is no need to check for it at build time.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -224,9 +224,6 @@ if( WITH_PLAYER )
- macro_log_feature( GLIB2_FOUND "glib2" "Required by libgpod and mp3tunes" "http://www.gtk.org" FALSE "2.x" "")
- endif( WITH_IPOD OR WITH_MP3Tunes )
-
-- find_program( CLAMZ_FOUND clamz PATH )
-- macro_log_feature( CLAMZ_FOUND "clamz" "Optional requirement to download songs from the Amazon MP3 store. Highly recommended on Linux, as the official downloader from Amazon is quite broken on many systems." "https://code.google.com/p/clamz/" FALSE )
--
- find_package(PythonInterp)
- macro_log_feature(PYTHONINTERP_FOUND "Python" "Required for generating the autocompletion file for the script console" "https://www.python.org" FALSE "2.x" "")
-
diff --git a/debian/patches/debian_find_mysql_fix.diff b/debian/patches/debian_find_mysql_fix.diff
deleted file mode 100644
index d5ce3d54..00000000
--- a/debian/patches/debian_find_mysql_fix.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: Fix mysql_config call for Debian MySQL
-Last-Update: 2012-06-02
-
-* As of 5.5.23, mysql_config_pic is shipped inside libmysqld-pic package.
---- a/cmake/modules/FindMySQLAmarok.cmake
-+++ b/cmake/modules/FindMySQLAmarok.cmake
-@@ -13,7 +13,7 @@
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
- if(NOT WIN32)
-- find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 HINTS ${BIN_INSTALL_DIR})
-+ find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config_pic mysql_config mysql_config5 HINTS ${BIN_INSTALL_DIR})
- endif(NOT WIN32)
-
- find_path(MYSQL_INCLUDE_DIR mysql.h PATH_SUFFIXES mysql mysql5/mysql)
diff --git a/debian/patches/debian_mysqle_amarok_local_errmsg_feature.diff b/debian/patches/debian_mysqle_amarok_local_errmsg_feature.diff
deleted file mode 100644
index ef2176e5..00000000
--- a/debian/patches/debian_mysqle_amarok_local_errmsg_feature.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Modestas Vainius <modestas at vainius.eu>
-Subject: [PATCH] Make Amarok use locally installed errsys.msg
-
-This patch makes Amarok MySQLe use locally installed errsys.msg
-(by amarok-common package) instead of global MySQL one which
-might not be available if mysql-server is not installed.
-
---- a/src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp
-+++ b/src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp
-@@ -23,6 +23,8 @@
- #include <core/support/Amarok.h>
- #include <core/support/Debug.h>
-
-+#include <KStandardDirs>
-+
- #include <QDir>
- #include <QVarLengthArray>
- #include <QVector>
-@@ -30,6 +32,9 @@
-
- #include <mysql.h>
-
-+#define MYSQLE_ERRMSG_FILENAME "errmsg.sys"
-+#define MYSQLE_ERRMSG_LOCAL_DIR "amarok/mysqle"
-+
- /** number of times the library is used.
- */
- static QAtomicInt libraryInitRef;
-@@ -47,6 +52,7 @@ MySqlEmbeddedStorage::init( const QStrin
- // -- figuring out and setting the database path.
- QString storagePath = storageLocation;
- QString databaseDir;
-+ QString languageDataDir;
- // TODO: the following logic is not explained in the comments.
- // tests use a different directory then the real run
- if( storagePath.isEmpty() )
-@@ -60,9 +66,11 @@ MySqlEmbeddedStorage::init( const QStrin
- dir.mkpath( "." ); //ensure directory exists
- databaseDir = dir.absolutePath() + QDir::separator() + "mysqle";
- }
-+ languageDataDir = KGlobal::dirs()->findResourceDir( "data", MYSQLE_ERRMSG_LOCAL_DIR "/" MYSQLE_ERRMSG_FILENAME );
-
- QVector<const char*> mysql_args;
- QByteArray dataDir = QString( "--datadir=%1" ).arg( databaseDir ).toLocal8Bit();
-+ QByteArray languageDir = QString( "--language=%1%2" ).arg( languageDataDir, MYSQLE_ERRMSG_LOCAL_DIR ).toLocal8Bit();
- mysql_args << "amarok"
- << dataDir.constData()
- // CAUTION: if we ever change the table type we will need to fix a number of MYISAM specific
-@@ -78,6 +86,10 @@ MySqlEmbeddedStorage::init( const QStrin
- << "--key-buffer-size=16777216" // (16Mb)
- << "--character-set-server=utf8"
- << "--collation-server=utf8_bin";
-+ if ( !languageDataDir.isEmpty() )
-+ {
-+ mysql_args << languageDir.constData();
-+ }
-
-
- if( !QFile::exists( databaseDir ) )
diff --git a/debian/patches/debian_mysqle_force_defaults_file.diff b/debian/patches/debian_mysqle_force_defaults_file.diff
deleted file mode 100644
index e76626bf..00000000
--- a/debian/patches/debian_mysqle_force_defaults_file.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: Force MySQLe to use our custom defaults file
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673403
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672207
-Origin: vendor
-Last-Update: 2012-05-20
-
-Defaults-file is forced via mysql_library_init() command line option
---defaults-file. If this option is not present, mysql_library_init() will also
-look for defaults file in the system paths likely making it dependent on the
-system-wide MySQL configuration. This causes such side effects like MySQLe
-looking for /etc/mysql/conf.d/ or reading system errmsg.sys.
-
---- a/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
-+++ b/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
-@@ -92,8 +92,12 @@ MySqlEmbeddedStorage::MySqlEmbeddedStora
-
- setenv( "MYSQL_HOME", storagePath.toLocal8Bit().data(), 1 );
- setenv( "DEFAULT_HOME_ENV", storagePath.toLocal8Bit().data(), 1 );
-- char *args[] = { (char*) "amarok" };
-- if( mysql_library_init( 1 , args, 0 ) != 0 )
-+ QByteArray defaultsFileArg = QByteArray("--defaults-file=") + QFile::encodeName(defaultsFile);
-+ char *args[] = {
-+ (char*) "amarok",
-+ defaultsFileArg.data()
-+ };
-+ if( mysql_library_init( 2 , args, 0 ) != 0 )
- {
- error() << "MySQL library initialization failed.";
- reportError( "init" );
diff --git a/debian/patches/no-mp3tunes.diff b/debian/patches/no-mp3tunes.diff
deleted file mode 100644
index e32b559a..00000000
--- a/debian/patches/no-mp3tunes.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Disable the mp3tunes service
- moc raises a build error related to GLib headers, but it does not provide a
- meaningful error message to diagnose the error. Hence, for now disable the
- mp3tunes service.
-Last-Update: 2018-05-18
-Forwarded: not-needed
-
---- a/src/services/CMakeLists.txt
-+++ b/src/services/CMakeLists.txt
-@@ -7,7 +7,7 @@ include_directories(
- add_subdirectory( amazon )
- add_subdirectory( magnatune )
- add_subdirectory( jamendo )
--add_subdirectory( mp3tunes )
-+#add_subdirectory( mp3tunes )
- if (QCA2_FOUND)
- add_subdirectory( ampache )
- endif (QCA2_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5d9363e4..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,7 +0,0 @@
-debian_mysqle_amarok_local_errmsg_feature.diff
-#debian_mysqle_force_defaults_file.diff
-debian_find_mysql_fix.diff
-debian_clamz_is_runtime_dependency.diff
-valgrind_uninitialized_value
-no-mp3tunes.diff
-use-secrure-URLs.diff
diff --git a/debian/patches/use-secrure-URLs.diff b/debian/patches/use-secrure-URLs.diff
deleted file mode 100644
index 76b1ea87..00000000
--- a/debian/patches/use-secrure-URLs.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Boris Pek <tehnick at debian.org>
-Description: Use more secure URL
-Last-Update: 2019-08-16
-Forwarded: no
-
-
---- a/src/context/applets/upcomingevents/upcoming-events-map.html
-+++ b/src/context/applets/upcomingevents/upcoming-events-map.html
-@@ -8,7 +8,7 @@
- #map_canvas { height: 100% }
- </style>
- <title>Upcoming Event Venue Location</title>
--<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-+<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script>
- <script type="text/javascript">
- var map;
- var markers = [];
diff --git a/debian/patches/valgrind_uninitialized_value b/debian/patches/valgrind_uninitialized_value
deleted file mode 100644
index b8be003d..00000000
--- a/debian/patches/valgrind_uninitialized_value
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/services/ServiceSqlQueryMaker.cpp b/src/services/ServiceSqlQueryMaker.cpp
-index 64cead7..614c0aa 100644
---- a/src/services/ServiceSqlQueryMaker.cpp
-+++ b/src/services/ServiceSqlQueryMaker.cpp
-@@ -94,6 +94,7 @@ ServiceSqlQueryMaker::ServiceSqlQueryMaker( ServiceSqlCollection* collection, Se
- //d->includedBuilder = true;
- //d->collectionRestriction = false;
- d->worker = 0;
-+ d->albumMode = AllAlbums;
-
- d->queryType = Private::NONE;
- d->linkedTables = 0;
More information about the Neon-commits
mailing list