diff options
| -rw-r--r-- | kde-apps/pimcommon/files/pimcommon-15.12.0-find-qt5designer.patch | 15 | ||||
| -rw-r--r-- | kde-apps/pimcommon/metadata.xml | 3 | ||||
| -rw-r--r-- | kde-apps/pimcommon/pimcommon-15.12.0-r1.ebuild (renamed from kde-apps/pimcommon/pimcommon-15.12.0.ebuild) | 13 | ||||
| -rw-r--r-- | kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild | 13 | ||||
| -rw-r--r-- | kde-apps/pimcommon/pimcommon-9999.ebuild | 11 |
5 files changed, 49 insertions, 6 deletions
diff --git a/kde-apps/pimcommon/files/pimcommon-15.12.0-find-qt5designer.patch b/kde-apps/pimcommon/files/pimcommon-15.12.0-find-qt5designer.patch new file mode 100644 index 00000000000..f45c6aa1806 --- /dev/null +++ b/kde-apps/pimcommon/files/pimcommon-15.12.0-find-qt5designer.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,6 +51,11 @@ + find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED) + find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) + ++find_package(Qt5Designer CONFIG) ++set_package_properties(Qt5Designer PROPERTIES ++ PURPOSE "Required to build the Qt Designer plugins" ++ TYPE OPTIONAL ++) + + ecm_setup_version(${PIMCOMMON_LIB_VERSION} VARIABLE_PREFIX PIMCOMMON + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/pimcommon_version.h" + diff --git a/kde-apps/pimcommon/metadata.xml b/kde-apps/pimcommon/metadata.xml index a23f444b67d..774f7f17dc3 100644 --- a/kde-apps/pimcommon/metadata.xml +++ b/kde-apps/pimcommon/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> diff --git a/kde-apps/pimcommon/pimcommon-15.12.0.ebuild b/kde-apps/pimcommon/pimcommon-15.12.0-r1.ebuild index b2dbc3b5dc6..ec5cc0be83a 100644 --- a/kde-apps/pimcommon/pimcommon-15.12.0.ebuild +++ b/kde-apps/pimcommon/pimcommon-15.12.0-r1.ebuild @@ -11,7 +11,7 @@ inherit kde5 DESCRIPTION="Common PIM libraries" LICENSE="LGPL-2+" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="designer" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -45,7 +45,6 @@ COMMON_DEPEND=" $(add_kdeapps_dep libakonadi) $(add_kdeapps_dep libkdepim) dev-libs/libxslt - dev-qt/designer:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 @@ -55,6 +54,7 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} sys-devel/gettext + designer? ( dev-qt/designer:5 ) " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 @@ -66,3 +66,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/pimcommon/pimcommon-15.12.49.9999.ebuild b/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild index 6187d0435b6..b3dba997496 100644 --- a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild +++ b/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild @@ -11,7 +11,7 @@ inherit kde5 DESCRIPTION="Common PIM libraries" LICENSE="LGPL-2+" KEYWORDS="" -IUSE="" +IUSE="designer" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -45,7 +45,6 @@ COMMON_DEPEND=" $(add_kdeapps_dep libakonadi) $(add_kdeapps_dep libkdepim) dev-libs/libxslt - dev-qt/designer:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 @@ -55,6 +54,7 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} sys-devel/gettext + designer? ( dev-qt/designer:5 ) " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 @@ -66,3 +66,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/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild index 9d5f91a3783..0e18ea92f0c 100644 --- a/kde-apps/pimcommon/pimcommon-9999.ebuild +++ b/kde-apps/pimcommon/pimcommon-9999.ebuild @@ -10,7 +10,7 @@ inherit kde5 DESCRIPTION="Common PIM libraries" LICENSE="LGPL-2+" KEYWORDS="" -IUSE="" +IUSE="designer" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -44,7 +44,6 @@ COMMON_DEPEND=" $(add_kdeapps_dep libakonadi) $(add_kdeapps_dep libkdepim) dev-libs/libxslt - dev-qt/designer:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 @@ -54,8 +53,16 @@ COMMON_DEPEND=" " 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 +} |