Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=fd22bb66c1e7c94b6be08ed098fe7c26960b6585

commit fd22bb66c1e7c94b6be08ed098fe7c26960b6585
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Fri Oct 22 17:16:35 2010 +0000

beagle-0.3.9-3-i686
*switch to dbus-sharp

diff --git a/source/gnome-extra/beagle/FrugalBuild 
b/source/gnome-extra/beagle/FrugalBuild
index 3baf02f..11ad758 100644
--- a/source/gnome-extra/beagle/FrugalBuild
+++ b/source/gnome-extra/beagle/FrugalBuild
@@ -4,10 +4,10 @@

pkgname=beagle
pkgver=0.3.9
-pkgrel=2
+pkgrel=3
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>=2.24.1-5' 'gsf-sharp' 'galago-sharp' 'gmime-sharp' 
'ndesk-dbus-glib' \
+       'wv' 'gnome-sharp>=2.24.1-5' 'gsf-sharp' 'galago-sharp' 'gmime-sharp' 
'dbus-sharp-glib' \
'taglib-sharp')
makedepends=('intltool' 'evolution-sharp>=0.18.0' 'thunderbird' \
'monodoc' 'scrnsaverproto' 'zip')
@@ -21,14 +21,16 @@ _F_gnome_desktop="y"
Finclude gnome mono gnome-scriptlet
install=$pkgname.install
url="http://beagle-project.org";
-source=($source Fix_gmime.diff beagle-0.3.9-sqlite.patch)
+source=($source Fix_gmime.diff beagle-0.3.9-sqlite.patch mono28.diff)
sha1sums=('5fdba6ffd4a210076a954cc22f5b940705b71a6e' \
'e2c63baaefc1a00af666854e604ae9084bada0d8' \
-          'b7a6357b7635a7ef78fa9667c55fce106b081f9a')
+          'b7a6357b7635a7ef78fa9667c55fce106b081f9a' \
+          '1a31ce377fd1ac7391cf4312f0a1c321d889760c')

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=("evolution-sharp>=0.18.0" "$pkgname=$pkgver thunderbird" 
"$pkgname=$pkgver" "$pkgname=$pkgver")
+subdepends=("evolution-sharp>=0.18.0" "thunderbird" "" "")
+subrodepends=("" "$pkgname=$pkgver" "$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')
@@ -44,8 +46,11 @@ build()
Fcd
Fpatchall
Fautoreconf
+       Fsed 'ndesk-dbus' 'dbus-sharp' configure
+       Fsed 'ndesk-dbus-glib' 'dbus-sharp-glib' configure
+       find ./ -exec sed -i "s/NDesk.DBus/DBus/g" {} \;
Fmake
-       Fmakeinstall
+       Fmakeinstall
#Fbuild

# OnlyShowIn values so we don't get the Gnome GUI's showing in KDE
@@ -54,10 +59,10 @@ build()

# Move autostart files to the correct location
Fmv /etc/xdg /usr/share/gnome
-
+
# This is for the system-wide indexing
Fmkdir /var/cache/beagle
-
+
# "Install" the Mozilla extension
Fmkdir /usr/share/doc/$pkgname-$pkgver/mozilla-extension
cp firefox-extension/beagle.xpi 
$Fdestdir/usr/share/doc/$pkgname-$pkgver/mozilla-extension/ || Fdie
@@ -68,12 +73,12 @@ build()

# Split out the packages
Fsplit $pkgname-evolution usr/lib/beagle/Backends/EvolutionBackends.*
-
+
Fsplit $pkgname-thunderbird usr/lib/beagle/Backends/ThunderbirdBackends.*
Fsplit $pkgname-thunderbird usr/share/doc/$pkgname-$pkgver/thunderbird-extension

Fsplit $pkgname-mozilla usr/share/doc/$pkgname-$pkgver/mozilla-extension
-
+
Fsplit $pkgname-gui usr/bin/beagle-imlogviewer
Fsplit $pkgname-gui usr/bin/beagle-settings
Fsplit $pkgname-gui usr/bin/beagle-search
@@ -82,7 +87,7 @@ build()
Fsplit $pkgname-gui usr/lib/beagle/Beagle.Search*
Fsplit $pkgname-gui usr/lib/beagle/Settings*
Fsplit $pkgname-gui usr/share/applications
-
+
Fbuild_gnome_scriptlet

Fmonocleanup
diff --git a/source/gnome-extra/beagle/mono28.diff 
b/source/gnome-extra/beagle/mono28.diff
new file mode 100644
index 0000000..5032434
--- /dev/null
+++ b/source/gnome-extra/beagle/mono28.diff
@@ -0,0 +1,152 @@
+Patch to enable compilation against mono-2.8
+
+* Mono-2.8 uses mono-2.pc instead of mono.pc for setting cflags and libs.
+* Mono-2.8 disables direct access to struct MonoType fields; use accessors
+instead (mono_type_get_type and mono_field_get_flags have been present in
+the API since at least mono-1.2, so we do not need any version ifdefs).
+* Cast FSpot.MetadataStore to IEnumerable in foreach() to prevent CS1640
+errors (non-unique enumeration of the type) with mono-2.8's gmcs.
+
+diff -ru beagle-0.3.9-orig/configure.in beagle-0.3.9/configure.in
+--- beagle-0.3.9-orig/configure.in     2010-10-16 01:30:03.807825004 -0400
++++ beagle-0.3.9/configure.in  2010-10-16 01:30:10.385825003 -0400
+@@ -59,11 +59,20 @@
+       AC_MSG_ERROR([You need to install the Mono gmcs compiler])
+ fi
+
+-AC_MSG_CHECKING([for mono.pc])
+-if test -z `$PKG_CONFIG --variable=prefix mono`; then
+-  AC_MSG_ERROR([missing the mono.pc file, usually found in the mono-devel 
package])
++# mono-2.8 and higher uses mono-2.pc instead of mono.pc for cflags and libs
++AC_MSG_CHECKING([for mono-2.pc])
++if test -z `$PKG_CONFIG --variable=prefix mono-2`; then
++  AC_MSG_RESULT([not found])
++  AC_MSG_CHECKING([for mono.pc])
++  if test -z `$PKG_CONFIG --variable=prefix mono`; then
++    AC_MSG_ERROR([missing the mono.pc file, usually found in the mono-devel 
package])
++  else
++    AC_MSG_RESULT([found])
++    mono_pc=mono
++  fi
+ else
+   AC_MSG_RESULT([found])
++  mono_pc=mono-2
+ fi
+
+ BEAGLE_DEFINES=""
+@@ -71,10 +80,10 @@
+ # check that we have the require version of mono
+
+ # Temporary: check for mono-1.9
+-PKG_CHECK_MODULES(MONO, mono >= 1.9, mono_1_9=yes, mono_1_9=no)
++PKG_CHECK_MODULES(MONO, $mono_pc >= 1.9, mono_1_9=yes, mono_1_9=no)
+ if test "x$mono_1_9" = "xno"; then
+       AC_MSG_RESULT([missing mono >= 1.9. Searching for mono >= 1.2.4])
+-      PKG_CHECK_MODULES(MONO, mono >= $MONO_REQUIRED)
++      PKG_CHECK_MODULES(MONO, $mono_pc >= $MONO_REQUIRED)
+ else
+       AC_MSG_RESULT([found mono >= 1.9])
+       BEAGLE_DEFINES="$BEAGLE_DEFINES -define:MONO_1_9"
+@@ -84,7 +93,7 @@
+ needed_dlls="Mono.Data.Sqlite Mono.Posix System.Data System.Web 
ICSharpCode.SharpZipLib"
+ for i in $needed_dlls; do
+   AC_MSG_CHECKING([for $i.dll])
+-  if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
++  if test ! -e `$PKG_CONFIG --variable=prefix $mono_pc`/lib/mono/2.0/$i.dll; 
then
+     AC_MSG_ERROR([missing required mono DLL: $i.dll])
+   else
+     AC_MSG_RESULT([found])
+@@ -195,7 +204,7 @@
+ if test "x$enable_google" = "xyes"; then
+   i="System.Security"
+   AC_MSG_CHECKING([for $i.dll (needed by Google backends)])
+-  if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
++  if test ! -e `$PKG_CONFIG --variable=prefix $mono_pc`/lib/mono/2.0/$i.dll; 
then
+     AC_MSG_ERROR([missing required mono DLL: $i.dll])
+   else
+     AC_MSG_RESULT([found])
+@@ -560,7 +569,7 @@
+ if test "x$enable_qt" != "xno" -a "x$has_qyoto" = "xno"; then
+       i="qt-dotnet"
+       AC_MSG_CHECKING([for $i.dll])
+-      if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; 
then
++      if test ! -e `$PKG_CONFIG --variable=prefix 
$mono_pc`/lib/mono/2.0/$i.dll; then
+               AC_MSG_ERROR([missing required mono DLL: $i.dll])
+       else
+               AC_MSG_RESULT([found])
+Only in beagle-0.3.9: configure.in.orig
+diff -ru beagle-0.3.9-orig/Filters/FilterImage.cs 
beagle-0.3.9/Filters/FilterImage.cs
+--- beagle-0.3.9-orig/Filters/FilterImage.cs   2008-04-13 15:24:13.000000000 
-0400
++++ beagle-0.3.9/Filters/FilterImage.cs        2010-10-16 02:08:10.755825005 
-0400
+@@ -141,7 +141,7 @@
+                       Resource rights_anon = null;
+                       Resource title_anon = null;
+
+-                      foreach (Statement stmt in xmp.Store) {
++                      foreach (Statement stmt in (IEnumerable)xmp.Store) {
+                               if (stmt.Predicate == 
MetadataStore.Namespaces.Resolve ("dc:subject")) {
+                                       //Console.WriteLine ("found subject");
+                                       subject_anon = stmt.Object;
+@@ -163,7 +163,7 @@
+                               }
+                       }
+
+-                      foreach (Statement stmt in xmp.Store) {
++                      foreach (Statement stmt in (IEnumerable)xmp.Store) {
+                               if (stmt.Subject == subject_anon &&
+                                   stmt.Predicate != 
MetadataStore.Namespaces.Resolve ("rdf:type")) {
+                                       AddProperty (Beagle.Property.New 
("dc:subject", ((Literal)stmt.Object).Value));
+diff -ru beagle-0.3.9-orig/Filters/FilterPdf.cs 
beagle-0.3.9/Filters/FilterPdf.cs
+--- beagle-0.3.9-orig/Filters/FilterPdf.cs     2008-04-13 15:31:18.000000000 
-0400
++++ beagle-0.3.9/Filters/FilterPdf.cs  2010-10-16 02:22:09.528825003 -0400
+@@ -8,6 +8,7 @@
+ //
+
+ using System;
++using System.Collections;
+ using System.IO;
+ using System.Diagnostics;
+
+@@ -220,7 +221,7 @@
+                       Resource rights_anon = null;
+                       Resource title_anon = null;
+
+-                      foreach (Statement stmt in xmp.Store) {
++                      foreach (Statement stmt in (IEnumerable)xmp.Store) {
+                               if (stmt.Predicate == 
MetadataStore.Namespaces.Resolve ("dc:subject")) {
+                                       //Console.WriteLine ("found subject");
+                                       subject_anon = stmt.Object;
+@@ -239,7 +240,7 @@
+                               }
+                       }
+
+-                      foreach (Statement stmt in xmp.Store) {
++                      foreach (Statement stmt in (IEnumerable)xmp.Store) {
+                               if (stmt.Subject == subject_anon &&
+                                   stmt.Predicate != 
MetadataStore.Namespaces.Resolve ("rdf:type")) {
+                                       AddProperty (Beagle.Property.New 
("dc:subject", ((Literal)stmt.Object).Value));
+diff -ru beagle-0.3.9-orig/glue/mono-glue.c beagle-0.3.9/glue/mono-glue.c
+--- beagle-0.3.9-orig/glue/mono-glue.c 2007-11-26 20:50:05.000000000 -0500
++++ beagle-0.3.9/glue/mono-glue.c      2010-10-16 01:04:19.839825010 -0400
+@@ -79,18 +79,18 @@
+         type = mono_class_get_type (klass);
+
+         /* This is an array, so drill down into it */
+-        if (type->type == MONO_TYPE_SZARRAY)
++        if (mono_type_get_type (type) == MONO_TYPE_SZARRAY)
+                 total += memory_usage_array ((MonoArray *) obj, visited);
+
+         while ((field = mono_class_get_fields (klass, &iter)) != NULL) {
+                 MonoType *ftype = mono_field_get_type (field);
+                 gpointer value;
+
+-                if ((ftype->attrs & (FIELD_ATTRIBUTE_STATIC | 
FIELD_ATTRIBUTE_HAS_FIELD_RVA)) != 0)
++                if ((mono_field_get_flags (field) & (FIELD_ATTRIBUTE_STATIC | 
FIELD_ATTRIBUTE_HAS_FIELD_RVA)) != 0)
+                         continue;
+
+                 /* FIXME: There are probably other types we need to drill 
down into */
+-                switch (ftype->type) {
++                switch (mono_type_get_type (ftype)) {
+
+                 case MONO_TYPE_CLASS:
+                 case MONO_TYPE_OBJECT:
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to