commit: 3452b9b6889dfa420bca27f2ddf9fdb531abc530
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 20:38:30 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 20:40:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3452b9b6
media-sound/tomahawk: Fix live /w latest dev-libs/quazip
Package-Manager: portage-2.3.2
.../tomahawk/files/tomahawk-quazip-cmake.patch | 67 ----------------------
media-sound/tomahawk/tomahawk-9999.ebuild | 7 +--
2 files changed, 2 insertions(+), 72 deletions(-)
diff --git a/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch
b/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch
deleted file mode 100644
index 7972056..00000000
--- a/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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 62a586d..5e61a7e 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -37,7 +37,7 @@ CDEPEND="
dev-cpp/sparsehash
dev-libs/boost:=
dev-libs/qtkeychain:=[qt5]
- dev-libs/quazip[qt5]
+ >=dev-libs/quazip-0.7.2[qt5]
>=media-libs/libechonest-2.3.1:=[qt5]
media-libs/liblastfm[qt5]
>=media-libs/taglib-1.8.0
@@ -58,10 +58,7 @@ RDEPEND="${CDEPEND}
DOCS=( AUTHORS ChangeLog README.md )
-PATCHES=(
- "${FILESDIR}/${PN}-quazip-cmake.patch"
- "${FILESDIR}/${PN}-liblastfm-cmake.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-liblastfm-cmake.patch" )
src_configure() {
local mycmakeargs=(
