summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-11-14 20:00:20 +0000
committerJohannes Huber <johu@gentoo.org>2012-11-14 20:00:20 +0000
commitbdb105fd80c603dafaf0de20f003d3ed463cf871 (patch)
treedf29a883de0b798e108547764b90bc11a40523c4 /app-office/kmymoney
parentStable for x86, wrt bug #438566 (diff)
downloadgentoo-2-bdb105fd80c603dafaf0de20f003d3ed463cf871.tar.gz
gentoo-2-bdb105fd80c603dafaf0de20f003d3ed463cf871.tar.bz2
gentoo-2-bdb105fd80c603dafaf0de20f003d3ed463cf871.zip
Remove old.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'app-office/kmymoney')
-rw-r--r--app-office/kmymoney/ChangeLog8
-rw-r--r--app-office/kmymoney/files/kmymoney-4.6.1-qt48.patch30
-rw-r--r--app-office/kmymoney/files/kmymoney-4.6.2-fix-parallel-build.patch21
-rw-r--r--app-office/kmymoney/files/kmymoney-4.6.2-sqlite-crash.patch22
-rw-r--r--app-office/kmymoney/kmymoney-4.6.2-r2.ebuild85
5 files changed, 7 insertions, 159 deletions
diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog
index 1c406bdba0ed..4c70e9a2b0af 100644
--- a/app-office/kmymoney/ChangeLog
+++ b/app-office/kmymoney/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-office/kmymoney
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.42 2012/11/14 19:57:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.43 2012/11/14 20:00:20 johu Exp $
+
+ 14 Nov 2012; Johannes Huber <johu@gentoo.org>
+ -files/kmymoney-4.6.1-qt48.patch,
+ -files/kmymoney-4.6.2-fix-parallel-build.patch,
+ -files/kmymoney-4.6.2-sqlite-crash.patch, -kmymoney-4.6.2-r2.ebuild:
+ Remove old.
14 Nov 2012; Johannes Huber <johu@gentoo.org> kmymoney-4.6.3.ebuild:
Stable for x86, wrt bug #438566
diff --git a/app-office/kmymoney/files/kmymoney-4.6.1-qt48.patch b/app-office/kmymoney/files/kmymoney-4.6.1-qt48.patch
deleted file mode 100644
index eb4b83552135..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.6.1-qt48.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 8324cfb9657d8c03f83691402386e8c5bfb29981
-Author: Christoph Feck <christoph@maxiom.de>
-Date: Thu Nov 10 12:34:20 2011 +0100
-
- Fix compile with Qt 4.8
-
- Sideported commits f42a0a3d878afebb298609c9886851858c56cc15 and
- fe74b25bf3b78c42e95569fe467a397876bc9c04 from massif-visualizer
-
-diff --git a/libkdchart/src/KDChartBackgroundAttributes.cpp b/libkdchart/src/KDChartBackgroundAttributes.cpp
-index f9f1520..3b86000 100644
---- a/libkdchart/src/KDChartBackgroundAttributes.cpp
-+++ b/libkdchart/src/KDChartBackgroundAttributes.cpp
-@@ -22,6 +22,7 @@
-
- #include "KDChartBackgroundAttributes.h"
- #include <QPixmap>
-+#include <QVariant>
-
- #include <KDABLibFakes>
-
-@@ -150,7 +151,7 @@ QDebug operator<<(QDebug dbg, const KDChart::BackgroundAttributes& ba)
- << "visible="<<ba.isVisible()
- << "brush="<<ba.brush()
- << "pixmapmode="<<ba.pixmapMode()
-- << "pixmap="<<ba.pixmap()
-+ << "pixmap="<<QVariant(ba.pixmap())
- << ")";
- return dbg;
- }
diff --git a/app-office/kmymoney/files/kmymoney-4.6.2-fix-parallel-build.patch b/app-office/kmymoney/files/kmymoney-4.6.2-fix-parallel-build.patch
deleted file mode 100644
index 15ea2e4d9a4c..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.6.2-fix-parallel-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 25ee292b205e6085ba624b8ac8a45fe11a99e5cc
-Author: Cristian Oneț <onet.cristian@gmail.com>
-Date: Tue Apr 10 20:25:26 2012 +0300
-
- The kmymoney_base target must depend on the kmm_config config target to avoid build failures when aggresive parallel make is used.
-
- BUG: 297008
-
-diff --git a/kmymoney/widgets/CMakeLists.txt b/kmymoney/widgets/CMakeLists.txt
-index 20d910d..5c6d28d 100644
---- a/kmymoney/widgets/CMakeLists.txt
-+++ b/kmymoney/widgets/CMakeLists.txt
-@@ -89,6 +89,8 @@ ADD_CUSTOM_TARGET(generate_base_ui_srcs DEPENDS
- # We can compile the uncritical sources without KMM_DESIGNER flags
- KDE4_ADD_LIBRARY(kmymoney_base STATIC ${_uncritial_common_sources})
-
-+ADD_DEPENDENCIES(kmymoney_base kmm_config)
-+
- ########### QtDesigner Widget Library (kmymoneywidgets) #################
- # we never link against this library,
- # but it is needed for uic and QtDesigner
diff --git a/app-office/kmymoney/files/kmymoney-4.6.2-sqlite-crash.patch b/app-office/kmymoney/files/kmymoney-4.6.2-sqlite-crash.patch
deleted file mode 100644
index a7d49389147e..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.6.2-sqlite-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 227cba74b84c55c3d8677f0c10e3f8e35c84e04e
-Author: Fernando Vilas <fvilas@iname.com>
-Date: Fri Mar 2 22:25:43 2012 -0600
-
- BUG: 295235
-
- Fix crash on opening SQLite database.
- (cherry picked from commit 6af4b33df2476f568db852d96b99eb45eaa2e21f)
-
-diff --git a/kmymoney/mymoney/storage/mymoneystoragesql.cpp b/kmymoney/mymoney/storage/mymoneystoragesql.cpp
-index ab5ed4c..4a170b1 100644
---- a/kmymoney/mymoney/storage/mymoneystoragesql.cpp
-+++ b/kmymoney/mymoney/storage/mymoneystoragesql.cpp
-@@ -3348,8 +3348,6 @@ const QMap<QString, MyMoneySchedule> MyMoneyStorageSql::fetchSchedules(const QSt
- if (forUpdate)
- queryString += m_driver->forUpdateString();
-
-- queryString += ';';
--
- q.prepare(queryString);
-
- if (! idList.empty()) {
diff --git a/app-office/kmymoney/kmymoney-4.6.2-r2.ebuild b/app-office/kmymoney/kmymoney-4.6.2-r2.ebuild
deleted file mode 100644
index a3be348ed038..000000000000
--- a/app-office/kmymoney/kmymoney-4.6.2-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.6.2-r2.ebuild,v 1.5 2012/07/27 21:57:49 creffett Exp $
-
-EAPI=4
-
-if [[ ${PV} != *9999* ]]; then
- KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et
- eu fi fr ga gl hu it ja lt ms nds nl pl pt
- pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
- KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
- KDE_HANDBOOK="optional"
- SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
-fi
-
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-
-inherit kde4-base
-
-DESCRIPTION="Personal finance manager for KDE"
-HOMEPAGE="http://kmymoney2.sourceforge.net/"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="debug calendar doc hbci ofx quotes test"
-
-COMMON_DEPEND="
- app-crypt/gpgme
- >=app-office/libalkimia-4.3.2
- dev-cpp/glibmm:2
- dev-cpp/libxmlpp:2.6
- dev-libs/boost
- dev-libs/glib:2
- dev-libs/gmp
- dev-libs/libgpg-error
- dev-libs/libxml2
- $(add_kdebase_dep kdepimlibs)
- x11-misc/shared-mime-info
- calendar? ( dev-libs/libical )
- hbci? (
- >=net-libs/aqbanking-5.0.1
- >=sys-libs/gwenhywfar-4.0.1[qt4]
- )
- ofx? ( >=dev-libs/libofx-0.9.4 )
-"
-RDEPEND="${COMMON_DEPEND}
- quotes? ( dev-perl/Finance-Quote )
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.6.1-qt48.patch"
- "${FILESDIR}/${P}-fix-parallel-build.patch"
- "${FILESDIR}/${P}-gcc-4.7.patch"
- "${FILESDIR}/${P}-sqlite-crash.patch"
-)
-
-src_configure() {
- mycmakeargs=(
- -DUSE_QT_DESIGNER=OFF
- $(cmake-utils_use_enable calendar LIBICAL)
- $(cmake-utils_use_use doc DEVELOPER_DOC)
- $(cmake-utils_use_enable hbci KBANKING)
- $(cmake-utils_use_enable ofx LIBOFX)
- $(cmake-utils_use test KDE4_BUILD_TESTS)
- )
- kde4-base_src_configure
-}
-
-src_compile() {
- kde4-base_src_compile
-
- use doc && kde4-base_src_compile apidoc
-}
-
-src_install() {
- use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/apidocs/html/")
- kde4-base_src_install
-}