public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/, app-office/skrooge/files/
@ 2016-08-05 17:24 Michael Palimaka
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2016-08-05 17:24 UTC (permalink / raw
  To: gentoo-commits

commit:     c9ed896fbe175791fa39bc6e6723505b6e92f703
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 17:08:59 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 17:24:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9ed896f

app-office/skrooge: remove old

Package-Manager: portage-2.3.0

 app-office/skrooge/Manifest                        |  1 -
 .../skrooge/files/skrooge-2.3.0-glibc-2.23.patch   | 74 ----------------
 app-office/skrooge/skrooge-2.3.0.ebuild            | 98 ----------------------
 3 files changed, 173 deletions(-)

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 12dd26e..0aafff9 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,2 +1 @@
-DIST skrooge-2.3.0.tar.xz 17533492 SHA256 76f57e2cede320848f1f1bef41b3be128aec9d59a8e643701b30bcae61f8a11a SHA512 b4ccd3b21852e726a4872b1df76e2a65f031b55dfc4adc7d9dddeb9a26a9b9c61a9a42c94004de2e159646c900a9d343a5b891053d6566f5572f40a18bfd51e3 WHIRLPOOL 3f6d5337af0d7d721cb0e050b1eda7da99e43a5ee0e07db815ce0bd384a98694601ee58f4becfddcbb85d636f1ba47178632c5bbc28ef0b65f3e482049cc6d1c
 DIST skrooge-2.4.0.tar.xz 18000104 SHA256 132d022337140f841f51420536c31dfe07c90fa3a38878279026825f5d2526fe SHA512 ce2a9aaf67ed8b751ce062bea020c999da0232aca7d1ddcf58294f76435123231c65cc07f818c92499d142941327253f491cbec48fa504541fe91effde8b78c0 WHIRLPOOL 4cc00833e5df03d8d6b071b1ba612258749852f8acf5bf94c2cefd61680516c2a3a53c8d05273c2687886849dac1c562d5a17b1015090876ab9b570130dd73f7

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
deleted file mode 100644
index 3df4428..0000000
--- a/app-office/skrooge/files/skrooge-2.3.0-glibc-2.23.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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.3.0.ebuild b/app-office/skrooge/skrooge-2.3.0.ebuild
deleted file mode 100644
index e01808f..0000000
--- a/app-office/skrooge/skrooge-2.3.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_GCC_MINIMAL="4.9"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="http://www.skrooge.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities crypt 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 kdelibs4support)
-	$(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 krunner)
-	$(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 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
-	activities? ( $(add_frameworks_dep kactivities) )
-	crypt? ( dev-db/sqlcipher )
-	!crypt? ( dev-db/sqlite:3 )
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdesignerplugin)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep designer)
-	dev-libs/libxslt
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/skrooge:4
-"
-
-# hangs + installs files
-RESTRICT="test"
-
-DOCS=( AUTHORS CHANGELOG README TODO )
-
-PATCHES=( "${FILESDIR}/${P}-glibc-2.23.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_CIPHER=$(usex crypt)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(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] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/, app-office/skrooge/files/
@ 2016-10-09 16:04 Michael Palimaka
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2016-10-09 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     acf8ee1af24b4112c5328777deea5852dec9d6d5
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Oct  9 09:48:55 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 16:04:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf8ee1a

app-office/skrooge: Version bump to 2.5.0, add USE=designer,kde

Package-Manager: portage-2.3.0

 app-office/skrooge/Manifest                        |   1 +
 app-office/skrooge/files/skrooge-2.5.0-cmake.patch |  28 ++++++
 app-office/skrooge/metadata.xml                    |   1 +
 app-office/skrooge/skrooge-2.5.0.ebuild            | 105 +++++++++++++++++++++
 4 files changed, 135 insertions(+)

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 0aafff9..4272da9 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1 +1,2 @@
 DIST skrooge-2.4.0.tar.xz 18000104 SHA256 132d022337140f841f51420536c31dfe07c90fa3a38878279026825f5d2526fe SHA512 ce2a9aaf67ed8b751ce062bea020c999da0232aca7d1ddcf58294f76435123231c65cc07f818c92499d142941327253f491cbec48fa504541fe91effde8b78c0 WHIRLPOOL 4cc00833e5df03d8d6b071b1ba612258749852f8acf5bf94c2cefd61680516c2a3a53c8d05273c2687886849dac1c562d5a17b1015090876ab9b570130dd73f7
+DIST skrooge-2.5.0.tar.xz 17603860 SHA256 97bebb1b3f1cd791160292bd4689e584c4054db14f0f88039541e67c72ce5e0d SHA512 00fb32f7705c5125803436a21648545154043b6333267ae722c9beac04baf766e1860ce84b4e56d80d81ade1ab3ef8e3ac60a98d0616cae6ec5212d7ad2ef528 WHIRLPOOL 0eef97d2eebcc00155d1505a457e8443df676c93124edbf352b89fa796781ae9e0630294256932e065d2a35eb2d1916ccf733e05bf4f16a237302d0db713073c

diff --git a/app-office/skrooge/files/skrooge-2.5.0-cmake.patch b/app-office/skrooge/files/skrooge-2.5.0-cmake.patch
new file mode 100644
index 00000000..a68b8e5
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-2.5.0-cmake.patch
@@ -0,0 +1,28 @@
+commit 7c8d47023fc34e02b6d2564696d8dc0d51f019f9
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sat Oct 8 23:17:54 2016 +0200
+
+    KF5DocTools -> KF5Runner conditional
+    
+    REVIEW: 129129
+
+diff --git a/plugins/krunner/skrooge_add_operation/CMakeLists.txt b/plugins/krunner/skrooge_add_operation/CMakeLists.txt
+index 6faec90..f9c41bf 100644
+--- a/plugins/krunner/skrooge_add_operation/CMakeLists.txt
++++ b/plugins/krunner/skrooge_add_operation/CMakeLists.txt
+@@ -20,7 +20,7 @@ PROJECT(plugin_add_operation)
+ 
+ FIND_PACKAGE(KF5Runner)
+ 
+-IF(KF5DOCTOOLS_FOUND)
++IF(KF5Runner_FOUND)
+   LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
+ 
+   ADD_LIBRARY(skrooge_add_operation MODULE skgaddoperation.cpp)
+@@ -29,4 +29,4 @@ IF(KF5DOCTOOLS_FOUND)
+   ########### install files ###############
+   INSTALL(TARGETS skrooge_add_operation DESTINATION ${KDE_INSTALL_QTPLUGINDIR})
+   INSTALL(FILES ${PROJECT_SOURCE_DIR}/org.kde.plasma-runner-skrooge-add-operation.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+-ENDIF()
+\ No newline at end of file
++ENDIF()

diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml
index fd15ec3..330eaf6 100644
--- a/app-office/skrooge/metadata.xml
+++ b/app-office/skrooge/metadata.xml
@@ -8,5 +8,6 @@
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="crypt">Enable encryption using <pkg>dev-db/sqlcipher</pkg></flag>
+		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/app-office/skrooge/skrooge-2.5.0.ebuild b/app-office/skrooge/skrooge-2.5.0.ebuild
new file mode 100644
index 00000000..588d21b
--- /dev/null
+++ b/app-office/skrooge/skrooge-2.5.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_GCC_MINIMAL="4.9"
+KDE_HANDBOOK="forceoptional" # not optional until kdelibs4support is gone
+KDE_TEST="forceoptional"
+# TODO: Drop kdelibs4support when QT_MINIMAL=5.7.0
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
+HOMEPAGE="http://www.skrooge.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities crypt 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 kdelibs4support)
+	$(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 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
+	activities? ( $(add_frameworks_dep kactivities) )
+	crypt? ( dev-db/sqlcipher )
+	!crypt? ( dev-db/sqlite:3 )
+	kde? ( $(add_frameworks_dep krunner) )
+	ofx? ( >=dev-libs/libofx-0.9.1 )
+"
+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"
+
+DOCS=( AUTHORS CHANGELOG README TODO )
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=$(usex test)
+		-DSKG_CIPHER=$(usex crypt)
+		-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] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/, app-office/skrooge/files/
@ 2018-04-17 22:17 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-04-17 22:17 UTC (permalink / raw
  To: gentoo-commits

commit:     967f3fe4c64207649bafe95e7aeb1851b0e88a0b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 22:16:16 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 22:16:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967f3fe4

app-office/skrooge: Fix build with Qt 5.11 (missing QHeaderView)

Package-Manager: Portage-2.3.30, Repoman-2.3.9

 .../skrooge/files/skrooge-2.12.0-qt-5.11.patch     | 40 ++++++++++++++++++++++
 app-office/skrooge/skrooge-2.12.0.ebuild           |  2 ++
 2 files changed, 42 insertions(+)

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
new file mode 100644
index 00000000000..e1a9bbbd328
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch
@@ -0,0 +1,40 @@
+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
index f5110fcfb09..23192a6a386 100644
--- a/app-office/skrooge/skrooge-2.12.0.ebuild
+++ b/app-office/skrooge/skrooge-2.12.0.ebuild
@@ -76,6 +76,8 @@ 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)


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/, app-office/skrooge/files/
@ 2018-09-05  7:21 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-09-05  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     fcfa3986fd61784b200a8098919ca80eb98743b3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  5 07:19:19 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 07:21:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcfa3986

app-office/skrooge: Fix build with USE=-designer

Closes: https://bugs.gentoo.org/665042
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 .../files/skrooge-2.14.0-designer-optional.patch   | 100 +++++++++++++++++++++
 app-office/skrooge/skrooge-2.14.0.ebuild           |   2 +
 2 files changed, 102 insertions(+)

diff --git a/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch b/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch
new file mode 100644
index 00000000000..e34e80b78af
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch
@@ -0,0 +1,100 @@
+From b83f0a0d1171fab0d839de23b97e0ffe3aae4d3e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 5 Sep 2018 08:46:09 +0200
+Subject: [PATCH] Fix build with SKG_DESIGNER=OFF
+
+Summary: cmake was adding designerplugin code to build with SKG_DESIGNER=OFF.
+
+Reviewers: #skrooge
+
+Differential Revision: https://phabricator.kde.org/D15282
+---
+ skgbankgui/CMakeLists.txt | 12 +++++++----
+ skgbasegui/CMakeLists.txt | 44 +++++++++++++++++++++------------------
+ 2 files changed, 32 insertions(+), 24 deletions(-)
+
+diff --git a/skgbankgui/CMakeLists.txt b/skgbankgui/CMakeLists.txt
+index 9bb197f3d..17c7c6ca2 100644
+--- a/skgbankgui/CMakeLists.txt
++++ b/skgbankgui/CMakeLists.txt
+@@ -26,12 +26,16 @@ SET(skgbankgui_SRCS
+     skgpredicatcreator.cpp
+     skgquerydelegate.cpp
+     skgunitcombobox.cpp
++)
+ 
+-    skgquerycreatordesignerplugin.cpp
+-    skgbkwidgetcollectiondesignerplugin.cpp
+-    skgpredicatcreatordesignerplugin.cpp
+-    skgunitcomboboxdesignerplugin.cpp
++IF(SKG_DESIGNER)
++    SET(skgbankgui_SRCS ${skgbankgui_SRCS}
++        skgquerycreatordesignerplugin.cpp
++        skgbkwidgetcollectiondesignerplugin.cpp
++        skgpredicatcreatordesignerplugin.cpp
++        skgunitcomboboxdesignerplugin.cpp
+     )
++ENDIF()
+ 
+ SET(LIBS Qt5::Xml skgbankmodeler skgbasemodeler skgbasegui)
+ IF(SKG_DESIGNER)
+diff --git a/skgbasegui/CMakeLists.txt b/skgbasegui/CMakeLists.txt
+index 112efe267..81b0bf8de 100644
+--- a/skgbasegui/CMakeLists.txt
++++ b/skgbasegui/CMakeLists.txt
+@@ -63,28 +63,32 @@ SET(skgbasegui_SRCS
+     skgshow.cpp
+     skgwidgetselector.cpp
+     skgsimpleperiodedit.cpp
+-
+-    skgwidgetcollectiondesignerplugin.cpp
+-    skgtabwidgetdesignerplugin.cpp
+-    skgtablewidgetdesignerplugin.cpp
+-    skgtableviewdesignerplugin.cpp
+-    skgfilteredtableviewdesignerplugin.cpp
+-    skgtreeviewdesignerplugin.cpp
+-    skgcomboboxdesignerplugin.cpp
+-    skgcolorbuttondesignerplugin.cpp
+-    skgwidgetselectordesignerplugin.cpp
+-    skgwebviewdesignerplugin.cpp
+-    skgzoomselectordesignerplugin.cpp
+-    skgcalculatoreditdesignerplugin.cpp
+-    skggraphicsviewdesignerplugin.cpp
+-    skgshowdesignerplugin.cpp
+-    skgtablewithgraphdesignerplugin.cpp
+-    skgdateeditdesignerplugin.cpp
+-    skgprogressbardesignerplugin.cpp
+-    skgperiodeditdesignerplugin.cpp
+-    skgsimpleperiodeditdesignerplugin.cpp
+ )
+ 
++IF(SKG_DESIGNER)
++    SET(skgbasegui_SRCS ${skgbasegui_SRCS}
++        skgwidgetcollectiondesignerplugin.cpp
++        skgtabwidgetdesignerplugin.cpp
++        skgtablewidgetdesignerplugin.cpp
++        skgtableviewdesignerplugin.cpp
++        skgfilteredtableviewdesignerplugin.cpp
++        skgtreeviewdesignerplugin.cpp
++        skgcomboboxdesignerplugin.cpp
++        skgcolorbuttondesignerplugin.cpp
++        skgwidgetselectordesignerplugin.cpp
++        skgwebviewdesignerplugin.cpp
++        skgzoomselectordesignerplugin.cpp
++        skgcalculatoreditdesignerplugin.cpp
++        skggraphicsviewdesignerplugin.cpp
++        skgshowdesignerplugin.cpp
++        skgtablewithgraphdesignerplugin.cpp
++        skgdateeditdesignerplugin.cpp
++        skgprogressbardesignerplugin.cpp
++        skgperiodeditdesignerplugin.cpp
++        skgsimpleperiodeditdesignerplugin.cpp
++    )
++ENDIF()
++
+ SET(LIBS KF5::Parts KF5::KIOFileWidgets KF5::NotifyConfig KF5::Notifications Qt5::QuickWidgets Qt5::PrintSupport Qt5::Svg skgbasemodeler)
+ IF(SKG_DESIGNER)
+     SET(LIBS ${LIBS} Qt5::Designer)
+-- 
+2.18.0
+

diff --git a/app-office/skrooge/skrooge-2.14.0.ebuild b/app-office/skrooge/skrooge-2.14.0.ebuild
index f5110fcfb09..69bfd2e405c 100644
--- a/app-office/skrooge/skrooge-2.14.0.ebuild
+++ b/app-office/skrooge/skrooge-2.14.0.ebuild
@@ -76,6 +76,8 @@ REQUIRED_USE="test? ( designer )"
 # hangs + installs files
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-designer-optional.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DSKG_BUILD_TEST=$(usex test)


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/, app-office/skrooge/files/
@ 2018-12-13 23:04 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-12-13 23:04 UTC (permalink / raw
  To: gentoo-commits

commit:     bb865282cf6b4aa9d58ef227d58c1ff002afe4b2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 23:03:36 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 23:03:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb865282

app-office/skrooge: Drop 2.15.0

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

 app-office/skrooge/Manifest                        |   1 -
 .../files/skrooge-2.14.0-designer-optional.patch   | 100 ---------------------
 app-office/skrooge/skrooge-2.15.0.ebuild           |  98 --------------------
 3 files changed, 199 deletions(-)

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 3b347b4440f..22b69ba3585 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,2 +1 @@
-DIST skrooge-2.15.0.tar.xz 20704388 BLAKE2B 37280e039595b5c7b3cb1af0fd20f66cc96c5796995c7a9ef4b83878c9a835856e54804ca312bcbb46d6de599a17dd49e45ef0e1dc1e6492b642ed36d88d731b SHA512 c49f8a84d7339ff2b96f27a7895bbfe5f75c33534c7c4f95e47ebd9787bf3e80847139e4a257bc3bdd12e853bfd2131173a66c436cbc3165e1ac7a5ae684eab0
 DIST skrooge-2.16.2.tar.xz 21005424 BLAKE2B c8e11df29defc714fe71ad4f488cd6207dcc8bfc0cbee28422682f9c683ed7af8200b84f90cfdd0ca6d0bd0292dab46724c6b9afa0155c9f1603bbbe189b001d SHA512 4bc7de279cf55888a258700c2a8450270904066684b1ce0b121cf5eb966da174d969daa3db432781de62d94420e706ab5364e386e053dde7617d967442eae397

diff --git a/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch b/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch
deleted file mode 100644
index e34e80b78af..00000000000
--- a/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From b83f0a0d1171fab0d839de23b97e0ffe3aae4d3e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 5 Sep 2018 08:46:09 +0200
-Subject: [PATCH] Fix build with SKG_DESIGNER=OFF
-
-Summary: cmake was adding designerplugin code to build with SKG_DESIGNER=OFF.
-
-Reviewers: #skrooge
-
-Differential Revision: https://phabricator.kde.org/D15282
----
- skgbankgui/CMakeLists.txt | 12 +++++++----
- skgbasegui/CMakeLists.txt | 44 +++++++++++++++++++++------------------
- 2 files changed, 32 insertions(+), 24 deletions(-)
-
-diff --git a/skgbankgui/CMakeLists.txt b/skgbankgui/CMakeLists.txt
-index 9bb197f3d..17c7c6ca2 100644
---- a/skgbankgui/CMakeLists.txt
-+++ b/skgbankgui/CMakeLists.txt
-@@ -26,12 +26,16 @@ SET(skgbankgui_SRCS
-     skgpredicatcreator.cpp
-     skgquerydelegate.cpp
-     skgunitcombobox.cpp
-+)
- 
--    skgquerycreatordesignerplugin.cpp
--    skgbkwidgetcollectiondesignerplugin.cpp
--    skgpredicatcreatordesignerplugin.cpp
--    skgunitcomboboxdesignerplugin.cpp
-+IF(SKG_DESIGNER)
-+    SET(skgbankgui_SRCS ${skgbankgui_SRCS}
-+        skgquerycreatordesignerplugin.cpp
-+        skgbkwidgetcollectiondesignerplugin.cpp
-+        skgpredicatcreatordesignerplugin.cpp
-+        skgunitcomboboxdesignerplugin.cpp
-     )
-+ENDIF()
- 
- SET(LIBS Qt5::Xml skgbankmodeler skgbasemodeler skgbasegui)
- IF(SKG_DESIGNER)
-diff --git a/skgbasegui/CMakeLists.txt b/skgbasegui/CMakeLists.txt
-index 112efe267..81b0bf8de 100644
---- a/skgbasegui/CMakeLists.txt
-+++ b/skgbasegui/CMakeLists.txt
-@@ -63,28 +63,32 @@ SET(skgbasegui_SRCS
-     skgshow.cpp
-     skgwidgetselector.cpp
-     skgsimpleperiodedit.cpp
--
--    skgwidgetcollectiondesignerplugin.cpp
--    skgtabwidgetdesignerplugin.cpp
--    skgtablewidgetdesignerplugin.cpp
--    skgtableviewdesignerplugin.cpp
--    skgfilteredtableviewdesignerplugin.cpp
--    skgtreeviewdesignerplugin.cpp
--    skgcomboboxdesignerplugin.cpp
--    skgcolorbuttondesignerplugin.cpp
--    skgwidgetselectordesignerplugin.cpp
--    skgwebviewdesignerplugin.cpp
--    skgzoomselectordesignerplugin.cpp
--    skgcalculatoreditdesignerplugin.cpp
--    skggraphicsviewdesignerplugin.cpp
--    skgshowdesignerplugin.cpp
--    skgtablewithgraphdesignerplugin.cpp
--    skgdateeditdesignerplugin.cpp
--    skgprogressbardesignerplugin.cpp
--    skgperiodeditdesignerplugin.cpp
--    skgsimpleperiodeditdesignerplugin.cpp
- )
- 
-+IF(SKG_DESIGNER)
-+    SET(skgbasegui_SRCS ${skgbasegui_SRCS}
-+        skgwidgetcollectiondesignerplugin.cpp
-+        skgtabwidgetdesignerplugin.cpp
-+        skgtablewidgetdesignerplugin.cpp
-+        skgtableviewdesignerplugin.cpp
-+        skgfilteredtableviewdesignerplugin.cpp
-+        skgtreeviewdesignerplugin.cpp
-+        skgcomboboxdesignerplugin.cpp
-+        skgcolorbuttondesignerplugin.cpp
-+        skgwidgetselectordesignerplugin.cpp
-+        skgwebviewdesignerplugin.cpp
-+        skgzoomselectordesignerplugin.cpp
-+        skgcalculatoreditdesignerplugin.cpp
-+        skggraphicsviewdesignerplugin.cpp
-+        skgshowdesignerplugin.cpp
-+        skgtablewithgraphdesignerplugin.cpp
-+        skgdateeditdesignerplugin.cpp
-+        skgprogressbardesignerplugin.cpp
-+        skgperiodeditdesignerplugin.cpp
-+        skgsimpleperiodeditdesignerplugin.cpp
-+    )
-+ENDIF()
-+
- SET(LIBS KF5::Parts KF5::KIOFileWidgets KF5::NotifyConfig KF5::Notifications Qt5::QuickWidgets Qt5::PrintSupport Qt5::Svg skgbasemodeler)
- IF(SKG_DESIGNER)
-     SET(LIBS ${LIBS} Qt5::Designer)
--- 
-2.18.0
-

diff --git a/app-office/skrooge/skrooge-2.15.0.ebuild b/app-office/skrooge/skrooge-2.15.0.ebuild
deleted file mode 100644
index e4af19a2944..00000000000
--- a/app-office/skrooge/skrooge-2.15.0.ebuild
+++ /dev/null
@@ -1,98 +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"
-
-PATCHES=( "${FILESDIR}/${PN}-2.14.0-designer-optional.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] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/, app-office/skrooge/files/
@ 2019-01-24 22:26 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-01-24 22:26 UTC (permalink / raw
  To: gentoo-commits

commit:     153c145d0b16557c8d8e5b5c7b79021c2765a9bf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 24 22:24:49 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 24 22:26:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153c145d

app-office/skrooge: Fix build without dev-qt/qtwebkit installed

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

 .../skrooge/files/skrooge-2.17.0-noqtwebkit.patch  | 28 ++++++++++++++++++++++
 app-office/skrooge/skrooge-2.17.0.ebuild           | 12 ++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
new file mode 100644
index 00000000000..cb56d16388f
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
@@ -0,0 +1,28 @@
+From 6ba59f2f707829242ad2410803f48089062c7241 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 24 Jan 2019 23:20:09 +0100
+Subject: [PATCH] Fix build without Qt5WebKit installed
+
+---
+ skgbasegui/skgtablewithgraph.ui | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/skgbasegui/skgtablewithgraph.ui b/skgbasegui/skgtablewithgraph.ui
+index e1a3058aa..df93115f3 100644
+--- a/skgbasegui/skgtablewithgraph.ui
++++ b/skgbasegui/skgtablewithgraph.ui
+@@ -151,11 +151,6 @@
+   </layout>
+  </widget>
+  <customwidgets>
+-  <customwidget>
+-   <class>QWebView</class>
+-   <extends>QWidget</extends>
+-   <header>QtWebKitWidgets/QWebView</header>
+-  </customwidget>
+   <customwidget>
+    <class>SKGGraphicsView</class>
+    <extends>QWidget</extends>
+-- 
+2.20.1
+

diff --git a/app-office/skrooge/skrooge-2.17.0.ebuild b/app-office/skrooge/skrooge-2.17.0.ebuild
index adde622d056..063a50e9408 100644
--- a/app-office/skrooge/skrooge-2.17.0.ebuild
+++ b/app-office/skrooge/skrooge-2.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,8 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="activities designer kde ofx webkit"
 
+REQUIRED_USE="test? ( designer )"
+
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
@@ -62,7 +64,6 @@ DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kwindowsystem)
 	dev-libs/libxslt
 	virtual/pkgconfig
-	x11-misc/shared-mime-info
 	designer? (
 		$(add_frameworks_dep kdesignerplugin)
 		$(add_qt_dep designer)
@@ -73,11 +74,14 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtquickcontrols)
 "
 
-REQUIRED_USE="test? ( designer )"
-
 # hangs + installs files
 RESTRICT+=" test"
 
+src_prepare() {
+	use webkit || eapply "${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196
+	kde5_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DSKG_BUILD_TEST=$(usex test)


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/, app-office/skrooge/files/
@ 2019-01-27 17:20 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-01-27 17:20 UTC (permalink / raw
  To: gentoo-commits

commit:     5ca89b45bc362c3383540a11c9a35e61b462753b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 16:42:08 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 17:20:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca89b45

app-office/skrooge: Switch to upstream patch

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

 .../skrooge/files/skrooge-2.17.0-noqtwebkit.patch  | 34 +++++++++++++---------
 app-office/skrooge/skrooge-2.17.0.ebuild           |  7 ++---
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
index cb56d16388f..588c4c116e0 100644
--- a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
+++ b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
@@ -1,28 +1,36 @@
-From 6ba59f2f707829242ad2410803f48089062c7241 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 24 Jan 2019 23:20:09 +0100
-Subject: [PATCH] Fix build without Qt5WebKit installed
+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 | 5 -----
- 1 file changed, 5 deletions(-)
+ skgbasegui/skgtablewithgraph.ui | 6 ------
+ 1 file changed, 6 deletions(-)
 
 diff --git a/skgbasegui/skgtablewithgraph.ui b/skgbasegui/skgtablewithgraph.ui
-index e1a3058aa..df93115f3 100644
+index e1a3058..b00273f 100644
 --- a/skgbasegui/skgtablewithgraph.ui
 +++ b/skgbasegui/skgtablewithgraph.ui
-@@ -151,11 +151,6 @@
-   </layout>
+@@ -152,11 +152,6 @@
   </widget>
   <customwidgets>
--  <customwidget>
+   <customwidget>
 -   <class>QWebView</class>
 -   <extends>QWidget</extends>
 -   <header>QtWebKitWidgets/QWebView</header>
 -  </customwidget>
-   <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>
 -- 
-2.20.1
-
+cgit v1.1

diff --git a/app-office/skrooge/skrooge-2.17.0.ebuild b/app-office/skrooge/skrooge-2.17.0.ebuild
index 063a50e9408..2aa99f0b78d 100644
--- a/app-office/skrooge/skrooge-2.17.0.ebuild
+++ b/app-office/skrooge/skrooge-2.17.0.ebuild
@@ -77,10 +77,9 @@ RDEPEND="${COMMON_DEPEND}
 # hangs + installs files
 RESTRICT+=" test"
 
-src_prepare() {
-	use webkit || eapply "${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196
-	kde5_src_prepare
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196
+)
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/, app-office/skrooge/files/
@ 2020-02-12 15:21 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-02-12 15:21 UTC (permalink / raw
  To: gentoo-commits

commit:     8a715fd056eef2982f73d096831b210b7448aeb5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 15:13:03 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 15:13:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a715fd0

app-office/skrooge: Drop 2.20.0

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

 app-office/skrooge/Manifest                        |   1 -
 .../files/skrooge-2.20.0-missing-header.patch      |  24 -----
 app-office/skrooge/skrooge-2.20.0.ebuild           | 101 ---------------------
 3 files changed, 126 deletions(-)

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 078f1a28697..4ab9a08a819 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,2 +1 @@
-DIST skrooge-2.20.0.tar.xz 21787404 BLAKE2B b289bbec8d6e369298a142360cc07c6d522d44969c55c68de70df4a9ad574e2a07e9b349091bb8b902408afc709552692557363ef9e7ca2a4375abc41236cd3f SHA512 5b4a9b5b17e24e222a99024bfed03d126df117d4b0af5b5828248ecb08df72dc595225290f811c9a5d45b552f465d361f19f95c4c1ef492bb39db38aa68fa96c
 DIST skrooge-2.21.1.tar.xz 21487048 BLAKE2B 64eeb2e14a18e57f8fd89985e28e3b2736e4ece2ffc5132478531ba19a6f7ad821a5198570f01fd6bb3ad79410ba69bc7b0cdf8c5a85243bff3a879ad2458a2d SHA512 7d87576b38bd0dea1718babd818115b56cdae9183ca6b7b7631bcf749f2ed2b6a49989275fa5603906e08457bcaaf66404b4a76e31c6b84653f40e5b249d31c5

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
deleted file mode 100644
index 311404993b8..00000000000
--- a/app-office/skrooge/files/skrooge-2.20.0-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 7d87ce4cec4..00000000000
--- a/app-office/skrooge/skrooge-2.20.0.ebuild
+++ /dev/null
@@ -1,101 +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 '' '' '5=')
-	$(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}
-	$(add_qt_dep qtquickcontrols)
-"
-
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
-
-# hangs + installs files
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package kde KF5Runner)
-		$(cmake_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] 8+ messages in thread
end of thread, other threads:[~2020-02-12 15:21 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-24 22:26 [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/, app-office/skrooge/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2020-02-12 15:21 Andreas Sturmlechner
2019-01-27 17:20 Andreas Sturmlechner
2018-12-13 23:04 Andreas Sturmlechner
2018-09-05  7:21 Andreas Sturmlechner
2018-04-17 22:17 Andreas Sturmlechner
2016-10-09 16:04 Michael Palimaka
2016-08-05 17:24 Michael Palimaka

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