commit: 840b734b295cf731f2d7fce1fac0fbd4be001129 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Fri Mar 11 18:38:28 2016 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Fri Mar 11 18:38:28 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=840b734b
app-office/skrooge: Moved to main tree Package-Manager: portage-2.2.28 .../skrooge/files/skrooge-2.3.0-glibc-2.23.patch | 74 ---------------- app-office/skrooge/skrooge-2.3.0.ebuild | 98 ---------------------- 2 files changed, 172 deletions(-) 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 <[email protected]> -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 a8f6c71..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" -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 -}
