Revision bump adds upstream patch to fix crash when open sqlite db file by Stuart W. Finlayson <stu@santa-li.com> wrt bug #416157.

(Portage version: 2.2.0_alpha105/cvs/Linux i686)

3 files changed, 116 insertions, 1 deletions

diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog
index f67118435351..7464aa203785 100644
--- a/app-office/kmymoney/ChangeLog
+++ b/app-office/kmymoney/ChangeLog
@@ -1,6 +1,13 @@
 # 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.33 2012/05/08 11:04:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.34 2012/05/15 22:34:38 johu Exp $
+
+*kmymoney-4.6.2-r2 (15 May 2012)
+
+  15 May 2012; Johannes Huber <johu@gentoo.org>
+  +files/kmymoney-4.6.2-sqlite-crash.patch, +kmymoney-4.6.2-r2.ebuild:
+  Revision bump adds upstream patch to fix crash when open sqlite db file by
+  Stuart W. Finlayson <stu@santa-li.com> wrt bug #416157.
 
   08 May 2012; Johannes Huber <johu@gentoo.org> kmymoney-4.6.2-r1.ebuild:
   Migrate to virtual/pkgconfig.
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
new file mode 100644
index 000000000000..a7d49389147e
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.6.2-sqlite-crash.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000000..56dfa327eaf6
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-4.6.2-r2.ebuild
@@ -0,0 +1,86 @@
+# 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.1 2012/05/15 22:34:38 johu 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
+
+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}-sqlite-crash.patch"
+)
+
+RESTRICT=test
+# bug 399467
+
+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
+}