commit: 1eb36c651e0363b5fb309776ccee23e7bb39cc7b Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sat Dec 19 12:18:44 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Dec 20 15:44:01 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1eb36c65
kde-apps/mailcommon: Add USE=designer Backport from git master Package-Manager: portage-2.2.24 .../mailcommon-15.12.0-find-qt5designer.patch | 24 ++++++++++++++++++++++ ...15.12.0.ebuild => mailcommon-15.12.0-r1.ebuild} | 13 ++++++++++-- .../mailcommon/mailcommon-15.12.49.9999.ebuild | 13 ++++++++++-- kde-apps/mailcommon/mailcommon-9999.ebuild | 11 ++++++++-- kde-apps/mailcommon/metadata.xml | 3 +++ 5 files changed, 58 insertions(+), 6 deletions(-) diff --git a/kde-apps/mailcommon/files/mailcommon-15.12.0-find-qt5designer.patch b/kde-apps/mailcommon/files/mailcommon-15.12.0-find-qt5designer.patch new file mode 100644 index 0000000..9317ccf --- /dev/null +++ b/kde-apps/mailcommon/files/mailcommon-15.12.0-find-qt5designer.patch @@ -0,0 +1,24 @@ +From: Montel Laurent <[email protected]> +Date: Fri, 18 Dec 2015 06:27:49 +0000 +Subject: Generate designer plugins +X-Git-Url: http://quickgit.kde.org/?p=mailcommon.git&a=commitdiff&h=a5f3593adc2e13124adf3a5258685c6954d12278 +--- +Generate designer plugins +--- + + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,6 +52,12 @@ + find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED) + find_package(Phonon4Qt5 CONFIG REQUIRED) + ++find_package(Qt5Designer CONFIG) ++set_package_properties(Qt5Designer PROPERTIES ++ PURPOSE "Required to build the Qt Designer plugins" ++ TYPE OPTIONAL ++) ++ + find_package(Xsltproc) + set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.") + diff --git a/kde-apps/mailcommon/mailcommon-15.12.0.ebuild b/kde-apps/mailcommon/mailcommon-15.12.0-r1.ebuild similarity index 84% rename from kde-apps/mailcommon/mailcommon-15.12.0.ebuild rename to kde-apps/mailcommon/mailcommon-15.12.0-r1.ebuild index 89b4358..06413c9 100644 --- a/kde-apps/mailcommon/mailcommon-15.12.0.ebuild +++ b/kde-apps/mailcommon/mailcommon-15.12.0-r1.ebuild @@ -11,7 +11,7 @@ inherit kde5 DESCRIPTION="Common mail library" LICENSE="LGPL-2+" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="designer" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -37,13 +37,13 @@ COMMON_DEPEND=" $(add_kdeapps_dep pimcommon) $(add_kdeapps_dep templateparser) dev-libs/libxslt - dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] " DEPEND="${COMMON_DEPEND} sys-devel/gettext + designer? ( dev-qt/designer:5 ) " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 @@ -55,3 +55,12 @@ if [[ ${KDE_BUILD_TYPE} = live ]] ; then else S="${WORKDIR}/${KMNAME}-${PV}/${PN}" fi + +PATCHES=( "${FILESDIR}/${PN}-15.12.0-find-qt5designer.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package designer Qt5Designer) + ) + kde5_src_configure +} diff --git a/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild b/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild index 0cf6186..27ae909 100644 --- a/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild +++ b/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild @@ -11,7 +11,7 @@ inherit kde5 DESCRIPTION="Common mail library" LICENSE="LGPL-2+" KEYWORDS="" -IUSE="" +IUSE="designer" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -37,13 +37,13 @@ COMMON_DEPEND=" $(add_kdeapps_dep pimcommon) $(add_kdeapps_dep templateparser) dev-libs/libxslt - dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] " DEPEND="${COMMON_DEPEND} sys-devel/gettext + designer? ( dev-qt/designer:5 ) " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 @@ -55,3 +55,12 @@ if [[ ${KDE_BUILD_TYPE} = live ]] ; then else S="${WORKDIR}/${KMNAME}-${PV}/${PN}" fi + +PATCHES=( "${FILESDIR}/${PN}-15.12.0-find-qt5designer.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package designer Qt5Designer) + ) + kde5_src_configure +} diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild b/kde-apps/mailcommon/mailcommon-9999.ebuild index 0c6f132..2c16313 100644 --- a/kde-apps/mailcommon/mailcommon-9999.ebuild +++ b/kde-apps/mailcommon/mailcommon-9999.ebuild @@ -10,7 +10,7 @@ inherit kde5 DESCRIPTION="Common mail library" LICENSE="LGPL-2+" KEYWORDS="" -IUSE="" +IUSE="designer" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -33,15 +33,22 @@ COMMON_DEPEND=" $(add_kdeapps_dep messagelib) $(add_kdeapps_dep pimcommon) dev-libs/libxslt - dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] " DEPEND="${COMMON_DEPEND} sys-devel/gettext + designer? ( dev-qt/designer:5 ) " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 !kde-base/kdepim-common-libs:4 " + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package designer Qt5Designer) + ) + kde5_src_configure +} diff --git a/kde-apps/mailcommon/metadata.xml b/kde-apps/mailcommon/metadata.xml index a23f444..774f7f1 100644 --- a/kde-apps/mailcommon/metadata.xml +++ b/kde-apps/mailcommon/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <herd>kde</herd> + <use> + <flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag> + </use> </pkgmetadata>
