Sun Dec 23 02:15:27 PST 2012

32 files changed, 328 insertions, 111 deletions

diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD
index cd1413842..456ff25ea 100644
--- a/community/fcitx-mozc/PKGBUILD
+++ b/community/fcitx-mozc/PKGBUILD
@@ -5,7 +5,7 @@
 ## Mozc compile option
 _bldtype=Release
 
-_zipcoderel=201208
+_zipcoderel=201211
 _protobuf_ver=2.4.1
 
 _pkgbase=mozc
@@ -13,14 +13,14 @@ pkgname=fcitx-mozc
 pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
 pkgver=1.6.1187.102
 _patchver=${pkgver}.2
-pkgrel=3
+pkgrel=4
 groups=('mozc-im')
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/mozc/"
 license=('custom')
 depends=('qt' 'fcitx' 'zinnia')
 makedepends=('pkg-config' 'python2' 'gtest' 'qt' 'curl' 'fcitx' 'gtk2')
-replaces=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
+replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
 source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2
         http://downloads.sourceforge.net/pnsft-aur/ken_all-${_zipcoderel}.zip
@@ -94,7 +94,7 @@ package() {
 }
 
 md5sums=('e5246d17a81d2e942e9e8de0c3240c95'
-         'd1df91ca1fc0cf2b0ffe4eb4ddcf09ca'
-         '0f7eff544b256eb643ef309678742e09'
+         'e61df4b5754f3869ca504d269dc9641d'
+         '59c5f7e9c734b40197454318f228859f'
          'ed436802019c9e1f40cc750eaf78f318'
          'a70fa7d5cef505c14f61e739b0502444')
diff --git a/community/fcitx-ui-light/PKGBUILD b/community/fcitx-ui-light/PKGBUILD
new file mode 100644
index 000000000..6ffa8a1d5
--- /dev/null
+++ b/community/fcitx-ui-light/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 81498 2012-12-22 12:52:08Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Author: CSSlayer <wengxt@gmail.com>
+# Contributor: Yangtse <yangtsesu@gmail.com> 
+
+pkgname=fcitx-ui-light
+pkgver=0.1.3
+pkgrel=2
+pkgdesc="Light weight xlib and xft based ui for fcitx."
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/fcitx"
+license=('GPL2')
+depends=('fcitx>=4.1.0' 'libxpm')
+makedepends=('cmake' 'intltool')
+source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
+
+build(){
+    cd "$srcdir/${pkgname}-${pkgver}"
+
+    rm -rf build
+    mkdir build
+    cd build
+    
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+    make
+}
+
+package ()
+{
+    cd "$srcdir/${pkgname}-${pkgver}/build"
+    make DESTDIR="${pkgdir}" install
+}
+md5sums=('633e8b018da9c8f09f99567b5479cf18')
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index 77f532c14..4aea87ec8 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80275 2012-11-19 02:35:00Z fyan $
+# $Id: PKGBUILD 81502 2012-12-22 13:42:19Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: csslayer <wengxt AT gmail com>
@@ -6,7 +6,8 @@
 pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
 pkgver=4.2.6.1
-pkgrel=3
+pkgrel=4
+groups=('fcitx-im')
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
@@ -36,11 +37,31 @@ check() {
 }
 
 package_fcitx() {
-  pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
+  pkgdesc="Flexible Context-aware Input Tool with eXtension"
   depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \
            'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \
            'libxfixes' 'dbus-core' 'icu')
-  optdepends=('enchant: for word predication support')
+  optdepends=('enchant: for word predication support'
+  	      'fcitx-anthy: Hiragana text to Kana Kanji mixed text Japanese input method'
+	      'fcitx-chewing: Intelligent Zhuyin input method library for traditional Chinese'
+	      'fcitx-cloudpinyin: Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates'
+	      'fcitx-configtool: GTK based config tool for Fcitx'
+	      'fcitx-fbterm: Fbterm support for Fcitx'
+	      'fcitx-googlepinyin: A fork from google pinyin on android for Fcitx'
+	      'fcitx-gtk2: GTK2 IM Module for fcitx'
+	      'fcitx-gtk3: GTK3 IM Module for fcitx'
+	      'fcitx-hangul: Hangul (Korean) support for fcitx'
+	      'fcitx-libpinyin: Fcitx Wrapper for libpinyin, Library to deal with pinyin'
+	      'fcitx-m17n: Multilingual text processing library'
+	      'fcitx-mozc: Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)'
+	      'fcitx-qt: QT IM Module for fcitx'
+	      'fcitx-rime: Rime input method engine (Traditional Chinese)'
+  	      'fcitx-sunpinyin: Statistical Language Model based pinyin IME by Sun'
+	      'fcitx-table-extra: Extra tables for Fcitx, including Boshiamy, Zhengma, Cangjie3, Cangjie5'
+	      'fcitx-table-other: Provides some other tables for Fcitx, fork from ibus-table-others, scim-tables'
+	      'fcitx-ui-light: Light weight xlib and xft based ui for fcitx'
+	      'fcitx-unikey: Fcitx Wrapper for unikey'
+	      'kcm-fcitx: KDE Config Module for Fcitx')
   install=fcitx.install
 
   cd "${srcdir}"/build
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index 6de7ecb12..b7abd60ec 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 80913 2012-12-06 17:28:21Z stativ $
+# $Id: PKGBUILD 81483 2012-12-22 10:23:17Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=12.0
-_pkgver=123.72
+pkgver=12.0.1
+_pkgver=123.94
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://www.jetbrains.org/"
 license=('apache')
 depends=('glibc')
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('d684a654b38285504fdc8a923d604d89')
+md5sums=('0641de81781cfb2f122df3b327a902fb')
 
 build() {
   cd "$srcdir"
diff --git a/community/libxkbcommon/PKGBUILD b/community/libxkbcommon/PKGBUILD
new file mode 100644
index 000000000..04bacedb1
--- /dev/null
+++ b/community/libxkbcommon/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Mladen Pejakovic <pejakm@gmail.com>
+
+pkgname=libxkbcommon
+pkgver=0.2.0
+pkgrel=3
+pkgdesc="Keyboard handling library using XKB data"
+arch=(i686 x86_64)
+url="http://xkbcommon.org/"
+license=('custom')
+depends=(glibc)
+makedepends=(doxygen xorg-util-macros)
+source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.bz2")
+md5sums=('2be3d4a255d02c7d46fc6a9486f21f6a')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD
index 8c8ec44c7..80a32233c 100644
--- a/core/ed/PKGBUILD
+++ b/core/ed/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 172178 2012-12-01 00:07:10Z dreisner $
+# $Id: PKGBUILD 173766 2012-12-22 18:16:53Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=ed
 pkgver=1.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A POSIX-compliant line-oriented text editor"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,6 +12,7 @@ url="http://www.gnu.org/software/ed/ed.html"
 depends=('glibc' 'sh')
 options=('!emptydirs')
 source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz)
+install='ed.install'
 md5sums=('0aa4e2428e325203d0d7c3e86c961b1c')
 
 build() {
@@ -32,7 +33,4 @@ check() {
 
 package() {
   make -C "$pkgname-$pkgver" "DESTDIR=$pkgdir" install
-
-  # nuke info pages
-  rm -r "$pkgdir/usr/share/info"
 }
diff --git a/core/ed/ed.install b/core/ed/ed.install
new file mode 100644
index 000000000..2be95d935
--- /dev/null
+++ b/core/ed/ed.install
@@ -0,0 +1,18 @@
+infodir=usr/share/info
+filelist=(ed.info)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2>/dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2>/dev/null
+  done
+}
diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD
index 8cf902069..2e9902106 100644
--- a/core/pcmciautils/PKGBUILD
+++ b/core/pcmciautils/PKGBUILD
@@ -1,28 +1,24 @@
-# $Id: PKGBUILD 173074 2012-12-10 03:04:40Z dreisner $
+# $Id: PKGBUILD 173746 2012-12-22 15:22:21Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pcmciautils
 pkgver=018
-pkgrel=5
+pkgrel=6
 pkgdesc="Utilities for inserting and removing PCMCIA cards"
 arch=('i686' 'x86_64')
 url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
 license=('GPL')
 groups=('base')
-# sysfsutils will not be required in the next release
-depends=('udev' 'sysfsutils')
+depends=('systemd')
 conflicts=('pcmcia-cs')
 # source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
         initcpio-install-pcmcia)
 options=(!makeflags)
-md5sums=('964c802994677a71b38ec56554aa229f'
-         '041af04025daee5b3b05812ac3896c8f')
 
 build() {
   cd "$pkgname-$pkgver"
-  sed -i -e 's,/usr/bin/install,install,g;
-             s,/lib/udev,/usr/lib/udev,g' Makefile
+  sed -i -e 's,/lib/udev,/usr/lib/udev,g' Makefile
   make
 }
 
@@ -32,3 +28,5 @@ package() {
   # install the mkinitpcio hook
   install -Dm644 initcpio-install-pcmcia "$pkgdir/usr/lib/initcpio/install/pcmcia"
 }
+md5sums=('2e9469c44dcb790d2b497723c2fa0566'
+         '041af04025daee5b3b05812ac3896c8f')
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 857bcc495..e0aabed6c 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171469 2012-11-17 23:02:13Z allan $
+# $Id: PKGBUILD 173745 2012-12-22 15:22:20Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
-pkgver=2.22.1
-pkgrel=3
+pkgver=2.22.2
+pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
@@ -75,7 +75,7 @@ package() {
   # TODO(dreisner): offer this upstream?
   install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
 }
-md5sums=('730cf9932531ed09b53a04ca30fcb4c9'
+md5sums=('eeacbfdd2556acd899a2d0ffdb446185'
          'a39554bfd65cccfd8254bb46922f4a67'
          '4368b3f98abd8a32662e094c54e7f9b1'
          'a31374fef2cba0ca34dfc7078e2969e4'
diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD
index 8b65e390b..df67da29e 100644
--- a/extra/e_dbus/PKGBUILD
+++ b/extra/e_dbus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172972 2012-12-07 19:30:17Z ronald $
+# $Id: PKGBUILD 173760 2012-12-22 16:25:57Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=e_dbus
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="D-Bus integration with Ecore"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('ecore' 'dbus-core')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('1bd664721ea4910fb61cff3f4b16863ecdbd0772')
+sha1sums=('1e17b6697502c85153e74ffaecbcb3410628063f')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD
index f46e6d991..4ef6c7b9d 100644
--- a/extra/ecore/PKGBUILD
+++ b/extra/ecore/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172964 2012-12-07 19:25:18Z ronald $
+# $Id: PKGBUILD 173752 2012-12-22 16:20:53Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=ecore
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="OS abstraction layer for e17"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst'
 makedepends=('subversion')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('c6ee8092af99842631e49566f6be32b6149eaaca')
+sha1sums=('673c3ef55b0482188b85f997af77bf8fb83791b5')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD
index 47c5131e7..0b61958d3 100644
--- a/extra/edje/PKGBUILD
+++ b/extra/edje/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173171 2012-12-12 00:31:43Z eric $
+# $Id: PKGBUILD 173756 2012-12-22 16:23:23Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=edje
-pkgver=1.7.3
-pkgrel=2
+pkgver=1.7.4
+pkgrel=1
 pkgdesc="A graphical design and layout library based on Evas"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
@@ -14,7 +14,7 @@ optdepends=('python2: inkscape2edc')
 install=edje.install
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('7882ee5cdf67a53a543b06d27a9f06f833b1b5da')
+sha1sums=('a5138ea6cf94a4219a542b571ef17cfc70b32711')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD
index 20cad2e9f..224f1b203 100644
--- a/extra/eet/PKGBUILD
+++ b/extra/eet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172961 2012-12-07 19:23:17Z ronald $
+# $Id: PKGBUILD 173749 2012-12-22 16:18:57Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eet
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="A data storage and compression library"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('libjpeg>=7' 'openssl' 'eina')
 options=(!libtool)
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('42265eb508a17e3684a01429593da138da369718')
+sha1sums=('ce4f05e180ce4a833d019fc618c7acd5aceca96d')
 
 build() {
    cd $srcdir/$pkgname-$pkgver
diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD
index bb54f32e0..8fed8ebf3 100644
--- a/extra/eeze/PKGBUILD
+++ b/extra/eeze/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172966 2012-12-07 19:26:35Z ronald $
+# $Id: PKGBUILD 173754 2012-12-22 16:22:10Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=eeze
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="Manipulate devices using udev and sysfs"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('ecore' 'eina' 'udev')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('3b3edfa7eed63f4b74184939578f16d866fa2bb2')
+sha1sums=('95d333cc105c9c6285722cd0de26427c6585f986')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD
index 4e227bef1..20f4ecd8a 100644
--- a/extra/efreet/PKGBUILD
+++ b/extra/efreet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172971 2012-12-07 19:29:41Z ronald $
+# $Id: PKGBUILD 173759 2012-12-22 16:25:20Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=efreet
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="FreeDesktop.Org specifications for e17"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('eina' 'ecore' 'e_dbus')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('3161ca46a1fed410340924f43ee773c52ff5e553')
+sha1sums=('eac167d8cd9f7902a1884dd1633a4a06a5a4e4ef')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD
index b09c81952..9356b18d5 100644
--- a/extra/eina/PKGBUILD
+++ b/extra/eina/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172960 2012-12-07 19:22:39Z ronald $
+# $Id: PKGBUILD 173748 2012-12-22 16:18:19Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eina
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="A core data structure and common utility library"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('LGPL2.1')
 depends=('glibc')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('b668b23cd0f88b0857a7b140eca645783b770108')
+sha1sums=('7f98af625b4908fe941589ef5634b16fe897bd0e')
 
 build() {
    cd $srcdir/$pkgname-$pkgver
diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD
index 0c1328fef..5861db0c3 100644
--- a/extra/eio/PKGBUILD
+++ b/extra/eio/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172965 2012-12-07 19:26:00Z ronald $
+# $Id: PKGBUILD 173753 2012-12-22 16:21:34Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=eio
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="Async IO library using Ecore"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('ecore')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('aaf54bfaee1ddae9bbff89da0178b56605df6048')
+sha1sums=('67d03ddcc9d15a8510a59f8d63bb9f83a9317dc5')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD
index 984789bc1..d4b239d3c 100644
--- a/extra/elementary/PKGBUILD
+++ b/extra/elementary/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172973 2012-12-07 19:30:53Z ronald $
+# $Id: PKGBUILD 173761 2012-12-22 16:26:33Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=elementary
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="Enlightenment's widget set"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('b7c3f346dbeb1d3ee43f140fd2a93384c20a92bb')
+sha1sums=('1189c619b38444f48893c0be63cd0b03f18d640d')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD
index 00d7395e9..acc6848df 100644
--- a/extra/embryo/PKGBUILD
+++ b/extra/embryo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172967 2012-12-07 19:27:09Z ronald $
+# $Id: PKGBUILD 173755 2012-12-22 16:22:44Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=embryo
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="implementation of a C like scripting language for e17"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('glibc' 'eina')
 options=('!libtool')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('9850e01d65aeb724fa53e5d9d351cf94eb6957f5')
+sha1sums=('f82ffaa0f2935c25e71dbdaf65885e55e114fe8e')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD
index dc9fa14a4..a7af72732 100644
--- a/extra/emotion/PKGBUILD
+++ b/extra/emotion/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172969 2012-12-07 19:28:30Z ronald $
+# $Id: PKGBUILD 173757 2012-12-22 16:24:05Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=emotion
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="Library to easily integrate media playback into EFL applications"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('gstreamer0.10' 'edje' 'eeze')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('9aebc9ee614e68b3ccb69e10f42ae2989d0d29a0')
+sha1sums=('5bdd5512c3e6459f3d4f3effb5b4d3ea2b06bff8')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD
index a4ab02539..6970ef101 100644
--- a/extra/enlightenment17/PKGBUILD
+++ b/extra/enlightenment17/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 173313 2012-12-18 19:57:25Z ronald $
+# $Id: PKGBUILD 173762 2012-12-22 16:29:18Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=enlightenment17
 _pkgname=enlightenment
-pkgver=0.17.0omega
-_pkgver=0.17.0-omega
+pkgver=0.17.0
 pkgrel=1
 pkgdesc="Enlightenment window manager DR17 (aka e17)"
 arch=('i686' 'x86_64')
@@ -19,15 +18,15 @@ provides=('notification-daemon' 'e')
 backup=('etc/enlightenment/sysactions.conf')
 options=('!libtool' '!emptydirs')
 install=enlightenment17.install
-source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz
+source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz
   'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch')
-sha1sums=('4c94f470d74133ebf2a5254683d0510bf3ece55f'
+sha1sums=('be8228200c1a7caeba914ae77927bda62e3a1776'
           'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5'
           '3f53931ae86de8fe99e386aeb097521aac0decd8'
           '86f1c5e36dc274c3101362532378be034e89c593')
 
 build() {
-  cd "$srcdir/$_pkgname-$_pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
   export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
   export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
@@ -63,7 +62,7 @@ build() {
 }
 
 package() {
-  cd $srcdir/$_pkgname-$_pkgver
+  cd $srcdir/$_pkgname-$pkgver
 
   make DESTDIR=$pkgdir install
 
diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD
index 33866e671..8ad78fdfc 100644
--- a/extra/ethumb/PKGBUILD
+++ b/extra/ethumb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172970 2012-12-07 19:29:06Z ronald $
+# $Id: PKGBUILD 173758 2012-12-22 16:24:44Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=ethumb
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="Thumbnailing library and D-Bus service using EFL"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('libexif' 'e_dbus'  'emotion')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('decee66729d0deccb4f836967c4492172a8d3875')
+sha1sums=('65110fe9e0aa10a10855dd3a5adb80a38e445222')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD
index 1bec2a72a..b64d9187a 100644
--- a/extra/evas/PKGBUILD
+++ b/extra/evas/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172963 2012-12-07 19:24:28Z ronald $
+# $Id: PKGBUILD 173751 2012-12-22 16:20:08Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=evas
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="A hardware-accelerated canvas API for X-Windows"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('eet' 'giflib' 'libpng' 'libjpeg>=7' 'libxrender' 'mesa'
 optdepends=("evas_generic_loaders")
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('ffa9b12d34e801112cf081a3c024eca5ef86ed8a')
+sha1sums=('d9d081d5ff44d3cebc5790a5edb47bd4092856ee')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD
index 6f3fa377b..fa1c32346 100644
--- a/extra/evas_generic_loaders/PKGBUILD
+++ b/extra/evas_generic_loaders/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172962 2012-12-07 19:23:53Z ronald $
+# $Id: PKGBUILD 173750 2012-12-22 16:19:33Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=evas_generic_loaders
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="Additional generic loaders for Evas"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('librsvg' 'gstreamer0.10' 'poppler' 'libraw' 'libspectre' 'eina')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('2aeee66f9f6ce8a2a7daf0eebf75681f0e89730d')
+sha1sums=('e40a1976374448c6918378130b0efacb3358b1f5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD
index 25359b5c0..46768fffc 100644
--- a/extra/exo/PKGBUILD
+++ b/extra/exo/PKGBUILD
@@ -1,27 +1,33 @@
-# $Id: PKGBUILD 173049 2012-12-09 18:14:06Z foutrelis $
+# $Id: PKGBUILD 173786 2012-12-22 22:26:11Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=exo
 pkgver=0.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Extensions to Xfce by os-cillation"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
 license=('GPL2' 'LGPL')
 groups=('xfce4')
 depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' )
-makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
+makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth' 'xfce4-dev-tools')
 optdepends=('perl-uri: for mail-compose helper script')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('34a6d14c58a12d3372eb810d05ae425b8c8c32ec976b99b6ad274c3f7b3f6896')
+source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2
+        drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch)
+sha256sums=('34a6d14c58a12d3372eb810d05ae425b8c8c32ec976b99b6ad274c3f7b3f6896'
+            '9983b3206391f0e86816d70ded4fc5ddd48ac27dd29b266d4ba4a930ca663626')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Fix launching of .desktop files (https://bugs.archlinux.org/task/33125)
+  patch -Np1 -i "$srcdir/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch"
+  NOCONFIGURE=1 xdt-autogen
+
   # Python 2 fix
   export PYTHON=python2
 
diff --git a/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch b/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch
new file mode 100644
index 000000000..a9edca3d7
--- /dev/null
+++ b/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch
@@ -0,0 +1,61 @@
+From a54bc42cb5f06f06141d8ed2434719bf7c200aaf Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Sun, 23 Dec 2012 00:09:34 +0200
+Subject: [PATCH] Drop HAVE_GIO_UNIX ifdef and load gio-unix-2.0 pkg
+
+This restores exo-open's .desktop file launching functionality.
+---
+ configure.ac.in | 1 +
+ exo-open/main.c | 9 ---------
+ 2 files changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index 0c8b3a1..ec9be67 100644
+--- a/configure.ac.in
++++ b/configure.ac
+@@ -159,6 +159,7 @@ dnl *** Check for required packages ***
+ dnl ***********************************
+ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0])
+ XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0])
++XDT_CHECK_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
+diff --git a/exo-open/main.c b/exo-open/main.c
+index 059fad4..da78f6a 100644
+--- a/exo-open/main.c
++++ b/exo-open/main.c
+@@ -32,9 +32,7 @@
+ 
+ #include <glib/gstdio.h>
+ #include <gio/gio.h>
+-#ifdef HAVE_GIO_UNIX
+ #include <gio/gdesktopappinfo.h>
+-#endif
+ #include <exo/exo.h>
+ 
+ 
+@@ -143,7 +141,6 @@ usage (void)
+ static gboolean
+ exo_open_launch_desktop_file (const gchar *arg)
+ {
+-#ifdef HAVE_GIO_UNIX
+   GFile           *gfile;
+   gchar           *contents;
+   gsize            length;
+@@ -191,12 +188,6 @@ exo_open_launch_desktop_file (const gchar *arg)
+ #endif
+ 
+   return result;
+-#else /* !HAVE_GIO_UNIX */
+-  g_critical (_("Launching desktop files is not supported when %s is compiled "
+-                "without GIO-Unix features."), g_get_prgname ());
+-
+-  return FALSE;
+-#endif
+ }
+ 
+ 
+-- 
+1.8.0.2
+
diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD
index 21b6ae5eb..b46e5f298 100644
--- a/extra/graphite/PKGBUILD
+++ b/extra/graphite/PKGBUILD
@@ -1,31 +1,37 @@
-# $Id: PKGBUILD 142675 2011-11-12 18:27:50Z ibiru $
+# $Id: PKGBUILD 173763 2012-12-22 16:44:26Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=graphite
-pkgver=1.0.3
+pkgver=1.2.0
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
-url="http://graphite.sil.org/"
+url="http://projects.palaso.org/projects/graphitedev"
 pkgdesc='reimplementation of the SIL Graphite text processing engine'
-license=('custom_SIL Dual license')
+license=('LGPL' 'GPL' 'custom')
 depends=('gcc-libs')
-makedepends=('cmake' 'freetype2')
+makedepends=('cmake' 'freetype2' 'python2') 
+# 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') - only for docs - target doesn't install properly
 options=('!libtool' '!emptydirs')
 source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz")
-md5sums=('3bf481ca95109b14435125c0dd1f2217')
+md5sums=('f5ef3f7f10fa8c3542c6a085a233080b')
 
 build() {
   cd "${srcdir}"
+  sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" graphite2-${pkgver}/tests/{jsoncmp,fuzztest,defuzz,corrupt.py}
   mkdir build
   cd build
   cmake -G "Unix Makefiles" ../graphite2-${pkgver} \
-	-DCMAKE_INSTALL_PREFIX=/usr
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DCMAKE_BUILD_TYPE:STRING=Release \
+	-DGRAPHITE2_COMPARE_RENDERER=OFF
   make
+  make docs
 }
 
 check() {
   cd "${srcdir}"/build
+  sed -i "s:python:python2:g" tests/CTestTestfile.cmake
   ctest
 }
 
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 470d428cf..7d778ab28 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 173026 2012-12-08 21:00:09Z heftig $
+# $Id: PKGBUILD 173764 2012-12-22 16:44:27Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=harfbuzz
 pkgver=0.9.9
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenType text shaping engine."
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 license=('MIT')
-depends=('icu' 'glib2' 'freetype2' 'graphite')
+depends=('icu' 'glib2' 'freetype2' 'graphite>=1.2.0')
 makedepends=('icu' 'cairo' 'glib2' 'freetype2')
 optdepends=('cairo: hb-view program')
 options=(!libtool)
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 6ef1f4fb4..3df07831f 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173675 2012-12-20 19:05:46Z andyrtr $
+# $Id: PKGBUILD 173765 2012-12-22 16:44:33Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -26,7 +26,7 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
 _LOver=3.6.4.3
 pkgver=3.6.4
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -38,7 +38,7 @@ makedepends=( # makedepends
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1.1" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2'
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite>=1.2.0' 'lcms2'
              'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
 	         'ttf-dejavu') # to satisfy regression tests
 
@@ -275,7 +275,7 @@ package_libreoffice-common() {
  pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=libreoffice-common.install
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1.1" 'clucene' 'lcms2'
+          'nspr' 'libsm' 'redland' 'hyphen' 'graphite>=1.2.0' "icu>=50.1.1" 'clucene' 'lcms2'
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD
new file mode 100644
index 000000000..4dc7caa81
--- /dev/null
+++ b/extra/serf/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 173790 2012-12-23 03:50:15Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+pkgname=serf
+pkgver=1.1.1
+pkgrel=1
+pkgdesc="High-performance asynchronous HTTP client library"
+url="http://code.google.com/p/serf/"
+arch=('i686' 'x86_64')
+license=('Apache')
+depends=('apr' 'apr-util' 'openssl' 'zlib')
+source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('1ec4689ef57e7c28e7371df00d0ccc3e32ef6457')
+options=('!libtool')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr --with-openssl=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  rm "${pkgdir}"/usr/lib/libserf-1.a
+}
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index c112ab7bc..71258a605 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 170250 2012-11-06 11:27:11Z stephane $
+# $Id: PKGBUILD 173791 2012-12-23 03:50:49Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.7.7
-pkgrel=2
+pkgver=1.7.8
+pkgrel=1
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64')
 license=('APACHE')
-depends=('neon' 'apr-util' 'sqlite' 'file')
+depends=('neon' 'apr-util' 'sqlite' 'file' 'serf')
 optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \
             'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts')
 makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
@@ -25,31 +25,33 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
         svnserve.conf
         svnserve.tmpfiles
         svnserve.service
-        subversion-1.7.6-kwallet-gcc47.patch        
+        subversion-kwallet.patch
         subversion.rpath.fix.patch)
-sha1sums=('c9fc0c5992eda36ba9affd93a15929e25958a951'
-          '3df83e46277f0f08868236a6b6e6c0f0d7ef9278'
+sha1sums=('12c7d8d5414bba74c9777c4d1dae74f152df63c2'
+          '24f8e82fa131c1a1b924d71046f8d38cb00645a7'
           '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
           '73b36c046c09cec2093354911c89e3ba8056af6c'
           'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
           '00cc36e69077a8c45674ead6dd62a7647b3a3b6d'
           '9f6790d842cf3e0228b007483a43e39a42724068'
-          'aa0d01e606de2ebc5eed9c533d218d37a217c50c'
+          'f2aed28a2e34b8631ee9b69175bac1bac59327ce'
           '3d1e28408a9abb42af2e531adc0d01ce21acfad6')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
    export PYTHON=/usr/bin/python2
 
-   patch -p0 -i ../subversion.rpath.fix.patch
+   patch -Np0 -i ../subversion.rpath.fix.patch
    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
 
-   patch -Np1 -i ../subversion-1.7.6-kwallet-gcc47.patch
+   # FS#33081
+   patch -Np0 -i ../subversion-kwallet.patch
 
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
-               --with-zlib=/usr --with-neon=/usr --with-apxs \
+               --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \
                --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \
-               --enable-javahl --with-gnome-keyring --with-kwallet
+               --enable-javahl --with-gnome-keyring --with-kwallet \
+               --disable-static
 
    make external-all
    make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
diff --git a/extra/subversion/subversion-kwallet.patch b/extra/subversion/subversion-kwallet.patch
new file mode 100644
index 000000000..d2bf17101
--- /dev/null
+++ b/extra/subversion/subversion-kwallet.patch
@@ -0,0 +1,22 @@
+Index: subversion/libsvn_auth_kwallet/kwallet.cpp
+===================================================================
+--- subversion/libsvn_auth_kwallet/kwallet.cpp	(revision 1421011)
++++ subversion/libsvn_auth_kwallet/kwallet.cpp	(working copy)
+@@ -253,7 +253,7 @@ kwallet_password_get(svn_boolean_t *done,
+         }
+     }
+ 
+-  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL);
++  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null);
+ 
+   return SVN_NO_ERROR;
+ }
+@@ -327,7 +327,7 @@ kwallet_password_set(svn_boolean_t *done,
+         }
+     }
+ 
+-  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL);
++  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null);
+ 
+   return SVN_NO_ERROR;
+ }
\ No newline at end of file