summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
Diffstat (limited to 'community')
-rw-r--r--community/awesome/01-fix_glib2_build.patch31
-rw-r--r--community/awesome/PKGBUILD64
-rw-r--r--community/awesome/awesome.desktop7
-rw-r--r--community/bitcoin/PKGBUILD20
-rw-r--r--community/blender/PKGBUILD8
-rw-r--r--community/cuda-sdk/PKGBUILD37
-rw-r--r--community/dos2unix/PKGBUILD5
-rw-r--r--community/go/PKGBUILD48
-rw-r--r--community/gtkwave/PKGBUILD6
-rw-r--r--community/gtranslator/PKGBUILD7
-rw-r--r--community/gtranslator/gtranslator.changelog3
-rw-r--r--community/guichan/PKGBUILD31
-rw-r--r--community/i3lock/PKGBUILD8
-rw-r--r--community/i3status/PKGBUILD6
-rw-r--r--community/ipset/PKGBUILD33
-rw-r--r--community/ipset/ipset.conf3
-rw-r--r--community/ipset/ipset.rc39
-rw-r--r--community/ipset/ipset.service12
-rw-r--r--community/ipset/ipset.systemd8
-rw-r--r--community/kid3/PKGBUILD14
-rw-r--r--community/kid3/kid3.changelog3
-rw-r--r--community/lazarus/ChangeLog4
-rw-r--r--community/lazarus/PKGBUILD7
-rw-r--r--community/libquvi/PKGBUILD11
-rw-r--r--community/luajit/PKGBUILD9
-rw-r--r--community/lxdm/PKGBUILD10
-rw-r--r--community/lxdm/greeter-session.patch13
-rwxr-xr-xcommunity/mathomatic/PKGBUILD6
-rw-r--r--community/minidlna/PKGBUILD5
-rw-r--r--community/mosh/PKGBUILD33
-rw-r--r--community/myodbc/PKGBUILD11
-rw-r--r--community/mythplugins/PKGBUILD18
-rw-r--r--community/mythplugins/mythplugins-mythweb.install4
-rw-r--r--community/mythplugins/php54.patch35
-rw-r--r--community/onboard/PKGBUILD41
-rw-r--r--community/onboard/fix_encoding_mismatch.patch187
-rw-r--r--community/onboard/fix_unicode_translations.patch247
-rw-r--r--community/onboard/onboard.install13
-rw-r--r--community/openbox/PKGBUILD52
-rw-r--r--community/openbox/movesize.patch19
-rw-r--r--community/openbox/title-matching.patch11
-rw-r--r--community/php-geoip/PKGBUILD6
-rw-r--r--community/php-memcache/PKGBUILD4
-rw-r--r--community/php-memcached/PKGBUILD4
-rw-r--r--community/pigeonhole/PKGBUILD4
-rw-r--r--community/powertop/PKGBUILD30
-rw-r--r--community/powertop/powertop.changelog2
-rw-r--r--community/pptpd/PKGBUILD11
-rw-r--r--community/pptpd/unrecognized-opt.patch13
-rw-r--r--community/python2-virtkey/PKGBUILD29
-rw-r--r--community/qtcreator/PKGBUILD11
-rw-r--r--community/quvi/PKGBUILD8
-rw-r--r--community/r8168-lts/PKGBUILD10
-rw-r--r--community/roxterm/PKGBUILD8
-rw-r--r--community/shotwell/PKGBUILD6
-rw-r--r--community/soundkonverter/PKGBUILD6
-rw-r--r--community/sslh/PKGBUILD22
-rw-r--r--community/sslh/sslh.conf2
-rw-r--r--community/sslh/sslh.rc33
-rw-r--r--community/xapian-core/PKGBUILD6
-rw-r--r--community/xdebug/PKGBUILD6
61 files changed, 1125 insertions, 225 deletions
diff --git a/community/awesome/01-fix_glib2_build.patch b/community/awesome/01-fix_glib2_build.patch
new file mode 100644
index 000000000..aeab63fbb
--- /dev/null
+++ b/community/awesome/01-fix_glib2_build.patch
@@ -0,0 +1,31 @@
+From d3d8160e273b56d0262d2570cfa6bcb76b9ea771 Mon Sep 17 00:00:00 2001
+From: Thomas Moschny <thomas.moschny@gmx.de>
+Date: Wed, 14 Dec 2011 20:00:53 +0100
+Subject: [PATCH] Fix build with glib2 2.31.0
+
+Starting with glib2 2.31.0, It is no longer possible to
+include individual headers (like "ghash.h") -- you must
+#include <glib.h>.
+
+Signed-off-by: Thomas Moschny <thomas.moschny@gmx.de>
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+---
+ spawn.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/spawn.c b/spawn.c
+index 3c8cf07..a6d6c5e 100644
+--- a/spawn.c
++++ b/spawn.c
+@@ -24,7 +24,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+
+-#include <glib/gspawn.h>
++#include <glib.h>
+
+ #include "spawn.h"
+ #include "screen.h"
+--
+1.7.2.5
+
diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD
new file mode 100644
index 000000000..b67f9c548
--- /dev/null
+++ b/community/awesome/PKGBUILD
@@ -0,0 +1,64 @@
+# $Id: PKGBUILD 70615 2012-05-12 21:06:01Z ibiru $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Contributor: xduugu
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Vesa Kaihlavirta
+
+pkgname=awesome
+pkgver=3.4.11
+pkgrel=4
+pkgdesc='Highly configurable framework window manager'
+arch=('i686' 'x86_64')
+url='http://awesome.naquadah.org/'
+license=('GPL2')
+depends=(
+ 'cairo'
+ 'dbus'
+ 'imlib2'
+ 'libev'
+ 'libxdg-basedir'
+ 'lua'
+ 'pango'
+ 'startup-notification'
+ 'xcb-util-image'
+ 'xcb-util-keysyms'
+ 'xcb-util-wm'
+ 'xorg-xmessage'
+)
+makedepends=(
+ 'asciidoc'
+ 'cmake'
+ 'docbook-xsl'
+ 'doxygen'
+ 'gperf'
+ 'imagemagick'
+ 'luadoc'
+ 'xmlto'
+)
+optdepends=(
+ 'rlwrap: readline support for awesome-client'
+ 'feh: image background setter for awsetbg'
+)
+provides=('notification-daemon')
+source=("$url/download/$pkgname-$pkgver.tar.xz"
+ "$pkgname.desktop"
+ '01-fix_glib2_build.patch')
+md5sums=('d6aa71334b5cd4ef63ce69d6c612ecf2'
+ '0fdbeec43d211c6750041d7e37611a6a'
+ 'baa179074c36e26ef156ebb2060bfd5c')
+
+build() {
+ cd $pkgname-$pkgver
+ # to remove in 3.4.12
+ patch -N -p1 -i ../01-fix_glib2_build.patch
+ make CMAKE_ARGS=' -DPREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE'
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ # install desktop file so you can start awesome from your login manager
+ install -Dm644 ../awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/awesome/awesome.desktop b/community/awesome/awesome.desktop
new file mode 100644
index 000000000..453399c6e
--- /dev/null
+++ b/community/awesome/awesome.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Awesome
+Comment=Highly configurable framework window manager
+Type=XSession
+Exec=awesome
+TryExec=awesome
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index 00d2cc85f..fc1930db8 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 69400 2012-04-15 20:25:26Z tredaelli $
+# $Id: PKGBUILD 70477 2012-05-09 10:21:50Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: shahid <helllamer@gmail.com>
pkgbase=bitcoin
pkgname=('bitcoin-daemon' 'bitcoin-qt')
-pkgver=0.6.0
+pkgver=0.6.2
+_commit=06d764e
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.bitcoin.org/"
@@ -12,21 +13,18 @@ makedepends=('boost' 'automoc4' 'miniupnpc')
conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
license=('MIT')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}-linux.tar.gz")
-sha256sums=('13faa8b7c8c9ce3518ebe31ff2d97920f4feb4f06c1d08455b272fdaaeeb1f97')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/bitcoin/$pkgbase/tarball/v$pkgver")
+sha256sums=('03c72d7bcdec70cb88033abb785b50686880b95d4768e8586891a9728d498c5a')
build() {
- cd "$srcdir/$pkgbase-$pkgver-linux/src"
-
- # FIXME GCC 4.7.0 is too strict
- echo "QMAKE_CXXFLAGS += $CXXFLAGS -fpermissive" >> bitcoin-qt.pro
+ cd "$srcdir/bitcoin-$pkgbase-$_commit"
# and make qt gui
qmake
make
# make bitcoind
- make -f makefile.unix -C src CXXFLAGS="$CXXFLAGS -fpermissive" USE_UPNP=1
+ make -f makefile.unix -C src CXXFLAGS="$CXXFLAGS" USE_UPNP=1
}
@@ -35,7 +33,7 @@ package_bitcoin-qt() {
depends=(boost-libs qt miniupnpc)
install=bitcoin-qt.install
- cd "$srcdir/$pkgbase-$pkgver-linux/src"
+ cd "$srcdir/bitcoin-$pkgbase-$_commit"
install -Dm755 bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt
install -Dm644 contrib/debian/bitcoin-qt.desktop \
"$pkgdir"/usr/share/applications/bitcoin.desktop
@@ -49,7 +47,7 @@ package_bitcoin-daemon() {
pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon"
depends=(boost-libs miniupnpc openssl)
- cd "$srcdir/$pkgbase-$pkgver-linux/src"
+ cd "$srcdir/bitcoin-$pkgbase-$_commit"
install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind
install -Dm644 contrib/debian/examples/bitcoin.conf \
"$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf"
diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD
index de29d6970..79bbbdae8 100644
--- a/community/blender/PKGBUILD
+++ b/community/blender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69995 2012-04-28 00:27:10Z svenstaro $
+# $Id: PKGBUILD 70565 2012-05-11 20:09:37Z svenstaro $
# Contributor: John Sowiak <john@archlinux.org>
# Contributor: tobias <tobias@archlinux.org>
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
@@ -13,9 +13,9 @@
_svn=false
pkgname=blender
-pkgver=2.63
+pkgver=2.63a
pkgrel=1
-epoch=3
+epoch=4
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('i686' 'x86_64')
license=('GPL')
@@ -30,7 +30,7 @@ options=(!strip)
install=blender.install
if [ $_svn = false ]; then
source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
- md5sums=('1cc18a9074ba63313a5711887de76c54')
+ md5sums=('31a60b3ce5466d965cb7e2648995e092')
else
source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
md5sums=('7579d1139d0d6025df8afcfca64a65c4')
diff --git a/community/cuda-sdk/PKGBUILD b/community/cuda-sdk/PKGBUILD
new file mode 100644
index 000000000..152b3add9
--- /dev/null
+++ b/community/cuda-sdk/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Thomas Jost <schnouki@schnouki.net>
+# Contributor: Carson Reynolds <carson@k2.t.u-tokyo.ac.jp>
+
+pkgname=cuda-sdk
+pkgver=4.2.9
+pkgrel=1
+pkgdesc="NVIDIA's GPU programming sdk"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/object/cuda_home.html"
+license=('custom')
+depends=('cuda-toolkit' 'nvidia' 'opencl-nvidia' 'freeglut' 'libxmu')
+makedepends=('perl')
+source=(http://developer.download.nvidia.com/compute/cuda/4_2/rel/sdk/gpucomputingsdk_${pkgver}_linux.run)
+md5sums=('693d969aca8bb06a5a1d51ef5c3ca04b')
+
+build() {
+ cd "$srcdir"
+
+ sh gpucomputingsdk_${pkgver}_linux.run --noexec --keep --nox11 --nochown --target sdk >/dev/null
+ cd sdk
+
+ find . -name *.cu | xargs sed -i "1 i #undef _GLIBCXX_ATOMIC_BUILTINS"
+ find . -name *.cu | xargs sed -i "1 i #undef _GLIBCXX_USE_INT128"
+
+ #find . -name 'Makefile*' -exec sed -i 's/^\tmake /\t$(MAKE) /g; s/^\t@make /\t@$(MAKE) /g' "{}" +
+
+ # Sadly we need to install this first and compile afterwards, this is why we only have build()
+ install -dm755 "$pkgdir/opt/cuda-sdk"
+ ./install-sdk-linux.pl --prefix="$pkgdir/opt/cuda-sdk" --cudaprefix="/opt/cuda-toolkit" >/dev/null
+
+ cd "$pkgdir/opt/cuda-sdk"
+ make CUDA_INSTALL_PATH=/opt/cuda-toolkit NO_MPI=1
+ # simpleMPI sometimes causes segfaults when building...
+
+ install -Dm755 "$pkgdir/opt/cuda-sdk/License.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/community/dos2unix/PKGBUILD b/community/dos2unix/PKGBUILD
index e85d40e06..0a8bbf17f 100644
--- a/community/dos2unix/PKGBUILD
+++ b/community/dos2unix/PKGBUILD
@@ -1,9 +1,10 @@
+# $Id: PKGBUILD 70487 2012-05-09 15:02:28Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski
# Contributor: Renato Garcia <fgar.renatoATgmailDOTcom>
# Contributor: Gerson E. Ruotolo <gersonruotolo@globo.com>
pkgname=dos2unix
-pkgver=5.3.3
+pkgver=6.0
pkgrel=1
pkgdesc='Text file format converter'
arch=('i686' 'x86_64')
@@ -13,7 +14,7 @@ depends=('glibc')
makedepends=('perl')
conflicts=('hd2u')
source=("http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f352d648b97197c8a786eccc832764d8')
+md5sums=('2fc8d6ebe9f1a519b15ebe0850e9aabd')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 4be7ea328..16f3154b8 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70381 2012-05-05 13:14:13Z arodseth $
+# $Id: PKGBUILD 70575 2012-05-11 22:56:57Z remy $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Andres Perera <andres87p gmail>
@@ -9,36 +9,33 @@
pkgname=go
pkgver=1.0.1
-pkgrel=1
+pkgrel=3
epoch=2
pkgdesc='Google Go compiler and tools (release version)'
arch=('x86_64' 'i686')
url="http://golang.org/"
license=('custom')
-depends=('perl' 'ed' 'gawk')
+depends=('perl' 'gawk')
makedepends=('inetutils')
options=('!strip' '!emptydirs')
install=go.install
-source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz"
- "$pkgname.run"
- "$pkgname.sh")
-sha1sums=('fc8a6d6725f7f2bf7c94685c5fd0880c9b7f67f6'
- '655754d95688294b0cf2334a1155432884f92859'
- 'a760c32cbad5a013f384a086efb3b8b8fd88794f')
+source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz")
+sha1sums=('fc8a6d6725f7f2bf7c94685c5fd0880c9b7f67f6')
build() {
cd "$srcdir/$pkgname"
-
- export GOROOT="$srcdir/$pkgname"
- export GOOS_FINAL="/usr/lib/go"
+ export GOROOT_FINAL="/usr/lib/go"
export GOOS=linux
- export GOBIN="$GOROOT/bin"
- export PATH="$GOBIN:$PATH"
- mkdir -p "$GOROOT/bin"
- cd "$GOROOT/src"
+ cd src && bash make.bash
+}
- . ./make.bash
+check() {
+ # TestSimpleMulticastListener will fail in standard chroot.
+ cd "$srcdir/$pkgname"
+ export GOROOT="$srcdir/$pkgname"
+ export PATH="$srcdir/$pkgname/bin:$PATH"
+ cd src && bash run.bash --no-rebuild || true
}
package() {
@@ -64,14 +61,14 @@ package() {
mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}}
- cp -r bin $pkgdir/usr
cp -r doc misc -t $pkgdir/usr/share/go
ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc
- cp -r pkg $pkgdir/usr/lib/go
- cp -r $GOROOT/src/pkg $pkgdir/usr/lib/go/src/
- cp -r $GOROOT/src/cmd $pkgdir/usr/lib/go/src/cmd
- cp -r $GOROOT/src/lib9 $pkgdir/usr/lib/go/src/
- cp -r $GOROOT/lib $pkgdir/usr/lib/go/
+ cp -r --preserve=timestamps bin $pkgdir/usr
+ cp -r --preserve=timestamps pkg $pkgdir/usr/lib/go
+ cp -r --preserve=timestamps $GOROOT/src/pkg $pkgdir/usr/lib/go/src/
+ cp -r --preserve=timestamps $GOROOT/src/cmd $pkgdir/usr/lib/go/src/cmd
+ cp -r --preserve=timestamps $GOROOT/src/lib9 $pkgdir/usr/lib/go/src/
+ cp -r --preserve=timestamps $GOROOT/lib $pkgdir/usr/lib/go/
install -Dm644 src/Make.* $pkgdir/usr/lib/go/src
@@ -85,10 +82,7 @@ package() {
install -Dm644 src/pkg/runtime/cgocall.h \
$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h
- install $srcdir/go.sh $pkgdir/etc/profile.d/
-
- mv "$pkgdir/usr/bin/go" "$pkgdir/usr/bin/go.elf"
- install -Dm755 "$srcdir/go.run" "$pkgdir/usr/bin/go"
+ rm -f "$pkgdir/usr/share/go/doc/articles/wiki/get.bin"
}
# vim:set ts=2 sw=2 et:
diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD
index 30d7ddca1..358789e62 100644
--- a/community/gtkwave/PKGBUILD
+++ b/community/gtkwave/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69361 2012-04-14 14:13:25Z kkeen $
+# $Id: PKGBUILD 70580 2012-05-12 02:21:28Z kkeen $
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: Jared Casper <jaredcasper@gmail.com>
pkgname=gtkwave
-pkgver=3.3.35
+pkgver=3.3.36
pkgrel=1
pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files'
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2')
makedepends=('gperf')
install='gtkwave.install'
source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz")
-md5sums=('f7de1e24ca4e3c5396d38dc6232d1f91')
+md5sums=('a4275363369b0b7011afbaa7ec1667e6')
build() {
cd "${srcdir}/gtkwave-${pkgver}"
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index e0899ca41..b950c18df 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 70021 2012-04-28 09:24:13Z allan $
+# $Id: PKGBUILD 70590 2012-05-12 10:14:49Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
# Contributor: Christer Solskogen (solskogen@carebears.mine.nu)
pkgname=gtranslator
-pkgver=2.91.3
-pkgrel=3
+pkgver=2.91.4
+pkgrel=1
pkgdesc="An enhanced gettext po file editor for the GNOME"
arch=('i686' 'x86_64' 'mips64el')
url="http://projects.gnome.org/gtranslator/"
@@ -32,3 +32,4 @@ package() {
make DESTDIR=${pkgdir} install
}
+sha256sums=('af4ede1495c0c52ecc1e7bd36c8ee6ce0bb35525144d687d1ce7cb4bf6630826')
diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog
index c9b484e39..712c1cb22 100644
--- a/community/gtranslator/gtranslator.changelog
+++ b/community/gtranslator/gtranslator.changelog
@@ -1,3 +1,6 @@
+2011-10-28 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+ * gtranslator 2.91.4-1
+
2012-04-23 Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
* gtranslator 2.91.3-2
rebuild for gdl 3.4.2
diff --git a/community/guichan/PKGBUILD b/community/guichan/PKGBUILD
index fe5467a56..d948c2b66 100644
--- a/community/guichan/PKGBUILD
+++ b/community/guichan/PKGBUILD
@@ -1,31 +1,32 @@
-# $Id: PKGBUILD 57204 2011-10-23 23:29:35Z andrea $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 70598 2012-05-12 11:22:15Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Bjørn Lindeijer <bjorn@lindeijer.nl>
pkgname=guichan
pkgver=0.8.2
-pkgrel=2
+pkgrel=3
pkgdesc="A portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL."
arch=('i686' 'x86_64' 'mips64el')
url="http://guichan.sourceforge.net/"
license=('BSD')
-makedepends=('sdl_image' 'allegro' 'libgl' 'glut')
-conflicts=('guichan-sdl' 'guichan-allegro' 'guichan-opengl' 'guichan-glut')
-provides=('guichan-sdl' 'guichan-allegro' 'guichan-opengl' 'guichan-glut')
-options=(!libtool !strip)
+makedepends=('sdl_image' 'allegro4' 'libgl' 'glut')
+options=('!libtool' '!strip')
source=(http://guichan.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('af535d7f387e774e3197cef8023ea105')
+sha256sums=('eedf206eae5201eaae027b133226d0793ab9a287bfd74c5f82c7681e3684eeab')
build() {
- cd $srcdir/$pkgname-$pkgver
- CXXFLAGS="-g" ./configure --prefix=/usr
- make
+ cd ${srcdir}/$pkgname-$pkgver
+
+ CXXFLAGS="-g" ./configure --prefix=/usr
+ make
}
package() {
- cd $srcdir/$pkgname-$pkgver
- make prefix=$pkgdir/usr install
+ cd ${srcdir}/$pkgname-$pkgver
+
+ make prefix=${pkgdir}/usr install
- # Install the license, as required for BSD
- install -m644 -D COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+# Install the license, as required for BSD
+ install -m644 -D COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/community/i3lock/PKGBUILD b/community/i3lock/PKGBUILD
index 761ace052..f73cfe2a5 100644
--- a/community/i3lock/PKGBUILD
+++ b/community/i3lock/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 68957 2012-04-06 14:24:01Z ttopper $
+# $Id: PKGBUILD 70612 2012-05-12 19:42:37Z ttopper $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
pkgname=i3lock
pkgver=2.4
-pkgrel=1
+pkgrel=2
pkgdesc="An improved screenlocker based upon XCB and PAM"
arch=('i686' 'x86_64' 'mips64el')
url="http://i3wm.org/i3lock/"
license=('MIT')
groups=("i3")
-depends=('xcb-util-image' 'xcb-util-keysyms' 'pam' 'libev' 'libx11')
+depends=('xcb-util-image' 'xcb-util-keysyms' 'pam' 'libev' 'libx11' 'cairo')
options=('docs')
source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2")
md5sums=('728e2654d886ef97449708f0135e9fa5')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make NOLIBCAIRO=y
+ make
gzip i3lock.1
}
diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD
index 88d8d46aa..1bfc6a24e 100644
--- a/community/i3status/PKGBUILD
+++ b/community/i3status/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 70239 2012-05-02 17:41:16Z ttopper $
+# $Id: PKGBUILD 70601 2012-05-12 12:03:50Z ttopper $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
pkgname=i3status
-pkgver=2.5
+pkgver=2.5.1
pkgrel=1
pkgdesc="Generates status bar to use with dzen2 or xmobar"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ backup=('etc/i3status.conf')
install=i3status.install
options=('docs')
source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2")
-md5sums=('6c3c1d91fae1dc939a517bc3b853f65f')
+md5sums=('28c27fc0c2294e12ae6ae390f3d89973')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD
index ac95e6229..76c732531 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -1,17 +1,26 @@
-# $Id: PKGBUILD 62118 2012-01-16 09:00:54Z seblu $
+# $Id: PKGBUILD 70556 2012-05-11 12:51:57Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
pkgname=ipset
-pkgver=6.11
+pkgver=6.12.1
pkgrel=1
pkgdesc='Administration tool for IP sets'
arch=('i686' 'x86_64')
url='http://ipset.netfilter.org'
license=('GPL2')
depends=('libmnl')
-makedepends=('linux-headers')
-source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2")
-md5sums=('bfcc92e30a0fcf10ae6e7c4affa03c84')
+backup=('etc/ipset.conf' "etc/conf.d/$pkgname")
+options=('!libtool')
+source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
+ "$pkgname.conf"
+ "$pkgname.rc"
+ "$pkgname.systemd"
+ "$pkgname.service")
+md5sums=('80df500a4d93cb14e1373ae290716cda'
+ '61963bda45c002fb37977e58bb5b829c'
+ '888bf1eadffcc076b9e97de02e2147c8'
+ 'c5f38e5f3027066c1491a563e734796e'
+ 'b9ff3bd7b959cb1b97b8c492b52b8377')
build() {
cd $pkgname-$pkgver
@@ -22,6 +31,20 @@ build() {
package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
+ # install doc
+ install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+ install -m644 README UPGRADE ChangeLog "$pkgdir/usr/share/doc/$pkgname"
+ # install initscripts
+ cd ..
+ install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+ install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname"
+ # install systemd service
+ install -Dm 755 $pkgname.systemd \
+ "$pkgdir/usr/lib/systemd/scripts/$pkgname"
+ install -Dm 644 $pkgname.service \
+ "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+ # default config file
+ install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf"
}
# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ipset/ipset.conf b/community/ipset/ipset.conf
new file mode 100644
index 000000000..686931f4c
--- /dev/null
+++ b/community/ipset/ipset.conf
@@ -0,0 +1,3 @@
+# vim:set ts=2 sw=2 ft=sh et:
+
+IPSET_CONF='/etc/ipset.conf'
diff --git a/community/ipset/ipset.rc b/community/ipset/ipset.rc
new file mode 100644
index 000000000..1d5f7df8b
--- /dev/null
+++ b/community/ipset/ipset.rc
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/ipset
+
+case "$1" in
+ start)
+ stat_busy 'Loading IP Sets'
+ if [[ -f $IPSET_CONF ]] && ipset restore < "$IPSET_CONF"; then
+ add_daemon ipset
+ stat_done
+ else
+ stat_fail
+ fi
+ ;;
+ stop)
+ status 'Clearing IP Sets' ipset destroy
+ rm_daemon ipset
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ save)
+ stat_busy 'Saving IP Sets'
+ if ipset save > "$IPSET_CONF" 2>/dev/null; then
+ stat_done
+ else
+ stat_fail
+ fi
+ ;;
+ *)
+ echo "usage: ${0##*/} {start|stop|restart|save}"
+esac
+exit 0
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ipset/ipset.service b/community/ipset/ipset.service
new file mode 100644
index 000000000..0e0dd4ff7
--- /dev/null
+++ b/community/ipset/ipset.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=IP Sets
+
+[Service]
+Type=oneshot
+ExecStart=/usr/lib/systemd/scripts/ipset start
+ExecStop=/usr/sbin/ipset destroy
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+Before=iptables.service
diff --git a/community/ipset/ipset.systemd b/community/ipset/ipset.systemd
new file mode 100644
index 000000000..36df5124a
--- /dev/null
+++ b/community/ipset/ipset.systemd
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+. /etc/conf.d/ipset
+
+[[ -f $IPSET_CONF ]] || exit 1
+ipset restore < "$IPSET_CONF"
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD
index f3342df96..17fec81ce 100644
--- a/community/kid3/PKGBUILD
+++ b/community/kid3/PKGBUILD
@@ -1,30 +1,28 @@
-# $Id: PKGBUILD 67670 2012-03-13 17:34:12Z lcarlier $
+# $Id: PKGBUILD 70617 2012-05-12 21:33:45Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Alois Nespor <alois.nespor@gmail.com>
pkgname=kid3
-pkgver=2.0.1
-pkgrel=2
+pkgver=2.1
+pkgrel=1
pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
arch=('i686' 'x86_64' 'mips64el')
url="http://kid3.sourceforge.net/"
license=('GPL')
depends=('id3lib' 'qt' 'tunepimp' 'kdelibs')
-makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl')
+makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl' 'chromaprint')
options=('!makeflags')
install=$pkgname.install
changelog=$pkgname.changelog
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('32c3bdf5a3f170076e46c5f3b9523f688e8ea6265d22d2264c1bcd318da9f32e')
+sha256sums=('8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225')
build() {
cd ${srcdir}
mkdir build
cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
+ cmake ../${pkgname}-${pkgver} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
make
}
diff --git a/community/kid3/kid3.changelog b/community/kid3/kid3.changelog
index 824a2406a..8c440c611 100644
--- a/community/kid3/kid3.changelog
+++ b/community/kid3/kid3.changelog
@@ -1,3 +1,6 @@
+2012-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * kid3 2.1-1
+
2011-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* kid3 2.0.1-1
diff --git a/community/lazarus/ChangeLog b/community/lazarus/ChangeLog
index 0a843b0ec..d435cb744 100644
--- a/community/lazarus/ChangeLog
+++ b/community/lazarus/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-08 BlackIkeEagle
+ * fix FS#29807
+ * should not have removed Makefiles
+
2012-04-30 BlackIkeEagle
* split pkgbuild
* lazarus (can be used for compiling)
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index f38913c75..97c9c1c7c 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70224 2012-05-02 13:40:21Z idevolder $
+# $Id: PKGBUILD 70466 2012-05-08 18:21:20Z idevolder $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jens Adam (byte/jra) <j_adam@web.de>
# Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
@@ -6,7 +6,7 @@
pkgbase=lazarus
pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt')
pkgver=0.9.30.4
-pkgrel=2
+pkgrel=3
url='http://www.lazarus.freepascal.org/'
license=('GPL2' 'MPL' 'custom:LGPL')
arch=('i686' 'x86_64' 'mips64el')
@@ -54,8 +54,7 @@ package_lazarus() {
--exclude=".xvpics" --exclude="*.compiled" \
--exclude="killme*" --exclude=".gdb_hist*" \
--exclude="debian" --exclude="COPYING*" \
- --exclude="*.app" --exclude="Makefile*" \
- --exclude="tools/install" \
+ --exclude="*.app" --exclude="tools/install" \
. "$pkgdir"/usr/lib/lazarus
#remove some stuff, not needed or for in other package
diff --git a/community/libquvi/PKGBUILD b/community/libquvi/PKGBUILD
index 968433a92..d9a21c4c2 100644
--- a/community/libquvi/PKGBUILD
+++ b/community/libquvi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 66396 2012-02-24 12:56:50Z lfleischer $
+# $Id: PKGBUILD 70444 2012-05-07 08:28:44Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
pkgname=libquvi
-pkgver=0.4.0
-pkgrel=3
+pkgver=0.4.1
+pkgrel=1
pkgdesc='Library for parsing video download links.'
arch=('i686' 'x86_64' 'mips64el')
url='http://quvi.sourceforge.net/'
@@ -11,8 +11,9 @@ license=('LGPL')
depends=('libquvi-scripts' 'curl' 'lua')
conflicts=('quvi<0.4.0')
options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.gz")
-md5sums=('85c47035105b6b523a28793d4f6da9f1')
+source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.gz"{,.sig})
+md5sums=('a5fa8860c23655a529b3166f6e25c83a'
+ 'cc7f15518f8ab2fc134bc64f0e9d584b')
build() {
cd "${pkgname}-${pkgver}"
diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD
index 8e1f0b122..7a9480d86 100644
--- a/community/luajit/PKGBUILD
+++ b/community/luajit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 67115 2012-03-04 14:30:22Z bpiotrowski $
+# $Id: PKGBUILD 70509 2012-05-09 20:30:54Z bpiotrowski $
# Maintainer: Chris Brannon <chris@the-brannons.com>
# Maintainer: Bartłomiej Piotrowski
# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
# Contributor: Anders Bergh <anders1@gmail.com>
pkgname=luajit
-pkgver=2.0.0b9
+pkgver=2.0.0b10
pkgrel=1
pkgdesc="A Just-In-Time Compiler for Lua"
arch=('i686' 'x86_64')
@@ -13,18 +13,15 @@ url="http://luajit.org/"
license=('MIT')
depends=('gcc-libs')
source=("http://luajit.org/download/LuaJIT-${pkgver/b/-beta}.tar.gz"
- "http://luajit.org/download/beta${pkgver: -1}_hotfix1.patch"
'luaconf.patch'
'Makefile.patch')
-md5sums=('e7e03e67e2550817358bc28b44270c6d'
- '4920f04fcef1ce486891509faf26b4f1'
+md5sums=('ed66689b96f7ad7bfeffe0b4ff2d63d4'
'c8da9c6790e20a12a0e2496f438d9dc3'
'8997c5e5fa4f6e8e0b86cc6b888de631')
build() {
cd "$srcdir/LuaJIT-${pkgver/b/-beta}"
- patch -Np1 -i "$srcdir/beta${pkgver: -1}_hotfix1.patch"
patch -Np0 -i "$srcdir/luaconf.patch"
patch -Np0 -i "$srcdir/Makefile.patch"
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index 10c69a84f..f47ddd09a 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68758 2012-04-01 15:10:08Z bpiotrowski $
+# $Id: PKGBUILD 70485 2012-05-09 14:58:36Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski
# Contributor: AndyRTR <andyrtr@archlinux.org>
# Contributor: kiefer <jorgelmadrid@gmail.com>
pkgname=lxdm
pkgver=0.4.1
-pkgrel=9
+pkgrel=10
pkgdesc="Lightweight Display Manager (part of LXDE)"
arch=('i686' 'x86_64' 'mips64el')
url="http://sourceforge.net/projects/lxdm/"
@@ -19,18 +19,22 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch
- lxdm-daemon lxdm-pam)
+ greeter-session.patch lxdm-daemon lxdm-pam)
md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
'a1e3c46a8bef691bc544028f5b6cfe22'
'baed9055e8825a5511712bc095197519'
'c50dd01b715b0a236407d48066191601'
'd2e4a4a22ee2aa1a986be154c647b6c6'
+ '28475239d0c8b4fd778ec49f5ec72962'
'705f394052fdd0dec22e95321d170de0'
'b20fe3c8487a039050986d60e45233a9')
build() {
cd $srcdir/$pkgname-$pkgver
+
patch -Np1 -i $srcdir/glib2-2.32.0.patch
+ patch -Np1 -i $srcdir/greeter-session.patch
+
./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm
make
diff --git a/community/lxdm/greeter-session.patch b/community/lxdm/greeter-session.patch
new file mode 100644
index 000000000..f3b94a57a
--- /dev/null
+++ b/community/lxdm/greeter-session.patch
@@ -0,0 +1,13 @@
+diff --git a/src/greeter.c b/src/greeter.c
+index c0c150d..1f6b88e 100644
+--- a/src/greeter.c
++++ b/src/greeter.c
+@@ -114,7 +114,7 @@ static char *get_session_exec(void)
+ GtkTreeModel* model;
+ GtkTreeIter it;
+ gchar *res;
+- if(!lang)
++ if(!sessions)
+ return g_strdup("");
+
+ if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it))
diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD
index d098d45df..3c4cc47c2 100755
--- a/community/mathomatic/PKGBUILD
+++ b/community/mathomatic/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70112 2012-04-29 22:28:19Z ttopper $
+# $Id: PKGBUILD 70548 2012-05-11 05:36:19Z ttopper $
# Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
pkgname=mathomatic
-pkgver=15.8.3
+pkgver=15.8.4
pkgrel=1
pkgdesc="General purpose Computer Algebra System written in C"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial'
'm4: for complex operations using the matho script'
'gnuplot: for plotting')
source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2)
-md5sums=('df4296e27840ecafe87f16ff9cf181ac')
+md5sums=('9b58f8221e76a80f847f31a67bf01401')
build() {
cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index 2114d29e5..03af311c7 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70262 2012-05-03 10:11:50Z spupykin $
+# $Id: PKGBUILD 70495 2012-05-09 17:17:28Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer:Biginoz < biginoz AT free point fr>
# Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -7,7 +7,7 @@
pkgname=minidlna
pkgver=1.0.24
-pkgrel=3
+pkgrel=4
pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
arch=('i686' 'x86_64' 'mips64el')
url="http://sourceforge.net/projects/minidlna/"
@@ -28,6 +28,7 @@ md5sums=('be9b4c91e3fcde592dc3f9828098ca0f'
build() {
cd "$srcdir/$pkgname-$pkgver"
+ sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh
make
}
diff --git a/community/mosh/PKGBUILD b/community/mosh/PKGBUILD
new file mode 100644
index 000000000..49a766641
--- /dev/null
+++ b/community/mosh/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Christian Neukirchen <chneukirchen@gmail.com>
+# Contributor: Thomas Weißschuh <thomas_weissschuh lavabit.com>
+
+pkgname=mosh
+pkgver=1.2
+pkgrel=1
+pkgdesc='Mobile shell, surviving disconnects with local echo and line editing'
+arch=('x86_64' 'i686')
+url="http://mosh.mit.edu/"
+license=('GPL3')
+depends=('protobuf' 'ncurses' 'zlib' 'openssh' 'perl' 'perl-io-tty')
+#optdepends=('libutempter: record of session in {u,t}wmp (recompile mosh afterwards)')
+conflicts=('mosh-git')
+source=("$pkgname-$pkgver.tgz::https://nodeload.github.com/keithw/mosh/tarball/master")
+sha1sums=('690e301560808f13a8a7b19bd7740d81fecac262')
+
+build() {
+ cd "$srcdir/keithw-mosh-"*
+
+ ./autogen.sh
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/keithw-mosh-"*
+
+ make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD
index 96a95a43b..6e55b0794 100644
--- a/community/myodbc/PKGBUILD
+++ b/community/myodbc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 70209 2012-05-02 12:44:37Z spupykin $
+# $Id: PKGBUILD 70531 2012-05-10 15:58:32Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=myodbc
pkgver=5.1.11
-pkgrel=1
+pkgrel=2
pkgdesc="ODBC driver/connector for MySQL"
arch=(i686 x86_64 'mips64el')
url="http://dev.mysql.com/downloads/connector/odbc/"
@@ -18,6 +18,13 @@ md5sums=('1d868f404038bbce6623a28255c8a9f7'
build() {
cd $srcdir/mysql-connector-odbc-${pkgver}-src
cp $srcdir/myconf.h.in driver/myconf.h.in
+ patch driver/Makefile.am <<EOF
+55c55,56
+< driver.h
+---
+> driver.h \\
+> my_stmt.c
+EOF
[ -x configure ] || { aclocal; libtoolize; automake --add-missing; autoreconf; }
[ -f Makefile ] || CFLAGS="$CFLAGS -DTHREAD" \
./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr --with-odbc-ini=/etc/odbc.ini \
diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index af1a3aabb..984be7fad 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69346 2012-04-14 12:26:30Z jconder $
+# $Id: PKGBUILD 70479 2012-05-09 10:48:34Z jconder $
# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -14,7 +14,7 @@ pkgname=('mythplugins-mytharchive'
'mythplugins-mythweb'
'mythplugins-mythzoneminder')
pkgver=0.25
-pkgrel=2
+pkgrel=3
epoch=1
arch=('i686' 'x86_64' 'mips64el')
url="http://www.mythtv.org"
@@ -25,14 +25,17 @@ makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif'
'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath'
'python2-oauth' 'python-imaging' 'python-pycurl' 'taglib' 'zlib')
source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2"
+ 'php54.patch'
'mtd.rc')
md5sums=('b3f2768372a38e92ca94841519daa05e'
+ '7a114c1b5a84ab5ee190e63cc9514086'
'476c12ba074794ad7f4ae092bdf949d6')
build() {
cd "$srcdir/$pkgbase-$pkgver"
find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+ patch -d 'mythweb' -Np0 -i "$srcdir/php54.patch"
sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php'
sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp'
@@ -115,18 +118,19 @@ package_mythplugins-mythweb() {
depends=('mythtv')
optdepends=('lighttpd'
'php-apache')
+ install='mythplugins-mythweb.install'
- mkdir -p "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions}
- cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/srv/http/mythweb"
- chown -R http:http "$pkgdir/srv/http/mythweb"
- chmod g+rw "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions}
+ mkdir -p "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
+ cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/var/lib/mythtv/mythweb"
+ chown -R http:http "$pkgdir/var/lib/mythtv/mythweb"
+ chmod g+rw "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
}
package_mythplugins-mythzoneminder() {
pkgdesc="View CCTV footage from zoneminder in MythTV"
depends=('mythtv')
-
install='mythplugins-mythzoneminder.install'
+
cd "$srcdir/$pkgbase-$pkgver/mythzoneminder"
make INSTALL_ROOT="$pkgdir" install
}
diff --git a/community/mythplugins/mythplugins-mythweb.install b/community/mythplugins/mythplugins-mythweb.install
new file mode 100644
index 000000000..2c626c538
--- /dev/null
+++ b/community/mythplugins/mythplugins-mythweb.install
@@ -0,0 +1,4 @@
+post_upgrade() {
+ echo "MythWeb files are now in /var/lib/mythtv/mythweb"
+ echo "Please update your server configuration accordingly"
+}
diff --git a/community/mythplugins/php54.patch b/community/mythplugins/php54.patch
new file mode 100644
index 000000000..afbe8f953
--- /dev/null
+++ b/community/mythplugins/php54.patch
@@ -0,0 +1,35 @@
+*** includes/sorting.php.old 2011-04-03 06:05:31.000000000 -0500
+--- includes/sorting.php 2012-03-27 05:05:51.000000000 -0500
+***************
+*** 123,129 ****
+ function by_user_choice(&$a, &$b) {
+ foreach ($GLOBALS['user_sort_choice'] as $sort) {
+ $function = 'by_'.$sort['field'];
+! $response = $function(&$a, &$b);
+ // Identical response, go on to the next sort choice
+ if (!$response)
+ continue;
+--- 123,129 ----
+ function by_user_choice(&$a, &$b) {
+ foreach ($GLOBALS['user_sort_choice'] as $sort) {
+ $function = 'by_'.$sort['field'];
+! $response = $function($a, $b);
+ // Identical response, go on to the next sort choice
+ if (!$response)
+ continue;
+*** modules/tv/tmpl/default/schedules.php.old 2011-04-03 06:05:31.000000000 -0500
+--- modules/tv/tmpl/default/schedules.php 2012-03-27 05:37:40.000000000 -0500
+***************
+*** 90,95 ****
+--- 90,100 ----
+ </tr>
+ </thead>
+ <?php
++ // Hack: Disable warnings about "Creating default
++ // object from empty value" from below line
++ // "$schedule->channel->name = '[ '.t('Any').' ]';"
++ ini_set('error_reporting', E_ERROR);
++
+ $prev_group = '';
+ $cur_group = '';
+ foreach ($the_schedules as $schedule) {
diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD
new file mode 100644
index 000000000..8476b2c16
--- /dev/null
+++ b/community/onboard/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=onboard
+pkgver=0.97.0
+pkgrel=2
+pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/onboard"
+license=('GPL')
+depends=('python2-cairo' 'dbus-python' 'python2-gobject' 'libwnck3' 'python2-virtkey' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('python-distutils-extra')
+optdepends=('at-spi2-atk: auto-show when editing text'
+ 'mousetweaks: hover click with mouse')
+options=('!emptydirs')
+install=$pkgname.install
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz
+ fix_unicode_translations.patch
+ fix_encoding_mismatch.patch)
+md5sums=('258bf6653a840c54ce1b4898d31fb775'
+ '73d71d019dc27e6ac8d479ab3dd0ab21'
+ '8c7f6f31547e1454725ded8090cbdc41')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # https://bugs.launchpad.net/onboard/+bug/933030
+ patch -Np0 -i "$srcdir/fix_unicode_translations.patch"
+
+ # https://bugs.launchpad.net/onboard/+bug/958385
+ patch -Np1 -i "$srcdir/fix_encoding_mismatch.patch"
+
+ sed -i 's/\"python\"/\"python2\"/g' scripts/sokSettings.py
+
+ python2 setup.py install --root=$pkgdir/ --optimize=1
+}
+
+package() {
+ cd "$pkgdir"
+
+ find . -type f -name *.py | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+}
diff --git a/community/onboard/fix_encoding_mismatch.patch b/community/onboard/fix_encoding_mismatch.patch
new file mode 100644
index 000000000..01750598c
--- /dev/null
+++ b/community/onboard/fix_encoding_mismatch.patch
@@ -0,0 +1,187 @@
+Subject: Fix string encodings so as to not have a mismatch without mousetweaks
+Author: marmuta
+Origin: upstream, http://bazaar.launchpad.net/~onboard/onboard/0.91/revision/764
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/958385
+
+---
+ Onboard/Config.py | 9 +++++----
+ Onboard/ConfigUtils.py | 9 ++++++---
+ Onboard/Exceptions.py | 5 +++--
+ Onboard/OnboardGtk.py | 5 +++--
+ Onboard/settings.py | 7 ++++---
+ Onboard/utils.py | 16 ++++++++++++++++
+ 6 files changed, 37 insertions(+), 14 deletions(-)
+
+Index: onboard-0.97.0/Onboard/Config.py
+===================================================================
+--- onboard-0.97.0.orig/Onboard/Config.py
++++ onboard-0.97.0/Onboard/Config.py
+@@ -12,7 +12,7 @@
+
+ from gi.repository import GLib, Gtk
+
+-from Onboard.utils import show_confirmation_dialog, Version
++from Onboard.utils import show_confirmation_dialog, Version, unicode_str
+ from Onboard.WindowUtils import Handle
+ from Onboard.ConfigUtils import ConfigObject
+ from Onboard.MouseControl import Mousetweaks, ClickMapper
+@@ -209,7 +209,7 @@
+ try:
+ ConfigObject.__init__(self)
+ except SchemaError as e:
+- _logger.error(str(e))
++ _logger.error(unicode_str(e))
+ sys.exit()
+
+ # init paths
+@@ -225,7 +225,8 @@
+ try:
+ copytree(old_user_dir, user_dir)
+ except OSError as ex: # python >2.5
+- _logger.error(_("Failed to migrate user directory. ") + str(ex))
++ _logger.error(_("Failed to migrate user directory. ") + \
++ unicode_str(ex))
+
+ # Load system defaults (if there are any, not required).
+ # Used for distribution specific settings, aka branding.
+@@ -347,7 +348,7 @@
+ self.mousetweaks = Mousetweaks()
+ self.children.append(self.mousetweaks)
+ except (SchemaError, ImportError) as e:
+- _logger.warning(str(e))
++ _logger.warning(unicode_str(e))
+ self.mousetweaks = None
+
+ self.clickmapper = ClickMapper()
+Index: onboard-0.97.0/Onboard/ConfigUtils.py
+===================================================================
+--- onboard-0.97.0.orig/Onboard/ConfigUtils.py
++++ onboard-0.97.0/Onboard/ConfigUtils.py
+@@ -22,7 +22,8 @@
+ from gi.repository import Gio
+
+ from Onboard.Exceptions import SchemaError
+-from Onboard.utils import pack_name_value_list, unpack_name_value_list
++from Onboard.utils import pack_name_value_list, unpack_name_value_list, \
++ unicode_str
+
+ _CAN_SET_HOOK = "_can_set_" # return true if value is valid
+ _GSETTINGS_GET_HOOK = "_gsettings_get_" # retrieve from gsettings
+@@ -388,7 +389,8 @@
+ try:
+ filename = parser.read(paths)
+ except configparser.ParsingError as ex:
+- _logger.error(_("Failed to read system defaults. " + str(ex)))
++ _logger.error(_("Failed to read system defaults. " + \
++ unicode_str(ex)))
+
+ if not filename:
+ _logger.info(_("No system defaults found."))
+@@ -501,7 +503,8 @@
+ value = self.settings[self.key]
+
+ except KeyError as ex:
+- _logger.error(_("Failed to get gsettings value. ") + str(ex))
++ _logger.error(_("Failed to get gsettings value. ") + \
++ unicode_str(ex))
+
+ return value
+
+Index: onboard-0.97.0/Onboard/Exceptions.py
+===================================================================
+--- onboard-0.97.0.orig/Onboard/Exceptions.py
++++ onboard-0.97.0/Onboard/Exceptions.py
+@@ -4,6 +4,7 @@
+
+ from traceback import format_tb
+ import sys
++from Onboard.utils import unicode_str
+
+ class ChainableError(Exception):
+ """
+@@ -40,10 +41,10 @@
+ traceback = property(_get_traceback)
+
+ def __str__(self):
+- message = self._message + "\n"
++ message = unicode_str(self._message) + "\n"
+ if self.chained_exception:
+ message += "%s: %s" % (type(self.chained_exception).__name__,
+- str(self.chained_exception))
++ unicode_str(self.chained_exception))
+ return message
+
+ class SVGSyntaxError(ChainableError):
+Index: onboard-0.97.0/Onboard/OnboardGtk.py
+===================================================================
+--- onboard-0.97.0.orig/Onboard/OnboardGtk.py
++++ onboard-0.97.0/Onboard/OnboardGtk.py
+@@ -26,7 +26,8 @@
+ from Onboard.KeyGtk import *
+ from Onboard.KbdWindow import KbdWindow, KbdPlugWindow
+ from Onboard.KeyboardSVG import KeyboardSVG
+-from Onboard.utils import show_confirmation_dialog, CallOnce, timeit
++from Onboard.utils import show_confirmation_dialog, CallOnce, timeit, \
++ unicode_str
+ from Onboard.Appearance import Theme
+
+ ### Config Singleton ###
+@@ -485,7 +486,7 @@
+ except virtkey.error as e:
+ t = time.time()
+ if t > self._vk_error_time + .2: # rate limit to once per 200ms
+- _logger.warning("vk: "+str(e))
++ _logger.warning("vk: " + unicode_str(e))
+ self._vk_error_time = t
+
+ return self._vk
+Index: onboard-0.97.0/Onboard/settings.py
+===================================================================
+--- onboard-0.97.0.orig/Onboard/settings.py
++++ onboard-0.97.0/Onboard/settings.py
+@@ -24,7 +24,8 @@
+ from Onboard.Appearance import Theme, ColorScheme
+ from Onboard.Scanner import ScanMode, ScanDevice
+ from Onboard.utils import show_ask_string_dialog, \
+- show_confirmation_dialog
++ show_confirmation_dialog, \
++ unicode_str
+
+ from virtkey import virtkey
+ from osk import Devices
+@@ -400,8 +401,8 @@
+ try:
+ Popen([filename, "universal-access"])
+ except OSError as e:
+- _logger.warning(_("System settings not found"
+- " ({}): {}").format(filename, str(e)))
++ _logger.warning(_("System settings not found ({}): {}") \
++ .format(filename, unicode_str(e)))
+
+ def update_num_resize_handles_combobox(self):
+ self.num_resize_handles_list = Gtk.ListStore(str, int)
+Index: onboard-0.97.0/Onboard/utils.py
+===================================================================
+--- onboard-0.97.0.orig/Onboard/utils.py
++++ onboard-0.97.0/Onboard/utils.py
+@@ -961,4 +961,20 @@
+ return 1
+ return 0
+
++def unicode_str(obj, encoding = "utf-8"):
++ """
++ Safe str() function that always returns an unicode string.
++ Do nothing if the string was already unicode.
++ """
++ if sys.version_info.major >= 3: # python 3?
++ return str(obj)
++
++ if type(obj) == unicode: # unicode string?
++ return obj
++
++ if hasattr(obj, "__unicode__"): # Exception object?
++ return unicode(obj)
++
++ return str(obj).decode("utf-8") # strings, numbers, ...
++
+
diff --git a/community/onboard/fix_unicode_translations.patch b/community/onboard/fix_unicode_translations.patch
new file mode 100644
index 000000000..1eaf663cc
--- /dev/null
+++ b/community/onboard/fix_unicode_translations.patch
@@ -0,0 +1,247 @@
+=== modified file 'Onboard/Appearance.py'
+--- Onboard/Appearance.py 2012-02-14 08:16:34 +0000
++++ Onboard/Appearance.py 2012-02-15 23:27:20 +0000
+@@ -11,7 +11,6 @@
+ _logger = logging.getLogger("Appearance")
+ ###############
+
+-from gettext import gettext as _
+ from xml.dom import minidom
+ import os
+ import re
+
+=== modified file 'Onboard/Config.py'
+--- Onboard/Config.py 2012-02-15 10:58:02 +0000
++++ Onboard/Config.py 2012-02-15 23:27:20 +0000
+@@ -9,7 +9,6 @@
+ import sys
+ from shutil import copytree
+ from optparse import OptionParser
+-from gettext import gettext as _
+
+ from gi.repository import GLib, Gtk
+
+
+=== modified file 'Onboard/ConfigUtils.py'
+--- Onboard/ConfigUtils.py 2012-02-08 14:56:38 +0000
++++ Onboard/ConfigUtils.py 2012-02-15 23:27:20 +0000
+@@ -13,7 +13,6 @@
+ import os
+ import sys
+ from ast import literal_eval
+-from gettext import gettext as _
+ try:
+ import configparser
+ except ImportError:
+@@ -418,8 +417,8 @@
+ # convert ini file strings to property values
+ sysdef_gskeys = dict((k.sysdef, k) for k in list(self.gskeys.values()))
+ for sysdef, value in items:
+- _logger.info(_("Found system default '{}={}'") \
+- .format(sysdef, value))
++ _logger.info(_("Found system default '[{}] {}={}'") \
++ .format(self.sysdef_section, sysdef, value))
+
+ gskey = sysdef_gskeys.get(sysdef, None)
+ value = self._convert_sysdef_key(gskey, sysdef, value)
+
+=== modified file 'Onboard/IconPalette.py'
+--- Onboard/IconPalette.py 2012-02-15 01:34:13 +0000
++++ Onboard/IconPalette.py 2012-02-15 23:27:20 +0000
+@@ -43,7 +43,6 @@
+ config = Config()
+ ########################
+
+-from gettext import gettext as _
+
+ class IconPalette(Gtk.Window, WindowRectTracker, WindowManipulator):
+ """
+
+=== modified file 'Onboard/Indicator.py'
+--- Onboard/Indicator.py 2012-02-11 14:07:56 +0000
++++ Onboard/Indicator.py 2012-02-15 23:27:20 +0000
+@@ -18,7 +18,6 @@
+ config = Config()
+ ########################
+
+-from gettext import gettext as _
+
+ class Indicator(GObject.GObject):
+
+
+=== modified file 'Onboard/KbdWindow.py'
+--- Onboard/KbdWindow.py 2012-02-15 10:18:48 +0000
++++ Onboard/KbdWindow.py 2012-02-15 23:27:20 +0000
+@@ -11,7 +11,6 @@
+ from Onboard.WindowUtils import Orientation, WindowRectTracker
+ from Onboard.IconPalette import IconPalette
+
+-from gettext import gettext as _
+
+ ### Logging ###
+ import logging
+
+=== modified file 'Onboard/Keyboard.py'
+--- Onboard/Keyboard.py 2012-02-14 20:21:02 +0000
++++ Onboard/Keyboard.py 2012-02-15 23:27:20 +0000
+@@ -3,7 +3,6 @@
+ from __future__ import division, print_function, unicode_literals
+
+ import sys
+-from gettext import gettext as _
+
+ from gi.repository import GObject, Gtk, Gdk
+
+
+=== modified file 'Onboard/KeyboardGTK.py'
+--- Onboard/KeyboardGTK.py 2012-02-15 01:33:34 +0000
++++ Onboard/KeyboardGTK.py 2012-02-15 23:27:20 +0000
+@@ -5,7 +5,6 @@
+
+ import os
+ import time
+-from gettext import gettext as _
+
+ import cairo
+ from gi.repository import GObject, Gdk, Gtk
+
+=== modified file 'Onboard/KeyboardSVG.py'
+--- Onboard/KeyboardSVG.py 2012-02-09 19:18:36 +0000
++++ Onboard/KeyboardSVG.py 2012-02-15 23:27:20 +0000
+@@ -11,7 +11,6 @@
+ import re
+ import sys
+ import shutil
+-from gettext import gettext as _
+ from xml.dom import minidom
+
+ from Onboard import Exceptions
+
+=== modified file 'Onboard/MouseControl.py'
+--- Onboard/MouseControl.py 2012-01-19 08:50:34 +0000
++++ Onboard/MouseControl.py 2012-02-15 23:27:20 +0000
+@@ -5,7 +5,6 @@
+
+ from __future__ import division, print_function, unicode_literals
+
+-from gettext import gettext as _
+ try:
+ import dbus
+ from dbus.mainloop.glib import DBusGMainLoop
+
+=== modified file 'Onboard/OnboardGtk.py'
+--- Onboard/OnboardGtk.py 2012-02-15 10:58:02 +0000
++++ Onboard/OnboardGtk.py 2012-02-15 23:27:20 +0000
+@@ -13,14 +13,14 @@
+ import signal
+ import gettext
+ import os.path
+-from gettext import gettext as _
+ import virtkey
+-
+ from gi.repository import GObject, Gio, Gdk, Gtk
+
++# setup gettext, install _() function for all modules
++app = "onboard"
++gettext.install(app, unicode=True)
+
+ from Onboard.Indicator import Indicator
+-
+ from Onboard.Keyboard import Keyboard
+ from Onboard.Scanner import Scanner
+ from Onboard.KeyGtk import *
+@@ -37,11 +37,6 @@
+ import Onboard.KeyCommon
+ import Onboard.utils as utils
+
+-#setup gettext
+-app="onboard"
+-gettext.textdomain(app)
+-gettext.bindtextdomain(app)
+-
+ DEFAULT_FONTSIZE = 10
+
+ class OnboardGtk(Gtk.Application):
+
+=== modified file 'Onboard/SnippetView.py'
+--- Onboard/SnippetView.py 2012-01-09 22:25:10 +0000
++++ Onboard/SnippetView.py 2012-02-15 23:27:20 +0000
+@@ -4,7 +4,6 @@
+
+ from gi.repository import GObject, Gtk
+
+-from gettext import gettext as _
+
+ from Onboard.utils import show_error_dialog
+
+
+=== modified file 'Onboard/TouchHandles.py'
+--- Onboard/TouchHandles.py 2012-02-14 08:32:08 +0000
++++ Onboard/TouchHandles.py 2012-02-15 23:27:20 +0000
+@@ -5,7 +5,6 @@
+
+ from math import pi, sqrt, sin, log
+ import cairo
+-from gettext import gettext as _
+
+ from Onboard.utils import Rect
+ from Onboard.WindowUtils import Handle
+
+=== modified file 'Onboard/WindowUtils.py'
+--- Onboard/WindowUtils.py 2012-02-15 10:23:36 +0000
++++ Onboard/WindowUtils.py 2012-02-15 23:27:20 +0000
+@@ -5,7 +5,6 @@
+
+ import time
+ from math import sqrt
+-from gettext import gettext as _
+
+ from gi.repository import GObject, Gtk, Gdk
+
+
+=== modified file 'Onboard/settings.py'
+--- Onboard/settings.py 2012-02-15 10:58:02 +0000
++++ Onboard/settings.py 2012-02-15 23:27:20 +0000
+@@ -11,9 +11,14 @@
+ from subprocess import Popen
+ from xml.parsers.expat import ExpatError
+ from xml.dom import minidom
++import gettext
+
+ from gi.repository import GObject, Pango, Gdk, Gtk
+
++# setup gettext, install _() function for all modules
++app = "onboard"
++gettext.install(app, unicode=True)
++
+ from Onboard.KeyboardSVG import KeyboardSVG
+ from Onboard.SnippetView import SnippetView
+ from Onboard.Appearance import Theme, ColorScheme
+@@ -36,14 +41,6 @@
+ config = Config()
+ ########################
+
+-#setup gettext
+-import gettext
+-from gettext import gettext as _
+-app = "onboard"
+-gettext.textdomain(app)
+-gettext.bindtextdomain(app)
+-
+-
+
+ def LoadUI(filebase):
+ builder = Gtk.Builder()
+
+=== modified file 'Onboard/utils.py'
+--- Onboard/utils.py 2012-02-15 01:33:34 +0000
++++ Onboard/utils.py 2012-02-15 23:27:20 +0000
+@@ -11,7 +11,6 @@
+ from subprocess import Popen
+ from math import pi, sqrt, sin
+ from contextlib import contextmanager
+-from gettext import gettext as _
+
+ from gi.repository import GObject, Gtk
+
+
diff --git a/community/onboard/onboard.install b/community/onboard/onboard.install
new file mode 100644
index 000000000..aa4c3e059
--- /dev/null
+++ b/community/onboard/onboard.install
@@ -0,0 +1,13 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ update-desktop-database -q
+ xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
index 4659f948a..f5d92d960 100644
--- a/community/openbox/PKGBUILD
+++ b/community/openbox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64899 2012-02-18 19:57:32Z bpiotrowski $
+# $Id: PKGBUILD 70588 2012-05-12 09:12:54Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,8 +6,8 @@
pkgname=openbox
pkgver=3.5.0
-pkgrel=5
-pkgdesc="A window manager for the X11 windowing system"
+pkgrel=7
+pkgdesc="A highly configurable and lightweight X11 window manager"
arch=('i686' 'x86_64' 'mips64el')
url="http://openbox.org"
license=('GPL')
@@ -18,34 +18,40 @@ groups=('lxde')
install=${pkgname}.install
options=('!libtool')
backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml')
-source=("http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz"
- 'which-2.20.patch')
+source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
+ which-2.20.patch
+ movesize.patch
+ title-matching.patch)
md5sums=('00441b53cf14c03566c8e82643544ff9'
- '7ca3b5244bb092d46f5bcf1e2bdf4a18')
+ '7ca3b5244bb092d46f5bcf1e2bdf4a18'
+ 'e09d77842aac9a0cd7eebe112df88383'
+ '6f99711eee0b1c413dca9fa691917b71')
build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
+ cd "${srcdir}"/${pkgname}-${pkgver}
- # FS#11455
- patch -p1 -i "${srcdir}"/which-2.20.patch
- sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
- data/autostart/openbox-xdg-autostart
+ patch -Np1 -i "${srcdir}"/which-2.20.patch # FS#11455
+ patch -Np1 -i "${srcdir}"/movesize.patch # FS#29812
+ patch -Np0 -i "${srcdir}"/title-matching.patch # FS#5277 on Openbox bugtracker
+
+ sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+ data/autostart/openbox-xdg-autostart
- ./configure --prefix=/usr \
- --with-x \
- --enable-startup-notification \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/openbox
+ ./configure --prefix=/usr \
+ --with-x \
+ --enable-startup-notification \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/openbox
- make
+ make
}
package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
- sed -i "s:startkde:/usr/bin/\0:" \
- "${pkgdir}"/usr/share/xsessions/openbox-kde.desktop
- sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \
- "${pkgdir}"/usr/share/xsessions/openbox-gnome.desktop
+ sed -i "s:startkde:/usr/bin/\0:" \
+ "${pkgdir}"/usr/share/xsessions/openbox-kde.desktop
+ sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \
+ "${pkgdir}"/usr/share/xsessions/openbox-gnome.desktop
}
diff --git a/community/openbox/movesize.patch b/community/openbox/movesize.patch
new file mode 100644
index 000000000..4f0e8595e
--- /dev/null
+++ b/community/openbox/movesize.patch
@@ -0,0 +1,19 @@
+--- openbox-3.5.0/openbox/moveresize.c.orig 2011-08-01 21:14:58.000000000 +0100
++++ openbox-3.5.0/openbox/moveresize.c 2012-03-28 20:04:36.100459920 +0100
+@@ -326,6 +326,16 @@ void moveresize_end(gboolean cancel)
+ #endif
+ }
+
++ if (!moveresize_client) {
++ ob_debug("moveresize_end: moveresize_client is NULL!");
++ return;
++ }
++
++ if (!moveresize_in_progress) {
++ ob_debug("moveresize_end: moveresize_in_progress is FALSE!");
++ return;
++ }
++
+ /* don't use client_move() here, use the same width/height as
+ we've been using during the move, otherwise we get different results
+ when moving maximized windows between monitors of different sizes !
diff --git a/community/openbox/title-matching.patch b/community/openbox/title-matching.patch
new file mode 100644
index 000000000..88ed73546
--- /dev/null
+++ b/community/openbox/title-matching.patch
@@ -0,0 +1,11 @@
+--- openbox/client.c 2011-08-01 22:14:58.000000000 +0200
++++ openbox/client.c 2011-10-22 14:59:56.000000000 +0200
+@@ -883,7 +883,7 @@
+ !g_pattern_match(app->role,
+ strlen(self->role), self->role, NULL))
+ match = FALSE;
+- else if (app->title &&
++ else if (app->title && self->title &&
+ !g_pattern_match(app->title,
+ strlen(self->title), self->title, NULL))
+ match = FALSE;
diff --git a/community/php-geoip/PKGBUILD b/community/php-geoip/PKGBUILD
index 37b59a9be..f3f193205 100644
--- a/community/php-geoip/PKGBUILD
+++ b/community/php-geoip/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57315 2011-10-25 17:20:28Z foutrelis $
+# $Id: PKGBUILD 70501 2012-05-09 18:48:05Z pschmitz $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
pkgname=php-geoip
pkgver=1.0.8
-pkgrel=1
+pkgrel=2
pkgdesc="GeoIP module for PHP"
arch=('i686' 'x86_64' 'mips64el')
url="http://pecl.php.net/package/geoip"
@@ -11,7 +11,7 @@ license=('PHP')
depends=('php' 'geoip')
backup=('etc/php/conf.d/geoip.ini')
source=(http://pecl.php.net/get/geoip-$pkgver.tgz)
-sha1sums=('f8d17da3e192002332ab54b9b4ab0f5deeaf9f15')
+sha256sums=('08beeb2cbe9ab729d06b026795f5b9084aead6a1762493b0be53c4393d68d08a')
build() {
cd "$srcdir/geoip-$pkgver"
diff --git a/community/php-memcache/PKGBUILD b/community/php-memcache/PKGBUILD
index ac2f91fbc..8e9d67f97 100644
--- a/community/php-memcache/PKGBUILD
+++ b/community/php-memcache/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 64649 2012-02-17 13:33:44Z foutrelis $
+# $Id: PKGBUILD 70503 2012-05-09 18:48:11Z pschmitz $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
pkgname=php-memcache
pkgver=3.0.6
-pkgrel=2
+pkgrel=3
pkgdesc="Memcache module for PHP"
arch=('i686' 'x86_64' 'mips64el')
url="http://pecl.php.net/package/memcache"
diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD
index 90338e5ed..fedae5dae 100644
--- a/community/php-memcached/PKGBUILD
+++ b/community/php-memcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69284 2012-04-12 09:18:59Z foutrelis $
+# $Id: PKGBUILD 70505 2012-05-09 18:48:15Z pschmitz $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
pkgname=php-memcached
pkgver=2.0.1
-pkgrel=3
+pkgrel=4
pkgdesc="PHP extension for interfacing with memcached via libmemcached library"
arch=('i686' 'x86_64' 'mips64el')
url="http://pecl.php.net/package/memcached"
diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD
index 8b75abcdd..84b646d14 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.5
+_dcpkgver=2.1.6
# Make sure to bump pkgrel if changing this.
pkgname=pigeonhole
pkgver=0.3.0
-pkgrel=6
+pkgrel=7
pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
arch=('i686' 'x86_64' 'mips64el')
url="http://pigeonhole.dovecot.org/"
diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD
index e85e59349..9df9b58d9 100644
--- a/community/powertop/PKGBUILD
+++ b/community/powertop/PKGBUILD
@@ -1,31 +1,29 @@
-# $Id: PKGBUILD 67110 2012-03-04 12:47:55Z stativ $
+# $Id: PKGBUILD 70596 2012-05-12 11:08:44Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: Xilon <xilonmu@gmail.com>
pkgname=powertop
-pkgver=1.13
-pkgrel=3
-pkgdesc="Tool that finds the software that makes your laptop use more power than necessary"
+pkgver=2.0
+pkgrel=1
+pkgdesc="A tool to diagnose issues with power consumption and power management"
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.lesswatts.org/projects/powertop/"
+url="https://01.org/powertop/"
license=('GPL2')
-depends=('ncurses')
-source=(http://www.lesswatts.org/projects/powertop/download/$pkgname-$pkgver.tar.gz \
- powertop-1.13-with-3.0.6.patch)
-md5sums=('78aa17c8f55178004223bf236654298e'
- '2b4c9d75fb0f5c96bcd549bcbbeb9c9d')
+depends=('libnl' 'ncurses')
+changelog=$pkgname.changelog
+source=(https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.bz2)
+sha256sums=('7af51d320856b3446bcc314c9414385f3b05b9360f650883b0210cd3b12c5c1c')
build() {
- cd "$srcdir/powertop-$pkgver"
-
- # fix the reported batery usage on recent kernels
- patch -Np1 < "$srcdir/powertop-1.13-with-3.0.6.patch" || true
+ cd ${srcdir}/$pkgname-$pkgver
+ ./configure --prefix=/usr
make
}
package() {
- cd "$srcdir/powertop-$pkgver"
- make DESTDIR="$pkgdir" install
+ cd ${srcdir}/$pkgname-$pkgver
+
+ make DESTDIR=${pkgdir} install
}
diff --git a/community/powertop/powertop.changelog b/community/powertop/powertop.changelog
new file mode 100644
index 000000000..7e8deb15d
--- /dev/null
+++ b/community/powertop/powertop.changelog
@@ -0,0 +1,2 @@
+2012-05-12 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+ * powertop 2.0-1
diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD
index b1a5972dd..d6590b9c6 100644
--- a/community/pptpd/PKGBUILD
+++ b/community/pptpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 70218 2012-05-02 13:03:21Z spupykin $
+# $Id: PKGBUILD 70497 2012-05-09 17:18:35Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=pptpd
pkgver=1.3.4
-pkgrel=6
+pkgrel=7
pkgdesc="Poptop server"
arch=(i686 x86_64 'mips64el')
url="http://poptop.sourceforge.net/"
@@ -11,12 +11,15 @@ license=('GPL')
depends=(ppp glibc)
backup=(etc/pptpd.conf)
source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz
- pptpd)
+ pptpd
+ unrecognized-opt.patch)
md5sums=('b38df9c431041922c997c1148bedf591'
- 'e09f81beb5d59a0fdfba94e3a60d992b')
+ 'e09f81beb5d59a0fdfba94e3a60d992b'
+ 'cfa02c86d0413eb94fac15599986f54c')
build() {
cd $srcdir/$pkgname-$pkgver
+ patch -p1 <$srcdir/unrecognized-opt.patch
autoreconf -i
./configure --prefix=/usr --libdir=/usr/lib --exec-prefix=/usr --mandir=/usr/share
make
diff --git a/community/pptpd/unrecognized-opt.patch b/community/pptpd/unrecognized-opt.patch
new file mode 100644
index 000000000..17ec49e52
--- /dev/null
+++ b/community/pptpd/unrecognized-opt.patch
@@ -0,0 +1,13 @@
+diff -wbBur pptpd-1.3.4/pptpctrl.c pptpd-1.3.4.my/pptpctrl.c
+--- pptpd-1.3.4/pptpctrl.c 2006-12-08 03:01:40.000000000 +0300
++++ pptpd-1.3.4.my/pptpctrl.c 2012-05-09 21:13:30.000000000 +0400
+@@ -759,8 +759,8 @@
+ syslog(LOG_DEBUG, "CTRL (PPPD Launcher): remote address = %s", pppaddrs[1]);
+ }
+
+- if (*pppaddrs[0] || *pppaddrs[1]) {
+ char pppInterfaceIPs[33];
++ if (*pppaddrs[0] || *pppaddrs[1]) {
+ sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
+ pppd_argv[an++] = pppInterfaceIPs;
+ }
diff --git a/community/python2-virtkey/PKGBUILD b/community/python2-virtkey/PKGBUILD
new file mode 100644
index 000000000..237f64857
--- /dev/null
+++ b/community/python2-virtkey/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: codl <codl@aquageek.net>
+# Contributor: Megamixman <Megamixman@gmail.com>
+
+pkgname=python2-virtkey
+_pkgname=python-virtkey
+pkgver=0.60.0
+pkgrel=3
+pkgdesc="Python extension for emulating keypresses and getting layout information from the X server"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/python-virtkey"
+license=('LGPL')
+depends=('python2' 'libxtst' 'gtk2')
+replaces=('python-virtkey')
+provides=('python-virtkey')
+source=(http://launchpad.net/$_pkgname/${pkgver%.*}/$pkgver/+download/$_pkgname-$pkgver.tar.gz)
+md5sums=('f4f6776f379bc635a29eac83a14fdde5')
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ python2 setup.py build
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ python2 setup.py install --root=$pkgdir/ --optimize=1
+}
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 7d7806da5..7782b4c54 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63396 2012-02-01 14:18:50Z svenstaro $
+# $Id: PKGBUILD 70483 2012-05-09 14:56:54Z svenstaro $
# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -7,8 +7,8 @@
# Contributor: delor <bartekpiech gmail com>
pkgname="qtcreator"
-pkgver=2.4.1
-_pkgver=2.4.1
+pkgver=2.5.0
+_pkgver=2.5.0
pkgrel=1
pkgdesc='Lightweight, cross-platform integrated development environment'
arch=('i686' 'x86_64' 'mips64el')
@@ -23,11 +23,12 @@ optdepends=('qt-doc: for the integrated Qt documentation'
'openssh-askpass: for ssh support'
'git: for git support'
'mercurial: for mercurial support'
- 'bzr: for bazaar support')
+ 'bzr: for bazaar support'
+ 'valgrind: for analyze support')
install=qtcreator.install
source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz"
'qtcreator.desktop')
-md5sums=('e3a95b86df5ce9151b40cfbb2b8bbf3b'
+md5sums=('31e26cdd1e3eeb8c406382ebe886dcc5'
'f1f4680b9838ff0b8f4cf11eb850d662')
build() {
diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD
index 5f2bedaa8..6aa010178 100644
--- a/community/quvi/PKGBUILD
+++ b/community/quvi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 59896 2011-12-02 07:00:15Z lfleischer $
+# $Id: PKGBUILD 70446 2012-05-07 08:29:18Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: joyfulgirl@archlinux.us
pkgname=quvi
-pkgver=0.4.1
+pkgver=0.4.2
pkgrel=1
pkgdesc='Command-line tool for parsing video download links.'
arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('LGPL')
depends=('libquvi')
options=('!libtool')
source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('0975e3d8cdf570d2143c49c249e698c5'
- '53e2e206c17cb6a38c8c6b7b427b8b4a')
+md5sums=('05f1e2c711d1ca9d4bc68b8de553941d'
+ '523b17d5a9024c8b0a1636917d79e792')
build() {
cd "${pkgname}-${pkgver}"
diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD
index eab94b895..8475ae2aa 100644
--- a/community/r8168-lts/PKGBUILD
+++ b/community/r8168-lts/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 68866 2012-04-04 09:58:28Z mtorromeo $
+# $Id: PKGBUILD 70550 2012-05-11 07:05:32Z mtorromeo $
# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
pkgname=r8168-lts
_pkgname=r8168
-pkgver=8.028.00
-pkgrel=4
+pkgver=8.029.00
+pkgrel=1
pkgdesc="A kernel module for Realtek 8168 network cards for kernel26-lts"
url="http://www.realtek.com.tw"
license=("GPL")
@@ -28,5 +28,5 @@ package() {
find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
}
-md5sums=('4cc3c1706f00b55ab9bd6f5e06b758c2')
-sha256sums=('c77873f43693eea5304e17e35ff3d6503f6581e358d28c38927573ea56f4d6a3')
+md5sums=('5dc15a976950250b7b543876cc3350a8')
+sha256sums=('211a2994c9caf57321dafdb3acdfaa877f0b3f447798dc2abd2e417db3b0e515')
diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD
index 8c3ed34d6..653f04467 100644
--- a/community/roxterm/PKGBUILD
+++ b/community/roxterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69819 2012-04-23 17:44:21Z ttopper $
+# $Id: PKGBUILD 70468 2012-05-08 20:11:39Z ttopper $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
# Contributor: Alexander Fehr <pizzapunk gmail com>
pkgname=roxterm
-pkgver=2.6.2
+pkgver=2.6.3
pkgrel=1
pkgdesc="Tabbed, VTE-based terminal emulator"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm')
makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg')
install=roxterm.install
source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2")
-sha1sums=('eca312666a1ff1412df2cddf93a12631c01d1a3a')
-md5sums=('5e5dc51b3341855fdb392f736476d89d')
+sha1sums=('f6f64cf35163338e539bdbc952d470b4a9217f9a')
+md5sums=('3089fc54b3c9bb8f8e087280bf96b037')
build() {
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index 8711dda85..58124460e 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69744 2012-04-23 09:08:15Z ibiru $
+# $Id: PKGBUILD 70567 2012-05-11 20:13:47Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
pkgname=shotwell
-pkgver=0.12.2
+pkgver=0.12.3
pkgrel=1
pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('libgee' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
makedepends=('intltool' 'vala')
install=shotwell.install
source=("http://yorba.org/download/shotwell/0.12/shotwell-${pkgver}.tar.bz2")
-md5sums=('ce3a3204ca3c1dd451ac43e3b80c28d9')
+md5sums=('de0e05350f8a7d557092489baf14d039')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/soundkonverter/PKGBUILD b/community/soundkonverter/PKGBUILD
index e3ccf47d2..8fcdfbc57 100644
--- a/community/soundkonverter/PKGBUILD
+++ b/community/soundkonverter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68236 2012-03-20 07:50:05Z stativ $
+# $Id: PKGBUILD 70533 2012-05-10 17:21:08Z stativ $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Darwin Bautista <djclue917@gmail.com>
pkgname=soundkonverter
-pkgver=1.4.0
+pkgver=1.5.0
pkgrel=1
pkgdesc="Front-end to various audio converters"
arch=('i686' 'x86_64' 'mips64el')
@@ -31,7 +31,7 @@ optdepends=('cdrkit: cdda2wav backend'
'wavpack: wavpack backend')
install=$pkgname.install
source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz")
-md5sums=('4d3d1ccab74c2dd41971c3a4a4e7fb57')
+md5sums=('9cb8dcf64bd257965a227d79e3c6e7fb')
build() {
cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index 5c74ce8df..8e63fd069 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 69659 2012-04-22 00:48:23Z seblu $
+# $Id: PKGBUILD 70458 2012-05-08 13:27:24Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
# Contributor: Jason Rodriguez <jason-aur@catloaf.net>
pkgname=sslh
-pkgver=1.11
+pkgver=1.12
pkgrel=1
pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.rutschle.net/tech/sslh.shtml'
license=('GPL2')
-backup=('etc/conf.d/sslh')
+depends=('libconfig')
+backup=('etc/conf.d/sslh' 'etc/sslh.conf')
source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz"
'sslh.rc'
'sslh.conf'
'sslh.service')
-md5sums=('4ea599f0fa31ae235646e5a200b8f8fb'
- 'f64da291e97f1a99c33cb6ebf939b95b'
- 'a098fb6b03a3435b223e16aed0e65e0b'
+md5sums=('265014ecdae4512eacca91aaff0b9a81'
+ 'e1c44f8160b7fef397f81db63eec8421'
+ 'c51c63d2b28080bae4c1c7a0c469bab7'
'ee8a4fcfc1f6839f7c93deb6f59f7fd6')
build() {
cd $pkgname-$pkgver
# fix archlinux path in manpage
- sed -i -e "s/init.d/rc.d/" sslh.pod
- sed -i -e "s+/etc/default+/etc/conf.d+" sslh.pod
+ sed -i 's/init.d/rc.d/' sslh.pod
+ sed -i 's+/etc/default+/etc/conf.d+' sslh.pod
+ # remove default pidfile in example
+ sed -i '/pidfile:/d' example.cfg
+ # daemon mode by default (as not overridable in command line)
+ sed -i 's/foreground: true;/foreground: false;/' example.cfg
make
}
@@ -40,6 +45,7 @@ package() {
install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select"
ln -s sslh-fork "$pkgdir/usr/bin/sslh"
install -Dm 0644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz"
+ install -Dm 0644 example.cfg "$pkgdir/etc/sslh.conf"
}
# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/sslh/sslh.conf b/community/sslh/sslh.conf
index b22a325ef..d3a46d053 100644
--- a/community/sslh/sslh.conf
+++ b/community/sslh/sslh.conf
@@ -1,3 +1,3 @@
# vim:set ts=2 sw=2 ft=sh noet:
-DAEMON_OPTS='-p 192.168.0.1:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443 -u nobody'
+DAEMON_OPTS='-F /etc/sslh.conf'
diff --git a/community/sslh/sslh.rc b/community/sslh/sslh.rc
index 9c31435a0..cd5397cad 100644
--- a/community/sslh/sslh.rc
+++ b/community/sslh/sslh.rc
@@ -4,31 +4,30 @@
. /etc/rc.d/functions
. /etc/conf.d/${0##*/}
-NAME=sslh
DAEMON=/usr/bin/sslh
PID=$(pidof -o %PPID $DAEMON)
case "$1" in
- start)
- stat_busy "Starting $NAME daemon"
- [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0
- stat_fail
- ;;
+ start)
+ stat_busy "Starting ${0##*/} daemon"
+ [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
+ stat_fail
+ ;;
stop)
- stat_busy "Stopping $NAME daemon"
- [[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0
- stat_fail
- ;;
+ stat_busy "Stopping ${0##*/} daemon"
+ [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
+ stat_fail
+ ;;
restart)
- $0 stop
- $0 start
- exit 0
- ;;
+ $0 stop
+ $0 start
+ exit 0
+ ;;
*)
- echo "usage: ${0##*/} {start|stop|restart}" >&2
- ;;
+ echo "usage: ${0##*/} {start|stop|restart}" >&2
+ ;;
esac
exit 1
-# vim:set ts=2 sw=2 ft=sh noet:
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/xapian-core/PKGBUILD b/community/xapian-core/PKGBUILD
index 14a00e706..56c0aba25 100644
--- a/community/xapian-core/PKGBUILD
+++ b/community/xapian-core/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68835 2012-04-03 16:30:36Z foutrelis $
+# $Id: PKGBUILD 70569 2012-05-11 20:14:44Z spupykin $
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: William Rea <sillywilly@gmail.com>
# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=xapian-core
-pkgver=1.2.9
+pkgver=1.2.10
pkgrel=1
pkgdesc='Open source search engine library.'
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('sh' 'gcc-libs' 'zlib' 'util-linux')
# xapian config requires libxapian.la
options=('libtool')
source=("http://oligarchy.co.uk/xapian/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('909dd02931fe8f37690aa82a4daaa441')
+md5sums=('c773df1aa9a84d3a056863532a7f6519')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD
index 0c25492a4..5a2244bb9 100644
--- a/community/xdebug/PKGBUILD
+++ b/community/xdebug/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68086 2012-03-17 18:57:19Z spupykin $
+# $Id: PKGBUILD 70507 2012-05-09 18:48:25Z pschmitz $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jonathan Wiersma <arch aur at jonw dot org>
# Contributor: Jonathan Wiersma <arch aur at jonw dot org>
# Contributor: sracker <smb.sac@gmail.com>
pkgname=xdebug
-pkgver=2.1.4
+pkgver=2.2.0
pkgrel=1
pkgdesc="PHP debugging extension"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ backup=('etc/php/conf.d/xdebug.ini')
source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz
xdebug-5.2.ini
xdebug.ini)
-md5sums=('0a1339ad8053eface15ed6420a295939'
+md5sums=('27d8ad8224ffab04d12eecb5997a4f5d'
'6b7fdbbe0bf381bda40e77e29981f439'
'68de800943369d4c76bdf7eb35c8463b')