diff options
Diffstat (limited to 'community/glabels')
| -rw-r--r-- | community/glabels/PKGBUILD | 17 | ||||
| -rw-r--r-- | community/glabels/glabels-3.0.0-new-eds.patch | 71 |
2 files changed, 6 insertions, 82 deletions
diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD index 19d6379f0..5250f1e6a 100644 --- a/community/glabels/PKGBUILD +++ b/community/glabels/PKGBUILD @@ -1,27 +1,23 @@ -# $Id: PKGBUILD 99761 2013-10-30 23:33:09Z allan $ +# $Id: PKGBUILD 101750 2013-11-30 17:42:47Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: yugrotavele <yugrotavele at archlinux dot us> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=glabels -pkgver=3.0.1 -pkgrel=3 +pkgver=3.2.0 +pkgrel=1 pkgdesc="Creating labels and business cards the very easy way" arch=('i686' 'x86_64') url="http://glabels.org/" license=('GPL' 'LGPL') depends=('librsvg' 'evolution-data-server' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils') -makedepends=('barcode' 'intltool' 'gnome-doc-utils') +makedepends=('intltool' 'itstool') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - glabels-3.0.0-new-eds.patch) -sha256sums=('99810705b9fcb234f085ed4ac6dbea50cc5b232c6d8ca05ab2c0634673fb9bd2' - 'f02ecf12e10b1d406607bad65f81e53ebd5d56fabe46035a47bd6fe1ec8bf70b') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('c4c5b2c911be7b6513ee5cfeda6cd78434623c24dd741bd29cc3573f90b374c9') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/glabels-3.0.0-new-eds.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile make @@ -29,6 +25,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install } diff --git a/community/glabels/glabels-3.0.0-new-eds.patch b/community/glabels/glabels-3.0.0-new-eds.patch deleted file mode 100644 index 9cae4c076..000000000 --- a/community/glabels/glabels-3.0.0-new-eds.patch +++ /dev/null @@ -1,71 +0,0 @@ -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> |