* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kaddressbook/files/, kde-apps/kaddressbook/
@ 2017-06-03 21:26 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2017-06-03 21:26 UTC (permalink / raw
To: gentoo-commits
commit: a35b4dca01b118ed484d9afbbca90c905bc6e6b7
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Jun 3 19:55:26 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 3 21:26:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a35b4dca
kde-apps/kaddressbook: Fix building in C++ 2011 and 2014 mode
.../files/kaddressbook-4.4.2017.04-gcc6.patch | 27 ++++++++++++++++++++++
.../kaddressbook/kaddressbook-4.4.2017.04.ebuild | 2 ++
2 files changed, 29 insertions(+)
diff --git a/kde-apps/kaddressbook/files/kaddressbook-4.4.2017.04-gcc6.patch b/kde-apps/kaddressbook/files/kaddressbook-4.4.2017.04-gcc6.patch
new file mode 100644
index 00000000000..5c7b55c5283
--- /dev/null
+++ b/kde-apps/kaddressbook/files/kaddressbook-4.4.2017.04-gcc6.patch
@@ -0,0 +1,27 @@
+--- a/kaddressbook/views/configurecardviewdialog.cpp
++++ b/kaddressbook/views/configurecardviewdialog.cpp
+@@ -34,6 +34,7 @@
+ #include <kcolorscheme.h>
+ #include <kconfig.h>
+ #include <kdebug.h>
++#include <kfontchooser.h>
+ #include <kfontdialog.h>
+ #include <kglobal.h>
+ #include <kiconloader.h>
+@@ -165,14 +166,14 @@
+ void CardViewLookNFeelPage::setTextFont()
+ {
+ QFont f( lTextFont->font() );
+- if ( KFontDialog::getFont( f, false, this ) == QDialog::Accepted )
++ if ( KFontDialog::getFont( f, KFontChooser::NoDisplayFlags, this ) == QDialog::Accepted )
+ updateFontLabel( f, lTextFont );
+ }
+
+ void CardViewLookNFeelPage::setHeaderFont()
+ {
+ QFont f( lHeaderFont->font() );
+- if ( KFontDialog::getFont( f,false, this ) == QDialog::Accepted )
++ if ( KFontDialog::getFont( f, KFontChooser::NoDisplayFlags, this ) == QDialog::Accepted )
+ updateFontLabel( f, lHeaderFont );
+ }
+
diff --git a/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild b/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
index 822b8b1c29e..00897c0b3cb 100644
--- a/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
@@ -32,6 +32,8 @@ KMEXTRACTONLY="
KMLOADLIBS="libkdepim"
+PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
+
src_install() {
kde4-meta_src_install
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kaddressbook/files/, kde-apps/kaddressbook/
@ 2021-11-15 18:59 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2021-11-15 18:59 UTC (permalink / raw
To: gentoo-commits
commit: a4f055f81314e51f04fc4c6bb807176b974c7bbc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 13:56:27 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 18:58:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f055f8
kde-apps/kaddressbook: Drop unused DEPENDs
Upstream commit eb9dad153f199c925ac60c0a33eca6ff0c1f9f44
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kaddressbook-21.08.3-unused-deps.patch | 61 ++++++++++++++++++
.../kaddressbook/kaddressbook-21.08.3-r1.ebuild | 74 ++++++++++++++++++++++
2 files changed, 135 insertions(+)
diff --git a/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch b/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch
new file mode 100644
index 000000000000..0f13513546b7
--- /dev/null
+++ b/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch
@@ -0,0 +1,61 @@
+From eb9dad153f199c925ac60c0a33eca6ff0c1f9f44 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <sknauss@kde.org>
+Date: Fri, 8 Oct 2021 17:56:50 +0000
+Subject: [PATCH] Remove unneeded dependencies
+
+---
+ CMakeLists.txt | 8 --------
+ src/CMakeLists.txt | 4 ----
+ 3 files changed, 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c5e3e336..aef0ccd9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,7 +53,6 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus PrintS
+ set(LIBKDEPIM_LIB_VERSION "5.18.3")
+ set(LIBGRANTLEETHEME_LIB_VERSION "5.18.3")
+ set(PIMCOMMON_LIB_VERSION "5.18.3")
+-set(LIBKLEO_LIB_VERSION "5.18.3")
+ set(AKONADI_SEARCH_VERSION "5.18.3")
+ set(AKONADI_CONTACT_VERSION "5.18.3")
+
+@@ -62,7 +61,6 @@ find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5KCMUtils ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5Crash ${KF5_MIN_VERSION} REQUIRED)
+-find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED)
+
+ find_package(KF5DocTools ${KF5_MIN_VERSION})
+ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
+@@ -79,12 +77,6 @@ find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED)
+ find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
+ find_package(KF5GrantleeTheme ${LIBGRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
+
+-set(GPGMEPP_LIB_VERSION "1.11.1")
+-find_package(Gpgmepp ${GPGMEPP_LIB_VERSION} CONFIG REQUIRED)
+-
+-set(QGPGME_LIB_VERSION "1.11.1")
+-find_package(QGpgme ${QGPGME_LIB_VERSION} CONFIG REQUIRED)
+-
+ include_directories(${kaddressbook_SOURCE_DIR} ${kaddressbook_BINARY_DIR})
+
+ find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3e756aab..ac2f5774 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -98,10 +98,6 @@ if (TARGET KUserFeedbackWidgets)
+ target_link_libraries(kaddressbookprivate PRIVATE KUserFeedbackWidgets)
+ endif()
+
+-if(QGpgme_FOUND)
+- target_link_libraries(kaddressbookprivate PRIVATE QGpgme)
+-endif()
+-
+ target_include_directories(kaddressbookprivate PUBLIC "$<BUILD_INTERFACE:${kaddressbook_SOURCE_DIR};${kaddressbook_BINARY_DIR}>")
+
+ set_target_properties(kaddressbookprivate PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION})
+--
+GitLab
+
diff --git a/kde-apps/kaddressbook/kaddressbook-21.08.3-r1.ebuild b/kde-apps/kaddressbook/kaddressbook-21.08.3-r1.ebuild
new file mode 100644
index 000000000000..cd81acf8ffbe
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-21.08.3-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.84.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Address book application based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kaddressbook/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="telemetry"
+
+DEPEND="
+ dev-libs/grantlee:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-search-${PVCUT}:5
+ >=kde-apps/grantleetheme-${PVCUT}:5
+ >=kde-apps/kontactinterface-${PVCUT}:5
+ >=kde-apps/libgravatar-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/prison-${KFMIN}:5
+ telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}
+ >=kde-apps/kdepim-runtime-${PVCUT}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package telemetry KUserFeedback)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
+ fi
+ ecm_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-15 18:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-03 21:26 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kaddressbook/files/, kde-apps/kaddressbook/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-11-15 18:59 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox