commit: 809669c7d78c443c904d0fdc9531edf0ac5ae112 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sun Dec 11 17:42:35 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Dec 11 17:43:51 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809669c7
media-gfx/kphotoalbum: backport misc build fixes from upstream Package-Manager: portage-2.3.3 .../files/kphotoalbum-5.0.1-buildbackports.patch | 190 +++++++++++++++++++++ media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild | 12 +- 2 files changed, 193 insertions(+), 9 deletions(-) diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch new file mode 100644 index 00000000..26eac8d --- /dev/null +++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch @@ -0,0 +1,190 @@ +From 87d8f63d5966b36af60e9d4aac95196fcee30f91 Mon Sep 17 00:00:00 2001 +From: Johannes Zarl-Zierl <[email protected]> +Date: Sun, 30 Oct 2016 21:52:03 +0100 +Subject: [PATCH] Review dependency list. + +Thanks to kensington for the suggestion! +--- + CMakeLists.txt | 23 ++++++++++++++++++----- + 1 file changed, 18 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 120a703..95f46c9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,7 +20,7 @@ include(FeatureSummary) + + find_package(Qt5 REQUIRED COMPONENTS Sql Xml Widgets Network) + find_package(Phonon4Qt5 REQUIRED) +-find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n KIO DocTools WidgetsAddons Config IconThemes Archive Parts JobWidgets) ++find_package(KF5 REQUIRED COMPONENTS Archive Completion Config CoreAddons DocTools I18n IconThemes JobWidgets KIO TextWidgets WidgetsAddons) + + # enable exceptions: + kde_enable_exceptions() +@@ -445,10 +445,23 @@ set(kphotoalbum_SRCS + add_executable(kphotoalbum ${kphotoalbum_SRCS}) + + # External components +-target_link_libraries(kphotoalbum ${JPEG_LIBRARY}) +-target_link_libraries(kphotoalbum Qt5::Network) +-target_link_libraries(kphotoalbum KF5::KIOCore KF5::CoreAddons KF5::I18n KF5::ConfigCore KF5::ConfigGui KF5::IconThemes KF5::Archive KF5::Parts KF5::JobWidgets KF5::WidgetsAddons) +-target_link_libraries(kphotoalbum Phonon::phonon4qt5) ++target_link_libraries(kphotoalbum ++ ${JPEG_LIBRARY} ++ KF5::Archive ++ KF5::Completion ++ KF5::ConfigCore ++ KF5::ConfigGui ++ KF5::CoreAddons ++ KF5::I18n ++ KF5::IconThemes ++ KF5::JobWidgets ++ KF5::KIOCore ++ KF5::KIOWidgets ++ KF5::TextWidgets ++ KF5::WidgetsAddons ++ Phonon::phonon4qt5 ++ Qt5::Network ++ ) + + if(KF5Kipi_FOUND) + target_link_libraries(kphotoalbum KF5::Kipi) +-- +2.7.3 + +From e07a6ffd6a96a527e0ac26e9f12eb1bcd7767830 Mon Sep 17 00:00:00 2001 +From: Johannes Zarl-Zierl <[email protected]> +Date: Thu, 8 Dec 2016 22:02:13 +0100 +Subject: [PATCH] Remove bogus dependency on KF5KExiv2 + +--- + CMakeLists.txt | 28 +++++++++++----------------- + 1 file changed, 11 insertions(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1594af0..36228b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,15 +92,13 @@ set_package_properties(KF5KDcraw + ) + set(HAVE_KDCRAW ${KF5KDcraw_FOUND} ) + +-find_package(KF5KExiv2) +-# FIXME: most of KPhotoAlbum uses plain libexiv: + find_package(Exiv2) +-set_package_properties(KF5KExiv2 ++set_package_properties(Exiv2 + PROPERTIES + TYPE RECOMMENDED + PURPOSE "Enables image metadata (exiv) support (strongly advised!)" + ) +-set(HAVE_EXIV2 ${KF5KExiv2_FOUND}) ++set(HAVE_EXIV2 ${Exiv2_FOUND}) + + if(ENABLE_PLAYGROUND) + find_package(KF5KFace 5.0.0 CONFIG) +@@ -112,16 +110,12 @@ if(ENABLE_PLAYGROUND) + set(HAVE_KFACE ${KF5KFace_FOUND}) + endif() + +-if(KF5KExiv2_FOUND) +- find_package(KF5KGeoMap) +- set_package_properties(KF5KGeoMap +- PROPERTIES +- TYPE OPTIONAL +- PURPOSE "Enables support for geographic map location using embedded GPS information." +- ) +-else() +- message(STATUS "Not searching KF5KGeoMap because of missing dependency KF5KExiv2...") +-endif() ++find_package(KF5KGeoMap) ++set_package_properties(KF5KGeoMap ++ PROPERTIES ++ TYPE OPTIONAL ++ PURPOSE "Enables support for geographic map location using embedded GPS information." ++ ) + set(HAVE_KGEOMAP ${KF5KGeoMap_FOUND}) + + add_custom_target( +@@ -433,7 +427,7 @@ add_subdirectory(script) + add_subdirectory(doc) + + set(EXIV2_SRCS) +-if(KF5KExiv2_FOUND AND Qt5Sql_FOUND) ++if(Exiv2_FOUND AND Qt5Sql_FOUND) + set(EXIV2_SRCS + #${CMAKE_CURRENT_SOURCE_DIR}/Browser/ExifFolder.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Settings/ExifPage.cpp +@@ -499,8 +493,8 @@ if(KF5KDcraw_FOUND) + target_link_libraries(kphotoalbum KF5::KDcraw) + endif() + +-if(KF5KExiv2_FOUND) +- target_link_libraries(kphotoalbum KF5::KExiv2 ${EXIV2_LIBRARIES} Qt5::Sql) ++if(Exiv2_FOUND) ++ target_link_libraries(kphotoalbum ${EXIV2_LIBRARIES} Qt5::Sql) + endif() + + if(KF5KFace_FOUND) +-- +2.7.3 + +From b17b99d25645b62838f7731b66d60a7efbbb5385 Mon Sep 17 00:00:00 2001 +From: Pino Toscano <[email protected]> +Date: Sat, 26 Nov 2016 17:06:35 +0100 +Subject: [PATCH] cmake: require KF5::XmlGui + +It is used explicitly (see KXmlGuiWindow), so it is needed to look for +it and link to it. +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5fef0df..b24ab3b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -69,7 +69,7 @@ endforeach() + + find_package(Qt5 REQUIRED COMPONENTS Sql Xml Widgets Network) + find_package(Phonon4Qt5 REQUIRED) +-find_package(KF5 REQUIRED COMPONENTS Archive Completion Config CoreAddons DocTools I18n IconThemes JobWidgets KIO TextWidgets WidgetsAddons) ++find_package(KF5 REQUIRED COMPONENTS Archive Completion Config CoreAddons DocTools I18n IconThemes JobWidgets KIO TextWidgets XmlGui WidgetsAddons) + + find_package(JPEG REQUIRED) + if(JPEG_FOUND) +@@ -484,6 +484,7 @@ target_link_libraries(kphotoalbum + KF5::KIOCore + KF5::KIOWidgets + KF5::TextWidgets ++ KF5::XmlGui + KF5::WidgetsAddons + Phonon::phonon4qt5 + Qt5::Network +-- +2.7.3 + +From e3c1911d5ad54f672cf086b041376f11ad4f446e Mon Sep 17 00:00:00 2001 +From: Johannes Zarl-Zierl <[email protected]> +Date: Thu, 27 Oct 2016 18:12:11 +0200 +Subject: [PATCH] Fix compilation with Qt 5.6.1 + +--- + HTMLGenerator/HTMLDialog.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/HTMLGenerator/HTMLDialog.cpp b/HTMLGenerator/HTMLDialog.cpp +index 9aa619d..3e53c58 100644 +--- a/HTMLGenerator/HTMLDialog.cpp ++++ b/HTMLGenerator/HTMLDialog.cpp +@@ -20,6 +20,7 @@ + + #include <QCheckBox> + #include <QComboBox> ++#include <QDebug> + #include <QDialogButtonBox> + #include <QFileDialog> + #include <QGroupBox> +-- +2.7.3 + diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild index 85cfa21..7f8ee13 100644 --- a/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild +++ b/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild @@ -13,9 +13,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2+ FDL-1.2" KEYWORDS="~amd64 ~x86" -IUSE="+exif +face +kipi +map +raw" - -REQUIRED_USE="map? ( exif )" +IUSE="+face +kipi +map +raw" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -37,12 +35,9 @@ COMMON_DEPEND=" $(add_qt_dep qtsql 'sqlite') $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) + >=media-gfx/exiv2-0.17:= media-libs/phonon[qt5] virtual/jpeg:0 - exif? ( - $(add_kdeapps_dep libkexiv2) - >=media-gfx/exiv2-0.17:= - ) face? ( $(add_kdeapps_dep libkface) ) kipi? ( $(add_kdeapps_dep libkipi) ) map? ( $(add_kdeapps_dep libkgeomap) ) @@ -58,11 +53,10 @@ RDEPEND="${COMMON_DEPEND} " DOCS=( ChangeLog README ) +PATCHES=( "${FILESDIR}/${P}-buildbackports.patch" ) src_configure() { local mycmakeargs=( - $(cmake-utils_use_find_package exif Exiv2) - $(cmake-utils_use_find_package exif KF5KExiv2) $(cmake-utils_use_find_package face KF5KFace) $(cmake-utils_use_find_package kipi KF5Kipi) $(cmake-utils_use_find_package map KF5KGeoMap)
