summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/bind/PKGBUILD6
-rw-r--r--community/dnscrypt-proxy/PKGBUILD39
-rw-r--r--community/dnscrypt-proxy/conf.d.file3
-rw-r--r--community/dnscrypt-proxy/dnscrypt-proxy.service20
-rw-r--r--community/libsodium/PKGBUILD38
-rw-r--r--community/sslh/PKGBUILD10
-rw-r--r--community/stuntrally/PKGBUILD4
-rw-r--r--extra/gnome-themes-standard/PKGBUILD6
-rw-r--r--extra/ibus/PKGBUILD10
-rw-r--r--extra/qemu/PKGBUILD43
-rw-r--r--extra/vigra/PKGBUILD9
-rw-r--r--extra/wireshark/01_fix_encoding_asn2deb_pod.patch77
-rw-r--r--extra/wireshark/01_fix_pod_file.patch11
-rw-r--r--extra/wireshark/02_fix_encoding_idl2deb_pod.patch77
-rw-r--r--extra/wireshark/03_force_utf8_for_pod2man.patch22
-rw-r--r--extra/wireshark/PKGBUILD24
-rw-r--r--libre/libretools/PKGBUILD8
-rw-r--r--pcr/cpptest/PKGBUILD24
-rw-r--r--pcr/kervalasquish-hg/PKGBUILD72
-rw-r--r--pcr/libsquish-svn/LICENSE24
-rw-r--r--pcr/libsquish-svn/PKGBUILD35
-rw-r--r--pcr/ryzom-hg-client/PKGBUILD37
-rw-r--r--pcr/ryzom-hg-nel/PKGBUILD42
-rw-r--r--pcr/ryzom-hg/PKGBUILD81
-rw-r--r--pcr/ryzom-hg/SRCBUILD40
-rw-r--r--pcr/ryzom-hg/ryzom.sh9
26 files changed, 292 insertions, 479 deletions
diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD
index 588c8c0a7..e0b63c374 100644
--- a/community/bind/PKGBUILD
+++ b/community/bind/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 92426 2013-06-05 07:49:55Z seblu $
+# $Id: PKGBUILD 94599 2013-07-27 17:55:53Z seblu $
# Maintainer: Sébastien Luttringer
# Contributor: Gaetan Bisson <bisson@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
pkgname=bind
-_pkgver=9.9.3-P1
+_pkgver=9.9.3-P2
pkgver=${_pkgver//-/.}
pkgrel=1
pkgdesc='The ISC BIND nameserver'
@@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
'named.logrotate'
'localhost.zone'
'127.0.0.zone')
-sha1sums=('9e1a9e5e45685befce6b93d4fcfd63e50eaeb2cf'
+sha1sums=('a0235692c488b3fadf54a15858b1f13ae2ab6979'
'029f89c49550c40ec7a95116b6a33f0e5a041094'
'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
diff --git a/community/dnscrypt-proxy/PKGBUILD b/community/dnscrypt-proxy/PKGBUILD
new file mode 100644
index 000000000..a4efe727a
--- /dev/null
+++ b/community/dnscrypt-proxy/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 94587 2013-07-27 15:21:05Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Techlive Zheng <techlivezheng at gmail dot com>
+# Contributor: peace4all <markspost at rocketmail dot com>
+
+pkgname=dnscrypt-proxy
+pkgver=1.3.2
+pkgrel=1
+pkgdesc="A tool for securing communications between a client and a DNS resolver"
+arch=('i686' 'x86_64')
+url="http://dnscrypt.org/"
+license=('custom')
+depends=(libsodium)
+source=(http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.bz2
+ conf.d.file
+ dnscrypt-proxy.service)
+backup=(etc/conf.d/dnscrypt-proxy)
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ CFLAGS="$CFLAGS -fPIC" ./configure --prefix=/usr --sbindir=/usr/bin
+ make -j2
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ mkdir -p "$pkgdir"/{usr/share/{licenses,doc}/$pkgname,etc/conf.d,usr/lib/systemd/system}
+ install -m 644 COPYING "$pkgdir"/usr/share/licenses/$pkgname
+ install -m 644 AUTHORS NEWS README README.markdown "$pkgdir"/usr/share/doc/$pkgname
+ install -m 644 "$srcdir"/conf.d.file "$pkgdir"/etc/conf.d/$pkgname
+ install -m 644 "$srcdir"/dnscrypt-proxy.service "$pkgdir"/usr/lib/systemd/system
+ rm -rf "$pkgdir"/usr/{lib/*.{l,}a,include}
+}
+
+sha512sums=('969219c5655ca7bcb8cbfb79d9dae9b27a79489bae7451e6e478ab5cee1bc22f0dc1758e9ff51ac2e80ec4230e6fe4eaba3a5ff98c3ddbde8d9dc24a51050bab'
+ '2271eab1baf1a7192a8daaa1b271c24a3a3fa498432ac99c2e4fb3c939590f09aab582427ae874fce7969ece365ccb7a2e946566e5a0c650d93c34d23b536b61'
+ '33e8f95c38a10a9e05aadeb369616f6dfaa8b32bc28b9f8ab9ae29dfc3b03514442e7172b1f52c56665317b61cad7d130a0e1dc00d6aceaa59eb465e63d079bc')
diff --git a/community/dnscrypt-proxy/conf.d.file b/community/dnscrypt-proxy/conf.d.file
new file mode 100644
index 000000000..fae760f21
--- /dev/null
+++ b/community/dnscrypt-proxy/conf.d.file
@@ -0,0 +1,3 @@
+DNSCRYPT_LOCALIP=127.0.0.1
+DNSCRYPT_LOCALPORT=53
+DNSCRYPT_USER=nobody
diff --git a/community/dnscrypt-proxy/dnscrypt-proxy.service b/community/dnscrypt-proxy/dnscrypt-proxy.service
new file mode 100644
index 000000000..5e30d888e
--- /dev/null
+++ b/community/dnscrypt-proxy/dnscrypt-proxy.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=A tool for securing communications between a client and a DNS resolver.
+After=network.target
+# Only needed if you use pdnsd, other caching DNS servers can go here. Could be ignored too.
+#Before=pdnsd.service
+
+[Service]
+Type=forking
+PIDFile=/var/run/dnscrypt-proxy.pid
+EnvironmentFile=/etc/conf.d/dnscrypt-proxy
+ExecStartPre=/bin/rm -f /var/run/dnscrypt-proxy.pid
+ExecStart=/usr/bin/dnscrypt-proxy --daemonize \
+ --pidfile=/var/run/dnscrypt-proxy.pid \
+ --logfile=/var/log/dnscrypt-proxy.log \
+ --local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
+ --user=${DNSCRYPT_USER}
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/libsodium/PKGBUILD b/community/libsodium/PKGBUILD
new file mode 100644
index 000000000..5a5d3b097
--- /dev/null
+++ b/community/libsodium/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 94581 2013-07-27 14:32:50Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: namelessjon <jonathan.stott@gmail.com>
+# Contributor: Alessio Sergi <asergi at archlinux dot us>
+
+pkgname=libsodium
+pkgver=0.4.2
+pkgrel=2
+pkgdesc="P(ortable|ackageable) NaCl-based crypto library"
+arch=('i686' 'x86_64')
+url="https://github.com/jedisct1/libsodium"
+license=('custom:ISC')
+depends=('glibc')
+options=('!libtool')
+source=(http://download.dnscrypt.org/$pkgname/releases/$pkgname-${pkgver}.tar.gz)
+sha256sums=('1a7901cdd127471724e854a8eb478247dc0ca67be549345c75fc6f2d4e05ed39')
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+ make check
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ # install license
+ install -d -m 755 "$pkgdir/usr/share/licenses/$pkgname"
+ install -m 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index ed60e5e8a..c2235965f 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83699 2013-02-04 14:24:41Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# $Id: PKGBUILD 94597 2013-07-27 17:54:41Z seblu $
+# Maintainer: Sébastien Luttringer
# Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
# Contributor: Jason Rodriguez <jason-aur@catloaf.net>
pkgname=sslh
-pkgver=1.14
-pkgrel=2
+pkgver=1.15
+pkgrel=1
pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
arch=('i686' 'x86_64')
url='http://www.rutschle.net/tech/sslh.shtml'
@@ -16,7 +16,7 @@ install=$pkgname.install
source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz"
'sslh-select.service'
'sslh-fork.service')
-md5sums=('36e64bd6c7d0a299d5acd1109988099b'
+md5sums=('cdb3e4499ff00438495f46ef7204ec58'
'67e8c9511508673254afa3e1ca61ff89'
'a4402244a4d819beb3c6dc7ff031084e')
diff --git a/community/stuntrally/PKGBUILD b/community/stuntrally/PKGBUILD
index 5c286dcdc..a4c340503 100644
--- a/community/stuntrally/PKGBUILD
+++ b/community/stuntrally/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=stuntrally
pkgver=2.0
-pkgrel=1
+pkgrel=2
pkgdesc='Stunt Rally game with track editor, based on VDrift'
arch=('x86_64' 'i686')
license=('GPL3')
@@ -13,7 +13,7 @@ url='http://code.google.com/p/vdrift-ogre'
depends=('libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor' 'stuntrally-data')
makedepends=('cmake' 'boost')
install=stuntrally.install
-source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/$pkgname/$pkgname/tar.gz/$pkgver")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz")
sha256sums=('ef3e645e4911f37c28925e3339c39555e849b7ac13511f009742030f531eed68')
build() {
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index 0b13c2970..4d2be9843 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191300 2013-07-23 12:42:33Z heftig $
+# $Id: PKGBUILD 191600 2013-07-26 23:41:43Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=gnome-themes-standard
-pkgver=3.8.2
+pkgver=3.8.3
pkgrel=1
pkgdesc="Default themes for the GNOME desktop"
arch=(i686 x86_64)
@@ -16,7 +16,7 @@ replaces=(gnome-themes)
conflicts=(gnome-themes)
options=('!libtool' '!emptydirs')
source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7e89f92c214b560e59edcbfac2263e49dccf201600871aa3d806ff1c562dff38')
+sha256sums=('977eb8ac94bad6e7095c272a583e614fba1c1897410e9f25ae028618d269b1e4')
build() {
cd $pkgname-$pkgver
diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD
index cddfdd852..e19629798 100644
--- a/extra/ibus/PKGBUILD
+++ b/extra/ibus/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 189729 2013-07-06 17:47:53Z schiv $
+# $Id: PKGBUILD 191614 2013-07-27 18:39:53Z eric $
# Contributor: Rainy <rainylau(at)gmail(dot)com>
# Contributor: Lee.MaRS <leemars at gmail dot com>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
# Maintainer: Brad Fanella <bradfanella@archlinux.us>
pkgname=ibus
-pkgver=1.5.2
-pkgrel=2
+pkgver=1.5.3
+pkgrel=1
pkgdesc="Next Generation Input Bus for Linux"
arch=('i686' 'x86_64')
url="http://ibus.googlecode.com"
license=('LGPL')
-depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-xdg' 'python2-gobject')
+depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-gobject' 'libnotify')
makedepends=('gobject-introspection' 'vala' 'dconf' 'iso-codes' 'intltool')
options=('!libtool')
install=ibus.install
source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('a7e1695731b4c954fa8897d091e6dda64e08b28c')
+sha1sums=('51ba186cbf5e1e194ba0cd22b81f00d9d40ec521')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 9220a8fee..e6ff9a5f2 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,18 +1,12 @@
-# $Id: PKGBUILD 189853 2013-07-09 13:42:03Z tpowa $
+# $Id: PKGBUILD 191616 2013-07-27 20:19:26Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=qemu
-pkgver=1.5.1
-pkgrel=2
-pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
+pkgname=('qemu' 'libcacard')
+pkgver=1.5.2
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2' 'LGPL2.1')
url="http://wiki.qemu.org/Index.html"
makedepends=('texi2html' 'perl' 'python2')
-depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
- 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
- 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
- 'libiscsi')
-backup=('etc/qemu/target-x86_64.conf')
install=qemu.install
source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
65-kvm.rules)
@@ -23,14 +17,20 @@ build ()
{
cd "${srcdir}/${pkgname}-${pkgver}"
# gtk gui breaks keymappings at the moment
- ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl'\
+ ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
--python=/usr/bin/python2 --smbd=/usr/bin/smbd \
- --enable-mixemu --libexecdir=/usr/lib/qemu \
+ --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \
--disable-gtk --enable-linux-aio --enable-seccomp
make
}
-package() {
+package_qemu() {
+ pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
+ depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+ 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
+ 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
+ 'libiscsi' 'libcacard')
+ backup=('etc/qemu/target-x86_64.conf')
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
rm "${pkgdir}/usr/share/qemu/bios.bin"
@@ -49,7 +49,22 @@ package() {
/usr/bin/strip $STRIP_BINARIES "$binary";;
esac
done
+ # remove libcacard files
+ rm -rf ${pkgdir}/usr/lib/libcacard*
+ rm -rf ${pkgdir}/usr/lib/pkgconfig/libcacard.pc
+ rm -rf ${pkgdir}/usr/bin/vscclient
+}
+package_libcacard() {
+ pkgdesc="Common Access Card (CAC) Emulation"
+ options=('strip' '!libtool')
+ depends=('nss' 'libaio' 'libcap-ng' 'libiscsi' 'curl' 'vde2')
+ mkdir -p ${pkgdir}/usr/bin
+ mkdir -p ${pkgdir}/usr/lib/pkgconfig
+ cp -a ${srcdir}/qemu-${pkgver}/.libs/libcacard.so* ${pkgdir}/usr/lib/
+ cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/
+ cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/
}
-md5sums=('b56e73bdcfdb214d5c68e13111aca96f'
+
+md5sums=('04b94189ba587b3280713ded3b7f959a'
'9d6de26867a05c306157e3d3c612b28a')
diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index 35fb5d28c..9d86b59ad 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 191194 2013-07-19 15:01:34Z andyrtr $
+# $Id: PKGBUILD 191605 2013-07-27 08:12:19Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgbase=vigra
pkgname=('vigra' 'vigra-doc')
pkgver=1.9.0
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url="http://hci.iwr.uni-heidelberg.de/vigra/"
license=('custom:MIT')
makedepends=(# runtime deps
- 'libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw'
+ 'libpng>=1.5.7' 'libtiff>=4.0.0' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw'
# additional makedeps
'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost>=1.54.0' 'python2-numpy')
options=('!libtool')
@@ -21,6 +21,7 @@ build() {
cd "${srcdir}"/${pkgbase}-${pkgver}
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DPYTHON_EXECUTABLE=/usr/bin/python2 \
+ -DWITH_OPENEXR=true \
-DWITH_VIGRANUMPY=1 \
-DDOCINSTALL=share/doc
make
@@ -33,7 +34,7 @@ check() {
package_vigra() {
pkgdesc="Computer vision library"
- depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw')
+ depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw')
optdepends=('python2: for python bindings'
'boost-libs: for python bindings')
diff --git a/extra/wireshark/01_fix_encoding_asn2deb_pod.patch b/extra/wireshark/01_fix_encoding_asn2deb_pod.patch
deleted file mode 100644
index 0b8b91363..000000000
--- a/extra/wireshark/01_fix_encoding_asn2deb_pod.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- doc/asn2deb.pod.orig 2013-06-06 21:30:28.314150100 +0200
-+++ doc/asn2deb.pod 2013-06-06 21:31:59.448850746 +0200
-@@ -5,8 +5,21 @@
-
- =head1 SYNOPSIS
-
--B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>]
--[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
-+B<asn2deb>
-+S<[ B<-a> E<lt>ASN.1 fileE<gt> ]>
-+S<[ B<--asn>=E<lt>ASN.1 fileE<gt> ]>
-+S<[ B<-d> E<lt>optsE<gt> ]>
-+S<[ B<--dbopts>=E<lt>optsE<gt> ]>
-+S<[ B<-e> E<lt>addressE<gt> ]>
-+S<[ B<--email>=E<lt>addressE<gt> ]>
-+S<[ B<-h> ]>
-+S<[ B<--help> ]>
-+S<[ B<-n> E<lt>nameE<gt> ]>
-+S<[ B<--name>=E<lt>nameE<gt> ]>
-+S<[ B<-p> ]>
-+S<[ B<--preserve> ]>
-+S< [B<-v> ]>
-+S<[ B<--version> ]>
-
- =head1 DESCRIPTION
-
-@@ -19,31 +32,31 @@
-
- =over 4
-
--=item B<-a >I<ASN.1 file> B<--asn=>I<ASN.1 file>
-+=item -a E<lt>ASN.1 fileE<gt> --asn=E<lt>ASN.1 fileE<gt>
-
- ASN.1 file to use (mandatory).
-
--=item B<-d >I<opts> B<--dbopts=>I<opts>
-+=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt>
-
- options for dpkg-buildpackage.
-
--=item B<-e >I<address> B<--email=>I<address>
-+=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt>
-
- use e-mail address.
-
--=item B<-h> B<--help>
-+=item -h --help
-
- print help and exit.
-
--=item B<-n >I<name> B<--name=>I<name>
-+=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt>
-
- use user name.
-
--=item B<-p> B<--preserve>
-+=item -p --preserve
-
- do not overwrite files.
-
--=item B<-v> B<--version>
-+=item -v --version
-
- print version and exit.
-
-@@ -68,8 +81,8 @@
-
- =head1 AUTHOR
-
--B<W. Borgert> Author.
-+B<W. Borgert> Author.
-
- =head1 COPYRIGHT
-
--Copyright (C) 2003, 2005 W. Borger
-\ No newline at end of file
-+Copyright (C) 2003, 2005 W. Borger
diff --git a/extra/wireshark/01_fix_pod_file.patch b/extra/wireshark/01_fix_pod_file.patch
new file mode 100644
index 000000000..f75f4c0bf
--- /dev/null
+++ b/extra/wireshark/01_fix_pod_file.patch
@@ -0,0 +1,11 @@
+--- trunk/doc/reordercap.pod 2013/05/20 05:45:32 49435
++++ trunk/doc/reordercap.pod 2013/05/20 14:56:18 49436
+@@ -40,6 +40,8 @@
+ When the B<-n> option is used, B<reordercap> will not write out the output
+ file if it finds that the input file is already in order.
+
++=back
++
+ =head1 SEE ALSO
+
+ pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1),
diff --git a/extra/wireshark/02_fix_encoding_idl2deb_pod.patch b/extra/wireshark/02_fix_encoding_idl2deb_pod.patch
deleted file mode 100644
index bc4000b8f..000000000
--- a/extra/wireshark/02_fix_encoding_idl2deb_pod.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- doc/idl2deb.pod.orig 2013-06-06 21:31:06.674726010 +0200
-+++ doc/idl2deb.pod 2013-06-06 21:35:38.522125866 +0200
-@@ -5,9 +5,21 @@
-
- =head1 SYNOPSIS
-
--B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>]
--[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
--
-+B<idl2deb>
-+S< [ B<-d> E<lt>optsE<gt> ]>
-+S< [ B<--dbopts>=E<lt>optsE<gt> ]>
-+S< [ B<-e> E<lt>addressE<gt> ]>
-+S< [ B<--email>=E<lt>addressE<gt> ]>
-+S< [ B<-h> ]>
-+S< [ B<--help> ]>
-+S< [ B<-i> E<lt>idlfileE<gt> ]>
-+S< [ B<--idl>=E<lt>idlfileE<gt> ]>
-+S< [ B<-n> E<lt>nameE<gt> ]>
-+S< [ B<--name>=E<lt>nameE<gt> ]>
-+S< [ B<-p> ]>
-+S< [ B<--preserve> ]>
-+S< [ B<-v> ]>
-+S< [ B<--version> ]>
-
- =head1 DESCRIPTION
-
-@@ -19,31 +31,31 @@
-
- =over 4
-
--=item B<-d>I<opts> B<--dbopts=>I<opts>
-+=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt>
-
- options for dpkg-buildpackage.
-
--=item B<-e >I<address> B<--email=>I<address>
-+=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt>
-
- use e-mail address.
-
--=item B<-i >I<idlfile> B<--idl=>I<idlfile>
-+=item -h --help
-
--IDL file to use (mandatory)
-+print help and exit.
-
--=item B<-h> B<--help>
-+=item -i E<lt>idlfileE<gt> --idl=E<lt>idlfileE<gt>
-
--print help and exit.
-+IDL file to use (mandatory)
-
--=item B<-n >I<name> B<--name=>I<name>
-+=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt>
-
- use user name.
-
--=item B<-p> B<--preserve>
-+=item -p --preserve
-
- do not overwrite files.
-
--=item B<-v> B<--version>
-+=item -v --version
-
- print version and exit.
-
-@@ -67,7 +79,7 @@
-
- =head1 AUTHOR
-
--B<W. Borgert> Author.
-+B<W. Borgert> Author.
-
- =head1 COPYRIGHT
-
diff --git a/extra/wireshark/03_force_utf8_for_pod2man.patch b/extra/wireshark/03_force_utf8_for_pod2man.patch
deleted file mode 100644
index ace641100..000000000
--- a/extra/wireshark/03_force_utf8_for_pod2man.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- doc/Makefile.am (revision 49837)
-+++ doc/Makefile.am (working copy)
-@@ -123,6 +123,7 @@
- $(AM_V_POD2MAN)$(POD2MAN) \
- --center="The Wireshark Network Analyzer" \
- --release=$(VERSION) \
-+ --utf8 \
- $< > $@
-
- .pod.html: ../config.h $(top_srcdir)/docbook/ws.css
---- doc/wireshark.pod.template (revision 49837)
-+++ doc/wireshark.pod.template (working copy)
-@@ -1,4 +1,9 @@
-+=begin man
-+
-+=encoding utf8
-+
-+=end man
-
- =head1 NAME
-
- wireshark - Interactively dump and analyze network traffic
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 27273c87c..d8136a396 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 189196 2013-06-29 09:29:34Z guillaume $
+# $Id: PKGBUILD 191608 2013-07-27 17:57:23Z guillaume $
# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
pkgname=('wireshark-cli' 'wireshark-gtk')
pkgbase=wireshark
-pkgver=1.10.0
-pkgrel=3
+pkgver=1.10.1
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
@@ -12,24 +12,14 @@ makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
url='http://www.wireshark.org/'
options=(!libtool)
source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
- 01_fix_encoding_asn2deb_pod.patch
- 02_fix_encoding_idl2deb_pod.patch
- 03_force_utf8_for_pod2man.patch)
-sha256sums=('1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add'
- '0dfe86b1e4bbf4090035fc1fcd36c2790d418a5749e23a2a7e7285699a6c147d'
- 'a46f6e87477fcbf8289bfde5e525e6c0b4c3268bd1a2e189e3120bd3ad4f7c27'
- '902f72132b9e0dd95f89ca0bcb216ef9c866ac11c842866781d239b6b7873daf')
+ 01_fix_pod_file.patch)
+sha256sums=('06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc'
+ '18470353d3658814b4925c7fcf07e647e1e400856cdf356555ddf105d12bdd41')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
- # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8774
- for p in 01_fix_encoding_asn2deb_pod.patch \
- 02_fix_encoding_idl2deb_pod.patch \
- 03_force_utf8_for_pod2man.patch;
- do
- patch -p0 <${srcdir}/${p}
- done
+ patch -p1 <${srcdir}/01_fix_pod_file.patch
./autogen.sh
./configure \
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index bf31c26bd..c362ea2e1 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,8 +9,8 @@ pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/packages/libretools.git/"
license=('GPL3' 'GPL2')
-pkgver=20130727
-_libretools_commit=05463eaf611f4784b3693b74029c3f5a6da1d70b
+pkgver=20130727.1
+_libretools_commit=b853e0a808ed5c2fe4c1850d46eb2370c967f46d
_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
_packages_url=https://projects.parabolagnulinux.org/packages
@@ -19,7 +19,7 @@ source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.ta
pkgrel=1
arch=('any')
-makedepends=(emacs) # emacs --batch is used during the build to process text
+makedepends=(emacs ronn) # emacs --batch is used during the build to process text
checkdepends=(sh-roundup)
build() {
@@ -74,5 +74,5 @@ package_libretools-mips64el() {
make install-libretools-mips64el DESTDIR="$pkgdir"
}
-md5sums=('49653793e6bff294661043ed38ac6e43'
+md5sums=('8e802315aa3b3437460c11234385db56'
'b28b1492fda205be7c577fc03cbc3399')
diff --git a/pcr/cpptest/PKGBUILD b/pcr/cpptest/PKGBUILD
new file mode 100644
index 000000000..df08feb00
--- /dev/null
+++ b/pcr/cpptest/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Contributor (aur): Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar>
+pkgname=cpptest
+pkgver=1.1.2
+pkgrel=2
+pkgdesc="CppTest is a portable and powerful unit testing framework for handling automated tests in C++. with focus on usability and extendability."
+url="http://cpptest.sourceforge.net/"
+depends=(gcc-libs)
+makedepends=(pkgconfig)
+source=(http://downloads.sourceforge.net/sourceforge/cpptest/$pkgname-$pkgver.tar.gz)
+md5sums=('79b9bff371d182f11a3235969f84ccb6')
+arch=('i686' 'x86_64')
+license="LGPL"
+
+build() {
+ cd ${srcdir}/$pkgname-$pkgver
+ ./configure --prefix=/usr
+ make || return 1
+}
+
+package() {
+ cd ${srcdir}/$pkgname-$pkgver
+ make DESTDIR=${pkgdir} install
+}
diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD
deleted file mode 100644
index e5e489950..000000000
--- a/pcr/kervalasquish-hg/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# Maintainer: Jorge Araya <jorgean@lavabit.com>
-
-pkgname=kervalasquish-hg
-pkgver=220
-pkgrel=2
-pkgdesc="Free Software DXT compression library, kervala's version"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/libsquish/"
-license=('MIT')
-makedepends=('mercurial' 'gcc-libs' 'cmake')
-provides=('libsquish')
-conflicts=('libsquish'
- 'kervala_libsquish-hg'
- 'kervalasquish-hg')
-
-_hgroot="http://hg.kervala.net"
-_hgrepo="packaging"
-cmakerepo="cmake"
-
-build() {
- cd "$srcdir"
- msg "Connecting to Kervala's Mercurial server for libsquish..."
-
- if [[ -d "$_hgrepo" ]]; then
- cd "$_hgrepo"
- hg pull -u
- msg "The local files are updated."
- else
- hg clone "${_hgroot}/${_hgrepo}"
- fi
-
- msg "Connecting to Kervala's Mercurial server for cmake modules..."
-
- if [[ -d $srcdir/$cmakerepo ]]; then
- cd $srcdir/$cmakerepo
- hg pull -u
- msg "The local files are updated."
- else
- cd $srcdir
- hg clone ${_hgroot}/${cmakerepo}
- fi
-
- msg "Mercurial checkout done or server timeout"
- msg "Starting build..."
-
- if [[ -d $_hgrepo-build ]]; then
- rm -rf "$srcdir/$_hgrepo-build"
- fi
-
- cp -r "$srcdir/$_hgrepo/squish" "$srcdir/$_hgrepo-build"
-
- if [[ ! -d $_hgrepo-build/CMakeModules ]]; then
- mkdir "$srcdir/$_hgrepo-build/CMakeModules"
- cp $srcdir/cmake/modules/common.cmake $srcdir/$_hgrepo-build/CMakeModules/
- fi
-
- if [[ -d $srcdir/$_hgrepo-build/build ]]; then
- rm -rf $srcdir/$_hgrepo-build/build
- fi
-
- mkdir "$srcdir/$_hgrepo-build/build"
- cd "$srcdir/$_hgrepo-build/build"
- cmake -DCMAKE_INSTALL_PREFIX=/usr ..
- make
-}
-
-package() {
- cd "$srcdir/$_hgrepo-build/build"
- make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/libsquish-svn/LICENSE b/pcr/libsquish-svn/LICENSE
new file mode 100644
index 000000000..dd0f22eb9
--- /dev/null
+++ b/pcr/libsquish-svn/LICENSE
@@ -0,0 +1,24 @@
+/* -----------------------------------------------------------------------------
+
+ Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ -------------------------------------------------------------------------- */
diff --git a/pcr/libsquish-svn/PKGBUILD b/pcr/libsquish-svn/PKGBUILD
new file mode 100644
index 000000000..17af64a96
--- /dev/null
+++ b/pcr/libsquish-svn/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Contributor: F0ruD<fzerorubigd{AT}gmail{DOT}com>
+pkgname=libsquish-svn
+pkgver=48
+pkgrel=5
+pkgdesc="DXT compression library - svn build"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/libsquish"
+makedepends=('subversion' )
+license=('MIT')
+provides=('libsquish')
+conflicts=('libsquish' 'kervalasquish-hg' 'kervala_libsquish-hg')
+mksource=("$pkgname-$pkgver"::svn+http://libsquish.googlecode.com/svn/trunk/#revision=$pkgver)
+mkmd5sums=('SKIP')
+
+source=("libre://$pkgname-$pkgver.tar.gz"
+ LICENSE)
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ # make install
+ mkdir -p $pkgdir/usr/local/{include,lib}
+
+ install -Dm 644 squish.h $pkgdir/usr/local/include/squish.h
+ install -Dm 644 libsquish.so.0.0 $pkgdir/usr/local/lib/libsquish.so.0.0
+ install -Dm 644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+
+sha256sums=('d1c057bf105872f50f504584fd7b31fb980ed5e235b14a92c6cb0aa7d7758e8f'
+ 'ed13029728a637f599833a68be22f3cc356a7f13be8d79284b2c415e172efd75')
diff --git a/pcr/ryzom-hg-client/PKGBUILD b/pcr/ryzom-hg-client/PKGBUILD
deleted file mode 100644
index 294e28024..000000000
--- a/pcr/ryzom-hg-client/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
-# Maintainer: Jorge Araya Navarro <jorge@abril>
-pkgname=ryzom-hg-client
-pkgver=20130706
-pkgrel=2
-pkgdesc="An awesome free software 3D MMORPG game, Game client."
-arch=('i686' 'x86_64')
-url="http://www.ryzom.com/"
-license=('AGPL')
-groups=("ryzom-hg")
-depends=('ryzom-hg-nel' 'expat')
-makedepends=('cpptest' 'cmake' 'bison' 'ryzom-hg-nel')
-provides=("ryzom-hg-client")
-conflicts=("ryzom-hg-client")
-replaces=("ryzom-hg-client")
-source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-$pkgrel-any.src.tar.gz")
-sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475')
-mksource=("ryzom-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
-_CMAKE_COMMON_ARGS=('-DWITH_STATIC=ON' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=ON') # cmake arguments for server and client
-
-_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client
-
-build() {
- mkdir -p "$srcdir/build-client"
- cd "$srcdir/build-client"
- cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
-
- make
-}
-
-package() {
- cd "$srcdir/build-client"
- make DESTDIR="$pkgdir" install
- install -Dm 644 "$srcdir/ryzom.desktop" "$pkgdir/usr/share/applications/"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ryzom-hg-nel/PKGBUILD b/pcr/ryzom-hg-nel/PKGBUILD
deleted file mode 100644
index c66aaf567..000000000
--- a/pcr/ryzom-hg-nel/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=ryzom-hg-nel
-pkgver=20130706
-pkgrel=5
-pkgdesc="An awesome free software 3D MMORPG game, Game client."
-arch=('i686' 'x86_64')
-url="http://www.ryzom.com/"
-license=('AGPL')
-groups=("ryzom-hg")
-depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql')
-makedepends=('cpptest' 'cmake' 'bison')
-provides=("ryzom-hg-nel")
-conflicts=("ryzom-hg-nel")
-replaces=("ryzom-hg-nel")
-
-source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-2-any.src.tar.gz")
-sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475')
-
-mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
-
-_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client
-
-_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_NEL=ON')
-
-build() {
- mkdir -p "$srcdir/build-nel"
- cd "$srcdir/build-nel"
- cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
-
- make
-}
-
-package() {
- cd "$srcdir/build-nel"
- make DESTDIR="$pkgdir" install
- # WWWInit.h is in /usr/include/w3c-libwww according to libwww package!
- sed -ie 's/WWWInit\.h/w3c-libwww\/WWWInit.h/' ${pkgdir}/usr/include/nel/gui/group_html.h
-}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 8277ccf17..01722ab34 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -1,64 +1,53 @@
# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
# Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com>
-pkgname=('ryzom-hg-nel' 'ryzom-hg-client')
-pkgbase="ryzom-hg"
-pkgver=20130706
-pkgrel=2
+pkgname='ryzom-hg'
+_hgver=ce26956d3a4a
+pkgver=20130727
+pkgrel="5"
+options=(debug strip) # there is a segmentation fault on ryzom_client executable
pkgdesc="An awesome free software 3D MMORPG game"
arch=('i686' 'x86_64')
url="http://www.ryzom.com/"
license=('AGPL3')
-groups=('ryzom-hg')
-depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql')
+depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish-svn' 'lua51' 'lua51-sql-mysql')
makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
-# ryzom-20130706-2-any.src.tar.gz
-source=("http://repo.parabolagnulinux.org/other/ryzom-20130706-2-any.src.tar.gz"
- 'ryzom.sh'
+source=("libre://$pkgname-$pkgver.tar.gz"
'ryzom.desktop')
-sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475'
- 'd3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6'
- '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
-
-mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
-
-_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client
-_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' '-DWITH_NEL=ON')
+mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${_hgver}"
+ 'ryzom.desktop')
-_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client
+_CAMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF')
+_CMAKE_BOTH_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=ON' '-DWITH_DRIVER_OPENGL=ON' '-DWITH_DRIVER_OPENAL=ON')
-package_ryzom-hg-nel() {
- # options and directives that can be overridden
- #pkgver=20130706
- #pkgrel=0
- pkgdesc="An awesome free software 3D MMORPG game. NeL library."
- #depends=()
-
- provides=('ryzom-hg-nel')
- conflicts=('ryzom-hg-nel')
- replaces=('ryzom-hg-nel')
+mksource() {
+ rm -rf "$srcdir/$pkgname-$pkgver"
+ cp "$srcdir/ryzom.desktop" "$srcdir/.$pkgname-$pkgver/code"
+ cp -a "$srcdir/.$pkgname-$pkgver/code" "${srcdir}/${pkgname}-${pkgver}"
+}
- mkdir -p "$srcdir/build-nel"
- cd "$srcdir/build-nel"
+build() {
+ mkdir -p "$srcdir/build"
+ cd "$srcdir/build"
+ cmake -b -Wno-dev "$srcdir/${pkgname}-${pkgver}" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_BOTH_ARGS[*]} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DRYZOM_ETC_PREFIX=/etc/ryzom \
+ -DRYZOM_SHARE_PREFIX=/usr/share/ryzom \
+ -DRYZOM_BIN_PREFIX=/usr/bin \
+ -DRYZOM_GAMES_PREFIX=/usr/bin
+
+ make all
+}
- cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
- make
+package() {
+ cd "$srcdir/build"
make DESTDIR="$pkgdir" install
+ install -Dm 644 "$srcdir/${pkgname}-${pkgver}/ryzom.desktop" "$pkgdir/usr/share/applications/"
}
-package_ryzom-hg-client() {
- # options and directives overrides
- pkgdesc="An awesome free software 3D MMORPG game. Game client."
- provides=('ryzom-hg-client')
- conflicts=('ryzom-hg-client')
- replaces=('ryzom-hg-client')
- depends=('ryzom-hg-nel')
-
- mkdir -p "$srcdir/build-client"
- cd "$srcdir/build-client"
+mksha256sums=('SKIP'
+ '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
- cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
- make
- make DESTDIR="$pkgdir" install
-}
+sha256sums=('a8c90f3f41fb3d497022a2d14a9aa39352557f5745f97b93d0bed61cebf85402'
+ '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
diff --git a/pcr/ryzom-hg/SRCBUILD b/pcr/ryzom-hg/SRCBUILD
deleted file mode 100644
index a04662b0d..000000000
--- a/pcr/ryzom-hg/SRCBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=("ryzom-hg")
-pkgver=20130708
-pkgrel=3
-pkgdesc="An awesome free software 3D MMORPG game"
-arch=(any)
-url="https://www.ryzom.com/"
-license=('AGPL3')
-makedepends=('mercurial')
-
-source=("ryzom.sh"
- "ryzom.desktop")
-
-_hgroot='https://bitbucket.org/ryzom/ryzomcore'
-_hgrepo='ryzomcore'
-
-build() {
- cd "$srcdir"
- msg "Connecting to Mercurial server...."
-
- if [[ -d "$_hgrepo" ]]; then
- cd "$_hgrepo"
- hg pull -u
- msg "The local files are updated."
- else
- hg clone "$_hgroot" "$_hgrepo"
- fi
-
- msg "Mercurial checkout done or server timeout"
-}
-
-package() {
- PKGEXT=${SRCEXT}
- PKGDEST=${SRCDEST}
- cp ${srcdir}/ryzom.sh ${pkgdir}/
- cp ${srcdir}/ryzom.desktop ${pkgdir}/
- cp -a ${srcdir}/ryzomcore/code ${pkgdir}/
-}
-sha256sums=('d3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6'
- '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
diff --git a/pcr/ryzom-hg/ryzom.sh b/pcr/ryzom-hg/ryzom.sh
deleted file mode 100644
index e3cff2c64..000000000
--- a/pcr/ryzom-hg/ryzom.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-if groups | grep games > /dev/null 2>&1 ; then
- ryzom_sync
- exec ryzom_client
-
-else
- echo "you need to be in games group to run ryzom"
- exit 1
-fi