[Lunar-commits] <moonbase> evolution: bugfix collection

[Paul Bredbury]

commit 6940208a7af9baf66c7bee648c9cf02e65d77069
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Thu Jan 20 15:19:07 2011 +0700

    evolution: bugfix collection
    
    From Gentoo.
    
    libgdata could be bumped to 0.8 also.
---
 gnome2/desktop/evolution-data-server/BUILD   |   20 ++++++++++----------
 gnome2/desktop/evolution-data-server/DETAILS |    5 ++++-
 gnome2/desktop/evolution/BUILD               |   10 ++++++----
 gnome2/desktop/evolution/DETAILS             |    5 ++++-
 zbeta/libgdata/DETAILS                       |    3 ++-
 5 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/gnome2/desktop/evolution-data-server/BUILD b/gnome2/desktop/evolution-data-server/BUILD
index 431e985..5782f17 100644
--- a/gnome2/desktop/evolution-data-server/BUILD
+++ b/gnome2/desktop/evolution-data-server/BUILD
@@ -1,14 +1,14 @@
 (
 
-   OPTS+=" --without-weather --enable-largefile"
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr} \
-                --build=$BUILD        \
-                --sysconfdir=/etc     \
-                --localstatedir=/var  \
-                --enable-ipv6=yes     \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info  \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man    \
-                $OPTS                                         &&
-    default_make
+  # Fixes bugs, and compilation with >= libgdata-0.7
+  patch_it $SOURCE_CACHE/$SOURCE2 1  &&
+
+  OPTS+=" --without-weather --enable-largefile --enable-ipv6"  &&
+
+  # For the patches to configure.ac to take effect
+  intltoolize --force --copy --automake  &&
+  autoreconf -fi  &&
+
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/evolution-data-server/DETAILS b/gnome2/desktop/evolution-data-server/DETAILS
index 5526ce6..9556b14 100644
--- a/gnome2/desktop/evolution-data-server/DETAILS
+++ b/gnome2/desktop/evolution-data-server/DETAILS
@@ -2,11 +2,14 @@
            MAJOR=2.32
          VERSION=$MAJOR.1
           SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=evolution-data-server-2.32.1-fixup.patch.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:aaf96d976dd0c5d8615adf6c7300c5098eb14046
+     SOURCE2_VFY=sha1:4b689f893148d86df8c451804328c0c2580d5b47
         WEB_SITE=http://gnome.org/projects/evolution
          ENTERED=20011109
-         UPDATED=20101202
+         UPDATED=20110117
            SHORT="backend data manager for Evolution"
            PSAFE=no
 
diff --git a/gnome2/desktop/evolution/BUILD b/gnome2/desktop/evolution/BUILD
index 9972dc1..cbfb5fe 100644
--- a/gnome2/desktop/evolution/BUILD
+++ b/gnome2/desktop/evolution/BUILD
@@ -1,11 +1,13 @@
 (
 
+  patch_it $SOURCE2 1  &&
+
   OPTS+=" --disable-nm"  &&
 
-  default_build
+  # For the changes to Makefile.am to take effect
+  intltoolize --force --copy --automake  &&
+  autoreconf -fi  &&
 
-#  if ! grep -q '/usr/lib/bonobo/servers' /etc/bonobo-activation/bonobo-activation-config.xml ; then
-#    sedit "s:<searchpath>:<searchpath>\n\t<item>/usr/lib/bonobo/servers</item>:" /etc/bonobo-activation/bonobo-activation-config.xml
-#  fi
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/evolution/DETAILS b/gnome2/desktop/evolution/DETAILS
index 5c2c554..ba3a025 100644
--- a/gnome2/desktop/evolution/DETAILS
+++ b/gnome2/desktop/evolution/DETAILS
@@ -2,11 +2,14 @@
            MAJOR=2.32
          VERSION=$MAJOR.1
           SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=evolution-2.32.1-fixup.patch.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:ade956b205dcdb1ba964554fb90be459e6908bac
+     SOURCE2_VFY=sha1:c34791eaf3ea863fcfa57e2f1a3f18f01c517de4
         WEB_SITE=http://gnome.org/projects/evolution
          ENTERED=20011109
-         UPDATED=20101202
+         UPDATED=20110117
            SHORT="email, calendar and notes information management solution"
 
 cat << EOF
diff --git a/zbeta/libgdata/DETAILS b/zbeta/libgdata/DETAILS
index d93e838..317bcaa 100644
--- a/zbeta/libgdata/DETAILS
+++ b/zbeta/libgdata/DETAILS
@@ -4,10 +4,11 @@
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
       SOURCE_VFY=sha1:d6a78525b15b320086b7483e18bd9be6cb4e9e86
-        WEB_SITE=http://www.gnome.org
+        WEB_SITE=http://live.gnome.org/libgdata
          ENTERED=20091006
          UPDATED=20101203
            SHORT="Gnome's GData protocol library"
+
 cat << EOF
 Libgdata is a GLib-based library for accessing online service APIs using
 the GData protocol -- most notably, Google's services. It provides APIs