Tue Jul 23 01:22:55 PDT 2013

17 files changed, 211 insertions, 160 deletions

diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD
index ae316078b..2a1042678 100644
--- a/extra/a2ps/PKGBUILD
+++ b/extra/a2ps/PKGBUILD
@@ -1,50 +1,52 @@
-# $Id: PKGBUILD 123160 2011-05-09 02:11:04Z eric $
+# $Id: PKGBUILD 191229 2013-07-21 22:39:59Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=a2ps
 pkgver=4.14
-pkgrel=2
+pkgrel=3
 pkgdesc="An Any to PostScript filter"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/a2ps/"
 license=('GPL3')
-depends=('ghostscript' 'psutils' 'imagemagick' 'perl')
+depends=('ghostscript' 'psutils' 'imagemagick')
 makedepends=('gperf')
 backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg')
 options=('!libtool')
 install=a2ps.install
-source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz \
-        a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch \
+source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz{,.sig}
+        a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch
         a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch)
-md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7'
-         '93011b58e9f20a7fafa31287a51884a4'
-         '2e493d0bc00d71eb3e8a9b6febc52b69'
-         '09cc5ed4d3d8ff1b2103e519191e8286'
-         '42aa39b74f6da8cf6e94185c4fc3e601'
-         '066f9327fee6b6eca3a57d657d1097d1')
 sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852'
+          'SKIP'
           '8783952d3410d8d59ed953e1db45e2ef1a0b8f65'
           '94e35a6ad9268161bec22a56d4cfb696d635994a'
           '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce'
           '6aed29c1399e79f3914b408059610f9e7c0fc38e'
           '58fa90134f1027e3f05aeb08212cbcc10f420738')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i -e '/^AM_C_PROTOTYPES/d' -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
+    -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+    configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4
+  sed -i "s:^countdictstack: \0:" contrib/psset.in
+  patch -p1 -i "${srcdir}/a2ps-4.13c-fnmatch-replacement.patch"
+  patch -p1 -i "${srcdir}/a2ps-4.13c-emacs.patch"
+  patch -p1 -i "${srcdir}/a2ps-4.13-manpage-chmod.patch"
+  patch -p1 -i "${srcdir}/a2ps-4.14-check-mempcpy.patch"
+  patch -p0 -i "${srcdir}/a2ps-4.14-fix-stpcpy-proto.patch"
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../a2ps-4.13c-fnmatch-replacement.patch
-  patch -p1 < ../a2ps-4.13c-emacs.patch
-  patch -p1 < ../a2ps-4.13-manpage-chmod.patch
-  patch -p1 < ../a2ps-4.14-check-mempcpy.patch
-  patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch
+  cd ${pkgname}-${pkgver}
   libtoolize --force --copy
-  autoreconf -I m4
+  autoreconf --force --install -I m4 
   ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
     --includedir=/usr/include --enable-nls
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
-  sed -i "s:^countdictstack: \0:" "${pkgdir}/usr/bin/psset"
 }
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index d6d1a8004..6a15b6b8c 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189213 2013-06-29 15:55:30Z schiv $
+# $Id: PKGBUILD 191251 2013-07-22 09:20:17Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: see .contrib
 
 pkgname=ardour
 _pkgname=Ardour3
-pkgver=3.2
+pkgver=3.3
 pkgrel=1
 pkgdesc="Professional-grade digital audio workstation"
 arch=('i686' 'x86_64')
@@ -14,10 +14,11 @@ license=('GPL')
 depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0'
          'aubio' 'libgnomecanvasmm' 'suil>=0.6.12')
 makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz')
+optdepends=('xjadeo: video monitoring')
 install=$pkgname.install
 source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2"
         "$pkgname.desktop")
-md5sums=('17028a3106f870cd62f6a60930a28590'
+md5sums=('40edf6ab63488d52abf94a2a48d7ac97'
          '316bd21ece5e2208a104fd09cac521af')
 
 prepare() {
diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install
index 78d8f7734..36da2e3ec 100644
--- a/extra/ardour/ardour.install
+++ b/extra/ardour/ardour.install
@@ -4,7 +4,7 @@ post_install() {
   > LXVST_PATH to include any custom directories of *.so VST plug-ins.
 
   > Ardour 3 also supports video (timeline and monitoring), but aside from
-  > xjadeo (AUR) the required external programs need to be retrieved from:
+  > xjadeo the required external programs need to be retrieved from:
 
       http://x42.github.io/harvid/
 
@@ -32,8 +32,7 @@ post_upgrade() {
   > Due to uncertainties with regards to program stability, 'harvid' is
   > currently not packaged in our repositories.
 
-  > In addition to the timeline, video can be monitored with xjadeo, which
-  > is presently available in the AUR. It will be in our repositories soon.
+  > In addition to the timeline, video can be monitored with xjadeo.
 MSG
 }
 
diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD
index 30f69b7a9..fa2bd62bc 100644
--- a/extra/cln/PKGBUILD
+++ b/extra/cln/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 143665 2011-11-28 09:23:06Z eric $
+# $Id: PKGBUILD 191235 2013-07-22 00:17:17Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=cln
-pkgver=1.3.2
+pkgver=1.3.3
 pkgrel=1
 pkgdesc="Class library for numbers"
 arch=('i686' 'x86_64')
@@ -13,16 +13,20 @@ makedepends=('texlive-core')
 options=('!libtool')
 install=cln.install
 source=(http://www.ginac.de/CLN/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d897cce94d9c34d106575ed4ec865d71')
-sha1sums=('c30dca80e75f45e2107f233075e6d0339ea884b0')
+sha1sums=('11c56780eb83ed54f2ad1ecef7f0dc0f609c426d')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make all html pdf
 }
 
+check() {
+  cd ${pkgname}-${pkgver}
+  make check
+}
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install install-html install-pdf
 }
diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD
index 480a521e2..57be2dc1f 100644
--- a/extra/glib/PKGBUILD
+++ b/extra/glib/PKGBUILD
@@ -1,37 +1,50 @@
-# $Id: PKGBUILD 135061 2011-08-10 01:01:44Z eric $
+# $Id: PKGBUILD 191242 2013-07-22 06:31:51Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glib
 pkgver=1.2.10
-pkgrel=9
+pkgrel=10
 pkgdesc="Common C routines used by Gtk+ and other libs"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('LGPL')
-depends=('glibc')
-options=('!libtool')
+depends=('glibc' 'sh')
+options=('!libtool' '!makeflags')
 install=glib.install
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \
-	gcc340.patch aclocal-fixes.patch)
-md5sums=('6fe30dad87c77b91b632def29dd69ef9'
-         '877b3330e822a4be69a0f8a8c268cfd7'
-         'e52c4b88427b9785bb8049dbdc9ff6fb')
+source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz
+	gcc340.patch aclocal-fixes.patch glib1-autotools.patch)
 sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa'
           'a2cc224a66aeffdcac16ebd9e8af18143cf54918'
-          'ae4438cf56c0c9264ee36f6973fb445f9a820be0')
+          'ae4438cf56c0c9264ee36f6973fb445f9a820be0'
+          '8a25fde3c79567262b3024f4e74c9ca4ee8a6279')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i "${srcdir}/gcc340.patch"
+  patch -Np0 -i "${srcdir}/aclocal-fixes.patch"
+  patch -Np1 -i "${srcdir}/glib1-autotools.patch"
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ../gcc340.patch
-  patch -Np0 -i ../aclocal-fixes.patch
+  cd ${pkgname}-${pkgver}
+  if [[ $CARCH = "i686" ]]; then
+    CONFIGFLAG='--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu'
+  elif [[ $CARCH = "x86_64" ]]; then
+    CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
+  fi
 
-  [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
+  autoreconf --force --install
   ./configure --prefix=/usr --mandir=/usr/share/man \
     --infodir=/usr/share/info $CONFIGFLAG
   make
 }
 
+check() {
+  cd ${pkgname}-${pkgver}
+  make check
+}
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/glib/glib1-autotools.patch b/extra/glib/glib1-autotools.patch
new file mode 100644
index 000000000..1332c9639
--- /dev/null
+++ b/extra/glib/glib1-autotools.patch
@@ -0,0 +1,33 @@
+diff -Naur glib-1.2.10-orig/configure.in glib-1.2.10/configure.in
+--- glib-1.2.10-orig/configure.in	2013-07-22 01:33:26.930091236 -0400
++++ glib-1.2.10/configure.in	2013-07-22 01:35:19.988776415 -0400
+@@ -17,7 +17,7 @@
+ 
+ dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
+ dnl are available for $ac_help expansion (don't we all *love* autoconf?)
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++AC_DIVERT_PUSH()dnl
+ #
+ # The following version number definitions apply to GLib, GModule and GThread
+ # as a whole, so if changes occoured in any of them, they are all
+@@ -81,7 +81,7 @@
+ 
+ dnl figure debugging default, prior to $ac_help setup
+ dnl
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++AC_DIVERT_PUSH()dnl
+ if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
+ 	debug_default=yes
+ else
+diff -Naur glib-1.2.10-orig/gmodule/Makefile.am glib-1.2.10/gmodule/Makefile.am
+--- glib-1.2.10-orig/gmodule/Makefile.am	2013-07-22 01:33:26.933424531 -0400
++++ glib-1.2.10/gmodule/Makefile.am	2013-07-22 01:38:46.553041607 -0400
+@@ -42,7 +42,7 @@
+ libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+ 
+ noinst_PROGRAMS = testgmodule
+-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
+ testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
+ 
+ .PHONY: files release
diff --git a/extra/gnet/PKGBUILD b/extra/gnet/PKGBUILD
index 60b952e00..b9b9a3647 100644
--- a/extra/gnet/PKGBUILD
+++ b/extra/gnet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122722 2011-05-06 08:12:47Z eric $
+# $Id: PKGBUILD 191233 2013-07-21 23:25:28Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gnet
 pkgver=2.0.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple network library"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GNetLibrary"
@@ -11,16 +11,15 @@ license=('LGPL')
 depends=('glib2')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/gnet/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('93327d2fca333d7e54ba2cf54e071165')
 sha1sums=('74a33dd25cc594b874e3a5171795efd99e567387')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  cd ${pkgname}-${pkgver}
+  LIBS+="-lglib-2.0" ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD
index 30fc520a8..c218906e7 100644
--- a/extra/gtk/PKGBUILD
+++ b/extra/gtk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137905 2011-09-12 10:53:48Z eric $
+# $Id: PKGBUILD 191240 2013-07-22 03:45:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gtk
 pkgver=1.2.10
-pkgrel=11
-pkgdesc="The GTK+ toolkit"
+pkgrel=12
+pkgdesc="GTK+ is a multi-platform toolkit (v1)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('LGPL')
@@ -12,20 +12,21 @@ depends=('libxi' 'glib' 'sh')
 makedepends=('libxt')
 options=('!libtool')
 install=gtk.install
-source=("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz"
-        'aclocal-fixes.patch')
-md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20'
-         'c59d4906602d99a7468f7334b6fc3b4e')
+source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz
+        aclocal-fixes.patch)
+sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c'
+          'b034e33efb85d27f3f3fb082c404e3b6ea79259f')
 
-build() {
-  cd "${srcdir}/gtk+-${pkgver}"
-  if [ "${CARCH}" = "x86_64" ]; then
-    rm config.guess config.sub
-    ln -s /usr/share/libtool/config/config.guess config.guess
-    ln -s /usr/share/libtool/config/config.sub config.sub
-  fi
-  patch -Np0 -i "${srcdir}/aclocal-fixes.patch"
+prepare() {
+  cd gtk+-${pkgver}
+  cp /usr/share/libtool/config/config.guess .
+  cp /usr/share/libtool/config/config.sub .
+  patch -p0 -i "${srcdir}/aclocal-fixes.patch"
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure
+}
 
+build() {
+  cd gtk+-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
     --mandir=/usr/share/man --infodir=/usr/share/info \
     --with-xinput=xfree
@@ -33,6 +34,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/gtk+-${pkgver}"
+  cd gtk+-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/idnkit/PKGBUILD b/extra/idnkit/PKGBUILD
index 13135127c..eb42dafc1 100644
--- a/extra/idnkit/PKGBUILD
+++ b/extra/idnkit/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 180328 2013-03-20 15:10:14Z bisson $
+# $Id: PKGBUILD 191237 2013-07-22 00:42:58Z eric $
 # Contributor: Igor Nemilentsev <trezorg@gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=idnkit
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Provides functionalities about Internationalized Domain Name processing'
 url='http://www.nic.ad.jp/ja/idn/idnkit/download/'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
 depends=('glibc')
+backup=('etc/idnalias.conf' 'etc/idn.conf')
 options=('!makeflags' '!libtool')
 source=("http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-${pkgver}-src.tar.gz")
 sha1sums=('7d843ffcf9843b7af02079e5a160520f28c75048')
 
-backup=('etc/idnalias.conf' 'etc/idn.conf')
+prepare() {
+	cd idnkit-${pkgver}-src
+	sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure
+}
 
 build() {
-	cd "${srcdir}/idnkit-${pkgver}-src"
+	cd idnkit-${pkgver}-src
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -28,12 +32,12 @@ build() {
 }
 
 check() {
-	cd "${srcdir}/idnkit-${pkgver}-src"
+	cd idnkit-${pkgver}-src
 	make check
 }
 
 package() {
-	cd "${srcdir}/idnkit-${pkgver}-src"
+	cd idnkit-${pkgver}-src
 	make DESTDIR="${pkgdir}" install
 	install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	rm "${pkgdir}"/etc/*.sample
diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD
index 41ab3ecba..de425926b 100644
--- a/extra/libxfont/PKGBUILD
+++ b/extra/libxfont/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 151781 2012-03-02 18:55:43Z andyrtr $
+# $Id: PKGBUILD 191249 2013-07-22 08:12:34Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxfont
-pkgver=1.4.5
+pkgver=1.4.6
 pkgrel=1
 pkgdesc="X11 font rasterisation library"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto')
 makedepends=('xorg-util-macros' 'xtrans')
 options=('!libtool')
 source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2)
-sha1sums=('0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e')
+sha256sums=('d0cbfe4554dc17ceea413cdad5601d35ed8d05d5b880e60931a8775fd1157e9f')
 
 build() {
   cd "${srcdir}/libXfont-${pkgver}"
diff --git a/extra/loudmouth/07-glib-single-include.patch b/extra/loudmouth/07-glib-single-include.patch
new file mode 100644
index 000000000..074b29526
--- /dev/null
+++ b/extra/loudmouth/07-glib-single-include.patch
@@ -0,0 +1,17 @@
+Description: Fix build failure with glib 2.32
+ where including individual glib headers is no longer allowed.
+Author: Michael Biebl <biebl@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665576
+Index: loudmouth-1.4.3/loudmouth/lm-error.c
+===================================================================
+--- loudmouth-1.4.3.orig/loudmouth/lm-error.c	2008-10-29 21:48:15.000000000 +0100
++++ loudmouth-1.4.3/loudmouth/lm-error.c	2012-03-26 00:24:19.518939657 +0200
+@@ -19,7 +19,7 @@
+  */
+ 
+ #include <config.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include "lm-error.h"
+ 
+ /**
diff --git a/extra/loudmouth/08-fix-ipv6-connect.patch b/extra/loudmouth/08-fix-ipv6-connect.patch
new file mode 100644
index 000000000..b8815a7de
--- /dev/null
+++ b/extra/loudmouth/08-fix-ipv6-connect.patch
@@ -0,0 +1,28 @@
+Description: fix crash when falling back from IPv6 to IPv4
+ Previously, loudmouth would set socket->watch_connect to NULL when
+ encountering an error. When the connection attempt (to a different IPv6)
+ succeeded later on, _lm_socket_succeeded would therefore not remove the
+ socket_connect_cb watcher, leading to socket_connect_cb being called upon
+ socket activity and segfaulting the program.
+Author: Michael Stapelberg <stapelberg@debian.org>
+Bug-Debian: http://bugs.debian.org/631729
+Forwarded: no
+Last-Update: 2013-02-03
+--- a/loudmouth/lm-socket.c
++++ b/loudmouth/lm-socket.c
+@@ -529,7 +529,6 @@
+ 			/* error condition, but might be possible to recover
+ 			 * from it (by connecting to the next host) */
+ 			if (!_lm_socket_failed_with_error (connect_data, err)) {
+-				socket->watch_connect = NULL;
+ 				goto out;
+ 			}
+ 		}
+@@ -560,7 +559,6 @@
+ 				_lm_sock_close (connect_data->fd);
+ 				_lm_socket_failed_with_error (connect_data, err);
+ 
+-				socket->watch_connect = NULL;
+ 				goto out;
+ 			}
+ 		} 
diff --git a/extra/loudmouth/PKGBUILD b/extra/loudmouth/PKGBUILD
index d1686df56..159f31e5e 100644
--- a/extra/loudmouth/PKGBUILD
+++ b/extra/loudmouth/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=loudmouth
 pkgver=1.4.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A lightweight Jabber client library written in C/Glib"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -16,19 +16,30 @@ makedepends=('intltool' 'pkgconfig' 'gtk-doc')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2
         01-fix-sasl-md5-digest-uri.patch
         03-drop-stanzas-on-fail.patch
-        04-use-pkg-config-for-gnutls.patch)
+        04-use-pkg-config-for-gnutls.patch
+        07-glib-single-include.patch
+        08-fix-ipv6-connect.patch)
 md5sums=('55339ca42494690c3942ee1465a96937'
          'dc799cea18b24847b1e008c7424010a3'
          'b7b2d81b01a5eee5fd5e21cae67b4af7'
-         'bffb25b9551df43255fe1706588582f3')
+         'bffb25b9551df43255fe1706588582f3'
+         'd1546ed54740de536f6bb79a18c5dccb'
+         '8e3071299776d32b9be27bba7d3f9ae0')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/01-fix-sasl-md5-digest-uri.patch"
-  patch -Np1 -i "${srcdir}/03-drop-stanzas-on-fail.patch"
-  patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch"
+  patch -Np1 -i ../01-fix-sasl-md5-digest-uri.patch
+  patch -Np1 -i ../03-drop-stanzas-on-fail.patch
+  patch -Np1 -i ../04-use-pkg-config-for-gnutls.patch
+  patch -Np1 -i ../07-glib-single-include.patch
+  patch -Np1 -i ../08-fix-ipv6-connect.patch
   libtoolize --force
-  autoreconf
+  aclocal
+  autoconf
+  automake --add-missing
+}
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --disable-static
   make
 }
diff --git a/extra/nedit/PKGBUILD b/extra/nedit/PKGBUILD
index 250d5e2bd..90e40764f 100644
--- a/extra/nedit/PKGBUILD
+++ b/extra/nedit/PKGBUILD
@@ -1,35 +1,35 @@
-# $Id: PKGBUILD 135019 2011-08-09 21:15:50Z eric $
+# $Id: PKGBUILD 191231 2013-07-21 23:04:03Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=nedit
 pkgver=5.5
-pkgrel=6
+pkgrel=7
 pkgdesc="A Unix text editor for programmers and general users"
 arch=('i686' 'x86_64')
 url="http://www.nedit.org/"
 license=('GPL')
 depends=('lesstif' 'libxpm')
-source=(http://www.nedit.org/ftp/v5_5/${pkgname}-${pkgver}-src.tar.bz2 
+source=(http://www.nedit.org/${pkgname}-${pkgver}-src.tar.bz2 
 	nedit_xorg_composite_fix.patch)
-md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe'
-         'ae1f56ae9b23163882051720ac52412d')
 sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87'
           '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../nedit_xorg_composite_fix.patch
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}/nedit_xorg_composite_fix.patch"
   sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux
   sed -i 's|fgets|//fgets|' util/check_lin_tif.c
   sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux
   sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
   make linux docs
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
+  cd ${pkgname}-${pkgver}
   install -Dm755 source/nedit "${pkgdir}/usr/bin/nedit"
   install -Dm755 source/nc "${pkgdir}/usr/bin/nedit-client"
   install -Dm644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1"
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index 219a4fff2..53feb35fb 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 182809 2013-04-15 13:34:39Z schiv $
+# $Id: PKGBUILD 191263 2013-07-22 13:50:52Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=rosegarden
-pkgver=13.04
+pkgver=13.06
 pkgrel=1
 pkgdesc="MIDI/audio sequencer and notation editor"
 arch=('i686' 'x86_64')
@@ -23,7 +23,7 @@ optdepends=('lilypond: notation display'
 [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('bcc9be7bf8c3945e0eefdb95dc037f0b')
+md5sums=('67b110277718b6ef2ec098a8fc452340')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -38,7 +38,6 @@ build() {
   export lrdf_CFLAGS LRELEASE LUPDATE
 
   ./configure --prefix=/usr
-
   make
 }
 
diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD
deleted file mode 100644
index cc72b3aef..000000000
--- a/extra/scribus/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 190048 2013-07-13 12:42:28Z svenstaro $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=scribus
-pkgver=1.4.2
-pkgrel=3
-pkgdesc='Desktop publishing software'
-url="http://www.scribus.net/"
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=('cmake' 'boost' 'mesa')
-depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
-         'ghostscript' 'python2' 'aspell' 'boost-libs'
-         'desktop-file-utils' 'shared-mime-info')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb')
-
-options=('!libtool')
-install=install
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i scribus.desktop
-	sed \
-		-e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-		-e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-		-i scribus/plugins/scriptplugin/{samples,scripts}/*
-	install -d ../build
-}
-
-build() {
-	cd "${srcdir}/build"
-	cmake "../${pkgname}-${pkgver}" \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DLIB_SUFFIX=""
-	make
-}
-
-package() {
-	cd "${srcdir}/build"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" "${pkgdir}/usr/share/applications/scribus.desktop"
-}
diff --git a/extra/scribus/install b/extra/scribus/install
deleted file mode 100644
index 8040f715b..000000000
--- a/extra/scribus/install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-	update-desktop-database -q
-}
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}