summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-04-22 03:45:42 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-04-22 03:45:42 +0000
commitd4b7ceefdfb9c828799749419e8f8f7a36c2d7b8 (patch)
treee33b9107bd1b9ee167a7d4ef8432070c31cfc48f
parentc925b627b01ec8ab7044dd26b245ac0b99992d0e (diff)
Tue Apr 22 03:41:19 UTC 2014
-rw-r--r--community/caja/4f1e756e08e61840eb9a52de4debee30006ea31e.diff89
-rw-r--r--community/caja/PKGBUILD8
-rw-r--r--community/cutter/PKGBUILD4
-rw-r--r--community/dart/PKGBUILD8
-rw-r--r--community/gedit-plugins/PKGBUILD6
-rw-r--r--community/gmic/PKGBUILD6
-rw-r--r--community/haskell-data-default-instances-base/PKGBUILD6
-rw-r--r--community/mednafen/PKGBUILD8
-rw-r--r--community/playpen/PKGBUILD2
-rw-r--r--core/psmisc/PKGBUILD10
-rw-r--r--extra/folks/PKGBUILD18
-rw-r--r--extra/gst-libav/PKGBUILD6
-rw-r--r--extra/gst-plugins-base/PKGBUILD6
-rw-r--r--extra/gst-plugins-good/0001-docs-fix-mismatched-para-tags.patch43
-rw-r--r--extra/gst-plugins-good/0002-docs-use-docbook-markup-for-xi-include.patch75
-rw-r--r--extra/gst-plugins-good/PKGBUILD22
-rw-r--r--extra/gst-plugins-ugly/PKGBUILD8
-rw-r--r--extra/gstreamer/PKGBUILD6
-rw-r--r--extra/lyx/PKGBUILD10
-rw-r--r--extra/lyx/lyx.install1
-rw-r--r--extra/network-manager-applet/PKGBUILD9
-rw-r--r--extra/networkmanager/PKGBUILD8
-rw-r--r--extra/orc/PKGBUILD6
-rw-r--r--extra/rsync/CVE-2014-2855.patch83
-rw-r--r--extra/rsync/PKGBUILD17
-rw-r--r--extra/xmlto/PKGBUILD8
-rw-r--r--extra/zeitgeist/PKGBUILD11
-rw-r--r--extra/zeitgeist/gio-dependency.patch20
28 files changed, 289 insertions, 215 deletions
diff --git a/community/caja/4f1e756e08e61840eb9a52de4debee30006ea31e.diff b/community/caja/4f1e756e08e61840eb9a52de4debee30006ea31e.diff
new file mode 100644
index 000000000..0ab9e1feb
--- /dev/null
+++ b/community/caja/4f1e756e08e61840eb9a52de4debee30006ea31e.diff
@@ -0,0 +1,89 @@
+diff --git a/src/caja-application.c b/src/caja-application.c
+index 3f4282c..47c86c8 100644
+--- a/src/caja-application.c
++++ b/src/caja-application.c
+@@ -961,6 +961,15 @@ queue_accel_map_save_callback (GtkAccelMap *object, gchar *accel_path,
+ }
+ }
+
++static gboolean
++desktop_changed_callback_connect (CajaApplication *application)
++{
++ g_signal_connect_swapped (caja_preferences, "changed::" CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR,
++ G_CALLBACK(desktop_location_changed_callback),
++ G_OBJECT (application));
++ return FALSE;
++}
++
+ void
+ caja_application_startup (CajaApplication *application,
+ gboolean kill_shell,
+@@ -1029,9 +1038,8 @@ caja_application_startup (CajaApplication *application,
+
+ /* Monitor the preference to have the desktop */
+ /* point to the Unix home folder */
+- g_signal_connect_swapped (caja_preferences, "changed::" CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR,
+- G_CALLBACK(desktop_location_changed_callback),
+- G_OBJECT (application));
++ g_timeout_add_seconds (30, (GSourceFunc) desktop_changed_callback_connect, application);
++
+ /* Create the other windows. */
+ if (urls != NULL || !no_default_window)
+ {
+diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c
+index c7918e6..616e85b 100644
+--- a/src/caja-window-manage-views.c
++++ b/src/caja-window-manage-views.c
+@@ -49,6 +49,7 @@
+ #include <eel/eel-gtk-macros.h>
+ #include <eel/eel-stock-dialogs.h>
+ #include <eel/eel-string.h>
++#include <eel/eel-vfs-extensions.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+ #include <glib/gi18n.h>
+@@ -527,8 +528,10 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+ char *old_uri, *new_uri;
+ int new_slot_position;
+ GList *l;
+- gboolean target_navigation = FALSE, target_same = FALSE;
+- gboolean is_desktop, is_navigation;
++ gboolean target_navigation = FALSE;
++ gboolean target_same = FALSE;
++ gboolean is_desktop = FALSE;
++ gboolean is_navigation = FALSE;
+
+ window = slot->pane->window;
+
+@@ -567,7 +570,12 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+ * otherwise it's the same window.
+ */
+ if (is_desktop) {
+- target_navigation = TRUE;
++ new_uri = g_file_get_uri (location);
++ if (g_str_has_prefix (new_uri, EEL_DESKTOP_URI))
++ target_same = TRUE;
++ else
++ target_navigation = TRUE;
++ g_free (new_uri);
+ } else {
+ target_same = TRUE;
+ }
+@@ -676,7 +684,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+ }
+ }
+
+- if ((target_window == window && target_slot == slot &&
++ if (!(is_desktop && target_same) && (target_window == window && target_slot == slot &&
+ old_location && g_file_equal (old_location, location))) {
+
+ if (callback != NULL) {
+@@ -688,7 +696,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+ }
+
+ begin_location_change (target_slot, location, old_location, new_selection,
+- CAJA_LOCATION_CHANGE_STANDARD, 0, NULL, callback, user_data);
++ (is_desktop && target_same) ? CAJA_LOCATION_CHANGE_RELOAD : CAJA_LOCATION_CHANGE_STANDARD, 0, NULL, callback, user_data);
+
+ /* Additionally, load this in all slots that have no location, this means
+ we load both panes in e.g. a newly opened dual pane window. */
diff --git a/community/caja/PKGBUILD b/community/caja/PKGBUILD
index 6219b7a55..7150c7973 100644
--- a/community/caja/PKGBUILD
+++ b/community/caja/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108196 2014-03-24 15:12:46Z flexiondotorg $
+# $Id: PKGBUILD 109911 2014-04-21 15:45:57Z flexiondotorg $
# Maintainer : Martin Wimpress <code@flexion.org>
pkgname=caja
pkgver=1.8.0
-pkgrel=2
+pkgrel=3
pkgdesc="The MATE shell and file manager"
url="http://mate-desktop.org"
arch=('i686' 'x86_64')
@@ -18,9 +18,9 @@ provides=('mate-file-manager')
conflicts=('mate-file-manager')
groups=('mate')
source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz"
- "https://github.com/mate-desktop/caja/commit/4f1e756e08e61840eb9a52de4debee30006ea31e.diff")
+ "4f1e756e08e61840eb9a52de4debee30006ea31e.diff")
sha1sums=('3bfb52dceae4fa7b39eb26099b07326fa4197f3f'
- 'a8ae80fb181c999deeea5d597d7a8f7a174e62c6')
+ 'b2b619091643521b1e7263f883780abdf7bd7d71')
install=${pkgname}.install
prepare() {
diff --git a/community/cutter/PKGBUILD b/community/cutter/PKGBUILD
index b6d100938..2ca7f946b 100644
--- a/community/cutter/PKGBUILD
+++ b/community/cutter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 107022 2014-03-11 11:37:13Z spupykin $
+# $Id: PKGBUILD 109922 2014-04-21 15:53:49Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=cutter
pkgver=1.03
-pkgrel=5
+pkgrel=6
pkgdesc="TCP/IP Connection cutting on Linux Firewalls and Routers"
arch=('i686' 'x86_64')
url="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
diff --git a/community/dart/PKGBUILD b/community/dart/PKGBUILD
index 89437f915..17da3de9a 100644
--- a/community/dart/PKGBUILD
+++ b/community/dart/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 109203 2014-04-11 11:58:40Z arodseth $
+# $Id: PKGBUILD 109924 2014-04-21 15:59:30Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: T. Jameson Little <t.jameson.little at gmail dot com>
# Contributor: Usagi Ito <usagi@WonderRabbitProject.net>
@@ -6,7 +6,7 @@
# Contributor: Julien Nicoulaud <julien.nicoulaud@gmail.com>
pkgname=dart
-pkgver=1.3
+pkgver=1.3.3
pkgrel=1
pkgdesc='The dart programming language SDK'
arch=('x86_64' 'i686')
@@ -18,10 +18,10 @@ options=('!strip')
if [[ $CARCH == x86_64 ]]; then
source=("$pkgname-$pkgver-64.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip")
- sha256sums=('62de0c4bcc2c7fd5c3ef0667350d51415010f96815951f4dc0a4e97de2ec68d4')
+ sha256sums=('ca8ab3fc4d603a554b7f28f02db495907c91f4c6f0faa8f8be9fa6af59ce8560')
else
source=("$pkgname-$pkgver-32.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip")
- sha256sums=('0b8d00479eae6f100bbfcdd04801e217373289e8897dded074abdfe947a9596c')
+ sha256sums=('b97d1e35d25683f6dd5e72c05b7c80bc804967b609ce2422549278619317a108')
fi
prepare() {
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index 06a061e4e..622a25957 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102711 2013-12-17 18:09:28Z bgyorgy $
+# $Id: PKGBUILD 109904 2014-04-21 14:11:22Z jgc $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Hugo Doria <hugo@archlinux.org>
@@ -6,7 +6,7 @@
# Contributor: zhuqin <zhuqin83@gmail.com>
pkgname=gedit-plugins
-pkgver=3.10.1
+pkgver=3.12.1
pkgrel=1
pkgdesc="Plugins for gedit"
arch=(x86_64 i686)
@@ -20,7 +20,7 @@ optdepends=('gucharmap: for charmap plugin'
options=('!emptydirs')
install=gedit-plugins.install
source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz")
-sha256sums=('b30e30d5a0efb9a711c6583748b37c1ed3e45222505e08f920b78c6de0bc4a9d')
+sha256sums=('431adb6c8327d755329061f59d9f06e94819e398b7910751bbe46bc96679c67f')
build() {
cd $pkgname-$pkgver
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index 21db3d9a1..4870394b9 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108387 2014-03-27 11:48:26Z spupykin $
+# $Id: PKGBUILD 109898 2014-04-21 10:42:07Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: farid <farid at archlinuc-br.org>
@@ -6,14 +6,14 @@
pkgbase=gmic
pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.8.5
+pkgver=1.5.8.6
pkgrel=1
arch=("i686" "x86_64")
url="http://gmic.sourceforge.net"
license=("custom:CeCILL")
makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz")
-md5sums=('6bfa5cf4fff73d892578079b76fcba62')
+md5sums=('0df62707961248869477c58f6c7d7605')
prepare() {
cd "${srcdir}/gmic-${pkgver}"
diff --git a/community/haskell-data-default-instances-base/PKGBUILD b/community/haskell-data-default-instances-base/PKGBUILD
index f433e99e1..5dbbb3202 100644
--- a/community/haskell-data-default-instances-base/PKGBUILD
+++ b/community/haskell-data-default-instances-base/PKGBUILD
@@ -2,17 +2,19 @@
_hkgname=data-default-instances-base
pkgname=haskell-data-default-instances-base
pkgver=0.0.1
-pkgrel=1
+pkgrel=3
pkgdesc="Default instances for types in base"
url="http://hackage.haskell.org/package/${_hkgname}"
license=('custom:BSD3')
arch=('i686' 'x86_64')
makedepends=()
-depends=('ghc=7.6.3' 'haskell-data-default-class')
+depends=('ghc=7.8.2' 'haskell-data-default-class')
options=('strip')
source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
install=${pkgname}.install
md5sums=('37fc6531e0227bcf9cfbbf85f04e759d')
+options=('staticlibs')
+
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD
index 5002bd0b9..ebe711293 100644
--- a/community/mednafen/PKGBUILD
+++ b/community/mednafen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108527 2014-03-27 20:02:12Z jsteel $
+# $Id: PKGBUILD 109894 2014-04-21 10:35:45Z jsteel $
# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
# Contributor: megadriver <megadriver at gmx dot com>
# Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -7,7 +7,7 @@
# Contributor: Hans-Kristian Arntzen <maister@archlinux.us>
pkgname=mednafen
-pkgver=0.9.33.2
+pkgver=0.9.33.3
pkgrel=1
pkgdesc="A command-line multi-system gaming emulator"
url="http://mednafen.sourceforge.net"
@@ -16,9 +16,9 @@ arch=('i686' 'x86_64')
depends=('libcdio' 'libsamplerate' 'sdl_net' 'zlib')
makedepends=('mesa' 'glu')
replaces=('mednafen-wip')
-install="$pkgname.install"
+install=$pkgname.install
source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2)
-md5sums=('5ad015c5cbbefbf6b52fd6b972809b6a')
+md5sums=('004b0854b7d47916160b0f4c4a0ead60')
build() {
cd "$srcdir"/$pkgname
diff --git a/community/playpen/PKGBUILD b/community/playpen/PKGBUILD
index 3e5d7a9f4..58232b930 100644
--- a/community/playpen/PKGBUILD
+++ b/community/playpen/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Daniel Micay <danielmicay@gmail.com>
pkgname=playpen
-pkgver=3
+pkgver=4
pkgrel=1
epoch=1
pkgdesc='A secure application sandbox using namespaces, cgroups and seccomp'
diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD
index 97b1a5d3b..24acdb6a2 100644
--- a/core/psmisc/PKGBUILD
+++ b/core/psmisc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 182101 2013-04-06 21:59:09Z eric $
+# $Id: PKGBUILD 211632 2014-04-21 19:41:48Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=psmisc
-pkgver=22.20
+pkgver=22.21
pkgrel=1
pkgdesc="Miscellaneous procfs tools"
arch=('i686' 'x86_64')
@@ -11,15 +11,15 @@ license=('GPL')
groups=('base')
depends=('ncurses')
source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('abdddc8d5c91251bba0f3190956ae9d05c058745')
+sha1sums=('09fabbef4539b58b6b8738a73da3d21d5daa1a58')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index 4a8804624..b093decb1 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 210434 2014-04-14 20:06:09Z jgc $
+# $Id: PKGBUILD 211631 2014-04-21 18:28:13Z jgc $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=folks
-pkgver=0.9.6
-pkgrel=2
+pkgver=0.9.7
+pkgrel=1
pkgdesc="Library to aggregates people into metacontacts"
arch=(i686 x86_64)
url="http://telepathy.freedesktop.org/wiki/Folks"
license=(LGPL2.1)
depends=(telepathy-glib libgee libxml2 evolution-data-server zeitgeist)
-makedepends=(gobject-introspection intltool vala)
+makedepends=(gobject-introspection intltool vala git)
install=folks.install
options=('!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f')
+source=(git://git.gnome.org/folks#commit=0085cb463849e5b30d4b4c58da63a5df3fd0d0be)
+md5sums=('SKIP')
build() {
- cd "$pkgname-$pkgver"
- #export PKG_CONFIG_PATH="${srcdir}/${pkgname}-${pkgver}/folks"
+ cd $pkgname
+ NOCONFIGURE=1 ./autogen.sh
./configure --prefix=/usr --disable-schemas-compile \
--disable-libsocialweb-backend --disable-fatal-warnings
make
}
package() {
- cd "$pkgname-$pkgver"
+ cd $pkgname
make DESTDIR="$pkgdir" install
}
diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD
index 37d258c15..08ab38427 100644
--- a/extra/gst-libav/PKGBUILD
+++ b/extra/gst-libav/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 205819 2014-02-10 13:13:12Z heftig $
+# $Id: PKGBUILD 211619 2014-04-21 17:03:55Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gst-libav
-pkgver=1.2.3
+pkgver=1.2.4
pkgrel=1
pkgdesc="Gstreamer libav Plugin"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('yasm' 'python')
options=(!emptydirs)
provides=("gst-ffmpeg=$pkgver-$pkgrel")
source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('ebc7fbe10955f40df6ccc4bf689075e7e296205fc7ecd8ff383d43c5cdf5bcd6')
+sha256sums=('2a69480d63fc2db93249d9e2e229ab3541bbc2db881b0f64de13d0bfc7d1f037')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD
index 385d34e5a..d0691fcda 100644
--- a/extra/gst-plugins-base/PKGBUILD
+++ b/extra/gst-plugins-base/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 205815 2014-02-10 13:12:18Z heftig $
+# $Id: PKGBUILD 211610 2014-04-21 16:24:05Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=gst-plugins-base
pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
-pkgver=1.2.3
+pkgver=1.2.4
pkgrel=1
pkgdesc="GStreamer Multimedia Framework Base Plugins"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv
options=(!emptydirs)
url="http://gstreamer.freedesktop.org/"
source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
-sha256sums=('61edec35c270f86928bad434bd059da4efff865d1ef01bcc64ecbd903625dae1')
+sha256sums=('4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550')
build() {
cd $pkgbase-$pkgver
diff --git a/extra/gst-plugins-good/0001-docs-fix-mismatched-para-tags.patch b/extra/gst-plugins-good/0001-docs-fix-mismatched-para-tags.patch
deleted file mode 100644
index 2747c6975..000000000
--- a/extra/gst-plugins-good/0001-docs-fix-mismatched-para-tags.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 908d728c8a8b12acd9f9659ebd8970882b7daa33 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <william.jon.mccann@gmail.com>
-Date: Fri, 14 Feb 2014 20:27:20 +0000
-Subject: docs: fix mismatched para tags
-
-newer gtkdoc is more sensitive to mismatched docbook tags.
-This fixes the build in master.
----
-diff --git a/gst/audiofx/audiocheblimit.c b/gst/audiofx/audiocheblimit.c
-index 549a9d2..e278886 100644
---- a/gst/audiofx/audiocheblimit.c
-+++ b/gst/audiofx/audiocheblimit.c
-@@ -46,12 +46,12 @@
- * be at most this value. A lower ripple value will allow a faster rolloff.
- *
- * As a special case, a Chebyshev type 1 filter with no ripple is a Butterworth filter.
-- * </para>
-+ *
- * <note><para>
- * Be warned that a too large number of poles can produce noise. The most poles are possible with
- * a cutoff frequency at a quarter of the sampling rate.
- * </para></note>
-- * <para>
-+ *
- * <refsect2>
- * <title>Example launch line</title>
- * |[
-diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
-index 922e381..ea49af9 100644
---- a/gst/udp/gstudpsrc.c
-+++ b/gst/udp/gstudpsrc.c
-@@ -78,8 +78,7 @@
- * </itemizedlist>
- * The message is typically used to detect that no UDP arrives in the receiver
- * because it is blocked by a firewall.
-- * </para>
-- * <para>
-+ *
- * A custom file descriptor can be configured with the
- * #GstUDPSrc:sockfd property. The socket will be closed when setting the
- * element to READY by default. This behaviour can be
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/gst-plugins-good/0002-docs-use-docbook-markup-for-xi-include.patch b/extra/gst-plugins-good/0002-docs-use-docbook-markup-for-xi-include.patch
deleted file mode 100644
index e4d2fef81..000000000
--- a/extra/gst-plugins-good/0002-docs-use-docbook-markup-for-xi-include.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 79fc4ec80b68eac193095ee40d5da584eb270f1c Mon Sep 17 00:00:00 2001
-From: Stefan Sauer <ensonic@users.sf.net>
-Date: Tue, 18 Feb 2014 21:54:45 +0000
-Subject: docs: use docbook markup for xi:include
-
-It turns out that the change in gtk-doc-1.20 which wraps the |[]| content in
-CDATA break xi:inlcude examples. As in a whole jhbuild checkout these where
-the only 4, we're fixing them instead.
----
-diff --git a/gst/audiofx/audiofirfilter.c b/gst/audiofx/audiofirfilter.c
-index e0887ad..0ab32f3 100644
---- a/gst/audiofx/audiofirfilter.c
-+++ b/gst/audiofx/audiofirfilter.c
-@@ -39,9 +39,9 @@
- *
- * <refsect2>
- * <title>Example application</title>
-- * |[
-+ * <informalexample><programlisting language="C">
- * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/audiofx/firfilter-example.c" />
-- * ]|
-+ * </programlisting></informalexample>
- * </refsect2>
- */
-
-diff --git a/gst/audiofx/audioiirfilter.c b/gst/audiofx/audioiirfilter.c
-index c107594..eb4f20c 100644
---- a/gst/audiofx/audioiirfilter.c
-+++ b/gst/audiofx/audioiirfilter.c
-@@ -35,9 +35,9 @@
- *
- * <refsect2>
- * <title>Example application</title>
-- * |[
-+ * <informalexample><programlisting language="C">
- * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/audiofx/iirfilter-example.c" />
-- * ]|
-+ * </programlisting></informalexample>
- * </refsect2>
- */
-
-diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
-index 59943d4..5cd83c8 100644
---- a/gst/level/gstlevel.c
-+++ b/gst/level/gstlevel.c
-@@ -95,9 +95,9 @@
- *
- * <refsect2>
- * <title>Example application</title>
-- * |[
-+ * <informalexample><programlisting language="C">
- * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/level/level-example.c" />
-- * ]|
-+ * </programlisting></informalexample>
- * </refsect2>
- */
-
-diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c
-index 75a9152..5e192c1 100644
---- a/gst/spectrum/gstspectrum.c
-+++ b/gst/spectrum/gstspectrum.c
-@@ -90,9 +90,9 @@
- *
- * <refsect2>
- * <title>Example application</title>
-- * |[
-+ * <informalexample><programlisting language="C">
- * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/spectrum/spectrum-example.c" />
-- * ]|
-+ * </programlisting></informalexample>
- * </refsect2>
- *
- * Last reviewed on 2011-03-10 (0.10.29)
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
index a6350f1a7..30e121c6e 100644
--- a/extra/gst-plugins-good/PKGBUILD
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 207962 2014-03-15 19:47:26Z heftig $
+# $Id: PKGBUILD 211612 2014-04-21 16:38:07Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gst-plugins-good
-pkgver=1.2.3
-pkgrel=2
+pkgver=1.2.4
+pkgrel=1
pkgdesc="GStreamer Multimedia Framework Good Plugins"
arch=('i686' 'x86_64')
license=('LGPL')
@@ -11,20 +11,8 @@ url="http://gstreamer.freedesktop.org/"
depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo')
makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python' 'gtk-doc')
options=(!emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz
- 0001-docs-fix-mismatched-para-tags.patch
- 0002-docs-use-docbook-markup-for-xi-include.patch)
-sha256sums=('bfb33536a515bdcc34482f64b8d9cc3e47c753878b254923b419bc2f7485e470'
- 'ff9411fc67f825144fff8496f6ae303ff14bb3d14f629e76c2b26616255bba64'
- '9e71a6bbd83be88ff6793b503af7ccde295cc90b3e3692ae46b874abe9ee32f7')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Fix build with gtk-doc 1.20 FS#39454
- patch -p1 -i ../0001-docs-fix-mismatched-para-tags.patch
- patch -p1 -i ../0002-docs-use-docbook-markup-for-xi-include.patch
-}
+source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD
index b1f34b353..138219b9d 100644
--- a/extra/gst-plugins-ugly/PKGBUILD
+++ b/extra/gst-plugins-ugly/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 208907 2014-03-28 15:46:20Z bpiotrowski $
+# $Id: PKGBUILD 211616 2014-04-21 16:57:39Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gst-plugins-ugly
-pkgver=1.2.3
-pkgrel=2
+pkgver=1.2.4
+pkgrel=1
pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
arch=('i686' 'x86_64')
license=('LGPL')
@@ -12,7 +12,7 @@ depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad
makedepends=('python' 'gtk-doc')
options=(!emptydirs)
source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('537b0a7607eee499026388bb705b5b68985a3fd59fe22ee09accaf8cdf57eb3b')
+sha256sums=('4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD
index 1ba7096a5..369ef08e8 100644
--- a/extra/gstreamer/PKGBUILD
+++ b/extra/gstreamer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 205814 2014-02-10 13:11:48Z heftig $
+# $Id: PKGBUILD 211608 2014-04-21 16:17:25Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gstreamer
-pkgver=1.2.3
+pkgver=1.2.4
pkgrel=1
pkgdesc="GStreamer Multimedia Framework"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('libxml2' 'glib2')
optdepends=('sh: feedback script')
makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
-sha256sums=('0f9a9817a384b3448c368c23345e5122435caef9c00f1c40d7b1953827b0d8eb')
+sha256sums=('1e7ca67a7870a82c9ed51d51d0008cdbc550c41d64cc3ff3f9a1c2fc311b4929')
build() {
cd "${srcdir}/gstreamer-${pkgver}"
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 7cb70b628..cde86bda9 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 208768 2014-03-26 20:31:50Z ronald $
+# $Id: PKGBUILD 211617 2014-04-21 17:02:48Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=lyx
-pkgver=2.0.7.1
+pkgver=2.1.0
pkgrel=1
pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
arch=('i686' 'x86_64')
url="http://www.lyx.org"
-depends=('qt4' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
-makedepends=('boost')
+depends=('qt4' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes' 'file')
+makedepends=('boost' 'bc')
optdepends=('rcs: built-in version control system'
'texlive-latexextra: float wrap support')
license=('GPL')
@@ -18,7 +18,7 @@ install=lyx.install
options=('emptydirs')
source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
lyx.desktop lyxrc.dist)
-sha1sums=('fd24172f3b5daf42ad8d3ab3dbaafe2cefaf1c18'
+sha1sums=('8e31c4bb34db0424128ff5d35849805835010b31'
'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
'56416642cc3da2a13b87b84e6b87c1a239f3d09a')
diff --git a/extra/lyx/lyx.install b/extra/lyx/lyx.install
index c15c17b3a..179b075bd 100644
--- a/extra/lyx/lyx.install
+++ b/extra/lyx/lyx.install
@@ -1,5 +1,6 @@
post_install() {
update-desktop-database -q
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
}
post_upgrade() {
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index 0f7c3b1cf..1db75fefd 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 209751 2014-04-02 20:13:24Z jgc $
+# $Id: PKGBUILD 211582 2014-04-21 10:21:28Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Arjan Timmerman <arjan@archlinux.org>
# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -6,7 +6,7 @@
# Contributor: Will Rea <sillywilly@gmail.com>
pkgname=network-manager-applet
-pkgver=0.9.8.8
+pkgver=0.9.8.9
pkgrel=1
pkgdesc="GNOME frontends to NetWorkmanager"
arch=(i686 x86_64)
@@ -14,12 +14,11 @@ license=(GPL)
url="http://www.gnome.org/projects/NetworkManager/"
depends=("networkmanager>=${pkgver%.*}" libsecret gtk3 libnotify
gnome-icon-theme mobile-broadband-provider-info iso-codes)
-makedepends=(intltool gnome-bluetooth gobject-introspection modemmanager)
-optdepends=('gnome-bluetooth: for PAN/DUN support')
+makedepends=(intltool gobject-introspection modemmanager)
options=('!emptydirs')
install=network-manager-applet.install
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('581ebf9ead919e33d7e910322c2f64919f98716d8636f1a640b72c9b2e3ba9eb')
+sha256sums=('b93d7bf49456b7932e233f562bf9531a3f3ff10946c942126159b92b3dda25c3')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 2c3f63798..e13de6afd 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 206339 2014-02-24 03:07:41Z heftig $
+# $Id: PKGBUILD 211581 2014-04-21 10:21:27Z jgc $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Maintainer: Jan de Groot <jgc@archlinxu.org>
# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -8,8 +8,8 @@
pkgname=networkmanager
_pkgname=NetworkManager
-pkgver=0.9.8.8
-pkgrel=3
+pkgver=0.9.8.9
+pkgrel=1
pkgdesc="Network Management daemon"
arch=('i686' 'x86_64')
license=('GPL')
@@ -26,7 +26,7 @@ install=networkmanager.install
#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55'
+sha256sums=('65fca0d4f5cbd3d75843ef3062bbdbee5175ad08ae38da6569dbd8422bf8c27a'
'44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
'25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD
index 710e9179c..4da301ac0 100644
--- a/extra/orc/PKGBUILD
+++ b/extra/orc/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 198360 2013-10-30 14:23:45Z allan $
+# $Id: PKGBUILD 211606 2014-04-21 16:11:09Z jgc $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=orc
-pkgver=0.4.18
+pkgver=0.4.19
pkgrel=1
pkgdesc="The Oild Runtime Compiler"
arch=('i686' 'x86_64')
@@ -10,6 +10,7 @@ url="http://code.entropywave.com/projects/orc/"
depends=('glibc')
makedepends=('valgrind')
source=(http://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.gz)
+md5sums=('2cacea6271aade6d592fe1622a136f19')
build () {
cd $pkgname-$pkgver
@@ -27,4 +28,3 @@ package() {
make DESTDIR="$pkgdir" install
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
}
-md5sums=('1a2552e8d127526c48d644fe6437b377')
diff --git a/extra/rsync/CVE-2014-2855.patch b/extra/rsync/CVE-2014-2855.patch
new file mode 100644
index 000000000..b73e77be9
--- /dev/null
+++ b/extra/rsync/CVE-2014-2855.patch
@@ -0,0 +1,83 @@
+From 0dedfbce2c1b851684ba658861fe9d620636c56a Mon Sep 17 00:00:00 2001
+From: Wayne Davison <wayned@samba.org>
+Date: Sun, 13 Apr 2014 13:44:58 -0700
+Subject: [PATCH] Avoid infinite wait reading secrets file.
+
+---
+ authenticate.c | 24 +++++++++++++-----------
+ 1 files changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/authenticate.c b/authenticate.c
+index 3381b8c..c92746c 100644
+--- a/authenticate.c
++++ b/authenticate.c
+@@ -102,15 +102,16 @@ static const char *check_secret(int module, const char *user, const char *group,
+ char pass2[MAX_DIGEST_LEN*2];
+ const char *fname = lp_secrets_file(module);
+ STRUCT_STAT st;
+- int fd, ok = 1;
++ int ok = 1;
+ int user_len = strlen(user);
+ int group_len = group ? strlen(group) : 0;
+ char *err;
++ FILE *fh;
+
+- if (!fname || !*fname || (fd = open(fname, O_RDONLY)) < 0)
++ if (!fname || !*fname || (fh = fopen(fname, "r")) == NULL)
+ return "no secrets file";
+
+- if (do_fstat(fd, &st) == -1) {
++ if (do_fstat(fileno(fh), &st) == -1) {
+ rsyserr(FLOG, errno, "fstat(%s)", fname);
+ ok = 0;
+ } else if (lp_strict_modes(module)) {
+@@ -123,29 +124,30 @@ static const char *check_secret(int module, const char *user, const char *group,
+ }
+ }
+ if (!ok) {
+- close(fd);
++ fclose(fh);
+ return "ignoring secrets file";
+ }
+
+ if (*user == '#') {
+ /* Reject attempt to match a comment. */
+- close(fd);
++ fclose(fh);
+ return "invalid username";
+ }
+
+ /* Try to find a line that starts with the user (or @group) name and a ':'. */
+ err = "secret not found";
+- while ((user || group) && read_line_old(fd, line, sizeof line, 1)) {
+- const char **ptr, *s;
++ while ((user || group) && fgets(line, sizeof line, fh) != NULL) {
++ const char **ptr, *s = strtok(line, "\n\r");
+ int len;
+- if (*line == '@') {
++ if (!s)
++ continue;
++ if (*s == '@') {
+ ptr = &group;
+ len = group_len;
+- s = line+1;
++ s++;
+ } else {
+ ptr = &user;
+ len = user_len;
+- s = line;
+ }
+ if (!*ptr || strncmp(s, *ptr, len) != 0 || s[len] != ':')
+ continue;
+@@ -158,7 +160,7 @@ static const char *check_secret(int module, const char *user, const char *group,
+ *ptr = NULL; /* Don't look for name again. */
+ }
+
+- close(fd);
++ fclose(fh);
+
+ memset(line, 0, sizeof line);
+ memset(pass2, 0, sizeof pass2);
+--
+1.7.0.4
+
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index 4744ab5b8..75710119d 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -1,25 +1,32 @@
-# $Id: PKGBUILD 195476 2013-09-30 19:07:27Z pierre $
+# $Id: PKGBUILD 211621 2014-04-21 17:22:50Z jgc $
pkgname=rsync
pkgver=3.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="A file transfer program to keep remote files in sync"
arch=('i686' 'x86_64')
-url="http://samba.anu.edu.au/rsync/"
+url="http://rsync.samba.org/"
license=('GPL3')
depends=('perl' 'popt')
backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz"
"http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz.asc"
'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service'
- 'rsyncd.socket' 'rsyncd@.service')
+ 'rsyncd.socket' 'rsyncd@.service'
+ 'CVE-2014-2855.patch')
md5sums=('3be148772a33224771a8d4d2a028b132'
'SKIP'
'bce64d122a8e0f86872a4a21a03bc7f3'
'ea3e9277dc908bc51f9eddc0f6b935c1'
'084140868d38cf3e937a2db716d47c0f'
'ae4c381e0c02d6132c7f6ded3f473041'
- '53f94e613e0bc502d38dd61bd2cd7636')
+ '53f94e613e0bc502d38dd61bd2cd7636'
+ 'dacfe77bd72fbf6b6ba65c741c57f74c')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../CVE-2014-2855.patch
+}
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xmlto/PKGBUILD b/extra/xmlto/PKGBUILD
index b5e476228..560679749 100644
--- a/extra/xmlto/PKGBUILD
+++ b/extra/xmlto/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 206151 2014-02-20 11:17:14Z giovanni $
+# $Id: PKGBUILD 211586 2014-04-21 14:38:24Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
# Contributor: Robert Stoffers <rob1@ubuntu.com>
pkgname=xmlto
-pkgver=0.0.25
-pkgrel=5
+pkgver=0.0.26
+pkgrel=1
pkgdesc="Convert xml to many other formats"
arch=('i686' 'x86_64')
url="http://cyberelk.net/tim/software/xmlto/"
@@ -14,7 +14,7 @@ license=('GPL')
depends=('libxslt')
makedepends=('docbook-xsl')
source=("https://fedorahosted.org/releases/x/m/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('6b6267b1470f8571fe5f63a128970364')
+md5sums=('c90a47c774e0963581c1ba57235f64f4')
build() {
cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD
index 951dc0f79..fe2652a11 100644
--- a/extra/zeitgeist/PKGBUILD
+++ b/extra/zeitgeist/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198587 2013-10-30 15:47:57Z allan $
+# $Id: PKGBUILD 211625 2014-04-21 18:17:51Z jgc $
# 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=1
+pkgrel=2
pkgdesc="Service logging user activities and events"
arch=(i686 x86_64)
url="http://zeitgeist-project.com/"
@@ -15,12 +15,15 @@ makedepends=(intltool gobject-introspection vala raptor python2-rdflib)
provides=(zeitgeist-datahub)
conflicts=(zeitgeist-datahub)
replaces=(zeitgeist-datahub)
-source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz")
-sha256sums=('769b5abfe67ef632414efa1d35a1462c5cd86c8792bb4635b4c3d93a5f15f061')
+source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz"
+ gio-dependency.patch)
+sha256sums=('769b5abfe67ef632414efa1d35a1462c5cd86c8792bb4635b4c3d93a5f15f061'
+ '4f2403b0695a6bf7b7cc10833e0e3a07d14fa22afeccc4ec89af0e89bbb35291')
prepare() {
cd $pkgname-$pkgver
sed -i 's/python -/$PYTHON -/' configure configure.ac
+ patch -Np1 -i ../gio-dependency.patch
}
build() {
diff --git a/extra/zeitgeist/gio-dependency.patch b/extra/zeitgeist/gio-dependency.patch
new file mode 100644
index 000000000..5f5fe5a32
--- /dev/null
+++ b/extra/zeitgeist/gio-dependency.patch
@@ -0,0 +1,20 @@
+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
+