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

Package-Manager: portage-2.2.0_alpha105/cvs/Linux i686

4 files changed, 127 insertions, 10 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/Manifest b/app-office/kmymoney/Manifest
index e7e2d1f13478..dc923f42739a 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -3,19 +3,21 @@ Hash: SHA512
 
 AUX kmymoney-4.6.1-qt48.patch 961 RMD160 8a44caa45c864687339a9f1d008e52d39bbc6a65 SHA1 b29a7cfbf4398e91bd4401a71a678d7ceb1f0cba SHA256 5fde218c7d0b62702e4d5bcac299472d3e6bff155e04680ef4923a4f42ec539d
 AUX kmymoney-4.6.2-fix-parallel-build.patch 887 RMD160 c73f3b750eb0940e61bedd00af2f746dd080bc84 SHA1 9a228c16aec47da720a54dfd33d984de2442601e SHA256 49e56dc703ac314b83883ca09694858fc36030bf92d729a1189ea73adad25264
+AUX kmymoney-4.6.2-sqlite-crash.patch 764 RMD160 b5dd7a8c97a41707163bef570163cf835c767c0a SHA1 44a36cb54fab76627f28ad54f5af5ad36d7d665f SHA256 0ddd5a7f49f63f0835f8a721a271044ecf78899c88a6fbb39a314d56ee740d35
 DIST kmymoney-4.6.2.tar.bz2 22762330 RMD160 b71f82f7fed3daba5711437db29cd225f38262d9 SHA1 b7dc6ce3a36c441ae2d199725db9aa2ec23fdd1f SHA256 add8acba2f0d4c212ac1c7fbbdad2fd43a24caceed586b13d90dcd2a20a12b75
 EBUILD kmymoney-4.6.2-r1.ebuild 1949 RMD160 ea8e7a973718d7b826eb6758fc39d0a60dbbd0a5 SHA1 f9b46f3c4bc159c46fa12d2c58db9e1fd4b6f1db SHA256 98f6aa0792eeba0eb5b5392956b6c861e26078ec67c2c2f5e9a524b8c88c1d06
+EBUILD kmymoney-4.6.2-r2.ebuild 1988 RMD160 5de284c08a569762727b4b91d0fc2be68dd25c9b SHA1 d2be89dca12048956ac616263fb35599c2058887 SHA256 02200e96860101a217d663591bf9a701356682aa6f543b73369ca5bc3ca67909
 EBUILD kmymoney-4.6.2.ebuild 1945 RMD160 a8e1afb68b8d3352073326d1198e3df64522817e SHA1 827c69d5f7aaa692c2f08fca4a8d22233a1c4251 SHA256 a0b0d705df2d6d17844c794056bf1bed0d087327c983622b7ad446dd1280b1dc
-MISC ChangeLog 4926 RMD160 752410f3f81942af87535d18b27e75707554ea13 SHA1 a48a72389c28c86995586a8a1bb26e7d784ba828 SHA256 b8df778561a282335b884eaa92a6ea4aa6ca0926052aaecc656a87752787cea4
+MISC ChangeLog 5215 RMD160 e2b5ea7d167c9b4f1e8b2a0ced1b57dc3c9d6bff SHA1 f29dcfaf5423f1d7859d0a8256b16bd1f33e4308 SHA256 ad286b1789931ed929120c31fe91ab57856a7a6475ab10553317c3fd87d1d3df
 MISC metadata.xml 327 RMD160 337c462e38007a529ca6c979b341426898a9af04 SHA1 62bfe203a842760f95655a42acdd1da8f4436637 SHA256 af0c2dc62649bae5e9a0b375d7106bee7952dda0b258ad375e2cf1551c75246f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEbBAEBCgAGBQJPqP2kAAoJEO+t9ga+3I3a1rYH+LCa0qO41cft5m7SWD4vmFQZ
-oWna3dScR44cZvyha32K96pe6HVRJh74bhLuj540N43xMLpbHGe4cDgfWOGY4xOX
-MZ0Jix+dal9upWfPloFD86ArfFfLNZeuAkfqHWHDp07hmyhZO9Srv3sTJBv5C4Mi
-evkrA777iuk8mO9R2iQoMw9xJlrPRHC0/FiKIU8EqkrP9KT3yRI5qBeyQPZhs+5g
-+C93eog9/uoNdTvc7+5K0brkrhHNIznOtNfd/lWwJVKYjtkfdB5gWf0qP5MCcXju
-/soHvkX4aJgEFupc8hWZMBvok2pkBzqZw78E7skx6lkg5u8qajNwhfWkPiiU2w==
-=Tn5L
+iQEcBAEBCgAGBQJPstpjAAoJEO+t9ga+3I3aAMIH/1LB5EdNnI9RrRhA+CiL5jJ8
+vwOdwLzxyMMOl5o9KJVGYNcwSNPlKgGXiKlvxhc6CclLs05CdPl4GZCzu2kfO3Kr
+WwC6M0WXzFfGgtBOldY7mtRvi1TUL1VLX9yGFqal+tortCiK8AYK4I9BH0xUUEVG
+ill/ux8EGR+EoWjEi2goL4FdUj0St8/jurTSiXt/rTUS1yvGWGbzLCo5N3joYEGh
+n/3p7VflXeg2PCoppFkpXG8qpQbEe6lEaqpZ+Zhoz2P1sVMYu4iVrwN5I7Hqqumq
+w8zAaDCh+o2/HYH2oJ3XRRwVNpfrvyR/XJtPodAt6gDDdhw50gojiNKOP6V3HEc=
+=vbF3
 -----END PGP SIGNATURE-----
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
+}