diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2016-03-23 15:46:28 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2016-03-23 15:47:05 +0100 |
| commit | 45f421bb8ef5ba6193b15d4fbe519dc1785fb00c (patch) | |
| tree | f9f6f4abf2bf4ad72722e1d434da2d5c335d9e9a /media-sound/kid3 | |
| parent | media-sound/kid3: Removed old. (diff) | |
| download | gentoo-45f421bb8ef5ba6193b15d4fbe519dc1785fb00c.tar.gz gentoo-45f421bb8ef5ba6193b15d4fbe519dc1785fb00c.tar.bz2 gentoo-45f421bb8ef5ba6193b15d4fbe519dc1785fb00c.zip | |
media-sound/kid3: Fixed location of plugins dir (bug #576946).
Thanks to Gramiel <gentoo.bugs@mailinator.com> for findinf the root
cause and to jjtt <jjtt@mbnet.fi> for providing a patch.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'media-sound/kid3')
| -rw-r--r-- | media-sound/kid3/files/kid3-3.3.2-libdir.patch | 44 | ||||
| -rw-r--r-- | media-sound/kid3/kid3-3.3.2-r1.ebuild (renamed from media-sound/kid3/kid3-3.3.2.ebuild) | 2 |
2 files changed, 45 insertions, 1 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/kid3-3.3.2.ebuild b/media-sound/kid3/kid3-3.3.2-r1.ebuild index 72088708640c..c52b7b3a61a0 100644 --- a/media-sound/kid3/kid3-3.3.2.ebuild +++ b/media-sound/kid3/kid3-3.3.2-r1.ebuild @@ -49,7 +49,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/${PN}-3.2.1-libdir.patch" ) +PATCHES=( "${FILESDIR}/${PN}-3.3.2-libdir.patch" ) src_configure() { local mycmakeargs=( |