Date: Friday, September 27, 2013 @ 03:47:55 Author: bgyorgy Revision: 97660
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: glabels/repos/community-staging-i686/ glabels/repos/community-staging-i686/PKGBUILD (from rev 97659, glabels/trunk/PKGBUILD) glabels/repos/community-staging-i686/glabels-3.0.0-new-eds.patch (from rev 97659, glabels/trunk/glabels-3.0.0-new-eds.patch) glabels/repos/community-staging-i686/glabels.install (from rev 97659, glabels/trunk/glabels.install) glabels/repos/community-staging-x86_64/ glabels/repos/community-staging-x86_64/PKGBUILD (from rev 97659, glabels/trunk/PKGBUILD) glabels/repos/community-staging-x86_64/glabels-3.0.0-new-eds.patch (from rev 97659, glabels/trunk/glabels-3.0.0-new-eds.patch) glabels/repos/community-staging-x86_64/glabels.install (from rev 97659, glabels/trunk/glabels.install) ------------------------------------------------------+ community-staging-i686/PKGBUILD | 35 ++++++++ community-staging-i686/glabels-3.0.0-new-eds.patch | 71 +++++++++++++++++ community-staging-i686/glabels.install | 15 +++ community-staging-x86_64/PKGBUILD | 35 ++++++++ community-staging-x86_64/glabels-3.0.0-new-eds.patch | 71 +++++++++++++++++ community-staging-x86_64/glabels.install | 15 +++ 6 files changed, 242 insertions(+) Copied: glabels/repos/community-staging-i686/PKGBUILD (from rev 97659, glabels/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2013-09-27 01:47:55 UTC (rev 97660) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: yugrotavele <yugrotavele at archlinux dot us> +# Contributor: Damir Perisa <da...@archlinux.org> + +pkgname=glabels +pkgver=3.0.1 +pkgrel=3 +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') +options=('!libtool') +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') + +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 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} Copied: glabels/repos/community-staging-i686/glabels-3.0.0-new-eds.patch (from rev 97659, glabels/trunk/glabels-3.0.0-new-eds.patch) =================================================================== --- community-staging-i686/glabels-3.0.0-new-eds.patch (rev 0) +++ community-staging-i686/glabels-3.0.0-new-eds.patch 2013-09-27 01:47:55 UTC (rev 97660) @@ -0,0 +1,71 @@ +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> Copied: glabels/repos/community-staging-i686/glabels.install (from rev 97659, glabels/trunk/glabels.install) =================================================================== --- community-staging-i686/glabels.install (rev 0) +++ community-staging-i686/glabels.install 2013-09-27 01:47:55 UTC (rev 97660) @@ -0,0 +1,15 @@ +post_install() { + xdg-icon-resource forceupdate + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + + +post_remove() { + post_install $1 +} Copied: glabels/repos/community-staging-x86_64/PKGBUILD (from rev 97659, glabels/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2013-09-27 01:47:55 UTC (rev 97660) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: yugrotavele <yugrotavele at archlinux dot us> +# Contributor: Damir Perisa <da...@archlinux.org> + +pkgname=glabels +pkgver=3.0.1 +pkgrel=3 +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') +options=('!libtool') +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') + +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 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} Copied: glabels/repos/community-staging-x86_64/glabels-3.0.0-new-eds.patch (from rev 97659, glabels/trunk/glabels-3.0.0-new-eds.patch) =================================================================== --- community-staging-x86_64/glabels-3.0.0-new-eds.patch (rev 0) +++ community-staging-x86_64/glabels-3.0.0-new-eds.patch 2013-09-27 01:47:55 UTC (rev 97660) @@ -0,0 +1,71 @@ +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> Copied: glabels/repos/community-staging-x86_64/glabels.install (from rev 97659, glabels/trunk/glabels.install) =================================================================== --- community-staging-x86_64/glabels.install (rev 0) +++ community-staging-x86_64/glabels.install 2013-09-27 01:47:55 UTC (rev 97660) @@ -0,0 +1,15 @@ +post_install() { + xdg-icon-resource forceupdate + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + + +post_remove() { + post_install $1 +}