fix compilation issue against sqlite, close #306313

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 112 insertions, 6 deletions

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 83358b6b312a..276b89af47e6 100644
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/beagle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.105 2010/02/10 20:51:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.106 2010/04/24 18:02:42 lxnay Exp $
+
+  24 Apr 2010; Fabio Erculiani <lxnay@gentoo.org> beagle-0.3.9-r1.ebuild,
+  beagle-0.3.9-r2.ebuild, +files/beagle-0.3.9-sqlite.patch:
+  fix compilation issue against sqlite, close #306313
 
   10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   beagle-0.3.9-r1.ebuild, beagle-0.3.9-r2.ebuild:
diff --git a/app-misc/beagle/Manifest b/app-misc/beagle/Manifest
index b087d9dc7777..15408e58dc7a 100644
--- a/app-misc/beagle/Manifest
+++ b/app-misc/beagle/Manifest
@@ -1,8 +1,9 @@
 AUX beagle-0.3.9-firefox-3.5.patch 7426 RMD160 aa674eb63cf320d5500e243659ac1196594ebe06 SHA1 fe1ba593e445ef4b29671800e78c694982e9b112 SHA256 2091b5519bef802124bd37387501270a688a715c1f06f382c9ed825eee86d4ba
+AUX beagle-0.3.9-sqlite.patch 2749 RMD160 0815f0e79981e10673e2f1a7451143f93598d88a SHA1 9999254ee26a04a2a9fa33ba09bf04e2e6ea7428 SHA256 bbb7245c42fa0be2bccb762463bda1f7daf1663f0e6460eb1038cf7f05316feb
 AUX beagle-log-level-warn.patch 2014 RMD160 444a772662d0cf1e2b32865c87ad8308c36537c2 SHA1 7b4abc9699922c3d681b3283ca9dc2dfe0710e88 SHA256 1f8664518210dfd54ea0e229cff30cc7e41dd0651ad5ed5f608afecb49afc48e
 AUX crawl-portage 295 RMD160 979f70ae6172ffbbba21fcf8ab22964d10bf6b1a SHA1 6c8da69912829a6dd8f1bdcacc3d59acb31a9f63 SHA256 14b8423c0590ce9bc8b43ee75b7c51c02ec46031d89baeee8c0100bdc6adb31b
 DIST beagle-0.3.9.tar.bz2 1895453 RMD160 f8e26ceeea50e33b04837e1d22f1a6f18fa84c1a SHA1 5fdba6ffd4a210076a954cc22f5b940705b71a6e SHA256 4252710247809df393f318450a391298fa57a3ad7b6043962734997035caf488
-EBUILD beagle-0.3.9-r1.ebuild 5744 RMD160 45cae1c65ed328b016ebe9bbcac408cf7f2bde7a SHA1 27c0fcd730b52d4e0d3bd7f848b70d29bb155b73 SHA256 dbbeac5341cdf1532dc0892edf536eb298a76ccff56dda17382d96bf7f2da6e2
-EBUILD beagle-0.3.9-r2.ebuild 5773 RMD160 d5c00cef066705e81deafd1b6027e7a5f2496dbb SHA1 84c089ccb638912353b2c742fe77978151c36d2f SHA256 852a2b2c7580bf8790bd4233f61308af8e11f1e352a9d70fe854a66fb7d02d78
-MISC ChangeLog 17988 RMD160 8d1cfce10db20e06e2a196fdc284f396fa33d1a8 SHA1 65fd2f9adafc11eb56ff3e35512ddc4fe78f54f1 SHA256 87abcb2a2c56c2af682518bf077897a9ab9e4abc54917a1278bf7b76de71c19e
+EBUILD beagle-0.3.9-r1.ebuild 5822 RMD160 e8e4a2ae07d6a68415c3be060d73380a9eeb7d79 SHA1 e0a0330ba23cc4e04d62458984c747201f9230b9 SHA256 1e6b8ace2dbc6ec7ac1f35edb5bceaa0bdeac146359f24677bd3d89e519d33fa
+EBUILD beagle-0.3.9-r2.ebuild 5850 RMD160 a1e7d73bffb0ec180a33c379bbfe7948277fed7f SHA1 328a27560f21d21bb67256fc1dd17f7fe1819b5b SHA256 fbf44000e770c0f266652015a29c74c568084de7726ccc71d2552ab67703c2e1
+MISC ChangeLog 18173 RMD160 f6c7390e62c1d35962e12ac339123ec2a6ca90c7 SHA1 465ae4ff90113d59f18bd25ae6d897ba7176bb4a SHA256 603a0b8c3de20f32af36178fcd959b138bb97362e4408e94ddde8e72b96d97c0
 MISC metadata.xml 2635 RMD160 04de0c5e6bb7c6610c2a611fc421fd04b3b14332 SHA1 c572b7e74e85c852156ec59ff41d35756c58d0e5 SHA256 d64623a36f93a4207d15850e4ceb8ae275eeb99f9f2e1c477cb1f126050cfff6
diff --git a/app-misc/beagle/beagle-0.3.9-r1.ebuild b/app-misc/beagle/beagle-0.3.9-r1.ebuild
index 9b9ff8ce8aee..ce875b8b46b0 100644
--- a/app-misc/beagle/beagle-0.3.9-r1.ebuild
+++ b/app-misc/beagle/beagle-0.3.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r1.ebuild,v 1.7 2010/02/10 20:51:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r1.ebuild,v 1.8 2010/04/24 18:02:42 lxnay Exp $
 
 EAPI=2
 
@@ -98,6 +98,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+
+	# Fix upstream bug, Gentoo bug #306313
+	epatch "${FILESDIR}"/${P}-sqlite.patch
+
 	#Fix bug 248703
 	sed -i  -e 's:VALID_EPIPHANY_VERSIONS=":VALID_EPIPHANY_VERSIONS="2.26 2.25 2.24 :' \
 		configure || die "epiphany sed failed"
diff --git a/app-misc/beagle/beagle-0.3.9-r2.ebuild b/app-misc/beagle/beagle-0.3.9-r2.ebuild
index 2b9e000bfa0f..4bd178adce3c 100644
--- a/app-misc/beagle/beagle-0.3.9-r2.ebuild
+++ b/app-misc/beagle/beagle-0.3.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r2.ebuild,v 1.4 2010/02/10 20:51:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r2.ebuild,v 1.5 2010/04/24 18:02:42 lxnay Exp $
 
 EAPI=2
 
@@ -96,6 +96,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+
+	#Fix upstream bug, Gentoo bug #306313
+	epatch "${FILESDIR}"/${P}-sqlite.patch
+
 	#Fix bug 248703
 	sed -i  -e 's:VALID_EPIPHANY_VERSIONS=":VALID_EPIPHANY_VERSIONS="2.26 2.25 2.24 :' \
 		configure.in || die "epiphany sed failed"
diff --git a/app-misc/beagle/files/beagle-0.3.9-sqlite.patch b/app-misc/beagle/files/beagle-0.3.9-sqlite.patch
new file mode 100644
index 000000000000..251b5517752f
--- /dev/null
+++ b/app-misc/beagle/files/beagle-0.3.9-sqlite.patch
@@ -0,0 +1,93 @@
+From 59f63233908b8ccee70251f698351014546d5765 Mon Sep 17 00:00:00 2001
+From: Gabriel Burt <gabriel.burt@gmail.com>
+Date: Thu, 07 Jan 2010 01:08:34 +0000
+Subject: Update to build against Mono.Data.Sqlite 2.x
+
+---
+diff --git a/beagle/Util/FSpotTools.cs b/beagle/Util/FSpotTools.cs
+index 9470a0a..82f7752 100644
+--- a/beagle/Util/FSpotTools.cs
++++ b/beagle/Util/FSpotTools.cs
+@@ -85,8 +85,12 @@ namespace Beagle.Util {
+ 							while (reader == null) {
+ 								try {
+ 									reader = command.ExecuteReader ();
+-								} catch (SqliteBusyException) {
+-									Thread.Sleep (50);
++								} catch (SqliteException e) {
++									if (e.ErrorCode == SQLiteErrorCode.Busy) {
++										Thread.Sleep (50);
++									} else {
++										throw;
++									}
+ 								}
+ 							}
+ 							reader.Close ();
+diff --git a/beagle/beagled/SqliteUtils.cs b/beagle/beagled/SqliteUtils.cs
+index f4be4c6..f747db5 100644
+--- a/beagle/beagled/SqliteUtils.cs
++++ b/beagle/beagled/SqliteUtils.cs
+@@ -55,8 +55,13 @@ namespace Beagle.Util {
+ 					try {
+ 						ret = command.ExecuteNonQuery ();
+ 						break;
+-					} catch (SqliteBusyException ex) {
+-						Thread.Sleep (50);
++					} catch (SqliteException ex) {
++						if (ex.ErrorCode == SQLiteErrorCode.Busy) {
++							Thread.Sleep (50);
++						} else {
++							Log.Error (ex, "SQL that caused the exception: {0}", command_text);
++							throw;
++						}
+ 					} catch (Exception e) {
+ 						Log.Error (e, "SQL that caused the exception: {0}", command_text);
+ 						throw;
+@@ -79,8 +84,13 @@ namespace Beagle.Util {
+ 				try {
+ 					ret = command.ExecuteNonQuery ();
+ 					break;
+-				} catch (SqliteBusyException ex) {
+-					Thread.Sleep (50);
++				} catch (SqliteException ex) {
++					if (ex.ErrorCode == SQLiteErrorCode.Busy) {
++						Thread.Sleep (50);
++					} else {
++						Log.Error (ex, "SQL that caused the exception: {0}", command.CommandText);
++						throw;
++					}
+ 				} catch (Exception e) {
+ 					Log.Error ( e, "SQL that caused the exception: {0}", command.CommandText);
+ 					throw;
+@@ -96,8 +106,12 @@ namespace Beagle.Util {
+ 			while (reader == null) {
+ 				try {
+ 					reader = command.ExecuteReader ();
+-				} catch (SqliteBusyException ex) {
+-					Thread.Sleep (50);
++				} catch (SqliteException ex) {
++					if (ex.ErrorCode == SQLiteErrorCode.Busy) {
++						Thread.Sleep (50);
++					} else {
++						throw;
++					}
+ 				}
+ 			}
+ 			return reader;
+@@ -108,8 +122,12 @@ namespace Beagle.Util {
+ 			while (true) {
+ 				try {
+ 					return reader.Read ();
+-				} catch (SqliteBusyException ex) {
+-					Thread.Sleep (50);
++				} catch (SqliteException ex) {
++					if (ex.ErrorCode == SQLiteErrorCode.Busy) {
++						Thread.Sleep (50);
++					} else {
++						throw;
++					}
+ 				}
+ 			}
+ 		}
+--
+cgit v0.8.3.1