Wed Apr 23 03:24:08 UTC 2014

15 files changed, 199 insertions, 91 deletions

diff --git a/extra/aspell-pt/PKGBUILD b/extra/aspell-pt/PKGBUILD
index d8a443be6..abcadda52 100644
--- a/extra/aspell-pt/PKGBUILD
+++ b/extra/aspell-pt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 188442 2013-06-14 04:11:14Z eric $
+# $Id: PKGBUILD 211658 2014-04-22 15:35:58Z fyan $
 # Maintainer:
 
 pkgname=aspell-pt
-_pkgverPT=20130331
+_pkgverPT=20140412
 _pkgverBR=20090702
 pkgver=$_pkgverPT
 pkgrel=1
@@ -17,8 +17,8 @@ source=(ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgverBR-0.tar.b
         http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-$_pkgverPT.tar.bz2
         http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-preao-$_pkgverPT.tar.bz2)
 sha1sums=('add1db9a6a908dccaad13a7fd85c3b202299ff26'
-          '694b35b1a6fcb90ff808b730a4513ff283e1ceee'
-          'fa164ac44adc4544c7fdbb3dc5c146c28f30525a')
+          '26d991841bb13d3dfa6fe2bb9a29edd6982d6657'
+          '492ace13679f5fa3824bb528e9017fbab4ef0d4c')
 
 build() {
   cd aspell6-pt_BR-$_pkgverBR-0
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 4a3acbcd5..5e8f11c89 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,26 +1,22 @@
-# $Id: PKGBUILD 202708 2013-12-25 21:15:10Z dan $
+# $Id: PKGBUILD 211662 2014-04-22 16:39:27Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.6
+pkgver=1.8.7
 pkgrel=1
 license=('GPL')
 arch=(i686 x86_64)
 url="http://www.doxygen.org/"
 makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript'
              'texlive-latexextra' 'graphviz' 'python2')
-source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz
-        doxygen-configure-python2.patch)
-md5sums=('9385dc52f0627875f8fa758e754ec674'
-         'a16ef06cd207292eda73801ea3835f1e')
-sha1sums=('204f1b3695c73efac44a521609c5360241d64045'
-          '98f9f473f906c5cd363b29c65b54bbe998c0793e')
+			 source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
+md5sums=('ff0529df773301f63db82c25137b7fd8')
+sha1sums=('3728f183f390f96b4ec39d02782a7c2d91f7bfca')
 
 build() {
   export PATH=$PATH:/usr/lib/qt4/bin
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -Np1 < ../doxygen-configure-python2.patch
   QTDIR=/usr/lib/qt4 ./configure --prefix /usr --with-doxywizard
   make
 }
diff --git a/extra/doxygen/doxygen-configure-python2.patch b/extra/doxygen/doxygen-configure-python2.patch
deleted file mode 100644
index 9750d1eb2..000000000
--- a/extra/doxygen/doxygen-configure-python2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- doxygen-1.8.6/configure.orig	2013-12-25 20:54:22.171988706 +0000
-+++ doxygen-1.8.6/configure	2013-12-25 20:54:33.405247482 +0000
-@@ -560,7 +560,7 @@
- 
- printf "  Checking for python... "
- if test "$f_python" = NO; then
--  python_names="python"
-+  python_names="python2 python"
-   python_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
-   python_prog=NO
-   python_found=NO
diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index 7210764cd..148c531f5 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 186073 2013-05-21 07:34:09Z tpowa $
+# $Id: PKGBUILD 211636 2014-04-22 06:47:43Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=hylafax
 pkgver=6.0.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64')
 install='hylafax.install'
@@ -14,7 +14,7 @@ backup=(var/spool/hylafax/bin/{faxrcvd,notify}
 	usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules}
 	var/spool/hylafax/etc/hosts.hfaxd) 
 source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz 
-        hylafax.cron.daily 
+        hylafax.{timer,service}
         config.local
         faxq.service
         hfaxd.service
@@ -32,7 +32,6 @@ package () {
   mkdir -p "$pkgdir"/usr/{bin,lib/fax,share/ghostscript/fonts}
   mkdir -p "$pkgdir"/var/{spool/hylafax,lock}
   make ROOT="$pkgdir" install
-  install -D -m 744 "$srcdir"/hylafax.cron.daily "$pkgdir"/etc/cron.daily/hylafax
   # add missing awk file for notify-4.1 script
   install -D -m 755 "$srcdir"/${pkgname}-${pkgver}/util/notify.awk \
   	"$pkgdir"/var/spool/hylafax/bin/notify.awk
@@ -43,9 +42,15 @@ package () {
   install -D -m644 $srcdir/faxq.service $pkgdir/usr/lib/systemd/system/faxq.service
   install -D -m644 $srcdir/faxgetty@.service $pkgdir/usr/lib/systemd/system/faxgetty@.service
   install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
+  # systemd timer
+  install -D -m644 ${srcdir}/hylafax.timer ${pkgdir}/usr/lib/systemd/system/hylafax.timer
+  install -D -m644 ${srcdir}/hylafax.service ${pkgdir}/usr/lib/systemd/system/hylafax.service
+  install -d -m755 ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants
+  ln -s ../shadow.timer ${pkgdir}//usr/lib/systemd/system/multi-user.target.wants/hylafax.timer
 }
 md5sums=('d063d45049c8fcbabefe09d662313067'
-         'b0b8d19a10c2145476d9fbb18c0478fe'
+         '9ef38446d2a2aeac698c4ae178fd5c2b'
+         'e5afba881859f018ee88d35fc62a488f'
          '5f3a89fbfb10c47755d3ca19183b8a59'
          'a10aa2ef613551a88d750f6602b5f2f7'
          '38a00db6d9d765d130b2d8d3a98e5c24'
diff --git a/extra/hylafax/hylafax.cron.daily b/extra/hylafax/hylafax.cron.daily
deleted file mode 100644
index 567dd8ed3..000000000
--- a/extra/hylafax/hylafax.cron.daily
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-/usr/bin/faxqclean
-/usr/bin/faxcron -rcv 30
diff --git a/extra/hylafax/hylafax.service b/extra/hylafax/hylafax.service
new file mode 100644
index 000000000..27f571899
--- /dev/null
+++ b/extra/hylafax/hylafax.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Daily fax queue cleanup and deletion of 30 days old faxes
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/faxqclean
+ExecStart=/usr/bin/faxcron -rcv 30
+Nice=19
+IOSchedulingClass=best-effort
+IOSchedulingPriority=7
+
diff --git a/extra/hylafax/hylafax.timer b/extra/hylafax/hylafax.timer
new file mode 100644
index 000000000..867cc2eaa
--- /dev/null
+++ b/extra/hylafax/hylafax.timer
@@ -0,0 +1,7 @@
+[Unit]
+Description=Daily fax queue cleanup and deletion of 30 days old faxes
+
+[Timer]
+OnCalendar=daily
+AccuracySec=12h
+Persistent=true
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 571c7f9fe..0cac6f681 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,47 +1,53 @@
-# $Id: PKGBUILD 200656 2013-12-01 09:50:21Z andyrtr $
+# $Id: PKGBUILD 211635 2014-04-22 02:11:15Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.4
-pkgrel=13
+pkgrel=14
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64')
 makedepends=('boost' 'intltool')
-depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.24.4' 'popt'
+depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt'
          'python2' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('pstoedit: latex formulas'
             'texlive-core: latex formulas'
             'python2-numpy: some extensions'
             'python2-lxml: some extensions and filters'
             'uniconvertor: reading/writing to some proprietary formats')
-source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-        spuriouscomma.patch
-        build_fix.diff)
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+        'spuriouscomma.patch'
+        'ime-placement.patch'
+        'freetype.patch'
+        'gc74.patch')
 sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c'
           '7d1d5a6d1d2b0926721a994d5889c52890fc57c1'
-          'aba4d98bebae088c3401fd9259ea3cf70b96fbbf')
+          'b12b948ca5ee7e02703a13aa8b8bccdf67947f12'
+          'aba4d98bebae088c3401fd9259ea3cf70b96fbbf'
+          '3e1b5b6852d668388a857bc7a73fb7731fb262b8')
 
 install=install
 
 prepare() {
-	cd ${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../gc74.patch # FS#39106
+	patch -p0 -i ../freetype.patch # FS#37956
+	patch -p1 -i ../ime-placement.patch # FS#39898
 	patch -p0 -i ../spuriouscomma.patch
-	# fix build with freetype 2.5.1
-	patch -Np0 -i ../build_fix.diff
 	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
 	sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
 	sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
 	sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
 	sed -i 's|"python"|"python2"|g' src/main.cpp
 	sed -i '/^#include <g.kmm/i #include <glibmm.h>' src/*{,/*{,/*{,/*}}}.{h,cpp}
+	sed -i '/extern unsigned GC_version;/c unsigned GC_version=GC_VERSION_MAJOR<<16+GC_VERSION_MINOR<<8+GC_VERSION_MICRO;' configure
 }
 
 build() {
-	cd ${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
 		--prefix=/usr \
 		--with-python \
@@ -53,6 +59,6 @@ build() {
 }
 
 package() {
-	cd ${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/inkscape/build_fix.diff b/extra/inkscape/freetype.patch
index 84cdc1ca6..84cdc1ca6 100644
--- a/extra/inkscape/build_fix.diff
+++ b/extra/inkscape/freetype.patch
diff --git a/extra/inkscape/gc74.patch b/extra/inkscape/gc74.patch
new file mode 100644
index 000000000..41615ac49
--- /dev/null
+++ b/extra/inkscape/gc74.patch
@@ -0,0 +1,54 @@
+--- inkscape-0.48.4/src/gc-core.h.old	2013-12-31 01:22:38.976653890 +0400
++++ inkscape-0.48.4/src/gc-core.h	2013-12-31 01:22:48.525653608 +0400
+@@ -57,7 +57,7 @@
+                                            CleanupFunc *old_func,
+                                            void **old_data);
+     int (*general_register_disappearing_link)(void **p_ptr,
+-                                              void *base);
++                                              const void *base);
+     int (*unregister_disappearing_link)(void **p_ptr);
+     std::size_t (*get_heap_size)();
+     std::size_t (*get_free_bytes)();
+--- inkscape-0.48.4/src/gc.cpp.old	2013-12-31 01:23:50.462651778 +0400
++++ inkscape-0.48.4/src/gc.cpp	2013-12-31 01:40:37.718622017 +0400
+@@ -70,8 +70,8 @@
+     return base + debug_base_fixup();
+ }
+ 
+-int debug_general_register_disappearing_link(void **p_ptr, void *base) {
+-    char *real_base=reinterpret_cast<char *>(base) - debug_base_fixup();
++int debug_general_register_disappearing_link(void **p_ptr, const void *base) {
++    char *real_base=const_cast<char *>(reinterpret_cast<const char *>(base)) - debug_base_fixup();
+     return GC_general_register_disappearing_link(p_ptr, real_base);
+ }
+ 
+@@ -90,7 +90,7 @@
+     }
+ }
+ 
+-int dummy_general_register_disappearing_link(void **, void *) { return false; }
++int dummy_general_register_disappearing_link(void **, const void *) { return false; }
+ 
+ int dummy_unregister_disappearing_link(void **/*link*/) { return false; }
+ 
+@@ -112,7 +112,11 @@
+     &GC_malloc_atomic_uncollectable,
+     &GC_base,
+     &GC_register_finalizer_ignore_self,
++#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4)
+     &GC_general_register_disappearing_link,
++#else
++    (int (*)(void**, const void*))(&GC_general_register_disappearing_link),
++#endif
+     &GC_unregister_disappearing_link,
+     &GC_get_heap_size,
+     &GC_get_free_bytes,
+@@ -202,7 +206,7 @@
+     die_because_not_initialized();
+ }
+ 
+-int stub_general_register_disappearing_link(void **, void *) {
++int stub_general_register_disappearing_link(void **, const void *) {
+     die_because_not_initialized();
+     return 0;
+ }
diff --git a/extra/inkscape/ime-placement.patch b/extra/inkscape/ime-placement.patch
new file mode 100644
index 000000000..7f2e13a5e
--- /dev/null
+++ b/extra/inkscape/ime-placement.patch
@@ -0,0 +1,62 @@
+diff -aur old/src/text-context.cpp new/src/text-context.cpp
+--- old/src/text-context.cpp	2011-07-08 08:25:09.468790000 -1000
++++ new/src/text-context.cpp	2014-04-21 14:48:22.668759004 -1000
+@@ -684,6 +684,17 @@
+                     // articifically here, for the text object does not exist yet:
+                     double cursor_height = sp_desktop_get_font_size_tool(desktop);
+                     sp_ctrlline_set_coords(SP_CTRLLINE(tc->cursor), dtp, dtp + Geom::Point(0, cursor_height));
++                    if (tc->imc) {
++                        GdkRectangle im_cursor;
++                        Geom::Point const top_left = SP_EVENT_CONTEXT(tc)->desktop->get_display_area().corner(3);
++                        Geom::Point const cursor_size(0, cursor_height);
++                        Geom::Point const im_position = SP_EVENT_CONTEXT(tc)->desktop->d2w(dtp + cursor_size - top_left);
++                        im_cursor.x = (int) floor(im_position[Geom::X]);
++                        im_cursor.y = (int) floor(im_position[Geom::Y]);
++                        im_cursor.width = 0;
++                        im_cursor.height = (int) -floor(SP_EVENT_CONTEXT(tc)->desktop->d2w(cursor_size)[Geom::Y]);
++                        gtk_im_context_set_cursor_location(tc->imc, &im_cursor);
++                    }
+                     event_context->_message_context->set(Inkscape::NORMAL_MESSAGE, _("Type text; <b>Enter</b> to start new line.")); // FIXME:: this is a copy of a string from _update_cursor below, do not desync
+ 
+                     event_context->within_tolerance = false;
+@@ -1560,8 +1571,6 @@
+ static void
+ sp_text_context_update_cursor(SPTextContext *tc,  bool scroll_to_see)
+ {
+-    GdkRectangle im_cursor = { 0, 0, 1, 1 };
+-
+     // due to interruptible display, tc may already be destroyed during a display update before
+     // the cursor update (can't do both atomically, alas)
+     if (!tc->desktop) return;
+@@ -1586,10 +1595,17 @@
+         sp_ctrlline_set_coords(SP_CTRLLINE(tc->cursor), d0, d1);
+ 
+         /* fixme: ... need another transformation to get canvas widget coordinate space? */
+-        im_cursor.x = (int) floor(d0[Geom::X]);
+-        im_cursor.y = (int) floor(d0[Geom::Y]);
+-        im_cursor.width = (int) floor(d1[Geom::X]) - im_cursor.x;
+-        im_cursor.height = (int) floor(d1[Geom::Y]) - im_cursor.y;
++        if (tc->imc) {
++            GdkRectangle im_cursor = { 0, 0, 1, 1 };
++            Geom::Point const top_left = SP_EVENT_CONTEXT(tc)->desktop->get_display_area().corner(3);
++            Geom::Point const im_d0 = SP_EVENT_CONTEXT(tc)->desktop->d2w(d0 - top_left);
++            Geom::Point const im_d1 = SP_EVENT_CONTEXT(tc)->desktop->d2w(d1 - top_left);
++            im_cursor.x = (int) floor(im_d0[Geom::X]);
++            im_cursor.y = (int) floor(im_d1[Geom::Y]);
++            im_cursor.width = (int) floor(im_d1[Geom::X]) - im_cursor.x;
++            im_cursor.height = (int) floor(im_d0[Geom::Y]) - im_cursor.y;
++            gtk_im_context_set_cursor_location(tc->imc, &im_cursor);
++        }
+ 
+         tc->show = TRUE;
+         tc->phase = 1;
+@@ -1631,9 +1647,6 @@
+         }
+     }
+ 
+-    if (tc->imc) {
+-        gtk_im_context_set_cursor_location(tc->imc, &im_cursor);
+-    }
+     SP_EVENT_CONTEXT(tc)->desktop->emitToolSubselectionChanged((gpointer)tc);
+ }
+ 
diff --git a/extra/perl-async-interrupt/PKGBUILD b/extra/perl-async-interrupt/PKGBUILD
index 45f6be82d..f65d04674 100644
--- a/extra/perl-async-interrupt/PKGBUILD
+++ b/extra/perl-async-interrupt/PKGBUILD
@@ -1,10 +1,10 @@
 # Packager: Justin Davis (juster) <jrcd83@gmail.com>
-# $Id: PKGBUILD 186392 2013-05-26 09:24:51Z bluewind $
+# $Id: PKGBUILD 211640 2014-04-22 10:12:44Z fyan $
 
 pkgname=perl-async-interrupt
-_ver=1.1
-pkgver=1.10
-pkgrel=3
+_ver=1.2
+pkgver=1.20
+pkgrel=1
 pkgdesc='allow C/XS libraries to interrupt perl asynchronously'
 arch=(i686 x86_64)
 license=(PerlArtistic GPL)
@@ -12,8 +12,8 @@ options=(!emptydirs)
 depends=(perl-common-sense)
 url=https://metacpan.org/release/Async-Interrupt
 source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Async-Interrupt-$_ver.tar.gz")
-md5sums=(18f19b1537ecf5d6195a6a243110e64b)
-sha512sums=(e8e62efc053c8103f509c08a19bfa0fefbfe760ca4e1e4670187de4ed4fbdec2e5a9a19bba1696cd2b721ad7fa6d4b723c24e342118b69dc8b7b1597f5e1385e)
+md5sums=('3ec1355c266dfd77245d1c3a1de6fa8d')
+sha512sums=('41091c445247597567c9470fd926318e42d08b1f71e4bee2ed9bad327f66ef679b9bfd89b3e0c66d820a3a82e423eac5a56dca97675a11566e917257f77a2a90')
 
 build()
 (
diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD
index e05ead47b..6edeb1812 100644
--- a/extra/python-markupsafe/PKGBUILD
+++ b/extra/python-markupsafe/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 208848 2014-03-27 14:43:32Z fyan $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 211647 2014-04-22 10:43:11Z fyan $
+# Maintainer : Felix Yan <felixonmars@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alex Anthony <alex.anthony28991@gmail.com>
 
 pkgname=('python-markupsafe' 'python2-markupsafe')
-pkgver=0.19
-pkgrel=2
+pkgver=0.21
+pkgrel=1
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
 arch=('i686' 'x86_64')
 url="http://pypi.python.org/pypi/MarkupSafe"
 license=('custom')
 makedepends=('python-setuptools' 'python2-setuptools')
 source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
-md5sums=('ccb3f746c807c5500850987006854a6d')
+sha512sums=('ecedf56be7ad1723c4d7bf799e1aefb8ceb0a28840a1b8ffdc2dee0f734149430cf5dfd5d335591e9934cf223255475e9c04da5ab34ed69e7845298f599d81bc')
 
 build() {
   cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD
index fe2652a11..1d9e7a0c2 100644
--- a/extra/zeitgeist/PKGBUILD
+++ b/extra/zeitgeist/PKGBUILD
@@ -1,47 +1,48 @@
-# $Id: PKGBUILD 211625 2014-04-21 18:17:51Z jgc $
+# $Id: PKGBUILD 211657 2014-04-22 13:55:57Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=zeitgeist
-pkgver=0.9.14
-pkgrel=2
+pkgver=0.9.15
+pkgrel=1
 pkgdesc="Service logging user activities and events"
 arch=(i686 x86_64)
 url="http://zeitgeist-project.com/"
 license=(GPL2 LGPL2.1)
 depends=(json-glib telepathy-glib gtk3)
-makedepends=(intltool gobject-introspection vala raptor python2-rdflib)
+makedepends=(intltool gobject-introspection vala raptor python2-rdflib gnome-common git)
 provides=(zeitgeist-datahub)
 conflicts=(zeitgeist-datahub)
 replaces=(zeitgeist-datahub)
-source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz"
-         gio-dependency.patch)
-sha256sums=('769b5abfe67ef632414efa1d35a1462c5cd86c8792bb4635b4c3d93a5f15f061'
-            '4f2403b0695a6bf7b7cc10833e0e3a07d14fa22afeccc4ec89af0e89bbb35291')
+source=("$pkgname::git://anongit.freedesktop.org/$pkgname/$pkgname#commit=d2c966f")
+sha256sums=('SKIP')
 
 prepare() {
-  cd $pkgname-$pkgver
-  sed -i 's/python -/$PYTHON -/' configure configure.ac
-  patch -Np1 -i ../gio-dependency.patch
+  cd $pkgname
+
+  sed -i 's/python -/$PYTHON -/' configure.ac
+  sed -i '1s/python$/python2/' data/ontology2code
+
+  mkdir m4
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   export PYTHON=/usr/bin/python2
-  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --libexecdir=/usr/lib/$pkgname
   make
 }
 
 check() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   # Log test fails in chroot, as we have no X and no proper dbus
   make -k check || :
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/zeitgeist/gio-dependency.patch b/extra/zeitgeist/gio-dependency.patch
deleted file mode 100644
index 5f5fe5a32..000000000
--- a/extra/zeitgeist/gio-dependency.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From ab624e66b0a1eccd4a605980be07726ac8ecb460 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <philip@tecnocode.co.uk>
-Date: Sun, 16 Feb 2014 15:08:49 +0000
-Subject: [PATCH] libzeitgeist: Add a missing dependency on gio-2.0
-
-This actually makes the zeitgeist vapi file usable.
----
- libzeitgeist/zeitgeist-2.0.deps | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libzeitgeist/zeitgeist-2.0.deps b/libzeitgeist/zeitgeist-2.0.deps
-index ff8d39b..59eec5d 100644
---- a/libzeitgeist/zeitgeist-2.0.deps
-+++ b/libzeitgeist/zeitgeist-2.0.deps
-@@ -1 +1,2 @@
- zeitgeist-datamodel-2.0
-+gio-2.0
--- 
-1.8.5.3
-