* [gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2016-02-09 15:08 Michael Palimaka
0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2016-02-09 15:08 UTC (permalink / raw
To: gentoo-commits
commit: b286a18e55066222770c7fa341a5fef0afcd0239
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 9 15:07:14 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 9 15:07:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b286a18e
media-sound/tomahawk: backport patch from upstream solving build failure with >=media-libs/taglib-1.10
Gentoo-bug: 574078
Package-Manager: portage-2.2.27
.../files/tomahawk-0.8.4-taglib-1.10.patch | 35 ++++++++++++++++++++++
media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild | 7 +++--
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-taglib-1.10.patch b/media-sound/tomahawk/files/tomahawk-0.8.4-taglib-1.10.patch
new file mode 100644
index 0000000..ff86225
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.8.4-taglib-1.10.patch
@@ -0,0 +1,35 @@
+From ee4656383a92a78299aff6f8637f174fff328e98 Mon Sep 17 00:00:00 2001
+From: Pinak Ahuja <pinak.ahuja@gmail.com>
+Date: Wed, 2 Sep 2015 14:41:00 +0530
+Subject: [PATCH] Compare taglib version properly
+
+---
+ CMakeModules/FindTaglib.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeModules/FindTaglib.cmake b/CMakeModules/FindTaglib.cmake
+index e0efbef..f54ff78 100644
+--- a/CMakeModules/FindTaglib.cmake
++++ b/CMakeModules/FindTaglib.cmake
+@@ -34,10 +34,10 @@ ELSE()
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -48,7 +48,7 @@ ELSE()
+ # message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}")
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
diff --git a/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild b/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
index 30323bd..77374a3 100644
--- a/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -74,7 +74,10 @@ RDEPEND="${DEPEND}
DOCS=( AUTHORS ChangeLog README.md )
-PATCHES=( "${FILESDIR}/${P}-qt55.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-qt55.patch"
+ "${FILESDIR}/${P}-taglib-1.10.patch"
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2016-03-10 21:10 Johannes Huber
0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2016-03-10 21:10 UTC (permalink / raw
To: gentoo-commits
commit: 47568dd7628758a71f379d14a3863a8e8413c718
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 21:08:27 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 21:09:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47568dd7
media-sound/tomahawk: Fix segfault on startup with Qt5
Revision bump adds upstream patch to link correctly against qca with Qt5.
Thanks to Jan Kundrát <jkt <AT> gentoo.org> for spotting.
Gentoo-bug: 567354
Package-Manager: portage-2.2.27
.../files/tomahawk-0.8.4-qca-qt5-linking.patch | 70 ++++++++++++++++++++++
...wk-0.8.4-r1.ebuild => tomahawk-0.8.4-r2.ebuild} | 1 +
2 files changed, 71 insertions(+)
diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-qca-qt5-linking.patch b/media-sound/tomahawk/files/tomahawk-0.8.4-qca-qt5-linking.patch
new file mode 100644
index 0000000..bc52cc3
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.8.4-qca-qt5-linking.patch
@@ -0,0 +1,70 @@
+From 4fa69d9607b95bf74dd86a151b8f77113f04f205 Mon Sep 17 00:00:00 2001
+From: Dominik Schmidt <domme@tomahawk-player.org>
+Date: Thu, 29 Jan 2015 06:11:36 +0100
+Subject: [PATCH] Link against correct qca library with Qt5
+
+---
+ CMakeLists.txt | 10 +++++++++-
+ src/accounts/hatchet/CMakeLists.txt | 1 -
+ src/libtomahawk/CMakeLists.txt | 5 +----
+ 3 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6db3741..65eebb1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -325,7 +325,15 @@ macro_log_feature(GNUTLS_FOUND "GnuTLS"
+ "http://gnutls.org/" TRUE ""
+ "GnuTLS is needed for serving the Playdar/HTTP API via TLS")
+
+-macro_optional_find_package(QCA2)
++if( TOMAHAWK_QT5 )
++ macro_optional_find_package(Qca-qt5)
++ if(Qca-qt5_DIR)
++ set(QCA2_FOUND ON CACHE BOOL "QCA2 was found")
++ set(QCA2_LIBRARIES "qca-qt5" CACHE STRING "QCA2 Qt5 target")
++ endif()
++else()
++ macro_optional_find_package(QCA2)
++endif()
+ macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions necessary for some resolvers and accounts" "http://delta.affinix.com/qca/" TRUE "" "")
+
+ if( TOMAHAWK_QT5 )
+diff --git a/src/accounts/hatchet/CMakeLists.txt b/src/accounts/hatchet/CMakeLists.txt
+index eb082ff..86ebee4 100644
+--- a/src/accounts/hatchet/CMakeLists.txt
++++ b/src/accounts/hatchet/CMakeLists.txt
+@@ -13,7 +13,6 @@ endif()
+ include( ${TOMAHAWK_USE_FILE} )
+
+ find_package(OpenSSL REQUIRED)
+-find_package(QCA2 REQUIRED)
+ find_package(websocketpp 0.2.99 REQUIRED)
+
+ include_directories(
+diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
+index 238670e..1e07325 100644
+--- a/src/libtomahawk/CMakeLists.txt
++++ b/src/libtomahawk/CMakeLists.txt
+@@ -402,10 +402,6 @@ include_directories(
+ ${QTKEYCHAIN_INCLUDE_DIRS}
+ )
+
+-IF(QCA2_FOUND)
+- INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
+-ENDIF(QCA2_FOUND)
+-
+ IF(LIBATTICA_FOUND)
+ SET( libGuiSources ${libGuiSources} AtticaManager.cpp )
+ INCLUDE_DIRECTORIES( ${LIBATTICA_INCLUDE_DIR} )
+@@ -491,6 +487,7 @@ IF(APPLE)
+ ENDIF()
+
+ IF(QCA2_FOUND)
++ INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
+ LIST(APPEND LINK_LIBRARIES ${QCA2_LIBRARIES} )
+ ENDIF(QCA2_FOUND)
+
+--
+1.8.3.2
+
diff --git a/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild b/media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
similarity index 98%
rename from media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
rename to media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
index 77374a3..11314ce 100644
--- a/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
@@ -77,6 +77,7 @@ DOCS=( AUTHORS ChangeLog README.md )
PATCHES=(
"${FILESDIR}/${P}-qt55.patch"
"${FILESDIR}/${P}-taglib-1.10.patch"
+ "${FILESDIR}/${P}-qca-qt5-linking.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2016-04-11 16:50 Johannes Huber
0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2016-04-11 16:50 UTC (permalink / raw
To: gentoo-commits
commit: f6d756fe90250378eab32f0622f25b79fdffc825
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 11:54:14 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 16:50:16 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d756fe
media-sound/tomahawk: Fix live build
Package-Manager: portage-2.2.28
.../tomahawk/files/tomahawk-liblastfm-cmake.patch | 126 +++++++++++++++++++++
.../tomahawk/files/tomahawk-quazip-cmake.patch | 67 +++++++++++
media-sound/tomahawk/tomahawk-9999.ebuild | 5 +
3 files changed, 198 insertions(+)
diff --git a/media-sound/tomahawk/files/tomahawk-liblastfm-cmake.patch b/media-sound/tomahawk/files/tomahawk-liblastfm-cmake.patch
new file mode 100644
index 0000000..763397c
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-liblastfm-cmake.patch
@@ -0,0 +1,126 @@
+diff --git a/CMakeModules/FindLibLastFm.cmake b/CMakeModules/FindLibLastFm.cmake
+index a348835..545e39f 100644
+--- a/CMakeModules/FindLibLastFm.cmake
++++ b/CMakeModules/FindLibLastFm.cmake
+@@ -14,7 +14,7 @@ endif()
+ # Include dir
+ find_path(LIBLASTFM_INCLUDE_DIR
+ # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then
+- NAMES lastfm${LASTFM_LIB_SUFFIX}/Track.h
++ NAMES lastfm/Track.h
+ PATHS ${KDE4_INCLUDE_DIR}
+ )
+
+diff --git a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
+index 85b747b..098e460 100644
+--- a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
++++ b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
+@@ -29,17 +29,10 @@
+ #include "utils/Closure.h"
+ #include "utils/NetworkAccessManager.h"
+
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include <lastfm5/ws.h>
+-#include <lastfm5/User.h>
+-#include <lastfm5/XmlQuery.h>
+-#include <lastfm5/Track.h>
+-#else
+ #include <lastfm/ws.h>
+ #include <lastfm/User.h>
+ #include <lastfm/XmlQuery.h>
+ #include <lastfm/Track.h>
+-#endif
+
+ using namespace Tomahawk::Accounts;
+
+diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
+index 277a62e..cea29a1 100644
+--- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
++++ b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
+@@ -34,13 +34,8 @@
+ #include "TomahawkSettings.h"
+ #include "utils/NetworkAccessManager.h"
+
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include <lastfm5/ws.h>
+-#include <lastfm5/XmlQuery.h>
+-#else
+ #include <lastfm/ws.h>
+ #include <lastfm/XmlQuery.h>
+-#endif
+
+ using namespace Tomahawk::Accounts;
+ using namespace Tomahawk::InfoSystem;
+diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
+index 0eb3b07..6e202b2 100644
+--- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
++++ b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
+@@ -24,15 +24,9 @@
+ #include "infosystem/InfoSystemWorker.h"
+ #include "DllMacro.h"
+
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include <lastfm5/Track.h>
+-#include <lastfm5/Audioscrobbler.h>
+-#include <lastfm5/ScrobblePoint.h>
+-#else
+ #include <lastfm/Track.h>
+ #include <lastfm/Audioscrobbler.h>
+ #include <lastfm/ScrobblePoint.h>
+-#endif
+
+ #include <QObject>
+
+diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp
+index 0baa27c..cf808d9 100644
+--- a/src/libtomahawk/utils/TomahawkUtils.cpp
++++ b/src/libtomahawk/utils/TomahawkUtils.cpp
+@@ -32,11 +32,7 @@
+ #include "Track.h"
+
+ #ifdef LIBLASTFM_FOUND
+- #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+- #include <lastfm5/ws.h>
+- #else
+ #include <lastfm/ws.h>
+- #endif
+ #endif
+
+ #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+diff --git a/src/tomahawk/Scrobbler.h b/src/tomahawk/Scrobbler.h
+index 01c2695..fab0ca6 100644
+--- a/src/tomahawk/Scrobbler.h
++++ b/src/tomahawk/Scrobbler.h
+@@ -20,15 +20,10 @@
+ #ifndef TOMAHAWK_SCROBBLER_H
+ #define TOMAHAWK_SCROBBLER_H
+
++#include "lastfm/ScrobblePoint.h"
+ #include "Result.h"
+ #include "infosystem/InfoSystem.h"
+
+-
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include <lastfm5/ScrobblePoint.h>
+-#else
+-#include <lastfm/ScrobblePoint.h>
+-#endif
+ #include <QObject>
+
+ /**
+diff --git a/src/tomahawk/TomahawkApp.h b/src/tomahawk/TomahawkApp.h
+index 953140b..c161d07 100644
+--- a/src/tomahawk/TomahawkApp.h
++++ b/src/tomahawk/TomahawkApp.h
+@@ -64,11 +64,7 @@ namespace Tomahawk
+ }
+
+ #ifdef LIBLASTFM_FOUND
+- #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+- #include <lastfm5/NetworkAccessManager.h>
+- #else
+ #include <lastfm/NetworkAccessManager.h>
+- #endif
+ #include "Scrobbler.h"
+ #endif
+
diff --git a/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch b/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch
new file mode 100644
index 0000000..7972056
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch
@@ -0,0 +1,67 @@
+diff --git a/CMakeModules/FindQuaZip.cmake b/CMakeModules/FindQuaZip.cmake
+deleted file mode 100644
+index 7e628fc..0000000
+--- a/CMakeModules/FindQuaZip.cmake
++++ /dev/null
+@@ -1,43 +0,0 @@
+-# QUAZIP_FOUND - QuaZip library was found
+-# QUAZIP_INCLUDE_DIR - Path to QuaZip include dir
+-# QUAZIP_INCLUDE_DIRS - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
+-# QUAZIP_LIBRARIES - List of QuaZip libraries
+-# QUAZIP_ZLIB_INCLUDE_DIR - The include dir of zlib headers
+-
+-
+-IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+- # in cache already
+- SET(QUAZIP_FOUND TRUE)
+-ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+- IF (Qt5Core_FOUND)
+- set(QUAZIP_LIB_VERSION_SUFFIX 5)
+- ENDIF()
+- IF (WIN32)
+- FIND_PATH(QUAZIP_LIBRARY_DIR
+- WIN32_DEBUG_POSTFIX d
+- NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll
+- HINTS "C:/Programme/" "C:/Program Files"
+- PATH_SUFFIXES QuaZip/lib
+- )
+- FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR})
+- FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
+- FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
+- ELSE(WIN32)
+- FIND_PACKAGE(PkgConfig)
+-# pkg_check_modules(PC_QCA2 QUIET qca2)
+- pkg_check_modules(PC_QUAZIP quazip)
+- FIND_LIBRARY(QUAZIP_LIBRARIES
+- WIN32_DEBUG_POSTFIX d
+- NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
+- HINTS /usr/lib /usr/lib64
+- )
+- FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
+- HINTS /usr/include /usr/local/include
+- PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
+- )
+- FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
+- ENDIF (WIN32)
+- INCLUDE(FindPackageHandleStandardArgs)
+- SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
+- find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
+-ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp
+index 0baa27c..74b403b 100644
+--- a/src/libtomahawk/utils/TomahawkUtils.cpp
++++ b/src/libtomahawk/utils/TomahawkUtils.cpp
+@@ -39,13 +39,8 @@
+ #endif
+ #endif
+
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include <quazip5/quazip.h>
+-#include <quazip5/quazipfile.h>
+-#else
+ #include <quazip/quazip.h>
+ #include <quazip/quazipfile.h>
+-#endif
+ // We need this for the version info (if available)
+ #include <taglib/taglib.h>
+
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index f93c527..7aff77b 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -74,6 +74,11 @@ RDEPEND="${DEPEND}
DOCS=( AUTHORS ChangeLog README.md )
+PATCHES=(
+ "${FILESDIR}/${PN}-quazip-cmake.patch"
+ "${FILESDIR}/${PN}-liblastfm-cmake.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DWITH_CRASHREPORTER=OFF
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2016-04-18 20:10 Johannes Huber
0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2016-04-18 20:10 UTC (permalink / raw
To: gentoo-commits
commit: 45ba63de05def5964878124c0e1a59af71711263
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 20:09:49 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 20:10:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ba63de
media-sound/tomahawk: Fix build with echonest 2.3.1
Backport upstream patch to fix build with media-libs/libechonest-2.3.1.
Unfortunately this bug release delivers breakage by introducing suffix for qt5.
At the time where tomahawk 0.8.4 was released this suffix doesn't exist and the
build system ignores it. This was fixed in master in the meantime.
Gentoo-bug: 578570
Package-Manager: portage-2.2.28
.../files/tomahawk-0.8.4-echonest231.patch | 168 +++++++++++++++++++++
media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild | 5 +-
media-sound/tomahawk/tomahawk-9999.ebuild | 2 +-
3 files changed, 172 insertions(+), 3 deletions(-)
diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch b/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch
new file mode 100644
index 0000000..537fa1d
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch
@@ -0,0 +1,168 @@
+commit 778b8ee180480e4296fe96d2496b740df8365f02
+Author: Dominik Schmidt <dev@dominik-schmidt.de>
+Date: Fri Feb 6 22:48:54 2015 +0100
+
+ Use new echonest5 include dir for Qt5
+
+diff --git a/CMakeModules/FindEchonest.cmake b/CMakeModules/FindEchonest.cmake
+index 2a3625e..1459372 100644
+--- a/CMakeModules/FindEchonest.cmake
++++ b/CMakeModules/FindEchonest.cmake
+@@ -13,7 +13,7 @@ endif()
+
+ PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest${LIBECHONEST_SUFFIX})
+
+-FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h
++FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest${LIBECHONEST_SUFFIX}/Track.h
+ HINTS
+ ${PC_ECHONEST_INCLUDEDIR}
+ ${PC_ECHONEST_INCLUDE_DIRS}
+diff --git a/src/infoplugins/generic/echonest/EchonestPlugin.cpp b/src/infoplugins/generic/echonest/EchonestPlugin.cpp
+index 92e8c11..a17c4a4 100644
+--- a/src/infoplugins/generic/echonest/EchonestPlugin.cpp
++++ b/src/infoplugins/generic/echonest/EchonestPlugin.cpp
+@@ -23,7 +23,11 @@
+ #include "utils/Logger.h"
+ #include "utils/NetworkAccessManager.h"
+
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include <echonest5/ArtistTypes.h>
++#else
+ #include <echonest/ArtistTypes.h>
++#endif
+
+ #include <QNetworkConfiguration>
+
+diff --git a/src/infoplugins/generic/echonest/EchonestPlugin.h b/src/infoplugins/generic/echonest/EchonestPlugin.h
+index 7388b38..40edd0c 100644
+--- a/src/infoplugins/generic/echonest/EchonestPlugin.h
++++ b/src/infoplugins/generic/echonest/EchonestPlugin.h
+@@ -25,7 +25,11 @@
+ #include "infosystem/InfoSystem.h"
+ #include "infosystem/InfoSystemWorker.h"
+
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include <echonest5/Artist.h>
++#else
+ #include <echonest/Artist.h>
++#endif
+
+ #include <QObject>
+
+diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.cpp b/src/libtomahawk/EchonestCatalogSynchronizer.cpp
+index cb70ed8..5d030c7 100644
+--- a/src/libtomahawk/EchonestCatalogSynchronizer.cpp
++++ b/src/libtomahawk/EchonestCatalogSynchronizer.cpp
+@@ -33,8 +33,13 @@
+ #include "TomahawkSettings.h"
+ #include "Track.h"
+
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include <echonest5/CatalogUpdateEntry.h>
++#include <echonest5/Config.h>
++#else
+ #include <echonest/CatalogUpdateEntry.h>
+ #include <echonest/Config.h>
++#endif
+
+ using namespace Tomahawk;
+
+diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.h b/src/libtomahawk/EchonestCatalogSynchronizer.h
+index 50d7cc2..0e7a5ac 100644
+--- a/src/libtomahawk/EchonestCatalogSynchronizer.h
++++ b/src/libtomahawk/EchonestCatalogSynchronizer.h
+@@ -22,7 +22,11 @@
+ #include "DllMacro.h"
+ #include "Query.h"
+
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include <echonest5/Catalog.h>
++#else
+ #include <echonest/Catalog.h>
++#endif
+
+ #include <QObject>
+ #include <QQueue>
+diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp
+index 1b14bb2..24f0ad1 100644
+--- a/src/libtomahawk/GlobalActionManager.cpp
++++ b/src/libtomahawk/GlobalActionManager.cpp
+@@ -61,8 +61,12 @@
+ #include <QClipboard>
+ #include <QMessageBox>
+
+-#include <echonest/Playlist.h>
+
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include <echonest5/Playlist.h>
++#else
++#include <echonest/Playlist.h>
++#endif
+
+ GlobalActionManager* GlobalActionManager::s_instance = 0;
+
+diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
+index b12108e..5704f35 100644
+--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
++++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
+@@ -24,7 +24,11 @@
+ #include <QTimer>
+ #include <QPointer>
+
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include <echonest5/Playlist.h>
++#else
+ #include <echonest/Playlist.h>
++#endif
+
+ namespace Tomahawk
+ {
+diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
+index 5ed250c..adb6e6c 100644
+--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
++++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
+@@ -28,7 +28,12 @@
+
+ #include "DllMacro.h"
+
++
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include <echonest5/Playlist.h>
++#else
+ #include <echonest/Playlist.h>
++#endif
+
+ namespace Tomahawk
+ {
+diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
+index d7e2040..960aadb 100644
+--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
++++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
+@@ -24,7 +24,11 @@
+ #include "utils/TomahawkUtils.h"
+ #include "utils/Logger.h"
+
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include <echonest5/Playlist.h>
++#else
+ #include <echonest/Playlist.h>
++#endif
+
+ #include <QPaintEvent>
+ #include <QHBoxLayout>
+diff --git a/src/tomahawk/sourcetree/items/CategoryItems.cpp b/src/tomahawk/sourcetree/items/CategoryItems.cpp
+index 425591f..c830ff9 100644
+--- a/src/tomahawk/sourcetree/items/CategoryItems.cpp
++++ b/src/tomahawk/sourcetree/items/CategoryItems.cpp
+@@ -33,7 +33,11 @@
+ #include "utils/ImageRegistry.h"
+ #include "utils/Logger.h"
+
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include <echonest5/Playlist.h>
++#else
+ #include <echonest/Playlist.h>
++#endif
+
+ using namespace Tomahawk;
+
diff --git a/media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild b/media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
index 11314ce..535e1ab 100644
--- a/media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
@@ -48,7 +48,7 @@ DEPEND="
dev-qt/qtsvg:4
dev-qt/qtwebkit:4
media-libs/phonon[qt4]
- >=media-libs/libechonest-2.3.0:=[qt4]
+ >=media-libs/libechonest-2.3.1:=[qt4]
media-libs/liblastfm[qt4]
telepathy? ( net-libs/telepathy-qt[qt4] )
)
@@ -63,7 +63,7 @@ DEPEND="
dev-qt/qtwidgets:5
kde-frameworks/attica:5
media-libs/phonon[qt5]
- >=media-libs/libechonest-2.3.0:=[qt5]
+ >=media-libs/libechonest-2.3.1:=[qt5]
media-libs/liblastfm[qt5]
telepathy? ( net-libs/telepathy-qt[qt5] )
)
@@ -78,6 +78,7 @@ PATCHES=(
"${FILESDIR}/${P}-qt55.patch"
"${FILESDIR}/${P}-taglib-1.10.patch"
"${FILESDIR}/${P}-qca-qt5-linking.patch"
+ "${FILESDIR}/${P}-echonest231.patch"
)
src_configure() {
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index 89198fe..8dadfa9 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -39,7 +39,7 @@ CDEPEND="
dev-libs/boost:=
dev-libs/qtkeychain[qt5]
dev-libs/quazip[qt5]
- >=media-libs/libechonest-2.3.0:=[qt5]
+ >=media-libs/libechonest-2.3.1:=[qt5]
media-libs/liblastfm[qt5]
media-libs/phonon[qt5]
>=media-libs/taglib-1.8.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2018-04-17 12:10 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-04-17 12:10 UTC (permalink / raw
To: gentoo-commits
commit: 3c3186be7affddef949635aac80d85332c7fd600
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 11:27:29 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 12:02:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c3186be
media-sound/tomahawk: Fix build with Qt 5.11_beta3
Package-Manager: Portage-2.3.29, Repoman-2.3.9
.../tomahawk-0.9.0_pre20170808-qt-5.11b3.patch | 240 +++++++++++++++++++++
.../tomahawk/tomahawk-0.9.0_pre20170808.ebuild | 2 +
2 files changed, 242 insertions(+)
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20170808-qt-5.11b3.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20170808-qt-5.11b3.patch
new file mode 100644
index 00000000000..6fb139c6bf1
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20170808-qt-5.11b3.patch
@@ -0,0 +1,240 @@
+From 208a259b08676f2e0db35451b78e8225cb87547d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 17 Apr 2018 13:09:25 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ CMakeLists.txt | 3 ---
+ TomahawkAddLibrary.cmake | 4 +++-
+ TomahawkUse.cmake.in | 3 ---
+ src/crashreporter/CMakeLists.txt | 6 ++++--
+ src/libtomahawk/CMakeLists.txt | 18 +++++++++++-------
+ src/tests/tomahawk_add_test.cmake | 8 ++++++--
+ src/tomahawk/CMakeLists.txt | 17 ++++++++++-------
+ src/tools/database-reader/CMakeLists.txt | 4 +++-
+ .../tomahawk-test-musicscan/CMakeLists.txt | 4 +++-
+ .../kdsingleapplicationguard/CMakeLists.txt | 4 +++-
+ .../src/certificate/CMakeLists.txt | 6 +++---
+ .../qxt/qxtweb-standalone/CMakeLists.txt | 10 +++++-----
+ 12 files changed, 51 insertions(+), 36 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7004e1b70..616db971f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -243,9 +243,6 @@ if( NOT Qt5Core_DIR )
+ macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
+ macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt-project.org" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n qtwebkit-devel package and whatever contains QtUiTools is installed too")
+
+- macro(qt5_use_modules)
+- endmacro()
+-
+ macro(qt_wrap_ui)
+ qt4_wrap_ui(${ARGN})
+ endmacro()
+diff --git a/TomahawkAddLibrary.cmake b/TomahawkAddLibrary.cmake
+index 384394e45..f67a48900 100644
+--- a/TomahawkAddLibrary.cmake
++++ b/TomahawkAddLibrary.cmake
+@@ -46,7 +46,9 @@ function(tomahawk_add_library)
+ endif()
+
+ # HACK: add qt modules - every lib should define its own set of modules
+- qt5_use_modules(${target} Core Network Widgets Sql Xml ${LIBRARY_QT5_MODULES})
++ if(Qt5Core_DIR)
++ target_link_libraries(${target} Qt5::Core Qt5::Network Qt5::Widgets Qt5::Sql Qt5::Xml)
++ endif()
+
+ # definitions - can this be moved into set_target_properties below?
+ add_definitions(${QT_DEFINITIONS})
+diff --git a/TomahawkUse.cmake.in b/TomahawkUse.cmake.in
+index cb39fe219..9401e1851 100644
+--- a/TomahawkUse.cmake.in
++++ b/TomahawkUse.cmake.in
+@@ -81,9 +81,6 @@ else(TOMAHAWK_QT5)
+ find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS})
+ include( ${QT_USE_FILE} )
+
+- macro(qt5_use_modules)
+- endmacro()
+-
+ macro(qt_wrap_ui)
+ qt4_wrap_ui(${ARGN})
+ endmacro()
+diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt
+index b837eb941..d47c91b62 100644
+--- a/src/crashreporter/CMakeLists.txt
++++ b/src/crashreporter/CMakeLists.txt
+@@ -43,7 +43,9 @@ target_link_libraries( ${TOMAHAWK_CRASH_REPORTER_TARGET}
+ ${QT_LIBRARIES}
+ )
+
++if(Qt5Core_DIR)
++ target_link_libraries(${TOMAHAWK_CRASH_REPORTER_TARGET} Qt5::Widgets Qt5::Network)
++endif()
++
+ set_target_properties(${TOMAHAWK_CRASH_REPORTER_TARGET} PROPERTIES AUTOMOC ON)
+ install(TARGETS ${TOMAHAWK_CRASH_REPORTER_TARGET} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
+-
+-qt5_use_modules(${TOMAHAWK_CRASH_REPORTER_TARGET} Widgets Network)
+diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
+index adb3edfa0..a85a835ad 100644
+--- a/src/libtomahawk/CMakeLists.txt
++++ b/src/libtomahawk/CMakeLists.txt
+@@ -500,12 +500,17 @@ set_target_properties(
+ OUTPUT_NAME ${TOMAHAWK_BASE_TARGET_NAME}
+ )
+
+-
+-qt5_use_modules(${TOMAHAWK_LIBRARY} Widgets Network Sql WebKitWidgets Concurrent Xml UiTools Svg)
+-IF(APPLE)
+- qt5_use_modules(${TOMAHAWK_LIBRARY} MacExtras)
+-ENDIF()
+-
++if(Qt5Core_DIR)
++ target_link_libraries(${TOMAHAWK_LIBRARY}
++ Qt5::Widgets Qt5::Network Qt5::Sql Qt5::WebKitWidgets Qt5::Concurrent Qt5::Xml Qt5::UiTools Qt5::Svg
++ )
++ if(APPLE)
++ target_link_libraries(${TOMAHAWK_LIBRARY} Qt5::MacExtras)
++ endif()
++ if( UNIX AND NOT APPLE )
++ target_link_libraries(${TOMAHAWK_LIBRARY} Qt5::DBus)
++ endif()
++endif()
+
+ IF(QCA2_FOUND)
+ INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
+@@ -514,7 +519,6 @@ ENDIF(QCA2_FOUND)
+
+ IF( UNIX AND NOT APPLE )
+ LIST(APPEND LINK_LIBRARIES ${QT_QTDBUS_LIBRARIES} )
+- qt5_use_modules(${TOMAHAWK_LIBRARY} DBus)
+ ENDIF( UNIX AND NOT APPLE )
+
+ TARGET_LINK_LIBRARIES( ${TOMAHAWK_LIBRARY}
+diff --git a/src/tests/tomahawk_add_test.cmake b/src/tests/tomahawk_add_test.cmake
+index 464b8c918..e3e20ed4b 100644
+--- a/src/tests/tomahawk_add_test.cmake
++++ b/src/tests/tomahawk_add_test.cmake
+@@ -16,8 +16,12 @@ macro(tomahawk_add_test test_class)
+ ${QT_QTCORE_LIBRARY}
+ )
+
+- add_test(NAME ${TOMAHAWK_TEST_TARGET} COMMAND ${TOMAHAWK_TEST_TARGET})
++ if(Qt5Core_DIR)
++ target_link_libraries(${TOMAHAWK_TEST_TARGET}
++ Qt5::Core Qt5::Network Qt5::Widgets Qt5::Sql Qt5::Xml Qt5::Test
++ )
++ endif()
+
+- qt5_use_modules(${TOMAHAWK_TEST_TARGET} Core Network Widgets Sql Xml Test)
++ add_test(NAME ${TOMAHAWK_TEST_TARGET} COMMAND ${TOMAHAWK_TEST_TARGET})
+
+ endmacro()
+diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt
+index cb60b8012..7facdc3da 100644
+--- a/src/tomahawk/CMakeLists.txt
++++ b/src/tomahawk/CMakeLists.txt
+@@ -171,13 +171,16 @@ SET_TARGET_PROPERTIES( ${TOMAHAWK_APPLICATION_TARGET}
+ RUNTIME_OUTPUT_NAME ${TOMAHAWK_RUNTIME_OUTPUT_NAME}
+ )
+
+-
+-qt5_use_modules(${TOMAHAWK_APPLICATION_TARGET} Core Widgets Network Sql WebKitWidgets)
+-if(APPLE)
+- qt5_use_modules(${TOMAHAWK_APPLICATION_TARGET} MacExtras)
+-endif()
+-if(WIN32)
+- qt5_use_modules(${TOMAHAWK_APPLICATION_TARGET} WinExtras)
++if(Qt5Core_DIR)
++ target_link_libraries(${TOMAHAWK_APPLICATION_TARGET}
++ Qt5::Core Qt5::Widgets Qt5::Network Qt5::Sql Qt5::WebKitWidgets
++ )
++ if(APPLE)
++ target_link_libraries(${TOMAHAWK_APPLICATION_TARGET} Qt5::MacExtras)
++ endif()
++ if(WIN32)
++ target_link_libraries(${TOMAHAWK_APPLICATION_TARGET} Qt5::WinExtras)
++ endif()
+ endif()
+
+ MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" )
+diff --git a/src/tools/database-reader/CMakeLists.txt b/src/tools/database-reader/CMakeLists.txt
+index 72bb1e0db..d7a45f0a6 100644
+--- a/src/tools/database-reader/CMakeLists.txt
++++ b/src/tools/database-reader/CMakeLists.txt
+@@ -15,7 +15,9 @@ set_target_properties( ${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET}
+ target_link_libraries( ${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET}
+ ${TOMAHAWK_LIBRARIES}
+ )
++if(Qt5Core_DIR)
++ target_link_libraries(${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET} Qt5::Core)
++endif()
+
+-qt5_use_modules(${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET} Core)
+ install( TARGETS ${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET} BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
+
+diff --git a/src/tools/tomahawk-test-musicscan/CMakeLists.txt b/src/tools/tomahawk-test-musicscan/CMakeLists.txt
+index 097e3fc08..15c0c479f 100644
+--- a/src/tools/tomahawk-test-musicscan/CMakeLists.txt
++++ b/src/tools/tomahawk-test-musicscan/CMakeLists.txt
+@@ -14,6 +14,8 @@ set_target_properties( ${TOMAHAWK_TOOL_MUSICSCAN_TARGET}
+ target_link_libraries( ${TOMAHAWK_TOOL_MUSICSCAN_TARGET}
+ ${TOMAHAWK_LIBRARIES}
+ )
++if(Qt5Core_DIR)
++ target_link_libraries(${TOMAHAWK_TOOL_MUSICSCAN_TARGET} Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets)
++endif()
+
+-qt5_use_modules(${TOMAHAWK_TOOL_MUSICSCAN_TARGET} Core Gui Network Widgets)
+ install( TARGETS ${TOMAHAWK_TOOL_MUSICSCAN_TARGET} BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
+diff --git a/thirdparty/kdsingleapplicationguard/CMakeLists.txt b/thirdparty/kdsingleapplicationguard/CMakeLists.txt
+index af4cf8704..9d6b49014 100644
+--- a/thirdparty/kdsingleapplicationguard/CMakeLists.txt
++++ b/thirdparty/kdsingleapplicationguard/CMakeLists.txt
+@@ -24,4 +24,6 @@ set_target_properties(
+ PROPERTIES
+ AUTOMOC TRUE
+ )
+-qt5_use_modules(kdsingleapplicationguard Core)
++if(Qt5Core_DIR)
++ target_link_libraries(kdsingleapplicationguard Qt5::Core)
++endif()
+diff --git a/thirdparty/qt-certificate-addon/src/certificate/CMakeLists.txt b/thirdparty/qt-certificate-addon/src/certificate/CMakeLists.txt
+index a51157cf7..bfb0b0afe 100644
+--- a/thirdparty/qt-certificate-addon/src/certificate/CMakeLists.txt
++++ b/thirdparty/qt-certificate-addon/src/certificate/CMakeLists.txt
+@@ -25,6 +25,6 @@ set_target_properties(
+ PROPERTIES
+ AUTOMOC TRUE
+ )
+-qt5_use_modules(qtcertificateaddon Core Network)
+-
+-
++if(Qt5Core_DIR)
++ target_link_libraries(qtcertificateaddon Qt5::Core Qt5::Network)
++endif()
+diff --git a/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt b/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt
+index 654a6aab5..1babe0cfc 100644
+--- a/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt
++++ b/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt
+@@ -74,10 +74,10 @@ ADD_LIBRARY( qxtweb-standalone STATIC
+ )
+
+
+-target_link_libraries( qxtweb-standalone
+- ${QT_LIBRARIES}
+-)
+-
+-qt5_use_modules( qxtweb-standalone Network )
++if(Qt5Core_DIR)
++ target_link_libraries( qxtweb-standalone Qt5::Network)
++else()
++ target_link_libraries( qxtweb-standalone ${QT_LIBRARIES} )
++endif()
+
+ set_target_properties( qxtweb-standalone PROPERTIES AUTOMOC TRUE )
+--
+2.17.0
+
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
index 15c73708429..8cb2950b9aa 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
@@ -50,6 +50,8 @@ RDEPEND="${CDEPEND}
app-crypt/qca:2[ssl]
"
+PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" )
+
src_prepare() {
kde5_src_prepare
has_version "media-libs/liblastfm[qt5]" &&
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2019-01-26 8:46 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-01-26 8:46 UTC (permalink / raw
To: gentoo-commits
commit: 488d5319cf31630b221a1abe66e284df51fdd11a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 26 08:35:20 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 08:46:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=488d5319
media-sound/tomahawk: Try to fix build with <cmake-3.10
Bug: https://bugs.gentoo.org/674826
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../tomahawk-0.9.0_pre20181030-cmakepolicy.patch | 37 ++++++++++++++++++++++
.../tomahawk/tomahawk-0.9.0_pre20181030.ebuild | 7 ++--
2 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch
new file mode 100644
index 00000000000..7ddf116eecc
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch
@@ -0,0 +1,37 @@
+From 663981b4dd28fca6cac0b079bed26c411e7d1722 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 25 Jan 2019 21:13:05 +0100
+Subject: [PATCH] Fix build with <cmake-3.10
+
+---
+ CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b44d2ee43..9422a808e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,14 +2,18 @@ PROJECT( tomahawk )
+ CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
+ CMAKE_POLICY(SET CMP0017 NEW)
+ CMAKE_POLICY(SET CMP0022 NEW)
+-CMAKE_POLICY(SET CMP0075 NEW)
++IF(POLICY CMP0075)
++ CMAKE_POLICY(SET CMP0075 NEW)
++ENDIF()
+
+ # TODO:
+ # Update to NEW and fix things up
+ CMAKE_POLICY(SET CMP0023 NEW)
+
+ # Let AUTOMOC and AUTOUIC process generated files
+-CMAKE_POLICY(SET CMP0071 NEW)
++IF(POLICY CMP0071)
++ CMAKE_POLICY(SET CMP0071 NEW)
++ENDIF()
+
+ # TODO:
+ # Disable automatic qtmain linking
+--
+2.20.1
+
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
index b9e80fa1ed9..82c9537fd05 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -53,7 +53,10 @@ RDEPEND="${COMMON_DEPEND}
S="${WORKDIR}/${PN}-${COMMIT}"
-PATCHES=( "${FILESDIR}/${P}-fix-warning.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-fix-warning.patch"
+ "${FILESDIR}/${P}-cmakepolicy.patch" # bug 674826
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2020-05-08 22:36 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-05-08 22:36 UTC (permalink / raw
To: gentoo-commits
commit: 4e33aa61197053aecccb7c693ac74a44223bc77a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 8 22:34:03 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 8 22:36:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e33aa61
media-sound/tomahawk: EAPI-7 bump, use cmake.eclass, build w/ Qt 5.15
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/tomahawk-0.9.0_pre20181030-qt-5.15.patch | 140 +++++++++++++++++++++
.../tomahawk/tomahawk-0.9.0_pre20181030.ebuild | 13 +-
2 files changed, 148 insertions(+), 5 deletions(-)
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch
new file mode 100644
index 00000000000..f07b746a03f
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch
@@ -0,0 +1,140 @@
+From 4fb44c931be648d61ef3c8d10426b34de1b2a53b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 8 May 2020 23:55:43 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath)
+
+---
+ src/libtomahawk/utils/AnimatedSpinner.cpp | 1 +
+ src/libtomahawk/utils/TomahawkUtilsGui.cpp | 1 +
+ src/libtomahawk/widgets/DropDownButton.cpp | 2 ++
+ src/libtomahawk/widgets/HoverControls.cpp | 1 +
+ src/libtomahawk/widgets/SourceTreePopupDialog.cpp | 1 +
+ src/libtomahawk/widgets/searchlineedit/SearchButton.cpp | 9 +++++----
+ src/tomahawk/widgets/AccountsPopupWidget.cpp | 1 +
+ src/tomahawk/widgets/SlideSwitchButton.cpp | 1 +
+ src/tomahawk/widgets/SocialWidget.cpp | 3 ++-
+ 9 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/src/libtomahawk/utils/AnimatedSpinner.cpp b/src/libtomahawk/utils/AnimatedSpinner.cpp
+index b4778cbe9..a705cfaa2 100644
+--- a/src/libtomahawk/utils/AnimatedSpinner.cpp
++++ b/src/libtomahawk/utils/AnimatedSpinner.cpp
+@@ -28,6 +28,7 @@
+ #include <QApplication>
+ #include <QHideEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QShowEvent>
+
+diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
+index b35799723..d2733d4a7 100644
+--- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp
++++ b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
+@@ -32,6 +32,7 @@
+
+ #include <QLayout>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QBitmap>
+ #include <QPalette>
+diff --git a/src/libtomahawk/widgets/DropDownButton.cpp b/src/libtomahawk/widgets/DropDownButton.cpp
+index 74aa344d1..106e8b882 100644
+--- a/src/libtomahawk/widgets/DropDownButton.cpp
++++ b/src/libtomahawk/widgets/DropDownButton.cpp
+@@ -19,6 +19,8 @@
+ #include "DropDownButton.h"
+
+ #include <QMouseEvent>
++#include <QPaintEvent>
++#include <QPainterPath>
+
+ #include "Artist.h"
+ #include "Album.h"
+diff --git a/src/libtomahawk/widgets/HoverControls.cpp b/src/libtomahawk/widgets/HoverControls.cpp
+index 3e31bf236..0b6b20aa8 100644
+--- a/src/libtomahawk/widgets/HoverControls.cpp
++++ b/src/libtomahawk/widgets/HoverControls.cpp
+@@ -27,6 +27,7 @@
+ #include <QPixmap>
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+
+ using namespace Tomahawk;
+
+diff --git a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
+index 807eb354a..1379c9c53 100644
+--- a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
++++ b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
+@@ -22,6 +22,7 @@
+ #include <QApplication>
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QDialogButtonBox>
+ #include <QVBoxLayout>
+ #include <QHBoxLayout>
+diff --git a/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp b/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
+index 1d9f1c4bd..97c5406f2 100644
+--- a/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
++++ b/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
+@@ -19,10 +19,11 @@
+
+ #include "SearchButton.h"
+
+-#include <qcompleter.h>
+-#include <qevent.h>
+-#include <qlineedit.h>
+-#include <qpainter.h>
++#include <QCompleter>
++#include <QEvent>
++#include <QLineEdit>
++#include <QPainter>
++#include <QPainterPath>
+
+ SearchButton::SearchButton(QWidget *parent)
+ : QAbstractButton(parent)
+diff --git a/src/tomahawk/widgets/AccountsPopupWidget.cpp b/src/tomahawk/widgets/AccountsPopupWidget.cpp
+index cb5739b97..ffd5dcaa1 100644
+--- a/src/tomahawk/widgets/AccountsPopupWidget.cpp
++++ b/src/tomahawk/widgets/AccountsPopupWidget.cpp
+@@ -24,6 +24,7 @@
+
+ #include <QDebug>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QVBoxLayout>
+
+diff --git a/src/tomahawk/widgets/SlideSwitchButton.cpp b/src/tomahawk/widgets/SlideSwitchButton.cpp
+index 3c61b4987..103562e00 100644
+--- a/src/tomahawk/widgets/SlideSwitchButton.cpp
++++ b/src/tomahawk/widgets/SlideSwitchButton.cpp
+@@ -24,6 +24,7 @@
+
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPropertyAnimation>
+ #include <QStyleOptionButton>
+ #include <QPixmap>
+diff --git a/src/tomahawk/widgets/SocialWidget.cpp b/src/tomahawk/widgets/SocialWidget.cpp
+index f0901279d..b43f44c5d 100644
+--- a/src/tomahawk/widgets/SocialWidget.cpp
++++ b/src/tomahawk/widgets/SocialWidget.cpp
+@@ -29,8 +29,9 @@
+ #include "Source.h"
+ #include "Track.h"
+
+-#include <QPainter>
+ #include <QDialog>
++#include <QPainter>
++#include <QPainterPath>
+ #include <QPropertyAnimation>
+
+ #define ARROW_HEIGHT 6
+--
+2.26.2
+
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
index fca16414dfb..e3e201984d0 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
COMMIT=777b31219179b43f56c7b95857d2fbd7f33199aa
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
DESCRIPTION="Multi-source social music player"
HOMEPAGE="https://github.com/tomahawk-player/tomahawk"
@@ -15,6 +15,9 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="telepathy xmpp"
+BDEPEND="
+ dev-qt/linguist-tools:5
+"
COMMON_DEPEND="
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -44,7 +47,6 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
dev-qt/designer:5
- dev-qt/linguist-tools:5
dev-qt/qtconcurrent:5
"
RDEPEND="${COMMON_DEPEND}
@@ -56,6 +58,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
PATCHES=(
"${FILESDIR}/${P}-fix-warning.patch"
"${FILESDIR}/${P}-cmakepolicy.patch" # bug 674826
+ "${FILESDIR}/${P}-qt-5.15.patch" # pending upstream
)
src_configure() {
@@ -70,7 +73,7 @@ src_configure() {
[[ ${PV} != *9999* ]] && mycmakeargs+=( -DBUILD_RELEASE=ON )
- cmake-utils_src_configure
+ cmake_src_configure
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2020-07-13 0:30 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-07-13 0:30 UTC (permalink / raw
To: gentoo-commits
commit: a56e41a7a6a49de23189cce5c31c6d5acd09695d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 00:16:12 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 00:29:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a56e41a7
media-sound/tomahawk: Fix build with ECM >=5.72.0
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../tomahawk-0.9.0_pre20181030-findtaglib.patch | 244 +++++++++++++++++++++
.../tomahawk/tomahawk-0.9.0_pre20181030.ebuild | 3 +-
2 files changed, 246 insertions(+), 1 deletion(-)
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch
new file mode 100644
index 00000000000..9a53e0d6902
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch
@@ -0,0 +1,244 @@
+From 7c7b57e295aebcca9b09d8c5798e172cb8fd179c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 13 Jul 2020 02:11:06 +0200
+Subject: [PATCH] Import FindTaglib.cmake from ECM 5.72.0
+
+This version of ECM gained a module that is overriding Tomahawk's own, but
+variables are incompatible. Use the updated ECM module until we can depend
+on the necessary ECM version itself.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ CMakeModules/CheckTagLibFileName.cmake | 5 +-
+ CMakeModules/FindTaglib.cmake | 173 +++++++++++++------------
+ src/libtomahawk/CMakeLists.txt | 4 +-
+ 4 files changed, 93 insertions(+), 91 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9422a808e..2f1e72238 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -213,7 +213,7 @@ macro_optional_find_package(Lucene++ 3.0.0)
+ macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search engine" "https://github.com/luceneplusplus/LucenePlusPlus/" TRUE "" "Lucene++ is used for indexing the collection")
+
+ macro_optional_find_package(Taglib 1.8.0)
+-macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
++macro_log_feature(Taglib_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
+ include( CheckTagLibFileName )
+ check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
+
+diff --git a/CMakeModules/CheckTagLibFileName.cmake b/CMakeModules/CheckTagLibFileName.cmake
+index e5b3706c9..7828dcf34 100644
+--- a/CMakeModules/CheckTagLibFileName.cmake
++++ b/CMakeModules/CheckTagLibFileName.cmake
+@@ -1,9 +1,8 @@
+ # taglib changed filenames to be a char/wchar struct on some platforms, need to check for it
+ macro (CHECK_TAGLIB_FILENAME TAGLIB_FILENAME_COMPLEX)
+ include (CheckCXXSourceCompiles)
+- set (CMAKE_REQUIRED_FLAGS ${TAGLIB_CFLAGS})
+- set (CMAKE_REQUIRED_INCLUDES ${TAGLIB_INCLUDES})
+- set (CMAKE_REQUIRED_LIBRARIES ${TAGLIB_LIBRARIES})
++ set (CMAKE_REQUIRED_INCLUDES ${Taglib_INCLUDE_DIRS})
++ set (CMAKE_REQUIRED_LIBRARIES ${Taglib_LIBRARIES})
+ check_cxx_source_compiles(
+ "#include <tfile.h>
+ int main()
+diff --git a/CMakeModules/FindTaglib.cmake b/CMakeModules/FindTaglib.cmake
+index d4ada2592..ad14c79cd 100644
+--- a/CMakeModules/FindTaglib.cmake
++++ b/CMakeModules/FindTaglib.cmake
+@@ -1,87 +1,90 @@
+-# - Try to find the Taglib library
+-# Once done this will define
++#.rst:
++# FindTaglib
++# ----------
+ #
+-# TAGLIB_FOUND - system has the taglib library
+-# TAGLIB_CFLAGS - the taglib cflags
+-# TAGLIB_LIBRARIES - The libraries needed to use taglib
+-
+-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
++# Try to find the Taglib library.
+ #
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-IF(TAGLIB_FOUND)
+- MESSAGE(STATUS "Using manually specified taglib locations")
+-ELSE()
+-
+- if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.6")
+- endif(NOT TAGLIB_MIN_VERSION)
+-
+- if(NOT WIN32)
+- find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
+- ${BIN_INSTALL_DIR}
+- )
+- endif(NOT WIN32)
+-
+- #reset vars
+- set(TAGLIB_LIBRARIES)
+- set(TAGLIB_CFLAGS)
+-
+-# MESSAGE( STATUS "PATHS: ${PATHS}")
+- # if taglib-config has been found
+- if(TAGLIBCONFIG_EXECUTABLE)
+-
+- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+-
+- if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+- message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+- set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+-
+- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+-
+- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS)
+-
+- if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+- set(TAGLIB_FOUND TRUE)
+-# message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}")
+- endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+- string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+- mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+-
+- else(TAGLIBCONFIG_EXECUTABLE)
+-
+- include(FindLibraryWithDebug)
+- include(FindPackageHandleStandardArgs)
+-
+- find_path(TAGLIB_INCLUDES
+- NAMES
+- tag.h
+- PATH_SUFFIXES taglib
+- PATHS
+- ${INCLUDE_INSTALL_DIR}
+- )
+-
+- find_library_with_debug(TAGLIB_LIBRARIES
+- WIN32_DEBUG_POSTFIX d
+- NAMES tag
+- PATHS
+- ${LIB_INSTALL_DIR}
+- )
+-
+- find_package_handle_standard_args(Taglib DEFAULT_MSG
+- TAGLIB_INCLUDES TAGLIB_LIBRARIES)
+- endif(TAGLIBCONFIG_EXECUTABLE)
+-ENDIF()
+-
+-if(TAGLIB_FOUND)
+- if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
+- message(STATUS "Found TagLib: ${TAGLIB_LIBRARIES}")
+- endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
+-else(TAGLIB_FOUND)
+- if(Taglib_FIND_REQUIRED)
+- message(FATAL_ERROR "Could not find Taglib")
+- endif(Taglib_FIND_REQUIRED)
+-endif(TAGLIB_FOUND)
++# This will define the following variables:
++#
++# ``Taglib_FOUND``
++# True if the system has the taglib library of at least the minimum
++# version specified by the version parameter to find_package()
++# ``Taglib_INCLUDE_DIRS``
++# The taglib include dirs for use with target_include_directories
++# ``Taglib_LIBRARIES``
++# The taglib libraries for use with target_link_libraries()
++# ``Taglib_VERSION``
++# The version of taglib that was found
++#
++# If ``Taglib_FOUND`` is TRUE, it will also define the following imported
++# target:
++#
++# ``Taglib::Taglib``
++# The Taglib library
++#
++# Since 5.72.0
++#
++# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org>
++# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
++# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
++# SPDX-License-Identifier: BSD-3-Clause
++
++find_package(PkgConfig QUIET)
++
++pkg_search_module(PC_TAGLIB QUIET taglib)
++
++find_path(Taglib_INCLUDE_DIRS
++ NAMES tag.h
++ PATH_SUFFIXES taglib
++ HINTS ${PC_TAGLIB_INCLUDEDIR}
++)
++
++find_library(Taglib_LIBRARIES
++ NAMES tag
++ HINTS ${PC_TAGLIB_LIBDIR}
++)
++
++set(Taglib_VERSION ${PC_TAGLIB_VERSION})
++
++if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION)
++ if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h")
++ file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H)
++
++ string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H})
++ string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H})
++ string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H})
++
++ string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}")
++ string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}")
++ string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}")
++
++ set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}")
++ endif()
++endif()
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(Taglib
++ FOUND_VAR
++ Taglib_FOUND
++ REQUIRED_VARS
++ Taglib_LIBRARIES
++ Taglib_INCLUDE_DIRS
++ VERSION_VAR
++ Taglib_VERSION
++)
++
++if (Taglib_FOUND AND NOT TARGET Taglib::Taglib)
++ add_library(Taglib::Taglib UNKNOWN IMPORTED)
++ set_target_properties(Taglib::Taglib PROPERTIES
++ IMPORTED_LOCATION "${Taglib_LIBRARIES}"
++ INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}"
++ )
++endif()
++
++mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS)
++
++include(FeatureSummary)
++set_package_properties(Taglib PROPERTIES
++ URL "https://taglib.org/"
++ DESCRIPTION "A library for reading and editing the meta-data of audio formats"
++)
+diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
+index 348d6b1dd..e0a342f0e 100644
+--- a/src/libtomahawk/CMakeLists.txt
++++ b/src/libtomahawk/CMakeLists.txt
+@@ -533,8 +533,8 @@ TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} PRIVATE
+ )
+
+ # TagLib
+-TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} LINK_PUBLIC ${TAGLIB_LIBRARIES})
+-TARGET_INCLUDE_DIRECTORIES(${TOMAHAWK_LIBRARY} PUBLIC ${TAGLIB_INCLUDES})
++TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} LINK_PUBLIC ${Taglib_LIBRARIES})
++TARGET_INCLUDE_DIRECTORIES(${TOMAHAWK_LIBRARY} PUBLIC ${Taglib_INCLUDE_DIRS})
+
+ INSTALL( TARGETS ${TOMAHAWK_LIBRARY}
+ EXPORT TomahawkLibraryDepends
+--
+2.27.0
+
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
index 147b6958096..442d0f525b7 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
@@ -58,7 +58,8 @@ S="${WORKDIR}/${PN}-${COMMIT}"
PATCHES=(
"${FILESDIR}/${P}-fix-warning.patch"
"${FILESDIR}/${P}-cmakepolicy.patch" # bug 674826
- "${FILESDIR}/${P}-qt-5.15.patch" # pending upstream
+ "${FILESDIR}/${P}-qt-5.15.patch" # git master
+ "${FILESDIR}/${P}-findtaglib.patch" # pending upstream
)
src_configure() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-07-13 0:30 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-26 8:46 [gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-07-13 0:30 Andreas Sturmlechner
2020-05-08 22:36 Andreas Sturmlechner
2018-04-17 12:10 Andreas Sturmlechner
2016-04-18 20:10 Johannes Huber
2016-04-11 16:50 Johannes Huber
2016-03-10 21:10 Johannes Huber
2016-02-09 15:08 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox