* [gentoo-commits] proj/kde:master commit in: kde-apps/pimcommon/files/, kde-apps/pimcommon/
@ 2015-12-20 15:44 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2015-12-20 15:44 UTC (permalink / raw
To: gentoo-commits
commit: 8f6302b3ab0060219daee5d2371b9deb923868a8
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Dec 19 12:02:03 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 15:44:00 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8f6302b3
kde-apps/pimcommon: Add USE=designer
Backport patch from git master
Package-Manager: portage-2.2.24
.../files/pimcommon-15.12.0-find-qt5designer.patch | 15 +++++++++++++++
kde-apps/pimcommon/metadata.xml | 3 +++
...mcommon-15.12.0.ebuild => pimcommon-15.12.0-r1.ebuild} | 13 +++++++++++--
kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild | 13 +++++++++++--
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 0000000..f45c6aa
--- /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 a23f444..774f7f1 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
similarity index 87%
rename from kde-apps/pimcommon/pimcommon-15.12.0.ebuild
rename to kde-apps/pimcommon/pimcommon-15.12.0-r1.ebuild
index b2dbc3b..ec5cc0b 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 6187d04..b3dba99 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 9d5f91a..0e18ea9 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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/pimcommon/files/, kde-apps/pimcommon/
@ 2017-07-25 5:56 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2017-07-25 5:56 UTC (permalink / raw
To: gentoo-commits
commit: 24f9e37e666d3feed760ff53dabdf98e6e718182
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 05:55:52 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 05:55:52 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=24f9e37e
kde-apps/pimcommon: Backport patch wrt unused deps, fix DEPENDs
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../pimcommon/files/pimcommon-17.04.3-deps.patch | 54 ++++++++++++++++++++++
kde-apps/pimcommon/pimcommon-17.07.80.ebuild | 3 ++
kde-apps/pimcommon/pimcommon-17.08.49.9999.ebuild | 3 ++
kde-apps/pimcommon/pimcommon-9999.ebuild | 1 +
4 files changed, 61 insertions(+)
diff --git a/kde-apps/pimcommon/files/pimcommon-17.04.3-deps.patch b/kde-apps/pimcommon/files/pimcommon-17.04.3-deps.patch
new file mode 100644
index 0000000000..9e9b37b4f3
--- /dev/null
+++ b/kde-apps/pimcommon/files/pimcommon-17.04.3-deps.patch
@@ -0,0 +1,54 @@
+commit fbebfbe29d1928a36fe5643853b5a02f13f7b07c
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun Jul 23 22:21:38 2017 +0200
+
+ Cleanup unused dependencies
+
+ Test Plan: Builds fine.
+
+ Reviewers: #kde_pim, mlaurent
+
+ Reviewed By: #kde_pim, mlaurent
+
+ Subscribers: mlaurent
+
+ Tags: #kde_pim
+
+ Differential Revision: https://phabricator.kde.org/D6859
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dca7fe2..d5f41fc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,23 +47,18 @@ find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5ItemModels ${KF5_VERSION} CONFIG REQUIRED)
+-find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5JobWidgets ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5NewStuff ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5Service ${KF5_VERSION} CONFIG REQUIRED)
+-find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED)
+-find_package(KF5WindowSystem ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
+
+ find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
+ find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED)
+-find_package(KF5AkonadiMime ${AKONADIMIME_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
+-find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
+ find_package(Grantlee5 "5.1" CONFIG REQUIRED)
+
+@@ -82,6 +76,7 @@ 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.")
+
+ if(BUILD_TESTING)
++ find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
+ add_definitions(-DBUILD_TESTING)
+ endif(BUILD_TESTING)
+
diff --git a/kde-apps/pimcommon/pimcommon-17.07.80.ebuild b/kde-apps/pimcommon/pimcommon-17.07.80.ebuild
index 0308f4f16c..e08688f90a 100644
--- a/kde-apps/pimcommon/pimcommon-17.07.80.ebuild
+++ b/kde-apps/pimcommon/pimcommon-17.07.80.ebuild
@@ -44,6 +44,7 @@ COMMON_DEPEND="
dev-libs/grantlee:5
"
DEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kiconthemes)
dev-libs/libxslt
test? ( $(add_kdeapps_dep kmime) )
"
@@ -51,3 +52,5 @@ RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-common-libs:4
!kde-apps/kdepim-l10n
"
+
+PATCHES=( "${FILESDIR}/${PN}-17.04.3-deps.patch" )
diff --git a/kde-apps/pimcommon/pimcommon-17.08.49.9999.ebuild b/kde-apps/pimcommon/pimcommon-17.08.49.9999.ebuild
index 9f51dcfb00..eae3316062 100644
--- a/kde-apps/pimcommon/pimcommon-17.08.49.9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-17.08.49.9999.ebuild
@@ -44,6 +44,7 @@ COMMON_DEPEND="
dev-libs/grantlee:5
"
DEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kiconthemes)
dev-libs/libxslt
test? ( $(add_kdeapps_dep kmime) )
"
@@ -51,3 +52,5 @@ RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-common-libs:4
!kde-apps/kdepim-l10n
"
+
+PATCHES=( "${FILESDIR}/${PN}-17.04.3-deps.patch" )
diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild
index 9f51dcfb00..2c6db7a368 100644
--- a/kde-apps/pimcommon/pimcommon-9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-9999.ebuild
@@ -44,6 +44,7 @@ COMMON_DEPEND="
dev-libs/grantlee:5
"
DEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kiconthemes)
dev-libs/libxslt
test? ( $(add_kdeapps_dep kmime) )
"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-07-25 5:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-25 5:56 [gentoo-commits] proj/kde:master commit in: kde-apps/pimcommon/files/, kde-apps/pimcommon/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2015-12-20 15:44 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox