* [PR PATCH] clementine: update to qt5-git branch for qt5 support
@ 2019-09-17 14:28 voidlinux-github
2019-09-17 16:49 ` [PR PATCH] [Merged]: " voidlinux-github
0 siblings, 1 reply; 2+ messages in thread
From: voidlinux-github @ 2019-09-17 14:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 352 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages clementine
https://github.com/void-linux/void-packages/pull/14523
clementine: update to qt5-git branch for qt5 support
None
A patch file from https://github.com/void-linux/void-packages/pull/14523.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-clementine-14523.patch --]
[-- Type: text/x-diff, Size: 14518 bytes --]
From af989565a3a64e15f2874385dfbb338e3152c0b6 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 16:10:14 +0200
Subject: [PATCH 1/2] libmygpo-qt: add shlib entry
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index d15941dce29..56feb7a217b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3509,3 +3509,4 @@ libdrumstick-file.so.1 drumstick-1.1.2_1
libdrumstick-alsa.so.1 drumstick-1.1.2_1
libdrumstick-rt.so.1 drumstick-1.1.2_1
libnozzle.so.1 libnozzle1-1.11_2
+libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
From 1cbd141531e8eeef9f2b5858a94e1eb2271a02ea Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 16:27:17 +0200
Subject: [PATCH 2/2] clementine: update to qt5-git branch for qt5 support
---
...add-missing-functional-includes-5630.patch | 51 ------------
.../patches/clementine-chromaprint-1.4.patch | 41 ----------
.../patches/clementine-moodbar_flags.patch | 14 ----
.../patches/clementine-sqlite-3.12.patch | 19 -----
srcpkgs/clementine/patches/protobuf-370.patch | 82 -------------------
srcpkgs/clementine/patches/sentinel.patch | 42 ----------
srcpkgs/clementine/template | 21 +++--
7 files changed, 12 insertions(+), 258 deletions(-)
delete mode 100644 srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch
delete mode 100644 srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch
delete mode 100644 srcpkgs/clementine/patches/clementine-moodbar_flags.patch
delete mode 100644 srcpkgs/clementine/patches/clementine-sqlite-3.12.patch
delete mode 100644 srcpkgs/clementine/patches/protobuf-370.patch
delete mode 100644 srcpkgs/clementine/patches/sentinel.patch
diff --git a/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch b/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch
deleted file mode 100644
index 0355eefca7c..00000000000
--- a/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001
-From: Morris Hafner <mmha@users.noreply.github.com>
-Date: Mon, 13 Feb 2017 17:46:46 +0100
-Subject: [PATCH] Add missing <functional> includes (#5630)
-
----
- src/core/mergedproxymodel.cpp | 1 +
- src/devices/giolister.cpp | 1 +
- src/library/groupbydialog.cpp | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp
-index 56217f6fd..8c210d391 100644
---- a/src/core/mergedproxymodel.cpp
-+++ b/src/core/mergedproxymodel.cpp
-@@ -23,6 +23,7 @@
-
- #include <QStringList>
-
-+#include <functional>
- #include <limits>
-
- // boost::multi_index still relies on these being in the global namespace.
-diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp
-index aa3bddb34..5f63ef248 100644
---- a/src/devices/giolister.cpp
-+++ b/src/devices/giolister.cpp
-@@ -17,6 +17,7 @@
-
- #include "config.h"
-
-+#include <functional>
- #include <memory>
-
- #include <QFile>
-diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp
-index 5efdc9f36..e5f711b34 100644
---- a/src/library/groupbydialog.cpp
-+++ b/src/library/groupbydialog.cpp
-@@ -20,6 +20,8 @@
-
- #include <QPushButton>
-
-+#include <functional>
-+
- // boost::multi_index still relies on these being in the global namespace.
- using std::placeholders::_1;
- using std::placeholders::_2;
---
-2.13.4
-
diff --git a/srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch b/srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch
deleted file mode 100644
index bfdc49265aa..00000000000
--- a/srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001
-From: Chocobozzz <florian.bigard@gmail.com>
-Date: Thu, 8 Dec 2016 23:12:17 +0100
-Subject: [PATCH] Add compatibility with chromaprint >= 1.4
-
----
- src/musicbrainz/chromaprinter.cpp | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
-index 9579b62..c7ad99e 100644
---- a/src/musicbrainz/chromaprinter.cpp
-+++ b/src/musicbrainz/chromaprinter.cpp
-@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() {
- ChromaprintContext* chromaprint =
- chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT);
- chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels);
-- chromaprint_feed(chromaprint, reinterpret_cast<void*>(data.data()),
-+ chromaprint_feed(chromaprint, reinterpret_cast<int16_t *>(data.data()),
- data.size() / 2);
- chromaprint_finish(chromaprint);
-
-- void* fprint = nullptr;
- int size = 0;
-+
-+#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4
-+ u_int32_t *fprint = nullptr;
-+ char *encoded = nullptr;
-+#else
-+ void *fprint = nullptr;
-+ void *encoded = nullptr;
-+#endif
-+
- int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size);
-+
- QByteArray fingerprint;
- if (ret == 1) {
-- void* encoded = nullptr;
- int encoded_size = 0;
- chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT,
- &encoded, &encoded_size, 1);
diff --git a/srcpkgs/clementine/patches/clementine-moodbar_flags.patch b/srcpkgs/clementine/patches/clementine-moodbar_flags.patch
deleted file mode 100644
index 5eadfec4c46..00000000000
--- a/srcpkgs/clementine/patches/clementine-moodbar_flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/gst/moodbar/CMakeLists.txt b/gst/moodbar/CMakeLists.txt
-index 44c1362..7ed5047 100644
---- a/gst/moodbar/CMakeLists.txt
-+++ b/gst/moodbar/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 2.6)
-
--set(CMAKE_C_FLAGS "-Wall")
--set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall --std=c++0x")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall --std=c++0x")
-
- include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-
diff --git a/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch b/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch
deleted file mode 100644
index 5c6a15227c7..00000000000
--- a/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/core/database.cpp
-+++ b/src/core/database.cpp
-@@ -265,6 +265,16 @@
- StaticInit();
-
- {
-+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+ QVariant v = db.driver()->handle();
-+ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
-+ sqlite3* handle = *static_cast<sqlite3**>(v.data());
-+ if (handle) {
-+ sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
-+ }
-+ }
-+#endif
-+
- QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db);
- set_fts_tokenizer.bindValue(":name", "unicode");
- set_fts_tokenizer.bindValue(
diff --git a/srcpkgs/clementine/patches/protobuf-370.patch b/srcpkgs/clementine/patches/protobuf-370.patch
deleted file mode 100644
index 00617da94cd..00000000000
--- a/srcpkgs/clementine/patches/protobuf-370.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/src/internet/lastfm/lastfmcompat.cpp
-+++ b/src/internet/lastfm/lastfmcompat.cpp
-@@ -68,13 +68,13 @@ bool ParseQuery(const QByteArray& data, XmlQuery* query,
- return false;
- }
- #endif // Q_OS_WIN32
-- } catch (lastfm::ws::ParseError e) {
-+ } catch (lastfm::ws::ParseError &e) {
- qLog(Error) << "Last.fm parse error: " << e.enumValue();
- if (connection_problems) {
- *connection_problems = e.enumValue() == lastfm::ws::MalformedResponse;
- }
- return false;
-- } catch (std::runtime_error& e) {
-+ } (std::runtime_error& e) {
- qLog(Error) << e.what();
- return false;
- }
---- a/src/internet/spotify/spotifyblobdownloader.cpp
-+++ b/src/internet/spotify/spotifyblobdownloader.cpp
-@@ -216,7 +216,7 @@ bool SpotifyBlobDownloader::CheckSignature(
- return false;
- }
- }
-- } catch (std::exception e) {
-+ } catch (std::exception &e) {
- // This should only happen if we fail to parse our own key.
- qLog(Debug) << "Verifying spotify blob signature failed:" << e.what();
- return false;
---- a/src/songinfo/echonestbiographies.cpp
-+++ b/src/songinfo/echonestbiographies.cpp
-@@ -66,7 +66,7 @@ void EchoNestBiographies::RequestFinished() {
- try {
- request->artist_->parseProfile(reply);
- }
-- catch (Echonest::ParseError e) {
-+ catch (Echonest::ParseError &e) {
- qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
- << e.what();
- }
---- a/src/songinfo/echonestimages.cpp
-+++ b/src/songinfo/echonestimages.cpp
-@@ -68,7 +68,7 @@ void EchoNestImages::RequestFinished(QNetworkReply* reply, int id,
- reply->deleteLater();
- try {
- artist.parseProfile(reply);
-- } catch (Echonest::ParseError e) {
-+ } catch (Echonest::ParseError &e) {
- qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
- << e.what();
- }
-@@ -94,7 +94,7 @@ void EchoNestImages::IdsFound(QNetworkReply* reply, int request_id) {
- DoSpotifyImageRequest(id.foreign_id, request_id);
- }
- }
-- } catch (Echonest::ParseError e) {
-+ } catch (Echonest::ParseError &e) {
- qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
- << e.what();
- }
---- a/src/songinfo/echonestsimilarartists.cpp
-+++ b/src/songinfo/echonestsimilarartists.cpp
-@@ -47,7 +47,7 @@ void EchoNestSimilarArtists::RequestFinished() {
- try {
- artists = Echonest::Artist::parseSimilar(reply);
- }
-- catch (Echonest::ParseError e) {
-+ catch (Echonest::ParseError &e) {
- qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
- << e.what();
- }
---- a/src/songinfo/echonesttags.cpp
-+++ b/src/songinfo/echonesttags.cpp
-@@ -51,7 +51,7 @@ void EchoNestTags::RequestFinished() {
- try {
- request->artist_->parseProfile(reply);
- }
-- catch (Echonest::ParseError e) {
-+ catch (Echonest::ParseError &e) {
- qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
- << e.what();
- }
diff --git a/srcpkgs/clementine/patches/sentinel.patch b/srcpkgs/clementine/patches/sentinel.patch
deleted file mode 100644
index d2aeb7d27ac..00000000000
--- a/srcpkgs/clementine/patches/sentinel.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/gstenginepipeline.cpp 2017-09-22 23:13:31.520359890 +0200
-+++ b/src/engines/gstenginepipeline.cpp 2017-09-22 23:14:31.837362189 +0200
-@@ -375,7 +375,7 @@
- // Link the elements with special caps
- // The scope path through the tee gets 16-bit ints.
- GstCaps* caps16 = gst_caps_new_simple("audio/x-raw", "format", G_TYPE_STRING,
-- "S16LE", NULL);
-+ "S16LE", (char*)0);
- gst_element_link_filtered(probe_converter, probe_sink, caps16);
- gst_caps_unref(caps16);
-
---- a/chromaprinter.cpp 2017-09-22 23:18:59.324372383 +0200
-+++ b/src/musicbrainz/chromaprinter.cpp 2017-09-22 23:19:35.520373762 +0200
-@@ -78,7 +78,7 @@
- // Chromaprint expects mono 16-bit ints at a sample rate of 11025Hz.
- GstCaps* caps = gst_caps_new_simple(
- "audio/x-raw", "format", G_TYPE_STRING, "S16LE", "channels", G_TYPE_INT,
-- kDecodeChannels, "rate", G_TYPE_INT, kDecodeRate, NULL);
-+ kDecodeChannels, "rate", G_TYPE_INT, kDecodeRate, (char*)0);
- gst_element_link_filtered(resample, sink, caps);
- gst_caps_unref(caps);
-
---- a/cddasongloader.cpp 2017-09-22 23:25:22.975387004 +0200
-+++ b/src/devices/cddasongloader.cpp 2017-09-22 23:25:59.774388406 +0200
-@@ -62,7 +62,7 @@
- nullptr);
- }
- if (g_object_class_find_property (G_OBJECT_GET_CLASS (cdda_), "paranoia-mode")) {
-- g_object_set (cdda_, "paranoia-mode", 0, NULL);
-+ g_object_set (cdda_, "paranoia-mode", 0, (char*)0);
- }
-
- // Change the element's state to ready and paused, to be able to query it
-@@ -106,7 +106,7 @@
-
- GstElement* pipeline = gst_pipeline_new("pipeline");
- GstElement* sink = gst_element_factory_make ("fakesink", NULL);
-- gst_bin_add_many (GST_BIN (pipeline), cdda_, sink, NULL);
-+ gst_bin_add_many (GST_BIN (pipeline), cdda_, sink, (char*)0);
- gst_element_link (cdda_, sink);
- gst_element_set_state(pipeline, GST_STATE_READY);
- gst_element_set_state(pipeline, GST_STATE_PAUSED);
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 6e99f249328..1a58a07c556 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,22 +1,25 @@
# Template file for 'clementine'
pkgname=clementine
version=1.3.1
-revision=18
-wrksrc="Clementine-${version}"
+revision=19
+_commit=75f18dab23f0842713a4200a7e362efd51b12e31
+wrksrc="Clementine-${_commit}"
build_style=cmake
-hostmakedepends="sparsehash pkg-config qt-host-tools qt-devel protobuf"
+configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF"
+hostmakedepends="sparsehash pkg-config qt5-qmake qt5-host-tools protobuf"
makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel liblastfm-devel
- qt-webkit-devel glew-devel qjson-devel sqlite-devel protobuf-devel libplist-devel
- libusbmuxd-devel libmtp-devel libcdio-devel qca-devel pulseaudio-devel glu-devel
+ qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel
+ libusbmuxd-devel libmtp-devel libcdio-devel pulseaudio-devel glu-devel
taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel) libechonest-devel
- libgpod-devel"
+ libgpod-devel libmygpo-qt-devel qt5-x11extras-devel qt5-plugin-mysql
+ qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc"
depends="desktop-file-utils"
short_desc="Modern music player and library organizer"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
-distfiles="https://github.com/clementine-player/Clementine/archive/${version}.tar.gz"
-checksum=f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c
+distfiles="https://github.com/clementine-player/Clementine/archive/${_commit}.tar.gz"
+checksum=0c29e596cb5acc6970754e3c20616c5474859b7d2e6f05f5cda5c539581e2c8a
patch_args="-Np1"
build_options="spotify"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: clementine: update to qt5-git branch for qt5 support
2019-09-17 14:28 [PR PATCH] clementine: update to qt5-git branch for qt5 support voidlinux-github
@ 2019-09-17 16:49 ` voidlinux-github
0 siblings, 0 replies; 2+ messages in thread
From: voidlinux-github @ 2019-09-17 16:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
There's a merged pull request on the void-packages repository
clementine: update to qt5-git branch for qt5 support
https://github.com/void-linux/void-packages/pull/14523
Description:
None
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-17 16:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-17 14:28 [PR PATCH] clementine: update to qt5-git branch for qt5 support voidlinux-github
2019-09-17 16:49 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).