[gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/files/, app-office/skrooge/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/files/, app-office/skrooge/
@ 2018-06-07 17:46 Johannes Huber
  0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2018-06-07 17:46 UTC (permalink / raw
  To: gentoo-commits

commit:     0e8cf43b7f4b5102c69aa5dcad2f4d157375c742
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 17:46:33 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 17:46:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8cf43b

app-office/skrooge: Remove 2.12.0

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-office/skrooge/Manifest                        |  1 -
 .../skrooge/files/skrooge-2.12.0-qt-5.11.patch     | 40 ---------
 app-office/skrooge/skrooge-2.12.0.ebuild           | 98 ----------------------
 3 files changed, 139 deletions(-)

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 701743e5aa2..4a215895fc4 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,2 +1 @@
-DIST skrooge-2.12.0.tar.xz 20289828 BLAKE2B 999f100fffca3b8fff5e343b1137fc51e337428cdbd89f7e5eb72811e3e5e1522cc257e6be83aad57cf4ec66fefd061b685d94caaadcc27182f32da13d57014f SHA512 348262a7e86f6b3f9fa028fea324eeb73c96e03a77d16774ae9f4b554c1893aca7a002bcf3160d4055cfe8aaceeb76a364e71e7f605382cfe1a801eca1ca874f
 DIST skrooge-2.13.0.tar.xz 20432856 BLAKE2B 5e5ace28f0a3d0f60decb8bcb63fde3d9ed5dc79103ce8d2f4bad2be33b3e4896f19aac4954668bee194362b3b860f0e585e902ed54563b0a82ee36ab41263a7 SHA512 7c5543a4c26953c89a1a67b653bdf5fa7f4baa14d96e763d868f27b288a0f9d7d4bc2994436a4e749d4fd7db999c16b6fcee69817be0774c6e171e49d69e30ba

diff --git a/app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch b/app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch
deleted file mode 100644
index e1a9bbbd328..00000000000
--- a/app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 38e61d2cd8a4a4b863801f8a5097b8b51b0c8e93 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 17 Apr 2018 23:49:52 +0200
-Subject: [PATCH] Fix build with Qt 5.11 (missing QHeaderView)
-
-Reviewers: #skrooge
-
-Differential Revision: https://phabricator.kde.org/D12297
----
- plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp | 1 +
- skgbasegui/skggraphicsview.cpp                              | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp b/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp
-index aa171913c..930c4ea3e 100644
---- a/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp
-+++ b/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp
-@@ -24,6 +24,7 @@
- #include <ksqueezedtextlabel.h>
- #include <kformat.h>
- 
-+#include <QHeaderView>
- #include <qpainter.h>
- 
- #include "skgbasegui_settings.h"
-diff --git a/skgbasegui/skggraphicsview.cpp b/skgbasegui/skggraphicsview.cpp
-index 4c4557880..7143ade3b 100644
---- a/skgbasegui/skggraphicsview.cpp
-+++ b/skgbasegui/skggraphicsview.cpp
-@@ -21,6 +21,7 @@
-  */
- #include "skggraphicsview.h"
- 
-+#include <QHeaderView>
- #include <qmenu.h>
- #include <qdesktopservices.h>
- #include <qprinter.h>
--- 
-2.17.0
-

diff --git a/app-office/skrooge/skrooge-2.12.0.ebuild b/app-office/skrooge/skrooge-2.12.0.ebuild
deleted file mode 100644
index 122a2459f9f..00000000000
--- a/app-office/skrooge/skrooge-2.12.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="https://skrooge.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities designer kde ofx"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlcipher
-	dev-libs/grantlee:5
-	activities? ( $(add_frameworks_dep kactivities) )
-	kde? ( $(add_frameworks_dep krunner) )
-	ofx? ( dev-libs/libofx )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwindowsystem)
-	dev-libs/libxslt
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	designer? (
-		$(add_frameworks_dep kdesignerplugin)
-		$(add_qt_dep designer)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/skrooge:4
-"
-
-REQUIRED_USE="test? ( designer )"
-
-# hangs + installs files
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package kde KF5Runner)
-		$(cmake-utils_use_find_package ofx LibOfx)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	kde5_src_test
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/files/, app-office/skrooge/
@ 2025-10-10 18:43 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2025-10-10 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     b3a36f7759e876127d3ae42ad49d5e1a8435c206
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 10 17:33:17 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 10 18:42:17 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a36f77

app-office/skrooge: Drop unused deps, add plasma-activities:= slot op

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../skrooge/files/skrooge-25.4.0-bogusdeps.patch   | 58 ++++++++++++++
 .../files/skrooge-25.4.0-fix-KF_MIN_VERSION.patch  | 62 +++++++++++++++
 .../skrooge/files/skrooge-25.4.0-qt-6.10.patch     | 44 ++++++++++
 app-office/skrooge/skrooge-25.4.0-r1.ebuild        | 93 ++++++++++++++++++++++
 4 files changed, 257 insertions(+)

diff --git a/app-office/skrooge/files/skrooge-25.4.0-bogusdeps.patch b/app-office/skrooge/files/skrooge-25.4.0-bogusdeps.patch
new file mode 100644
index 000000000000..a7ca3b1f4459
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-25.4.0-bogusdeps.patch
@@ -0,0 +1,58 @@
+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
+

diff --git a/app-office/skrooge/files/skrooge-25.4.0-fix-KF_MIN_VERSION.patch b/app-office/skrooge/files/skrooge-25.4.0-fix-KF_MIN_VERSION.patch
new file mode 100644
index 000000000000..647a9437de33
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-25.4.0-fix-KF_MIN_VERSION.patch
@@ -0,0 +1,62 @@
+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
+

diff --git a/app-office/skrooge/files/skrooge-25.4.0-qt-6.10.patch b/app-office/skrooge/files/skrooge-25.4.0-qt-6.10.patch
new file mode 100644
index 000000000000..19e099e20ea9
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-25.4.0-qt-6.10.patch
@@ -0,0 +1,44 @@
+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
+

diff --git a/app-office/skrooge/skrooge-25.4.0-r1.ebuild b/app-office/skrooge/skrooge-25.4.0-r1.ebuild
new file mode 100644
index 000000000000..ba8425023a4b
--- /dev/null
+++ b/app-office/skrooge/skrooge-25.4.0-r1.ebuild
@@ -0,0 +1,93 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/files/, app-office/skrooge/
@ 2019-08-11 11:06 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-08-11 11:06 UTC (permalink / raw
  To: gentoo-commits

commit:     cb8c91474b0ae2f9e889f89afe2d9114dbd1784f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 10:49:02 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 11:06:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb8c9147

app-office/skrooge: Fix missing header with Frameworks 5.61

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/skrooge-2.20.0-missing-header.patch      | 24 ++++++++++++++++++++++
 app-office/skrooge/skrooge-2.20.0.ebuild           |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/app-office/skrooge/files/skrooge-2.20.0-missing-header.patch b/app-office/skrooge/files/skrooge-2.20.0-missing-header.patch
new file mode 100644
index 00000000000..311404993b8
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-2.20.0-missing-header.patch
@@ -0,0 +1,24 @@
+From 79aeb3f4d3cc01761d99af5868c7fb5101cf2258 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Sun, 21 Jul 2019 09:19:40 +0200
+Subject: Fix build with Qt 5.13
+
+---
+ plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp b/plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp
+index 423eb3a..dfcfb43 100644
+--- a/plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp
++++ b/plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp
+@@ -27,6 +27,8 @@
+ #include "skgmainpanel.h"
+ #include "skgtraces.h"
+ 
++#include <QMetaProperty>
++
+ #include <KFormat>
+ 
+ QVariant SKGDocumentTableFilter::doFilter(const QVariant& input, const QVariant& argument, bool autoescape) const
+-- 
+cgit v1.1

diff --git a/app-office/skrooge/skrooge-2.20.0.ebuild b/app-office/skrooge/skrooge-2.20.0.ebuild
index 191abf9bd10..998ef8d2ee9 100644
--- a/app-office/skrooge/skrooge-2.20.0.ebuild
+++ b/app-office/skrooge/skrooge-2.20.0.ebuild
@@ -75,6 +75,8 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtquickcontrols)
 "
 
+PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
+
 # hangs + installs files
 RESTRICT+=" test"
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/files/, app-office/skrooge/
@ 2019-03-02 20:57 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-03-02 20:57 UTC (permalink / raw
  To: gentoo-commits

commit:     cf3a0a16001bf720f8916ffe42cedcbf39c858dd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 20:53:02 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 20:54:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf3a0a16

app-office/skrooge: Drop 2.16.2, 2.17.0

Closes: https://bugs.gentoo.org/679032
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/skrooge/Manifest                        |   2 -
 .../skrooge/files/skrooge-2.17.0-noqtwebkit.patch  |  36 -------
 app-office/skrooge/skrooge-2.16.2.ebuild           |  96 -------------------
 app-office/skrooge/skrooge-2.17.0.ebuild           | 104 ---------------------
 4 files changed, 238 deletions(-)

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index dc7e3521135..4348ed3ab4e 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,3 +1 @@
-DIST skrooge-2.16.2.tar.xz 21005424 BLAKE2B c8e11df29defc714fe71ad4f488cd6207dcc8bfc0cbee28422682f9c683ed7af8200b84f90cfdd0ca6d0bd0292dab46724c6b9afa0155c9f1603bbbe189b001d SHA512 4bc7de279cf55888a258700c2a8450270904066684b1ce0b121cf5eb966da174d969daa3db432781de62d94420e706ab5364e386e053dde7617d967442eae397
-DIST skrooge-2.17.0.tar.xz 23421972 BLAKE2B c0e08ef7235a6e05e945fcb92a222cc89e7a99ead4b30ba112fea7b420e150545e002e174b747bf7955415241eb55e8007d97e7fd92fa547a1f596360ab68156 SHA512 e65a1e1ed30af7c76776dbdf22f62d475ec3aece9c866453634d2692c6d1f1d6c00cb04376861cb3b09a990a3202f08dcb70ffe28f3c146cce17ade3a3a67a47
 DIST skrooge-2.18.0.tar.xz 20951548 BLAKE2B 7679c519cab88a165c878dbba0a077d7f4cddc9bd1252ce5fd1e6f2d90c98b9fc39b8251df83470debdc8a6fb4f093fcff55768aa41b6a4c379c9e4c4f558f25 SHA512 b8a222947f535eee9041e6bc71703a053fa9a201de352c5f39fcbf35be5259f76532ed5291becab4c676ff8eaba7727730f6d957af36bac54aa4ada11db25da3

diff --git a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
deleted file mode 100644
index 588c4c116e0..00000000000
--- a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From dab0fd4adf2cbee89a417c483350ddffda77ed3b Mon Sep 17 00:00:00 2001
-From: Stephane MANKOWSKI <stephane@mankowski.fr>
-Date: Sun, 27 Jan 2019 17:13:28 +0100
-Subject: skrooge w/ -DSKG_WEBENGINE=ON: ui_skgtablewithgraph.h:15:10: fatal
- error: QtWebKitWidgets/QWebView: No such file or directory BUG:403575
-
----
- skgbasegui/skgtablewithgraph.ui | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/skgbasegui/skgtablewithgraph.ui b/skgbasegui/skgtablewithgraph.ui
-index e1a3058..b00273f 100644
---- a/skgbasegui/skgtablewithgraph.ui
-+++ b/skgbasegui/skgtablewithgraph.ui
-@@ -152,11 +152,6 @@
-  </widget>
-  <customwidgets>
-   <customwidget>
--   <class>QWebView</class>
--   <extends>QWidget</extends>
--   <header>QtWebKitWidgets/QWebView</header>
--  </customwidget>
--  <customwidget>
-    <class>SKGGraphicsView</class>
-    <extends>QWidget</extends>
-    <header>skggraphicsview.h</header>
-@@ -173,7 +168,6 @@
-   </customwidget>
-   <customwidget>
-    <class>SKGWebView</class>
--   <extends>QWebView</extends>
-    <header>skgwebview.h</header>
-   </customwidget>
-  </customwidgets>
--- 
-cgit v1.1

diff --git a/app-office/skrooge/skrooge-2.16.2.ebuild b/app-office/skrooge/skrooge-2.16.2.ebuild
deleted file mode 100644
index 3b71b9d132f..00000000000
--- a/app-office/skrooge/skrooge-2.16.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="https://skrooge.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities designer kde ofx"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlcipher
-	dev-libs/grantlee:5
-	activities? ( $(add_frameworks_dep kactivities) )
-	kde? ( $(add_frameworks_dep krunner) )
-	ofx? ( dev-libs/libofx )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwindowsystem)
-	dev-libs/libxslt
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	designer? (
-		$(add_frameworks_dep kdesignerplugin)
-		$(add_qt_dep designer)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/skrooge:4
-"
-
-REQUIRED_USE="test? ( designer )"
-
-# hangs + installs files
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package kde KF5Runner)
-		$(cmake-utils_use_find_package ofx LibOfx)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	kde5_src_test
-}

diff --git a/app-office/skrooge/skrooge-2.17.0.ebuild b/app-office/skrooge/skrooge-2.17.0.ebuild
deleted file mode 100644
index ec78c6db80c..00000000000
--- a/app-office/skrooge/skrooge-2.17.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="https://skrooge.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
-IUSE="activities designer kde ofx webkit"
-
-REQUIRED_USE="test? ( designer )"
-
-BDEPEND="
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlcipher
-	dev-libs/grantlee:5
-	activities? ( $(add_frameworks_dep kactivities) )
-	kde? ( $(add_frameworks_dep krunner) )
-	ofx? ( dev-libs/libofx )
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwindowsystem)
-	designer? (
-		$(add_frameworks_dep kdesignerplugin)
-		$(add_qt_dep designer)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/skrooge:4
-	$(add_qt_dep qtquickcontrols)
-"
-
-# hangs + installs files
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package kde KF5Runner)
-		$(cmake-utils_use_find_package ofx LibOfx)
-		-DSKG_WEBENGINE=$(usex !webkit)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	kde5_src_test
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/files/, app-office/skrooge/
@ 2016-03-11 18:39 Johannes Huber
  0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2016-03-11 18:39 UTC (permalink / raw
  To: gentoo-commits

commit:     c05153d361569c5892e0f90e5e3f9cf5b6ba5e7d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 18:37:02 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 18:38:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c05153d3

app-office/skrooge: Version bump 2.3.0

Thanks to Andreas Sturmlechner <andreas.sturmlechner <AT> gmail.com>.

Package-Manager: portage-2.2.28

 app-office/skrooge/Manifest                        |  2 +-
 .../skrooge/files/skrooge-2.3.0-glibc-2.23.patch   | 74 ++++++++++++++++++++++
 .../{skrooge-2.2.0.ebuild => skrooge-2.3.0.ebuild} | 30 +++++----
 3 files changed, 91 insertions(+), 15 deletions(-)

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index e2b5bfc..507ff24 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,2 +1,2 @@
 DIST skrooge-1.12.5.tar.xz 11727312 SHA256 8050f8aa767743edf6aad3b4c39bfd8962412e10d9c5578c02d0ce6306a8d3d6 SHA512 5612378a57872065c4ebfff0fabca74a9a0df116fc493643bc01a08c2627a8fb45025221ce5b2123b49d2daffa57ea543312192ecfe96aa3189db7ea4c07fe90 WHIRLPOOL ce99a61896d28699d66f9a17e3ccbccfde0d58cb9106b3919a219dd07a4d5650009e75a965600ec2444e51df43e0d918f1badf484d63b2353838fa490a98be52
-DIST skrooge-2.2.0.tar.xz 16936804 SHA256 c711a63cff0874fdb0c9a1be954d6013dc77cafc30e779252fc50533ebae7eef SHA512 cf341b7d1e2302fbf8da569da42d9f26e0e5c8ce492ba41ffda27593a235d3e15037af9683b506450ebab12ab3129f83ddb4ac58d69b295e54ccb5eada3dfb1b WHIRLPOOL 881dfb2d7a987f51cd7d0819807de6380793f06a2a20e64da3e4e667410bde10c6d25fe53360d13fe03b297b30015dd2ac868af00a8132ed044c283a4a4566e2
+DIST skrooge-2.3.0.tar.xz 17533492 SHA256 76f57e2cede320848f1f1bef41b3be128aec9d59a8e643701b30bcae61f8a11a SHA512 b4ccd3b21852e726a4872b1df76e2a65f031b55dfc4adc7d9dddeb9a26a9b9c61a9a42c94004de2e159646c900a9d343a5b891053d6566f5572f40a18bfd51e3 WHIRLPOOL 3f6d5337af0d7d721cb0e050b1eda7da99e43a5ee0e07db815ce0bd384a98694601ee58f4becfddcbb85d636f1ba47178632c5bbc28ef0b65f3e482049cc6d1c

diff --git a/app-office/skrooge/files/skrooge-2.3.0-glibc-2.23.patch b/app-office/skrooge/files/skrooge-2.3.0-glibc-2.23.patch
new file mode 100644
index 0000000..3df4428
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-2.3.0-glibc-2.23.patch
@@ -0,0 +1,74 @@
+From: Stephane Mankowski <stephane@mankowski.fr>
+Date: Wed, 24 Feb 2016 14:07:00 +0000
+Subject: Building the v2.3.0 package on Arch Linux dies with an error 'isnan' was not declared in this scope
+X-Git-Url: http://quickgit.kde.org/?p=skrooge.git&a=commitdiff&h=dacb104d4c803679be744c198c70a871c2078dd0
+---
+Building the v2.3.0 package on Arch Linux dies with an error 'isnan' was not declared in this scope
+BUG:359679
+---
+
+
+--- a/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
++++ b/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
+@@ -27,7 +27,6 @@
+ 
+ #include <qdom.h>
+ #include <qfileinfo.h>
+-#include <math.h>
+ #include <cmath>
+ 
+ #include "skgtraces.h"
+@@ -36,11 +35,6 @@
+ #include "skgobjectbase.h"
+ #include "skgpayeeobject.h"
+ #include "skgimportexportmanager.h"
+-
+-#ifdef Q_OS_WIN
+-#define isnan(a) _isnan(a)
+-#define isinf(a) !_finite(a)
+-#endif
+ 
+ /**
+  * This plugin factory.
+@@ -386,7 +380,7 @@
+                                         }
+                                     }
+ 
+-                                    if (!isnan(info.value)) {
++                                    if (!std::isnan(info.value)) {
+                                         QChar accountType = mapIdType[info.account.text()];
+                                         if (accountType == 'C') {
+                                             suboperationsList.push_front(info);
+
+--- a/skgbasemodeler/skgdocument.cpp
++++ b/skgbasemodeler/skgdocument.cpp
+@@ -42,7 +42,6 @@
+ #include <qurl.h>
+ 
+ #include <sqlite3.h>
+-#include <math.h>
+ #include <cmath>
+ 
+ #include "skgtraces.h"
+@@ -51,11 +50,6 @@
+ #include "skgpropertyobject.h"
+ #include "skgtransactionmng.h"
+ #include "skgreport.h"
+-
+-#ifdef Q_OS_WIN
+-#define isnan(a) _isnan(a)
+-#define isinf(a) !_finite(a)
+-#endif
+ 
+ #ifdef SKGCIPHER
+ #define SQLDRIVERNAME QStringLiteral("SKGSQLCIPHER")
+@@ -2693,7 +2687,7 @@
+     if (iValue > 0) {
+         p = '+' % p;
+     }
+-    if (p.count() > 10 || isnan(iValue) || isinf(iValue)) {
++    if (p.count() > 10 || std::isnan(iValue) || std::isinf(iValue)) {
+         p = QChar(8734);
+     }
+     return "<font color=\"" %
+

diff --git a/app-office/skrooge/skrooge-2.2.0.ebuild b/app-office/skrooge/skrooge-2.3.0.ebuild
similarity index 83%
rename from app-office/skrooge/skrooge-2.2.0.ebuild
rename to app-office/skrooge/skrooge-2.3.0.ebuild
index cfdb65f..a8f6c71 100644
--- a/app-office/skrooge/skrooge-2.2.0.ebuild
+++ b/app-office/skrooge/skrooge-2.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_GCC_MINIMAL="4.9"
 KDE_HANDBOOK="forceoptional"
@@ -40,19 +40,19 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	app-crypt/qca:2[qt5]
 	dev-libs/grantlee:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
 	activities? ( $(add_frameworks_dep kactivities) )
 	crypt? ( dev-db/sqlcipher )
 	!crypt? ( dev-db/sqlite:3 )
@@ -63,8 +63,8 @@ DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep designer)
 	dev-libs/libxslt
-	dev-qt/designer:5
 	virtual/pkgconfig
 	x11-misc/shared-mime-info
 "
@@ -77,6 +77,8 @@ RESTRICT="test"
 
 DOCS=( AUTHORS CHANGELOG README TODO )
 
+PATCHES=( "${FILESDIR}/${P}-glibc-2.23.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DSKG_BUILD_TEST=$(usex test)


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2025-10-10 18:43 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-07 17:46 [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/files/, app-office/skrooge/ Johannes Huber
  -- strict thread matches above, loose matches on Subject: below --
2025-10-10 18:43 Andreas Sturmlechner
2019-08-11 11:06 Andreas Sturmlechner
2019-03-02 20:57 Andreas Sturmlechner
2016-03-11 18:39 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox