* [gentoo-commits] proj/kde:master commit in: kde-apps/calendarjanitor/files/, kde-apps/calendarjanitor/
@ 2024-08-12 14:23 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2024-08-12 14:23 UTC (permalink / raw
To: gentoo-commits
commit: f4f65d265f8ca6793ad34786fa59f3c4cb05562e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 14:15:43 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 14:16:57 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4f65d26
kde-apps/calendarjanitor: Set ECM_HANDBOOK="false" and properly disable it
There is no handbook for this package, so there should be no IUSE.
Also, do not install an empty logging categories file.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../calendarjanitor-24.07.90.ebuild | 10 +++--
.../calendarjanitor-24.08.49.9999.ebuild | 10 +++--
.../calendarjanitor/calendarjanitor-9999.ebuild | 10 +++--
.../calendarjanitor-24.05.2-loggingcategory.patch | 50 ++++++++++++++++++++++
4 files changed, 68 insertions(+), 12 deletions(-)
diff --git a/kde-apps/calendarjanitor/calendarjanitor-24.07.90.ebuild b/kde-apps/calendarjanitor/calendarjanitor-24.07.90.ebuild
index 4964134aa2..661787d059 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-24.07.90.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-24.07.90.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+ECM_HANDBOOK="false"
ECM_TEST="false"
KDE_ORG_NAME="akonadi-calendar-tools"
PVCUT=$(ver_cut 1-3)
@@ -13,7 +13,7 @@ inherit ecm gear.kde.org
DESCRIPTION="Tool to scan calendar data for buggy instances"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+LICENSE="GPL-2+"
SLOT="6"
KEYWORDS="~amd64 ~arm64"
IUSE=""
@@ -29,11 +29,13 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-24.05.2-loggingcategory.patch" )
+
src_prepare() {
ecm_src_prepare
-
+ ecm_punt_kf_module DocTools
+ sed -i -e "/kdoctools_install/I s/^/#DONT/" CMakeLists.txt || die
cmake_comment_add_subdirectory doc konsolekalendar
- sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
# delete colliding konsolekalendar translations
rm -f po/*/konsolekalendar.po || die
diff --git a/kde-apps/calendarjanitor/calendarjanitor-24.08.49.9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-24.08.49.9999.ebuild
index a98932dbc4..07f32c2fce 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-24.08.49.9999.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-24.08.49.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+ECM_HANDBOOK="false"
ECM_TEST="false"
KDE_ORG_NAME="akonadi-calendar-tools"
PVCUT=$(ver_cut 1-3)
@@ -13,7 +13,7 @@ inherit ecm gear.kde.org
DESCRIPTION="Tool to scan calendar data for buggy instances"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+LICENSE="GPL-2+"
SLOT="6"
KEYWORDS=""
IUSE=""
@@ -29,11 +29,13 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-24.05.2-loggingcategory.patch" )
+
src_prepare() {
ecm_src_prepare
-
+ ecm_punt_kf_module DocTools
+ sed -i -e "/kdoctools_install/I s/^/#DONT/" CMakeLists.txt || die
cmake_comment_add_subdirectory doc konsolekalendar
- sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
# delete colliding konsolekalendar translations
rm -f po/*/konsolekalendar.po || die
diff --git a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
index a98932dbc4..07f32c2fce 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+ECM_HANDBOOK="false"
ECM_TEST="false"
KDE_ORG_NAME="akonadi-calendar-tools"
PVCUT=$(ver_cut 1-3)
@@ -13,7 +13,7 @@ inherit ecm gear.kde.org
DESCRIPTION="Tool to scan calendar data for buggy instances"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+LICENSE="GPL-2+"
SLOT="6"
KEYWORDS=""
IUSE=""
@@ -29,11 +29,13 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-24.05.2-loggingcategory.patch" )
+
src_prepare() {
ecm_src_prepare
-
+ ecm_punt_kf_module DocTools
+ sed -i -e "/kdoctools_install/I s/^/#DONT/" CMakeLists.txt || die
cmake_comment_add_subdirectory doc konsolekalendar
- sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
# delete colliding konsolekalendar translations
rm -f po/*/konsolekalendar.po || die
diff --git a/kde-apps/calendarjanitor/files/calendarjanitor-24.05.2-loggingcategory.patch b/kde-apps/calendarjanitor/files/calendarjanitor-24.05.2-loggingcategory.patch
new file mode 100644
index 0000000000..e9796c3342
--- /dev/null
+++ b/kde-apps/calendarjanitor/files/calendarjanitor-24.05.2-loggingcategory.patch
@@ -0,0 +1,50 @@
+From 1c10a1418a063d625dce2fc1a5714b82f9cee728 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 12 Aug 2024 16:02:27 +0200
+Subject: [PATCH] Move ecm_qt_install_logging_categories to konsolekalendar
+ subdir
+
+None is declared in calendarjanitor.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 6 ------
+ konsolekalendar/CMakeLists.txt | 5 +++++
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d887d81..f79b923 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,12 +79,6 @@ endif()
+ add_subdirectory(calendarjanitor)
+ add_subdirectory(konsolekalendar)
+
+-ecm_qt_install_logging_categories(
+- EXPORT AKONADICALENDARTOOLS
+- FILE console.categories
+- DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+- )
+-
+ add_subdirectory(doc)
+ kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+ ki18n_install(po)
+diff --git a/konsolekalendar/CMakeLists.txt b/konsolekalendar/CMakeLists.txt
+index c0b0eab..7e90f6c 100644
+--- a/konsolekalendar/CMakeLists.txt
++++ b/konsolekalendar/CMakeLists.txt
+@@ -44,6 +44,11 @@ target_link_libraries(konsolekalendar
+
+ install(TARGETS konsolekalendar ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+
++ecm_qt_install_logging_categories(
++ EXPORT AKONADICALENDARTOOLS
++ FILE console.categories
++ DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
++ )
+
+ ########### install files ###############
+
+--
+2.45.2
+
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-apps/calendarjanitor/files/, kde-apps/calendarjanitor/
@ 2016-02-18 14:44 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2016-02-18 14:44 UTC (permalink / raw
To: gentoo-commits
commit: 981b12fae7c0375ce4a9225db8b566e69f7e7f4a
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Feb 14 20:32:49 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 14:23:56 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=981b12fa
kde-apps/calendarjanitor: Split out of kdepim
Package-Manager: portage-2.2.27
.../calendarjanitor-15.12.49.9999.ebuild | 62 ++++++++++++++++++++++
.../calendarjanitor/calendarjanitor-9999.ebuild | 59 ++++++++++++++++++++
.../calendarjanitor/files/kdepim-console.patch | 46 ++++++++++++++++
3 files changed, 167 insertions(+)
diff --git a/kde-apps/calendarjanitor/calendarjanitor-15.12.49.9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-15.12.49.9999.ebuild
new file mode 100644
index 0000000..bf5397d
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-15.12.49.9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="false"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="A tool to scan calendar data for buggy instances"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS=""
+
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_kdeapps_dep akonadi)
+ $(add_kdeapps_dep akonadi-calendar)
+ $(add_kdeapps_dep calendarsupport)
+ $(add_kdeapps_dep kcalcore)
+ $(add_qt_dep qtwidgets)
+ dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+ !<kde-apps/kdepim-15.12.2:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+ S="${WORKDIR}/${P}"
+else
+ S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+PATCHES=( "${FILESDIR}/kdepim-console.patch" )
+
+src_prepare() {
+
+ sed -e '/^include.*kleopatra\/ConfigureChecks/ s/^/#DONT/' \
+ -i CMakeLists.txt || die
+
+ mv console/calendarjanitor calendarjanitor || die "Failed to move calendarjanitor"
+ mv console/konsolekalendar konsolekalendar || die "Failed to move konsolekalendar"
+
+ kde5_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
new file mode 100644
index 0000000..70d9ac5
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="false"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="A tool to scan calendar data for buggy instances"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS=""
+
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_kdeapps_dep akonadi)
+ $(add_kdeapps_dep akonadi-calendar)
+ $(add_kdeapps_dep calendarsupport)
+ $(add_kdeapps_dep kcalcore)
+ $(add_qt_dep qtwidgets)
+ dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+ !<kde-apps/kdepim-15.12.2:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+ S="${WORKDIR}/${P}"
+else
+ S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+PATCHES=( "${FILESDIR}/kdepim-console.patch" )
+
+src_prepare() {
+
+ mv console/calendarjanitor calendarjanitor || die "Failed to move calendarjanitor"
+ mv console/konsolekalendar konsolekalendar || die "Failed to move konsolekalendar"
+
+ kde5_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-apps/calendarjanitor/files/kdepim-console.patch b/kde-apps/calendarjanitor/files/kdepim-console.patch
new file mode 100644
index 0000000..1c67199
--- /dev/null
+++ b/kde-apps/calendarjanitor/files/kdepim-console.patch
@@ -0,0 +1,46 @@
+commit d29d2ad26bb15be0c229267e196c398e389358cb
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun Feb 14 14:57:54 2016 +0100
+
+ [console] Build console applications independently
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6fd1994..b137a56 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,7 +261,8 @@ add_subdirectory(blogilo)
+ add_subdirectory(kontact)
+
+ add_subdirectory(akonadiconsole)
+-add_subdirectory(console)
++add_subdirectory(calendarjanitor)
++add_subdirectory(konsolekalendar)
+
+ add_subdirectory(plugins) # Must be after KMail
+
+diff --git a/calendarjanitor/CMakeLists.txt b/calendarjanitor/CMakeLists.txt
+index 36d322a..511a12f 100644
+--- a/calendarjanitor/CMakeLists.txt
++++ b/calendarjanitor/CMakeLists.txt
+@@ -1,5 +1,8 @@
+ project(calendarjanitor)
+
++add_definitions( -DQT_NO_CAST_FROM_ASCII )
++add_definitions( -DQT_NO_CAST_TO_ASCII )
++
+ ########### next target ###############
+
+ set(calendarjanitor_SRCS
+diff --git a/konsolekalendar/CMakeLists.txt b/konsolekalendar/CMakeLists.txt
+index 7b0c6e0..f1b045a 100644
+--- a/konsolekalendar/CMakeLists.txt
++++ b/konsolekalendar/CMakeLists.txt
+@@ -1,5 +1,8 @@
+ project(konsolekalendar)
+
++add_definitions( -DQT_NO_CAST_FROM_ASCII )
++add_definitions( -DQT_NO_CAST_TO_ASCII )
++
+ add_subdirectory(pics)
+
+ ########### next target ###############
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-08-12 14:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-12 14:23 [gentoo-commits] proj/kde:master commit in: kde-apps/calendarjanitor/files/, kde-apps/calendarjanitor/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2016-02-18 14: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