From ca80e0db6ce97b75caf467dce808b9064f2877f0 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 26 Oct 2012 06:49:05 +0000 Subject: [PATCH] - unbreak with e-d-s 3.6.0, patch from fedora. --- productivity/glabels/Makefile | 15 +++-- .../patches/patch-src_merge-evolution_c | 66 +++++++++++++++++++ .../glabels/patches/patch-src_merge-vcard_c | 19 ++++++ 3 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 productivity/glabels/patches/patch-src_merge-evolution_c create mode 100644 productivity/glabels/patches/patch-src_merge-vcard_c diff --git a/productivity/glabels/Makefile b/productivity/glabels/Makefile index 5ff643d90bc..ccc05e4276c 100644 --- a/productivity/glabels/Makefile +++ b/productivity/glabels/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.28 2012/09/30 09:54:01 jasper Exp $ - -# XXX: https://bugzilla.gnome.org/show_bug.cgi?id=685130 -BROKEN = needs to be ported to new EDS ESource API +# $OpenBSD: Makefile,v 1.29 2012/10/26 06:49:05 jasper Exp $ COMMENT = labels and business card designer GNOME_PROJECT = glabels GNOME_VERSION = 3.0.1 +REVISION = 0 + CATEGORIES = productivity graphics SHARED_LIBS += glabels-3.0 0.0 # 8.0 @@ -25,13 +24,17 @@ PERMIT_DISTFILES_FTP = Yes WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm asn1 atk-1.0 c cairo WANTLIB += cairo-gobject camel-1.2 com_err croco-0.6 crypto dbus-1 -WANTLIB += dbus-glib-1 drm ebook-1.2 edataserver-1.2 expat ffi -WANTLIB += fontconfig freetype gconf-2 gdk-3 gdk_pixbuf-2.0 gio-2.0 +WANTLIB += drm ebook-1.2 edataserver-1.2 expat ffi +WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gssapi gthread-2.0 WANTLIB += gtk-3 krb5 m nspr4 nss3 pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre pixman-1 plc4 plds4 png pthread pthread-stubs WANTLIB += qrencode rsvg-2 smime3 softokn3 soup-2.4 sqlite3 ssl3 WANTLIB += stdc++ xcb xcb-render xcb-shm xml2 z zint +WANTLIB += ICE SM atk-bridge-2.0 atspi gck-1 gcr-base-3 gcrypt +WANTLIB += gnome-keyring gpg-error harfbuzz icudata icule icuuc +WANTLIB += nssutil3 p11-kit + MODULES = devel/gettext \ x11/gnome \ diff --git a/productivity/glabels/patches/patch-src_merge-evolution_c b/productivity/glabels/patches/patch-src_merge-evolution_c new file mode 100644 index 00000000000..da083dc73c5 --- /dev/null +++ b/productivity/glabels/patches/patch-src_merge-evolution_c @@ -0,0 +1,66 @@ +$OpenBSD: patch-src_merge-evolution_c,v 1.1 2012/10/26 06:49:05 jasper Exp $ + +Fix glabels broken with evolution-data-server 3.6.0 +https://bugzilla.gnome.org/show_bug.cgi?id=685130 + +Patch from Fedora: +http://pkgs.fedoraproject.org/cgit/glabels.git/tree/glabels-3.0.0-new-eds.patch + +--- src/merge-evolution.c.orig Tue Sep 18 02:01:02 2012 ++++ src/merge-evolution.c Fri Oct 26 08:43:05 2012 +@@ -29,7 +29,7 @@ + + #include "merge-evolution.h" + +-#include ++#include + #include + #include + #include +@@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gconstpointer *a, + /*--------------------------------------------------------------------------*/ + /* Open merge source. */ + /*--------------------------------------------------------------------------*/ ++static EBook * ++gl_open_system_addressbook (GError **error) ++{ ++ ESourceRegistry *registry; ++ EBook *book = NULL; ++ ESource *source; ++ ++ registry = e_source_registry_new_sync (NULL, error); ++ if (!registry) ++ return NULL; ++ ++ source = e_source_registry_ref_builtin_address_book (registry); ++ if (!source) { ++ g_object_unref (registry); ++ return NULL; ++ } ++ ++ book = e_book_new (source, error); ++ ++ g_object_unref (source); ++ g_object_unref (registry); ++ ++ return book; ++} ++ + static void + gl_merge_evolution_open (glMerge *merge) + { +@@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge) + return; + } + +- merge_evolution->priv->book = e_book_new_system_addressbook(&error); ++ merge_evolution->priv->book = gl_open_system_addressbook(&error); + if (!merge_evolution->priv->book) { + g_warning ("Couldn't open addressbook."); + if (error) + { +- g_warning ("e_book_new_system_addressbook: %s", error->message); ++ g_warning ("gl_open_system_addressbook: %s", error->message); + g_error_free (error); + } + e_book_query_unref(query); diff --git a/productivity/glabels/patches/patch-src_merge-vcard_c b/productivity/glabels/patches/patch-src_merge-vcard_c new file mode 100644 index 00000000000..b7b4524f63c --- /dev/null +++ b/productivity/glabels/patches/patch-src_merge-vcard_c @@ -0,0 +1,19 @@ +$OpenBSD: patch-src_merge-vcard_c,v 1.1 2012/10/26 06:49:05 jasper Exp $ + +Fix glabels broken with evolution-data-server 3.6.0 +https://bugzilla.gnome.org/show_bug.cgi?id=685130 + +Patch from Fedora: +http://pkgs.fedoraproject.org/cgit/glabels.git/tree/glabels-3.0.0-new-eds.patch + +--- src/merge-vcard.c.orig Tue Sep 18 02:01:02 2012 ++++ src/merge-vcard.c Fri Oct 26 08:43:05 2012 +@@ -27,7 +27,7 @@ + + #include "merge-vcard.h" + +-#include ++#include + #include + #include + #include