Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=7d3c84cfe931535914dc01523f0e804393be3f86
commit 7d3c84cfe931535914dc01523f0e804393be3f86
Author: bouleetbil <bouleet...@frogdev.info>
Date: Mon Nov 7 15:51:51 2011 +0100
evolution-3.3.1.1-1-x86_64
*version bump
diff --git a/source/gnome/evolution/FrugalBuild
b/source/gnome/evolution/FrugalBuild
index a114eb4..2821851 100644
--- a/source/gnome/evolution/FrugalBuild
+++ b/source/gnome/evolution/FrugalBuild
@@ -2,11 +2,11 @@
# Maintainer: bouleetbil <bouleet...@frogdev.info>
pkgname=evolution
-pkgver=3.2.1
-evo_major=3.2
+pkgver=3.3.1.1
+evo_major=3.4
pkgrel=1
pkgdesc="Integrated mail, calendar and address book suite for GNOME"
-depends=('unique' 'gst-plugins-base' 'gnome-desktop>=3.2.1' 'libcanberra-gtk'
'xcb-util>=0.3.8' 'clutter-gtk')
+depends=('unique' 'gst-plugins-base' 'gnome-desktop>=3.3.1' 'libcanberra-gtk'
'xcb-util>=0.3.8' 'clutter-gtk')
rodepends=("$pkgname-base" "$pkgname-audio")
makedepends=('intltool' 'gnome-doc-utils>=0.14.0' 'openldap' \
'psmisc' 'gnome-common' 'krb5' 'gtk-doc' 'openssl>=1.0.0')
@@ -163,6 +163,8 @@ build() {
Fbuild_gnome_scriptlet
}
-sha1sums=('ef7c68d0516bf1c64cc271e50dab93b2614e34ba')
+source=($source glib.diff)
+sha1sums=('91d105c11df97d49f5180e290461edf677f3471d' \
+ 'deb44abb956751eca4675946e384dedb651f6742')
# optimization OK
diff --git a/source/gnome/evolution/glib.diff b/source/gnome/evolution/glib.diff
new file mode 100644
index 0000000..52d8074
--- /dev/null
+++ b/source/gnome/evolution/glib.diff
@@ -0,0 +1,45 @@
+diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
+index 99e0b4a..91e3690 100644
+--- a/capplet/anjal-settings-main.c
++++ b/capplet/anjal-settings-main.c
+@@ -167,8 +167,10 @@ main (gint argc,
+ if (!gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error))
+ g_error ("%s", error->message);
+
++ #if !GLIB_CHECK_VERSION(2,31,0)
+ if (!g_thread_get_initialized ())
+ g_thread_init (NULL);
++ #endif
+
+ e_passwords_init ();
+ categories_icon_theme_hack ();
+diff --git a/capplet/settings/mail-guess-servers.c
b/capplet/settings/mail-guess-servers.c
+index 0b14494..0b15271 100644
+--- a/capplet/settings/mail-guess-servers.c
++++ b/capplet/settings/mail-guess-servers.c
+@@ -343,7 +343,9 @@ main (gint argc,
+ gchar **argv)
+ {
+ EmailProvider *provider;
++ #if !GLIB_CHECK_VERSION(2,31,0)
+ g_thread_init (NULL);
++ #endif
+ g_type_init ();
+
+ provider = g_new0 (EmailProvider, 1);
+diff --git a/shell/main.c b/shell/main.c
+index bb056e3..5b76a2e 100644
+--- a/shell/main.c
++++ b/shell/main.c
+@@ -492,8 +492,10 @@ main (gint argc,
+ textdomain (GETTEXT_PACKAGE);
+
+ g_type_init ();
++ #if !GLIB_CHECK_VERSION(2,31,0)
+ if (!g_thread_get_initialized ())
+ g_thread_init (NULL);
++ #endif
+
+ /* do not require Gtk+ for --force-shutdown */
+ if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) {
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
