diff options
Diffstat (limited to 'community')
130 files changed, 2796 insertions, 534 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD index b36205e09..77a3bcae9 100644 --- a/community/0ad/PKGBUILD +++ b/community/0ad/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com> pkgname=0ad -pkgver=a9 -_pkgver=r11339-alpha +pkgver=a10 +_pkgver=r11863-alpha pkgrel=1 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL2' 'CCPL') depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'gamin' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'openexr' 'python2' 'sdl' 'wxgtk' 'zip' 'zlib' 'libgl' '0ad-data') makedepends=('boost' 'cmake' 'mesa') source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz") -md5sums=('6db1e62215654269516f5eb1eec371f1') +md5sums=('f42a2e18515cbcd48b99f0ea3796b3a4') build() { cd "$srcdir/$pkgname-$_pkgver/build/workspaces" diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index 53ff54a87..677e10b47 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69396 2012-04-15 17:01:41Z seblu $ +# $Id: PKGBUILD 70904 2012-05-18 22:37:04Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: xduugu # Contributor: Manolis Tzanidakis @@ -6,7 +6,7 @@ pkgname=acpid pkgver=2.0.16 -pkgrel=1 +pkgrel=2 pkgdesc='A daemon for delivering ACPI power management events with netlink support' arch=('i686' 'x86_64') url='http://tedfelix.com/linux/acpid-netlink.html' @@ -16,15 +16,19 @@ optdepends=('perl: use perl based examples') replaces=('acpid2') backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid') source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz" - 'acpid' + 'acpid.rc' + 'acpid.conf' + 'acpid.socket' + 'acpid.service' 'anything' - 'handler.sh' - 'acpid.conf.d') + 'handler.sh') md5sums=('d59fc02c9c34f0d5c137495302e2c074' - 'd69203a032c4583f9abaafcf21a7ed84' + '077475c75fbdd9de75f9a397130ccd91' + '929c6d2e91295c22ed9ec6212d7eabef' + 'ee6cb99e50e580c50331a73045412ae9' + '953e26477c5d4f5f013d6861c04b4af6' '2d37b98d6e74bab815604b8b48c6cfd4' - '615439f4a89716c747907d4fc3c8df75' - '929c6d2e91295c22ed9ec6212d7eabef') + '74ee3c33714ff5cb44f30c9a0dceeef0') build() { cd $pkgname-$pkgver @@ -33,15 +37,22 @@ build() { } package() { - cd $pkgname-$pkgver + pushd $pkgname-$pkgver make DESTDIR="$pkgdir" install + popd + + # default config + install -Dm644 anything "$pkgdir/etc/acpi/events/anything" + install -Dm755 handler.sh "$pkgdir/etc/acpi/handler.sh" - install -Dm755 ../acpid "$pkgdir/etc/rc.d/acpid" - install -Dm644 ../anything "$pkgdir/etc/acpi/events/anything" - install -Dm755 ../handler.sh "$pkgdir/etc/acpi/handler.sh" - install -Dm644 ../acpid.conf.d "$pkgdir/etc/conf.d/acpid" + # initscripts + install -Dm755 acpid.rc "$pkgdir/etc/rc.d/acpid" + install -Dm644 acpid.conf "$pkgdir/etc/conf.d/acpid" + install -Dm644 acpid.socket "$pkgdir/usr/lib/systemd/system/acpid.socket" + install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service" - chmod 755 "$pkgdir"/usr/sbin/acpid + # fix acpid rights + chmod 755 "$pkgdir/usr/sbin/acpid" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/acpid/acpid.conf b/community/acpid/acpid.conf new file mode 100644 index 000000000..b60103a2d --- /dev/null +++ b/community/acpid/acpid.conf @@ -0,0 +1,5 @@ +# +# Arguments to be passed to the acpid daemon +# + +ACPID_ARGS="" diff --git a/community/acpid/acpid.rc b/community/acpid/acpid.rc new file mode 100644 index 000000000..674f4621b --- /dev/null +++ b/community/acpid/acpid.rc @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +[[ -f /etc/conf.d/acpid ]] && . /etc/conf.d/acpid + +PID=$(pidof -o %PPID /usr/sbin/acpid) +case "$1" in + start) + stat_busy "Starting acpid" + [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon acpid + stat_done + fi + ;; + stop) + stat_busy "Stopping acpid" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon acpid + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/acpid/acpid.service b/community/acpid/acpid.service new file mode 100644 index 000000000..31fcc0575 --- /dev/null +++ b/community/acpid/acpid.service @@ -0,0 +1,7 @@ +[Unit] +Description=ACPI event daemon +Requires=acpid.socket + +[Service] +EnvironmentFile=/etc/conf.d/acpid +ExecStart=/usr/sbin/acpid -f $ACPID_ARGS diff --git a/community/acpid/acpid.socket b/community/acpid/acpid.socket new file mode 100644 index 000000000..1e5365bf1 --- /dev/null +++ b/community/acpid/acpid.socket @@ -0,0 +1,8 @@ +[Unit] +Description=ACPID Listen Socket + +[Socket] +ListenStream=/run/acpid.socket + +[Install] +WantedBy=sockets.target diff --git a/community/acpid/handler.sh b/community/acpid/handler.sh index aac143a9a..b5a548f43 100644 --- a/community/acpid/handler.sh +++ b/community/acpid/handler.sh @@ -9,16 +9,24 @@ set $* case "$1" in button/power) - #echo "PowerButton pressed!">/dev/tty5 case "$2" in - PBTN|PWRF) logger "PowerButton pressed: $2" ;; - *) logger "ACPI action undefined: $2" ;; + PBTN|PWRF) + logger "PowerButton pressed: $2" + poweroff + ;; + *) + logger "ACPI action undefined: $2" + ;; esac ;; button/sleep) case "$2" in - SLPB|SBTN) echo -n mem >/sys/power/state ;; - *) logger "ACPI action undefined: $2" ;; + SLPB|SBTN) + echo -n mem >/sys/power/state + ;; + *) + logger "ACPI action undefined: $2" + ;; esac ;; ac_adapter) @@ -28,43 +36,51 @@ case "$1" in 00000000) echo -n $minspeed >$setspeed #/etc/laptop-mode/laptop-mode start - ;; + ;; 00000001) echo -n $maxspeed >$setspeed #/etc/laptop-mode/laptop-mode stop - ;; + ;; esac ;; - *) logger "ACPI action undefined: $2" ;; + *) + logger "ACPI action undefined: $2" + ;; esac ;; battery) case "$2" in BAT0) case "$4" in - 00000000) #echo "offline" >/dev/tty5 - ;; - 00000001) #echo "online" >/dev/tty5 - ;; + 00000000) + logger 'Battery online' + ;; + 00000001) + logger 'Battery offline' + ;; esac ;; - CPU0) + CPU0) ;; *) logger "ACPI action undefined: $2" ;; esac ;; button/lid) - case "$3" in - close) - #echo "LID closed!">/dev/tty5 - ;; - open) - #echo "LID opened!">/dev/tty5 - ;; - esac - ;; - + case "$3" in + close) + logger 'LID closed' + ;; + open) + logger 'LID opened' + ;; + *) + logger "ACPI action undefined: $3" + ;; + esac + ;; *) logger "ACPI group/action undefined: $1 / $2" ;; esac + +# vim:set ts=4 sw=4 ft=sh et: diff --git a/community/armagetronad/PKGBUILD b/community/armagetronad/PKGBUILD index 431cf4344..7b9972f5f 100644 --- a/community/armagetronad/PKGBUILD +++ b/community/armagetronad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68998 2012-04-07 15:11:48Z kkeen $ +# $Id: PKGBUILD 70736 2012-05-16 00:12:56Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Filippo 'JoeyrS' Civiletti <joeyrs@gmail.com> pkgname=armagetronad pkgver=0.2.8.3.2 -pkgrel=1 +pkgrel=2 pkgdesc='A Tron Clone in 3D.' arch=('i686' 'x86_64' 'mips64el') url='http://armagetronad.net/' @@ -35,6 +35,9 @@ package() { cd "$srcdir/armagetronad-$pkgver" make DESTDIR="$pkgdir" install install -D -m 644 "desktop/armagetronad.desktop" "$pkgdir/usr/share/applications/armagetronad.desktop" + install -d "$pkgdir/usr/share/pixmaps/" + ln -s /usr/share/armagetronad/desktop/icons/large/armagetronad.png \ + "$pkgdir/usr/share/pixmaps/armagetronad.png" mv "$pkgdir/usr/bin/armagetronad" "$pkgdir/usr/bin/armagetronad_bin" printf "#!/bin/bash\n/usr/bin/armagetronad_bin --configdir /etc/armagetronad --datadir /usr/share/armagetronad" > "$pkgdir/usr/bin/armagetronad" chmod +x "$pkgdir/usr/bin/armagetronad" 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/bcg729/PKGBUILD b/community/bcg729/PKGBUILD new file mode 100644 index 000000000..23cb66cf3 --- /dev/null +++ b/community/bcg729/PKGBUILD @@ -0,0 +1,25 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=bcg729 +pkgver=1.0.0 +pkgrel=2 +pkgdesc="g729 codec" +arch=('i686' 'x86_64') +url="http://www.linphone.org/eng/documentation/dev/bcg729.html" +license=('GPL') +depends=('mediastreamer') +options=('!libtool') +source=(http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/bcg729-$pkgver.tar.gz) +md5sums=('45e127a9a309aff94d3262d97b5aeab0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} 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/ccrtp/PKGBUILD b/community/ccrtp/PKGBUILD index 25595a7d7..311579ea4 100644 --- a/community/ccrtp/PKGBUILD +++ b/community/ccrtp/PKGBUILD @@ -1,41 +1,30 @@ -# $Id: PKGBUILD 64382 2012-02-12 15:47:02Z arodseth $ +# $Id: PKGBUILD 70714 2012-05-15 11:37:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ccrtp -pkgver=1.8.0 -pkgrel=2 +pkgver=2.0.3 +pkgrel=1 pkgdesc="GNU ccRTP" arch=('x86_64' 'i686' 'mips64el') url="http://www.gnu.org/software/ccrtp/" license=('GPL' 'custom') -depends=('commoncpp2' 'zlib' 'libxml2' 'libgcrypt') +depends=('zlib' 'libxml2' 'libgcrypt' 'ucommon') options=('!libtool') install=$pkgname.install -source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" - 'gcc46.patch') -sha256sums=('365feddd276c78104600204ae6db4e76c66036df1e5b905e855239daac6a2473' - '4ac9385228dc8b8893e0868d5a06477e4009e9fb2dc191460406da58fc6a6fb3') +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") +sha256sums=('365feddd276c78104600204ae6db4e76c66036df1e5b905e855239daac6a2473') build() { cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 -i "$srcdir/gcc46.patch" - # arch64 fix from Mandriva - [ "$CARCH" == "x86_64" ] && export CXXFLAGS="$CXXFLAGS -fpermissive" - export LDFLAGS="$LDFLAGS `pkg-config --libs libccgnu2`" ./configure --prefix=/usr --mandir=/usr/share/man make } package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install install -Dm644 COPYING.addendum "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - #rm -rf "$pkgdir/usr/share/info/dir" } - -# vim:set ts=2 sw=2 et: 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/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index 0346592a0..32dcd10e3 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68423 2012-03-24 13:07:55Z lfleischer $ +# $Id: PKGBUILD 70879 2012-05-18 11:38:46Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef -pkgver=0.5.2 -pkgrel=1 +pkgver=0.5.4 +pkgrel=2 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64' 'mips64el') url='http://deadbeef.sourceforge.net' @@ -12,7 +12,7 @@ license=('GPL2') depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' 'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' - 'libsamplerate') + 'libsamplerate' 'yasm') optdepends=('libsamplerate: for Resampler plugin' 'libvorbis: for Ogg Vorbis playback' 'libmad: for MP1/MP2/MP3 playback' @@ -33,7 +33,7 @@ optdepends=('libsamplerate: for Resampler plugin' options=('!libtool') install='deadbeef.install' source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('0810c1b609b6c1ca43578ebf321fdec4') +md5sums=('062b7c15d21e383a54e43b3e8076d8e3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD index ace0834a4..51037ff0d 100644 --- a/community/dmenu/PKGBUILD +++ b/community/dmenu/PKGBUILD @@ -27,5 +27,4 @@ package() { cd $srcdir/$pkgname-$pkgver make PREFIX=/usr DESTDIR=$pkgdir install install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} -md5sums=('85204de9ac040e0ba544978ce6d6a105') +}
\ No newline at end of file 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/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD index 1dc0c2a38..ade9c7dae 100644 --- a/community/doublecmd/PKGBUILD +++ b/community/doublecmd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70226 2012-05-02 13:40:27Z idevolder $ +# $Id: PKGBUILD 70846 2012-05-17 18:29:58Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: (sirocco AT ngs.ru) @@ -6,7 +6,7 @@ pkgbase=doublecmd pkgname=('doublecmd-gtk2' 'doublecmd-qt') pkgver=0.5.4 _helpver=0.5.1 -pkgrel=2 +pkgrel=2.1 url="http://doublecmd.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD index a2bb91007..44cd7b43e 100644 --- a/community/fpc/PKGBUILD +++ b/community/fpc/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 61619 2012-01-04 22:27:59Z spupykin $ +# $Id: PKGBUILD 70842 2012-05-17 18:20:47Z idevolder $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Valeriy Lyasotskiy <onestep@ukr.net> # Contributor: Jan Willemson <janwil@hot.ee> # Contributor: Hugo Ideler <hugoideler@dse.nl> +# Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Original PKGBUILD: Andre Naumann <anaumann@SPARCed.org> # See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc pkgname=fpc pkgver=2.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library." arch=('i686' 'x86_64' 'mips64el') url="http://www.freepascal.org/" @@ -45,6 +46,9 @@ package() { mkdir -p ${pkgdir}/etc ${pkgdir}/usr/lib/fpc/${pkgver}/samplecfg $pkgdir/usr/lib/fpc/${pkgver} ${pkgdir}/etc + # use -fPIC by default + echo -e "#ifdef cpux86_64\n# for x86_64 use -fPIC by default\n-Cg\n#endif" >> "$pkgdir/etc/fpc.cfg" + mv $pkgdir/usr/man $pkgdir/usr/share/ find $pkgdir/etc/ -type f -exec sed -i "s|$pkgdir||g" {} \; diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD new file mode 100644 index 000000000..ad30d215f --- /dev/null +++ b/community/freeorion/PKGBUILD @@ -0,0 +1,100 @@ +# $Id: PKGBUILD 70724 2012-05-15 19:44:31Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: guini <sidtrun@googlemail.com> +# Contributor: Forrest Loomis <cybercyst _ at _ gmail dot com> +# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: fana-m <geminin@gmx.net> + +pkgname=freeorion +pkgver=0.4 +_fixedrevision=4635 +pkgrel=5 +pkgdesc="Turn-based galactic conquest game inspired by Master of Orion" +arch=('x86_64' 'i686') +url="http://www.freeorion.org/" +license=('GPL') +if [ "$CARCH" == "x86_64" ] +then + depends=('lib32-nvidia-cg-toolkit') +else + depends=('nvidia-cg-toolkit') +fi +depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils') +makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-10' 'graphviz' 'libogg' + 'desktop-file-utils' 'setconf' 'clang' 'cmake' 'gendesk' 'subversion') +options=('!strip' '!emptydirs') +install=$pkgname.install +source=("$pkgname.sh") +sha256sums=('111532e460aec847ff455ee67dd64f46e2fa5ceba39a0349d25a84b69c646eaf') + +build() { + cd "$srcdir" + gendesk + + msg2 "Checking out svn revision $_fixedrevision..." + if [[ -d "$pkgname/.svn" ]]; then + (cd "$pkgname" && svn up -r "$_fixedrevision") + else + svn co \ + https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/ \ + --config-dir ./ -r "$_fixedrevision" "$pkgname" + fi + + msg2 "Setting up build directory..." + rm -rf "$srcdir/$pkgname-build" + cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build" + cd "$srcdir/$pkgname-build" + + msg2 "Generating makefiles..." + cmake -G "Unix Makefiles" + + msg2 "GLU fix..." + setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING "'-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU '" + + msg2 "Compiling..." + make -j1 + + msg2 "OGRE fix..." + sed -i 's:PluginFolder=.:PluginFolder=/usr/lib/OGRE/:g' \ + "$srcdir/$pkgname-build/ogre_plugins.cfg" +} + +package() { + cd "$srcdir/$pkgname-build" + + msg2 "Packaging documentation..." + install -Dm644 loki_setup/README.txt \ + "$pkgdir/usr/share/doc/$pkgname/README.txt" + + msg2 "Packaging binaries..." + install -Dm 755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/freeorion" + install -Dm 755 freeorion "$pkgdir/usr/bin/freeorion.elf" + install -Dm 755 freeorionca "$pkgdir/usr/bin/freeorionca" + install -Dm 755 freeoriond "$pkgdir/usr/bin/freeoriond" + + msg2 "Packaging data..." + mkdir -p "$pkgdir/usr/share/$pkgname" "$pkgdir/usr/lib/$pkgname" + cp -r default "$pkgdir/usr/share/$pkgname" + install -Dm 644 OISInput.cfg "$pkgdir/usr/share/OISInput.cfg" + + msg2 "Packaging license..." + install -Dm 644 default/COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + cd "$srcdir" + + msg2 "Packaging icon and shortcut..." + install -Dm 644 "$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/freeorion.png" + install -Dm 644 "$pkgname.desktop" \ + "$pkgdir/usr/share/applications/freeorion.desktop" + + msg2 "Packaging OGRE plugins configuration..." + install -Dm 644 "$srcdir/$pkgname-build/ogre_plugins.cfg" \ + "$pkgdir/usr/share/freeorion/ogre_plugins.cfg" + + msg2 "Cleaning up..." + find "$pkgdir" -name ".svn" -print0 | xargs -0 rm -rf +} + +# vim:set ts=2 sw=2 et: diff --git a/community/freeorion/freeorion.install b/community/freeorion/freeorion.install new file mode 100644 index 000000000..ad97d7bab --- /dev/null +++ b/community/freeorion/freeorion.install @@ -0,0 +1,13 @@ +post_upgrade() { + update-desktop-database -q +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/freeorion/freeorion.sh b/community/freeorion/freeorion.sh new file mode 100644 index 000000000..d80623ab2 --- /dev/null +++ b/community/freeorion/freeorion.sh @@ -0,0 +1,143 @@ +#!/bin/sh +# +# written by Markus Sinner, http://psitronic.de +# +# Nightly builds on. +# http://freeorion.psitronic.de/download/nightly/ +# +# This is a wrapper-script for starting FreeOrion on +# ix86 (and maybe x64) Linux Systems. +# This script will CD into application and set some +# enviroment variables. + +# ---- commandline PARAMETERS and ENVIROMENT variables ----- +# This script supports parameters, that will be evaluated +# BEFORE freeorion binary is called and will be removed, +# because the binary won't support them. +# Currently only one parameter at a time is supported! +# Parameters other than these will be appended as command +# line parameters to the call of the freeorion binary. +# +# --strace +# This starts freeorion using the "strace" utility. +# Generates a strace logifle /tmp/freeorion.trace. +# Make sure it is installed on your system! +# --gdb +# Runs freeorion in a gdb instance, passes the original +# parameters through the --args parameter of gdb +# +# +# ENVIROMENT variables +# This script supports some enviroment variables. To set them +# either use the followin command BEFORE you execute this script. +# export XXXX="value" +# This permanently set the variable in you current shell script. +# Or you prepend the options when running this script, like this: +# PARAM1="hello" PARAM2="yo man" /usr/bin/freeorion.elf +# +# Supportet are: +# FO_TRACE= +# Use this to prepend something to calling freorion. +# This variables also is used internally, when --gdb or --trace +# appear on the command line. +# FO_GDB_ARGS= +# If you use --gbd, you should uses this env to add GDB parameters. +# Make sure you end this list of parameters with --args, otherwise +# gdb won't start. Example: FO_GDB_ARGS="-q -s fo.symbols --args" +# LD_LIBRARY_PATH= +# This is a well known env and will be honored by this script. +# + + +# ---------- STARTS HERE --------------- +# Change into application directory +# If this is a symlink, then we +# need to change into the dir of symlink-target. +if [ -h $0 ]; then + echo "I am Symlink. Following into my targets basedir" + ME=`readlink $0` +else + echo "Following into my basedir" + ME=$0 +fi + +# This is important! Script won't work outside its installation dir +ROOT=/usr/share/freeorion +cd ${ROOT} +echo -n "CWD: " +pwd + + + +# Check for python. If freeorionca binary is missing it, use +# the shipped version. +if ldd /usr/bin/freeorionca | grep "libpython.*not found"; then + #echo "python2.5 missing. Using shipped version." + PYTHON_USE_SHIPPED=1 +else + #echo "python2.5 found. Using it." + PYTHON_USE_SHIPPED=0 +fi + +# Set Python library home for loading modules +# If no python 2.5 is detected, use shipped python 2.5 +if [ "$PYTHON_USE_SHIPPED" = "1" ]; then + export PYTHONHOME=/usr/lib/freeorion/python2.5 + export PYTHONPATH=${PYTHONHOME} + export PYTHONDEBUG=1 + export PYTHONVERBOSE=1 + echo "PYTHONHOME=${PYTHONHOME}" + + export LD_LIBRARY_PATH=${PYTHONHOME}:${LD_LIBRARY_PATH} + export LD_PRELOAD=${PYTHONHOME}/libutil.so.1:${PYTHONHOME}/libpython2.5.so +fi + + +# Command line Parameter --gdb forces running in gdb +# Setting FO_TRACE to gdb results in other settings, see +# below +if [ "$1" = "--gdb" ]; then + FO_TRACE="gdb" + + # Don't forget to remove the param + shift +fi + +if [ "$1" = "--strace" ]; then + TRACEFILE=/tmp/freeorion.trace + echo + echo "Tracing to ${TRACEFILE}" + echo + FO_TRACE="strace -f -o ${TRACEFILE}" + + # Don't forget to remove the param + shift +fi + + + +# Add a parameter FO_GDB_ARGS to support gdb +# Or warn the user, if he changed FO_GDB_ARGS and has +# forgotten to end it with --args +if [ "$FO_TRACE" = "gdb" ]; then + if [ "$FO_GDB_ARGS" = "" ]; then + FO_GDB_ARGS="--args" + else + echo "****************************************************" + echo "** NOTE NOTE NOTE NOTE **" + echo "Running FO in gdb" + echo "If you use FO_GDB_ARGS on your command line, make" + echo "sure that you END this variabble with --args." + echo "Otherwise gdb will not start." + echo + echo "Type 'start' when the gdb instance has loaded!" + echo + fi +fi + + +# Support loading libs from application/lib +export LD_LIBRARY_PATH=./lib:${LD_LIBRARY_PATH} + +# Call with settings-dir to avoid conflicting installations +${FO_TRACE} ${FO_GDB_ARGS} /usr/bin/freeorion.elf --resource-dir ./default $@ diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD index 0e24fe037..4975ecdc6 100644 --- a/community/freerdp/PKGBUILD +++ b/community/freerdp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64460 2012-02-14 00:48:20Z spupykin $ +# $Id: PKGBUILD 70706 2012-05-15 10:37:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stijn Segers <francesco dot borromini at gmail dot com> pkgname=freerdp pkgver=1.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Free RDP client" arch=('i686' 'x86_64' 'mips64el') url="http://freerdp.sourceforge.net" @@ -19,12 +19,12 @@ source=(https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-$pkgver.tar.gz) md5sums=('c843185e0ff22ce8409954651718f338') build() { - cd "$srcdir/freerdp-$pkgver" + cd `find ${srcdir}/ -type d -name freerdp-\*` cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib . make } package() { - cd "$srcdir/freerdp-$pkgver" + cd `find ${srcdir}/ -type d -name freerdp-\*` make DESTDIR="${pkgdir}" install } diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD new file mode 100644 index 000000000..db11176b4 --- /dev/null +++ b/community/gigi/PKGBUILD @@ -0,0 +1,79 @@ +# $Id: PKGBUILD 70696 2012-05-15 08:07:41Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: fana-m <geminin@gmx.net> +# Contributor: Andrzej Giniewicz <gginiu@gmail.com> +# Contributor: Manuel Gaul <inkaine@hotmail.com> + +pkgname=gigi +pkgver=0.8.0 +pkgrel=10 +_fixedrevision=1074 +pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL" +url="http://gigi.sourceforge.net/" +arch=('x86_64' 'i686') +license=('LGPL') +depends=('boost' 'mesa' 'libpng' 'libjpeg' 'libtiff' 'freetype2' 'ogre' 'sdl' 'ois' 'python') +makedepends=('subversion' 'cmake' 'setconf' 'doxygen') +conflicts=('gigi-svn' 'mesa-full') + +build() { + cd "$srcdir" + + msg2 "Fetching files..." + if [ -d gigi/.svn ]; then + (cd gigi && svn up -r "$_fixedrevision") + else + svn co https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/ \ + --config-dir ./ -r "$_fixedrevision" gigi + fi + + rm -rf gigi-build + svn export gigi gigi-build + cd gigi-build + + msg2 "Patching..." + sed -i 's/move_backward(/adobe::move_backward(/g' GG/adobe/vector.hpp + sed -i 's/__GNUC_MINOR__ <= 6/__GNUC_MINOR__ <= 999/g' GG/adobe/cmath.hpp + sed -i 's/insert(adobe/this->insert(adobe/g' GG/adobe/closed_hash.hpp + + msg2 "Configuring..." + setconf cmake/GiGiOgre.pc.in prefix /usr + setconf cmake/GiGi.pc.in prefix /usr + setconf cmake/GiGiSDL.pc.in prefix /usr + cmake \ + -D CMAKE_INSTALL_PREFIX="$pkgdir"/usr \ + -D BUILD_TUTORIALS=OFF \ + -D CPACK_GENERATOR=GiGiDevel \ + -D CMAKE_C_FLAGS_RELEASE="-DNDEBUG" \ + . + + msg2 "Building documentation..." + cd doc + doxygen + cd .. + + msg2 "Compiling..." + make -j1 +} + +package() { + cd "$srcdir/gigi-build" + + msg2 "Packaging files..." + make install + + msg2 "Fixing documentation..." + mkdir -p "$pkgdir/usr/share/doc" + mv "$pkgdir/usr/doc" "$pkgdir/usr/share/doc/$pkgname" + + for f in `find "$pkgdir/usr/share/doc" -name "dir_*.html"`; do + sed -i "s:$srcdir:/:g" "$f" + done + + msg2 "Packaging license..." + install -Dm 644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index 938929724..f76929bc1 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69964 2012-04-27 11:53:11Z jconder $ +# $Id: PKGBUILD 70738 2012-05-16 07:55:23Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.4.1 +pkgver=3.4.2 pkgrel=1 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') @@ -15,19 +15,9 @@ install=$_pkgname.install url="http://www.gnome.org" source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz" 'systemd-fallback.patch' - 'evironment.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=9d7ea1d0b8b90b55f916751858a210a2e02a06b6' - 'arguments.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=00681573ad6ebeb127ec72ac61d30d69be6459f8' - 'mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=053f48b3b1b9a3b2ab0714d470da4354735d0c4b' - 'glist-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=214a832820f6448f07d438f6686267eaf8301dd1' - 'mouse-mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=09c215b42312ca5bb63b215c2f95231613b3103d' 'arch.patch') -sha256sums=('d5d4a270ec5692cdc56a58cfb57bc7f8fa93374566912a65e78c1c3db7faf4ed' +sha256sums=('00499118c80474981f3389ef518e2d001f1b1a3b1fb78e54859d59f3bee38ff4' '82b721d0e274af15ed2770052d550d3162d2d37e5e9ee5e6fcebac1ed6cb8199' - '1ba33f6eadac4c54f3f08f4bce075d2bef8124f857f5af22eaee010c8d38bc3b' - '884a959b334f864f75dcb4eec8c137785f587c7c2ae57906f8b4e60e04c29246' - '3a3f8b2964406b9b3c85c05f25e677e8c9eaa221779b95826ffbc0474740decc' - 'af3bda801befdbd3d318723ae6de3aaf7df1e16bccd84e13f15b57f2dceaefcd' - '43b7397e622a2c19091b3665822e9461067fb6a497b9507418a3bbb100a69e1b' '727ab3e8181464af32ba604b2931b77cd6d4fbf34e10bbba99bb213eb992466e') build() { @@ -35,11 +25,6 @@ build() { patch -Np1 -i "$srcdir/arch.patch" patch -Np1 -i "$srcdir/systemd-fallback.patch" - patch -Np1 -i ../evironment.patch - patch -Np1 -i ../arguments.patch - patch -Np1 -i ../mem-leak.patch - patch -Np1 -i ../glist-leak.patch - patch -Np1 -i ../mouse-mem-leak.patch gnome-autogen.sh --prefix=/usr \ --sysconfdir=/etc \ diff --git a/community/gnome-web-photo/PKGBUILD b/community/gnome-web-photo/PKGBUILD index e354d0386..ee29c7b08 100644 --- a/community/gnome-web-photo/PKGBUILD +++ b/community/gnome-web-photo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68361 2012-03-23 03:17:03Z bgyorgy $ +# $Id: PKGBUILD 70732 2012-05-15 22:59:27Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com> # Contributor: Adam <adam@russ.co.il> pkgname=gnome-web-photo -pkgver=0.10.5 -pkgrel=2 +pkgver=0.10.6 +pkgrel=1 pkgdesc="Generate full-size image files and thumbnails from HTML files and web pages" arch=('i686' 'x86_64') url="http://git.gnome.org/browse/gnome-web-photo/" @@ -13,7 +13,7 @@ license=('LGPL') depends=('libwebkit3') makedepends=('intltool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b76a116af977e0b30ed82e50dc5c41827f257502c357eeda42347ebfabcdd7f5') +sha256sums=('1353fc1abe9fcd38b3e09c6282e43aeb0c306201a4df9e25d4834407ba2cbe7f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 4be7ea328..ab6e73e97 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,44 +1,47 @@ -# $Id: PKGBUILD 70381 2012-05-05 13:14:13Z arodseth $ +# $Id: PKGBUILD 70799 2012-05-16 17:49:57Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Rémy Oudompheng <remy@archlinux.org> # Contributor: Andres Perera <andres87p gmail> # Contributor: Matthew Bauer <mjbauer95@gmail.com> -# Contributor: Christian Himpel <chressie at gmail dot com> +# Contributor: Christian Himpel <chressie@gmail.com> # Contributor: Mike Rosset <mike.rosset@gmail.com> # Contributor: Daniel YC Lin <dlin.tw@gmail.com> pkgname=go pkgver=1.0.1 -pkgrel=1 +pkgrel=5 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') + '0e8c7edc9d788be3518367bf04bdb5ff8b6bbdcf') 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 +} + +check() { + cd "$srcdir/$pkgname" + + export GOROOT="$srcdir/$pkgname" + export PATH="$srcdir/$pkgname/bin:$PATH" - . ./make.bash + # TestSimpleMulticastListener will fail in standard chroot. + cd src && bash run.bash --no-rebuild || true } package() { @@ -62,33 +65,33 @@ package() { install -Dm644 "misc/vim/$f" "$pkgdir/usr/share/vim/vimfiles/$f" done - mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}} + 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 doc misc -t "$pkgdir/usr/share/go" + ln -s /usr/share/go/doc "$pkgdir/usr/lib/go/doc" + 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 + install -Dm644 src/Make.* "$pkgdir/usr/lib/go/src" # Remove object files from target src dir - find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete - find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete + find "$pkgdir/usr/lib/go/src/" -type f -name '*.[ao]' -delete + find "$pkgdir/usr/lib/go/src/pkg" -type f -executable -delete # Headers for C modules install -Dm644 src/pkg/runtime/runtime.h \ - $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h + "$pkgdir/usr/lib/go/src/pkg/runtime/runtime.h" install -Dm644 src/pkg/runtime/cgocall.h \ - $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h + "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h" - install $srcdir/go.sh $pkgdir/etc/profile.d/ + # For packages that source /etc/profile.d/go.sh + install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh" - 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/go/go.install b/community/go/go.install index decdeccf5..25b9690ac 100644 --- a/community/go/go.install +++ b/community/go/go.install @@ -14,6 +14,12 @@ post_upgrade() { # setting the appropriate environment variables. # ln -sf /usr/bin /usr/lib/go/bin + + # Friendly message to the user + echo "Example use of the \"go\" tool as a user:" + echo " mkdir ~/go" + echo " export GOPATH=~/go" + echo " go get website.com/user/module" } post_install() { diff --git a/community/go/go.sh b/community/go/go.sh index 8393dc8d2..a0109ba97 100755..100644 --- a/community/go/go.sh +++ b/community/go/go.sh @@ -1 +1 @@ -export GOROOT=/usr/lib/go +export GOPATH=/usr/lib/go/site diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD index 8ff73274b..6b8be0415 100644 --- a/community/gsoap/PKGBUILD +++ b/community/gsoap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64430 2012-02-13 06:18:52Z spupykin $ +# $Id: PKGBUILD 70883 2012-05-18 13:41:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> # Contributor: Lee.MaRS <leemars@gmail.com> pkgname=gsoap -pkgver=2.8.7 +pkgver=2.8.8 pkgrel=1 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++" url="http://www.cs.fsu.edu/~engelen/soap.html" @@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs') makedepends=('autoconf' 'automake') source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip LICENSE) -md5sums=('48a8dfddffd8f10b3ca82a6a9583e206' +md5sums=('cffb523b66eb36c51ca455645f1cfeb0' '27aaa3f5166db94d44044c11a7b2c37b') build() { 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/hardlink/PKGBUILD b/community/hardlink/PKGBUILD new file mode 100644 index 000000000..edf5d6973 --- /dev/null +++ b/community/hardlink/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 70897 2012-05-18 22:12:06Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgname=hardlink +pkgver=0.2.0 +pkgrel=1 +pkgdesc='Replace file copies using hardlinks' +arch=('i686' 'x86_64') +url='http://jak-linux.org/projects/hardlink/' +license=('custom: MIT') +depends=('glibc' 'pcre') +source=("http://jak-linux.org/projects/hardlink/hardlink_$pkgver.tar.gz") +md5sums=('4c1621ee7850a1c8b316735a7bced993') + +build() { + cd $pkgname-$pkgver + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # install icense + install -Dm 644 debian/copyright "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD index a52740de9..54ca1c75b 100644 --- a/community/hostapd/PKGBUILD +++ b/community/hostapd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67614 2012-03-13 14:20:23Z spupykin $ +# $Id: PKGBUILD 70872 2012-05-18 10:00:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hostapd -pkgver=0.7.3 -pkgrel=8 +pkgver=1.0 +pkgrel=1 pkgdesc="daemon for wireless software access points" arch=('i686' 'x86_64' 'mips64el') url="http://hostap.epitest.fi/hostapd/" @@ -25,25 +25,19 @@ backup=('etc/hostapd/hostapd.conf' 'etc/hostapd/wired.conf') install=hostapd.install source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz - hostap_allow-linking-with-libnl-3.2.patch config hostapd hostapd.conf.d) -md5sums=('91a7c8d0f090b7104152d3455a84c112' - 'e904e62b12c5d64132dd9441e8b45dce' +md5sums=('236247a7bbd4f60d5fa3e99849d1ffc9' '5d7ee10b04e33f22c37be56a4c33dddb' 'd570327c385f34a4af24d3a0d61cea19' 'f169534b0f59b341f6df1a21e0344511') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch" - - cd hostapd + cd "$srcdir/$pkgname-$pkgver"/hostapd cp "$srcdir/config" ./.config - sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf - + export CFLAGS="$CFLAGS `pkg-config --cflags libnl-3.0`" make } diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD index 2ec9ba308..5b24c72be 100644 --- a/community/hubbub/PKGBUILD +++ b/community/hubbub/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 59698 2011-11-29 12:42:33Z arodseth $ +# $Id: PKGBUILD 70911 2012-05-18 23:52:08Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> + pkgname=hubbub -pkgver=0.1.1 -pkgrel=2 +pkgver=0.1.2 +pkgrel=1 pkgdesc="HTML5 compliant parsing library" arch=('i686' 'x86_64' 'mips64el') url="http://www.netsurf-browser.org/projects/hubbub/" license=('MIT') depends=('libparserutils') source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") -md5sums=('98f49be58e228010c88381bc39f39e19') +sha256sums=('95a1d5a71055b28a8e4ce4dc8516b8f0ed691c5ee03525bf73600495657f1b52') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/i3lock/PKGBUILD b/community/i3lock/PKGBUILD index 761ace052..9c66826b2 100644 --- a/community/i3lock/PKGBUILD +++ b/community/i3lock/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 68957 2012-04-06 14:24:01Z ttopper $ +# $Id: PKGBUILD 70687 2012-05-14 17:17:38Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3lock pkgver=2.4 -pkgrel=1 +pkgrel=3 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' 'cairo') options=('docs') +backup=("etc/pam.d/i3lock") 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/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index bd9501371..10b0f1561 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 68868 2012-04-04 11:24:37Z stativ $ +# $Id: PKGBUILD 70885 2012-05-18 16:05:18Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=11.1.1 -_pkgver=117.117 +pkgver=11.1.2 +_pkgver=117.418 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('09f814cc26b6c98d6e5f0fdf2aaa293c') +md5sums=('eae2d36d088677e1d5670986da311f85') build() { cd "$srcdir" diff --git a/community/iperf/PKGBUILD b/community/iperf/PKGBUILD new file mode 100644 index 000000000..71a359d8d --- /dev/null +++ b/community/iperf/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 70860 2012-05-18 02:29:56Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Dale Blount <dale@archlinux.org> + +pkgname=iperf +pkgver=2.0.5 +pkgrel=5 +pkgdesc='A tool to measure maximum TCP bandwidth' +arch=('i686' 'x86_64') +license=('custom') +url='http://iperf.sourceforge.net' +depends=('gcc-libs') +source=("http://downloads.sourceforge.net/iperf/iperf-$pkgver.tar.gz" + 'iperf.rc' + 'iperf.conf' + 'iperf.service' + 'client.cpp.patch') +md5sums=('44b5536b67719f4250faed632a3cd016' + 'e99dc0d41eb800970390dd149d70b544' + 'c75cb18434c6bf19fdc89b9caa766d7d' + 'b0c1165e21fb686e449c6bab9852be31' + '82ce63c87cc8bb2f0f94069857ac14a9') + +build() { + cd $pkgname-$pkgver + # fix FS#25159 + patch -Np1 -i "$srcdir/client.cpp.patch" + ./configure --prefix=/usr \ + --enable-ipv6 \ + --enable-multicast \ + --enable-threads + make +} + +package() { + pushd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/iperf/LICENSE" + popd + # install initscripts + install -Dm755 iperf.rc "$pkgdir/etc/rc.d/iperf" + install -Dm644 iperf.conf "$pkgdir/etc/conf.d/iperf" + install -Dm644 iperf.service "$pkgdir/usr/lib/systemd/system/iperf.service" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/iperf/client.cpp.patch b/community/iperf/client.cpp.patch new file mode 100644 index 000000000..85f89e765 --- /dev/null +++ b/community/iperf/client.cpp.patch @@ -0,0 +1,17 @@ +--- a/src/Client.cpp 2010-04-01 22:23:17.000000000 +0200 ++++ b/src/Client.cpp 2011-07-19 11:03:42.000000000 +0200 +@@ -212,10 +212,10 @@ + char* readAt = mBuf; + + #if HAVE_THREAD +- if ( !isUDP( mSettings ) ) { +- RunTCP(); +- return; +- } ++// if ( !isUDP( mSettings ) ) { ++// RunTCP(); ++// return; ++// } + #endif + + // Indicates if the stream is readable diff --git a/community/iperf/iperf.conf b/community/iperf/iperf.conf new file mode 100644 index 000000000..0685ff011 --- /dev/null +++ b/community/iperf/iperf.conf @@ -0,0 +1,7 @@ +# vim:set ts=2 sw=2 ft=sh noet: + +# daemon pid file +#PIDFILE='/run/iperf.pid' + +# daemon options. treated as an array. +#DAEMON_OPTS='--port 5001' diff --git a/community/iperf/iperf.rc b/community/iperf/iperf.rc new file mode 100644 index 000000000..617b666ad --- /dev/null +++ b/community/iperf/iperf.rc @@ -0,0 +1,52 @@ +#!/bin/bash + +# You can use this script to run iperf as tcp and udp. +# Copy and rename this script to /etc/rc.d/iperf-udp and copy config file to +# /etc/conf.d/iperf-udp and add -u to daemon options + +. /etc/rc.conf +. /etc/rc.d/functions +[[ -r /etc/conf.d/${0##*/} ]] && . /etc/conf.d/${0##*/} + +DAEMON=${DAEMON:-/usr/bin/iperf} +PIDFILE=${PIDFILE:-/run/${0##*/}.pid} +DAEMON_OPTS="--server $DAEMON_OPTS" + +# check pid +[[ -r "$PIDFILE" ]] && + read PID < "$PIDFILE" && [[ -n $PID ]] && kill -0 $PID &>/dev/null || unset PID + +case "$1" in + start) + stat_busy "Starting ${0##*/} daemon" + [[ -z $PID ]] && + { $DAEMON $DAEMON_OPTS </dev/null &>/dev/null & } && + echo "$!" > "$PIDFILE" && + disown %% && + add_daemon ${0##*/} && + stat_done && + exit 0 + stat_fail + ;; + stop) + stat_busy "Stopping ${0##*/} daemon" + [[ -n $PID ]] && kill $PID &> /dev/null && + rm_daemon ${0##*/} && + rm -f "$PIDFILE" && + stat_done && + exit 0 + stat_fail + ;; + restart) + $0 stop + $0 start + exit 0 + ;; + *) + echo "usage: ${0##*/} {start|stop|restart}" >&2 + ;; +esac + +exit 1 + +# vim:set ts=2 sw=2 ft=sh noet: diff --git a/community/iperf/iperf.service b/community/iperf/iperf.service new file mode 100644 index 000000000..1bdcf86e9 --- /dev/null +++ b/community/iperf/iperf.service @@ -0,0 +1,8 @@ +[Unit] +Description=Iperf Server + +[Service] +ExecStart=/usr/bin/iperf -s + +[Install] +WantedBy=multi-user.target 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/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 68c61dcec..93eec8d18 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65323 2012-02-21 01:34:56Z spupykin $ +# $Id: PKGBUILD 70710 2012-05-15 11:27:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive -pkgver=0.8.2.1 -pkgrel=2 +pkgver=0.9 +pkgrel=1 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://www.kdenlive.org/" @@ -13,11 +13,15 @@ license=('GPL') depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz' 'libqzeitgeist') makedepends=('automoc4' 'cmake' 'gettext' 'mesa') +optdepends=('recordmydesktop' + 'dvdauthor' + 'mkisolinux' + 'xine-ui') install=kdenlive.install options=('docs') -source=("http://downloads.sourceforge.net/kdenlive/kdenlive-${pkgver}.tar.gz" +source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.gz glu.patch) -md5sums=('96b39531eba98c77546e7eba45a744ce' +md5sums=('8ceb59444df9aa950fd6bc7300c4a90d' 'fd6c5fe46419ee505c562363d41f6e9f') build() { diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD index f3342df96..f43f06d89 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 70622 2012-05-13 09:46:34Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> pkgname=kid3 -pkgver=2.0.1 +pkgver=2.1 pkgrel=2 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') +depends=('chromaprint' 'id3lib' 'qt' 'tunepimp' 'kdelibs') makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl') 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..1e4776b1d 100644 --- a/community/lazarus/ChangeLog +++ b/community/lazarus/ChangeLog @@ -1,3 +1,12 @@ +2012-05-15 BlackIkeEagle + * fix lazcontrols failure + see: http://doublecmd.sourceforge.net/mantisbt/view.php?id=347 + * add compiled files again + +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..04c191398 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 70866 2012-05-18 06:01:51Z ebelanger $ # 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,18 +6,27 @@ pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') pkgver=0.9.30.4 -pkgrel=2 +pkgrel=5 url='http://www.lazarus.freepascal.org/' license=('GPL2' 'MPL' 'custom:LGPL') arch=('i686' 'x86_64' 'mips64el') makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync') options=('!emptydirs' '!makeflags') -source=(http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2) -md5sums=('ebd40cdfdfc4b66d1ced7a0d48d6da84') +source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2" + 'lazcontrols2.diff' +) +md5sums=('ebd40cdfdfc4b66d1ced7a0d48d6da84' + '288bca6ad5ade79deec34c3602daaaa9' +) build() { cd $srcdir/${pkgbase} + ( # patch lazcontrols + cd components/lazcontrols + patch -p0 -i "$srcdir/lazcontrols2.diff" + ) + # build gtk2 ide make FPC=/usr/bin/fpc LCL_PLATFORM=gtk2 clean bigide # move gtk binaries @@ -51,11 +60,10 @@ package_lazarus() { --exclude="*.rst" --exclude=".#*" \ --exclude="*.~*" --exclude="*.bak" \ --exclude="*.orig" --exclude="*.rej" \ - --exclude=".xvpics" --exclude="*.compiled" \ + --exclude=".xvpics" \ --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/lazarus/lazcontrols2.diff b/community/lazarus/lazcontrols2.diff new file mode 100644 index 000000000..4748ae380 --- /dev/null +++ b/community/lazarus/lazcontrols2.diff @@ -0,0 +1,46 @@ +Index: Makefile.fpc +=================================================================== +--- Makefile.fpc (wersja 37097) ++++ Makefile.fpc (kopia robocza) +@@ -51,6 +51,6 @@ + -$(DEL) $(COMPILER_UNITTARGETDIR)/lazcontrols$(PPUEXT) + + compiled: +- $(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/LazControls.compiled ++ $(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/LazControls.compiled + + all: cleartarget $(COMPILER_UNITTARGETDIR) lazcontrols$(PPUEXT) compiled +Index: Makefile.compiled +=================================================================== +--- Makefile.compiled (wersja 37097) ++++ Makefile.compiled (kopia robocza) +@@ -1,5 +1,5 @@ + <?xml version="1.0"?> + <CONFIG> + <Makefile Value="True"/> +- <Params Value=" -MObjFPC -Scghi -O1 -gl -vewnhi -l -Fu../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fi. -dLCL -dLCL%(LCL_PLATFORM)"/> ++ <Params Value=" -MObjFPC -Scghi -O1 -gl -vewnhi -l -Fu../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../packager/units/%(CPU_TARGET)-%(OS_TARGET);.;.;lib/%(CPU_TARGET)-%(OS_TARGET) -Fi. -dLCL -dLCL%(LCL_PLATFORM) lazcontrols.pas"/> + </CONFIG> +Index: Makefile +=================================================================== +--- Makefile (wersja 37097) ++++ Makefile (kopia robocza) +@@ -2961,5 +2961,5 @@ + cleartarget: + -$(DEL) $(COMPILER_UNITTARGETDIR)/lazcontrols$(PPUEXT) + compiled: +- $(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/LazControls.compiled ++ $(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/LazControls.compiled + all: cleartarget $(COMPILER_UNITTARGETDIR) lazcontrols$(PPUEXT) compiled +Index: lazcontrols.lpk +=================================================================== +--- lazcontrols.lpk (wersja 37097) ++++ lazcontrols.lpk (kopia robocza) +@@ -10,6 +10,7 @@ + <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> + </SearchPaths> + <Other> ++ <CustomOptions Value="$(IDEBuildOptions)"/> + <CompilerPath Value="$(CompPath)"/> + </Other> + </CompilerOptions> diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD index 6a2af7230..fc9c0f46c 100644 --- a/community/libcec/PKGBUILD +++ b/community/libcec/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68568 2012-03-28 10:28:32Z idevolder $ +# $Id: PKGBUILD 70691 2012-05-14 21:28:54Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: Philippe Cherel <philippe.cherel@mayenne.org> pkgname=libcec -pkgver=1.5.2 +pkgver=1.6.2 pkgrel=1 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ url="https://github.com/Pulse-Eight/libcec" license=('GPL') depends=('udev') source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-00a02d1 -sha256sums=('93990024d01da7c66e2c78ca23919fd83137f6b944a2dc82fb5cc6d58a46742f') +_srcfolder=Pulse-Eight-libcec-e14b158 +sha256sums=('2d853df4478a9b93ef699c7038cf78a97741b1a594996d1df644f2d5e51d6969') options=(!libtool) build() { diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD index b54f06cbc..30f881397 100644 --- a/community/libcss/PKGBUILD +++ b/community/libcss/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64859 2012-02-18 18:11:23Z arodseth $ +# $Id: PKGBUILD 70909 2012-05-18 23:49:56Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=libcss -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="CSS parser and selection engine" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url="http://www.netsurf-browser.org/projects/libcss/" license=('MIT') depends=('libparserutils' 'libwapcaplet') source=("http://www.netsurf-browser.org/projects/releases/libcss-$pkgver-src.tar.gz") -sha256sums=('383c424c1f7134be67e22a7a633e31d47ba6b87aba835a4e73eca893aa01c0a0') +sha256sums=('92c112a059bc5ae490392439401005b47ca5c270f891f6317b64aac738ae1f5e') build() { cd "$srcdir/$pkgname-$pkgver" 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/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 184aa6a1f..9f1501a8b 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69468 2012-04-16 15:11:07Z spupykin $ +# $Id: PKGBUILD 70825 2012-05-17 09:48:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.9.11 -pkgrel=2 +pkgver=0.9.12 +pkgrel=3 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -12,8 +12,8 @@ license=('LGPL') depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'netcf' 'libnl1') -makedepends=('pkgconfig' 'lvm2') + 'iproute2' 'netcf' 'libnl') +makedepends=('pkgconfig' 'lvm2' 'linux-api-headers') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' 'kvm' @@ -35,18 +35,14 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd-guests.rc.d libvirtd-guests.conf.d openbsd-netcat-default.patch - unixperms.patch - yajl-2.x.patch - "libvirt-qemu-ssh-user.patch::http://libvirt.org/git/?p=libvirt.git;a=patch;h=4eb1c2560d1ab8bae620788d343e9e7b32ddc066") -md5sums=('6e9fab115075a8fd21d9bd0d7e558a52' + libvirt-libnl3.patch) +md5sums=('5e842bc55733ceba60c64767580ff3e4' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '8297b1be794a24cc77f66af9380ace59' 'bc2971dacdbac967fc3474e50affc345' 'b0be50eb9dfe4d133decf23b60880f7d' - 'db95aecdf2ccf3693fef5821cdcb7eba' - '5745bb8d0b254abb7a3528c66e03b0f9' - '40f6ad1d227ae2c41b4a83f7a3165ffb') + 'ba27fbcd989de8d84cfff98326f10c54') build() { cd "$srcdir/$pkgname-$pkgver" @@ -58,13 +54,12 @@ build() { sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done -# for more information on authentication see http://libvirt.org/auth.html -# If you wish to have unix-permissions based access rather than only polkit -# access, create a group called libvirt and uncomment the line below: -# patch -Np1 -i "$srcdir"/unixperms.patch - [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch - [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/libvirt-qemu-ssh-user.patch + + patch -Np1 -i ${srcdir}/libvirt-libnl3.patch + aclocal + automake --add-missing || true + autoreconf export LDFLAGS=-lX11 export RADVD=/usr/sbin/radvd diff --git a/community/libvirt/libvirt-libnl3.patch b/community/libvirt/libvirt-libnl3.patch new file mode 100644 index 000000000..1e5f141b9 --- /dev/null +++ b/community/libvirt/libvirt-libnl3.patch @@ -0,0 +1,111 @@ +diff -wbBur libvirt-0.9.12/configure.ac libvirt-0.9.12.my/configure.ac +--- libvirt-0.9.12/configure.ac 2012-05-14 06:15:40.000000000 +0400 ++++ libvirt-0.9.12.my/configure.ac 2012-05-17 13:18:22.000000000 +0400 +@@ -71,7 +71,7 @@ + LIBCURL_REQUIRED="7.18.0" + OPENWSMAN_REQUIRED="2.2.3" + LIBPCAP_REQUIRED="1.0.0" +-LIBNL_REQUIRED="1.1" ++LIBNL_REQUIRED="3.2" + LIBSSH2_REQUIRED="1.0" + LIBBLKID_REQUIRED="2.17" + DBUS_REQUIRED="1.0.0" +@@ -2652,21 +2652,9 @@ + PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [ + have_libnl=yes + AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-3.0]) +- AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is available]) + PKG_CHECK_MODULES([LIBNL_ROUTE3], [libnl-route-3.0]) + LIBNL_CFLAGS="$LIBNL_CFLAGS $LIBNL_ROUTE3_CFLAGS" + LIBNL_LIBS="$LIBNL_LIBS $LIBNL_ROUTE3_LIBS" +- ], [PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ +- have_libnl=yes +- AC_DEFINE_UNQUOTED([HAVE_LIBNL], [1], +- [whether the netlink library is available]) +- AC_DEFINE_UNQUOTED([HAVE_LIBNL1], [1], +- [whether the netlink v1 library is available]) +- ], [ +- if test "$with_macvtap" = "yes"; then +- AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support]) +- fi +- ]) + ]) + fi + AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) +diff -wbBur libvirt-0.9.12/daemon/Makefile.am libvirt-0.9.12.my/daemon/Makefile.am +--- libvirt-0.9.12/daemon/Makefile.am 2012-04-20 08:25:25.000000000 +0400 ++++ libvirt-0.9.12.my/daemon/Makefile.am 2012-05-17 13:18:22.000000000 +0400 +@@ -96,6 +96,7 @@ + $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ + $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \ + $(WARN_CFLAGS) \ ++ $(LIBNL_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ + -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" +diff -wbBur libvirt-0.9.12/src/Makefile.am libvirt-0.9.12.my/src/Makefile.am +--- libvirt-0.9.12/src/Makefile.am 2012-05-05 16:53:48.000000000 +0400 ++++ libvirt-0.9.12.my/src/Makefile.am 2012-05-17 13:18:22.000000000 +0400 +@@ -16,6 +16,7 @@ + + AM_CFLAGS = $(DRIVER_MODULE_CFLAGS) \ + $(LIBXML_CFLAGS) \ ++ $(LIBNL_CFLAGS) \ + $(WARN_CFLAGS) \ + $(LOCK_CHECKING_CFLAGS) \ + $(WIN32_EXTRA_CFLAGS) \ +diff -wbBur libvirt-0.9.12/src/util/virnetdevmacvlan.c libvirt-0.9.12.my/src/util/virnetdevmacvlan.c +--- libvirt-0.9.12/src/util/virnetdevmacvlan.c 2012-05-09 05:21:54.000000000 +0400 ++++ libvirt-0.9.12.my/src/util/virnetdevmacvlan.c 2012-05-17 13:25:21.000000000 +0400 +@@ -27,6 +27,10 @@ + + #include <config.h> + ++#include <netlink/msg.h> ++#include <linux/rtnetlink.h> ++#include <linux/if_link.h> ++ + #include "virnetdevmacvlan.h" + #include "virmacaddr.h" + #include "util.h" +diff -wbBur libvirt-0.9.12/src/util/virnetdevvportprofile.c libvirt-0.9.12.my/src/util/virnetdevvportprofile.c +--- libvirt-0.9.12/src/util/virnetdevvportprofile.c 2012-05-09 05:21:54.000000000 +0400 ++++ libvirt-0.9.12.my/src/util/virnetdevvportprofile.c 2012-05-17 13:27:54.000000000 +0400 +@@ -22,6 +22,10 @@ + + #include <config.h> + ++#include <netlink/msg.h> ++#include <linux/rtnetlink.h> ++#include <linux/if_link.h> ++ + #include "virnetdevvportprofile.h" + #include "virterror_internal.h" + +diff -wbBur libvirt-0.9.12/src/util/virnetlink.c libvirt-0.9.12.my/src/util/virnetlink.c +--- libvirt-0.9.12/src/util/virnetlink.c 2012-05-09 16:41:41.000000000 +0400 ++++ libvirt-0.9.12.my/src/util/virnetlink.c 2012-05-17 13:38:08.000000000 +0400 +@@ -49,7 +49,7 @@ + + #define NETLINK_ACK_TIMEOUT_S 2 + +-#if defined(__linux__) && defined(HAVE_LIBNL) ++#if defined(__linux__) && defined(HAVE_LIBNL3) + /* State for a single netlink event handle */ + struct virNetlinkEventHandle { + int watch; +diff -wbBur libvirt-0.9.12/src/util/virnetlink.h libvirt-0.9.12.my/src/util/virnetlink.h +--- libvirt-0.9.12/src/util/virnetlink.h 2012-05-09 05:21:54.000000000 +0400 ++++ libvirt-0.9.12.my/src/util/virnetlink.h 2012-05-17 13:27:37.000000000 +0400 +@@ -23,9 +23,10 @@ + # include "config.h" + # include "internal.h" + +-# if defined(__linux__) && defined(HAVE_LIBNL) ++# if defined(__linux__) && defined(HAVE_LIBNL3) + + # include <netlink/msg.h> ++# include <stdint.h> + + # else + diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD index 088b2800e..32ad0c148 100644 --- a/community/libwapcaplet/PKGBUILD +++ b/community/libwapcaplet/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 64868 2012-02-18 18:47:16Z arodseth $ +# $Id: PKGBUILD 70913 2012-05-18 23:56:14Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=libwapcaplet -pkgver=0.1.0 -pkgrel=3 +pkgver=0.1.1 +pkgrel=1 pkgdesc="String internment library with rapid string comparison" arch=('i686' 'x86_64' 'mips64el') url="http://www.netsurf-browser.org/projects/libwapcaplet/" license=('MIT') source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") -sha256sums=('e58df9d4ee18344946d5c7c17fb99f29269027dafd875e2fe10bb1fb9d7fc1a7') +sha256sums=('cf05159d7d515523697ce07228cff6a6339dc6bdcfec3e02e3b72d8b773f5258') build() { - cd "$srcdir/$pkgname-$pkgver-src" + cd "$srcdir/$pkgname-$pkgver" make PREFIX=/usr COMPONENT_TYPE="lib-shared" make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd "$srcdir/$pkgname-$pkgver-src" + cd "$srcdir/$pkgname-$pkgver" make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" diff --git a/community/libzrtpcpp/PKGBUILD b/community/libzrtpcpp/PKGBUILD index 2166c1919..4750b60b1 100644 --- a/community/libzrtpcpp/PKGBUILD +++ b/community/libzrtpcpp/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 66224 2012-02-23 03:37:26Z spupykin $ +# $Id: PKGBUILD 70716 2012-05-15 11:42:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Michel Brabants <michel.brabants@euphonynet.be> pkgname=libzrtpcpp -pkgver=1.4.2 -pkgrel=6 +pkgver=2.0.0 +pkgrel=1 pkgdesc="An extension to Real-time Transport Protocol (RTP) which describes a method of Diffie-Hellman key agreement for Secure Real-time Transport Protocol (SRTP)" arch=('i686' 'x86_64' 'mips64el') url="http://zfoneproject.com" license=('GPL') -depends=('ccrtp') -makedepends=('pkgconfig') +depends=('ccrtp' 'ucommon') +makedepends=('pkgconfig' 'cmake') options=('!libtool') source=(ftp://ftp.gnu.org/gnu/ccrtp/$pkgname-$pkgver.tar.gz) -md5sums=('2360f0f8dc0ddab3e1691ee146c4b92e') -md5sums=('2360f0f8dc0ddab3e1691ee146c4b92e') +md5sums=('dc1501e7e8a46a1608fc3820c7476727') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr + sed -i 's|lib64|lib|g' CMakeLists.txt + cmake -DCMAKE_INSTALL_PREFIX=/usr . make } diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD index 838c1ce36..ec9f3c8e1 100644 --- a/community/linphone/PKGBUILD +++ b/community/linphone/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 66218 2012-02-23 03:32:14Z spupykin $ +# $Id: PKGBUILD 70717 2012-05-15 11:51:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=linphone pkgver=3.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="A Voice-over-IP phone" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/index.php/eng" license=('GPL') depends=('alsa-lib' 'ffmpeg' 'gtk2' 'libexosip2' 'speex' 'libv4l' 'libglade' 'v4l-utils' - 'libpulse' 'libxv' 'mediastreamer' 'ortp') + 'libpulse' 'libxv' 'mediastreamer' 'ortp' 'libzrtpcpp') makedepends=('pkgconfig' 'perlxml' 'intltool' 'sgmltools-lite') optdepends=('pulseaudio') options=('!libtool' '!emptydirs') @@ -24,7 +24,9 @@ build() { ./configure --prefix=/usr --disable-static --enable-ipv6 --enable-video \ --enable-alsa --enable-pulseaudio --disable-artsc --disable-strict \ --libexecdir=/usr/lib/$pkgname \ - --enable-external-mediastreamer --enable-external-ortp + --enable-external-mediastreamer \ + --enable-external-ortp \ + --enable-zrtp make } 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/midori/PKGBUILD b/community/midori/PKGBUILD index 8e1242d7b..64fdaf822 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 69842 2012-04-24 15:19:18Z bpiotrowski $ +# $Id: PKGBUILD 70793 2012-05-16 17:08:50Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> pkgname=midori -pkgver=0.4.5 -pkgrel=2 +pkgver=0.4.6 +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" @@ -16,10 +16,8 @@ depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-util makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') options=('!emptydirs') -source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 - 0001-Fix-libsoup-version-check-defines.patch) -sha256sums=('7b57cf3ebb56eef586351f2ae9f71ec9683aedff0b79a071b70b811d9876ff84' - '0095c23247c62b6a4b3ab4312f68b49e2d0974ce3fd701a2ce0114817c7bd399') +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha256sums=('910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,9 +26,6 @@ build() { export PYTHON=/usr/bin/python2 sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf - # FS#29468 - patch -Np1 -i "$srcdir"/0001-Fix-libsoup-version-check-defines.patch - ./configure \ --prefix=/usr \ --jobs=${MAKEFLAGS/-j/} \ 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/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 9e48f12f3..042d07fbc 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 69293 2012-04-12 17:54:48Z tdziedzic $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# $Id: PKGBUILD 70656 2012-05-14 04:57:10Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Mathias Stearn <mathias@10gen.com> # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.0.4 -pkgrel=4 +pkgver=2.0.5 +pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64' 'mips64el') url='http://www.mongodb.org' @@ -21,7 +22,7 @@ source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.conf' '0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch' '0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch') -md5sums=('099bc701a3d190a040123c58958e8f67' +md5sums=('06cf5fb887dbbddd70a29c0af08aad4f' '9c67e00f4626ad761a8f7d4e037a54d7' '4839fe1d638187ca3226e8267b947318' 'fdbf06b005b3a73a2b6caca257ec8f64' @@ -35,8 +36,8 @@ build() { # 0001 suggested to backport along with 0002 # 0002 backported for https://jira.mongodb.org/browse/SERVER-5358 # also fixes https://bugs.archlinux.org/task/29050 - patch -Np1 -i ${srcdir}/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch - patch -Np1 -i ${srcdir}/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch + #patch -Np1 -i ${srcdir}/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch + #patch -Np1 -i ${srcdir}/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch # fix python name for smoke tests #sed \ 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/mp3splt-gtk/PKGBUILD b/community/mp3splt-gtk/PKGBUILD index 67c31d429..47a33bfe0 100644 --- a/community/mp3splt-gtk/PKGBUILD +++ b/community/mp3splt-gtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 66640 2012-02-26 16:44:34Z jlichtblau $ +# $Id: PKGBUILD 70795 2012-05-16 17:11:55Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=mp3splt-gtk -pkgver=0.7.1 +pkgver=0.7.2 pkgrel=1 pkgdesc="Split mp3 and ogg files without decoding" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz \ $pkgname.desktop) -sha256sums=('b3f54a62dae55cfabab7aff3ae2f5627093dee27675635b04b425f3214bcdd62' +sha256sums=('58d2e562b004bc99ad206b4a6726126d170dc9093a35689888b010fe663be23a' 'a50dd43c28a723c824d658b9468ff3719dcc302c57ecb3b122124e63c20800ed') build() { diff --git a/community/mp3splt-gtk/mp3splt-gtk.changelog b/community/mp3splt-gtk/mp3splt-gtk.changelog index c5e4dadc6..50b711d96 100644 --- a/community/mp3splt-gtk/mp3splt-gtk.changelog +++ b/community/mp3splt-gtk/mp3splt-gtk.changelog @@ -1,3 +1,6 @@ +2012-05-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * mp3splt-gtk O.7.2-1 + 2012-02-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * mp3splt-gtk O.7.1-1 diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index 96a95a43b..d933da1aa 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 70209 2012-05-02 12:44:37Z spupykin $ +# $Id: PKGBUILD 70836 2012-05-17 14:29:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc pkgver=5.1.11 -pkgrel=1 +pkgrel=3 pkgdesc="ODBC driver/connector for MySQL" arch=(i686 x86_64 'mips64el') url="http://dev.mysql.com/downloads/connector/odbc/" depends=('unixodbc' 'libmysqlclient') +makedepends=('cmake') license=('GPL') options=('libtool') -source=("http://mysql.skynet.be/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-$pkgver-src.tar.gz" - myconf.h.in) -md5sums=('1d868f404038bbce6623a28255c8a9f7' - '6c99c83e309b18d15ef0f07f0b461241') +source=("http://mysql.skynet.be/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-$pkgver-src.tar.gz") +md5sums=('1d868f404038bbce6623a28255c8a9f7') build() { cd $srcdir/mysql-connector-odbc-${pkgver}-src - cp $srcdir/myconf.h.in driver/myconf.h.in - [ -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 \ - --with-mysql-path=/usr --without-x --disable-gui --disable-test + unset LDFLAGS + cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_UNIXODBC=1 . make } package() { cd $srcdir/mysql-connector-odbc-${pkgver}-src make DESTDIR=$pkgdir install + pushd $pkgdir/usr + rm -rf test + install -dm0755 share/mysql-connector-odbc + mv ChangeLog COPYING INSTALL Licenses_for_Third-Party_Components.txt README README.debug \ + share/mysql-connector-odbc/ + popd } 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/netcf/PKGBUILD b/community/netcf/PKGBUILD index 0383ca4da..9c26ba270 100644 --- a/community/netcf/PKGBUILD +++ b/community/netcf/PKGBUILD @@ -1,26 +1,32 @@ -# $Id: PKGBUILD 66320 2012-02-23 14:03:54Z allan $ +# $Id: PKGBUILD 70813 2012-05-16 21:38:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com> pkgname=netcf -pkgver=0.1.7 -pkgrel=3 +pkgver=0.1.9 +pkgrel=2 pkgdesc="A library for configuring network interfaces" arch=('i686' 'x86_64') license=('LGPL') url="https://fedorahosted.org/netcf/" -depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl1') +depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl') makedepends=('gcc') options=(!libtool) source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz" - netcf-0.1.7.patch) -md5sums=('8e313b623c907eb035cf3948b71fecc2' - '0e88ee6813219e9e75a943444fe439f5') + "netcf-libnl3.patch::https://bugs.archlinux.org/task/29908?getfile=8775") +md5sums=('4d62010a79d56c12438969da9035b63c' + 'a509be4b819f669fac21e1eaa621e3e0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/netcf-0.1.7.patch - ./configure --prefix=/usr --disable-static + patch -Np1 -i ${srcdir}/netcf-libnl3.patch + aclocal + automake --add-missing || true + autoreconf +# CFLAGS="`pkg-config --cflags libnl-3.0` -DRTNL_LINK_NOT_FOUND=-1" + CFLAGS="-DNETCF_TRANSACTION=\"true\"" ./configure --prefix=/usr \ + --disable-static \ + --with-init-script=none make } diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 0dfeed59c..f8a6ba84f 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 70343 2012-05-04 22:20:32Z tdziedzic $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# $Id: PKGBUILD 70788 2012-05-16 16:52:49Z bpiotrowski $ +# Maintainer: Nartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > # Contributor: Dongsheng Cai <dongsheng at moodle dot com> @@ -7,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.6.17 +pkgver=0.6.18 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +19,7 @@ checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('55641d5d280cdd4e0c030c203107599d') +md5sums=('4a3d3123ccc7b9b21c1990fe074e3d14') build() { cd node-v${pkgver} diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD new file mode 100644 index 000000000..b493ea4c0 --- /dev/null +++ b/community/onboard/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=onboard +pkgver=0.97.1 +pkgrel=1 +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) +md5sums=('065dcdf89d5fe145ad7876c5721c0df5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + 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/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index c01c7e4f1..47a5061e5 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70349 2012-05-04 23:55:01Z allan $ +# $Id: PKGBUILD 70830 2012-05-17 10:51:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools pkgver=2012.03.13 _pkgsubver=651368 -pkgrel=4 +pkgrel=5 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" arch=('i686' 'x86_64') url="http://open-vm-tools.sourceforge.net/" @@ -45,6 +45,7 @@ package() { cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" make install DESTDIR="$pkgdir" + install -Dm0644 vmware-user-suid-wrapper/vmware-user.desktop $pkgdir/usr/share/applications/vmware-user.desktop install -D -m 755 scripts/common/vmware-xdg-detect-de "$pkgdir"/usr/bin/vmware-xdg-detect-de chmod 07755 "$pkgdir"/usr/bin/vmware-user-suid-wrapper @@ -52,11 +53,11 @@ package() { patch -p1 -i "$srcdir"/scripts-network.patch etc/vmware-tools/scripts/vmware/network patch -p1 -i "$srcdir"/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network - install -D -m 755 "$srcdir"/open-vm-tools.rc.d "$pkgdir"/etc/rc.d/open-vm-tools - install -D -m 644 "$srcdir"/open-vm-tools.conf.d "$pkgdir"/etc/conf.d/open-vm-tools - install -D -m 644 "$srcdir"/tools.conf "$pkgdir"/etc/vmware-tools/tools.conf - install -D -m 644 "$srcdir"/xautostart.conf "$pkgdir"/etc/vmware-tools/xautostart.conf - install -D -m 644 "$srcdir"/vmware-guestd "$pkgdir"/etc/pam.d/vmware-guestd + install -Dm0755 "$srcdir"/open-vm-tools.rc.d "$pkgdir"/etc/rc.d/open-vm-tools + install -Dm0644 "$srcdir"/open-vm-tools.conf.d "$pkgdir"/etc/conf.d/open-vm-tools + install -Dm0644 "$srcdir"/tools.conf "$pkgdir"/etc/vmware-tools/tools.conf + install -Dm0644 "$srcdir"/xautostart.conf "$pkgdir"/etc/vmware-tools/xautostart.conf + install -Dm0644 "$srcdir"/vmware-guestd "$pkgdir"/etc/pam.d/vmware-guestd rm -rf "$pkgdir"/usr/etc ln -fs /usr/sbin/mount.vmhgfs "$pkgdir"/sbin/mount.vmhgfs 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/passenger/PKGBUILD b/community/passenger/PKGBUILD index 220375dc6..38fa509ea 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 67809 2012-03-14 13:50:13Z spupykin $ +# $Id: PKGBUILD 70838 2012-05-17 15:56:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger -pkgver=3.0.11 -pkgrel=2 -_pkgdlnr=75548 +pkgver=3.0.12 +pkgrel=1 +_pkgdlnr=76005 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64' 'mips64el') url="http://www.modrails.com" license=('GPL') -depends=('apache' 'ruby' 'ruby-rack' 'curl') +depends=('ruby' 'ruby-rack' 'curl') +makedepends=('apache') install=passenger.install options=('!emptydirs') source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz - passenger-install-apache2-module.patch) -md5sums=('9186d799e065ccad803cbc0289954f40' - '3d04eba10c55a955c378678d5df8497f') + passenger-install-apache2-module.patch + build-fix-git-2012-05-17.diff) +md5sums=('fedcf948a46b76e00ddd25527dac4b6d' + '3d04eba10c55a955c378678d5df8497f' + 'e2d3409bae3676232f411f03abac440c') build(){ cd $srcdir/passenger-$pkgver - patch bin/passenger-install-apache2-module <$srcdir/passenger-install-apache2-module.patch - ./bin/passenger-install-apache2-module +# patch bin/passenger-install-apache2-module <$srcdir/passenger-install-apache2-module.patch + patch -p1 <$srcdir/build-fix-git-2012-05-17.diff + ./bin/passenger-install-apache2-module -a rake nginx mkdir -p $pkgdir/usr/lib/passenger/ diff --git a/community/passenger/build-fix-git-2012-05-17.diff b/community/passenger/build-fix-git-2012-05-17.diff new file mode 100644 index 000000000..b9aa6b538 --- /dev/null +++ b/community/passenger/build-fix-git-2012-05-17.diff @@ -0,0 +1,547 @@ +diff -wbBur passenger-3.0.12/bin/passenger-install-nginx-module passenger.git/bin/passenger-install-nginx-module +--- passenger-3.0.12/bin/passenger-install-nginx-module 2012-04-13 12:09:57.000000000 +0400 ++++ passenger.git/bin/passenger-install-nginx-module 2012-05-17 19:35:01.000000000 +0400 +@@ -162,7 +162,7 @@ + new_screen + color_puts "<banner>PCRE (required by Nginx) not installed, downloading it...</banner>" + +- url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz" ++ url = "http://downloads.sourceforge.net/project/pcre/pcre/#{PREFERRED_PCRE_VERSION}/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz" + dirname = "pcre-#{PREFERRED_PCRE_VERSION}" + tarball = "#{@working_dir}/pcre.tar.gz" + +diff -wbBur passenger-3.0.12/build/basics.rb passenger.git/build/basics.rb +--- passenger-3.0.12/build/basics.rb 2012-04-13 12:09:57.000000000 +0400 ++++ passenger.git/build/basics.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -33,7 +33,6 @@ + require 'phusion_passenger/platform_info/curl' + require 'phusion_passenger/platform_info/zlib' + require 'phusion_passenger/platform_info/compiler' +-require 'phusion_passenger/platform_info/documentation_tools' + + include PhusionPassenger + include PhusionPassenger::PlatformInfo +diff -wbBur passenger-3.0.12/build/documentation.rb passenger.git/build/documentation.rb +--- passenger-3.0.12/build/documentation.rb 2012-02-04 02:25:41.000000000 +0400 ++++ passenger.git/build/documentation.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -1,5 +1,5 @@ + # Phusion Passenger - http://www.modrails.com/ +-# Copyright (c) 2010 Phusion ++# Copyright (c) 2010, 2011, 2012 Phusion + # + # "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui. + # +@@ -21,25 +21,34 @@ + # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + # THE SOFTWARE. + +-ASCIIDOC_FLAGS = "-b html5 -a toc -a theme=flask -a numbered -a toclevels=3 -a icons" +- + desc "Generate all documentation" + task :doc => Packaging::ASCII_DOCS + + Packaging::ASCII_DOCS.each do |target| + source = target.sub(/\.html$/, '.txt') + file target => [source] + Dir["doc/users_guide_snippets/**/*"] do +- if PlatformInfo.asciidoc ++ if PlatformInfo.find_command('mizuho') + if target =~ /apache/i +- type = "-a apache" ++ type = "apache" ++ juvia_site_key = "5jpmkyjqlml8rktsfldfpbwth8ig7w9" + elsif target =~ /nginx/i +- type = "-a nginx" ++ type = "nginx" ++ juvia_site_key = "q0ptarhn8o9xanwomq8zkgewbtwffyz" ++ elsif target =~ /standalone/i ++ type = nil ++ juvia_site_key = "amggdy0k65hb4hbjg3dh7pnb9zd8dwy" + else + type = nil ++ juvia_site_key = nil ++ end ++ command = "mizuho '#{source}'" ++ command << " -a #{type}" if type ++ if juvia_site_key ++ command << " -c juvia --juvia-url http://juvia.phusion.nl --juvia-site-key #{juvia_site_key}" + end +- sh "#{PlatformInfo.asciidoc} #{ASCIIDOC_FLAGS} #{type} '#{source}'" ++ sh(command) + else +- sh "echo 'asciidoc required to build docs' > '#{target}'" ++ sh "echo 'Mizuho required to build docs' > '#{target}'" + end + end + +diff -wbBur passenger-3.0.12/build/packaging.rb passenger.git/build/packaging.rb +--- passenger-3.0.12/build/packaging.rb 2012-02-04 02:25:41.000000000 +0400 ++++ passenger.git/build/packaging.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -1,5 +1,5 @@ + # Phusion Passenger - http://www.modrails.com/ +-# Copyright (c) 2010 Phusion ++# Copyright (c) 2010, 2011, 2012 Phusion + # + # "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui. + # +@@ -42,7 +42,7 @@ + s.require_paths = ["lib"] + s.add_dependency 'rake', '>= 0.8.1' + s.add_dependency 'fastthread', '>= 1.0.1' +- s.add_dependency 'daemon_controller', '>= 0.2.5' ++ s.add_dependency 'daemon_controller', '>= 1.0.0' + s.add_dependency 'rack' + s.files = FileList[*Packaging::GLOB] - FileList[*Packaging::EXCLUDE_GLOB] + s.executables = Packaging::USER_EXECUTABLES + Packaging::SUPER_USER_EXECUTABLES +diff -wbBur passenger-3.0.12/DEVELOPERS.TXT passenger.git/DEVELOPERS.TXT +--- passenger-3.0.12/DEVELOPERS.TXT 2012-04-13 12:09:57.000000000 +0400 ++++ passenger.git/DEVELOPERS.TXT 2012-05-17 19:35:01.000000000 +0400 +@@ -13,6 +13,7 @@ + * rspec >= 1.1.2 + * mime-types >= 1.15 + * sqlite3-ruby ++* daemon_controller >= 1.0.0 + + The following software is optional: + +diff -wbBur passenger-3.0.12/doc/Users guide Apache.txt passenger.git/doc/Users guide Apache.txt +--- passenger-3.0.12/doc/Users guide Apache.txt 2012-02-04 02:25:41.000000000 +0400 ++++ passenger.git/doc/Users guide Apache.txt 2012-05-17 19:35:01.000000000 +0400 +@@ -203,15 +203,7 @@ + + ==== Installing via a native Linux package ==== + +-John Leach from Brightbox has kindly provided an Ubuntu Hardy package for Phusion Passenger. The package is available from the link:http://apt.brightbox.net[Brightbox repository]. +- +-Please install the native Linux package, e.g.: +------------------------------------------------------- +-sudo sh -c 'echo "deb http://apt.brightbox.net hardy main" > /etc/apt/sources.list.d/brightbox.list' +-sudo sh -c 'wget -q -O - http://apt.brightbox.net/release.asc | apt-key add -' +-sudo apt-get update +-sudo apt-get install libapache2-mod-passenger +------------------------------------------------------- ++John Leach from Brightbox has kindly provided a Ubuntu packages for Phusion Passenger. The package is available from the link:http://wiki.brightbox.co.uk/docs:phusion-passenger[Brightbox repository]. + + ==== What does the installer do? ==== + +@@ -635,7 +627,7 @@ + Allow from all + </Directory> + +- RackBaseURI /rails # <-- These lines have ++ RackBaseURI /rack # <-- These lines have + <Directory /websites/phusion/rails> # <-- been added. + Options -MultiViews # <-- + </Directory> # <-- +diff -wbBur passenger-3.0.12/ext/boost/config/stdlib/libstdcpp3.hpp passenger.git/ext/boost/config/stdlib/libstdcpp3.hpp +--- passenger-3.0.12/ext/boost/config/stdlib/libstdcpp3.hpp 2012-02-04 02:25:42.000000000 +0400 ++++ passenger.git/ext/boost/config/stdlib/libstdcpp3.hpp 2012-05-17 19:35:01.000000000 +0400 +@@ -31,7 +31,8 @@ + + #ifdef __GLIBCXX__ // gcc 3.4 and greater: + # if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ +- || defined(_GLIBCXX__PTHREADS) ++ || defined(_GLIBCXX__PTHREADS) \ ++ || defined(_GLIBCXX_HAS_GTHREADS) + // + // If the std lib has thread support turned on, then turn it on in Boost + // as well. We do this because some gcc-3.4 std lib headers define _REENTANT +diff -wbBur passenger-3.0.12/ext/boost/exception/detail/error_info_impl.hpp passenger.git/ext/boost/exception/detail/error_info_impl.hpp +--- passenger-3.0.12/ext/boost/exception/detail/error_info_impl.hpp 2012-02-04 02:25:42.000000000 +0400 ++++ passenger.git/ext/boost/exception/detail/error_info_impl.hpp 2012-05-17 19:35:01.000000000 +0400 +@@ -30,7 +30,7 @@ + + protected: + +- ~error_info_base() throw() ++ virtual ~error_info_base() throw() + { + } + }; +diff -wbBur passenger-3.0.12/ext/common/StaticString.h passenger.git/ext/common/StaticString.h +--- passenger-3.0.12/ext/common/StaticString.h 2012-04-13 12:09:57.000000000 +0400 ++++ passenger.git/ext/common/StaticString.h 2012-05-17 19:35:01.000000000 +0400 +@@ -25,6 +25,7 @@ + #ifndef _PASSENGER_STATIC_STRING_H_ + #define _PASSENGER_STATIC_STRING_H_ + ++#include <sys/types.h> + #include <string> + #include <cstring> + #include <cstddef> +diff -wbBur passenger-3.0.12/ext/common/Watchdog.cpp passenger.git/ext/common/Watchdog.cpp +--- passenger-3.0.12/ext/common/Watchdog.cpp 2012-04-13 12:09:57.000000000 +0400 ++++ passenger.git/ext/common/Watchdog.cpp 2012-05-17 19:35:01.000000000 +0400 +@@ -975,7 +975,7 @@ + } else if (pid == -1) { + // Error + e = errno; +- throw SystemException("fork() failed", errno); ++ throw SystemException("fork() failed", e); + + } else { + // Parent +diff -wbBur passenger-3.0.12/ext/nginx/Configuration.c passenger.git/ext/nginx/Configuration.c +--- passenger-3.0.12/ext/nginx/Configuration.c 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/ext/nginx/Configuration.c 2012-05-17 19:35:01.000000000 +0400 +@@ -1,7 +1,7 @@ + /* + * Copyright (C) Igor Sysoev + * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com) +- * Copyright (C) 2010 Phusion ++ * Copyright (C) 2010, 2011, 2012 Phusion + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -335,6 +335,14 @@ + conf->upstream_config.pass_request_headers = NGX_CONF_UNSET; + conf->upstream_config.pass_request_body = NGX_CONF_UNSET; + ++#if (NGX_HTTP_CACHE) ++ conf->upstream_config.cache = NGX_CONF_UNSET_PTR; ++ conf->upstream_config.cache_min_uses = NGX_CONF_UNSET_UINT; ++ conf->upstream_config.cache_bypass = NGX_CONF_UNSET_PTR; ++ conf->upstream_config.no_cache = NGX_CONF_UNSET_PTR; ++ conf->upstream_config.cache_valid = NGX_CONF_UNSET_PTR; ++#endif ++ + conf->upstream_config.intercept_errors = NGX_CONF_UNSET; + + conf->upstream_config.cyclic_temp_file = 0; +@@ -511,8 +519,8 @@ + + if (conf->upstream_config.busy_buffers_size < size) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, +- "\"passenger_busy_buffers_size\" must be equal or bigger than " +- "maximum of the value of \"passenger_buffer_size\" and " ++ "\"passenger_busy_buffers_size\" must be equal to or greater " ++ "than the maximum of the value of \"passenger_buffer_size\" and " + "one of the \"passenger_buffers\""); + + return NGX_CONF_ERROR; +@@ -542,8 +550,8 @@ + + if (conf->upstream_config.temp_file_write_size < size) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, +- "\"passenger_temp_file_write_size\" must be equal or bigger than " +- "maximum of the value of \"passenger_buffer_size\" and " ++ "\"passenger_temp_file_write_size\" must be equal to or greater than " ++ "the maximum of the value of \"passenger_buffer_size\" and " + "one of the \"passenger_buffers\""); + + return NGX_CONF_ERROR; +@@ -566,8 +574,8 @@ + { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "\"passenger_max_temp_file_size\" must be equal to zero to disable " +- "the temporary files usage or must be equal or bigger than " +- "maximum of the value of \"passenger_buffer_size\" and " ++ "temporary files usage or must be equal to or greater than " ++ "the maximum of the value of \"passenger_buffer_size\" and " + "one of the \"passenger_buffers\""); + + return NGX_CONF_ERROR; +@@ -639,6 +647,14 @@ + conf->cache_key = prev->cache_key; + } + ++ #if NGINX_VERSION_NUM >= 1002000 ++ ngx_conf_merge_value(conf->upstream_config.cache_lock, ++ prev->upstream_config.cache_lock, 0); ++ ++ ngx_conf_merge_msec_value(conf->upstream_config.cache_lock_timeout, ++ prev->upstream_config.cache_lock_timeout, 5000); ++ #endif ++ + #endif + + ngx_conf_merge_value(conf->upstream_config.pass_request_headers, +@@ -1273,7 +1289,7 @@ + NULL }, + + { ngx_string("passenger_pass_header"), +- NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG, ++ NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1, + ngx_conf_set_str_array_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(passenger_loc_conf_t, upstream_config.pass_headers), +diff -wbBur passenger-3.0.12/ext/nginx/ContentHandler.c passenger.git/ext/nginx/ContentHandler.c +--- passenger-3.0.12/ext/nginx/ContentHandler.c 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/ext/nginx/ContentHandler.c 2012-05-17 19:35:01.000000000 +0400 +@@ -1,7 +1,7 @@ + /* + * Copyright (C) Igor Sysoev + * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com) +- * Copyright (C) 2010 Phusion ++ * Copyright (C) 2010, 2011, 2012 Phusion + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -387,8 +387,8 @@ + app_type_string_len = sizeof("wsgi"); + break; + default: +- app_type_string = (const u_char *) "rails"; +- app_type_string_len = sizeof("rails"); ++ app_type_string = (const u_char *) "rack"; ++ app_type_string_len = sizeof("rack"); + break; + } + +@@ -931,7 +931,7 @@ + context = ngx_http_get_module_ctx(r, ngx_http_passenger_module); + + if (context == NULL) { +- return NGX_HTTP_INTERNAL_SERVER_ERROR; ++ return NGX_ERROR; + } + + rc = parse_status_line(r, context); +@@ -952,7 +952,6 @@ + } + #endif + +- r->http_version = NGX_HTTP_VERSION_9; + u->headers_in.status_n = NGX_HTTP_OK; + u->state->status = NGX_HTTP_OK; + +@@ -966,7 +965,7 @@ + u->headers_in.status_line.data = ngx_palloc(r->pool, + u->headers_in.status_line.len); + if (u->headers_in.status_line.data == NULL) { +- return NGX_HTTP_INTERNAL_SERVER_ERROR; ++ return NGX_ERROR; + } + + ngx_memcpy(u->headers_in.status_line.data, context->status_start, +diff -wbBur passenger-3.0.12/lib/phusion_passenger/dependencies.rb passenger.git/lib/phusion_passenger/dependencies.rb +--- passenger-3.0.12/lib/phusion_passenger/dependencies.rb 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/lib/phusion_passenger/dependencies.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -1,5 +1,5 @@ + # Phusion Passenger - http://www.modrails.com/ +-# Copyright (c) 2010 Phusion ++# Copyright (c) 2010, 2011, 2012 Phusion + # + # "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui. + # +@@ -29,7 +29,6 @@ + require 'phusion_passenger/platform_info/ruby' + require 'phusion_passenger/platform_info/linux' + require 'phusion_passenger/platform_info/curl' +-require 'phusion_passenger/platform_info/documentation_tools' + + module PhusionPassenger + +@@ -110,9 +109,9 @@ + return (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7" + end + +- # Returns whether asciidoc is required in order to be able to package all files ++ # Returns whether Mizuho is required in order to be able to package all files + # in the packaging list. +- def self.asciidoc_required? ++ def self.mizuho_required? + return Packaging::ASCII_DOCS.any? do |fn| + !File.exist?("#{SOURCE_ROOT}/#{fn}") + end +@@ -579,7 +578,7 @@ + end + + Daemon_Controller = Dependency.new do |dep| +- dep.name = "daemon_controller >= 0.2.5" ++ dep.name = "daemon_controller >= 1.0.0" + dep.install_instructions = "Please install RubyGems first, then run " << + "<b>#{PlatformInfo.gem_command || "gem"} install daemon_controller</b>" + dep.define_checker do |result| +@@ -591,7 +590,7 @@ + require 'daemon_controller' + begin + require 'daemon_controller/version' +- too_old = DaemonController::VERSION_STRING < '0.2.5' ++ too_old = DaemonController::VERSION_STRING < '1.0.0' + rescue LoadError + too_old = true + end +@@ -610,23 +609,18 @@ + end + end + +- AsciiDoc = Dependency.new do |dep| +- dep.name = "Asciidoc" ++ Mizuho = Dependency.new do |dep| ++ dep.name = "Mizuho" + dep.define_checker do |result| +- if PlatformInfo.asciidoc.nil? ++ mizuho = PlatformInfo.find_command('mizuho') ++ if mizuho.nil? + result.not_found + else +- result.found(PlatformInfo.asciidoc) ++ result.found(mizuho) + end + end +- if RUBY_PLATFORM =~ /darwin/ +- # Installing asciidoc with source-highlight is too much of a pain on OS X, +- # so recommend Mizuho instead. + dep.website = "http://github.com/FooBarWidget/mizuho" + dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo.gem_command || "gem"} install mizuho</b>" +- else +- dep.website = "http://www.methods.co.nz/asciidoc/" +- end + end + end + +diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/command.rb passenger.git/lib/phusion_passenger/standalone/command.rb +--- passenger-3.0.12/lib/phusion_passenger/standalone/command.rb 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/lib/phusion_passenger/standalone/command.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -1,5 +1,5 @@ + # Phusion Passenger - http://www.modrails.com/ +-# Copyright (c) 2010 Phusion ++# Copyright (c) 2010, 2011, 2012 Phusion + # + # "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui. + # +@@ -61,13 +61,13 @@ + require 'daemon_controller' + begin + require 'daemon_controller/version' +- too_old = DaemonController::VERSION_STRING < '0.2.5' ++ too_old = DaemonController::VERSION_STRING < '1.0.0' + rescue LoadError + too_old = true + end + if too_old + error "Your version of daemon_controller is too old. " << +- "You must install 0.2.5 or later. Please upgrade:\n\n" << ++ "You must install 1.0.0 or later. Please upgrade:\n\n" << + + " sudo gem uninstall FooBarWidget-daemon_controller\n" << + " sudo gem install daemon_controller" +@@ -210,24 +210,21 @@ + end + end + +- def ping_nginx +- require 'socket' unless defined?(UNIXSocket) +- if @options[:socket_file] +- UNIXSocket.new(@options[:socket_file]) +- else +- TCPSocket.new(@options[:address], nginx_ping_port) +- end +- end +- + def create_nginx_controller(extra_options = {}) + require_daemon_controller ++ require 'socket' unless defined?(UNIXSocket) + @temp_dir = "/tmp/passenger-standalone.#{$$}" + @config_filename = "#{@temp_dir}/config" ++ if @options[:socket_file] ++ ping_spec = [:unix, @options[:socket_file]] ++ else ++ ping_spec = [:tcp, @options[:address], nginx_ping_port] ++ end + opts = { + :identifier => 'Nginx', + :before_start => method(:write_nginx_config_file), + :start_command => method(:determine_nginx_start_command), +- :ping_command => method(:ping_nginx), ++ :ping_command => ping_spec, + :pid_file => @options[:pid_file], + :log_file => @options[:log_file], + :timeout => 25 +diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/runtime_installer.rb passenger.git/lib/phusion_passenger/standalone/runtime_installer.rb +--- passenger-3.0.12/lib/phusion_passenger/standalone/runtime_installer.rb 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/lib/phusion_passenger/standalone/runtime_installer.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -91,8 +91,8 @@ + if Dependencies.fastthread_required? + result << Dependencies::FastThread + end +- if Dependencies.asciidoc_required? +- result << Dependencies::AsciiDoc ++ if Dependencies.mizuho_required? ++ result << Dependencies::Mizuho + end + return result + end +diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/start_command.rb passenger.git/lib/phusion_passenger/standalone/start_command.rb +--- passenger-3.0.12/lib/phusion_passenger/standalone/start_command.rb 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/lib/phusion_passenger/standalone/start_command.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -243,15 +243,32 @@ + end + end + +- def check_port_availability +- if !@options[:socket_file] ++ def check_port(address, port) ++ begin ++ socket = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0) ++ sockaddr = Socket.pack_sockaddr_in(port, address) ++ begin ++ socket.connect_nonblock(sockaddr) ++ rescue Errno::ENOENT, Errno::EINPROGRESS, Errno::EAGAIN, Errno::EWOULDBLOCK ++ if select(nil, [socket], nil, 0.1) + begin +- TCPSocket.new(@options[:address], @options[:port]).close +- port_taken = true +- rescue SystemCallError +- port_taken = false ++ socket.connect_nonblock(sockaddr) ++ rescue Errno::EISCONN ++ end ++ else ++ raise Errno::ECONNREFUSED ++ end + end +- if port_taken ++ return true ++ rescue Errno::ECONNREFUSED ++ return false ++ ensure ++ socket.close if socket ++ end ++ end ++ ++ def check_port_availability ++ if !@options[:socket_file] && check_port(@options[:address], @options[:port]) + error "The address #{@options[:address]}:#{@options[:port]} is already " << + "in use by another process, perhaps another Phusion Passenger " << + "Standalone instance.\n\n" << +@@ -261,7 +278,6 @@ + exit 1 + end + end +- end + + def should_watch_logs? + return !@options[:daemonize] && @options[:log_file] != "/dev/null" +diff -wbBur passenger-3.0.12/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb passenger.git/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb +--- passenger-3.0.12/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb 2012-05-17 19:35:01.000000000 +0400 +@@ -1,7 +1,7 @@ + <red>WARNING:</red> <yellow>Apache doesn't seem to be compiled with the 'prefork', 'worker' or 'event' MPM</yellow> + + Phusion Passenger has only been tested on Apache with the 'prefork', the +-'worker' and the 'worker' MPM. Your Apache installation is compiled with ++'worker' and the 'event' MPM. Your Apache installation is compiled with + the '<%= @current_mpm %>' MPM. We recommend you to abort this installer and to recompile + Apache with either the 'prefork', the 'worker' or the 'event' MPM. + +diff -wbBur passenger-3.0.12/lib/phusion_passenger/templates/standalone/config.erb passenger.git/lib/phusion_passenger/templates/standalone/config.erb +--- passenger-3.0.12/lib/phusion_passenger/templates/standalone/config.erb 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/lib/phusion_passenger/templates/standalone/config.erb 2012-05-17 19:35:01.000000000 +0400 +@@ -27,7 +27,7 @@ + master_process on; + worker_processes 1; + daemon on; +-error_log '<%= @options[:log_file] %>'; ++error_log '<%= @options[:log_file] %>' info; + pid '<%= @options[:pid_file] %>'; + <% if @options[:user] %>user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;<% end %> + +@@ -36,6 +36,7 @@ + } + + http { ++ log_format debug '[$time_local] $msec "$request" $status conn=$connection sent=$bytes_sent body_sent=$body_bytes_sent'; + include '<%= PhusionPassenger::RESOURCES_DIR %>/mime.types'; + passenger_ruby <%= PlatformInfo.ruby_command %>; + passenger_root '<%= passenger_root %>'; diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index c27b0d27d..33e2b34fe 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 69962 2012-04-27 10:25:29Z mtorromeo $ +# $Id: PKGBUILD 70768 2012-05-16 14:40:05Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.22_rel25.2 +pkgver=5.5.23_rel25.3 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" arch=('i686' 'x86_64') @@ -99,6 +99,6 @@ package() { install -dm700 "${pkgdir}"/var/lib/mysql } -md5sums=('2fc67b0e0e31c1a7949beae9399abc33' +md5sums=('b098914c14256187686db0ccbc46a6d4' '243864805611764a7e5883c1dba7afd8' '1c949c0dbea5206af0db14942d9927b6') 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/pidgin-otr/PKGBUILD b/community/pidgin-otr/PKGBUILD index 2a01f18f7..3cfaae4ac 100644 --- a/community/pidgin-otr/PKGBUILD +++ b/community/pidgin-otr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57815 2011-11-03 09:57:10Z lfleischer $ +# $Id: PKGBUILD 70766 2012-05-16 13:08:20Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,16 +6,17 @@ # Contributor: Marcel Wysocki <maci@satgnu.net> pkgname=pidgin-otr -pkgver=3.2.0 -pkgrel=3 +pkgver=3.2.1 +pkgrel=1 pkgdesc='Off-the-Record Messaging plugin for Pidgin.' arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://www.cypherpunks.ca/otr/' depends=('libotr>=3.2.0' 'pidgin' 'perlxml') +makedepends=('intltool') source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz"{,.asc}) -md5sums=('8af70b654b7d7c5a5b7785699ff562f9' - '67d711a7a44cef2791f50b319aaf0e0e') +md5sums=('4c3f73cca729555ff46c09e789ef6896' + 'e9a6d699768bd888f086e697ad984aa7') build() { cd "${srcdir}/${pkgname}-${pkgver}" 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/prosody/PKGBUILD b/community/prosody/PKGBUILD index 994cf84fa..9dc7f4f2a 100644 --- a/community/prosody/PKGBUILD +++ b/community/prosody/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66166 2012-02-23 02:25:30Z spupykin $ +# $Id: PKGBUILD 70828 2012-05-17 10:16:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.0@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> pkgname=prosody pkgver=0.8.2 -pkgrel=2 +pkgrel=3 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua." arch=('i686' 'x86_64' 'mips64el') url="http://prosody.im/" @@ -20,11 +20,13 @@ backup=('etc/logrotate.d/prosody' source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz" 'prosody.rcd' 'prosody.logrotated' - 'fix-config.patch') + 'fix-config.patch' + 'prosody.tmpfile.d') md5sums=('6e907bf0d0acf24f1011083020ba6ffb' 'd2b5f9c8e42bb31819e715eb1756ee53' '26466fdbea87963a3ca6f48f76fe4a29' - '59a1bf2dfd0bd386cef6fa646e2a3752') + '59a1bf2dfd0bd386cef6fa646e2a3752' + 'e2f5a1df410b05696a30dcb058841084') build() { cd "$srcdir/prosody-$pkgver" @@ -50,5 +52,6 @@ package() { install -o root -g root -m 644 "$srcdir/prosody.logrotated" \ "$pkgdir/etc/logrotate.d/prosody" - install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir//usr/lib/tmpfiles.d/prosody.conf } diff --git a/community/prosody/prosody.tmpfile.d b/community/prosody/prosody.tmpfile.d new file mode 100644 index 000000000..5f6de657d --- /dev/null +++ b/community/prosody/prosody.tmpfile.d @@ -0,0 +1 @@ +d /run/prosody 0755 412 412 diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index 25bdc0312..672ece806 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 60320 2011-12-10 12:45:52Z arodseth $ +# $Id: PKGBUILD 70698 2012-05-15 08:14:57Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> + pkgname=python-pymongo -pkgver=1.9b1 -pkgrel=3 +pkgver=2.2 +pkgrel=1 pkgdesc="Python driver for MongoDB" arch=('x86_64' 'i686' 'mips64el') license=("APACHE") -url="http://pypi.python.org/pypi/pymongo3/" +url="http://pypi.python.org/pypi/pymongo/" depends=('python') makedepends=('python-distribute') -source=("http://pypi.python.org/packages/source/p/pymongo3/pymongo3-$pkgver.tar.gz") -sha256sums=('dcabaaca2f0067e648c2b081a70564b832de981495ff953597c1e451a7fcac20') +source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") +sha256sums=('ac7952896ecfd5d9b4b9d8bb0077c95a0296ea21374df85e2ca32c237c0be57f') package() { - cd "$srcdir/pymongo3-$pkgver" + cd "$srcdir/pymongo-$pkgver" LANG=en_US.UTF8 python setup.py install --root="$pkgdir" --optimize=1 } diff --git a/community/python2-pymongo/PKGBUILD b/community/python2-pymongo/PKGBUILD index 22e894a3b..eb27d7d31 100644 --- a/community/python2-pymongo/PKGBUILD +++ b/community/python2-pymongo/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: lp76 <l.peduto@gmail.com> pkgname=python2-pymongo -pkgver=2.1 +pkgver=2.2 pkgrel=1 pkgdesc="Python driver for MongoDB" license=("APACHE") @@ -12,7 +12,7 @@ depends=('python2') makedepends=('python2-distribute') source=(http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz) arch=('i686' 'x86_64' 'mips64el') -md5sums=('40f8c8be0edcea398ba41d5d3ba5e8b0') +md5sums=('101dd4ae59bdd487f67b3a3968a82c8c') package() { cd $srcdir/pymongo-$pkgver 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..c34f660cc 100644 --- a/community/r8168-lts/PKGBUILD +++ b/community/r8168-lts/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68866 2012-04-04 09:58:28Z mtorromeo $ +# $Id: PKGBUILD 70870 2012-05-18 08:29:14Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=r8168-lts _pkgname=r8168 -pkgver=8.028.00 -pkgrel=4 -pkgdesc="A kernel module for Realtek 8168 network cards for kernel26-lts" +pkgver=8.030.00 +pkgrel=2 +pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts" url="http://www.realtek.com.tw" license=("GPL") arch=('i686' 'x86_64') @@ -28,5 +28,5 @@ package() { find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; } -md5sums=('4cc3c1706f00b55ab9bd6f5e06b758c2') -sha256sums=('c77873f43693eea5304e17e35ff3d6503f6581e358d28c38927573ea56f4d6a3') +md5sums=('3205d895dbdc7564ba60b71acb308417') +sha256sums=('1b2267703c83f1709cad115cc39b11e8c4b64e7944452c684ef2bd86c626d6c4') diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD index 965ec606a..5933729b9 100644 --- a/community/remmina/PKGBUILD +++ b/community/remmina/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 70316 2012-05-04 09:53:40Z spupykin $ +# $Id: PKGBUILD 70791 2012-05-16 16:57:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=remmina pkgver=1.0.0 -pkgrel=6 +pkgrel=7 pkgdesc="Remmina is a remote desktop client written in GTK+. " arch=(i686 x86_64 'mips64el') url="http://remmina.sourceforge.net/" license=('GPL') -depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp' 'libgnome-keyring') -makedepends=('intltool' 'pkgconfig' 'cmake' +depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp') +makedepends=('intltool' 'pkgconfig' 'cmake' 'libgnome-keyring' 'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib') optdepends=('libxkbfile' 'freerdp' @@ -32,5 +32,9 @@ build() { export LDFLAGS="-lX11 -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lpthread -lgnutls" cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_APPINDICATOR=OFF . make +} + +package() { + cd ${srcdir}/FreeRDP-Remmina-*/ make DESTDIR=${pkgdir} install } 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/scite/PKGBUILD b/community/scite/PKGBUILD index 3e9f6ebc8..3cf3c638e 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 66814 2012-02-28 22:45:12Z arodseth $ +# $Id: PKGBUILD 70700 2012-05-15 08:39:01Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Jochem Kossen <j.kossen@home.nl> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + pkgname=scite -pkgver=3.0.3 +pkgver=3.1.0 pkgrel=1 pkgdesc='Editor with facilities for building and running programs' arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +17,7 @@ makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') install=$pkgname.install source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -sha256sums=('0d02b81f6f182366abe8133f4e727d802b756d33e9eeba5fe9ac69c4a17286fd') +sha256sums=('09b020a331f7c54edd731440fa1c717776021d5dc775e58965f8ef71673202e3') build() { cd "$srcdir" 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/simh/PKGBUILD b/community/simh/PKGBUILD index fb4130e97..2c2018374 100644 --- a/community/simh/PKGBUILD +++ b/community/simh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66322 2012-02-23 14:04:05Z allan $ +# $Id: PKGBUILD 70434 2012-05-06 12:11:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: waterbear <st92.at.freeshell.org> pkgname=simh -pkgver=3.8.1 -_pkgver=38-1 -pkgrel=3 +pkgver=3.9.0 +_pkgver=39-0 +pkgrel=1 pkgdesc="simulator for assorted historical computers, from Altair to VAX" arch=('i686' 'x86_64' 'mips64el') url="http://simh.trailing-edge.com" @@ -15,7 +15,7 @@ makedepends=("unzip") install=simh.install source=("http://simh.trailing-edge.com/sources/simhv${_pkgver}.zip" "LICENSE") -md5sums=('e15f65a82e21ea49e14b438326d93d5c' +md5sums=('b80385888f23269abaee0bad7d84ea7c' 'd56eefa5d020ee2b77d21280fef80e3d') build() { diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD index d27f6865f..9a5e4bcc7 100644 --- a/community/snort/PKGBUILD +++ b/community/snort/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69276 2012-04-11 23:23:45Z lfleischer $ +# $Id: PKGBUILD 70868 2012-05-18 06:19:27Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> @@ -6,7 +6,7 @@ # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> pkgname=snort -pkgver=2.9.2.2 +pkgver=2.9.2.3 pkgrel=1 pkgdesc='A lightweight network intrusion detection system.' arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ install='snort.install' source=("http://www.snort.org/dl/snort-current/${pkgname}-${pkgver}.tar.gz" 'snort' 'snort.conf.d') -md5sums=('4254389550e3be31afebc70e64e6002f' +md5sums=('9ddb26005d864577fca66a9a1cdfdc8a' '361b8b9e40b9af0164f6b3e3da2e8277' 'b4fb8a68490589cd34df93de7609bfac') 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..7c6210b0c 100644 --- a/community/sslh/PKGBUILD +++ b/community/sslh/PKGBUILD @@ -1,45 +1,50 @@ -# $Id: PKGBUILD 69659 2012-04-22 00:48:23Z seblu $ +# $Id: PKGBUILD 70896 2012-05-18 22:00:49Z 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.13b 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' - 'ee8a4fcfc1f6839f7c93deb6f59f7fd6') + 'sslh.conf') +md5sums=('fbd8934e6f799437c562866f09afee5b' + 'c2a0c7c58d091acf5b4672f58066ee8f' + 'c51c63d2b28080bae4c1c7a0c469bab7') build() { - cd $pkgname-$pkgver + #cd $pkgname-$pkgver + cd $pkgname-1.13 # 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 - make + sed -i 's/init.d/rc.d/' sslh.pod + sed -i 's+/etc/default+/etc/conf.d+' sslh.pod + make VERSION=\"v$pkgver\" } package() { # install initscripts install -Dm 755 sslh.rc "$pkgdir/etc/rc.d/sslh" install -Dm 644 sslh.conf "$pkgdir/etc/conf.d/sslh" - # install systemd service - install -Dm 644 sslh.service "$pkgdir/usr/lib/systemd/system/sslh.service" # manually install to have both ssl-fork and ssl-select - cd $pkgname-$pkgver + #cd $pkgname-$pkgver + cd $pkgname-1.13 install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork" install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select" ln -s sslh-fork "$pkgdir/usr/bin/sslh" + # install manpage install -Dm 0644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz" + # install example file + install -Dm 0644 example.cfg "$pkgdir/etc/sslh.conf" + # install systemd service + install -Dm 644 scripts/systemd.sslh.service \ + "$pkgdir/usr/lib/systemd/system/sslh.service" } # 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..456e122f4 100644 --- a/community/sslh/sslh.rc +++ b/community/sslh/sslh.rc @@ -4,31 +4,31 @@ . /etc/rc.d/functions . /etc/conf.d/${0##*/} -NAME=sslh DAEMON=/usr/bin/sslh PID=$(pidof -o %PPID $DAEMON) +DAEMON_OPTS="--background $DAEMON_OPTS" 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/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index a8c10e9ed..d8580657e 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67591 2012-03-13 12:49:15Z spupykin $ +# $Id: PKGBUILD 70821 2012-05-17 08:59:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat -pkgver=10.0.4 +pkgver=10.0.5 pkgrel=1 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ backup=('etc/conf.d/sysstat' 'etc/conf.d/sysstat.ioconf') source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz sysstat) -md5sums=('c84fd7774080dae34f47257175a0b187' +md5sums=('208dd236d726d20591d53d3a20124dd4' '3ce41ebf7330aba01e70b38658afed1f') build() { diff --git a/community/tig/PKGBUILD b/community/tig/PKGBUILD index 63f0a5f06..3dda790b9 100644 --- a/community/tig/PKGBUILD +++ b/community/tig/PKGBUILD @@ -4,15 +4,15 @@ # Contributor: Nathan Jones <nathanj@insightbb.com> pkgname=tig -pkgver=0.18 -pkgrel=2 +pkgver=1.0 +pkgrel=1 pkgdesc='Text-mode interface for Git.' depends=('git' 'ncurses') url='http://jonas.nitro.dk/tig/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('4fa9e33c5daa76b6fed11e068405356f') +md5sums=('a2d414d1cebbc9cd4f3d545bc6f225c6') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/ucommon/PKGBUILD b/community/ucommon/PKGBUILD new file mode 100644 index 000000000..bb002c30a --- /dev/null +++ b/community/ucommon/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 70712 2012-05-15 11:28:13Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Dan Serban +# Contributors: David Zaragoza, Andrea Scarpino + +pkgname=ucommon +pkgver=5.2.2 +pkgrel=1 +pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" +arch=(i686 x86_64) +url=http://ftp.gnu.org/gnu/commoncpp/ +license=(GPL) +depends=(openssl) +makedepends=(lynx) +options=('!libtool') +source=("http://ftp.gnu.org/pub/gnu/commoncpp/ucommon-$pkgver.tar.gz") +md5sums=('4739fcd9db006432f1b8e2ea226e414a') + +build() { + cd $(ls -1d ucommon-*/ | tail -1) + ./configure --prefix=/usr + make + make DESTDIR="${pkgdir}" install +} diff --git a/community/uget/PKGBUILD b/community/uget/PKGBUILD index bf103729d..73c1ba391 100644 --- a/community/uget/PKGBUILD +++ b/community/uget/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 69404 2012-04-15 22:27:21Z bgyorgy $ +# $Id: PKGBUILD 70730 2012-05-15 22:54:45Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=uget -pkgver=1.8.1 +pkgver=1.8.2 pkgrel=1 pkgdesc="GTK+ download manager featuring download classification and HTML import" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool') optdepends=('aria2: alternative backend') install=$pkgname.install source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver.tar.gz) -md5sums=('e3fc14042820f0496f12c85c3847c6f8') +md5sums=('42be57f08f41ffe4f5c4b60a4e8aa079') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/volumeicon/PKGBUILD b/community/volumeicon/PKGBUILD index daa61ed5d..574ebfbde 100644 --- a/community/volumeicon/PKGBUILD +++ b/community/volumeicon/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 64486 2012-02-14 08:50:43Z arodseth $ +# $Id: PKGBUILD 70695 2012-05-15 07:22:05Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Maato <maato softwarebakery com> pkgname=volumeicon pkgver=0.4.6 -pkgrel=3 +pkgrel=4 pkgdesc="Volume control for your system tray" arch=('x86_64' 'i686') url="http://softwarebakery.com/maato/volumeicon.html" license=('GPL3') -depends=('gtk2>=2.16.0' 'alsa-lib') -source=("http://softwarebakery.com/maato/files/volumeicon/$pkgname-$pkgver.tar.gz") -sha256sums=('32f94adc5f346404ae564405dd483ae4bd04212df08e46f18d369b4ba2cb6590') +depends=('gtk2>=2.16.0' 'alsa-lib' 'libnotify') +source=("http://softwarebakery.com/maato/files/volumeicon/$pkgname-$pkgver.tar.gz" + "glib.patch") +sha256sums=('32f94adc5f346404ae564405dd483ae4bd04212df08e46f18d369b4ba2cb6590' + 'f2ab8b01cd9f554b170a773fa2a88c2874d97eb3fe106d4692595728201abeb0') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + patch -p1 < ../glib.patch + ./configure \ + --prefix=/usr \ + --enable-notify make } diff --git a/community/volumeicon/glib.patch b/community/volumeicon/glib.patch new file mode 100644 index 000000000..93e47d2c4 --- /dev/null +++ b/community/volumeicon/glib.patch @@ -0,0 +1,14 @@ +--- volumeicon-0.4.6/src/alsa_backend.backup 2012-05-15 09:12:13.469335762 +0200 ++++ volumeicon-0.4.6/src/alsa_backend.c 2012-05-15 09:12:31.862905251 +0200 +@@ -22,10 +22,7 @@ + //############################################################################## + + #include <alsa/asoundlib.h> +-#include <glib/gstring.h> +-#include <glib/gstdio.h> +-#include <glib/glist.h> +-#include <glib/giochannel.h> ++#include <glib.h> + + #include "alsa_backend.h" + diff --git a/community/wmname/PKGBUILD b/community/wmname/PKGBUILD index 0d72d64c7..778e1f94a 100644 --- a/community/wmname/PKGBUILD +++ b/community/wmname/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55541 2011-09-14 08:07:38Z andrea $ +# $Id: PKGBUILD 70751 2012-05-16 10:53:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vincent Kriek <vincent@vincentkriek.nl> @@ -6,7 +6,7 @@ pkgname=wmname pkgver=0.1 pkgrel=2 pkgdesc="An utility to set the name of your window manager" -url="http://www.suckless.org/programs/wmname.html" +url="http://tools.suckless.org/wmname" license=('custom') depends=('libx11') arch=('i686' 'x86_64' 'mips64el') 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') diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD index 2fee0ffbe..d2aea71eb 100644 --- a/community/yaz/PKGBUILD +++ b/community/yaz/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 69774 2012-04-23 09:16:32Z ibiru $ -# Maintainer: Ray Rashif <schiv@archlinux.org> +# $Id: PKGBUILD 70645 2012-05-13 19:04:54Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=yaz -pkgver=4.2.29 +pkgver=4.2.33 pkgrel=1 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers" arch=('i686' 'x86_64' 'mips64el') -license=('BSD') url="http://www.indexdata.dk/yaz" +license=('BSD') depends=('openssl' 'libxslt' 'icu') options=('!libtool') source=("http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('584bcf12401f182a42091616c6cf7e0a') +sha256sums=('77baecaa0b032c0155676e704d39b49415d4793ab65ad6c26e04f6dfb0be1276') build() { - cd "$srcdir/$pkgname-$pkgver" + cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr \ --enable-shared=yaz \ @@ -27,12 +28,9 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd ${srcdir}/$pkgname-$pkgver - make DESTDIR="$pkgdir/" install + make DESTDIR=${pkgdir} install - install -Dm644 LICENSE \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } - -# vim:set ts=2 sw=2 et: |