From 55d1e19e71b453a0f47c599f281a2ad2644247d2 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 5 Dec 2011 23:15:23 +0000 Subject: Mon Dec 5 23:15:23 UTC 2011 --- community/avrdude/PKGBUILD | 9 +-- community/conkeror-git/PKGBUILD | 42 ++++++------ community/courier-imap/PKGBUILD | 8 +-- community/courier-maildrop/PKGBUILD | 6 +- community/courier-mta/PKGBUILD | 6 +- community/freeimage/PKGBUILD | 4 +- community/jack2/40-hpet-permissions.rules | 2 + community/jack2/99-audio.conf | 2 + community/jack2/PKGBUILD | 80 ++++++++++++++++------ community/megaglest/PKGBUILD | 8 +-- community/nodejs/PKGBUILD | 4 +- community/openttd/PKGBUILD | 6 +- community/pcsclite/PKGBUILD | 7 +- community/tremulous/PKGBUILD | 109 +++++++++++++++--------------- community/tremulous/fix_fs26749.patch | 21 ++++++ community/tremulous/tremded.sh | 17 +++++ community/tremulous/tremdedrc | 1 + community/tremulous/tremulous.sh | 14 ++++ community/uzbl/PKGBUILD | 8 +-- 19 files changed, 226 insertions(+), 128 deletions(-) create mode 100644 community/jack2/40-hpet-permissions.rules create mode 100644 community/jack2/99-audio.conf create mode 100644 community/tremulous/fix_fs26749.patch create mode 100644 community/tremulous/tremded.sh create mode 100644 community/tremulous/tremdedrc create mode 100644 community/tremulous/tremulous.sh (limited to 'community') diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD index a3f7a537b..ee235f8a7 100644 --- a/community/avrdude/PKGBUILD +++ b/community/avrdude/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 55068 2011-09-02 00:01:59Z bfanella $ +# $Id: PKGBUILD 60059 2011-12-04 15:21:41Z jelle $ # Contributor: Corrado Primier # Maintainer: Brad Fanella pkgname=avrdude -pkgver=5.11 +pkgver=5.11.1 pkgrel=1 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers" arch=('i686' 'x86_64') url="http://www.nongnu.org/avrdude/" license=('GPL') depends=('libusb-compat' 'readline') -source=(http://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz) -md5sums=('ba62697270b1292146dc56d462f5da14') +source=(http://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('3a43e288cb32916703b6945e3f260df9' + '0c23b005d4090aef4e081476aabc1958') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/conkeror-git/PKGBUILD b/community/conkeror-git/PKGBUILD index ad91cbccd..01336992b 100644 --- a/community/conkeror-git/PKGBUILD +++ b/community/conkeror-git/PKGBUILD @@ -1,17 +1,17 @@ # Contributor: Heeru Kiyura # Maintainer: Stefan Husmann -_commit=c53588e0e42330f65e8c3be41900900da17a7eda +_commit=b0882d615876ec7c1554e50b652bed79209da4d6 pkgname=conkeror-git pkgver=1.0pre -pkgrel=2 +pkgrel=3 pkgdesc="A highly programmable web browser based on Mozilla XULRunner." arch=('i686' 'x86_64') url="http://conkeror.mozdev.org/" license=('MPL' 'GPL' 'LGPL') depends=('xulrunner' 'desktop-file-utils') -makedepends=('git' 'imagemagick') -provides=(conkeror) +makedepends=('git') +provides=('conkeror') source=(conkeror_gimpfile.xpm conkeror.sh) md5sums=('b592582a5b923db1707615564a95737f' '11c6c76a2639254754b34a542f1965a1') @@ -21,10 +21,10 @@ __gitroot="git://repo.or.cz/conkeror.git" __gitname="conkeror" build() { - cd $srcdir + cd "$srcdir" ## Git checkout - if [ -d $srcdir/${__gitname} ] ; then + if [ -d "$srcdir/${__gitname}" ] ; then msg "Git checkout: Updating existing tree" cd ${__gitname} && git checkout ${_commit} msg "Git checkout: Tree has been updated" @@ -35,24 +35,22 @@ build() { msg "Checkout completed" ## Build - [ -d ${__gitname}-build ] || rm -rf $srcdir/${__gitname}-build - git clone $srcdir/${__gitname} $srcdir/${__gitname}-build - cd $srcdir/${__gitname}-build + [ -d ${__gitname}-build ] || rm -rf "$srcdir/${__gitname}-build" + git clone "$srcdir/${__gitname}" "$srcdir/${__gitname}-build" + cd "$srcdir/${__gitname}-build" make } package() { - cd $srcdir/${__gitname}-build - install -d $pkgdir/usr/share/conkeror - install -d $pkgdir/usr/share/man/man1 - cp -a $srcdir/${__gitname}-build/* $pkgdir/usr/share/conkeror - install -Dm644 $pkgdir/usr/share/conkeror/contrib/man/conkeror.1 \ - $pkgdir/usr/share/man/man1/conkeror.1 - rm -r $pkgdir/usr/share/conkeror/contrib/man - install -Dm644 $srcdir/${__gitname}-build/debian/conkeror.desktop \ - $pkgdir/usr/share/applications/conkeror.desktop - rm -r $pkgdir/usr/share/conkeror/debian - install -d $pkgdir/usr/share/pixmaps - install -Dm644 $srcdir/conkeror_gimpfile.xpm $pkgdir/usr/share/pixmaps - install -Dm755 $srcdir/conkeror.sh $pkgdir/usr/bin/conkeror + cd "$srcdir/${__gitname}-build" + install -d "$pkgdir"/usr/share/{conkeror,man/man1} + cp -a "$srcdir"/${__gitname}-build/* "$pkgdir/usr/share/conkeror" + install -Dm644 "$pkgdir/usr/share/conkeror/contrib/man/conkeror.1" \ + "$pkgdir/usr/share/man/man1/conkeror.1" + rm -r "$pkgdir/usr/share/conkeror/contrib/man" + install -Dm644 "$srcdir/${__gitname}-build/debian/conkeror.desktop" \ + "$pkgdir/usr/share/applications/conkeror.desktop" + rm -r "$pkgdir/usr/share/conkeror/debian" + install -Dm644 "$srcdir/conkeror_gimpfile.xpm" "$pkgdir/usr/share/pixmaps/conkeror_gimpfile.xpm" + install -Dm755 "$srcdir/conkeror.sh" "$pkgdir/usr/bin/conkeror" } diff --git a/community/courier-imap/PKGBUILD b/community/courier-imap/PKGBUILD index d45dbf1d1..e1bb3f4f8 100644 --- a/community/courier-imap/PKGBUILD +++ b/community/courier-imap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59702 2011-11-29 13:34:05Z stephane $ +# $Id: PKGBUILD 60091 2011-12-05 02:57:32Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: tobias # Committer: Manolis Tzanidakis pkgname=courier-imap -pkgver=4.9.3 -pkgrel=5 +pkgver=4.10.0 +pkgrel=1 pkgdesc="IMAP(s)/POP3(s) Server" arch=('i686' 'x86_64') license=('GPL2') @@ -26,7 +26,7 @@ source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgnam imapd-ssl.rc.d pop3d.rc.d pop3d-ssl.rc.d) -md5sums=('703ddbb090569436dbda61d0d62b1eb8' +md5sums=('2f95c99b9ad1380b9f3ac733ccd741a2' '3e08f017f6c5a52dea28f6f0dbd50b86' '500c37831974f4676b67e650c67a59f6' '6574c8046e44698efa7452c4b445d88e' diff --git a/community/courier-maildrop/PKGBUILD b/community/courier-maildrop/PKGBUILD index a2cd7edb0..02564d120 100644 --- a/community/courier-maildrop/PKGBUILD +++ b/community/courier-maildrop/PKGBUILD @@ -5,8 +5,8 @@ pkgname=courier-maildrop _srcname=maildrop -pkgver=2.5.4 -pkgrel=3 +pkgver=2.5.5 +pkgrel=1 pkgdesc="mail delivery agent - procmail like but nicer syntax" arch=('i686' 'x86_64') license=('GPL2') @@ -15,7 +15,7 @@ depends=('courier-authlib>=0.63.0' 'gamin' 'pcre' 'gdbm') conflicts=('courier-mta') options=(!libtool) source=(http://downloads.sourceforge.net/project/courier/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.bz2) -md5sums=('5770345cdceae28bdc24809e7adb3426') +md5sums=('5d71455ab26096ecf4f624fbee0320cb') build() { cd ${srcdir}/${_srcname}-${pkgver} diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD index 82df2e28f..12ec10476 100644 --- a/community/courier-mta/PKGBUILD +++ b/community/courier-mta/PKGBUILD @@ -7,8 +7,8 @@ # Go read http://www.courier-mta.org/install.html b4 running or building courier pkgname=courier-mta -pkgver=0.66.3 -pkgrel=5 +pkgver=0.67.0 +pkgrel=1 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" arch=(i686 x86_64) license=('GPL2') @@ -40,7 +40,7 @@ source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/couri pop3d.rc.d pop3d-ssl.rc.d webmaild.rc.d) -md5sums=('3b28f14afe3db09b74b4845323c3e982' +md5sums=('c2e26499f9f48577aa7a0735f5e96997' '9055ba622efd37603186ce1f37277224' '5cbeb5c323706058e545f74ad7752ebe' 'f3ff70b40c7a1f7a017e8c4cc4d92f4f' diff --git a/community/freeimage/PKGBUILD b/community/freeimage/PKGBUILD index 9e6020ad2..56cd2ccb4 100644 --- a/community/freeimage/PKGBUILD +++ b/community/freeimage/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: scippio pkgname=freeimage -pkgver=3.15.0 +pkgver=3.15.1 pkgrel=1 pkgdesc="Library project for developers who would like to support popular graphics image formats." arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('gcc-libs') makedepends=('hd2u') source=("http://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip" 'gcc4.5_ln.patch') -md5sums=('3b4f08e4985b269beb29a2fced1ef888' +md5sums=('450d2ff278690b0d1d7d7d58fad083cc' 'f85279b2572a0a9e03775909cd9cd759') build() { diff --git a/community/jack2/40-hpet-permissions.rules b/community/jack2/40-hpet-permissions.rules new file mode 100644 index 000000000..7af3780f9 --- /dev/null +++ b/community/jack2/40-hpet-permissions.rules @@ -0,0 +1,2 @@ +KERNEL=="rtc0", GROUP="audio" +KERNEL=="hpet", GROUP="audio" diff --git a/community/jack2/99-audio.conf b/community/jack2/99-audio.conf new file mode 100644 index 000000000..eb76ef920 --- /dev/null +++ b/community/jack2/99-audio.conf @@ -0,0 +1,2 @@ +@audio - rtprio 99 +@audio - memlock unlimited diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index b0c49a04d..c6b75a3b4 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 52694 2011-07-27 17:23:48Z schiv $ +# $Id: PKGBUILD 60072 2011-12-04 18:08:53Z schiv $ # Maintainer: Ray Rashif # Contributor: Daniele Paolella # Contributor: Philipp Überbacher @@ -6,23 +6,37 @@ pkgbase=jack2 pkgname=('jack2' 'jack2-dbus') +#pkgname= # single build (overrides split) _tarname=jack pkgver=1.9.7 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://jackaudio.org/" +backup=(etc/security/limits.d/99-audio.conf) license=('GPL') -makedepends=('python2' 'doxygen' 'libffado' 'celt' - 'libsamplerate' 'dbus-core') -source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2") -md5sums=('9759670feecbd43eeccf1c0f743ec199') +makedepends=('python2' 'doxygen' 'libffado' + 'libsamplerate' 'dbus-core' 'celt') +source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2" + '99-audio.conf' + '40-hpet-permissions.rules') +md5sums=('9759670feecbd43eeccf1c0f743ec199' + 'ae65b7c9ebe0fff6c918ba9d97ae342d' + '471aad533ff56c5d3cbbf65ce32cadef') _pyfix() { - sed -i 's:bin/env python:bin/env python2:' "$pkgdir/usr/bin/jack_control" + sed -i 's:bin/env python:bin/env python2:' \ + "$pkgdir/usr/bin/jack_control" } _wafconf() { - python2 waf configure --prefix=/usr --alsa --firewire --doxygen $@ + python2 waf configure --prefix=/usr \ + --alsa \ + --firewire \ + --doxygen $@ +} + +_isbuild() { + printf "%s\n" ${pkgname[@]} | grep -qx $1 } build() { @@ -31,23 +45,31 @@ build() { # fix doxygen building sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript - # we're going to do 2 different builds + # we may do 2 different builds cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver # mixed dbus/classic build - cd $_tarname-$pkgver - msg2 "Running Mixed D-Bus/Classic build" - _wafconf --classic --dbus - python2 waf build $MAKEFLAGS + if _isbuild jack2; then + cd $_tarname-$pkgver + msg2 "Running Mixed D-Bus/Classic build" + _wafconf --classic --dbus + python2 waf build $MAKEFLAGS + cd .. + fi # dbus-ONLY build - cd ../$_tarname-dbus-$pkgver - msg2 "Running D-Bus-only build" - _wafconf --dbus - python2 waf build $MAKEFLAGS + if _isbuild jack2-dbus; then + cd $_tarname-dbus-$pkgver + msg2 "Running D-Bus-only build" + _wafconf --dbus + python2 waf build $MAKEFLAGS + cd .. + fi } package_jack2() { + ! _isbuild jack2 && return + pkgdesc="The next-generation JACK with SMP support" depends=('libsamplerate') optdepends=('libffado: FireWire support' @@ -55,8 +77,8 @@ package_jack2() { 'dbus-core: jackdbus' 'python2: jack_control') conflicts=('jack') - provides=('jack' 'jack-audio-connection-kit' 'jackdbus' - 'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp') + provides=('jack' 'jack-audio-connection-kit' + 'jackmp' 'jackdmp' 'jackdbus') cd "$srcdir/$_tarname-$pkgver" @@ -64,23 +86,39 @@ package_jack2() { # fix for major python transition _pyfix + + # configure realtime access/scheduling + # see https://bugs.archlinux.org/task/26343 + install -Dm644 "$srcdir/99-audio.conf" \ + "$pkgdir/etc/security/limits.d/99-audio.conf" + + install -Dm644 "$srcdir/40-hpet-permissions.rules" \ + "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" } package_jack2-dbus() { + ! _isbuild jack2-dbus && return + pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)" depends=('libsamplerate' 'dbus-core') optdepends=('libffado: FireWire support' 'celt: NetJACK2 driver' 'python2: jack_control') conflicts=('jack' 'jack2') - provides=('jack' 'jack2' 'jack-audio-connection-kit' 'jackdbus' - 'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp') + provides=('jack' 'jack2' 'jack-audio-connection-kit' + 'jackmp' 'jackdmp' 'jackdbus') cd "$srcdir/$_tarname-dbus-$pkgver" python2 waf install --destdir="$pkgdir" _pyfix + + install -Dm644 "$srcdir/99-audio.conf" \ + "$pkgdir/etc/security/limits.d/99-audio.conf" + + install -Dm644 "$srcdir/40-hpet-permissions.rules" \ + "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" } # vim:set ts=2 sw=2 et: diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 9f2f8f54a..be5651398 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 51432 2011-07-09 04:39:59Z svenstaro $ +# $Id: PKGBUILD 60085 2011-12-05 02:11:18Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Larry Hajali pkgname=megaglest -pkgver=3.5.2.4 +pkgver=3.6.0 pkgrel=1 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64') url="http://sourceforge.net/projects/megaglest/" license=('GPL3') -depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'mesa' 'lua' 'icu') +depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'mesa' 'lua' 'icu' 'ftgl' 'glew') makedepends=('ftjam' 'p7zip' 'wxgtk' 'cmake') source=("http://downloads.sourceforge.net/project/${pkgname}/current_release/${pkgname}-source-${pkgver}.tar.xz") -md5sums=('0f8a3857d41fce8a726eebcc4826ad60') +md5sums=('ad48987d9ecea9c6de8c175b045cc5df') build() { cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 21bff3257..1247d1b66 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.6.4 +pkgver=0.6.5 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -17,7 +17,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=('a170bef450de365720223c3af3747bf7') +md5sums=('0aaae7ebf357b4a67dcf1916dfc250fa') build() { cd node-v${pkgver} diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index c4c1a06f6..a17e7c43d 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 55851 2011-09-23 18:46:03Z lcarlier $ +# $Id: PKGBUILD 60078 2011-12-04 22:02:23Z lcarlier $ # Maintainer: Vesa Kaihlavirta pkgname=openttd -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") -md5sums=('a0a730a8e40133fe789f34f2bc9601a9') +md5sums=('d1c48ddf616bd0d269c4cd35ef8a8a39') build() { cd ${pkgname}-${pkgver} diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index 52a20c7ac..108b4ebc3 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59581 2011-11-28 13:33:16Z giovanni $ +# $Id: PKGBUILD 60080 2011-12-04 22:03:31Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Daniel Plaza pkgname=pcsclite pkgver=1.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64') url="https://alioth.debian.org/projects/pcsclite/" @@ -24,7 +24,8 @@ build() { --enable-libudev \ --sysconfdir=/etc \ --enable-ipcdir=/run/pcscd \ - --enable-usbdropdir=/usr/lib/pcsc/drivers + --enable-usbdropdir=/usr/lib/pcsc/drivers \ + --with-systemdsystemunitdir=/lib/systemd/system make } diff --git a/community/tremulous/PKGBUILD b/community/tremulous/PKGBUILD index b26368a8b..3f127903e 100644 --- a/community/tremulous/PKGBUILD +++ b/community/tremulous/PKGBUILD @@ -1,69 +1,72 @@ -# $Id: PKGBUILD 6443 2009-12-10 14:33:11Z daenyth $ -# Contributor: Slash -# Contributor: Vesa Kaihlavirta -# Maintainer: Daenyth +#Contributor: Daenyth pkgname=tremulous pkgver=1.1.0 -pkgrel=7 -pkgdesc="A completely free online team based FPS/RTS hybrid game based on the ioquake3 engine." -url="http://tremulous.net/" -license=("GPL") +pkgrel=8 +pkgdesc="A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates." +url="http://tremulous.net" arch=('i686' 'x86_64') -depends=("sdl" "openal>=1.7.411" "tremulous-data=$pkgver") -makedepends=(subversion mesa) -source=('tremulous.launcher' 'tremded.launcher' 'tremulous.desktop' 'tremulous.xpm' - "backport.patch::http://source.mercenariesguild.net/client/trunk/patches/backport-client-r1112.patch?revision=2" - "fixfavorites.patch::http://source.mercenariesguild.net/client/trunk/patches/slacker-fixfavorites.patch?revision=15" - "resolution.patch::http://source.mercenariesguild.net/client/trunk/patches/Lakitu7-backport_resolution_cvars.patch?revision=71" - "sortping.patch::http://source.mercenariesguild.net/client/trunk/patches/Amanieu_sortping_fix_client.patch?revision=3") -md5sums=('5d2a7f0459affe970fe2b33b7ef18780' - '8775c2d5b9ec6ce9b9d85ab79ec9879d' - '9974bde01b95b6d967beb76c31c0e742' - '7e3a881608f1c7c0ccece1e07fcf92d8' - '7b3bf98d1ae3ea89da58e3c7775bf452' - '510384ba8699aceac13aaa15d722ced7' - '4d39ef28a0924bdc33234a01fb54f846' - '85315bd6d35519bd231e9771552a8e49') - -build() { - cd $srcdir +license=('GPL') +depends=('sdl' 'openal>=1.7.411' 'libgl' "tremulous-data=$pkgver" "freetype2") +makedepends=(mesa) +provides=("tremulous-updated=$pkgver-$pkgrel") +conflicts=('tremulous-updated') +replaces=('trem-backport' 'tremulous-updated') +source=(http://releases.mercenariesguild.net/client/mg-client-manual.txt + http://releases.mercenariesguild.net/client/mgclient_source_Release_1.011.tar.gz + http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz + http://projects.mercenariesguild.net/attachments/download/109/game.qvm + http://projects.mercenariesguild.net/attachments/download/111/lakitu7_qvm.txt + tremdedrc + tremulous.desktop + tremded.sh + tremulous.sh + tremulous.xpm + fix_fs26749.patch) - # Check out the revision recommended by the developers - svn co svn://svn.icculus.org/tremulous/trunk/ --config-dir ./ -r 1114 tremulous-src || return 1 +backup=('etc/tremdedrc') +noextract=(mg_tremded_source_1.01.tar.gz) - # Compile Source - cd tremulous-src +md5sums=('e0e1b6e03e7596da00a77fe638560402' + '95e526b961f875ba66b6fdd4842c913b' + '938bdf944dff667b74e2132a87a49780' + '90343619d140557d0c481a61ffa5756c' + 'a0b8970b33a27798c125f9152049013c' + 'f0056120d0192a0d4d591d1114439c52' + 'aef37632a2edcf74a53503a49530bad2' + 'b755d7c022cddc449ca2de508dfeee30' + '8e89473f9fdb481ad44e5cea5f6f681e' + '7e3a881608f1c7c0ccece1e07fcf92d8' + 'e85511d8a9e7309dc24fb90917463900') - # Add patches recommended by the developers - patch -Np0 -i $srcdir/backport.patch || return 1 - patch -Np0 -i $srcdir/fixfavorites.patch || return 1 - patch -Np0 -i $srcdir/resolution.patch || return 1 - patch -Np0 -i $srcdir/sortping.patch || return 1 +build() { + local _arch=${CARCH/i686/x86} + # Build and install the server + mkdir -p $srcdir/tremded + bsdtar -x -C $srcdir/tremded -f $srcdir/mg_tremded_source_1.01.tar.gz + cd $srcdir/tremded make || return 1 -} - -package() { - cd $srcdir/tremulous-src - - install -dm755 $pkgdir/opt/tremulous/ + install -D -m755 build/release-linux-$_arch/tremded.$_arch $pkgdir/opt/tremulous/tremded.$_arch + install -D -m644 $srcdir/tremdedrc $pkgdir/etc/tremdedrc + install -D -m644 $srcdir/game.qvm $pkgdir/opt/tremulous/game.qvm + install -D -m755 $srcdir/tremded.sh $pkgdir/usr/bin/tremded - # Install Binaries - local _arch=${CARCH/i686/x86} - install -m755 build/release-linux-$_arch/*.$_arch $pkgdir/opt/tremulous - - cd $srcdir + # Build and install the client + cd $srcdir/Release_1.011 + patch -Np1 -i $srcdir/fix_fs26749.patch || return 1 + make || return 1 + install -Dm755 build/release-linux-$_arch/tremulous.$_arch $pkgdir/opt/tremulous/tremulous.$_arch + install -D -m755 $srcdir/tremulous.sh $pkgdir/usr/bin/tremulous - # Install Client Launcher - install -D -m755 tremulous.launcher $pkgdir/usr/bin/tremulous + # Install the documentation + install -Dm644 $srcdir/mg-client-manual.txt $pkgdir/usr/share/tremulous/mg-client-manual.txt + install -Dm644 $srcdir/lakitu7_qvm.txt $pkgdir/usr/share/tremulous/lakitu7_qvm.txt - # Install Server Launcher - install -D -m755 tremded.launcher $pkgdir/usr/bin/tremded + # Install the .desktop and icon files + install -D -m644 $srcdir/tremulous.xpm $pkgdir/usr/share/pixmaps/tremulous.xpm + install -D -m644 $srcdir/tremulous.desktop $pkgdir/usr/share/applications/tremulous.desktop - # Install Desktop Icons - install -D -m644 tremulous.desktop $pkgdir/usr/share/applications/tremulous.desktop - install -D -m644 tremulous.xpm $pkgdir/usr/share/pixmaps/tremulous.xpm } # vim:set ts=2 sw=2 et: diff --git a/community/tremulous/fix_fs26749.patch b/community/tremulous/fix_fs26749.patch new file mode 100644 index 000000000..12a73138c --- /dev/null +++ b/community/tremulous/fix_fs26749.patch @@ -0,0 +1,21 @@ +diff -ruN Release_1.011-old/src/qcommon/parse.c Release_1.011/src/qcommon/parse.c +--- Release_1.011-old/src/qcommon/parse.c 2011-12-02 19:11:49.307368651 -0500 ++++ Release_1.011/src/qcommon/parse.c 2011-12-02 19:13:27.556836387 -0500 +@@ -981,7 +981,7 @@ + { + if (*string == '\"') + { +- strcpy(string, string+1); ++ memmove(string, string+1, strlen(string)); + } + if (string[strlen(string)-1] == '\"') + { +@@ -1784,7 +1784,7 @@ + if ((*ptr == '\\' || *ptr == '/') && + (*(ptr+1) == '\\' || *(ptr+1) == '/')) + { +- strcpy(ptr, ptr+1); ++ memmove(ptr, ptr+1, strlen(ptr)); + } + else + { diff --git a/community/tremulous/tremded.sh b/community/tremulous/tremded.sh new file mode 100644 index 000000000..339bdd501 --- /dev/null +++ b/community/tremulous/tremded.sh @@ -0,0 +1,17 @@ +#!/bin/sh +CARCH=`uname -m` +ext=x86; [ "$CARCH" = 'x86_64' ] && ext=x86_64 + +[ -f /etc/tremdedrc ] && . /etc/tremdedrc +[ -f "$HOME/.tremdedrc" ] && . "$HOME/.tremdedrc" + +if [ ! -r "$HOME/.tremulous/base/vm/game.qvm" ]; then + echo "Cannot find game.qvm -- linking to installed version." + if [ ! -d "$HOME/.tremulous/base/vm" ]; then + mkdir -p "$HOME/.tremulous/base/vm/" || exit 1 + fi + ln -s /opt/tremulous/game.qvm "$HOME/.tremulous/base/vm/game.qvm" || exit 1 +fi + +cd /opt/tremulous/ +./tremded.$ext "$TREM_ARGS" "$@" diff --git a/community/tremulous/tremdedrc b/community/tremulous/tremdedrc new file mode 100644 index 000000000..7fbe122f6 --- /dev/null +++ b/community/tremulous/tremdedrc @@ -0,0 +1 @@ +TREM_ARGS="+set dedicated 1 +exec server.cfg" diff --git a/community/tremulous/tremulous.sh b/community/tremulous/tremulous.sh new file mode 100644 index 000000000..01575befc --- /dev/null +++ b/community/tremulous/tremulous.sh @@ -0,0 +1,14 @@ +#!/bin/sh +CARCH=`uname -m` +ext=x86; [ "$CARCH" = 'x86_64' ] && ext=x86_64 + +if [ ! -r "$HOME/.tremulous/base/vm/game.qvm" ]; then + echo "Cannot find game.qvm -- linking to installed version." + if [ ! -d "$HOME/.tremulous/base/vm" ]; then + mkdir -p "$HOME/.tremulous/base/vm/" || exit 1 + fi + ln -s /opt/tremulous/game.qvm "$HOME/.tremulous/base/vm/game.qvm" || exit 1 +fi + +cd /opt/tremulous/ +./tremulous.$ext "$@" diff --git a/community/uzbl/PKGBUILD b/community/uzbl/PKGBUILD index 25dfa6a08..9ee2129c6 100644 --- a/community/uzbl/PKGBUILD +++ b/community/uzbl/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 56503 2011-10-07 11:58:08Z lcarlier $ +# $Id: PKGBUILD 60076 2011-12-04 21:15:00Z lcarlier $ # Maintainer : Laurent Carlier # Contributor: Ionut Biru # Contributor: Dieter Plaetinck pkgbase=uzbl pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed') -pkgver=2011.10.01 +pkgver=2011.11.28 pkgrel=1 arch=('i686' 'x86_64') url="http://www.uzbl.org" license=('GPL3') -makedepends=('git' 'pkgconfig' 'libwebkit>=1.3.13') +makedepends=('pkgconfig' 'libwebkit>=1.3.13') source=(uzbl-$pkgver.tar.gz::https://github.com/Dieterbe/uzbl/tarball/$pkgver) -md5sums=('aadafc08ef56966cdafec00b9d09abd1') +md5sums=('6e55474050b5df43d8bdd403248b1da6') build() { cd "$srcdir"/Dieterbe-uzbl-* -- cgit v1.2.3-54-g00ecf