diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-10-17 12:02:19 +0200 |
|---|---|---|
| committer |   Michael Palimaka <kensington@gentoo.org> | 2015-10-23 00:18:11 +1100 |
| commit | 3df6fb500cb1b6120065db4a7a972ba84ef49dc1 (patch) | |
| tree | 4ef249e9ad1c212eb748110ab39514321806d3d5 | |
| parent | media-gfx/digikam: Version bump to 4.14.0 (diff) | |
| download | gentoo-3df6fb500cb1b6120065db4a7a972ba84ef49dc1.tar.gz gentoo-3df6fb500cb1b6120065db4a7a972ba84ef49dc1.tar.bz2 gentoo-3df6fb500cb1b6120065db4a7a972ba84ef49dc1.zip | |
media-gfx/kphotoalbum: Add upstream patch to match updated kdelibs4 policy
Package-Manager: portage-2.2.20.1
| -rw-r--r-- | media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch | 31 | ||||
| -rw-r--r-- | media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch b/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch new file mode 100644 index 000000000000..f23a8f8bac28 --- /dev/null +++ b/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch @@ -0,0 +1,31 @@ +From: David Faure <faure@kde.org> +Date: Sun, 26 Jul 2015 16:12:24 +0000 +Subject: set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix build accordingly +X-Git-Url: http://quickgit.kde.org/?p=kphotoalbum.git&a=commitdiff&h=f785317ba88528760886b592aa9604b0c4ba62dd +--- +set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix build accordingly + +(working around the lack of ${KDE4_KMEDIAPLAYER_LIBS}) + +CCMAIL: kde-buildsystem@kde.org +--- + + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR) ++cmake_minimum_required(VERSION 2.8.9) + project(kphotoalbum) + + if(POLICY CMP0017) +@@ -456,7 +456,7 @@ + target_link_libraries(kphotoalbum Utilities) + + # External components +-target_link_libraries(kphotoalbum ${KDE4_KIO_LIBS} ${JPEG_LIBRARY} kmediaplayer ${KDE4_PHONON_LIBS}) ++target_link_libraries(kphotoalbum ${KDE4_KIO_LIBS} ${JPEG_LIBRARY} ${KDE4_TARGET_PREFIX}kmediaplayer ${KDE4_PHONON_LIBS}) + + if(KIPI_FOUND) + target_link_libraries(kphotoalbum ${KIPI_LIBRARIES}) + diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild index d83e74cce2bf..ad86cca27c08 100644 --- a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild +++ b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild @@ -40,6 +40,7 @@ RDEPEND="${COMMON_DEPEND} kipi? ( >=media-plugins/kipi-plugins-4.7.0 ) " +PATCHES=( "${FILESDIR}/${P}-bump-min-cmake.patch" ) DOCS=( ChangeLog README ) src_configure() { |