| 1 |
commit: d9aa2719c248888f621b06cea4abc8077ad8321c |
| 2 |
Author: Priit Laes <plaes <AT> plaes <DOT> org> |
| 3 |
AuthorDate: Fri Aug 24 17:07:23 2012 +0000 |
| 4 |
Commit: Priit Laes <plaes <AT> plaes <DOT> org> |
| 5 |
CommitDate: Fri Aug 24 17:07:23 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d9aa2719 |
| 7 |
|
| 8 |
gnome-extra/evolution-data-server: 3.5.5 → 3.5.90 |
| 9 |
|
| 10 |
--- |
| 11 |
....ebuild => evolution-data-server-3.5.90.ebuild} | 2 - |
| 12 |
.../evolution-data-server-3.5.5-gcc-compat.patch | 54 -------------------- |
| 13 |
2 files changed, 0 insertions(+), 56 deletions(-) |
| 14 |
|
| 15 |
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.90.ebuild |
| 16 |
similarity index 98% |
| 17 |
rename from gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild |
| 18 |
rename to gnome-extra/evolution-data-server/evolution-data-server-3.5.90.ebuild |
| 19 |
index 784ad84..9666e95 100644 |
| 20 |
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild |
| 21 |
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.5.90.ebuild |
| 22 |
@@ -92,8 +92,6 @@ pkg_setup() { |
| 23 |
src_prepare() { |
| 24 |
gnome2_src_prepare |
| 25 |
|
| 26 |
- epatch "${FILESDIR}/${P}-gcc-compat.patch" |
| 27 |
- |
| 28 |
# /usr/include/db.h is always db-1 on FreeBSD |
| 29 |
# so include the right dir in CPPFLAGS |
| 30 |
append-cppflags "-I$(db_includedir)" |
| 31 |
|
| 32 |
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 |
| 33 |
deleted file mode 100644 |
| 34 |
index 24f591e..0000000 |
| 35 |
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-3.5.5-gcc-compat.patch |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,54 +0,0 @@ |
| 38 |
-From 5e6aadd88030702c002d8f1c32806f2eccbefb60 Mon Sep 17 00:00:00 2001 |
| 39 |
-From: Matthew Barnes <mbarnes@××××××.com> |
| 40 |
-Date: Fri, 10 Aug 2012 12:31:01 +0000 |
| 41 |
-Subject: e-book-backend-db-cache.h: Avoid DB typedef. |
| 42 |
- |
| 43 |
-Some distros use compiler settings that choke on duplicate typedefs. |
| 44 |
-Gentoo seems to be one of them. |
| 45 |
- |
| 46 |
-Replace the DB typedef with a forward declaration of "struct __db" |
| 47 |
-and fix up all the function arguments that take a DB pointer. |
| 48 |
---- |
| 49 |
-diff --git a/addressbook/libedata-book/e-book-backend-db-cache.h b/addressbook/libedata-book/e-book-backend-db-cache.h |
| 50 |
-index b0742ca..4b17bbd 100644 |
| 51 |
---- a/addressbook/libedata-book/e-book-backend-db-cache.h |
| 52 |
-+++ b/addressbook/libedata-book/e-book-backend-db-cache.h |
| 53 |
-@@ -31,23 +31,23 @@ |
| 54 |
- G_BEGIN_DECLS |
| 55 |
- |
| 56 |
- /* Avoid including <db.h> in a public header file. */ |
| 57 |
--typedef struct __db DB; |
| 58 |
-+struct __db; |
| 59 |
- |
| 60 |
--EContact * e_book_backend_db_cache_get_contact (DB *db, const gchar *uid); |
| 61 |
--gchar *e_book_backend_db_cache_get_filename (DB *db); |
| 62 |
--void e_book_backend_db_cache_set_filename (DB *db, const gchar *filename); |
| 63 |
--gboolean e_book_backend_db_cache_add_contact (DB *db, |
| 64 |
-+EContact * e_book_backend_db_cache_get_contact (struct __db *db, const gchar *uid); |
| 65 |
-+gchar *e_book_backend_db_cache_get_filename (struct __db *db); |
| 66 |
-+void e_book_backend_db_cache_set_filename (struct __db *db, const gchar *filename); |
| 67 |
-+gboolean e_book_backend_db_cache_add_contact (struct __db *db, |
| 68 |
- EContact *contact); |
| 69 |
--gboolean e_book_backend_db_cache_remove_contact (DB *db, |
| 70 |
-+gboolean e_book_backend_db_cache_remove_contact (struct __db *db, |
| 71 |
- const gchar *uid); |
| 72 |
--gboolean e_book_backend_db_cache_check_contact (DB *db, const gchar *uid); |
| 73 |
--GList * e_book_backend_db_cache_get_contacts (DB *db, const gchar *query); |
| 74 |
-+gboolean e_book_backend_db_cache_check_contact (struct __db *db, const gchar *uid); |
| 75 |
-+GList * e_book_backend_db_cache_get_contacts (struct __db *db, const gchar *query); |
| 76 |
- gboolean e_book_backend_db_cache_exists (const gchar *uri); |
| 77 |
--void e_book_backend_db_cache_set_populated (DB *db); |
| 78 |
--gboolean e_book_backend_db_cache_is_populated (DB *db); |
| 79 |
--GPtrArray * e_book_backend_db_cache_search (DB *db, const gchar *query); |
| 80 |
--void e_book_backend_db_cache_set_time (DB *db, const gchar *t); |
| 81 |
--gchar * e_book_backend_db_cache_get_time (DB *db); |
| 82 |
-+void e_book_backend_db_cache_set_populated (struct __db *db); |
| 83 |
-+gboolean e_book_backend_db_cache_is_populated (struct __db *db); |
| 84 |
-+GPtrArray * e_book_backend_db_cache_search (struct __db *db, const gchar *query); |
| 85 |
-+void e_book_backend_db_cache_set_time (struct __db *db, const gchar *t); |
| 86 |
-+gchar * e_book_backend_db_cache_get_time (struct __db *db); |
| 87 |
- |
| 88 |
- G_END_DECLS |
| 89 |
- |
| 90 |
--- |
| 91 |
-cgit v0.9.0.2 |
Archives