diff options
Diffstat (limited to 'community')
-rw-r--r-- | community/exfat-utils/PKGBUILD | 8 | ||||
-rw-r--r-- | community/fuse-exfat/PKGBUILD | 8 | ||||
-rw-r--r-- | community/haveged/PKGBUILD | 27 | ||||
-rw-r--r-- | community/haveged/rc.d | 44 | ||||
-rw-r--r-- | community/haveged/service | 11 | ||||
-rw-r--r-- | community/libfm/PKGBUILD | 12 | ||||
-rw-r--r-- | community/libfm/libfm.install | 6 | ||||
-rw-r--r-- | community/pcmanfm/PKGBUILD | 11 | ||||
-rw-r--r-- | community/poedit/PKGBUILD | 6 | ||||
-rw-r--r-- | community/psqlodbc/PKGBUILD | 8 | ||||
-rw-r--r-- | community/ristretto/PKGBUILD | 2 | ||||
-rw-r--r-- | community/simutrans/PKGBUILD | 60 | ||||
-rw-r--r-- | community/simutrans/config.patch | 52 | ||||
-rw-r--r-- | community/simutrans/fix-build.patch | 11 | ||||
-rw-r--r-- | community/simutrans/path-for-game-data.patch | 18 | ||||
-rw-r--r-- | community/simutrans/settings-folder.patch | 12 | ||||
-rw-r--r-- | community/simutrans/simutrans.desktop | 9 | ||||
-rw-r--r-- | community/ushare/PKGBUILD | 17 | ||||
-rw-r--r-- | community/ushare/ushare.service | 11 | ||||
-rw-r--r-- | community/wvstreams/PKGBUILD | 12 | ||||
-rw-r--r-- | community/wvstreams/wvstreams-4.6.1-gcc47.patch | 44 |
21 files changed, 329 insertions, 60 deletions
diff --git a/community/exfat-utils/PKGBUILD b/community/exfat-utils/PKGBUILD index cce282aca..923d38a6e 100644 --- a/community/exfat-utils/PKGBUILD +++ b/community/exfat-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68470 2012-03-25 09:10:23Z giovanni $ +# $Id: PKGBUILD 75092 2012-08-13 17:32:26Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alex <mail.avatar@gmail.com> pkgname=exfat-utils -pkgver=0.9.7 +pkgver=0.9.8 pkgrel=1 pkgdesc="Utilities for exFAT file system" arch=('i686' 'x86_64' 'mips64el') @@ -12,12 +12,12 @@ license=('GPL3') depends=('glibc') makedepends=('scons') source=("http://exfat.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('1bd94db19fc556701b16a66f6291b4ca') +md5sums=('a14c4bab6920121c874f448b5bfe4017') package() { cd "${srcdir}/${pkgname}-${pkgver}" - scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " install DESTDIR="${pkgdir}/sbin" + scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " install DESTDIR="${pkgdir}/usr/bin" # Install man pages install -Dm444 dump/dumpexfat.8 "${pkgdir}/usr/share/man/man8/dumpexfat.8" diff --git a/community/fuse-exfat/PKGBUILD b/community/fuse-exfat/PKGBUILD index a58cad0e8..cce35b5dc 100644 --- a/community/fuse-exfat/PKGBUILD +++ b/community/fuse-exfat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68468 2012-03-25 09:05:15Z giovanni $ +# $Id: PKGBUILD 75089 2012-08-13 17:28:00Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: GaoShichao <xgdgsc@gmail.com> pkgname=fuse-exfat -pkgver=0.9.7 +pkgver=0.9.8 pkgrel=1 pkgdesc="Free exFAT file system implementation" arch=('i686' 'x86_64' 'mips64el') @@ -14,12 +14,12 @@ makedepends=('scons') optdepends=('exfat-utils: utilities for exFAT file system' 'util-linux: to mount exFAT volumes automatically') source=("http://exfat.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('ea8eddcc68ec8881cb8a280086297e39') +md5sums=('59ff35d4ec8e53a79359edc53a6ab534') package() { cd "${srcdir}/${pkgname}-${pkgver}" - scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " install DESTDIR="${pkgdir}/sbin" + scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " install DESTDIR="${pkgdir}/usr/bin" # Install man page install -Dm444 fuse/mount.exfat-fuse.8 "${pkgdir}/usr/share/man/man8/mount.exfat-fuse.8" diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD index cb66c777b..4b38607e7 100644 --- a/community/haveged/PKGBUILD +++ b/community/haveged/PKGBUILD @@ -1,34 +1,33 @@ -# $Id: PKGBUILD 72028 2012-06-06 10:37:52Z heftig $ +# $Id: PKGBUILD 75053 2012-08-13 05:31:00Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: kfgz <kfgz at interia dot pl> # Contributor: pootzko <pootzko at gmail dot com> pkgname=haveged -pkgver=1.4 -pkgrel=3 -pkgdesc="Entropy harvesting daemon using CPU timings" +pkgver=1.5 +pkgrel=1 +pkgdesc='Entropy harvesting daemon using CPU timings' arch=('i686' 'x86_64' 'mips64el') -url="http://www.issihosts.com/haveged" +url='http://www.issihosts.com/haveged' license=('GPL') depends=('glibc') source=(${url}/${pkgname}-${pkgver}.tar.gz - haveged haveged.service) -md5sums=('39a03d4b8a4225706f78dbef3f623b0e' + rc.d service) +md5sums=('89ea7d79c76160f13065301d952091d7' '264b725be5271288b40f363d7cfc6b68' 'fc62a480f520377364503aca9efff0b0') build() { - cd "${srcdir}"/${pkgname}-${pkgver/a/} + cd $srcdir/$pkgname-${pkgver/a/} ./configure --prefix=/usr make } package() { - cd "${srcdir}"/${pkgname}-${pkgver/a/} - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/etc/init.d + cd $srcdir/$pkgname-${pkgver/a/} + make DESTDIR=$pkgdir install + rm -rf $pkgdir/etc/init.d - cd "${srcdir}" - install -D -m755 haveged "${pkgdir}"/etc/rc.d/haveged - install -D -m644 haveged.service "${pkgdir}"/usr/lib/systemd/system/haveged.service + install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/haveged + install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/haveged.service } diff --git a/community/haveged/rc.d b/community/haveged/rc.d new file mode 100644 index 000000000..c0e13b40d --- /dev/null +++ b/community/haveged/rc.d @@ -0,0 +1,44 @@ +#!/bin/bash +## +# chkconfig: 2345 75 25 +# description: havege entropy daemon +# +# source function library +. /etc/rc.conf +. /etc/rc.d/functions + +RETVAL=0 +prog="haveged" + +case "$1" in +start) + stat_busy $"Starting $prog" + /usr/sbin/$prog -w 1024 -v 1 + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon $prog + stat_done + fi + ;; + +stop) + stat_busy $"Stopping $prog" + kill `cat /var/run/$prog.pid` + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon $prog + stat_done + rm -f /var/lock/$prog + fi + ;; + +restart) + $0 stop + $0 start + ;; + +*) + echo "usage: $prog [start|stop|restart]" +esac diff --git a/community/haveged/service b/community/haveged/service new file mode 100644 index 000000000..6803a0dec --- /dev/null +++ b/community/haveged/service @@ -0,0 +1,11 @@ +[Unit] +Description=Entropy Harvesting Daemon +Documentation=man:haveged(8) + +[Service] +Type=forking +ExecStart=/usr/sbin/haveged -w 1024 -v 1 +PIDFile=/var/run/haveged.pid + +[Install] +WantedBy=multi-user.target diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index a6520ffcf..834a79fa2 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -1,11 +1,13 @@ +# $Id: PKGBUILD 75065 2012-08-13 13:28:06Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=libfm -pkgver=0.1.17 -pkgrel=1.1 -pkgdesc="the core of next generation file manager PCManFM" +pkgver=1.0 +pkgrel=1 +pkgdesc="A library for file management" url="http://pcmanfm.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,12 +16,11 @@ options=('!libtool') install=libfm.install depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils') source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz) -md5sums=('a97e03d973e6ac727f28d0934d6c9ad5') +md5sums=('9f978eb58c72a6623021504832a9da1b') build() { cd $srcdir/$pkgname-$pkgver -# sed -i -e "s|docs/Makefile docs/reference/Makefile docs/reference/libfm/Makefile ||" configure ./configure --prefix=/usr \ --sysconfdir=/etc \ --enable-udisks \ @@ -29,6 +30,5 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install } diff --git a/community/libfm/libfm.install b/community/libfm/libfm.install index 076da308e..1a6a34b9a 100644 --- a/community/libfm/libfm.install +++ b/community/libfm/libfm.install @@ -1,7 +1,7 @@ post_install() { - usr/bin/update-mime-database usr/share/mime > /dev/null - usr/bin/update-desktop-database -q - usr/bin/gio-querymodules usr/lib/gio/modules + update-mime-database /usr/share/mime > /dev/null + update-desktop-database -q + [ -d /usr/lib/gio/modules ] && gio-querymodules /usr/lib/gio/modules } post_upgrade() { diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD index 417d469ff..244a40260 100644 --- a/community/pcmanfm/PKGBUILD +++ b/community/pcmanfm/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 74709 2012-08-02 09:11:53Z bpiotrowski $ +# $Id: PKGBUILD 75067 2012-08-13 13:28:46Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=pcmanfm -pkgver=0.9.10 -pkgrel=3 +pkgver=1.0 +pkgrel=1 pkgdesc="An extremely fast and lightweight file manager" arch=('i686' 'x86_64' 'mips64el') url="http://pcmanfm.sourceforge.net/" @@ -16,14 +16,13 @@ depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') makedepends=('intltool' 'pkgconfig') install=$pkgname.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz) -md5sums=('d34a3530a6c5dcd674d23021d71c3e95') +md5sums=('df082fde42c4036b220cd3167ceab98e') build() { cd "$srcdir/$pkgname-$pkgver" - LDFLAGS+=' -lm' ./configure --sysconfdir=/etc --prefix=/usr - make + make LDFLAGS="-lm $LDFLAGS" } package() { diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD index b4c322235..890dc66c0 100644 --- a/community/poedit/PKGBUILD +++ b/community/poedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74812 2012-08-06 07:24:54Z bpiotrowski $ +# $Id: PKGBUILD 75051 2012-08-13 05:24:10Z bpiotrowski $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alexander Fehr <pizzapunk@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=poedit -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="Cross-platform gettext catalogs (.po files) editor" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('wxgtk>=2.8.11' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext') makedepends=('pkgconfig' 'boost') install=poedit.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('950ac62ea5e6375a5a8b9c9e5f6e2e2d') +md5sums=('d58ff8b5a821d68258699b2697ec9041') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/psqlodbc/PKGBUILD b/community/psqlodbc/PKGBUILD index acce6d1be..1929aee36 100644 --- a/community/psqlodbc/PKGBUILD +++ b/community/psqlodbc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61119 2011-12-21 20:58:01Z andrea $ +# $Id: PKGBUILD 75081 2012-08-13 13:51:08Z spupykin $ # Maintainer: # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux-br.org> # Contributor: Rick Rein <jeebusroxors@gmail.com> pkgname=psqlodbc -pkgver=09.00.0310 -pkgrel=2 +pkgver=09.01.0100 +pkgrel=1 pkgdesc="PostgreSQL ODBC driver" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -15,7 +15,7 @@ makedepends=('postgresql') options=('!libtool') source=(ftp://ftp2.it.postgresql.org/mirrors/postgres//odbc/versions/src/$pkgname-$pkgver.tar.gz fix-function-declarations.patch) -md5sums=('78144d9ea6c40f0a0a0b92128e6b0e05' +md5sums=('08121d9d57bb2dbab11c36c2cc8e8edb' 'f1189f9c6ae0b5bfb5ee8423eaa4076f') build() { diff --git a/community/ristretto/PKGBUILD b/community/ristretto/PKGBUILD index 5b3b2a268..249fe361a 100644 --- a/community/ristretto/PKGBUILD +++ b/community/ristretto/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70118 2012-04-30 04:20:02Z foutrelis $ +# $Id: PKGBUILD 75057 2012-08-13 06:21:47Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/simutrans/PKGBUILD b/community/simutrans/PKGBUILD new file mode 100644 index 000000000..cabad01c4 --- /dev/null +++ b/community/simutrans/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 75106 2012-08-13 23:27:28Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Gilles Gagniard <gilles@gagniard.org> +# Contributor: JD Steffen <jd at steffennet dot org> + +pkgname=simutrans +pkgver=111.3.1 +_pkgver=111-3-1 +pkgrel=1 +pkgdesc="An open source transportation simulation game" +arch=('i686' 'x86_64') +url="http://simutrans.com/" +license=('PerlArtistic') +depends=('gcc-libs' 'zlib' 'sdl_mixer' 'bzip2' 'simutrans-pak64') +makedepends=('imagemagick') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-src-$_pkgver.zip + http://downloads.sourceforge.net/$pkgname/simulinux-$_pkgver.zip + settings-folder.patch + path-for-game-data.patch + config.patch + fix-build.patch + simutrans.desktop) +md5sums=('efd18a25d30009d5421001c0d9fd7803' + '95b96826ff07b7da2cce33f38def6f4e' + 'c87d9a9910bc371df5d50f7f1ec298bb' + '4648680290b44775b9c47d3758d3bd6c' + 'd11bc8ee33a34e33341f6ccd90a44dba' + '7d6329f7db821e3cc22fde5c5c138e2d' + 'f41f7a08ad517ef2b60412859eb49963') + +build() { + cd "$srcdir" + + cp config.template config.default + patch -Np0 -i "$srcdir/settings-folder.patch" + patch -Np1 -i "$srcdir/path-for-game-data.patch" + patch -Np0 -i "$srcdir/config.patch" + patch -Np0 -i "$srcdir/fix-build.patch" + convert simutrans.ico -alpha on simutrans.png + chmod 644 simsys_opengl.cc + + make +} + +package() { + cd "$srcdir" + + #binary + install -Dm755 build/default/sim "$pkgdir/usr/bin/simutrans" + + #data + mkdir -p "$pkgdir/usr/share/games/$pkgname" + cp -r "$pkgname"/{config,font,music,skin,text} "$pkgdir/usr/share/games/$pkgname" + + #desktop file and icon + install -Dm644 simutrans.png "$pkgdir/usr/share/pixmaps/simutrans.png" + install -Dm644 simutrans.desktop "$pkgdir/usr/share/applications/simutrans.desktop" +} diff --git a/community/simutrans/config.patch b/community/simutrans/config.patch new file mode 100644 index 000000000..ea4657a7a --- /dev/null +++ b/community/simutrans/config.patch @@ -0,0 +1,52 @@ +--- config.default.orig 2011-11-10 21:48:01.000000000 +0100 ++++ config.default 2011-11-10 21:51:58.383221979 +0100 +@@ -6,23 +6,23 @@ + #BACKEND = allegro + #BACKEND = gdi + #BACKEND = sdl +-#BACKEND = mixer_sdl ++BACKEND = mixer_sdl + #BACKEND = posix + + #COLOUR_DEPTH = 0 +-#COLOUR_DEPTH = 16 ++COLOUR_DEPTH = 16 + + #OSTYPE = amiga + #OSTYPE = beos + #OSTYPE = cygwin + #OSTYPE = freebsd + #OSTYPE = haiku +-#OSTYPE = linux ++OSTYPE = linux + #OSTYPE = mingw + #OSTYPE = mac + + #DEBUG = 3 # Level 1-3, higher number means more debug-friendly, see Makefile +-#OPTIMISE = 1 # Add umpteen optimisation flags ++OPTIMISE = 1 # Add umpteen optimisation flags + #PROFILE = 1 # Enable profiling + #PROFILE = 2 # Enable profiling with optimisation flags, can be used with `OPTIMISE = 1' + +@@ -34,9 +34,9 @@ + # Define these as empty strings, if you don't have the respective config program + #ALLEGRO_CONFIG = allegro-config + #PNG_CONFIG = pkg-config libpng +-#SDL_CONFIG = sdl-config ++SDL_CONFIG = sdl-config + +-#VERBOSE = 1 ++VERBOSE = 1 + + # The following useful conditional compilation flags exist + # +@@ -65,6 +65,9 @@ + # + # In order to use the flags, add a line like this: (-Dxxx) + # FLAGS = -DUSE_C ++ifeq ($(shell uname -m),x86_64) ++ FLAGS += -DUSE_C ++endif + + # Output directories: + # diff --git a/community/simutrans/fix-build.patch b/community/simutrans/fix-build.patch new file mode 100644 index 000000000..a575cbef6 --- /dev/null +++ b/community/simutrans/fix-build.patch @@ -0,0 +1,11 @@ +diff -Naur utils/csv.cc utils/csv.cc +--- utils/csv.cc 2012-03-18 21:10:39.000000000 +0000 ++++ utils/csv.cc 2012-05-04 11:06:50.228842822 +0000 +@@ -8,6 +8,7 @@ + #include <cstring> + #include <stdio.h> + #include <assert.h> ++#include <stdlib.h> + + #include "csv.h" + #include "simstring.h" diff --git a/community/simutrans/path-for-game-data.patch b/community/simutrans/path-for-game-data.patch new file mode 100644 index 000000000..ac2b41407 --- /dev/null +++ b/community/simutrans/path-for-game-data.patch @@ -0,0 +1,18 @@ +look in /usr/share/games/simutrans for game data + +@DPATCH@ + +--- simutrans.orig/simmain.cc ++++ simutrans/simmain.cc +@@ -437,8 +437,9 @@ + strcat( umgebung_t::program_dir, path_sep ); + } + else { +- strcpy( umgebung_t::program_dir, argv[0] ); +- *(strrchr( umgebung_t::program_dir, path_sep[0] )+1) = 0; ++ // strcpy( umgebung_t::program_dir, argv[0] ); ++ // *(strrchr( umgebung_t::program_dir, path_sep[0] )+1) = 0; ++ strcpy(umgebung_t::program_dir, "/usr/share/games/simutrans/"); + + chdir( umgebung_t::program_dir ); + } diff --git a/community/simutrans/settings-folder.patch b/community/simutrans/settings-folder.patch new file mode 100644 index 000000000..166795803 --- /dev/null +++ b/community/simutrans/settings-folder.patch @@ -0,0 +1,12 @@ +--- simsys.cc.orig 2011-10-28 20:32:25.000000000 +0200 ++++ simsys.cc 2011-11-10 23:09:10.380031846 +0100 +@@ -47,7 +47,7 @@ + #elif defined __APPLE__ + sprintf(buffer, "%s/Library/Simutrans", getenv("HOME")); + #else +- sprintf(buffer, "%s/simutrans", getenv("HOME")); ++ sprintf(buffer, "%s/.simutrans", getenv("HOME")); + #endif + + dr_mkdir(buffer); + diff --git a/community/simutrans/simutrans.desktop b/community/simutrans/simutrans.desktop new file mode 100644 index 000000000..e8d8660c8 --- /dev/null +++ b/community/simutrans/simutrans.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Simutrans +Comment=Transportation simulator +Exec=simutrans +Icon=simutrans +Terminal=false +Type=Application +Categories=Game;Simulation; + diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD index 5d5126cdc..597b1541f 100644 --- a/community/ushare/PKGBUILD +++ b/community/ushare/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65329 2012-02-21 01:38:24Z spupykin $ +# $Id: PKGBUILD 75096 2012-08-13 19:22:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> pkgname=ushare pkgver=1.1a -pkgrel=17 +pkgrel=18 pkgdesc="A free UPnP A/V Media Server for Linux" url="http://ushare.geexbox.org" license=('GPL2') @@ -18,12 +18,14 @@ source=("http://ushare.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2" "ushare" "upnp-build-fix.patch" "ushare-config.patch" - "segfault.patch") + "segfault.patch" + "ushare.service") md5sums=('5bbcdbf1ff85a9710fa3d4e82ccaa251' 'e3cf0a44b0280da4966177c21e49361c' '32c29f9f673e8b3a3d9e7bf5e60febbc' '5243475c0cebc5db49296b2f3691085b' - '0b0fbf5d103f0ebb72716cbad0b28ffa') + '0b0fbf5d103f0ebb72716cbad0b28ffa' + 'db6187257b4623ef155b5575526d5d87') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -42,12 +44,13 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/etc/${pkgname}/init.d - install -m 0755 -D ${srcdir}/ushare ${pkgdir}/etc/rc.d/ushare - install -d -m 0755 ${pkgdir}/etc/conf.d/ + install -Dm0755 ${srcdir}/ushare ${pkgdir}/etc/rc.d/ushare + install -dm0755 ${pkgdir}/etc/conf.d/ cat >${pkgdir}/etc/conf.d/ushare <<EOF #PARAMS="-c /tmp -i eth0" PARAMS= USHARE_USER=ushare EOF - install -D -m0644 src/ushare.1 $pkgdir/usr/share/man/man1/ushare.1 + install -Dm0644 src/ushare.1 $pkgdir/usr/share/man/man1/ushare.1 + install -Dm0644 $srcdir/ushare.service $pkgdir/usr/lib/systemd/system/ushare.service } diff --git a/community/ushare/ushare.service b/community/ushare/ushare.service new file mode 100644 index 000000000..ba6719b8b --- /dev/null +++ b/community/ushare/ushare.service @@ -0,0 +1,11 @@ +[Unit] +Description=ushare +After=network.target + +[Service] +EnvironmentFile=/etc/conf.d/ushare +ExecStart=/usr/bin/ushare -D -x --cfg=/etc/ushare/ushare.conf +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD index 8bd07de60..0f7797cd2 100644 --- a/community/wvstreams/PKGBUILD +++ b/community/wvstreams/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74964 2012-08-10 12:12:57Z bluewind $ +# $Id: PKGBUILD 75083 2012-08-13 16:55:40Z bluewind $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=wvstreams pkgver=4.6.1 -pkgrel=4 +pkgrel=5 pkgdesc="A network programming library written in C++" arch=('i686' 'x86_64' 'mips64el') url="http://alumnit.ca/wiki/?page=WvStreams" @@ -15,7 +15,7 @@ source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz wvstreams-4.6.1-glibc212.patch wvstreams-4.6.1-gcc47.patch openssl-buildfix.patch) md5sums=('2760dac31a43d452a19a3147bfde571c' '5f6e24864209055239cb4e7c9bbd4a41' - '918be13d35205385a39077403ce36388' + '217e5dedd7f1d50588a5a67d637fc8a1' 'df423c68134a09439b3961c34635e0b4') options=('!makeflags') @@ -23,7 +23,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch" - patch -p1 -i "$srcdir/wvstreams-4.6.1-gcc47.patch" + patch -p0 -i "$srcdir/wvstreams-4.6.1-gcc47.patch" patch -p1 -i "$srcdir/openssl-buildfix.patch" ./configure --prefix=/usr \ @@ -33,8 +33,8 @@ build() { --with-pam \ --with-openssl \ --without-tcl \ - --without-qt || return 1 - make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive" VERBOSE=1 + --without-qt + make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive -fno-tree-dce -fno-optimize-sibling-calls" VERBOSE=1 } package() { diff --git a/community/wvstreams/wvstreams-4.6.1-gcc47.patch b/community/wvstreams/wvstreams-4.6.1-gcc47.patch index 3d6704832..b284da8f3 100644 --- a/community/wvstreams/wvstreams-4.6.1-gcc47.patch +++ b/community/wvstreams/wvstreams-4.6.1-gcc47.patch @@ -1,5 +1,33 @@ ---- wvstreams-4.6.1-dist/include/wvuid.h 2012-01-05 10:18:58.713661236 +0100 -+++ wvstreams-4.6.1/include/wvuid.h 2012-01-05 10:27:42.198435328 +0100 +http://bugs.gentoo.org/419563 +http://bugs.gentoo.org/419971 + +See -gcc47-patch and -magic.patch in Fedora git: + +http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree + +--- include/wvtask.h ++++ include/wvtask.h +@@ -45,7 +45,8 @@ + typedef void TaskFunc(void *userdata); + + static int taskcount, numtasks, numrunning; +- int magic_number, *stack_magic; ++ int volatile magic_number; ++ int *stack_magic; + WvString name; + int tid; + +@@ -84,7 +85,7 @@ + static WvTaskMan *singleton; + static int links; + +- static int magic_number; ++ static int volatile magic_number; + static WvTaskList all_tasks, free_tasks; + + static void get_stack(WvTask &task, size_t size); +--- include/wvuid.h ++++ include/wvuid.h @@ -7,6 +7,7 @@ #ifndef __WVUID_H #define __WVUID_H @@ -8,3 +36,15 @@ #include "wvstring.h" #if WIN32 +--- utils/wvtask.cc ++++ utils/wvtask.cc +@@ -58,7 +58,8 @@ + int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning; + + WvTaskMan *WvTaskMan::singleton; +-int WvTaskMan::links, WvTaskMan::magic_number; ++int WvTaskMan::links; ++int volatile WvTaskMan::magic_number; + WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks; + ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return, + WvTaskMan::toplevel; |