Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=faabfb0e4e0019a708c42077daff9a42031ee33c
commit faabfb0e4e0019a708c42077daff9a42031ee33c
Author: bouleetbil <bouleet...@frogdev.info>
Date: Tue Apr 27 15:00:30 2010 +0000
beagle-0.3.9-2-i686
*rebuild with new libs.
diff --git a/source/gnome-extra/beagle/FrugalBuild
b/source/gnome-extra/beagle/FrugalBuild
index 12cc0b7..3baf02f 100644
--- a/source/gnome-extra/beagle/FrugalBuild
+++ b/source/gnome-extra/beagle/FrugalBuild
@@ -4,10 +4,10 @@
pkgname=beagle
pkgver=0.3.9
-pkgrel=1
+pkgrel=2
pkgdesc="Search tool that ransacks your personal information space"
depends=('gecko-sharp' 'gmime>=2.4.3' 'libexif' 'sqlite3' 'libxscrnsaver'
'perl-xml-parser' \
- 'wv' 'gnome-sharp' 'gsf-sharp' 'galago-sharp' 'gmime-sharp'
'ndesk-dbus-glib' \
+ 'wv' 'gnome-sharp>=2.24.1-5' 'gsf-sharp' 'galago-sharp' 'gmime-sharp'
'ndesk-dbus-glib' \
'taglib-sharp')
makedepends=('intltool' 'evolution-sharp>=0.18.0' 'thunderbird' \
'monodoc' 'scrnsaverproto' 'zip')
@@ -21,13 +21,14 @@ _F_gnome_desktop="y"
Finclude gnome mono gnome-scriptlet
install=$pkgname.install
url="http://beagle-project.org";
-source=($source Fix_gmime.diff)
+source=($source Fix_gmime.diff beagle-0.3.9-sqlite.patch)
sha1sums=('5fdba6ffd4a210076a954cc22f5b940705b71a6e' \
- 'e2c63baaefc1a00af666854e604ae9084bada0d8')
+ 'e2c63baaefc1a00af666854e604ae9084bada0d8' \
+ 'b7a6357b7635a7ef78fa9667c55fce106b081f9a')
subpkgs=("$pkgname-evolution" "$pkgname-thunderbird" "$pkgname-mozilla"
"$pkgname-gui")
subdescs=('Beagle evolution bindings.' 'Beagle backend for thunderbird' 'Beagle
extension for Mozilla' 'Desktop Search Application.')
-subdepends=("$pkgname=$pkgver evolution-sharp>=0.18.0" "$pkgname=$pkgver
thunderbird" "$pkgname=$pkgver" "$pkgname=$pkgver")
+subdepends=("evolution-sharp>=0.18.0" "$pkgname=$pkgver thunderbird"
"$pkgname=$pkgver" "$pkgname=$pkgver")
subgroups=('gnome-extra' 'gnome-extra' 'gnome-extra' 'gnome-extra')
suboptions=('scriptlet' 'scriptlet' 'scriptlet' 'scriptlet')
subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64')
diff --git a/source/gnome-extra/beagle/beagle-0.3.9-sqlite.patch
b/source/gnome-extra/beagle/beagle-0.3.9-sqlite.patch
new file mode 100644
index 0000000..1ae1136
--- /dev/null
+++ b/source/gnome-extra/beagle/beagle-0.3.9-sqlite.patch
@@ -0,0 +1,93 @@
+From 59f63233908b8ccee70251f698351014546d5765 Mon Sep 17 00:00:00 2001
+From: Gabriel Burt <gabriel.b...@gmail.com>
+Date: Thu, 07 Jan 2010 01:08:34 +0000
+Subject: Update to build against Mono.Data.Sqlite 2.x
+
+---
+diff --git a/Util/FSpotTools.cs b/beagle/Util/FSpotTools.cs
+index 9470a0a..82f7752 100644
+--- a/Util/FSpotTools.cs
++++ b/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/beagled/SqliteUtils.cs b/beagle/beagled/SqliteUtils.cs
+index f4be4c6..f747db5 100644
+--- a/beagled/SqliteUtils.cs
++++ b/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
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
