diff options
Diffstat (limited to 'community')
-rw-r--r-- | community/aria2/PKGBUILD | 4 | ||||
-rw-r--r-- | community/calcurse/PKGBUILD | 6 | ||||
-rw-r--r-- | community/cgit/PKGBUILD | 24 | ||||
-rw-r--r-- | community/cgit/apache.example.conf | 25 | ||||
-rw-r--r-- | community/kvirc/PKGBUILD | 7 | ||||
-rw-r--r-- | community/libvirt/PKGBUILD | 9 | ||||
-rwxr-xr-x | community/libvirt/libvirtd.rc.d | 1 | ||||
-rw-r--r-- | community/orange/PKGBUILD | 8 | ||||
-rw-r--r-- | community/oss/PKGBUILD | 65 | ||||
-rw-r--r-- | community/oss/rc-script | 30 | ||||
-rw-r--r-- | community/oss/remove-hal.patch | 20 | ||||
-rw-r--r-- | community/oss/rm-init-scripts.patch | 52 | ||||
-rw-r--r-- | community/oss/soundon.patch | 28 | ||||
-rw-r--r-- | community/redis/PKGBUILD | 6 | ||||
-rw-r--r-- | community/scantailor/PKGBUILD | 25 | ||||
-rw-r--r-- | community/scantailor/build-fix.patch | 16 | ||||
-rw-r--r-- | community/scrotwm/PKGBUILD | 6 | ||||
-rw-r--r-- | community/synce-librapi/PKGBUILD | 9 | ||||
-rw-r--r-- | community/synce-rra/PKGBUILD | 11 | ||||
-rw-r--r-- | community/unifdef/PKGBUILD | 24 | ||||
-rw-r--r-- | community/xlockmore/PKGBUILD | 12 |
21 files changed, 291 insertions, 97 deletions
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 5041a2d79..3d7b7dbb7 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.12.0 +pkgver=1.12.1 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url='http://aria2.sourceforge.net/' license=('GPL') depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2") -sha1sums=('5bc6f07f84f6ad1d0e222d2b5c78cd3118e1a569') +md5sums=('9f3bf96d92bc8b70b74817ed10c2c7e7') build() { cd aria2-${pkgver} diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD index 75b80c91f..537483258 100644 --- a/community/calcurse/PKGBUILD +++ b/community/calcurse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48143 2011-05-28 23:23:26Z lfleischer $ +# $Id: PKGBUILD 53331 2011-08-02 22:40:00Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: wain <wain.at.gmx.net> pkgname=calcurse -pkgver=2.9.0 +pkgver=2.9.1 pkgrel=1 pkgdesc='A text-based personal organizer.' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url='http://calcurse.org/' license=('BSD') depends=('ncurses') source=("http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('3ff0229581060d43232a6fb56b0cd07a') +md5sums=('3a1af304a55a87169c425099b4886dc2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index 1c11029d1..edc48fe55 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 52856 2011-07-29 11:59:24Z spupykin $ +# $Id: PKGBUILD 53245 2011-08-02 14:54:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Current Maintainer: Patrick Palka <patrick@parcs.ath.cx> # Previous Maintainer: Loui Chang <louipc.ist at gmail com> @@ -7,7 +7,8 @@ pkgname=cgit pkgver=0.9.0.2 -pkgrel=1 +_gitver=1.7.4 +pkgrel=2 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64') url="http://hjemli.net/git/cgit" @@ -15,19 +16,30 @@ license=('GPL') depends=('openssl') makedepends=('git' 'zlib' 'curl' 'asciidoc') install=cgit.install -source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2") -md5sums=('5b92b07e0107ff24a783adfb8c0cd1f2') +source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2" + "http://www.kernel.org/pub/software/scm/git/git-${_gitver}.tar.bz2" + "apache.example.conf") +md5sums=('5b92b07e0107ff24a783adfb8c0cd1f2' + 'fa24dc1ef0b663327ea0fe1981365b39' + 'bd5696bea0654bfcf98f249b1a36737d') build() { cd "$pkgname-$pkgver" - make get-git + _cgit_gitver=`grep 'GIT_VER = ' Makefile | cut -f3 -d\ ` + [ "x${_gitver}" == "x${_cgit_gitver}" ] || { msg "Bad git version"; return 1; } + rm -rf git/* + mv ../git-${_gitver}/* git/ make make doc-man } package() { cd "$pkgname-$pkgver" - make CGIT_SCRIPT_PATH=/srv/http/cgit DESTDIR="$pkgdir" install install-man + make CGIT_SCRIPT_PATH=/usr/share/webapps/cgit DESTDIR="$pkgdir" install install-man install -vDm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" install -vd "$pkgdir/var/cache/$pkgname" + install -vDm0644 $srcdir/apache.example.conf $pkgdir/etc/webapps/cgit/apache.example.conf + mkdir -p $pkgdir/usr/lib/cgit + mv $pkgdir/usr/share/webapps/cgit/cgit.cgi $pkgdir/usr/lib/cgit + ln -sf ../../../lib/cgit/cgit.cgi $pkgdir/usr/share/webapps/cgit/cgit.cgi } diff --git a/community/cgit/apache.example.conf b/community/cgit/apache.example.conf new file mode 100644 index 000000000..9beb27db3 --- /dev/null +++ b/community/cgit/apache.example.conf @@ -0,0 +1,25 @@ +ScriptAlias /cgit/ "/usr/lib/cgit/cgit.cgi/" + +Alias /cgit-css "/usr/share/webapps/cgit/" + +<Directory "/usr/share/webapps/cgit/"> + AllowOverride None + Options None + Order allow,deny + Allow from all + AuthType Basic + AuthName cgit + AuthUserFile /etc/httpd/conf/passwd + Require user root +</Directory> + +<Directory "/usr/lib/cgit/"> + AllowOverride None + Options ExecCGI FollowSymlinks + Order allow,deny + Allow from all + AuthType Basic + AuthName cgit + AuthUserFile /etc/httpd/conf/passwd + Require user root +</Directory> diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index a53dbed2c..47f99a313 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 47455 2011-05-23 15:33:39Z tdziedzic $ +# $Id: PKGBUILD 53306 2011-08-02 18:26:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=kvirc pkgver=4.0.4 -pkgrel=2 +pkgrel=3 pkgdesc="Qt-based IRC client" url="http://www.kvirc.net" -depends=('python2' 'esound' 'qt' 'libxss') -optdepends=('esound: needed for snd plugin') +depends=('python2' 'qt' 'libxss') arch=(i686 x86_64) makedepends=('cmake') license=('GPL') diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 9678c6c4a..c2354f5e5 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52905 2011-07-29 19:20:46Z giovanni $ +# $Id: PKGBUILD 53281 2011-08-02 17:21:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.3 -pkgrel=3 +pkgrel=4 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -24,7 +24,8 @@ optdepends=('bridge-utils: for briged networking (default)' 'user-mode-linux' 'virtualbox_bin' 'virtualbox-ose' - 'xen') + 'xen' + 'radvd') options=('emptydirs' '!libtool') backup=('etc/conf.d/libvirtd' 'etc/libvirt/libvirtd.conf' @@ -38,7 +39,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" unixperms.patch yajl-2.x.patch) md5sums=('04f47fad7d0c614af9dcc5d1351c2148' - '018d97dafc0049075fba6f2850f17a12' + 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' 'ebb78cda893ca7991e0c22588a63132b' 'db95aecdf2ccf3693fef5821cdcb7eba' diff --git a/community/libvirt/libvirtd.rc.d b/community/libvirt/libvirtd.rc.d index 2f949ab9d..193bffa9c 100755 --- a/community/libvirt/libvirtd.rc.d +++ b/community/libvirt/libvirtd.rc.d @@ -14,6 +14,7 @@ PID=`pidof -o %PPID /usr/sbin/libvirtd` case "$1" in start) stat_busy "Starting libvirtd" + export RADVD=/usr/sbin/radvd for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do [ -d $i ] || mkdir -p $i done diff --git a/community/orange/PKGBUILD b/community/orange/PKGBUILD index c45ed2703..e6c6f982b 100644 --- a/community/orange/PKGBUILD +++ b/community/orange/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 21425 2010-07-16 12:03:23Z spupykin $ +# $Id: PKGBUILD 53301 2011-08-02 17:49:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=orange pkgver=0.4 -pkgrel=2 +pkgrel=3 pkgdesc="a helper tool for synce" arch=('i686' 'x86_64') url="http://synce.sourceforge.net/" license=("GPL") -depends=(dynamite synce-libsynce file unshield) +depends=('dynamite' 'synce-libsynce' 'file' 'unshield') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/synce/liborange-$pkgver.tar.gz) md5sums=('40e9ac3de389c74a60007f7493e072a5') @@ -17,6 +17,6 @@ md5sums=('40e9ac3de389c74a60007f7493e072a5') build() { cd $srcdir/liborange-$pkgver ./configure --prefix=/usr - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD index c251c41b6..314d6cb0d 100644 --- a/community/oss/PKGBUILD +++ b/community/oss/PKGBUILD @@ -1,32 +1,37 @@ -# $Id: PKGBUILD 36678 2011-01-05 23:16:19Z bluewind $ +# $Id: PKGBUILD 53275 2011-08-02 16:11:02Z bluewind $ +# Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=oss pkgver=4.2_2004 -pkgrel=1 +pkgrel=2 pkgdesc="Open Sound System UNIX audio architecture" arch=('i686' 'x86_64') url="http://developer.opensound.com/" license=('GPL2') depends=('gcc' 'make' 'kernel26-headers' 'module-init-tools' 'libtool' 'sed') makedepends=('pkgconfig' 'gawk' 'gtk2' 'findutils') -optdepends=('gtk2: for graphical mixer (ossxmix)' - 'hal: for automatic USB audio configuration') +optdepends=('gtk2: for graphical mixer (ossxmix)') conflicts=('oss-linux' 'oss-linux-free' 'oss-testing' 'libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss') replaces=('libflashsupport-oss') install=oss.install backup=('usr/lib/oss/soundon.user') source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2" - 'oss.rm-init-scripts.patch' 'oss.rc' 'oss.soundon.patch') + "rm-init-scripts.patch" + "rc-script" + "soundon.patch" + "remove-hal.patch" + ) md5sums=('256aba264d523fb8ee444aaacfb8d3da' 'b9a380a0ac8896390d71ac13676f27e1' - '8ca7cdf94c56ab02890eb4aba6a4995f' - '65f07fe241bfbf912f76d8b6d8f276b5') + 'cbcbce5c03b127df5eafa8faa091492c' + '65f07fe241bfbf912f76d8b6d8f276b5' + 'cd7f1dc6166bba8c94d96f3a28e948a5') build() { _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl - cd ${srcdir}/${_dir} + cd "${srcdir}/${_dir}" # Avoid these flags conflicting with OSS build system. unset CFLAGS @@ -42,43 +47,41 @@ build() { gcc -shared -fPIC -O2 -Wall -Werror flashsupport.c -o libflashsupport.so msg "Preparing the build environment." - cd ${srcdir} + cd "${srcdir}" - if [ ! -d build ]; then - # Create build directory and configure - mkdir build && cd build - ${srcdir}/${_dir}/configure --enable-libsalsa=NO - else - # Change to existing build directory - cd build - fi + # Create build directory and configure + rm -rf build + mkdir build && cd build + "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm msg "Building OSS." make build msg "Patching init scripts." - cd ${srcdir}/build/prototype + cd "${srcdir}/build/prototype" rm usr/lib/oss/etc/S89oss - patch -b -p0 < ${srcdir}/oss.rm-init-scripts.patch - patch -b -p0 < ${srcdir}/oss.soundon.patch - + patch -p0 -i "${srcdir}/rm-init-scripts.patch" + patch -p0 -i "${srcdir}/soundon.patch" + # remove hal dependency + patch -p0 -i "${srcdir}/remove-hal.patch" + rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi } package() { _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl - cd ${srcdir}/${_dir} + cd "${srcdir}/${_dir}" msg "Copying files." # Install libflashsupport.so - install -Dm755 oss/lib/libflashsupport.so \ - ${pkgdir}/usr/lib/libflashsupport.so - rm -f oss/lib/{flashsupport.c,libflashsupport.so} + install -dm755 "$pkgdir/usr/lib" + ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so" + + cd "${srcdir}/build/prototype" + cp -a * "${pkgdir}" - cd ${srcdir}/build/prototype - cp -a * ${pkgdir} - chmod -R a+r ${pkgdir} # All files can have read permission (FS#13815) - find ${pkgdir} -type d -exec chmod a+x '{}' \; # Make namcap happy - install -Dm755 ${srcdir}/oss.rc ${pkgdir}/etc/rc.d/oss + chmod -R a+r "${pkgdir}" # All files can have read permission (FS#13815) + find "${pkgdir}" -type d -exec chmod a+x '{}' \; # Make namcap happy + install -Dm755 "${srcdir}/rc-script" "${pkgdir}/etc/rc.d/oss" } diff --git a/community/oss/rc-script b/community/oss/rc-script new file mode 100644 index 000000000..5c930107c --- /dev/null +++ b/community/oss/rc-script @@ -0,0 +1,30 @@ +#!/bin/bash +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy 'Starting Open Sound System' + if /usr/sbin/soundon; then + add_daemon oss + stat_done + else + stat_fail + fi + ;; + stop) + stat_busy 'Stopping Open Sound System' + if /usr/sbin/soundoff; then + rm_daemon oss + stat_done + else + stat_fail + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "Usage: $0 {start|stop|restart}" +esac diff --git a/community/oss/remove-hal.patch b/community/oss/remove-hal.patch new file mode 100644 index 000000000..27e2ef2de --- /dev/null +++ b/community/oss/remove-hal.patch @@ -0,0 +1,20 @@ +Date: Tue Aug 2 16:37:31 CEST 2011 +Author: Florian Pritz <bluewind@xinu.at> +This removes all hal dependencies + +References: +http://www.archlinux.org/todo/92/ + +--- usr/lib/oss/build/install_2011-08-02_162647.sh 2011-08-02 16:26:47.000000000 +0200 ++++ usr/lib/oss/build/install.sh 2011-08-02 16:27:13.000000000 +0200 +@@ -336,10 +336,4 @@ + echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs + fi + +-# Hal 0.5.0+ hotplug +-mkdir -p /usr/lib/hal/scripts +-ln -sf $OSSLIBDIR/scripts/oss_usb-create-devices /usr/lib/hal/scripts/ +-mkdir -p /usr/share/hal/fdi/policy/20thirdparty/ +-ln -sf $OSSLIBDIR/scripts/90-oss_usb-create-device.fdi /usr/share/hal/fdi/policy/20thirdparty/ +- + exit 0 diff --git a/community/oss/rm-init-scripts.patch b/community/oss/rm-init-scripts.patch new file mode 100644 index 000000000..981ff605f --- /dev/null +++ b/community/oss/rm-init-scripts.patch @@ -0,0 +1,52 @@ +--- usr/lib/oss/build/install.sh.orig 2008-09-25 11:41:47.180167692 -0300 ++++ usr/lib/oss/build/install.sh 2008-09-25 11:41:47.180167692 -0300 +@@ -290,38 +290,6 @@ + echo + fi + +-if ! test -d /etc/init.d +-then +- mkdir /etc/init.d +-fi +- +-rm -f /etc/init.d/oss /etc/rc.d/rc3.d/S89oss /etc/rc3.d/S89oss +-cp -f $OSSLIBDIR/etc/S89oss /etc/init.d/oss +- +-chmod 744 /etc/init.d/oss +- +-if test -x /sbin/chkconfig +-then +- /sbin/chkconfig oss on > /dev/null 2>&1 +-else +- if test -x /usr/sbin/update-rc.d +- then +- /usr/sbin/update-rc.d oss defaults > /dev/null 2>&1 +- else +- if test -d etc/rc.d/rc3.d +- then +- rm -f /etc/rc.d/rc3.d/S89oss +- ln -s /etc/init.d/oss /etc/rc.d/rc3.d/S89oss +- else +- if test -d /etc/rc3.d +- then +- rm -f /etc/rc3.d/S89oss +- ln -s /etc/init.d/oss /etc/rc3.d/S89oss +- fi +- fi +- fi +-fi +- + # Install ALSA interface module (Cuckoo) + #(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 + #if (cd $OSSLIBDIR/cuckoo && make install) > /var/log/cuckoo.log 2>&1 +--- usr/lib/oss/scripts/restore_drv.sh.orig 2008-09-25 11:41:47.210168487 -0300 ++++ usr/lib/oss/scripts/restore_drv.sh 2008-09-25 11:41:47.210168487 -0300 +@@ -18,8 +18,6 @@ + fi + fi + +-rm -f /etc/init.d/oss +- + if ! test -d /lib/modules/`uname -r`/kernel/sound + then + if test -f /lib/modules/`uname -r`/sound-preoss.tar.bz2 diff --git a/community/oss/soundon.patch b/community/oss/soundon.patch new file mode 100644 index 000000000..4702b8680 --- /dev/null +++ b/community/oss/soundon.patch @@ -0,0 +1,28 @@ +--- usr/sbin/soundon.old 2009-09-04 06:35:26.000000000 +0100 ++++ usr/sbin/soundon 2009-11-15 13:59:53.000000000 +0000 +@@ -255,7 +255,10 @@ + then + if test "`uname -m` " = "x86_64 " + then +- ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2 ++ # Fix for compatibility with Arch's directory structure ++ # Not that we use it, there is no $OSSLIBDIR/.libsalsa_installed ++ ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2 ++ #ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2 + #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 + else + if test -s /lib/libasound.so.2 +@@ -278,8 +281,11 @@ + then + if test "`uname -m` " = "x86_64 " + then +- ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 +- ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64 ++ # Fix for compatibility with Arch's directory structure ++ ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib ++ ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib ++ #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 ++ #ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64 + else + if test -s /lib/libasound.so.2 + then diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index f7580492a..6e824e496 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51232 2011-07-06 10:22:03Z spupykin $ +# $Id: PKGBUILD 53250 2011-08-02 14:55:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.2.11 +pkgver=2.2.12 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('5501c90ca02ae7ea93c34f067b3e0619' +md5sums=('61b287860cab3e89c49390b8f5ffb697' 'bf61968d18d0e42529880f5c488ea9ed' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/scantailor/PKGBUILD b/community/scantailor/PKGBUILD index 34d6976de..96c166249 100644 --- a/community/scantailor/PKGBUILD +++ b/community/scantailor/PKGBUILD @@ -1,22 +1,35 @@ -# $Id: PKGBUILD 33966 2010-11-29 21:42:36Z spupykin $ +# $Id: PKGBUILD 53336 2011-08-03 00:10:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Denis Terskov aka neurosurgeon <terskov.den@gmail.com> pkgname=scantailor -pkgver=0.9.9.2 +pkgver=0.9.10 pkgrel=1 pkgdesc="Interactive post-processing tool for scanned pages" arch=(i686 x86_64) url="http://scantailor.sourceforge.net" license="GPL" depends=('qt') -makedepends=('cmake boost') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('0944b12c936019fe12269c7a356d60d0') +makedepends=('cmake' 'boost') +options=('!makeflags') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + build-fix.patch) +md5sums=('f962c93a2d63b449fa3f6612ade3b028' + '0aeb1bae724b5cae208ae8af95e8ed9b') build() { cd $srcdir/$pkgname-$pkgver - cmake -DCMAKE_INSTALL_PREFIX=/usr + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + patch -p1 <$srcdir/build-fix.patch + cmake . + cmake \ + -DCMAKE_CXX_FLAGS="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ + -DCMAKE_CXX_FLAGS_DEBUG="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ + -DCMAKE_CXX_FLAGS_RELEASE="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release . make make DESTDIR="$pkgdir" install } diff --git a/community/scantailor/build-fix.patch b/community/scantailor/build-fix.patch new file mode 100644 index 000000000..85b620020 --- /dev/null +++ b/community/scantailor/build-fix.patch @@ -0,0 +1,16 @@ +diff -wbBur scantailor-0.9.10/zones/EditableZoneSet.h scantailor-0.9.10.my/zones/EditableZoneSet.h +--- scantailor-0.9.10/zones/EditableZoneSet.h 2011-07-31 00:47:25.000000000 +0400 ++++ scantailor-0.9.10.my/zones/EditableZoneSet.h 2011-08-03 01:59:40.000000000 +0400 +@@ -76,6 +77,12 @@ + + EditableZoneSet(); + ++ EditableZoneSet(const EditableZoneSet& zs) ++ { ++ m_splineMap = zs.m_splineMap; ++ m_defaultProps = zs.m_defaultProps; ++ } ++ + const_iterator begin() const { return iterator(m_splineMap.begin()); } + + const_iterator end() const { return iterator(m_splineMap.end()); } diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD index cd6c2363a..a120b9f65 100644 --- a/community/scrotwm/PKGBUILD +++ b/community/scrotwm/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=scrotwm -pkgver=0.9.32 -pkgrel=2 +pkgver=0.9.33 +pkgrel=1 pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way." arch=('i686' 'x86_64') url="http://www.scrotwm.org" @@ -15,7 +15,7 @@ backup=(etc/scrotwm.conf) source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ LICENSE \ baraction.sh) -md5sums=('43053b82962f6629ffa487bfb1c3195d' +md5sums=('fcfd0aba8e48217e26db823226640547' 'a67cfe51079481e5b0eab1ad371379e3' '6132ba773ee00f39d8f67ac0347a9814') diff --git a/community/synce-librapi/PKGBUILD b/community/synce-librapi/PKGBUILD index 639321737..85a2e946f 100644 --- a/community/synce-librapi/PKGBUILD +++ b/community/synce-librapi/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 51603 2011-07-12 06:27:16Z spupykin $ +# $Id: PKGBUILD 53263 2011-08-02 15:19:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=synce-librapi pkgver=0.15.2 -pkgrel=1 +pkgrel=2 pkgdesc="provide a means of communication with a Windows CE device - libraries and tools for making remote calls to pocket pc" arch=('i686' 'x86_64') url="http://synce.sourceforge.net/" license=('GPL') -depends=('synce-libsynce' 'hal') +depends=('synce-libsynce') makedepends=('pyrex') source=(http://downloads.sourceforge.net/sourceforge/synce/librapi2-$pkgver.tar.gz) md5sums=('0a15bc22ee02794ca4714799611b4746') build() { cd $srcdir/librapi2-$pkgver - ./configure --prefix=/usr + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr --enable-udev-support --disable-hal-support make make DESTDIR=$pkgdir install } diff --git a/community/synce-rra/PKGBUILD b/community/synce-rra/PKGBUILD index dcc1e2f6b..0a305f882 100644 --- a/community/synce-rra/PKGBUILD +++ b/community/synce-rra/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 27254 2010-09-18 22:01:47Z schuay $ +# $Id: PKGBUILD 53286 2011-08-02 17:26:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=synce-rra pkgver=0.14 -pkgrel=3 +pkgrel=4 pkgdesc="provide a means of communication with a Windows CE device - rra libraries for synce" arch=('i686' 'x86_64') url="http://synce.sourceforge.net/" license=('GPL') depends=('glibc' 'synce-librapi' 'synce-libmimedir') makedepends=('python2' 'pyrex') -source=(http://downloads.sourceforge.net/synce/librra-$pkgver.tar.gz \ - build-fix.diff) -md5sums=('3a608174a3a476c96dd4dd4929448fe8' - '8c898d226653cbbb8b778aa0587d66aa') +source=(http://downloads.sourceforge.net/synce/librra-$pkgver.tar.gz) +md5sums=('3a608174a3a476c96dd4dd4929448fe8') build() { cd $srcdir/librra-$pkgver ./configure --prefix=/usr sed -i s/-Werror// lib/Makefile src/Makefile -# patch -p2 python/pyrra.pyx <../build-fix.diff make make DESTDIR=$pkgdir install } diff --git a/community/unifdef/PKGBUILD b/community/unifdef/PKGBUILD index 7f6fc1122..b25062afc 100644 --- a/community/unifdef/PKGBUILD +++ b/community/unifdef/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 1000 2009-08-11 09:12:57Z spupykin $ +# $Id: PKGBUILD 53255 2011-08-02 14:56:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=unifdef -pkgver=1.0 -pkgrel=2 +pkgver=2.6 +pkgrel=1 pkgdesc="Remove #ifdef'ed lines" arch=(i686 x86_64) -url="http://www.cs.cmu.edu/~ajw/public/dist/" +url="http://dotat.at/prog/unifdef/" license=('GPL') depends=() -source=(http://www.cs.cmu.edu/~ajw/public/dist/unifdef-$pkgver.tar.gz) -md5sums=('825240622f35c7b002f11ece1af4ba22') +source=("http://dotat.at/prog/unifdef/unifdef-$pkgver.tar.gz") +md5sums=('18b832baea2c7b6b00bd7d4f3db38f62') build() { - cd "$startdir/src/$pkgname-$pkgver" - + cd "$srcdir/$pkgname-$pkgver" make clean - make || return 1 - - mkdir -p $startdir/pkg/usr/bin $startdir/pkg/usr/share/man/man1 && \ - install -m 0755 unifdef $startdir/pkg/usr/bin/ && \ - install -m 0644 unifdef.1 $startdir/pkg/usr/share/man/man1/ + make + mkdir -p $pkgdir/usr/bin $startdir/pkg/usr/share/man/man1 + install -m 0755 unifdef $pkgdir/usr/bin/ + install -m 0644 unifdef.1 $pkgdir/usr/share/man/man1/ } diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index c2a39a992..23bfef4e6 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 42698 2011-03-19 21:23:28Z spupykin $ +# $Id: PKGBUILD 53311 2011-08-02 18:29:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=xlockmore pkgver=5.33 -pkgrel=1 +pkgrel=2 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64) license=('BSD') -depends=(freetype2 gtk2 libxpm lesstif pam mesa esound libxmu) +depends=(freetype2 gtk2 libxpm lesstif pam mesa libxmu) url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 \ @@ -18,15 +18,13 @@ md5sums=('8ae31d03f836e768cd888198c5f1a5f8' build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --disable-setuid \ - --enable-appdefaultdir=/usr/share/X11/app-defaults \ - --enable-pam --with-gtk2 --with-esound --without-ftgl + --enable-appdefaultdir=/usr/share/X11/app-defaults \ + --enable-pam --with-gtk2 --without-esound --without-ftgl make make xapploaddir=$pkgdir/usr/share/X11/app-defaults \ mandir=$pkgdir/usr/man/man1 \ prefix=$pkgdir/usr install - install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE mv $pkgdir/usr/man $pkgdir/usr/share/ } |