Wed Dec 7 23:14:52 UTC 2011

13 files changed, 139 insertions, 37 deletions

diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 3353e15d4..14482efbd 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 143076 2011-11-22 12:47:07Z giovanni $
+# $Id: PKGBUILD 144467 2011-12-06 11:17:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10683
+pkgver=10688
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('c9adbecbbec7831fc42b177c8b548e05')
+md5sums=('0bb387c6aafa146e75130e1537a64066')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index b5ccdeb4d..bf86e27d1 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144362 2011-12-05 08:15:00Z bisson $
+# $Id: PKGBUILD 144487 2011-12-06 22:43:42Z bisson $
 
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
@@ -8,13 +8,16 @@
 
 pkgname=bitlbee
 pkgver=3.0.4
-pkgrel=1
+pkgrel=3
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
-arch=('i686' 'x86_64')
 url='http://www.bitlbee.org/'
 license=('GPL')
-depends=('openssl' 'glib2' 'libotr')
-optdepends=('xinetd: to run bitlbee through xinetd')
+arch=('i686' 'x86_64')
+depends=('openssl' 'glib2')
+makedepends=('asciidoc' 'libotr')
+optdepends=('skype4py: to use skyped'
+            'libotr: for OTR encryption support'
+            'xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
 	'xinetd'
 	'rc.d')
@@ -28,14 +31,16 @@ install=install
 build() { 
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	./configure --prefix=/usr \
+	./configure \
+		--prefix=/usr \
 		--etcdir=/etc/bitlbee \
 		--pidfile=/var/run/bitlbee/bitlbee.pid \
 		--ipcsocket=/var/run/bitlbee/bitlbee.sock \
 		--systemdsystemunitdir=/lib/systemd/system \
 		--ssl=openssl \
 		--strip=0 \
-		--otr=1 \
+		--otr=plugin \
+		--skype=plugin \
 
 	make
 }
diff --git a/extra/bitlbee/install b/extra/bitlbee/install
index 7b43c7885..b0dd5511d 100644
--- a/extra/bitlbee/install
+++ b/extra/bitlbee/install
@@ -10,4 +10,5 @@ post_upgrade() {
 post_remove() {
 	getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
 	getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
+	true
 }
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 1d6e309f3..b158cec54 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 144384 2011-12-05 13:01:04Z ibiru $
+# $Id: PKGBUILD 144475 2011-12-06 14:25:28Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=colord
 pkgver=0.1.15
-pkgrel=2
+pkgrel=3
 pkgdesc="Color daemon"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/software/colord"
 license=('GPL2')
-depends=('lcms2' 'libgusb' 'polkit' 'sane' 'sqlite3' 'udev')
+depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev')
 makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x')
-optdepends=('shared-color-profiles: color profiles')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
+source=($url/releases/$pkgname-$pkgver.tar.xz
+        scan_only_color_profile_dir.patch)
 options=('!libtool')
-sha1sums=('e83a68add3fac9c677829925794ee353743dc9c8')
+sha1sums=('e83a68add3fac9c677829925794ee353743dc9c8'
+          'b4b8ea1008ecfdc1084ec69d647127587a2a87f7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/scan_only_color_profile_dir.patch"
   ./configure --prefix=/usr \
     --sysconfdir=/etc --libexecdir=/usr/lib/colord \
     --localstatedir=/var --disable-static
diff --git a/extra/colord/scan_only_color_profile_dir.patch b/extra/colord/scan_only_color_profile_dir.patch
new file mode 100644
index 000000000..0591fc420
--- /dev/null
+++ b/extra/colord/scan_only_color_profile_dir.patch
@@ -0,0 +1,35 @@
+From 78b6dc7dbf865df6b0d30526293591fe5773029a Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Tue, 6 Dec 2011 09:49:49 +0000
+Subject: [PATCH] If /usr/share/color appears at runtime, don't rescan the
+ parent dir
+
+Resolves https://bugs.freedesktop.org/show_bug.cgi?id=43542
+---
+ src/cd-profile-store.c |   10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/cd-profile-store.c b/src/cd-profile-store.c
+index ecad474..c662351 100644
+--- a/src/cd-profile-store.c
++++ b/src/cd-profile-store.c
+@@ -260,8 +260,14 @@ cd_profile_store_file_monitor_changed_cb (GFileMonitor *monitor,
+ 	/* just rescan the correct directory */
+ 	parent = g_file_get_parent (file);
+ 	parent_path = g_file_get_path (parent);
+-	g_debug ("CdProfileStore: %s was added, rescanning %s", path, parent_path);
+-	cd_profile_store_search_path (profile_store, parent_path);
++	if (g_strcmp0 (parent_path, DATADIR) == 0) {
++		g_debug ("CdProfileStore: %s was added, rescanning", path);
++		cd_profile_store_search_path (profile_store, path);
++	} else {
++		g_debug ("CdProfileStore: %s was added, rescanning parent %s",
++			 path, parent_path);
++		cd_profile_store_search_path (profile_store, parent_path);
++	}
+ out:
+ 	if (parent != NULL)
+ 		g_object_unref (parent);
+-- 
+1.7.6
+
diff --git a/extra/convertlit/PKGBUILD b/extra/convertlit/PKGBUILD
new file mode 100644
index 000000000..4c7477666
--- /dev/null
+++ b/extra/convertlit/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 144473 2011-12-06 12:35:16Z giovanni $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: gDD (usrgdd | gmail)
+# Contributor: cantabile
+
+pkgname=convertlit
+pkgver=1.8
+pkgrel=6
+pkgdesc="An extractor/converter for .LIT eBooks"
+arch=('i686' 'x86_64')
+url="http://www.convertlit.com/"
+license=('GPL')
+depends=('glibc')
+makedepends=('libtommath')
+source=("http://www.convertlit.com/clit18src.zip")
+md5sums=('d691d4729485fe5d73e3f0937d8fb42e')
+
+build() {
+  cd ${srcdir}/lib
+  make 
+
+  cd ../clit18
+  sed -i 's|../libtommath-0.30/|/usr/lib/|' Makefile
+  make
+}
+
+package() {
+  cd ${srcdir}/clit18
+
+  install -Dm755 clit "$pkgdir/usr/bin/clit"
+}
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 3cc2150a6..55c6fd5fd 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 136084 2011-08-22 14:13:59Z dan $
+# $Id: PKGBUILD 144489 2011-12-06 22:57:33Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.7.5.1
+pkgver=1.7.6
 pkgrel=1
 license=('GPL')
 arch=(i686 x86_64)
 url="http://www.doxygen.org/"
 makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra')
 source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('f5355c442c5bc2481dbef7fdea8f0556')
-sha1sums=('15671defd1eefe255aa564b6f3097e30ab07ff55')
+md5sums=('79f67eea3d43a5c9964194786d786f37')
+sha1sums=('6c63ece66875c9312b76bfe11d688e1b1ae2e3bb')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/most/PKGBUILD b/extra/most/PKGBUILD
index 0cea27712..6d91e7d02 100644
--- a/extra/most/PKGBUILD
+++ b/extra/most/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 125648 2011-05-27 17:52:54Z stephane $
-# Maintainer: juergen <juergen@archlinux.org>
+# $Id: PKGBUILD 144477 2011-12-06 14:33:19Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: juergen <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=most
 pkgver=5.0.0a
-pkgrel=3
+pkgrel=4
 pkgdesc="A terminal pager similar to 'more' and 'less'"
 arch=('i686' 'x86_64')
 depends=('slang')
 license=('GPL')
-url="ftp://space.mit.edu/pub/davis/most/"
-source=(ftp://space.mit.edu/pub/davis/${pkgname}/${pkgname}-${pkgver}.tar.gz most-debian.patch)
+url="http://www.jedsoft.org/most/index.html"
+source=(ftp://space.mit.edu/pub/davis/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        most-debian.patch
+        most-leak-fd.patch)
 sha1sums=('99eedb7169754b9a47c7755ac48949d76531e3b2'
-          '937796040c69bae3bf735fa3cd734775c582e7d0')
-
+          '937796040c69bae3bf735fa3cd734775c582e7d0'
+          'c5713e1278febdd0ed434e6e3044feb220b5d525')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i ../most-debian.patch
+  patch -Np1 -i ../most-leak-fd.patch
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
diff --git a/extra/most/most-leak-fd.patch b/extra/most/most-leak-fd.patch
new file mode 100644
index 000000000..c8cd2af09
--- /dev/null
+++ b/extra/most/most-leak-fd.patch
@@ -0,0 +1,14 @@
+--- most-5.0.0a.orig/src/most.c 2007-06-03 00:03:59.000000000 -0400
++++ most-5.0.0a/src/most.c	2010-12-31 04:42:08.000000000 -0500
+@@ -321,9 +321,11 @@
+ 	  {
+ 	     fprintf (stderr, "fwrite returned %d, errno = %d\n",
+ 		      m, errno);
++	     (void) fclose (fp);
+ 	     exit (1);
+ 	  }
+      }
++   (void) fclose (fp);
+ }
+ 
+ void most_initialize_most (void)
diff --git a/extra/mpd/ChangeLog b/extra/mpd/ChangeLog
index 40ba5e4e7..b22d95f8d 100644
--- a/extra/mpd/ChangeLog
+++ b/extra/mpd/ChangeLog
@@ -1,3 +1,6 @@
+2011-12-05 Angel Velasquez <angvp@archlinux.org>
+    * Version bump to 0.16.6
+
 2011-09-03 Angel Velasquez <angvp@archlinux.org>
     * Version bump to 0.16.4
     * Removed the patch mpd-0.16.3_ffmpeg_sigsegv.patch since is included upstream
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 77b1cecc4..4710dcecb 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 142638 2011-11-12 17:15:35Z ibiru $
+# $Id: PKGBUILD 144459 2011-12-06 06:52:26Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=mpd
-pkgver=0.16.5
-pkgrel=2
+pkgver=0.16.6
+pkgrel=1
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -19,7 +19,7 @@ install=${pkgname}.install
 changelog=ChangeLog
 source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2"
 'mpd') 
-md5sums=('f7564cff12035f6a1112cce770655df7'
+md5sums=('5489dd327fba12c67f01558d2cfa6d57'
          'e5669c2bff4031928531e52475addeb1')
 
 build() {
diff --git a/extra/nicotine/PKGBUILD b/extra/nicotine/PKGBUILD
index 0be93063f..c37ea7190 100644
--- a/extra/nicotine/PKGBUILD
+++ b/extra/nicotine/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 108389 2011-01-30 22:14:15Z angvp $
+# $Id: PKGBUILD 144457 2011-12-06 06:35:08Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: Andrew Wright <andreww@photism.org>
 
 pkgname=nicotine
 pkgver=1.2.16
-pkgrel=2
+pkgrel=3
 pkgdesc="Soulseek music-sharing client, written in python"
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('pygtk>=2.14.1' 'mutagen' 'python-geoip>=1.2.4')
+depends=('pygtk>=2.14.1' 'mutagen')
 conflicts=(nicotine-plus)
 replaces=(nicotine-plus)
 url="http://sourceforge.net/projects/nicotine-plus/"
@@ -18,6 +18,9 @@ optdepends=('python-sexy: To enable spell checking'
 	    'python-geoip: to enable Geographical blocker')
 md5sums=('ac7433c21ef619a37e079a7ae68da94a')
 
+
+
+
 build() {
   cd ${srcdir}/${pkgname}+-${pkgver}
   sed -i -e "s/Icon=nicotine-plus/Icon=nicotine-plus-32px/" files/nicotine.desktop # Fixing FS#22476
@@ -25,6 +28,10 @@ build() {
   cd trayicon
   python2 autogen.py
   make 
+}
+
+package() {
+  cd ${srcdir}/${pkgname}+-${pkgver}/trayicon
   make DESTDIR=${pkgdir} install 
   ln -s nicotine.py ${pkgdir}/usr/bin/nicotine 
 }
diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD
index 52b15ee9d..dcf96039e 100644
--- a/extra/polkit/PKGBUILD
+++ b/extra/polkit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136695 2011-08-31 14:31:56Z jgc $
+# $Id: PKGBUILD 144479 2011-12-06 17:28:58Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=polkit
-pkgver=0.102
+pkgver=0.103
 pkgrel=1
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ replaces=('policykit')
 options=('!libtool')
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
         polkit.pam)
-md5sums=('a3726bdb9728c103e58f62131e26693a'
+md5sums=('aaacf2ef18774ea8a825a426a7cfe763'
          '6564f95878297b954f0572bc1610dd15')
 
 build() {