Merge branch 'master' of vparabola:abslibre

12 files changed, 68 insertions, 70 deletions

diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 601c9559f..5f310ddc0 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -10,12 +10,12 @@
 pkgbase=linux-libre-rt      # Build stock -LIBRE-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-_releasever=10
-_rtpatchver=rt7
+_releasever=14
+_rtpatchver=rt9
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
 pkgrel=1
-_lxopkgver=${_basekernel}.10 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.14 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -36,10 +36,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '3.10.6-logitech-dj.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '673ae6d60b4ce8acad930a06f9fe2e3f'
-         'b634614a96f47a564bc32bc87afe587f'
-         '9dad7b1491caf056b10d4fbf54081988'
-         '6fb1660497947ec5c20405dc439b5c5a'
+         '33e33cc6a9f3f3fc0a760e9920bedc8b'
+         '303d1fbf2f5144628d67b65509325c52'
+         'aee046ea7320dce066bb180facd7262a'
+         'c21fb94a198752879b059a08d73cd3a6'
          '82496e68851d1960543a07ba51cdb44a'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -47,7 +47,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
          'f3def2cefdcbb954c21d8505d23cc83c'
          'd50c1ac47394e9aec637002ef3392bd1'
          '3ff40ca684cfe719723e627e2cef7cea'
-         '714134bcb52e243898036beacca2e7b7')
+         '832d858c373a180f5e1ac407049ce652')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686
index 8b98c58a5..80fc256ef 100644
--- a/kernels/linux-libre-rt/config.i686
+++ b/kernels/linux-libre-rt/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.9 Kernel Configuration
+# Linux/x86 3.10.4 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -674,12 +674,10 @@ CONFIG_I82365=m
 CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
 CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI=m
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
@@ -758,8 +756,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_UDP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
@@ -1630,7 +1628,7 @@ CONFIG_AD525X_DPOT_I2C=m
 # CONFIG_AD525X_DPOT_SPI is not set
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_IBM_ASM is not set
-# CONFIG_HWLAT_DETECTOR is not set
+CONFIG_HWLAT_DETECTOR=m
 CONFIG_PHANTOM=m
 CONFIG_INTEL_MID_PTI=m
 CONFIG_SGI_IOC4=m
diff --git a/kernels/linux-libre-rt/config.x86_64 b/kernels/linux-libre-rt/config.x86_64
index ffa3a2ca0..d12fc66ab 100644
--- a/kernels/linux-libre-rt/config.x86_64
+++ b/kernels/linux-libre-rt/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.5-1 Kernel Configuration
+# Linux/x86 3.10.10 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -163,7 +163,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_CHECKPOINT_RESTORE=y
+# CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -646,9 +646,7 @@ CONFIG_YENTA_TOSHIBA=y
 CONFIG_PD6729=m
 CONFIG_I82092=m
 CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI=m
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
@@ -735,8 +733,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_UDP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
@@ -1901,7 +1899,6 @@ CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
-# CONFIG_BCACHE is not set
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=m
@@ -5679,7 +5676,6 @@ CONFIG_PANIC_ON_OOPS_VALUE=0
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
-CONFIG_TRACE_IRQFLAGS=y
 CONFIG_STACKTRACE=y
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
@@ -5718,10 +5714,8 @@ CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_INTERRUPT_OFF_HIST=y
-CONFIG_PREEMPT_TRACER=y
-CONFIG_PREEMPT_OFF_HIST=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_SCHED_TRACER=y
 CONFIG_WAKEUP_LATENCY_HIST=y
 CONFIG_MISSED_TIMER_OFFSETS_HIST=y
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 8ff51b16d..34ffc6f6e 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193917 2013-09-06 04:31:29Z eric $
+# $Id: PKGBUILD 196228 2013-10-08 23:20:06Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.10.2
+pkgver=1.10.3
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions"
 arch=('i686' 'x86_64')
@@ -26,7 +26,7 @@ options=('!libtool' '!emptydirs')
 install=liferea.install
 source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2
         remove-non-free-suggestions.patch)
-sha1sums=('24d533af7dcd985d3cc8b2589fc3443c17b5acd7'
+sha1sums=('70ea247cd84274cd6a144f63772d97af4e6b5ebb'
           '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1')
 
 build() {
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 374a7662b..8b896d031 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195936 2013-10-05 19:51:37Z tpowa $
+# $Id: PKGBUILD 196212 2013-10-08 14:19:09Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,7 +6,7 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=62
+pkgrel=63
 epoch=1
 _extramodules=extramodules-3.11-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,7 +22,9 @@ source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar
         kernel-2.6.39.patch
         linux-3.8.patch
         lirc.logrotate
-        lirc.service lircm.service irexec.service
+        lirc.service
+        lircm.service
+        irexec.service
         lirc.tmpfiles)
 
 build() {
@@ -34,6 +36,12 @@ build() {
   patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
   patch -Np1 -i "${srcdir}/linux-3.8.patch"
 
+  # use fixed instead of Courier w/xmode2, should be more prevalent on linux boxen
+  sed -i -e 's|char.*font1_name.*Courier.*$|char		font1_name[]="-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1";|g' tools/xmode2.c
+
+  # use /dev/lirc0 by default instead of /dev/lirc
+  sed -i -e 's|#define DEV_LIRC	"lirc"|#define DEV_LIRC	"lirc0"|' config.h.in
+
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -e 's/@X_CFLAGS@//g' \
       -e 's/@X_LIBS@//g' \
@@ -108,7 +116,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086'
          '087a7d102e1c96bf1179f38db2b0b237'
          '9ee196bd03ea44af5a752fb0cc6ca96a'
          '3deb02604b37811d41816e9b4385fcc3'
-         '1c7ceace42da44f41e5a42b4dd3b3d76'
-         '121283a6de274e52ed86522aecd0f6e5'
+         'a9ab637e7207472e61e55a2fa75dc555'
+         '1847b9997685bc3ad2cf11bea4590a92'
          '07131d117fcfe9dcd50c453c3a5e9531'
          'febf25c154a7d36f01159e84f26c2d9a')
diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service
index 2123348fd..a797d1661 100644
--- a/libre/lirc-libre/lirc.service
+++ b/libre/lirc-libre/lirc.service
@@ -1,11 +1,12 @@
 [Unit]
 Description=Linux Infrared Remote Control
+After=network.target
 
 [Service]
-ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd
-ExecStart=/usr/bin/lircd --pidfile=/run/lirc/lircd.pid
 Type=forking
 PIDFile=/run/lirc/lircd.pid
+ExecStart=/usr/sbin/lircd --driver=default --device=/dev/lirc0 
 
 [Install]
 WantedBy=multi-user.target
+
diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service
index eedcf5d8f..c0b5e36b7 100644
--- a/libre/lirc-libre/lircm.service
+++ b/libre/lirc-libre/lircm.service
@@ -1,11 +1,12 @@
 [Unit]
 Description=LIRC Mouse
-After=lirc.service
-Wants=lirc.service
+Requires=lirc.service
+After=network.target lirc.service
 
 [Service]
-ExecStart=/usr/bin/lircmd -u
 Type=forking
+ExecStart=/usr/sbin/lircmd 
 
 [Install]
 WantedBy=multi-user.target
+
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index 828e2bdb9..bf77c087d 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -4,8 +4,8 @@ pkgbase=mesa
 _pkgname=libcl
 pkgname=$pkgbase-$_pkgname
 _pkgflag=libre
-pkgver=9.2.0
-pkgrel=2
+pkgver=9.2.1
+pkgrel=1
 pkgdesc='Mesa 3-D OpenCL library'
 url=http://${pkgbase}3d.sourceforge.net
 license=(MIT Khronos LGPL)
@@ -28,7 +28,7 @@ conflicts=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
 replaces=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
 options=(!libtool)
 source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
-sha512sums=26c4b41b7e1d5284b87e2997a14424c1ee0713e11fd9dd65932987832e43b96986ed5e88c06fad4616fc912ffb8e17a2314b282cbf38a2640d76c39724965910
+sha512sums=1dbc59b348618dde85e00b318fa5bbc58c29c3f56f8f77260569f155e5e787e56a2b5efff6b0e8cafedc915ccb465c547a10501f39e3d20a57c4e654968de62e
 
 build() {
   cd $srcdir/${pkgbase^}-$pkgver
diff --git a/nonprism/empathy-nonprism/PKGBUILD b/nonprism/empathy-nonprism/PKGBUILD
index 50c3fa399..b528dd888 100644
--- a/nonprism/empathy-nonprism/PKGBUILD
+++ b/nonprism/empathy-nonprism/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 194415 2013-09-16 09:02:51Z jgc $
+# $Id: PKGBUILD 195042 2013-09-24 18:47:37Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 _pkgname=empathy
 pkgname=empathy-nonprism
-pkgver=3.8.4
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework, without telepathy-haze recommendation"
 arch=(i686 x86_64)
 url="http://live.gnome.org/Empathy"
 license=(GPL2)
-depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk3 telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control)
+depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control geoclue2 geocode-glib cheese libchamplain)
 makedepends=(intltool itstool docbook-xsl python2)
 optdepends=('telepathy-gabble: XMPP/Jabber support'
             'telepathy-idle: IRC support'
@@ -21,8 +21,8 @@ install=empathy.install
 replaces=("$_pkgname" 'empathy-coherence')
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('cbc4934ce838e3d697616b5c36b070d2fc4fc57f84fd654c2f2cb2b8b650f5c9')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('5580bdba9faec0518b3328d5dc23f03dc0cf25ccf6c14902f306838c23d5918f')
 
 build() {
   cd $_pkgname-$pkgver
diff --git a/nonprism/eog-plugins-nonprism/PKGBUILD b/nonprism/eog-plugins-nonprism/PKGBUILD
index 010f3eb7b..7c889280b 100644
--- a/nonprism/eog-plugins-nonprism/PKGBUILD
+++ b/nonprism/eog-plugins-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 194995 2013-09-24 13:10:42Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=eog-plugins
 pkgname=eog-plugins-nonprism
-pkgver=3.8.1
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="Plugins for Eye of Gnome, without libgdata support"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/"
@@ -18,7 +18,7 @@ replaces=$_pkgname
 install=eog-plugins.install
 options=('!libtool')
 source=(http://download.gnome.org/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('5cf8dab5b6622b9e712da4094185112cc84baa96f2775cc76bf654b1c443cfb9')
+sha256sums=('0e6699c45181264e87f34a6eb03deeadfd5d73e35995772b7afc803e8218906d')
 
 build() {
   cd $_pkgname-$pkgver
diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD
index 96caee984..5d4cc25ea 100644
--- a/nonprism/evolution-data-server-nonprism/PKGBUILD
+++ b/nonprism/evolution-data-server-nonprism/PKGBUILD
@@ -1,12 +1,12 @@
 
 _pkgname=evolution-data-server
 pkgname=evolution-data-server-nonprism
-pkgver=3.8.5
+pkgver=3.10.0
 pkgrel=1
-pkgdesc="Centralized access to appointments and contacts without libgdata support"
+pkgdesc="Centralized access to appointments and contacts, without libgdata support"
 arch=(i686 x86_64)
-depends=(nss krb5 libical db libxml2 libsoup gtk3 libsecret gcr)
-makedepends=(intltool gperf gobject-introspection vala python2 gnome-common)
+depends=(gnome-online-accounts nss krb5 libgweather libical db)
+makedepends=(intltool gperf gobject-introspection vala python2)
 options=('!libtool')
 install=$_pkgname.install
 url="http://www.gnome.org"
@@ -15,21 +15,17 @@ replaces=("$_pkgname" 'evolution-data-server-coherence')
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('73c4ecfed65651cc72966b90081d7b72f9b42573585bc89797efea65ccfdbd2a')
-
+sha256sums=('1c47a0e138e9a5ed630d6e3ab30761e74e5f26ed7bbc31debfe76c2bac058b27')
 
 build() {
   cd "$_pkgname-$pkgver"
-  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --with-openldap=yes \
       --libexecdir=/usr/lib/evolution-data-server \
       --with-krb5=/usr --with-libdb=/usr \
       --without-libgdata \
-      --disable-goa \
       --disable-google \
-      --disable-weather \
-      --enable-vala-bindings --disable-uoa PYTHON=python2
+      --enable-vala-bindings --disable-uoa
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
   make
 }
diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
index d91e396f5..d7f0c88fc 100644
--- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD
+++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 193763 2013-08-30 13:15:23Z heftig $
+# $Id: PKGBUILD 195045 2013-09-24 18:59:12Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=gnome-online-accounts
 pkgname=gnome-online-accounts-nonprism
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL')
-depends=('webkitgtk3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret')
+depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret' 'telepathy-glib')
 makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 provides=("$_pkgname=$pkgver")
 conflicts=$_pkgname
 replaces=($_pkgname $pkgname-coherence)
 options=(!libtool)
 install=$_pkgname.install
-source=(http://download.gnome.org/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('9e5e55c5097b8d7c32c0dfb7d94448795c627723b133e8edd0b846adde63a44b')
- 
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('bba85366632cf5ce777b6889eab505d98d7593c37f7859a312dc57dde05a0feb')
+
 build() {
   cd $_pkgname-$pkgver
-  ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts \
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$_pkgname
     --disable-google \
     --enable-owncloud \
     --disable-facebook \