Thu Oct 20 23:14:58 UTC 2011

8 files changed, 121 insertions, 46 deletions

diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD
index 10c60f529..8619bbbc8 100644
--- a/community/cherokee/PKGBUILD
+++ b/community/cherokee/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56833 2011-10-14 14:02:14Z foutrelis $
+# $Id: PKGBUILD 57044 2011-10-19 09:24:20Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=cherokee
-pkgver=1.2.100
-pkgrel=2
+pkgver=1.2.101
+pkgrel=1
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 arch=('i686' 'x86_64')
 url="http://www.cherokee-project.com/"
@@ -26,13 +26,11 @@ options=('!libtool')
 source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz
         cherokee.rc
         cherokee.logrotate
-        fix-ctk-path-handler-match.patch
-        cherokee-admin-socket-bind.patch)
-sha1sums=('2ed95504c7f156227f9b688a901608be21cf3dff'
+        fix-ctk-path-handler-match.patch)
+sha1sums=('b27f149c7d7111207ac8c3cd8a4856c05490d136'
           '85e24ccc94e6e97858226222ac62cca79c17bc80'
           '266064ab6d3ebd206d7207e1d97b003d2021b2e4'
-          '6d64371dfb23f43c29a24e37e7ae99e08a0c84cc'
-          '3c0b407e7282542657125d7cfb1c64eb3521ed8c')
+          '6d64371dfb23f43c29a24e37e7ae99e08a0c84cc')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD
index 842d04da9..42edd6cb8 100644
--- a/community/distcc/PKGBUILD
+++ b/community/distcc/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 55020 2011-08-31 13:12:35Z spupykin $
+# $Id: PKGBUILD 57046 2011-10-19 10:30:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=distcc
 pkgver=3.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A distributed C, C++, Obj C compiler"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/distcc/"
 license=('GPL')
-depends=('gcc' 'popt')
+depends=('gcc' 'popt' 'avahi')
 makedepends=('gtk2' 'pkgconfig' 'python2')
 optdepends=('gtk2: for distccmon-gnome'
 	    'python2')
@@ -26,9 +26,11 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   [ -f Makefile ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-              --with-gtk \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man
+	--with-gtk \
+	--sysconfdir=/etc \
+	--mandir=/usr/share/man \
+#	--without-avahi \
+
   make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python2
 }
 
diff --git a/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
new file mode 100644
index 000000000..e077a15cf
--- /dev/null
+++ b/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
@@ -0,0 +1,60 @@
+From d30496f52b85f82947bd07b9bd60f8482843ece8 Mon Sep 17 00:00:00 2001
+From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e>
+Date: Tue, 5 Jul 2011 09:23:38 +0000
+Subject: [PATCH 1/2] When using Poppler 0.17.0, I needed to swap the blue and
+ red channels, otherwise the colors (other than black
+ and white) looked wierd.
+
+git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@367 cb4bfb15-1111-0410-82e2-95233c8f1c7e
+---
+ src/PDFDocument.cxx |   20 ++++++++++++++++++++
+ 1 files changed, 20 insertions(+), 0 deletions(-)
+
+diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx
+index df5d75f..63b3513 100644
+--- a/src/PDFDocument.cxx
++++ b/src/PDFDocument.cxx
+@@ -20,6 +20,7 @@
+ #include <time.h>
+ #include <poppler.h>
+ #include <unistd.h>
++#include <algorithm>
+ #include "epdfview.h"
+ 
+ using namespace ePDFView;
+@@ -33,6 +34,24 @@ static PageLayout convertPageLayout (gint pageLayout);
+ static PageMode convertPageMode (gint pageMode);
+ static gchar *getAbsoluteFileName (const gchar *fileName);
+ 
++namespace
++{
++    void
++    convert_bgra_to_rgba (guint8 *data, int width, int height)
++    {
++        using std::swap;
++
++        for (int y = 0; y < height; y++)
++        {
++            for (int x = 0; x < width; x++)
++            {
++                swap(data[0], data[2]);
++                data += 4;
++            }
++        }
++    }
++}
++
+ ///
+ /// @brief Constructs a new PDFDocument object.
+ ///
+@@ -650,6 +669,7 @@ PDFDocument::renderPage (gint pageNum)
+         poppler_page_render (page, context);
+         cairo_destroy(context);
+         cairo_surface_destroy (surface);
++        convert_bgra_to_rgba(renderedPage->getData (), width, height);
+ #else // !HAVE_POPPLER_0_17_0
+         // Create the pixbuf from the data and render to it.
+         GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data (renderedPage->getData (),
+-- 
+1.7.7
+
diff --git a/community/epdfview/PKGBUILD b/community/epdfview/PKGBUILD
index fb88c3d81..9beb8974c 100644
--- a/community/epdfview/PKGBUILD
+++ b/community/epdfview/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56941 2011-10-17 08:20:15Z ibiru $
+# $Id: PKGBUILD 57042 2011-10-19 06:13:49Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Tom K <tomk@runbox.com>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 
 pkgname=epdfview
 pkgver=0.1.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A free lightweight PDF document viewer."
 url="http://www.emma-soft.com/projects/epdfview/"
 arch=('i686' 'x86_64')
@@ -14,14 +14,17 @@ depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2')
 makedepends=('pkgconfig')
 install='epdfview.install'
 source=("http://www.emma-soft.com/projects/${pkgname}/chrome/site/releases/${pkgname}-${pkgver}.tar.bz2"
-        "${pkgname}.desktop.patch")
+        "${pkgname}.desktop.patch"
+        "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch")
 md5sums=('e50285b01612169b2594fea375f53ae4'
-         'fbf22bbabdbb7544db615ac5775d57e2')
+         'fbf22bbabdbb7544db615ac5775d57e2'
+         '7f9ea101a41f5b4e999fd024f423d41f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -Np0 -i "${srcdir}/${pkgname}.desktop.patch"
+  patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD
index f5fb0b6c6..f10780c27 100644
--- a/community/gpsbabel/PKGBUILD
+++ b/community/gpsbabel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56961 2011-10-17 10:14:20Z spupykin $
+# $Id: PKGBUILD 57048 2011-10-19 10:30:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gpsbabel
 pkgver=1.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats"
 arch=('i686' 'x86_64')
 url="http://www.gpsbabel.org"
@@ -14,8 +14,10 @@ depends=('libusb-compat' 'expat')
 makedepends=('fop' 'qt' 'libxml2' 'libxslt')
 optdepends=('qt')
 options=('docs')
-source=(gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz)
-md5sums=('76ea9f7852be2e98aa18976c4697ca93')
+source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz"
+	"gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD")
+md5sums=('76ea9f7852be2e98aa18976c4697ca93'
+         '7bdbd243e29a8831842d31c079f04c45')
 
 build() {
   cd $srcdir/gpsbabel-$pkgver
@@ -31,6 +33,8 @@ package() {
 
   # GUI
   install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin
+  install -Dm644 gui/images/appicon.png $pkgdir/usr/share/pixmaps/gpsbabel.png
+  install -Dm644 $srcdir/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop
 
   # Header install
   mkdir -p $pkgdir/usr/include/gpsbabel
diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD
index 040763b2d..8b58c7f3e 100644
--- a/community/haskell-hslogger/PKGBUILD
+++ b/community/haskell-hslogger/PKGBUILD
@@ -1,41 +1,41 @@
-# $Id: PKGBUILD 50273 2011-06-27 12:56:55Z vegai $
+# $Id: PKGBUILD 57050 2011-10-19 10:31:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
 
 _hkgname=hslogger
 pkgname=haskell-hslogger
-pkgver=1.1.0
-pkgrel=6
+pkgver=1.1.5
+pkgrel=1
 pkgdesc="Versatile logging framework"
-url="http://hackage.haskell.org/package/${_hkgname}"
+url="http://hackage.haskell.org/package/hslogger"
 license=('LGPL')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
+depends=('ghc' 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
 options=('strip')
 install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-md5sums=('8039e079338dae19e1273bbd73332014')
+source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz)
+md5sums=('cd3dfd6f88176bd53b333ea29130a857')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \
+  cd ${srcdir}/hslogger-${pkgver}
+  runhaskell Setup configure -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \
 	--enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \
 	--enable-library-profiling
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
+  _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
+  depends=("ghc=${_ghcver}" 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2')
 
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
+  cd ${srcdir}/hslogger-${pkgver}
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/hslogger
+  runhaskell Setup copy --destdir=${pkgdir}
 }
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index fc2610b7d..00e8f4774 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -1,10 +1,12 @@
+# $Id: PKGBUILD 57055 2011-10-19 13:43:09Z bisson $
+
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=unbound
 pkgver=1.4.13
-pkgrel=1
+pkgrel=2
 pkgdesc='Validating, recursive, and caching DNS resolver'
 arch=('i686' 'x86_64')
 url='http://unbound.net/'
@@ -19,7 +21,7 @@ source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
         'rc.d')
 sha1sums=('834ccfd1cb41a44f53b33f8338a8f9cc68febaf7'
           '5d473ec2943fd85367cdb653fcd58e186f07383f'
-          'a0c8c496d71d43ed9e09b170d3df836dfb096480')
+          'dc96e772f467b32555df21d16fdb15e98194c228')
 
 install=install
 
diff --git a/community/unbound/rc.d b/community/unbound/rc.d
index f392450ae..b5b6466de 100644
--- a/community/unbound/rc.d
+++ b/community/unbound/rc.d
@@ -21,6 +21,12 @@ stop)
 	&& { rm_daemon $name; stat_done; } \
 	|| { stat_fail; exit 1; }
 	;;
+reload)
+	stat_busy "Reloading $name daemon"
+	[[ -n "$PID" ]] && kill -SIGHUP $PID &>/dev/null \
+	&& { stat_done; } \
+	|| { stat_fail; exit 1; }
+	;;
 restart)
 	$0 stop
 	sleep 2