| 1 |
commit: 3452b9b6889dfa420bca27f2ddf9fdb531abc530 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 28 20:38:30 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 28 20:40:39 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3452b9b6 |
| 7 |
|
| 8 |
media-sound/tomahawk: Fix live /w latest dev-libs/quazip |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
.../tomahawk/files/tomahawk-quazip-cmake.patch | 67 ---------------------- |
| 13 |
media-sound/tomahawk/tomahawk-9999.ebuild | 7 +-- |
| 14 |
2 files changed, 2 insertions(+), 72 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch b/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index 7972056..00000000 |
| 19 |
--- a/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,67 +0,0 @@ |
| 22 |
-diff --git a/CMakeModules/FindQuaZip.cmake b/CMakeModules/FindQuaZip.cmake |
| 23 |
-deleted file mode 100644 |
| 24 |
-index 7e628fc..0000000 |
| 25 |
---- a/CMakeModules/FindQuaZip.cmake |
| 26 |
-+++ /dev/null |
| 27 |
-@@ -1,43 +0,0 @@ |
| 28 |
--# QUAZIP_FOUND - QuaZip library was found |
| 29 |
--# QUAZIP_INCLUDE_DIR - Path to QuaZip include dir |
| 30 |
--# QUAZIP_INCLUDE_DIRS - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR) |
| 31 |
--# QUAZIP_LIBRARIES - List of QuaZip libraries |
| 32 |
--# QUAZIP_ZLIB_INCLUDE_DIR - The include dir of zlib headers |
| 33 |
-- |
| 34 |
-- |
| 35 |
--IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) |
| 36 |
-- # in cache already |
| 37 |
-- SET(QUAZIP_FOUND TRUE) |
| 38 |
--ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) |
| 39 |
-- IF (Qt5Core_FOUND) |
| 40 |
-- set(QUAZIP_LIB_VERSION_SUFFIX 5) |
| 41 |
-- ENDIF() |
| 42 |
-- IF (WIN32) |
| 43 |
-- FIND_PATH(QUAZIP_LIBRARY_DIR |
| 44 |
-- WIN32_DEBUG_POSTFIX d |
| 45 |
-- NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll |
| 46 |
-- HINTS "C:/Programme/" "C:/Program Files" |
| 47 |
-- PATH_SUFFIXES QuaZip/lib |
| 48 |
-- ) |
| 49 |
-- FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR}) |
| 50 |
-- FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) |
| 51 |
-- FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h) |
| 52 |
-- ELSE(WIN32) |
| 53 |
-- FIND_PACKAGE(PkgConfig) |
| 54 |
--# pkg_check_modules(PC_QCA2 QUIET qca2) |
| 55 |
-- pkg_check_modules(PC_QUAZIP quazip) |
| 56 |
-- FIND_LIBRARY(QUAZIP_LIBRARIES |
| 57 |
-- WIN32_DEBUG_POSTFIX d |
| 58 |
-- NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} |
| 59 |
-- HINTS /usr/lib /usr/lib64 |
| 60 |
-- ) |
| 61 |
-- FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h |
| 62 |
-- HINTS /usr/include /usr/local/include |
| 63 |
-- PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} |
| 64 |
-- ) |
| 65 |
-- FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) |
| 66 |
-- ENDIF (WIN32) |
| 67 |
-- INCLUDE(FindPackageHandleStandardArgs) |
| 68 |
-- SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR}) |
| 69 |
-- find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS) |
| 70 |
--ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) |
| 71 |
-diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp |
| 72 |
-index 0baa27c..74b403b 100644 |
| 73 |
---- a/src/libtomahawk/utils/TomahawkUtils.cpp |
| 74 |
-+++ b/src/libtomahawk/utils/TomahawkUtils.cpp |
| 75 |
-@@ -39,13 +39,8 @@ |
| 76 |
- #endif |
| 77 |
- #endif |
| 78 |
- |
| 79 |
--#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) |
| 80 |
--#include <quazip5/quazip.h> |
| 81 |
--#include <quazip5/quazipfile.h> |
| 82 |
--#else |
| 83 |
- #include <quazip/quazip.h> |
| 84 |
- #include <quazip/quazipfile.h> |
| 85 |
--#endif |
| 86 |
- // We need this for the version info (if available) |
| 87 |
- #include <taglib/taglib.h> |
| 88 |
- |
| 89 |
|
| 90 |
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild |
| 91 |
index 62a586d..5e61a7e 100644 |
| 92 |
--- a/media-sound/tomahawk/tomahawk-9999.ebuild |
| 93 |
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild |
| 94 |
@@ -37,7 +37,7 @@ CDEPEND=" |
| 95 |
dev-cpp/sparsehash |
| 96 |
dev-libs/boost:= |
| 97 |
dev-libs/qtkeychain:=[qt5] |
| 98 |
- dev-libs/quazip[qt5] |
| 99 |
+ >=dev-libs/quazip-0.7.2[qt5] |
| 100 |
>=media-libs/libechonest-2.3.1:=[qt5] |
| 101 |
media-libs/liblastfm[qt5] |
| 102 |
>=media-libs/taglib-1.8.0 |
| 103 |
@@ -58,10 +58,7 @@ RDEPEND="${CDEPEND} |
| 104 |
|
| 105 |
DOCS=( AUTHORS ChangeLog README.md ) |
| 106 |
|
| 107 |
-PATCHES=( |
| 108 |
- "${FILESDIR}/${PN}-quazip-cmake.patch" |
| 109 |
- "${FILESDIR}/${PN}-liblastfm-cmake.patch" |
| 110 |
-) |
| 111 |
+PATCHES=( "${FILESDIR}/${PN}-liblastfm-cmake.patch" ) |
| 112 |
|
| 113 |
src_configure() { |
| 114 |
local mycmakeargs=( |
Archives