diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-09 09:27:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-09 09:27:03 +0100 |
commit | cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch) | |
tree | 047fc92023c520d07f13ec5ac96e094d1b312a7a /app-office/skrooge | |
parent | 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff) |
gentoo resync : 09.06.2018
Diffstat (limited to 'app-office/skrooge')
-rw-r--r-- | app-office/skrooge/Manifest | 5 | ||||
-rw-r--r-- | app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch | 40 | ||||
-rw-r--r-- | app-office/skrooge/skrooge-2.12.0.ebuild | 98 | ||||
-rw-r--r-- | app-office/skrooge/skrooge-2.13.0.ebuild | 2 |
4 files changed, 2 insertions, 143 deletions
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest index bea6a2639732..5c58dc4404af 100644 --- a/app-office/skrooge/Manifest +++ b/app-office/skrooge/Manifest @@ -1,6 +1,3 @@ -AUX skrooge-2.12.0-qt-5.11.patch 1280 BLAKE2B cae8b90183fefa70f062355184f40e8767d357e78e4eed1901a32dae3e1b444251c37917e69201e23873d91ccb47b19268b85906cf45f36b0414751770c0e2fd SHA512 625947c334c06ed9bfd0c7cf0a7a6b0ddcf491572532d9e73e529cd4a1ef2e53939b6570df9442817269db897dc2d3c5155d318e6738ddcd4787470a8ffc85ad -DIST skrooge-2.12.0.tar.xz 20289828 BLAKE2B 999f100fffca3b8fff5e343b1137fc51e337428cdbd89f7e5eb72811e3e5e1522cc257e6be83aad57cf4ec66fefd061b685d94caaadcc27182f32da13d57014f SHA512 348262a7e86f6b3f9fa028fea324eeb73c96e03a77d16774ae9f4b554c1893aca7a002bcf3160d4055cfe8aaceeb76a364e71e7f605382cfe1a801eca1ca874f DIST skrooge-2.13.0.tar.xz 20432856 BLAKE2B 5e5ace28f0a3d0f60decb8bcb63fde3d9ed5dc79103ce8d2f4bad2be33b3e4896f19aac4954668bee194362b3b860f0e585e902ed54563b0a82ee36ab41263a7 SHA512 7c5543a4c26953c89a1a67b653bdf5fa7f4baa14d96e763d868f27b288a0f9d7d4bc2994436a4e749d4fd7db999c16b6fcee69817be0774c6e171e49d69e30ba -EBUILD skrooge-2.12.0.ebuild 2411 BLAKE2B a8146472badf1889d4cbd6d1191e9308ab061e6ceaa70f37d2635a86fb4b300e70dc7bef507844eb1f1a6e8367177bd8c1371e418894445355d5250dd4934977 SHA512 cba8d0a3106bffe5a1a833838c89b20315c0c35ce843be20038f634a8d0b69b1ebb5699aac99e34abba74eff70640fcc7f4d95f3e8fab0f0d69b722aee81b5ff -EBUILD skrooge-2.13.0.ebuild 2367 BLAKE2B e4045cba2290bad7f903e9ff81615f7f5f443a0c3dd42ec82a6e1e43e7e9ef421737fa06a799d76c63e1801ea2ce43cfb74fb5b1dc959ae6cf1cc96125ec2773 SHA512 9e2ceacaa2ae8e16864cf3fe4de6dea5d261ad24f42af0e6499b7f1be88afabc3c40ee178de0ff12eb8c70ac1d1d58d73d912d55ea785d2f4739dab35e1bce5c +EBUILD skrooge-2.13.0.ebuild 2365 BLAKE2B aeaf4ffdc815569d4c124bff99bc47acd7b49b576e761e981073a86e0c2e24275696dfcbc4ca2105e3c6fa0b52149130d0a21d9910750ed15e50f9a1b99bb2c6 SHA512 fd9c100ebf80952bb209597e369ca03f88e0a122ec4fb7271ed551c72016e360e49f87f5abff85018eed0a42cf03b39806d1ecb5b973526e95e9443c255b44e8 MISC metadata.xml 400 BLAKE2B b0f7a87e2c2fda05271f731d2c3a6d9a490cf94dd7a742ed60e21aa44964a50bad1218c6ebd9ad16d87a8814f34b70792f7d80bd1e03d80845bd9f1c9292a95c SHA512 50120cec8f5798f6b104c6e1fd05b831f2f280e2f3bab8aa66667a3da1bb351a955b671d16cf4e30b44b0738625424fe4a32bb8a677947d147031964e108dcb0 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 e1a9bbbd3282..000000000000 --- 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 122a2459f9f7..000000000000 --- 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 -} diff --git a/app-office/skrooge/skrooge-2.13.0.ebuild b/app-office/skrooge/skrooge-2.13.0.ebuild index f5110fcfb096..d2d42126152c 100644 --- a/app-office/skrooge/skrooge-2.13.0.ebuild +++ b/app-office/skrooge/skrooge-2.13.0.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://skrooge.org/" [[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="activities designer kde ofx" COMMON_DEPEND=" |