[gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/

["Priit Laes" <plaes@plaes.org>]

commit:     4bc393013b26554b9103ce029a90cb1d1457bcc9
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Aug 10 13:15:28 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Aug 10 13:15:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4bc39301

gnome-extra/evolution-data-server: Fix build with gcc-4.5.x

---
 .../evolution-data-server-3.5.5.ebuild             |    2 +
 .../evolution-data-server-3.5.5-gcc-compat.patch   |   54 ++++++++++++++++++++
 2 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild
index 9e4dfcc..83561c5 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild
@@ -91,6 +91,8 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
+	epatch "${FILESDIR}/${P}-gcc-compat.patch"
+
 	# /usr/include/db.h is always db-1 on FreeBSD
 	# so include the right dir in CPPFLAGS
 	append-cppflags "-I$(db_includedir)"

diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.5.5-gcc-compat.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.5.5-gcc-compat.patch
new file mode 100644
index 0000000..24f591e
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-3.5.5-gcc-compat.patch
@@ -0,0 +1,54 @@
+From 5e6aadd88030702c002d8f1c32806f2eccbefb60 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Fri, 10 Aug 2012 12:31:01 +0000
+Subject: e-book-backend-db-cache.h: Avoid DB typedef.
+
+Some distros use compiler settings that choke on duplicate typedefs.
+Gentoo seems to be one of them.
+
+Replace the DB typedef with a forward declaration of "struct __db"
+and fix up all the function arguments that take a DB pointer.
+---
+diff --git a/addressbook/libedata-book/e-book-backend-db-cache.h b/addressbook/libedata-book/e-book-backend-db-cache.h
+index b0742ca..4b17bbd 100644
+--- a/addressbook/libedata-book/e-book-backend-db-cache.h
++++ b/addressbook/libedata-book/e-book-backend-db-cache.h
+@@ -31,23 +31,23 @@
+ G_BEGIN_DECLS
+ 
+ /* Avoid including <db.h> in a public header file. */
+-typedef struct __db DB;
++struct __db;
+ 
+-EContact * e_book_backend_db_cache_get_contact (DB *db, const gchar *uid);
+-gchar *e_book_backend_db_cache_get_filename (DB *db);
+-void e_book_backend_db_cache_set_filename (DB *db, const gchar *filename);
+-gboolean e_book_backend_db_cache_add_contact (DB *db,
++EContact * e_book_backend_db_cache_get_contact (struct __db *db, const gchar *uid);
++gchar *e_book_backend_db_cache_get_filename (struct __db *db);
++void e_book_backend_db_cache_set_filename (struct __db *db, const gchar *filename);
++gboolean e_book_backend_db_cache_add_contact (struct __db *db,
+ 					   EContact *contact);
+-gboolean e_book_backend_db_cache_remove_contact (DB *db,
++gboolean e_book_backend_db_cache_remove_contact (struct __db *db,
+ 					      const gchar *uid);
+-gboolean e_book_backend_db_cache_check_contact (DB *db, const gchar *uid);
+-GList *   e_book_backend_db_cache_get_contacts (DB *db, const gchar *query);
++gboolean e_book_backend_db_cache_check_contact (struct __db *db, const gchar *uid);
++GList *   e_book_backend_db_cache_get_contacts (struct __db *db, const gchar *query);
+ gboolean e_book_backend_db_cache_exists (const gchar *uri);
+-void     e_book_backend_db_cache_set_populated (DB *db);
+-gboolean e_book_backend_db_cache_is_populated (DB *db);
+-GPtrArray * e_book_backend_db_cache_search (DB *db, const gchar *query);
+-void e_book_backend_db_cache_set_time (DB *db, const gchar *t);
+-gchar * e_book_backend_db_cache_get_time (DB *db);
++void     e_book_backend_db_cache_set_populated (struct __db *db);
++gboolean e_book_backend_db_cache_is_populated (struct __db *db);
++GPtrArray * e_book_backend_db_cache_search (struct __db *db, const gchar *query);
++void e_book_backend_db_cache_set_time (struct __db *db, const gchar *t);
++gchar * e_book_backend_db_cache_get_time (struct __db *db);
+ 
+ G_END_DECLS
+ 
+--
+cgit v0.9.0.2