r2128 - in /unstable/evolution-data-server/debian: changelog control patches/23_dbus_glib_threading.patch patches/series

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Mon Apr 2 08:46:05 UTC 2012


Author: sjoerd
Date: Mon Apr  2 08:46:04 2012
New Revision: 2128

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2128
Log:
* debian/patches/23_dbus_glib_threading.patch
 - Added. Initialize threading support in dbus-glib which is used through
   gconf (Closes: #666890).
* debian/control: Add myself to uploaders

Added:
    unstable/evolution-data-server/debian/patches/23_dbus_glib_threading.patch
Modified:
    unstable/evolution-data-server/debian/changelog
    unstable/evolution-data-server/debian/control
    unstable/evolution-data-server/debian/patches/series

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=2128&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Mon Apr  2 08:46:04 2012
@@ -1,3 +1,12 @@
+evolution-data-server (3.2.2-3) UNRELEASED; urgency=low
+
+  * debian/patches/23_dbus_glib_threading.patch
+   - Added. Initialize threading support in dbus-glib which is used through
+     gconf (Closes: #666890).
+  * debian/control: Add myself to uploaders
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 02 Apr 2012 10:28:59 +0200
+
 evolution-data-server (3.2.2-2) unstable; urgency=low
 
   * Remove manual call to dh_bugfiles in binary-indep which was also

Modified: unstable/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/control?rev=2128&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control (original)
+++ unstable/evolution-data-server/debian/control Mon Apr  2 08:46:04 2012
@@ -11,7 +11,8 @@
            Yves-Alexis Perez <corsac at debian.org>,
            Pedro Fragoso <ember at ubuntu.com>,
            Josselin Mouette <joss at debian.org>,
-           David Weinehall <tao at debian.org>
+           David Weinehall <tao at debian.org>,
+           Sjoerd Simons <sjoerd at debian.org>
 Standards-Version: 3.9.3
 Dm-Upload-Allowed: yes
 Homepage: http://www.gnome.org/projects/evolution/
@@ -50,7 +51,8 @@
                gnome-pkg-tools,
                liboauth-dev (>= 0.9.4),
                libgoa-1.0-dev (>= 3.1.1),
-               valac-0.14
+               valac-0.14,
+               libdbus-glib-1-dev (>= 0.6)
 
 Package: evolution-data-server
 Architecture: any

Added: unstable/evolution-data-server/debian/patches/23_dbus_glib_threading.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/23_dbus_glib_threading.patch?rev=2128&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/23_dbus_glib_threading.patch (added)
+++ unstable/evolution-data-server/debian/patches/23_dbus_glib_threading.patch Mon Apr  2 08:46:04 2012
@@ -1,0 +1,132 @@
+From 595a9e84d6c09693d6faa164204acca21c10bfbe Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Mon, 2 Apr 2012 09:53:33 +0200
+Subject: [PATCH] Initialize dbus-glib threading
+
+Based on upstreams 990e10860a7a624edcc38241422b7ad39f2cdf45, fixes gnome
+bug #659756.
+---
+ addressbook/libedata-book/Makefile.am           |    7 +++++--
+ addressbook/libedata-book/e-data-book-factory.c |    5 +++++
+ calendar/libedata-cal/Makefile.am               |    6 ++++--
+ calendar/libedata-cal/e-data-cal-factory.c      |    5 +++++
+ configure.ac                                    |    9 +++++++++
+ 5 files changed, 28 insertions(+), 4 deletions(-)
+
+diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am
+index 2fff48a..6af90c3 100644
+--- a/addressbook/libedata-book/Makefile.am
++++ b/addressbook/libedata-book/Makefile.am
+@@ -90,7 +90,8 @@ e_addressbook_factory_CPPFLAGS = \
+ 	-I$(top_builddir)/addressbook \
+ 	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+ 	$(GOA_CFLAGS) \
+-	$(FACTORY_GTK_CFLAGS)
++	$(FACTORY_GTK_CFLAGS) \
++	$(DBUS_GLIB_CFLAGS)
+ 
+ e_addressbook_factory_SOURCES = \
+ 	e-data-book-factory.c \
+@@ -103,7 +104,9 @@ e_addressbook_factory_LDADD = \
+ 	$(top_builddir)/libebackend/libebackend-1.2.la \
+ 	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+ 	$(GOA_LIBS) \
+-	$(FACTORY_GTK_LIBS)
++	$(FACTORY_GTK_LIBS) \
++	$(DBUS_GLIB_LIBS)
++
+ 
+ %-$(API_VERSION).pc: %.pc
+ 	 cp $< $@
+diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
+index dca4255..e7dec12 100644
+--- a/addressbook/libedata-book/e-data-book-factory.c
++++ b/addressbook/libedata-book/e-data-book-factory.c
+@@ -26,6 +26,8 @@
+ #include <unistd.h>
+ #include <glib/gi18n.h>
+ 
++#include <dbus/dbus-glib.h>
++
+ #ifdef ENABLE_MAINTAINER_MODE
+ #include <gtk/gtk.h>
+ #endif
+@@ -842,6 +844,9 @@ main (gint argc,
+ 	gtk_init_check (&argc, &argv);
+ 	#endif
+ 
++	/* this is to initialize threading for dbus-glib used by GConf */
++	dbus_g_thread_init ();
++
+ 	context = g_option_context_new (NULL);
+ 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+ 	g_option_context_parse (context, &argc, &argv, &error);
+diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
+index a7d1a02..11bf702 100644
+--- a/calendar/libedata-cal/Makefile.am
++++ b/calendar/libedata-cal/Makefile.am
+@@ -107,7 +107,8 @@ e_calendar_factory_CPPFLAGS = \
+ 	-I$(top_builddir)/calendar			\
+ 	$(LIBICAL_CFLAGS)				\
+ 	$(EVOLUTION_CALENDAR_CFLAGS)			\
+-	$(FACTORY_GTK_CFLAGS)
++	$(FACTORY_GTK_CFLAGS) \
++	$(DBUS_GLIB_CFLAGS)
+ 
+ e_calendar_factory_LDADD =						\
+ 	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
+@@ -117,6 +118,7 @@ e_calendar_factory_LDADD =						\
+ 	$(top_builddir)/libebackend/libebackend-1.2.la			\
+ 	$(LIBICAL_LIBS)							\
+ 	$(EVOLUTION_CALENDAR_LIBS)					\
+-	$(FACTORY_GTK_LIBS)
++	$(FACTORY_GTK_LIBS) \
++	$(DBUS_GLIB_LIBS)
+ 
+ -include $(top_srcdir)/git.mk
+diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
+index df3e136..a831d64 100644
+--- a/calendar/libedata-cal/e-data-cal-factory.c
++++ b/calendar/libedata-cal/e-data-cal-factory.c
+@@ -30,6 +30,8 @@
+ #include <unistd.h>
+ #include <glib/gi18n.h>
+ 
++#include <dbus/dbus-glib.h>
++
+ #ifdef ENABLE_MAINTAINER_MODE
+ #include <gtk/gtk.h>
+ #endif
+@@ -1043,6 +1045,9 @@ main (gint argc,
+ 	gtk_init_check (&argc, &argv);
+ 	#endif
+ 
++	/* this is to initialize threading for dbus-glib used by GConf */
++	dbus_g_thread_init ();
++
+ 	context = g_option_context_new (NULL);
+ 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+ 	g_option_context_parse (context, &argc, &argv, &error);
+diff --git a/configure.ac b/configure.ac
+index 3d3995e..0bdba2c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -345,6 +345,15 @@ if `$PKG_CONFIG --atleast-version=0.9.1 libgdata`; then
+ 	AC_DEFINE(HAVE_LIBGDATA_0_9, 1, [libgdata is 0.9.1 or higher])
+ fi
+ 
++dnl ******************************
++dnl DBus-glib stuff, to initialize thread for GConf, which is using it
++dnl this is returned back only temporarily and wil lbe removed as soon
++dnl as eds will stop using GConf completely
++dnl ******************************
++PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.6)
++AC_SUBST(DBUS_GLIB_CFLAGS)
++AC_SUBST(DBUS_GLIB_LIBS)
++
+ dnl *******************************
+ dnl Check for GNOME Online Accounts
+ dnl *******************************
+-- 
+1.7.9.5
+

Modified: unstable/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/series?rev=2128&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/series (original)
+++ unstable/evolution-data-server/debian/patches/series Mon Apr  2 08:46:04 2012
@@ -9,3 +9,4 @@
 20_gettext_intltool.patch
 21_link_libical.patch
 22_gmodule_dep.patch
+23_dbus_glib_threading.patch




More information about the pkg-evolution-commits mailing list