diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /media-sound/kid3/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'media-sound/kid3/files')
-rw-r--r-- | media-sound/kid3/files/kid3-3.3.2-libdir.patch | 44 | ||||
-rw-r--r-- | media-sound/kid3/files/kid3-3.4.4-deps.patch | 40 |
2 files changed, 84 insertions, 0 deletions
diff --git a/media-sound/kid3/files/kid3-3.3.2-libdir.patch b/media-sound/kid3/files/kid3-3.3.2-libdir.patch new file mode 100644 index 000000000000..b54bf129693c --- /dev/null +++ b/media-sound/kid3/files/kid3-3.3.2-libdir.patch @@ -0,0 +1,44 @@ +Install libraries to the correct directory. + +Gentoo-bug: 562624 +Gentoo-bug: 570976 +Gentoo-bug: 576946 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -159,7 +159,7 @@ + endif (BUILD_KDE_APP OR BUILD_SHARED_LIBS) + set(WITH_QMLDIR_DEFAULT "share/kid3/qml") + set(WITH_BINDIR_DEFAULT "bin") +- set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}/kid3") ++ set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}") + set(WITH_PLUGINSDIR_DEFAULT "${WITH_LIBDIR_DEFAULT}/plugins") + endif (APPLE) + +@@ -189,6 +189,10 @@ + set(CMAKE_INSTALL_PREFIX_SLASH "") + endif (CMAKE_INSTALL_PREFIX) + ++if (NOT APPLE AND NOT WIN32) ++ set(WITH_PLUGINSDIR "${WITH_LIBDIR_DEFAULT}/${QTVER}/plugins/kid3") ++endif () ++ + if (APPLE) + file(RELATIVE_PATH CFG_DATAROOTDIR "/kid3.app/Contents/MacOS" /${WITH_DATAROOTDIR}) + file(RELATIVE_PATH CFG_DOCDIR "/kid3.app/Contents/MacOS" /${WITH_DOCDIR}) +@@ -241,6 +245,7 @@ + find_package(Qt4 COMPONENTS ${_QT4_COMPONENTS}) + if (Qt4_FOUND OR QT4_FOUND) + include (${QT_USE_FILE}) ++ set(QTVER "qt4") + if (NOT WITH_QT4) + message(STATUS "Qt4 found, explicitly set WITH_QT5 or QT_QMAKE_EXECUTABLE to use a different version.") + endif (NOT WITH_QT4) +@@ -276,6 +281,7 @@ + endif (_qt5Dir) + if (Qt5Core_FOUND) + set(HAVE_QT5 1) ++ set(QTVER "qt5") + set(WITH_PHONON OFF) + set(QT_INCLUDES) + set(QT_DEFINITIONS) diff --git a/media-sound/kid3/files/kid3-3.4.4-deps.patch b/media-sound/kid3/files/kid3-3.4.4-deps.patch new file mode 100644 index 000000000000..333645d11b39 --- /dev/null +++ b/media-sound/kid3/files/kid3-3.4.4-deps.patch @@ -0,0 +1,40 @@ +From 2f66191a82e60a2b46ead8aa2195346084817e91 Mon Sep 17 00:00:00 2001 +From: Michael Palimaka <kensington@gentoo.org> +Date: Sun, 27 Nov 2016 20:00:37 +1100 +Subject: [PATCH] Improve KF5 dependencies. + +This list was compiled from a cusory include and NEEDED inspection. +--- + src/app/CMakeLists.txt | 2 +- + src/app/kde/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt +index 516e3f9..7790fde 100644 +--- a/src/app/CMakeLists.txt ++++ b/src/app/CMakeLists.txt +@@ -33,7 +33,7 @@ if (BUILD_KDE_APP) + include(KDECMakeSettings) + include(FeatureSummary) + +- find_package(KF5 REQUIRED COMPONENTS KIO) ++ find_package(KF5 REQUIRED COMPONENTS Config ConfigWidgets CoreAddons WidgetsAddons XmlGui) + + if (BUILD_SHARED_LIBS) + # KDECMakeSettings.cmake will overwrite our RPATH if LIB_INSTALL_DIR is +diff --git a/src/app/kde/CMakeLists.txt b/src/app/kde/CMakeLists.txt +index 2f2867a..8a25b43 100644 +--- a/src/app/kde/CMakeLists.txt ++++ b/src/app/kde/CMakeLists.txt +@@ -13,7 +13,7 @@ if (HAVE_QT5) + + add_executable(kid3 ${kde_SRCS}) + +- target_link_libraries(kid3 kid3-gui KF5::KIOFileWidgets -lstdc++) ++ target_link_libraries(kid3 kid3-gui KF5::ConfigCore KF5::ConfigGui KF5::ConfigWidgets KF5::CoreAddons KF5::WidgetsAddons KF5::XmlGui -lstdc++) + + install(TARGETS kid3 DESTINATION ${BIN_INSTALL_DIR}) + install(FILES ../kid3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +-- +2.10.2 + |