Mon May 20 00:57:42 PDT 2013

8 files changed, 66 insertions, 25 deletions

diff --git a/community/flashrom/PKGBUILD b/community/flashrom/PKGBUILD
index 1b6db94b1..cc7bb1cd5 100644
--- a/community/flashrom/PKGBUILD
+++ b/community/flashrom/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74911 2012-08-09 12:06:08Z giovanni $
+# $Id: PKGBUILD 91099 2013-05-19 13:18:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Cilyan Olowen <gaknar@gmail.com>
 # Contributor: fill <mailbox@fillo.ru>
@@ -6,7 +6,7 @@
 
 pkgname=flashrom
 pkgver=0.9.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Utility for reading, writing, erasing and verifying flash ROM chips"
 url="http://www.flashrom.org/"
 arch=('i686' 'x86_64')
@@ -19,6 +19,7 @@ md5sums=('407e836c0a2b17ec76583cb6809f65e5')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  sed -i "s:sbin:bin:g" Makefile
   make
 }
 
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index cb8d4df7e..18d9ef0a2 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 88703 2013-04-21 22:24:13Z heftig $
+# $Id: PKGBUILD 91084 2013-05-19 01:47:07Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 pkgname=gnome-packagekit
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ optdepends=('polkit-gnome: required for privileged actions'
 options=('!emptydirs' '!libtool')
 install="$pkgname.install"
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('fe0a6368ee5a67419c9332a3b0031ecf1e3e92aa2fe0eb30aa4273f6224d070a')
+sha256sums=('f13481d477a47295fa204b73ae7590f61d5576a8c889e5644cee0bc1f5cf530c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index ba4a392af..bed9955a3 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88701 2013-04-21 22:24:09Z heftig $
+# $Id: PKGBUILD 91086 2013-05-19 01:51:02Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 _pkgname=gnome-settings-daemon
 pkgname=$_pkgname-updates
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="Updates plugin for the GNOME Settings daemon"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ install=$_pkgname.install
 url="http://www.gnome.org"
 source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
 	'arch.patch')
-sha256sums=('367a770ec7affff3c85a43bc39ced5a02a1b1761780d954329f6b21c0f2efcee'
+sha256sums=('e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be'
 	    '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea')
 
 build() {
diff --git a/community/kvpnc/PKGBUILD b/community/kvpnc/PKGBUILD
index e9039de9c..947ebb3ea 100644
--- a/community/kvpnc/PKGBUILD
+++ b/community/kvpnc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89963 2013-05-06 10:41:26Z spupykin $
+# $Id: PKGBUILD 91108 2013-05-19 18:46:49Z dreisner $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Danial Olsen <do@meyl.fo>
 
 pkgname=kvpnc
 pkgver=0.9.6a
-pkgrel=3
+pkgrel=4
 pkgdesc="A KDE Desktop Environment frontend for various vpn clients"
 arch=(i686 x86_64)
 url="http://home.gna.org/kvpnc/"
@@ -12,12 +12,21 @@ license=("GPL")
 depends=('kdelibs' 'hicolor-icon-theme')
 makedepends=('cmake' 'automoc4' 'optipng')
 install=kvpnc.install
-source=(http://download.gna.org/$pkgname/$pkgname-${pkgver}-kde4.tar.bz2)
-md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7')
+source=(http://download.gna.org/$pkgname/$pkgname-${pkgver}-kde4.tar.bz2
+        "vpnc-paths.patch")
+md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7'
+         '4bf6a10c7be84656723183b876cbaf9d')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver-kde4"
+
+  patch -Np0 <"$srcdir/vpnc-paths.patch"
+
+  sed -i '1,1i#include <unistd.h>' src/kvpnc.cpp
+}
 
 build() {
   cd $srcdir
-  sed -i '1,1i#include <unistd.h>' ${pkgname}-${pkgver}-kde4/src/kvpnc.cpp
 
   export LDFLAGS=-lX11
   mkdir build
diff --git a/community/kvpnc/vpnc-paths.patch b/community/kvpnc/vpnc-paths.patch
new file mode 100644
index 000000000..5dc66638d
--- /dev/null
+++ b/community/kvpnc/vpnc-paths.patch
@@ -0,0 +1,20 @@
+--- src/kvpncconfig.cpp.orig	2013-05-19 14:37:11.867517045 -0400
++++ src/kvpncconfig.cpp	2013-05-19 14:37:31.702107829 -0400
+@@ -865,7 +865,7 @@
+     enableDebugXl2tpdtunnel = QVariant(configgroup.readEntry("EnableDebugXl2tpdtunnel", false)).toBool();
+ 
+ 
+-    pathToVpnc = configgroup.readEntry("Path to vpnc-bin", "/usr/sbin/vpnc");
++    pathToVpnc = configgroup.readEntry("Path to vpnc-bin", "/usr/bin/vpnc");
+     pathToCiscoVpnc = configgroup.readEntry("Path to vpnclient", "/usr/local/bin/vpnclient");
+     pathToSetkey = configgroup.readEntry("Path to setkey", "/usr/sbin/setkey");
+     pathToRacoon = configgroup.readEntry("Path to racoon", "/usr/sbin/racoon");
+@@ -1489,7 +1489,7 @@
+ void KVpncConfig::checkStandardPathValues()
+ {
+     if (pathToVpnc.isEmpty())
+-        pathToVpnc = "/usr/sbin/vpnc";
++        pathToVpnc = "/usr/bin/vpnc";
+ 
+     if (pathToCiscoVpnc.isEmpty())
+         pathToCiscoVpnc = "/usr/local/bin/vpnclient";
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index 76d023209..b2e855e55 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90243 2013-05-09 23:40:12Z arodseth $
+# $Id: PKGBUILD 91092 2013-05-19 10:48:50Z arodseth $
 # Maintainer:  Alexander Rødseth <rodseth@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -7,8 +7,8 @@
 # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 
 pkgname=midori
-pkgver=0.5.0
-pkgrel=2
+pkgver=0.5.2
+pkgrel=1
 pkgdesc='Lightweight web browser based on Gtk WebKit'
 arch=('x86_64' 'i686')
 url='http://www.twotoasts.de/index.php?/pages/midori_summary.html'
@@ -20,7 +20,7 @@ optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support'
             'aria2: download utility')
 options=('!emptydirs')
 source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2")
-sha256sums=('d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0')
+sha256sums=('a9c5cb4606e8e4967a2b980caa9ada25623c50d927a302b6bf73eeac5815c97c')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index fd860a96f..d46531006 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83602 2013-02-03 16:05:49Z giovanni $
+# $Id: PKGBUILD 91101 2013-05-19 13:42:04Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
 pkgver=1.8.8
-pkgrel=2
+pkgrel=3
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64')
 url="https://alioth.debian.org/projects/pcsclite/"
@@ -21,6 +21,7 @@ build() {
   sed -i -e "s:python:python2:g" src/spy/pcsc-spy
 
   ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
               --enable-libudev \
               --sysconfdir=/etc \
               --enable-ipcdir=/run/pcscd \
diff --git a/community/tuxpaint/PKGBUILD b/community/tuxpaint/PKGBUILD
index 0e5b9d335..f83770517 100644
--- a/community/tuxpaint/PKGBUILD
+++ b/community/tuxpaint/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90097 2013-05-06 19:39:46Z foutrelis $
+# $Id: PKGBUILD 91097 2013-05-19 11:35:37Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Sergio Jovani Guzman <moret.sjg@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=tuxpaint
 pkgver=0.9.21
-pkgrel=8
+pkgrel=9
 pkgdesc='Drawing program designed for young children'
 arch=('x86_64' 'i686')
 url='http://www.tuxpaint.org/'
@@ -14,7 +14,7 @@ license=('GPL')
 backup=('etc/tuxpaint/tuxpaint.conf')
 depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango'
          'libpaper' 'librsvg')
-makedepends=('setconf')
+makedepends=('setconf' 'optipng')
 optdepends=('tuxpaint-stamps: more stamps'
             'tuxpaint-conf: configuration manager')
 source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz"
@@ -22,18 +22,28 @@ source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.
 sha256sums=('6d4f2b981643b5c937708e5e6cdaf318ae7b5562375327b4b1cb84611e65ede9'
             '6d572467fce710c9323ba53bb3309eb7ed1401b4fee2c1f56533e871558a7f20')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;'
+  sed -i 's:# fu:fu:' src/tuxpaint.conf
+
   # python2 fix
   for f in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do
     sed -i '0,/on/s//on2/' $f
   done
 
+  # libpng15 fix
   patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch
   sed -i 's:$(ARCH_LINKS):$(ARCH_LINKS) -lpng:' Makefile
-  setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;'
-  sed -i 's:# fu:fu:' src/tuxpaint.conf
+
+  # libpng16 fix
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   make PREFIX=/usr
 }