[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/

2020-07-12 Thread Andreas Sturmlechner 
commit: a56e41a7a6a49de23189cce5c31c6d5acd09695d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 13 00:16:12 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul 13 00:29:11 2020 +
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  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 000..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 
+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 
+---
+ 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 
+   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, 
++# 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}")
+-

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/

2020-05-08 Thread Andreas Sturmlechner 
commit: 4e33aa61197053aecccb7c693ac74a44223bc77a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May  8 22:34:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May  8 22:36:04 2020 +
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  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 000..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 
+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 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+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 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+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 
++#include 
++#include 
+ 
+ #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 
+ #include 
+ #include 
++#include 
+ 
+ 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 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+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 
+-#include 
+-#include 
+-#include 
++#include 
++#include 
++#include 
++#include 
++#include 
+ 
+ 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 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+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 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+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

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/

2019-01-26 Thread Andreas Sturmlechner 
commit: 488d5319cf31630b221a1abe66e284df51fdd11a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 26 08:35:20 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 26 08:46:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=488d5319

media-sound/tomahawk: Try to fix build with https://bugs.gentoo.org/674826
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  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 000..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 
+Date: Fri, 25 Jan 2019 21:13:05 +0100
+Subject: [PATCH] Fix build with

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/

2018-04-17 Thread Andreas Sturmlechner 
commit: 3c3186be7affddef949635aac80d85332c7fd600
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr 17 11:27:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 17 12:02:23 2018 +
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 000..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 
+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
++)

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/

2016-04-18 Thread Johannes Huber 
commit: 45ba63de05def5964878124c0e1a59af71711263
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr 18 20:09:49 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Apr 18 20:10:01 2016 +
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-.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 000..537fa1d
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch
@@ -0,0 +1,168 @@
+commit 778b8ee180480e4296fe96d2496b740df8365f02
+Author: Dominik Schmidt 
+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 
++#else
+ #include 
++#endif
+ 
+ #include 
+ 
+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 
++#else
+ #include 
++#endif
+ 
+ #include 
+ 
+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 
++#include 
++#else
+ #include 
+ #include 
++#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 
++#else
+ #include 
++#endif
+ 
+ #include 
+ #include 
+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 
+ #include 
+ 
+-#include 
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include 
++#else
++#include 
++#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 
+ #include 
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include 
++#else
+ #include 
++#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 @@
+ 
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/

2016-04-11 Thread Johannes Huber 
commit: f6d756fe90250378eab32f0622f25b79fdffc825
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr 11 11:54:14 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Apr 11 16:50:16 2016 +
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-.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 000..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 
+-#include 
+-#include 
+-#include 
+-#else
+ #include 
+ #include 
+ #include 
+ #include 
+-#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 
+-#include 
+-#else
+ #include 
+ #include 
+-#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 
+-#include 
+-#include 
+-#else
+ #include 
+ #include 
+ #include 
+-#endif
+ 
+ #include 
+ 
+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 
+-#else
+ #include 
+-#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 
+-#else
+-#include 
+-#endif
+ #include 
+ 
+ /**
+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 
+-#else
+ #include 
+-#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 000..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..000
+--- 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

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/

2016-03-10 Thread Johannes Huber 
commit: 47568dd7628758a71f379d14a3863a8e8413c718
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Mar 10 21:08:27 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Mar 10 21:09:58 2016 +
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  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 000..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 
+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() {

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/

2016-02-09 Thread Michael Palimaka 
commit: b286a18e55066222770c7fa341a5fef0afcd0239
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Feb  9 15:07:14 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Feb  9 15:07:58 2016 +
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 000..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 
+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=(