Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fontconfig.git;a=commitdiff;h=a0cdaa3224c24e8b7ffe75ea903614462aca327c
commit a0cdaa3224c24e8b7ffe75ea903614462aca327c Author: Baste <[email protected]> Date: Fri Feb 1 11:11:38 2013 +0100 glabels-3.0.1-1-x86_64 * Version bump * Change m8r diff --git a/source/gnome-extra/glabels/FrugalBuild b/source/gnome-extra/glabels/FrugalBuild index 333e23e..51ddb5e 100644 --- a/source/gnome-extra/glabels/FrugalBuild +++ b/source/gnome-extra/glabels/FrugalBuild @@ -1,22 +1,25 @@ # Compiling Time: 0.13 SBU -# Maintainer: bouleetbil <[email protected]> +# Maintainer: Baste <[email protected]> +# Contributor: bouleetbil <[email protected]> pkgname=glabels -pkgver=2.2.8 -pkgrel=7 +pkgver=3.0.1 +pkgrel=1 pkgdesc="gLabels is a program for creating labels and business cards for the GNOME" -depends=('libjpeg>=8a' 'libbonoboui' 'libsm' 'gail>=2.20.0-2' 'libart_lgpl' 'libglade>=2.6.4-2' \ - 'atk' 'pango' 'freetype2' 'libxau' 'libxdmcp' 'evolution-data-server>=3.0.0' \ - 'e2fsprogs' 'popt' 'nspr>=4.8.7' 'gnome-vfs' 'openssl>=1.0.0' 'libbonobo' \ - 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'libkrb5' 'libgnomeui') -makedepends=('perl-xml-parser' 'rarian' 'gtk-doc' 'intltool' 'gnome-doc-utils' 'krb5') +depends=('librsvg' 'evolution-data-server' 'qrencode') +makedepends=('intltool' 'gnome-doc-utils' 'barcode') groups=('gnome-extra') replaces=('kbarcode') archs=('i686' 'x86_64') options=('scriptlet') +_F_gnome_glib="y" _F_gnome_desktop="y" -Finclude sourceforge gnome-scriptlet -Fconfopts="${Fconfopts[@]} --disable-update-mimedb --disable-update-desktopdb" -sha1sums=('9b71da53ec3f27e886177a7c9089c8901fbf7fb2') +_F_gnome_iconcache="y" +_F_gnome_ext=".tar.xz" +Finclude gnome gnome-scriptlet +Fconfopts+=" --disable-chemas-compile" +source=($source eds.patch) +sha1sums=('86dfa9a5855d46c09909fd81e6bbbd84e50b686c' \ + '7237bd2ea1346ef7134dbf103e3d86a62bec001d') # optimization OK diff --git a/source/gnome-extra/glabels/eds.patch b/source/gnome-extra/glabels/eds.patch new file mode 100644 index 0000000..ad0299a --- /dev/null +++ b/source/gnome-extra/glabels/eds.patch @@ -0,0 +1,72 @@ +diff -up glabels-3.0.0/src/merge-evolution.c.new-eds glabels-3.0.0/src/merge-evolution.c +--- glabels-3.0.0/src/merge-evolution.c.new-eds 2011-04-04 01:02:48.000000000 +0200 ++++ glabels-3.0.0/src/merge-evolution.c 2012-08-29 11:54:20.240577838 +0200 +@@ -29,7 +29,7 @@ + + #include "merge-evolution.h" + +-#include <libebook/e-book.h> ++#include <libebook/libebook.h> + #include <glib/gi18n.h> + #include <stdio.h> + #include <string.h> +@@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gcon + /*--------------------------------------------------------------------------*/ + /* 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 -up glabels-3.0.0/src/merge-vcard.c.new-eds glabels-3.0.0/src/merge-vcard.c +--- glabels-3.0.0/src/merge-vcard.c.new-eds 2011-04-04 01:02:48.000000000 +0200 ++++ glabels-3.0.0/src/merge-vcard.c 2012-08-29 11:54:20.241577849 +0200 +@@ -27,7 +27,7 @@ + + #include "merge-vcard.h" + +-#include <libebook/e-contact.h> ++#include <libebook/libebook.h> + #include <stdio.h> + #include <string.h> + #include <errno.h> + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
