From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 395FF13800E for ; Fri, 10 Aug 2012 13:17:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12742E0495; Fri, 10 Aug 2012 13:17:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C0AD9E0495 for ; Fri, 10 Aug 2012 13:17:23 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E51041B4038 for ; Fri, 10 Aug 2012 13:17:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A851FE5439 for ; Fri, 10 Aug 2012 13:17:21 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <1344604528.4bc393013b26554b9103ce029a90cb1d1457bcc9.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild gnome-extra/evolution-data-server/files/evolution-data-server-3.5.5-gcc-compat.patch X-VCS-Directories: gnome-extra/evolution-data-server/files/ gnome-extra/evolution-data-server/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 4bc393013b26554b9103ce029a90cb1d1457bcc9 X-VCS-Branch: master Date: Fri, 10 Aug 2012 13:17:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a0269f64-623f-48fd-adf6-254a937caf0a X-Archives-Hash: c15276c83d222077c7747f096e00147c commit: 4bc393013b26554b9103ce029a90cb1d1457bcc9 Author: Priit Laes plaes org> AuthorDate: Fri Aug 10 13:15:28 2012 +0000 Commit: Priit Laes plaes 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 +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 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