From b69c3d492459984c4ae9e92f5d7cbd0ae766be77 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 22 Jul 2025 07:49:05 +0200 Subject: [PATCH] kmymoney_kf5, downgrade to 5.1.3 (#12612) --- ...5.2.0.recipe => kmymoney_kf5-5.1.3.recipe} | 58 +++---------------- .../kmymoney/patches/kmymoney-5.1.3.patchset | 27 +++++++++ 2 files changed, 34 insertions(+), 51 deletions(-) rename app-office/kmymoney/{kmymoney_kf5-5.2.0.recipe => kmymoney_kf5-5.1.3.recipe} (74%) create mode 100644 app-office/kmymoney/patches/kmymoney-5.1.3.patchset diff --git a/app-office/kmymoney/kmymoney_kf5-5.2.0.recipe b/app-office/kmymoney/kmymoney_kf5-5.1.3.recipe similarity index 74% rename from app-office/kmymoney/kmymoney_kf5-5.2.0.recipe rename to app-office/kmymoney/kmymoney_kf5-5.1.3.recipe index 660f26084..4ff02cace 100644 --- a/app-office/kmymoney/kmymoney_kf5-5.2.0.recipe +++ b/app-office/kmymoney/kmymoney_kf5-5.1.3.recipe @@ -6,15 +6,14 @@ HOMEPAGE="https://kmymoney.org/" COPYRIGHT="2010-2023 KDE Organisation" LICENSE="GNU GPL v2" REVISION="3" -SOURCE_URI="https://download.kde.org/stable/kmymoney/$portVersion/kmymoney-$portVersion.tar.xz" -CHECKSUM_SHA256="f308b0a2297f22f43d9bbe46b4c7dc6aac08bd594454e635a844d06abda4d33c" +SOURCE_URI="https://download.kde.org/stable/kmymoney/$portVersion/src/kmymoney-$portVersion.tar.xz" +CHECKSUM_SHA256="3938b8078b7391ba32e12bb4239762fae134683a0c2ec1a75105c302ca3e5e3f" SOURCE_DIR="kmymoney-$portVersion" -PATCHES="kmymoney-$portVersion.patchset - 8c4b84f290e50e62fbf90a61df8c701140a42715.patch" +PATCHES="kmymoney-$portVersion.patchset" ADDITIONAL_FILES="kmymoney.rdef.in" ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="!x86" +SECONDARY_ARCHITECTURES="x86" libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" @@ -22,33 +21,20 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" kmymoney_kf5$secondaryArchSuffix = $portVersion app:KMyMoney = $portVersion - lib:libkmm_base_dialogs$secondaryArchSuffix = $libVersionCompat - lib:libkmm_base_widgets$secondaryArchSuffix = $libVersionCompat lib:libkmm_csvimportercore$secondaryArchSuffix = $libVersionCompat - lib:libkmm_extended_dialogs$secondaryArchSuffix = $libVersionCompat - lib:libkmm_gpgfile$secondaryArchSuffix = $libVersionCompat - lib:libkmm_keychain$secondaryArchSuffix = $libVersionCompat lib:libkmm_icons$secondaryArchSuffix = $libVersionCompat - lib:libkmm_menuactionexchanger$secondaryArchSuffix = $libVersionCompat lib:libkmm_menus$secondaryArchSuffix = $libVersionCompat lib:libkmm_models$secondaryArchSuffix = $libVersionCompat lib:libkmm_mymoney$secondaryArchSuffix = $libVersionCompat lib:libkmm_payeeidentifier$secondaryArchSuffix = $libVersionCompat lib:libkmm_plugin$secondaryArchSuffix = $libVersionCompat lib:libkmm_printer$secondaryArchSuffix = $libVersionCompat - lib:libkmm_selections$secondaryArchSuffix = $libVersionCompat lib:libkmm_settings$secondaryArchSuffix = $libVersionCompat - lib:libkmm_templates$secondaryArchSuffix = $libVersionCompat - lib:libkmm_webconnect$secondaryArchSuffix = $libVersionCompat lib:libkmm_widgets$secondaryArchSuffix = $libVersionCompat - lib:libkmm_wizard$secondaryArchSuffix = $libVersionCompat - lib:libkmm_yesno$secondaryArchSuffix = $libVersionCompat - lib:libonlinetask_interfaces$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix lib:libgmp$secondaryArchSuffix - lib:libgpgmepp$secondaryArchSuffix lib:libalkimia5$secondaryArchSuffix lib:libKF5Activities$secondaryArchSuffix lib:libKF5Codecs$secondaryArchSuffix @@ -61,7 +47,6 @@ REQUIRES=" lib:libKF5I18n$secondaryArchSuffix lib:libKF5KCMutils$secondaryArchSuffix lib:libKF5Notifications$secondaryArchSuffix - lib:libKF5ItemModels$secondaryArchSuffix lib:libKF5ItemViews$secondaryArchSuffix lib:libKF5KIOCore$secondaryArchSuffix lib:libKF5JobWidgets$secondaryArchSuffix @@ -74,7 +59,6 @@ REQUIRES=" lib:libKPim5AkonadiCore$secondaryArchSuffix lib:libKPim5IdentityManagement$secondaryArchSuffix lib:libsqlcipher$secondaryArchSuffix - lib:libqt5keychain$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5WebKitWidgets$secondaryArchSuffix @@ -86,28 +70,16 @@ CONFLICTS=" PROVIDES_devel=" kmymoney_kf5${secondaryArchSuffix}_devel = $portVersion - devel:libkmm_base_dialogs$secondaryArchSuffix = $libVersionCompat - devel:libkmm_base_widgets$secondaryArchSuffix = $libVersionCompat devel:libkmm_csvimportercore$secondaryArchSuffix = $libVersionCompat - devel:libkmm_extended_dialogs$secondaryArchSuffix = $libVersionCompat - devel:libkmm_gpgfile$secondaryArchSuffix = $libVersionCompat - devel:libkmm_keychain$secondaryArchSuffix = $libVersionCompat devel:libkmm_icons$secondaryArchSuffix = $libVersionCompat - devel:libkmm_menuactionexchanger$secondaryArchSuffix = $libVersionCompat devel:libkmm_menus$secondaryArchSuffix = $libVersionCompat devel:libkmm_models$secondaryArchSuffix = $libVersionCompat devel:libkmm_mymoney$secondaryArchSuffix = $libVersionCompat devel:libkmm_payeeidentifier$secondaryArchSuffix = $libVersionCompat devel:libkmm_plugin$secondaryArchSuffix = $libVersionCompat devel:libkmm_printer$secondaryArchSuffix = $libVersionCompat - devel:libkmm_selections$secondaryArchSuffix = $libVersionCompat devel:libkmm_settings$secondaryArchSuffix = $libVersionCompat - devel:libkmm_templates$secondaryArchSuffix = $libVersionCompat - devel:libkmm_webconnect$secondaryArchSuffix = $libVersionCompat devel:libkmm_widgets$secondaryArchSuffix = $libVersionCompat - devel:libkmm_wizard$secondaryArchSuffix = $libVersionCompat - devel:libkmm_yesno$secondaryArchSuffix = $libVersionCompat - devel:libonlinetask_interfaces$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" kmymoney_kf5$secondaryArchSuffix == $portVersion base @@ -115,7 +87,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix + extra_cmake_modules$secondaryArchSuffix >= 5.93.0 devel:libalkimia5$secondaryArchSuffix devel:libgpgmepp$secondaryArchSuffix devel:libgmp$secondaryArchSuffix @@ -153,10 +125,8 @@ BUILD_REQUIRES=" devel:libKPim5IdentityManagement$secondaryArchSuffix devel:libKPim5TextEdit$secondaryArchSuffix devel:libsqlcipher$secondaryArchSuffix - devel:libqgpgme$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libQt5DBus$secondaryArchSuffix - devel:libqt5keychain$secondaryArchSuffix devel:libQt5WebEngineWidgets$secondaryArchSuffix devel:libQt5WebKitWidgets$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix @@ -174,14 +144,13 @@ BUILD_PREREQUIRES=" BUILD() { - cmake -B build -S . $cmakeDirArgs \ + cmake -Bbuild -S. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ -DKDE_INSTALL_BINDIR=$appsDir \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DFETCH_TRANSLATIONS=ON \ -DBUILD_TESTING=OFF -Wno-dev - make -C build $jobArgs } @@ -191,7 +160,6 @@ INSTALL() rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic} rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces} - rm -rf $dataDir/applications mv $appsDir/kmymoney $appsDir/KMyMoney @@ -218,28 +186,16 @@ INSTALL() addAppDeskbarSymlink $appsDir/KMyMoney prepareInstalledDevelLibs \ - libkmm_base_dialogs \ - libkmm_base_widgets \ libkmm_csvimportercore \ - libkmm_extended_dialogs \ - libkmm_gpgfile \ - libkmm_keychain \ libkmm_icons \ - libkmm_menuactionexchanger \ libkmm_menus \ libkmm_models \ libkmm_mymoney \ libkmm_payeeidentifier \ libkmm_plugin \ libkmm_printer \ - libkmm_selections \ libkmm_settings \ - libkmm_templates \ - libkmm_webconnect \ - libkmm_widgets \ - libkmm_wizard \ - libkmm_yesno \ - libonlinetask_interfaces + libkmm_widgets packageEntries devel \ $developDir diff --git a/app-office/kmymoney/patches/kmymoney-5.1.3.patchset b/app-office/kmymoney/patches/kmymoney-5.1.3.patchset new file mode 100644 index 000000000..0e196f341 --- /dev/null +++ b/app-office/kmymoney/patches/kmymoney-5.1.3.patchset @@ -0,0 +1,27 @@ +From b9daa9d0188570ad0997f34b8203eb70f93cf5f5 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Sat, 25 Nov 2023 11:29:01 +0100 +Subject: Silense deprecated warnings + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b49d5c..fd06f0c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -469,6 +469,13 @@ option(USE_QT_DESIGNER + + add_feature_info("QtDesigner" USE_QT_DESIGNER "Qt-Designer library support (for devs only).") + ++################# disable deprecated warnings ################# ++ ++if (HAIKU) ++ add_definitions(-Wno-deprecated-declarations) # TODO too much spam for now ++endif() ++ ++ + ######################### The Actual Targets ########################## + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") +-- +2.42.1 +