Fri Jul 6 00:01:50 UTC 2012

12 files changed, 91 insertions, 67 deletions

diff --git a/community/ibus/PKGBUILD b/community/ibus/PKGBUILD
index 144c534fd..485e2b61a 100644
--- a/community/ibus/PKGBUILD
+++ b/community/ibus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63863 2012-02-06 10:52:08Z ebelanger $
+# $Id: PKGBUILD 73242 2012-07-04 07:56:41Z ebelanger $
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,44 +6,38 @@
 
 pkgname=ibus
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64')
 url="http://ibus.googlecode.com"
 license=('LGPL')
-depends=('dbus-python>=0.84.0' 'gconf' 'dconf' 'pyxdg' \
+depends=('python2-dbus' 'gconf' 'dconf' 'python2-xdg' \
          'iso-codes' 'librsvg' 'python-notify' 'hicolor-icon-theme')
 makedepends=('intltool' 'gobject-introspection')
 optdepends=('notification-daemon')
 options=('!libtool')
 install=ibus.install
-source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('88ef7dda720cec2de92b8673832a702e')
+source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz ibus-1389-dbus-address.patch)
+sha1sums=('4cc045553885d35a118ec4b44c2694910209509e'
+          'ee4eb1cf900a14d62adae932621ffb2f8d0a549d')
 
 build() {
   cd ${pkgname}-${pkgver}
   export PYTHON=python2
-  sed -i 's|--pkg=ibus-1.0||' src/Makefile.in
+  patch -p1 -i ../ibus-1389-dbus-address.patch
+  sed -i 's|--pkg=ibus-1.0|--pkg-export=ibus-1.0|' src/Makefile.in
   ./configure \
     --prefix=/usr \
     --libexecdir=/usr/lib/ibus \
     --sysconfdir=/etc \
     --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
     --enable-gtk3
-
-# python2 fix
-  for file in setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in; do
-    sed -i 's_exec python_exec python2_' $file
-  done
-
   make
 }
 
 package() {
   cd ${pkgname}-${pkgver}
-  export PYTHON=python2
   make DESTDIR="${pkgdir}" install
   install -d "${pkgdir}/etc/xdg/autostart"
   ln -s /usr/share/applications/ibus.desktop "${pkgdir}/etc/xdg/autostart/ibus.desktop"
-  find "${pkgdir}" -type f -exec sed -i 's_exec /usr/bin/python_exec /usr/bin/python2_' {} \;
 }
diff --git a/community/ibus/ibus-1389-dbus-address.patch b/community/ibus/ibus-1389-dbus-address.patch
new file mode 100644
index 000000000..e6b18bdb2
--- /dev/null
+++ b/community/ibus/ibus-1389-dbus-address.patch
@@ -0,0 +1,15 @@
+--- ibus-1.4.99.20120317/src/ibusshare.c.orig	2012-04-26 12:24:55.922072674 +0900
++++ ibus-1.4.99.20120317/src/ibusshare.c	2012-04-26 13:10:44.301421547 +0900
+@@ -44,7 +44,11 @@ ibus_get_local_machine_id (void)
+         if (!g_file_get_contents ("/var/lib/dbus/machine-id",
+                                   &machine_id,
+                                   NULL,
+-                                  &error)) {
++                                  &error) &&
++            !g_file_get_contents ("/etc/machine-id",
++                                  &machine_id,
++                                  NULL,
++                                  NULL)) {
+             g_warning ("Unable to load /var/lib/dbus/machine-id: %s", error->message);
+             g_error_free (error);
+             machine_id = "machine-id";
diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD
index bec61f747..9d1246a33 100644
--- a/community/kvirc/PKGBUILD
+++ b/community/kvirc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71745 2012-06-02 10:29:12Z bluewind $
+# $Id: PKGBUILD 73246 2012-07-04 09:21:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=kvirc
-pkgver=4.0.4
-pkgrel=5
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="Qt-based IRC client"
 url="http://www.kvirc.net"
 depends=('python2' 'qt' 'libxss' 'qtwebkit')
@@ -12,17 +12,11 @@ makedepends=('cmake')
 license=('GPL')
 options=("!libtool")
 install=kvirc.install
-source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2
-        kvirc-4.0.4-gcc-4.7.0.patch)
-md5sums=('26fd24979ae4a29bac9309b3b0c98788'
-         '863e33f5b38f0b5124144e9a8b640e42')
+source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2)
+md5sums=('bf7229aaae132933a18b6a35125a2328')
 
 build() {
   cd $srcdir
-
-  # Fix build with GCC 4.7
-  patch -d "$pkgname-$pkgver" -Np4 -i "$srcdir/kvirc-4.0.4-gcc-4.7.0.patch"
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD
index c38d48afc..724f783f5 100644
--- a/community/nbd/PKGBUILD
+++ b/community/nbd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 72000 2012-06-05 13:31:36Z svenstaro $
+# $Id: PKGBUILD 73267 2012-07-04 16:56:49Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Christian Hesse <mail@eworm.de>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
 
 pkgname=nbd
-pkgver=3.1.1
+pkgver=3.2
 pkgrel=1
 pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 backup=('etc/nbd-server/config')
 depends=('glib2')
 install=nbd.install
-md5sums=('e0e9d96abe068ee4f6fecd58635450ac'
+md5sums=('9cafce4ecfb55e670d7ded4c8f4e6bc9'
          '2d05d426b8c2708d5f8a0d028fcbae05'
          'e7b13a8b3369e11927d9917664557efa')
 
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index adb01b4f5..5e0417f2e 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73197 2012-07-03 19:16:22Z dreisner $
+# $Id: PKGBUILD 73240 2012-07-04 07:09:22Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
 pkgname=nginx
-pkgver=1.2.1
-pkgrel=6
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl')
@@ -27,7 +27,7 @@ backup=('etc/nginx/fastcgi.conf'
 source=(http://nginx.org/download/nginx-$pkgver.tar.gz
         rc.d service
         nginx.logrotate)
-md5sums=('ceacae12d66d1f021bf3737a0269b6f4'
+md5sums=('53105bbe3ac9319db54d9eb46119695b'
          'f62c7c9b5a53471d4666a4c49ad363fb'
          '16c6b4cbe24001a3f4f58b9d5f4e3d4c'
          'b38744739022876554a0444d92e6603b')
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index 781870857..48a6d5aec 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71230 2012-05-25 11:31:06Z spupykin $
+# $Id: PKGBUILD 73261 2012-07-04 14:01:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
 
 pkgname=parrot
-pkgver=4.4.0
+pkgver=4.5.0
 #_rel=stable
 _rel=devel
 pkgrel=1
@@ -16,36 +16,20 @@ makedepends=('perl-json')
 optdepends=('freeglut')
 options=('!makeflags')
 source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('5c3f5ba2de06f6adb53b7835374a4f3e0601ec63e8a1d1dba6c6a07e12cc2990')
-sha256sums=('348ce13fc136afc74a7b50b094f64d8cb00f83f0cd3d59acc6fa4e63c824fa4d')
-sha256sums=('348ce13fc136afc74a7b50b094f64d8cb00f83f0cd3d59acc6fa4e63c824fa4d')
+md5sums=('8deb517792652d8b44442ebb5d289e2c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  sed -i 's#auto::sha1##' lib/Parrot/Configure/Step/List.pm
-  sed -i 's#auto::git_describe##' lib/Parrot/Configure/Step/List.pm
-
   perl Configure.pl --prefix=/usr \
     --parrot_is_shared \
-    --disable-rpath || true
-
-#  find -type f -name Makefile | while read F; do
-#    grep "$srcdir" $F  && sed -i \
-#      "s#-Wl,-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F
-#    grep "$srcdir" $F  && sed -i \
-#      "s#-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F
-#  done
-
+    --disable-rpath
   export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib"
   make all parrot_utils docs html
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make DESTDIR="$pkgdir" install-dev
-
   sed -i "s#$srcdir#/usr/src#" \
     $pkgdir/usr/lib/parrot/$pkgver/tools/lib/Parrot/Config/Generated.pm
 }
diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD
index 24a9ba7b7..669e9689c 100644
--- a/community/pigeonhole/PKGBUILD
+++ b/community/pigeonhole/PKGBUILD
@@ -4,12 +4,12 @@
 # This must be built against the version of dovecot being used,
 # else mail delivery will fail.
 # Specify the version of dovecot to be used here:
-_dcpkgver=2.1.7
+_dcpkgver=2.1.8
 # Make sure to bump pkgrel if changing this.
 
 pkgname=pigeonhole
 pkgver=0.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
 arch=('i686' 'x86_64')
 url="http://pigeonhole.dovecot.org/"
diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD
index 43fab3af7..88b8354f1 100644
--- a/community/tinc/PKGBUILD
+++ b/community/tinc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 68908 2012-04-05 15:23:32Z tredaelli $
+# $Id: PKGBUILD 73258 2012-07-04 13:07:27Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: helios
 # Contributor: Lothar Gesslein
 
 pkgname=tinc
-pkgver=1.0.18
+pkgver=1.0.19
 pkgrel=1
 pkgdesc="VPN (Virtual Private Network) daemon"
 arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@ backup=(etc/conf.d/tincd.conf)
 install=tinc.install
 source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
         tincd.rc tincd.conf)
-md5sums=('9352d53e892df4127e839f54a0e8af2a'
-         '1c219383bff7cc57024a9a25cd7fca5d'
+md5sums=('5d97ee0f1ccf8fea5b492f6b54d5ac32'
+         'af4a88d89a17c216e38b93630389181a'
          '64bb53748d9051255f243003f0d511f5'
          '7c0276d4812cc5d3cc18142562a3aa82')
 
diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD
index f14114da1..0fb0d9ff3 100644
--- a/community/units/PKGBUILD
+++ b/community/units/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73111 2012-07-01 18:55:45Z spupykin $
+# $Id: PKGBUILD 73248 2012-07-04 09:22:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Steve Sansom <snsansom@gmail.com>
 
 pkgname=units
 pkgver=2.00
-pkgrel=1
+pkgrel=2
 pkgdesc="converts between different units"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/units/units.html"
@@ -16,7 +16,7 @@ install=units.install
 source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz
 	build-fix.patch)
 md5sums=('6d0518d493f9bab5aa318a3c7d0801b2'
-         'bf891464e398b0ddadac97dd7ce948c4')
+         'dbb20e628ce0879fe82393f585e9dab6')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/units/build-fix.patch b/community/units/build-fix.patch
index 219c16b85..7361a9e91 100644
--- a/community/units/build-fix.patch
+++ b/community/units/build-fix.patch
@@ -1,6 +1,6 @@
 diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in
 --- units-2.00.org/Makefile.in	2012-05-03 00:37:55.000000000 +0400
-+++ units-2.00/Makefile.in	2012-07-01 22:44:37.000000000 +0400
++++ units-2.00/Makefile.in	2012-07-04 12:54:20.000000000 +0400
 @@ -84,10 +84,10 @@
  	sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" units_cur > units_cur_inst
  
@@ -16,3 +16,12 @@ diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in
  	$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
  
  install: units@EXEEXT@ install-doc install-support
+diff -wbBur units-2.00.org/units_cur units-2.00/units_cur
+--- units-2.00.org/units_cur	2012-05-01 04:51:35.000000000 +0400
++++ units-2.00/units_cur	2012-07-04 12:53:47.000000000 +0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ 
+ import urllib
+ import datetime
diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD
index 5e1543134..29f509fcf 100644
--- a/community/vidalia/PKGBUILD
+++ b/community/vidalia/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72455 2012-06-14 19:38:37Z tredaelli $
+# $Id: PKGBUILD 73256 2012-07-04 13:05:20Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Rorschach <r0rschach@lavabit.com>
 
 pkgname=vidalia
 pkgver=0.2.19
-pkgrel=2
+pkgrel=3
 pkgdesc="Controller GUI for Tor"
 url="https://www.torproject.org/vidalia"
 arch=('i686' 'x86_64')
@@ -13,15 +13,15 @@ depends=('qt' 'tor')
 makedepends=('cmake')
 install=vidalia.install
 source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc}
-        revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch)
+        bug6178.patch)
 md5sums=('caf92b44ad2932bbc1c40d6405951c39'
          '1ba45d7c91797e880d79a3fc85818dee'
-         '72de3a292b8481b381f67016cb2a677c')
+         'bdc0855fef6b230ab63a5b523e853d4e')
 
 build() {
   [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh
 
-  patch "$srcdir"/$pkgname-$pkgver/src/vidalia/MainWindow.cpp "$srcdir"/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch
+  patch -d "$srcdir/$pkgname-$pkgver" -i "$srcdir"/bug6178.patch -p1
 
   cd "$srcdir"
   mkdir build
diff --git a/community/vidalia/bug6178.patch b/community/vidalia/bug6178.patch
new file mode 100644
index 000000000..5da41ef55
--- /dev/null
+++ b/community/vidalia/bug6178.patch
@@ -0,0 +1,28 @@
+From: Tomás Touceda <chiiph@torproject.org>
+Date: Thu, 28 Jun 2012 23:55:24 +0000 (-0300)
+Subject: Do not add relative root to datadirectory if it is empty
+X-Git-Url: https://gitweb.torproject.org
+
+Do not add relative root to datadirectory if it is empty
+---
+
+diff --git a/changes/bug6178 b/changes/bug6178
+new file mode 100644
+index 0000000..e727ed9
+--- /dev/null
++++ b/changes/bug6178
+@@ -0,0 +1 @@
++  o Do not add relative root to DataDirectory if it is empty. Fixes bug 6178.
+diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
+index a8dce5a..a7a4a09 100644
+--- a/src/vidalia/MainWindow.cpp
++++ b/src/vidalia/MainWindow.cpp
+@@ -1104,7 +1104,7 @@ MainWindow::start()
+   QString dataDirectory = settings.getDataDirectory();
+   QFileInfo dataDirectoryInfo(dataDirectory);
+ 
+-  if(QDir(dataDirectory).isRelative()) {
++  if(not dataDirectory.isEmpty() and QDir(dataDirectory).isRelative()) {
+     dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory;
+ 
+     QFileInfo newDataDirectoryInfo(dataDirectory);