From b6e823198d27bc8b1abf6ad0956f3b33ff1d35a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jan 2024 22:50:10 +0000 Subject: gentoo auto-resync : 21:01:2024 - 22:50:10 --- app-office/Manifest.gz | Bin 8444 -> 8434 bytes app-office/calligraplan/Manifest | 3 +- .../calligraplan/calligraplan-3.3.0-r1.ebuild | 91 ++++++++++++++ app-office/calligraplan/calligraplan-3.3.0.ebuild | 89 -------------- .../files/calligraplan-3.3.0-no-kinit.patch | 134 +++++++++++++++++++++ 5 files changed, 227 insertions(+), 90 deletions(-) create mode 100644 app-office/calligraplan/calligraplan-3.3.0-r1.ebuild delete mode 100644 app-office/calligraplan/calligraplan-3.3.0.ebuild create mode 100644 app-office/calligraplan/files/calligraplan-3.3.0-no-kinit.patch (limited to 'app-office') diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz index c8d6949bb013..0d582db63987 100644 Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest index c5ee99dffe28..f11637f63fa6 100644 --- a/app-office/calligraplan/Manifest +++ b/app-office/calligraplan/Manifest @@ -1,3 +1,4 @@ +AUX calligraplan-3.3.0-no-kinit.patch 4822 BLAKE2B 56bf9ba2124de4cb4240e9fd0a2ff4436100eef29f621b0a8ece24f42dda91e766b2a7377b52e1a7a24185fffa8f2fb0acfbbbed0c3e19422b695a8d528947aa SHA512 dc424eda3d361ebf059cbdb08a7c52d78be082a6a5257482e6c4fb31542d2c316d0f0aff6974c904d99f92cc566cb3d3bde0d21c6c79dad4d7c8f2dc53c90a4b DIST calligraplan-3.3.0.tar.xz 4500032 BLAKE2B 48983bcaad5f8bc60a9e689ab9347731eda6c82eae248df50fa3cdf4a2d9c1882a5f44cda503dcb7ba65452da874256ce4ec3ff2348cf0acd65a9b8a83b63aed SHA512 165bb1d846e8ac96789b5123bd8e352ad77a4ae607d7e06008916f7729a457351c35779b43774f73a6a35bf9401626852cb4dd2ccf16cbcfb38d2abce56bd936 -EBUILD calligraplan-3.3.0.ebuild 2530 BLAKE2B 70f2b647ba59483bd9df1abdaf99f9bf755da58249c3501d488087cdac30b4651838dfab06d1b67189e911dd9360a2e4cc7874d55115d1dd9ab70015424a06f2 SHA512 69babd31864be523dd37e29221438cea007753ec88bd2a2ed71f3eeb1b29836ad5b897164a80927a64873eb2092d36a27bba308e114dcce0cf74feb4d1005ff6 +EBUILD calligraplan-3.3.0-r1.ebuild 2599 BLAKE2B 7633f080d19915769d5f90191b01f3546d94515b0e3245f933f26578513787464ec24d8f1ef377373c4ab1f340520ac9726921e1b0d9b536e458d53e9e607515 SHA512 afd2b294c51bb14a6cce5bb03f78279612da9d97b7991caa62395d968f2c3d35946dcc9200b67d4b589857670a5ce07df752a53d3b05702e1273b6948a32fed4 MISC metadata.xml 718 BLAKE2B b887142a7dd2b1f43cdbf7e63df19ff71059e7af947f6e649e0432f06797bd8a33bcff80267fa66cce6de7bda65494ce730b07bcde9e539e38062d86c02b9793 SHA512 3eac2bd09f1e12c81f65b7b91bba0c4ad872d33220ae960477b3f03cc34b01150e9aa0c2746fc82035fc990beae083c440839abd1a07bf7f790f2b65d9e88e6f diff --git a/app-office/calligraplan/calligraplan-3.3.0-r1.ebuild b/app-office/calligraplan/calligraplan-3.3.0-r1.ebuild new file mode 100644 index 000000000000..79b9a52b5fff --- /dev/null +++ b/app-office/calligraplan/calligraplan-3.3.0-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm kde.org + +DESCRIPTION="Project management application" +HOMEPAGE="https://calligra.org/plan/" + +if [[ ${KDE_BUILD_TYPE} == release ]]; then + SRC_URI="mirror://kde/stable/calligra/${PV}/${PN}-${PV}.tar.xz" + KEYWORDS="amd64 ~arm64 ~riscv x86" +fi + +LICENSE="GPL-2" +SLOT="5" +IUSE="activities +holidays kwallet X" + +RESTRICT="test" + +# FIXME: Disabled by upstream for good reason +# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940) +# $(add_kdeapps_dep akonadi) +# $(add_kdeapps_dep akonadi-contacts) +# Currently upstream-disabled: +# =dev-libs/kproperty-3.0*:5 +# =dev-libs/kreport-3.0*:5 +DEPEND=" + dev-lang/perl + >=dev-libs/kdiagram-2.8.0:5 + >=dev-qt/designer-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcalendarcore-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 ) + holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) + kwallet? ( + >=app-crypt/qca-2.3.0:2[qt5(+)] + >=kde-frameworks/kwallet-${KFMIN}:5 + ) + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + ) +" +RDEPEND="${DEPEND} + !app-office/calligra[calligra_features_plan(-)] + >=dev-qt/qtsvg-${QTMIN}:5 +" + +PATCHES=( "${FILESDIR}/${P}-no-kinit.patch" ) # bug 922506 + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package activities KF5Activities) + $(cmake_use_find_package holidays KF5Holidays) + $(cmake_use_find_package kwallet Qca-qt5) + $(cmake_use_find_package kwallet KF5Wallet) + ) + # Qt5DBus can't be disabled because of KF5DBusAddons dependency + + ecm_src_configure +} diff --git a/app-office/calligraplan/calligraplan-3.3.0.ebuild b/app-office/calligraplan/calligraplan-3.3.0.ebuild deleted file mode 100644 index cfb35ec5f928..000000000000 --- a/app-office/calligraplan/calligraplan-3.3.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.74.0 -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Project management application" -HOMEPAGE="https://calligra.org/plan/" - -if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://kde/stable/calligra/${PV}/${PN}-${PV}.tar.xz" - KEYWORDS="amd64 ~arm64 ~riscv x86" -fi - -LICENSE="GPL-2" -SLOT="5" -IUSE="activities +holidays kwallet X" - -# FIXME: Disabled by upstream for good reason -# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940) -# $(add_kdeapps_dep akonadi) -# $(add_kdeapps_dep akonadi-contacts) -# Currently upstream-disabled: -# =dev-libs/kproperty-3.0*:5 -# =dev-libs/kreport-3.0*:5 -DEPEND=" - dev-lang/perl - >=dev-libs/kdiagram-2.8.0:5 - >=dev-qt/designer-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcalendarcore-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 ) - holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) - kwallet? ( - >=app-crypt/qca-2.3.0:2 - >=kde-frameworks/kwallet-${KFMIN}:5 - ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) -" -RDEPEND="${DEPEND} - !app-office/calligra[calligra_features_plan(-)] - >=dev-qt/qtsvg-${QTMIN}:5 -" - -RESTRICT="test" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package holidays KF5Holidays) - $(cmake_use_find_package kwallet Qca-qt5) - $(cmake_use_find_package kwallet KF5Wallet) - ) - # Qt5DBus can't be disabled because of KF5DBusAddons dependency - - ecm_src_configure -} diff --git a/app-office/calligraplan/files/calligraplan-3.3.0-no-kinit.patch b/app-office/calligraplan/files/calligraplan-3.3.0-no-kinit.patch new file mode 100644 index 000000000000..16ee6b1e09a4 --- /dev/null +++ b/app-office/calligraplan/files/calligraplan-3.3.0-no-kinit.patch @@ -0,0 +1,134 @@ +From 1883014daa5ae1dedf4d9356dbdaafd4d9d3014f Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Sat, 17 Sep 2022 17:11:05 +0200 +Subject: [PATCH] Port away from deprecated kinit + +(cherry picked from commit d0c9c05bfb1d1eae6b1d92ac7d5a22ed5238329f) +--- + CMakeLists.txt | 1 - + src/CMakeLists.txt | 11 ++++------- + src/main.cpp | 2 +- + src/workpackage/CMakeLists.txt | 10 +++------- + src/workpackage/main.cpp | 2 +- + 5 files changed, 9 insertions(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 70025827..a354e4a0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -112,7 +112,6 @@ set(REQUIRED_KF5_VERSION "5.45.0") + + find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED + COMPONENTS +- Init + Archive + # Codecs + # Completion +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 3c77e9f4..755863a2 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -207,7 +207,7 @@ install(TARGETS calligraplanpart DESTINATION ${PLUGIN_INSTALL_DIR}/calligraplan/ + + ########### KPlato executable ############### + +-set(calligraplan_KDEINIT_SRCS main.cpp ) ++set(calligraplan_SRCS main.cpp ) + + file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/*-apps-calligraplan.png") + ecm_add_app_icon(kdeinit_app_ICONS_SRCS ICONS ${ICONS_SRCS}) +@@ -215,20 +215,17 @@ if(WIN32) + set(_resourcefile "${CMAKE_CURRENT_BINARY_DIR}/kdeinit_app_ICONS_SRCS.rc") + endif() + +-kf5_add_kdeinit_executable( calligraplan ${calligraplan_KDEINIT_SRCS}) ++add_executable( calligraplan ${calligraplan_SRCS}) + + if (APPLE) + set_target_properties(calligraplan PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template) + set_target_properties(calligraplan PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.calligra.plan") + set_target_properties(calligraplan PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Plan") +- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/calligraplan_KDEINIT_SRCS.icns DESTINATION ${BUNDLE_INSTALL_DIR}/calligraplan.app/Contents/Resources) ++ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/calligraplan_SRCS.icns DESTINATION ${BUNDLE_INSTALL_DIR}/calligraplan.app/Contents/Resources) + endif () + +-target_link_libraries(kdeinit_calligraplan planmain) ++target_link_libraries(calligraplan planmain) + +-install(TARGETS kdeinit_calligraplan ${INSTALL_TARGETS_DEFAULT_ARGS}) +- +-target_link_libraries(calligraplan kdeinit_calligraplan planmain) + install(TARGETS calligraplan ${INSTALL_TARGETS_DEFAULT_ARGS}) + + ########### install files ############### +diff --git a/src/main.cpp b/src/main.cpp +index 3b807381..64ae2e8f 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -27,7 +27,7 @@ + #include + #include + +-extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) ++int main(int argc, char **argv) + { + /** + * Disable debug output by default, only log warnings. +diff --git a/src/workpackage/CMakeLists.txt b/src/workpackage/CMakeLists.txt +index 9072ebad..808646d9 100644 +--- a/src/workpackage/CMakeLists.txt ++++ b/src/workpackage/CMakeLists.txt +@@ -77,7 +77,7 @@ install(TARGETS calligraplanworkpart DESTINATION ${PLUGIN_INSTALL_DIR}) + + ########### Calligra PlanWork executable ############### + +-set(calligraplanwork_KDEINIT_SRCS main.cpp commandlineparser.cpp) ++set(calligraplanwork_SRCS main.cpp commandlineparser.cpp) + + file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/*-apps-calligraplanwork.png") + ecm_add_app_icon(kdeinit_app_ICONS_SRCS ICONS ${ICONS_SRCS}) +@@ -85,7 +85,7 @@ if(WIN32) + set(_resourcefile "${CMAKE_CURRENT_BINARY_DIR}/kdeinit_app_ICONS_SRCS.rc") + endif() + +-kf5_add_kdeinit_executable(calligraplanwork ${calligraplanwork_KDEINIT_SRCS}) ++add_executable(calligraplanwork ${calligraplanwork_SRCS}) + + if (APPLE) + set_target_properties(calligraplanwork PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template) +@@ -94,7 +94,7 @@ if (APPLE) + endif () + + target_link_libraries( +- kdeinit_calligraplanwork ++ calligraplanwork + + planworkfactory + plankernel +@@ -105,10 +105,6 @@ target_link_libraries( + KF5::DBusAddons + ) + +-install(TARGETS kdeinit_calligraplanwork ${INSTALL_TARGETS_DEFAULT_ARGS}) +- +-target_link_libraries( calligraplanwork kdeinit_calligraplanwork ) +- + install(TARGETS calligraplanwork ${INSTALL_TARGETS_DEFAULT_ARGS}) + + ########### install files ############### +diff --git a/src/workpackage/main.cpp b/src/workpackage/main.cpp +index 12af06e1..56c0be4f 100644 +--- a/src/workpackage/main.cpp ++++ b/src/workpackage/main.cpp +@@ -29,7 +29,7 @@ + + #include + +-extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) ++int main(int argc, char **argv) + { + QApplication app(argc, argv); + #ifdef Q_OS_MACOS +-- +2.43.0 + -- cgit v1.2.3