mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
app-office/skrooge: drop 25.4.0-r1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
parent
d46cedcf73
commit
3ba56a36ce
@ -1,2 +1 @@
|
||||
DIST skrooge-25.10.0.tar.xz 25765508 BLAKE2B 21eeb20f3b8c5a8794a99e24c4f8a2c9303a67c92641568fd03d535777e3f768f2cbd75b39b85fee50fcb1b9c712e51705a033e65e11ad1f894a372a2957c5d4 SHA512 d388f56dc2a94e249566159113024d5f569c8022f8f1867e45b9a5810dc31f7e6e827c446da8a1660855f9bff4c90e1a38632b8ce483bbefc28d13acc466a258
|
||||
DIST skrooge-25.4.0.tar.xz 23334240 BLAKE2B 87e7990bef60b99e124b8b20ad1e4d6afa4d1aa1878b7f0fcd8f8376f62d5bbe44abd5411b74a048529cad015859a9668b556cf66ebf2fe048ae8bf71aff871f SHA512 2fb47eff133dc8c89bd3ed7a0d06f1efcefa4954bb6e5421cd1f04967d378f044d49f6f4b3e247af14c2861b5c99d08f516673dce3d50d1478abd5c60883509b
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From f5759599ec9fb9e0038395062cc5d08588da0765 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
Date: Fri, 10 Oct 2025 19:06:36 +0200
|
||||
Subject: [PATCH] Drop unused dependencies
|
||||
|
||||
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
---
|
||||
CMakeLists.txt | 2 --
|
||||
plugins/skrooge/skrooge_importexport/CMakeLists.txt | 11 ++---------
|
||||
2 files changed, 2 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a596f6d6d..c0c6c037f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -98,10 +98,8 @@ FIND_PACKAGE(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS
|
||||
I18n # Tier 1
|
||||
ItemViews # Tier 1
|
||||
WidgetsAddons # Tier 1
|
||||
- WindowSystem # Tier 1
|
||||
GuiAddons # Tier 1
|
||||
Completion # Tier 2
|
||||
- JobWidgets # Tier 2
|
||||
ConfigWidgets # Tier 3
|
||||
IconThemes # Tier 3
|
||||
KIO # Tier 3
|
||||
diff --git a/plugins/skrooge/skrooge_importexport/CMakeLists.txt b/plugins/skrooge/skrooge_importexport/CMakeLists.txt
|
||||
index a9178509a..454f78e15 100644
|
||||
--- a/plugins/skrooge/skrooge_importexport/CMakeLists.txt
|
||||
+++ b/plugins/skrooge/skrooge_importexport/CMakeLists.txt
|
||||
@@ -7,10 +7,6 @@ MESSAGE( STATUS "..:: CMAKE PLUGIN_IMPORTEXPORT ::..")
|
||||
|
||||
PROJECT(plugin_importexport)
|
||||
|
||||
-FIND_PACKAGE(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS
|
||||
- GuiAddons # Tier 1
|
||||
-)
|
||||
-
|
||||
LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
|
||||
|
||||
SET(skrooge_importexport_SRCS
|
||||
@@ -20,11 +16,8 @@ ki18n_wrap_ui(skrooge_importexport_SRCS skgimportexportpluginwidget_pref.ui)
|
||||
kconfig_add_kcfg_files(skrooge_importexport_SRCS skgimportexport_settings.kcfgc )
|
||||
|
||||
KCOREADDONS_ADD_PLUGIN(skrooge_importexport SOURCES ${skrooge_importexport_SRCS} INSTALL_NAMESPACE "skg_gui")
|
||||
-IF(QT_MAJOR_VERSION STREQUAL "5")
|
||||
- TARGET_LINK_LIBRARIES(skrooge_importexport KF${QT_MAJOR_VERSION}::Parts KF${QT_MAJOR_VERSION}::KIOCore KF${QT_MAJOR_VERSION}::KIOFileWidgets KF${QT_MAJOR_VERSION}::KIOWidgets skgbasemodeler skgbasegui skgbankmodeler)
|
||||
-ELSE()
|
||||
- TARGET_LINK_LIBRARIES(skrooge_importexport KF${QT_MAJOR_VERSION}::GuiAddons KF${QT_MAJOR_VERSION}::Parts KF${QT_MAJOR_VERSION}::KIOCore KF${QT_MAJOR_VERSION}::KIOFileWidgets KF${QT_MAJOR_VERSION}::KIOWidgets skgbasemodeler skgbasegui skgbankmodeler)
|
||||
-ENDIF()
|
||||
+TARGET_LINK_LIBRARIES(skrooge_importexport KF${QT_MAJOR_VERSION}::Parts KF${QT_MAJOR_VERSION}::KIOCore KF${QT_MAJOR_VERSION}::KIOFileWidgets KF${QT_MAJOR_VERSION}::KIOWidgets skgbasemodeler skgbasegui skgbankmodeler)
|
||||
+
|
||||
########### install files ###############
|
||||
INSTALL(FILES ${PROJECT_SOURCE_DIR}/skrooge_importexport.rc DESTINATION ${KDE_INSTALL_KXMLGUIDIR}/skrooge_importexport )
|
||||
INSTALL(FILES ${PROJECT_SOURCE_DIR}/skgimportexport_settings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
|
||||
--
|
||||
2.51.0
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
From af13519eb01df8f63603ae14954f2e263490bfbe Mon Sep 17 00:00:00 2001
|
||||
From: Luigi Toscano <luigi.toscano@tiscali.it>
|
||||
Date: Fri, 27 Jun 2025 01:53:23 +0200
|
||||
Subject: [PATCH 1/2] Fix the usage of KF_MIN_VERSION
|
||||
|
||||
Move it (and a few other related variables) before its first usage.
|
||||
|
||||
(cherry picked from commit a498ce4bc1f86d09e55c589d90a8bb422fe86f57)
|
||||
---
|
||||
CMakeLists.txt | 18 +++++++-----------
|
||||
1 file changed, 7 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index c0c6c037f..37357c047 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -14,7 +14,7 @@ SET(CMAKE_CXX_STANDARD 17)
|
||||
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
OPTION(SKG_BUILD_TEST "Build the test" ON)
|
||||
-OPTION(SKG_DESIGNER "Build designer library" ON)
|
||||
+# OPTION(SKG_DESIGNER "Build designer library" ON)
|
||||
OPTION(SKG_WEBENGINE "Build Skrooge with WebEngine" ON)
|
||||
OPTION(SKG_DBUS "Build with DBUS" ON)
|
||||
IF(WIN32)
|
||||
@@ -22,13 +22,16 @@ IF(WIN32)
|
||||
SET(SKG_DESIGNER OFF)
|
||||
ENDIF(WIN32)
|
||||
|
||||
+SET(QT_MIN_VERSION "6.3.0")
|
||||
+SET(KF_MIN_VERSION "6.3.0")
|
||||
+SET(SKG_DESIGNER OFF)
|
||||
+ADD_DEFINITIONS(-DBUILD_WITH_QT6=ON)
|
||||
+ADD_DEFINITIONS(-DSKG_QT6=ON)
|
||||
+
|
||||
IF(POLICY CMP0063)
|
||||
CMAKE_POLICY(SET CMP0063 NEW)
|
||||
ENDIF(POLICY CMP0063)
|
||||
|
||||
-SET(QT_MIN_VERSION "5.15.0")
|
||||
-SET(KF_MIN_VERSION "5.102.0")
|
||||
-
|
||||
FIND_PACKAGE(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
|
||||
|
||||
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${skrooge_SOURCE_DIR}/cmake/modules)
|
||||
@@ -44,13 +47,6 @@ INCLUDE(ECMGenerateHeaders)
|
||||
INCLUDE(CMakePackageConfigHelpers)
|
||||
INCLUDE(KDEFrameworkCompilerSettings)
|
||||
|
||||
-IF(QT_MAJOR_VERSION STREQUAL "6")
|
||||
- SET(QT_MIN_VERSION "6.3.0")
|
||||
- SET(KF_MIN_VERSION "6.3.0")
|
||||
- SET(SKG_DESIGNER OFF)
|
||||
- ADD_DEFINITIONS(-DSKG_QT6=ON)
|
||||
-ENDIF()
|
||||
-
|
||||
# Qt 6 build
|
||||
MESSAGE(STATUS "Using Qt${QT_MAJOR_VERSION}/KF${QT_MAJOR_VERSION} to build Skrooge")
|
||||
ADD_COMPILE_DEFINITIONS(
|
||||
--
|
||||
2.51.0
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From 88308f242e5bf2a156bae1b2b81e3db03de03bd7 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Marin <christophe@krop.fr>
|
||||
Date: Thu, 9 Oct 2025 12:20:48 +0200
|
||||
Subject: [PATCH 2/2] Fix build with Qt 6.10
|
||||
|
||||
(cherry picked from commit 38bb99c348c6dc9ca861d636f06f176731f5a291)
|
||||
---
|
||||
CMakeLists.txt | 4 ++++
|
||||
skgsqlcipher/CMakeLists.txt | 2 +-
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 37357c047..0fab5841e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -66,6 +66,10 @@ ELSE()
|
||||
FIND_PACKAGE(Qt6 REQUIRED COMPONENTS Core5Compat)
|
||||
ENDIf()
|
||||
|
||||
+IF(Qt6Core_VERSION VERSION_GREATER_EQUAL 6.10)
|
||||
+ FIND_PACKAGE(Qt6 REQUIRED COMPONENTS SqlPrivate)
|
||||
+ENDIF()
|
||||
+
|
||||
IF(SKG_WEBENGINE)
|
||||
FIND_PACKAGE(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS WebEngineWidgets)
|
||||
MESSAGE( STATUS " Mode WebEngine")
|
||||
diff --git a/skgsqlcipher/CMakeLists.txt b/skgsqlcipher/CMakeLists.txt
|
||||
index 8a0a8d00b..c46a32d84 100644
|
||||
--- a/skgsqlcipher/CMakeLists.txt
|
||||
+++ b/skgsqlcipher/CMakeLists.txt
|
||||
@@ -16,9 +16,9 @@ IF(QT_MAJOR_VERSION STREQUAL "5")
|
||||
ELSE()
|
||||
SET(skgsqlcipher_sources skgsqlcipherdriverplugin.cpp q6sql_sqlite.cpp)
|
||||
ADD_LIBRARY(libskgsqlcipher MODULE ${skgsqlcipher_sources})
|
||||
+ TARGET_LINK_LIBRARIES(libskgsqlcipher Qt6::Sql Qt6::SqlPrivate ${SQLCIPHER_LIBRARIES})
|
||||
TARGET_INCLUDE_DIRECTORIES(libskgsqlcipher PRIVATE ${Qt6Sql_PRIVATE_INCLUDE_DIRS} ${SQLCIPHER_INCLUDE_DIRS})
|
||||
ENDIF()
|
||||
-TARGET_LINK_LIBRARIES(libskgsqlcipher Qt${QT_MAJOR_VERSION}::Sql ${SQLCIPHER_LIBRARIES})
|
||||
|
||||
GENERATE_EXPORT_HEADER(libskgsqlcipher BASE_NAME skgsqlcipher)
|
||||
|
||||
--
|
||||
2.51.0
|
||||
|
||||
@ -1,93 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
ECM_HANDBOOK="optional"
|
||||
ECM_TEST="forceoptional"
|
||||
KFMIN=6.16.0
|
||||
QTMIN=6.7.2
|
||||
inherit ecm kde.org xdg
|
||||
|
||||
DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
|
||||
HOMEPAGE="https://skrooge.org/"
|
||||
|
||||
if [[ ${KDE_BUILD_TYPE} = release ]]; then
|
||||
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
|
||||
KEYWORDS="amd64"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="activities kde ofx"
|
||||
|
||||
# hangs + installs files (also requires KF5DesignerPlugin)
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="
|
||||
dev-db/sqlcipher
|
||||
>=dev-qt/qt5compat-${QTMIN}:6
|
||||
>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
|
||||
>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
|
||||
>=dev-qt/qtsvg-${QTMIN}:6
|
||||
>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
|
||||
>=kde-frameworks/karchive-${KFMIN}:6
|
||||
>=kde-frameworks/kcolorscheme-${KFMIN}:6
|
||||
>=kde-frameworks/kcompletion-${KFMIN}:6
|
||||
>=kde-frameworks/kconfig-${KFMIN}:6
|
||||
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
|
||||
>=kde-frameworks/kcoreaddons-${KFMIN}:6
|
||||
>=kde-frameworks/kdbusaddons-${KFMIN}:6
|
||||
>=kde-frameworks/ki18n-${KFMIN}:6
|
||||
>=kde-frameworks/kiconthemes-${KFMIN}:6
|
||||
>=kde-frameworks/kio-${KFMIN}:6
|
||||
>=kde-frameworks/kitemviews-${KFMIN}:6
|
||||
>=kde-frameworks/knewstuff-${KFMIN}:6
|
||||
>=kde-frameworks/knotifications-${KFMIN}:6
|
||||
>=kde-frameworks/knotifyconfig-${KFMIN}:6
|
||||
>=kde-frameworks/kparts-${KFMIN}:6
|
||||
>=kde-frameworks/kservice-${KFMIN}:6
|
||||
>=kde-frameworks/ktexttemplate-${KFMIN}:6
|
||||
>=kde-frameworks/ktextwidgets-${KFMIN}:6
|
||||
>=kde-frameworks/kwallet-${KFMIN}:6
|
||||
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
|
||||
>=kde-frameworks/kxmlgui-${KFMIN}:6
|
||||
activities? ( kde-plasma/plasma-activities:6= )
|
||||
kde? ( >=kde-frameworks/krunner-${KFMIN}:6 )
|
||||
ofx? ( dev-libs/libofx:= )
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
!${CATEGORY}/${PN}:5
|
||||
"
|
||||
BDEPEND="
|
||||
dev-libs/libxslt
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# cherry-picked from git master
|
||||
"${FILESDIR}/${P}-fix-KF_MIN_VERSION.patch"
|
||||
"${FILESDIR}/${P}-qt-6.10.patch"
|
||||
# Pending https://invent.kde.org/office/skrooge/-/merge_requests/81
|
||||
"${FILESDIR}/${P}-bogusdeps.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DSKG_WEBENGINE=ON
|
||||
-DSKG_DESIGNER=OFF
|
||||
$(cmake_use_find_package activities PlasmaActivities)
|
||||
$(cmake_use_find_package kde KF6Runner)
|
||||
$(cmake_use_find_package ofx LibOfx)
|
||||
-DSKG_BUILD_TEST=$(usex test)
|
||||
)
|
||||
|
||||
ecm_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local mycmakeargs=(
|
||||
-DSKG_BUILD_TEST=ON
|
||||
)
|
||||
ecm_src_test
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user