diff options
78 files changed, 2187 insertions, 663 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 6d13e9d8b..449f7d958 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' 'mips64el') @@ -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 6d0e9535f..7f536231d 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' 'mips64el') 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 96e5b4f2e..1c3a84895 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' 'mips64el') 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 64bc17274..0a19f823c 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' 'mips64el') 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 d83649895..f5e95e73d 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' 'mips64el') 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 cb8d48f99..d7c653ad9 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' 'mips64el') @@ -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 86047c4b2..1d295ea75 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 'mips64el') 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 0902d7d15..b8c8123c0 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' 'mips64el') 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 89bb0f9d3..aad00d2a7 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' 'mips64el') 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 70c4d0c3a..cdb7ee936 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 'mips64el') -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 d842e6199..1de99d190 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 'mips64el') 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/ } diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD index d473f397d..e768b82ca 100644 --- a/extra/alsaplayer/PKGBUILD +++ b/extra/alsaplayer/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 98445 2010-11-09 00:59:46Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 134328 2011-08-02 22:50:41Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=alsaplayer pkgver=0.99.81 -pkgrel=1 +pkgrel=2 pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsaplayer.org/" license=('GPL') -depends=('gcc-libs') -makedepends=('gtk2' 'libid3tag' 'libvorbis' 'libmad' 'libmikmod' 'jack' 'esound' 'mesa') +depends=('gcc-libs' 'desktop-file-utils') +makedepends=('gtk2' 'libid3tag' 'libvorbis' 'libmad' 'libmikmod' 'jack' 'mesa' 'audiofile' 'doxygen') optdepends=('gtk2: for the gtk2 GUI interface' \ 'libgl: for the OpenGL visual plugins' \ - 'esound: for ESD audio server output support' \ 'jack: for JACK audio server output support' \ 'audiofile: for support of various audio formats like AIFF, WAVE, .snd/.au' \ - 'libid3tag: for flac support' 'flac: for flac support' 'libmad: for MPEG support' \ - 'libsndfile: for sndfile support' 'libvorbis: for ogg vorbis support' \ + 'libid3tag: for flac support' \ + 'flac: for flac support' \ + 'libmad: for MPEG support' \ + 'libsndfile: for sndfile support' \ + 'libvorbis: for ogg vorbis support' \ 'libmikmod: for mod, s3m, it and xm formats supports') options=('!libtool') +install=alsaplayer.install source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2) md5sums=('845c53975791ba342e316ceac8aa1527') sha1sums=('25817ebd1e5c36da31a88363315a1bf7a945ddfd') diff --git a/extra/alsaplayer/alsaplayer.install b/extra/alsaplayer/alsaplayer.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/extra/alsaplayer/alsaplayer.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index 9fd24d47b..dda460dab 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 127810 2011-06-18 16:08:40Z ibiru $ +# $Id: PKGBUILD 134343 2011-08-03 00:13:58Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.5 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" -makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'esound' 'libvorbis' 'sdl' 'libxv' \ +makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse') source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz @@ -34,9 +34,9 @@ build() { cd ../../plugins mkdir build cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR=${srcdir}/avidemux_${pkgver} \ - -D AVIDEMUX_CORECONFIG_DIR=${srcdir}/avidemux_${pkgver}/build/config \ - -D AVIDEMUX_INSTALL_PREFIX=${srcdir}/avidemux_${pkgver}/build \ + cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \ + -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \ + -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \ -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON .. make } @@ -48,7 +48,6 @@ package_avidemux-cli() { 'faac: for the corresponding audio encoder plugin' 'faad2: for the corresponding audio decoder plugin' 'opencore-amr: for the corresponding audio decoder plugin' - 'esound: for the corresponding audio device plugin' 'jack: for the corresponding audio device plugin' 'libpulse: for the corresponding audio device plugin' 'sdl: for the corresponding audio device plugin' diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 4966c18bd..58b6ea22d 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 133458 2011-07-28 09:24:50Z jgc $ +# $Id: PKGBUILD 134142 2011-08-02 09:11:04Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.4.7 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" @@ -13,11 +13,13 @@ makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-avahi.patch cups-no-export-ssllibs.patch + cups-no-gcrypt.patch cups cups.logrotate cups.pam) #options=('!emptydirs') md5sums=('1590033ab4c739b859aeb672fe849089' '8ebd390197501ffd709f0ee546937fd5' '9b8467a1e51d360096b70e2c3c081e6c' + 'c9ede95cfc8e76571bd8156f0a573e3b' '9657daa21760bb0b5fa3d8b51d5e01a1' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17') @@ -31,6 +33,8 @@ build() { # Do not export SSL libs in cups-config patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch" + + patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch" # Rebuild configure script for --enable-avahi. aclocal -I config-scripts diff --git a/extra/cups/cups-no-gcrypt.patch b/extra/cups/cups-no-gcrypt.patch new file mode 100644 index 000000000..203b4f4ac --- /dev/null +++ b/extra/cups/cups-no-gcrypt.patch @@ -0,0 +1,39 @@ +diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4 +--- cups-1.4.7.orig//config-scripts/cups-ssl.m4 2011-01-11 08:05:58.000000000 +0100 ++++ cups-1.4.7/config-scripts/cups-ssl.m4 2011-08-02 10:44:26.011047900 +0200 +@@ -74,7 +74,6 @@ + dnl Then look for GNU TLS... + if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then + AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config) +- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config) + if $PKGCONFIG --exists gnutls; then + if test "x$have_pthread" = xyes; then + AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.]) +@@ -96,16 +95,6 @@ + AC_DEFINE(HAVE_GNUTLS) + fi + fi +- +- if test $have_ssl = 1; then +- if $PKGCONFIG --exists gcrypt; then +- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`" +- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`" +- elif test "x$LIBGCRYPTCONFIG" != x; then +- SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`" +- SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`" +- fi +- fi + fi + + dnl Check for the OpenSSL library last... +diff -ruN cups-1.4.7.orig//cups/http-private.h cups-1.4.7/cups/http-private.h +--- cups-1.4.7.orig//cups/http-private.h 2011-01-22 01:07:22.000000000 +0100 ++++ cups-1.4.7/cups/http-private.h 2011-08-02 10:42:43.341604107 +0200 +@@ -98,7 +98,6 @@ + * The GNU TLS library is more of a "bare metal" SSL/TLS library... + */ + # include <gnutls/gnutls.h> +-# include <gcrypt.h> + + typedef struct + { diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD index be395e27d..106c472b8 100644 --- a/extra/enlightenment/PKGBUILD +++ b/extra/enlightenment/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 120890 2011-04-27 03:29:01Z eric $ +# $Id: PKGBUILD 134356 2011-08-03 02:27:18Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=enlightenment -pkgver=1.0.8 +pkgver=1.0.9 _themever=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A fast, flexible, and very extensible Window Manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" license=('BSD' 'custom') -depends=('libxinerama' 'libxft' 'libxxf86vm' 'esound' 'imlib2' 'perl' \ - 'libxcomposite' 'libxdamage' 'libxrandr') -makedepends=('xbitmaps') +depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \ + 'libxdamage' 'libxrandr' 'libpulse' 'audiofile') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \ http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz) -md5sums=('bf2cf452ea838ebb0c68205215817ecf' +md5sums=('ad85044366efe64cb67f4a8e49a37f84' 'bbd9cfd969610c29c7627c2ba1ce3094') -sha1sums=('1ff5cfce00c67c866280de9824f0662953b9c552' +sha1sums=('97929090b5d66fa28067b21b17f48cedea1f81bb' 'ae34e2df1294198795736bf953bf695aba93b710') build() { cd "${srcdir}/e16-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --enable-sound --enable-mans + ./configure --prefix=/usr --sysconfdir=/etc --enable-sound-pulse make cd "${srcdir}/e16-themes-${_themever}" diff --git a/extra/epplet-base/PKGBUILD b/extra/epplet-base/PKGBUILD index 490ec2db3..33af3327e 100644 --- a/extra/epplet-base/PKGBUILD +++ b/extra/epplet-base/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 79809 2010-05-08 05:03:22Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# $Id: PKGBUILD 134351 2011-08-03 02:24:23Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=epplet-base pkgver=0.13 -pkgrel=1 +pkgrel=2 pkgdesc="Addon plugins for the enlightenment windowmanager" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" license=('GPL') -depends=('esound' 'imlib2' 'libcdaudio' 'libgl') +depends=('imlib2' 'libcdaudio' 'libgl') makedepends=('mesa') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/enlightenment/epplets-${pkgver}.tar.gz) @@ -18,11 +17,11 @@ sha1sums=('8af41829e5993a992c31f6285122edce6b60475a') build() { cd "${srcdir}/epplets-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make } package() { cd "${srcdir}/epplets-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } diff --git a/extra/genius/PKGBUILD b/extra/genius/PKGBUILD index d3f5c4a39..0eb84efd5 100644 --- a/extra/genius/PKGBUILD +++ b/extra/genius/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100391 2010-11-23 05:28:18Z heftig $ +# $Id: PKGBUILD 134294 2011-08-02 19:07:41Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soulfly.nl> pkgname=genius -pkgver=1.0.12 +pkgver=1.0.14 pkgrel=1 pkgdesc="Advanced calculator including a mathematical programming language" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('vte>=0.26.2' 'gtksourceview2>=2.10.5' 'mpfr>=3.0.0' 'desktop-file-util makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.0') options=('!libtool' '!makeflags') install=genius.install -source=(http://ftp.gnome.org/pub/GNOME/sources/genius/1.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e94f92474140d1549f44cd84a09e62760f4e0e6af555c565559d132556f5fde4') +source=(http://ftp.gnome.org/pub/GNOME/sources/genius/1.0/${pkgname}-${pkgver}.tar.xz) +sha256sums=('90ed181e6bb0b4a8a5adcad1eb8273c55685345e7f322b3591b59be02e41bb5f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ggv/PKGBUILD b/extra/ggv/PKGBUILD index 5d9dd9474..6a85287d8 100644 --- a/extra/ggv/PKGBUILD +++ b/extra/ggv/PKGBUILD @@ -1,28 +1,31 @@ -# $Id: PKGBUILD 40229 2009-05-28 22:48:30Z jgc $ +# $Id: PKGBUILD 134236 2011-08-02 16:46:54Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=ggv pkgver=2.12.0 -pkgrel=3 +pkgrel=4 pkgdesc="Postscript viewer" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('libgnomeui>=2.14.1' 'ghostscript' 'desktop-file-utils') -makedepends=('intltool' 'gnome-doc-utils' 'pkgconfig') +depends=('libgnomeui' 'ghostscript' 'desktop-file-utils') +makedepends=('intltool' 'gnome-doc-utils' 'pkgconfig' 'gnome-common') url="http://www.gnome.org" install=ggv.install +options=('!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/ggv/2.12/ggv-${pkgver}.tar.bz2) md5sums=('418f0ef3f8b82bb0c423a2a1cf6769f7') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed '/AC_PATH_XTRA/d' -i configure.in + intltoolize --force + autoreconf --force --install ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/ggv \ - --localstatedir=/var || return 1 - make || return 1 - make GCONF_DISABLE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + --libexecdir=/usr/lib/ggv \ + --localstatedir=/var + make + make GCONF_DISABLE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas --domain ggv ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas --domain ggv ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas - } diff --git a/extra/gstreamer0.10/PKGBUILD b/extra/gstreamer0.10/PKGBUILD index 8a6739537..e7498d2be 100644 --- a/extra/gstreamer0.10/PKGBUILD +++ b/extra/gstreamer0.10/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 124024 2011-05-16 07:21:10Z jgc $ +# $Id: PKGBUILD 134230 2011-08-02 16:10:38Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10 -pkgver=0.10.34 +pkgver=0.10.35 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') options=('!libtool') source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.bz2) -sha256sums=('85348f70dc4b70ad1beb05c9a59a64175c5058f4ee5273f89230a3c1d11b26a3') +sha256sums=('817bfea2cd46e2487b97e2ed9218f0299b32a3de1e5e80b4c7868d17e9089786') build() { cd "${srcdir}/gstreamer-${pkgver}" @@ -24,6 +24,11 @@ build() { make } +check() { + cd "${srcdir}/gstreamer-${pkgver}" + make check +} + package() { cd "${srcdir}/gstreamer-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 90ae73837..7a3a36e81 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 127882 2011-06-19 07:39:12Z ibiru $ +# $Id: PKGBUILD 134153 2011-08-02 11:48:33Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') pkgver=2.24.5 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" -makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' +makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') options=('!libtool' '!docs') license=('LGPL') @@ -27,12 +27,16 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --with-xinput=yes + + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } package_gtk2() { pkgdesc="The GTK+ Toolkit (v2)" install=gtk2.install - depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') + depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') backup=(etc/gtk-2.0/gtkrc) cd "${srcdir}/gtk+-${pkgver}" diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 3295a94db..ffa168329 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 126728 2011-06-06 21:19:26Z ibiru $ +# $Id: PKGBUILD 134152 2011-08-02 11:46:44Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.0.11 +pkgver=3.0.12 pkgrel=1 pkgdesc="The GTK+ Toolkit (v3)" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" install=gtk3.install -depends=('atk' 'cairo' 'gtk-update-icon-cache' 'gnutls' 'krb5' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info') +depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info') makedepends=('gobject-introspection') options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.xz settings.ini) -sha256sums=('e2e38b316c4657df0cf376c3b6aad63158a9068c557ad41033a677f29967001b' +sha256sums=('219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { @@ -25,6 +25,8 @@ build() { --localstatedir=/var \ --enable-gtk2-dependency \ --disable-schemas-compile + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } diff --git a/extra/gtkglext/PKGBUILD b/extra/gtkglext/PKGBUILD index 3742f0745..25b17a369 100644 --- a/extra/gtkglext/PKGBUILD +++ b/extra/gtkglext/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 78325 2010-04-20 22:14:28Z ibiru $ +# $Id: PKGBUILD 134243 2011-08-02 17:13:55Z jgc $ # Maintainer: damir <damir@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gtkglext pkgver=1.2.0 -pkgrel=5 +pkgrel=6 pkgdesc="opengl extensions for gtk2" arch=('i686' 'x86_64' 'mips64el') url="http://gtkglext.sourceforge.net/" license=('LGPL') depends=('gtk2' 'mesa' 'libxmu') -makedepends=('gcc') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" gtk2.20.patch) @@ -18,10 +17,11 @@ md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4' 'e5a87ec3f2d0e616c6f32f90c3f7237f') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/gtk2.20.patch || return 1 - autoconf --force || return 1 - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/gtk2.20.patch" + sed '/AC_PATH_XTRA/d' -i configure.in + autoreconf --force --install + ./configure --prefix=/usr --disable-static + make + make DESTDIR="${pkgdir}" install } diff --git a/extra/gtkglextmm/PKGBUILD b/extra/gtkglextmm/PKGBUILD index 15e0b3a4a..e29ba745b 100644 --- a/extra/gtkglextmm/PKGBUILD +++ b/extra/gtkglextmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 128291 2011-06-22 14:49:45Z giovanni $ +# $Id: PKGBUILD 134258 2011-08-02 17:37:45Z jgc $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Bastien Bouclet <bastien.bouclet@gmail.com> pkgname=gtkglextmm pkgver=1.2.0 -pkgrel=5 +pkgrel=6 pkgdesc="Cpp C++ bindings for gtkglext" arch=('i686' 'x86_64' 'mips64el') url="http://gtkglext.sourceforge.net/" @@ -18,18 +18,18 @@ md5sums=('27c05f4d45c5fd07b6fb0f044add3056' 'd7c8ea33c748a6857ee629c16b2d9bff') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # FS#24706 - patch -Np1 -i ${srcdir}/gdkspanfunc.patch + patch -Np1 -i "${srcdir}/gdkspanfunc.patch" ./configure --prefix=/usr \ - --disable-gtkglext-test + --disable-gtkglext-test --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD index d5ddcce1f..83746ce4f 100644 --- a/extra/imlib/PKGBUILD +++ b/extra/imlib/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 64376 2010-01-20 03:40:51Z eric $ +# $Id: PKGBUILD 134264 2011-08-02 18:15:21Z jgc $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=imlib pkgver=1.9.15 -pkgrel=9 +pkgrel=10 pkgdesc="General image handling library for X11 and Gtk" arch=('i686' 'x86_64' 'mips64el') url="http://freshmeat.net/projects/imlib/" license=('GPL') -depends=('gtk' 'giflib' 'libpng>=1.4.0' 'libtiff>=3.9.2-2' 'libjpeg>=8' 'libsm') +depends=('gtk' 'giflib' 'libpng>=1.4.0' 'libtiff>=3.9.2-2' 'libjpeg>=8') makedepends=('libxt') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2 @@ -23,11 +23,16 @@ sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' 'fe2fd9ce4d7bc62271e724153d build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/debian-bug448360.patch" || return 1 - patch -Np1 -i "${srcdir}/CAN-2004-1026.patch" || return 1 - patch -Np0 -i "${srcdir}/aclocal-fixes.patch" || return 1 - patch -Np1 -i "${srcdir}/libpng14.patch" || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + patch -Np1 -i "${srcdir}/debian-bug448360.patch" + patch -Np1 -i "${srcdir}/CAN-2004-1026.patch" + patch -Np0 -i "${srcdir}/aclocal-fixes.patch" + patch -Np1 -i "${srcdir}/libpng14.patch" + sed '/AC_PATH_XTRA/d' -i configure.in + libtoolize --force + cp /usr/bin/libtool . + autoreconf --force --install + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm --disable-static + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make + make DESTDIR="${pkgdir}" install } diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 519a8d9a0..d2ec16e9a 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 132583 2011-07-25 00:12:54Z andrea $ +# $Id: PKGBUILD 134137 2011-08-02 08:56:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble pkgver=4.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'gpsd') -makedepends=('cmake' 'automoc4') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4' 'gpsd') +optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2" 'gpsd-2.96.patch') diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index d26474129..7523955ae 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 119196 2011-04-11 09:50:01Z jgc $ +# $Id: PKGBUILD 130679 2011-07-07 17:20:06Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.25 +pkgver=2.4.26 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') license=('custom') -depends=('glibc') +depends=('glibc' 'libpciaccess') options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch COPYING) -sha1sums=('b950f29cd1c4bb9f1c98a926486a47256b0a4194' - 'af2d9871565ea4cf524873f897691a18b2bba944' - 'ba3dcd636997ee0d30df14b03dae05c24ae5d094') +md5sums=('062569426773f69b11a47a7712bba770' + 'c722c8406507b7e3a8da7a3030d1d9cf' + 'ba65e71c481b94ef0fb6c23c7f21ffa1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch index 6602f8785..348c2a795 100644 --- a/extra/libdrm/no-pthread-stubs.patch +++ b/extra/libdrm/no-pthread-stubs.patch @@ -1,34 +1,35 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac --- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 +++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 -@@ -32,10 +32,6 @@ - AC_HEADER_STDC - AC_SYS_LARGEFILE +@@ -47,10 +47,6 @@ + LT_INIT([disable-static]) + -PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) -AC_SUBST(PTHREADSTUBS_CFLAGS) -AC_SUBST(PTHREADSTUBS_LIBS) - - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev], + PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) + AC_SUBST(PCIACCESS_CFLAGS) + AC_SUBST(PCIACCESS_LIBS) --- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 -@@ -26,13 +26,12 @@ +@@ -26,14 +26,13 @@ $(WARN_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/intel \ - $(PTHREADSTUBS_CFLAGS) \ + $(PCIACCESS_CFLAGS) \ -I$(top_srcdir)/include/drm libdrm_intel_la_LTLIBRARIES = libdrm_intel.la libdrm_intel_ladir = $(libdir) libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@ -+libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@ +-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@ ++libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@ libdrm_intel_la_SOURCES = \ - intel_atomic.h \ + intel_bufmgr.c \ --- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000 @@ -26,13 +26,12 @@ diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD index 18556eefb..f88c65b64 100644 --- a/extra/libgpod/PKGBUILD +++ b/extra/libgpod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 117411 2011-04-01 17:02:09Z ibiru $ +# $Id: PKGBUILD 134225 2011-08-02 15:30:18Z jgc $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libgpod -pkgver=0.8.0 -pkgrel=2 +pkgver=0.8.2 +pkgrel=1 pkgdesc="A shared library to access the contents of an iPod" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -12,9 +12,9 @@ depends=('gtk2' 'mutagen' 'sg3_utils' 'libimobiledevice') makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject-devel' 'gtk-sharp-2') optdepends=('gtk-sharp-2: Mono bindings') url="http://www.gtkpod.org/libgpod/" -source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2) options=('!libtool' '!emptydirs') -md5sums=('6660f74cc53293dcc847407aa5f672ce') +md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libmms/PKGBUILD b/extra/libmms/PKGBUILD index 05ce88338..322a4fdd5 100644 --- a/extra/libmms/PKGBUILD +++ b/extra/libmms/PKGBUILD @@ -1,24 +1,25 @@ -#$Id: PKGBUILD 81998 2010-06-07 14:12:43Z jgc $ +#$Id: PKGBUILD 134220 2011-08-02 15:22:22Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libmms -pkgver=0.6 +pkgver=0.6.2 pkgrel=1 pkgdesc="MMS stream protocol library" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/libmms/" license=(LGPL) -depends=('glib2>=2.24.1') +depends=('glib2') options=('!libtool') -source=(http://download.sourceforge.net/libmms/${pkgname}-${pkgver}.tar.gz - libmms-0.5-this-keyword.patch) -md5sums=('650ad04a4c8bd79246390b81b29680b6' - '5266259060f5723d8ee639b8a541f835') +source=(http://download.sourceforge.net/libmms/${pkgname}-${pkgver}.tar.gz) +md5sums=('9f63aa363deb4874e072a45850161bff') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/libmms-0.5-this-keyword.patch" || return 1 - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libmpeg2/PKGBUILD b/extra/libmpeg2/PKGBUILD index 81db4f23d..04a3e41d3 100644 --- a/extra/libmpeg2/PKGBUILD +++ b/extra/libmpeg2/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 8676 2008-08-15 11:02:53Z andyrtr $ +# $Id: PKGBUILD 134269 2011-08-02 18:27:34Z jgc $ # Contributor: Sarah Hay <sarah@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libmpeg2 pkgver=0.5.1 -pkgrel=1 -pkgdesc="libmpeg2 is a library for decoding MPEG-1 and MPEG-2 video streams." +pkgrel=2 +pkgdesc="Library for decoding MPEG-1 and MPEG-2 video streams." arch=('i686' 'x86_64' 'mips64el') url="http://libmpeg2.sourceforge.net/" depends=('glibc') +makedepends=('sdl' 'libxv') optdepends=('sdl: requiered for mpeg2dec' - 'libsm: requiered for mpeg2dec' 'libxv: requiered for mpeg2dec') source=(http://libmpeg2.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz) license=('GPL2') @@ -19,10 +19,13 @@ provides=('mpeg2dec') md5sums=('0f92c7454e58379b4a5a378485bbd8ef') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-shared --disable-static || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + sed '/AC_PATH_XTRA/d' -i configure.ac + autoreconf --force --install + + ./configure --prefix=/usr --enable-shared --disable-static make OPT_CFLAGS="${CFLAGS}" \ MPEG2DEC_CFLAGS="${CFLAGS}" \ - LIBMPEG2_CFLAGS="" || return 1 - make DESTDIR=${pkgdir} install || return 1 + LIBMPEG2_CFLAGS="" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 9dc386211..96155e9b3 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,8 +1,19 @@ -# $Id: PKGBUILD 130669 2011-07-07 16:34:03Z andyrtr $ +# $Id: PKGBUILD 134107 2011-08-01 16:13:27Z stephane $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" -pkgname=('libreoffice' 'libreoffice-sdk' +pkgname=('libreoffice-common' + 'libreoffice-base' + 'libreoffice-calc' + 'libreoffice-draw' + 'libreoffice-gnome' + 'libreoffice-impress' + 'libreoffice-kde4' + 'libreoffice-math' + 'libreoffice-sdk' + 'libreoffice-sdk-doc' + 'libreoffice-writer' + 'libreoffice-en-US' #'libreoffice-extension-barcode' # 'libreoffice-extension-diagram' 'libreoffice-extension-google-docs' @@ -24,9 +35,9 @@ pkgname=('libreoffice' 'libreoffice-sdk' 'libreoffice-extension-validator' 'libreoffice-extension-watch-window' 'libreoffice-extension-wiki-publisher') -_LOver=3.4.1.3 -pkgver=3.4.1 -pkgrel=2 +_LOver=3.4.2.3 +pkgver=3.4.2 +pkgrel=1 arch=('i686' 'x86_64') #_LO_tree="3.4" _OFFICEUPD="340" @@ -48,7 +59,7 @@ makedepends=( # makedepends # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors _mirror="http://download.documentfoundation.org/libreoffice/src" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src/" +#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://hg.services.openoffice.org/binaries" source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -74,14 +85,14 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - http://download.go-oo.org/src/7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 + http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt + http://ooo.itc.hu/oxygenoffice/download/libreoffice/451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt @@ -92,10 +103,10 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions buildfix_boost.diff buildfix_ct2n.diff vbahelper.visibility.patch - 0001-fix-configure-without-the-optional-translations-modu.patch) + scp2-more-reasonable-file-access-rights.diff) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 - 7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 + 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -131,67 +142,69 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) -md5sums=('10b3212002688e7ce49a276c68352b50' - 'c6547ec8f971284ea1e58bb39375c500' - '26328364a0804dedab94818c15e76871' - 'd26c6ab53c9404e82e04ea366d4db261' - '132aa87f2f3e7fff62d7211a86b769f3' - '801c254c28402df0c5fb5e2615817a6d' - 'b94208fdae537f0b026ee26cede9a946' - '096e3071949d1eedf73faa13a2cf7b7e' - 'e27e715b08cc6a35988aaa6efab6cc7f' - 'e94d7adb79f38d3fd8119b712b04cc6e' - '1d2e7ca24b9fffafeaf236817fc8cbe9' - '69a9af6536607340a57b54b5562077f7' - '3b4e819497ba695f5c64a0107c2aac8d' - '5a7370a79e563f649f6bf506bc71928c' - 'c480ed571703e68d851fbbcd4aa520be' - '222cec135152c108068baa4e370a3f68' - '93524298efb472503b12ae47c95de399' - '5420c40473f8bf8e5b400dd8a1e54f02' - '1516196f023bb1ae55fd1773a8db9d16' - '1f24ab1d39f4a51faf22244c94a6203f' - '35c94d2df8893241173de1d16b6034c0' - '798b2ffdc8bcfe7bca2cf92b62caf685' - 'fdb27bfe2dbe2e7b57ae194d9bf36bab' - 'ada24d37d8d638b3d8a9985e80bc2978' - '2a177023f9ea8ec8bd00837605c5df1b' - 'a7983f859eafb2677d7ff386a023bc40' - '3c219630e4302863a9a83d0efde889db' - '2ae988b339daec234019a7066f96733e' - '2c9b0f83ed5890af02c0df1c1776f39b' - 'af3c3acf618de6108d65fcdc92b492e1' - 'eeb2c7ddf0d302fba4bfc6e97eac9624' - '39bb3fcea1514f1369fcfc87542390fd' - '3404ab6b1792ae5f16bbd603bd1e1d03' - '97b2d4dba862397f446b217e2b623e71' - 'f94d9870737518e3b597f9265f4e9803' - '8ce2fcd72becf06c41f7201d15373ed9' - 'd8bd5eed178db6e2b18eeed243f85aa8' - '3bdf40c0d199af31923e900d082ca2dd' - 'ace6ab49184e329db254e454a010f56d' - 'db60e4fde8dd6d6807523deb71ee34dc' - 'ba2930200c9f019c2d93a8c88c651a0f' - '18f577b374d60b3c760a3a3350407632' - '7a0dcb3fe1e8c7229ab4fb868b7325e6' - '185d60944ea767075d27247c3162b3bc' - 'b4cae0700aa1c2aef7eb7f345365e6f1' - '90401bca927835b6fbae4a707ed187c8' - 'f02578f5218f217a9f20e9c30e119c6a' - '7e7efc5d4a03126bb9ae3ae9aa2c4e87' - '41c9b65ad60af4b3255bbecdfef11736' - '451ccf439a36a568653b024534669971' - 'bbdd5639ada63e3130761daaecae1a10' - '23bd75552206dfcd8fd4e29137dcac84' - 'b8cbca7b3363e6ca2d02bc0ba2b63904' - 'b632bdd25649cc4067bcb410bae23d2b' - '9d60b6cfa3ef1926848710bbcd11115b' - 'dbaafd21de055e582d92d7d32fe9da13' - 'b7b2d0e04e142f26dd96119c80757d1f' - 'bc228237108cab7745897a9f466b6d39' - 'eee273f501ff45dc5f1365e78c6d57c0' - '43b145db28e6c0d73578ae6fd35e510d' - 'f8a8fdcc58f50560fbc266e28efdbbfe') + +md5sums=('1600ebf998ec7075bd0e96e7a49513dc' #libreoffice-artwork-3.4.2.3.tar.bz2 + '0e12b4a03d14645dac1f073eb2f67423' #libreoffice-base-3.4.2.3.tar.bz2 + 'f106511220a2a0b2a45571cf7605953a' #libreoffice-bootstrap-3.4.2.3.tar.bz2 + '20854b5961b8b0b38219376a93ecf362' #libreoffice-calc-3.4.2.3.tar.bz2 + '5799be1571289b7c17bd8fd2020c00f6' #libreoffice-components-3.4.2.3.tar.bz2 + '75ca9da214abe072e37fb4d19fc2c34f' #libreoffice-extensions-3.4.2.3.tar.bz2 + '73aa766053ea8f4c84dd0a76c0888f18' #libreoffice-extras-3.4.2.3.tar.bz2 + '4416cc18cfa84f61eae905ff441a18d0' #libreoffice-filters-3.4.2.3.tar.bz2 + 'ecfd57a3dfd0ce230e5837b5099a0d5a' #libreoffice-help-3.4.2.3.tar.bz2 + '40e23531e95617c7fe91e7025f007a91' #libreoffice-impress-3.4.2.3.tar.bz2 + 'bd2027fc2160798728e49d0fd331d163' #libreoffice-libs-core-3.4.2.3.tar.bz2 + '9a948012496fcd27c31f755314ff98e3' #libreoffice-libs-extern-3.4.2.3.tar.bz2 + 'a5a8d9080492968eef001314093cd82d' #libreoffice-libs-extern-sys-3.4.2.3.tar.bz2 + '810aa9e69b96af0f4de2e6d74b7b1847' #libreoffice-libs-gui-3.4.2.3.tar.bz2 + '45de04dcbb6f6ff7474110ee982da7b8' #libreoffice-postprocess-3.4.2.3.tar.bz2 + '545d65e92b674d354dd6511ee552d23f' #libreoffice-sdk-3.4.2.3.tar.bz2 + '99e306957e38ce5e68deed9568874be6' #libreoffice-testing-3.4.2.3.tar.bz2 + '2e7277588ef610b7a06953c59dc77c9b' #libreoffice-ure-3.4.2.3.tar.bz2 + '281973e517d3b5626f5eedd746378fcc' #libreoffice-writer-3.4.2.3.tar.bz2 + '1f24ab1d39f4a51faf22244c94a6203f' #1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + '35c94d2df8893241173de1d16b6034c0' #35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + '798b2ffdc8bcfe7bca2cf92b62caf685' #798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + 'fdb27bfe2dbe2e7b57ae194d9bf36bab' #fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz + 'ada24d37d8d638b3d8a9985e80bc2978' #ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip + '2a177023f9ea8ec8bd00837605c5df1b' #2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + 'a7983f859eafb2677d7ff386a023bc40' #a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + '3c219630e4302863a9a83d0efde889db' #3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + '2ae988b339daec234019a7066f96733e' #2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + '2c9b0f83ed5890af02c0df1c1776f39b' #2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + 'af3c3acf618de6108d65fcdc92b492e1' #af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz + 'eeb2c7ddf0d302fba4bfc6e97eac9624' #eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + '39bb3fcea1514f1369fcfc87542390fd' #39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + '3404ab6b1792ae5f16bbd603bd1e1d03' #3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + '97b2d4dba862397f446b217e2b623e71' #97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + 'f94d9870737518e3b597f9265f4e9803' #f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + '8ce2fcd72becf06c41f7201d15373ed9' #8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + 'd8bd5eed178db6e2b18eeed243f85aa8' #d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + '3bdf40c0d199af31923e900d082ca2dd' #3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + 'ace6ab49184e329db254e454a010f56d' #ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + 'db60e4fde8dd6d6807523deb71ee34dc' #db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + 'ba2930200c9f019c2d93a8c88c651a0f' #ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + '18f577b374d60b3c760a3a3350407632' #18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + '0ff7d225d087793c8c2c680d77aac3e7' #0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 + '185d60944ea767075d27247c3162b3bc' #185d60944ea767075d27247c3162b3bc-unowinreg.dll + 'b4cae0700aa1c2aef7eb7f345365e6f1' #b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 + '90401bca927835b6fbae4a707ed187c8' #90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 + 'f02578f5218f217a9f20e9c30e119c6a' #f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + '7e7efc5d4a03126bb9ae3ae9aa2c4e87' #7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt + '41c9b65ad60af4b3255bbecdfef11736' #41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt + '451ccf439a36a568653b024534669971' #451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt + 'bbdd5639ada63e3130761daaecae1a10' #bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt + '23bd75552206dfcd8fd4e29137dcac84' #23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt + 'b8cbca7b3363e6ca2d02bc0ba2b63904' #b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt + 'b632bdd25649cc4067bcb410bae23d2b' #b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt + '9d60b6cfa3ef1926848710bbcd11115b' #9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt + 'dbaafd21de055e582d92d7d32fe9da13' #dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt + 'b7b2d0e04e142f26dd96119c80757d1f' #b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt + 'bc228237108cab7745897a9f466b6d39' #buildfix_boost.diff + 'eee273f501ff45dc5f1365e78c6d57c0' #buildfix_ct2n.diff + '43b145db28e6c0d73578ae6fd35e510d' #vbahelper.visibility.patch + '37638431e7e40baf2e47966ebb9bc0e9' #scp2-more-reasonable-file-access-rights.diff + ) build() { @@ -205,6 +218,8 @@ build() { for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations mv ${srcdir}/$i/* . done +# mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* . +# ./bin/unpack-sources ${srcdir}/build # move external sources into place mkdir ${srcdir}/ext_sources && cd ${srcdir}/ext_sources @@ -218,8 +233,11 @@ build() { patch -Np1 -i ${srcdir}/buildfix_boost.diff patch -Np1 -i ${srcdir}/buildfix_ct2n.diff patch -Np0 -i ${srcdir}/vbahelper.visibility.patch - patch -Np1 -i ${srcdir}/0001-fix-configure-without-the-optional-translations-modu.patch + patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff + # Temporary workaround to avoid build failure in ct2n + mv ${srcdir}/451ccf439a36a568653b024534669971-ConvertTextToNumber{_,-}1.3.2.oxt + # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 # unset CFLAGS @@ -246,18 +264,20 @@ build() { # sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1 # fi -# autoconf -v -f + # needed for 0003-distro-install-fix-en-US-only-installation.patch + autoconf -v -f # non-SMP test build # export MAKEFLAGS="-j1" ./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ --with-unix-wrapper="libreoffice" \ + --enable-split-app-modules \ --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ --with-external-tar="${srcdir}/ext_sources" \ --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ --with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \ - --with-lang="" \ --disable-verbose \ + --with-lang="" \ --enable-cairo\ --enable-crashdump \ --enable-dbus \ @@ -326,6 +346,8 @@ build() { --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ $EXTRAOPTS || return 1 +#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool + #--with-system-graphite --enable-graohite ? #--with-servlet-api-jar=JARFILE # see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 @@ -337,6 +359,10 @@ build() { unset MAKEFLAGS ./bootstrap make + + # fake installation to create split file lists + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall distro-pack-install } #check() { @@ -344,23 +370,23 @@ build() { # make check #} -package_libreoffice() { +package_libreoffice-common() { - pkgdesc="a productivity suite that is compatible with other major office suites" + pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=${pkgbase}.install - depends=("curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' - 'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' + depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6" + 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2') # keep gtk2 for install script #'java-runtime' #'saxon' - optdepends=('java-runtime: adds java support' + optdepends=('libreoffice-langpack: additional language support' + 'java-runtime: adds java support' 'libcups: adds printing support' 'gconf: adds additional gnome support' 'nss: adds support for signed files/macros' 'pstoedit: translates PostScript and PDF graphics into other vector formats' 'poppler: for shipped pdfimport extension' - 'kdelibs: for kde integration' 'libmythes: for use in thesaurus' 'hsqldb-java: default database format for OpenOffice.org' 'beanshell: interactive java -- good for prototyping /macros' @@ -371,121 +397,302 @@ package_libreoffice() { 'lucene: full-text search engine library for Java needed in the help section' 'sane: for scanner access' 'unixodbc: adds ODBC database support' - 'mesa: for the OGLTrans extension' 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc etc/libreoffice/psprint.conf) - provides=('go-openoffice') + groups=('libreoffice') + provides=('go-openoffice' 'libreoffice') conflicts=('go-openoffice') - replaces=('go-openoffice' 'openoffice-base' ) + replaces=('go-openoffice' 'openoffice-base' 'libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/common_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # # remove version in menu entry and make it visible +# sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop +# echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop + + # put configuration files into place + install -dm755 ${pkgdir}/etc/libreoffice + install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ + # install dummy links to make them found by LibO + cd ${pkgdir}/usr/lib/libreoffice/program/ + ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . + cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/ + ln -vsf /etc/libreoffice/psprint.conf . + + #fix http://bugs.archlinux.org/task/17656 + find ${pkgdir} -perm 444 -exec ls -lh {} \; + find ${pkgdir} -perm 444 -exec chmod 644 {} \; + find ${pkgdir} -perm 555 -exec ls -lh {} \; + find ${pkgdir} -perm 555 -exec chmod 755 {} \; +} - cd ${srcdir}/build - make DESTDIR=${pkgdir} install - - # fix missing desktop integration - install -dm755 ${pkgdir}/usr/bin - pushd ${pkgdir}/usr/bin - ln -vs /usr/lib/libreoffice/program/soffice ./libreoffice - ln -vs /usr/lib/libreoffice/program/soffice ./soffice - ln -vs /usr/lib/libreoffice/program/sbase ./lobase - ln -vs /usr/lib/libreoffice/program/scalc ./localc - ln -vs /usr/lib/libreoffice/program/sdraw ./lodraw - ln -vs /usr/lib/libreoffice/program/simpress ./loimpress - ln -vs /usr/lib/libreoffice/program/smath ./lomath - ln -vs /usr/lib/libreoffice/program/swriter ./lowriter - ln -vs /usr/lib/libreoffice/program/unopkg ./unopkg - popd - - # move sysui desktop files into place we want to use - javafilter and qstarter, but not unneeded printeradmin - install -dm755 ${pkgdir}/usr/share/{applications,icons,mime/packages,pixmaps} - rm ${pkgdir}/usr/lib/libreoffice/share/xdg/printeradmin.desktop - for i in base calc draw impress javafilter math qstart startcenter writer; do - cp ${pkgdir}/usr/lib/libreoffice/share/xdg/$i.desktop ${pkgdir}/usr/share/applications/libreoffice-$i.desktop - done - # remove version in menu entry and make it visible - sed -i -e "s/3.4//g" ${pkgdir}/usr/share/applications/*.desktop - sed -i -e "s/Icon=libreoffice34-/Icon=/g" ${pkgdir}/usr/share/applications/*.desktop - sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop - echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop - # remove unneeded .desktop files - rm -rf ${pkgdir}/usr/lib/libreoffice/share/xdg - - # add missing icon files - cp -R ${srcdir}/build/sysui/desktop/icons/{hi,lo}color ${pkgdir}/usr/share/icons/ - pushd ${pkgdir}/usr/share/pixmaps - for i in base calc draw impress main math printeradmin startcenter writer; do - ln -vs /usr/share/icons/hicolor/48x48/apps/$i.png . - done - popd - sed -i -e 's/Icon=libreoffice-/Icon=/' ${pkgdir}/usr/share/applications/*.desktop - - # add missing mimetype file - install -m644 ${srcdir}/build/sysui/unxlng*/misc/libreoffice/openoffice.org.xml ${pkgdir}/usr/share/mime/packages/libreoffice.xml - - # put configuration files into place - install -dm755 ${pkgdir}/etc/libreoffice - install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ - install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ - # install dummy links to make them found by LibO - cd ${pkgdir}/usr/lib/libreoffice/program/ - ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . - cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/ - ln -vsf /etc/libreoffice/psprint.conf . +package_libreoffice-base() { + pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/base_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-calc() { + pkgdesc="Spreadsheet application for LibreOffice." + depends=('libreoffice-common' 'lpsolve' ) + optdepends=() + backup=() + groups=('libreoffice') - #fix http://bugs.archlinux.org/task/17656 - find ${pkgdir} -perm 444 -exec ls -lh {} \; - find ${pkgdir} -perm 444 -exec chmod 644 {} \; - find ${pkgdir} -perm 555 -exec ls -lh {} \; - find ${pkgdir} -perm 555 -exec chmod 755 {} \; - - # split out extensions - mv ${pkgdir}/usr/lib/libreoffice/share/extensions ${srcdir}/extensions-install - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - install -m644 ${srcdir}/extensions-install/package.txt ${pkgdir}/usr/lib/libreoffice/share/extensions/ + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/calc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} - # move SDK to separated package - mkdir -p ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.4/sdk - mv ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.4/ +package_libreoffice-draw() { + pkgdesc="Drawing Application for LibreOffice." + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/draw_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} - # cleanup gid_Module files - mkdir ${srcdir}/splitlist - mv -f ${pkgdir}/gid_Module* ${srcdir}/splitlist/ +package_libreoffice-gnome() { + pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." + depends=('libreoffice-common' 'dbus-glib') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/gnome_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done } -package_libreoffice-sdk() { +package_libreoffice-impress() { + pkgdesc="Presentation Application for LibreOffice." + depends=('libreoffice-common') + optdepends=('mesa: for the OGLTrans extension') + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/impress_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-kde4() { + pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." + depends=('libreoffice-common' 'kdelibs') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/kde4_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-math() { + pkgdesc="Equation Editor Applicationfor LibreOffice." + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/math_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} - pkgdesc="Software development kit for LibreOffice" - depends=('libreoffice' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') +package_libreoffice-sdk() { + pkgdesc="Software Development Kit for LibreOffice." + depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # fix ArchLinux LibreOffice installation paths + sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ + -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \ + -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ + -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \ + -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ + -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ + -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ + -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \ + -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \ + -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \ + -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ + -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in +} - cd ${srcdir}/sdk-install - cp -r * ${pkgdir} +package_libreoffice-sdk-doc() { + pkgdesc="Software Development Kit documentation for LibreOffice" + depends=('libreoffice-common' 'libreoffice-sdk') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_doc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + #fix permissions + find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \; +} - cd ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk - cp setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix{,.sh} +package_libreoffice-writer() { + pkgdesc="Word Processor Applicationfor LibreOffice." + depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') + optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/writer_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} - # fix ArchLinux LIbreOffice installation paths - sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ - -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \ - -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \ - -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ - -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ - -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ - -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \ - -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \ - -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \ - -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ - -e "s,@SDK_AUTO_DEPLOYMENT@,NO," setsdkenv_unix.{csh,sh}.in - #fix permissions - find examples -type f -exec chmod -x {} \; +package_libreoffice-en-US() { + pkgdesc="English (US) language pack for LibreOffice" + #arch=('any') + provides=('openoffice-en-US' 'libreoffice-langpack') + replaces=(openoffice-en-US) + conflicts=(openoffice-en-US) + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/build/file-lists/lang_en_US_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done } package_libreoffice-extension-barcode() { pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw " #arch=('any') - depends=('libreoffice') + depends=('libreoffice-common') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -497,7 +704,7 @@ package_libreoffice-extension-diagram() { pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks" #arch=('any') - depends=('libreoffice') + depends=('libreoffice-common' 'java-environment') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -508,7 +715,7 @@ package_libreoffice-extension-google-docs() { pkgdesc="Google Documents extension for LibreOffice" #arch=('any') - depends=('libreoffice') + depends=('libreoffice-common' 'java-environment') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -519,7 +726,7 @@ package_libreoffice-extension-hunart() { pkgdesc="Hungarian cross-reference toolbar extension" #arch=('any') - depends=('libreoffice') + depends=('libreoffice-common') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -530,7 +737,7 @@ package_libreoffice-extension-hunart() { # pkgdesc="Lightproof extension for LibreOffice" #arch=('any') -# depends=('libreoffice') +# depends=('libreoffice-common') # groups=('libreoffice-extensions') # install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -541,7 +748,7 @@ package_libreoffice-extension-hunart() { # pkgdesc="MySQL Connector extension for LibreOffice" #arch=('any') -# depends=('libreoffice') +# depends=('libreoffice-common') # groups=('libreoffice-extensions') # install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -552,7 +759,7 @@ package_libreoffice-extension-nlpsolver() { pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" #arch=('any') - depends=('libreoffice') + depends=('libreoffice-common' 'java-environment') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -563,7 +770,7 @@ package_libreoffice-extension-ct2n() { pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates." #arch=('any') - depends=('libreoffice') + depends=('libreoffice-common') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -574,7 +781,7 @@ package_libreoffice-extension-numbertext() { pkgdesc="NUMBERTEXT/MONEYTEXT extensions" #arch=('any') - depends=('libreoffice') + depends=('libreoffice-common') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -585,7 +792,7 @@ package_libreoffice-extension-oooblogger() { pkgdesc="An extensions for blogging" #arch=('any') - depends=('libreoffice' 'coreutils') + depends=('libreoffice-common' 'coreutils' 'python') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -595,7 +802,7 @@ package_libreoffice-extension-oooblogger() { package_libreoffice-extension-pdfimport() { pkgdesc="This extension allows you to import and modify PDF documents" - depends=('libreoffice' 'poppler') + depends=('libreoffice-common' 'poppler') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -605,7 +812,7 @@ package_libreoffice-extension-pdfimport() { package_libreoffice-extension-presenter-screen() { pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" - depends=('libreoffice') + depends=('libreoffice-common' 'java-environment') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -615,7 +822,7 @@ package_libreoffice-extension-presenter-screen() { package_libreoffice-extension-presentation-minimizer() { pkgdesc="This extension reduce the file size of the current presentation" - depends=('libreoffice' 'gcc-libs') + depends=('libreoffice-common' 'gcc-libs') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -626,7 +833,7 @@ package_libreoffice-extension-report-builder() { pkgdesc="This extension creates smart-looking database reports" #arch=('any') - depends=('libreoffice') + depends=('libreoffice-common' 'java-environment') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -636,7 +843,7 @@ package_libreoffice-extension-report-builder() { package_libreoffice-extension-scripting-beanshell() { pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" - depends=('libreoffice') + depends=('libreoffice-common' 'java-environment') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -646,7 +853,7 @@ package_libreoffice-extension-scripting-beanshell() { package_libreoffice-extension-scripting-javascript() { pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" - depends=('libreoffice') + depends=('libreoffice-common' 'java-environment') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -656,7 +863,7 @@ package_libreoffice-extension-scripting-javascript() { package_libreoffice-extension-scripting-python() { pkgdesc="LibreOffice extension - Enables support for scripts in Python" - depends=('libreoffice') + depends=('libreoffice-common' 'python') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -667,19 +874,20 @@ package_libreoffice-extension-typo() { pkgdesc="Typography toolbar extension" #arch=('any') - depends=('libreoffice') + depends=('libreoffice-common') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo - chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo + find ${pkgdir} -type d -exec chmod 755 {} \; + #chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo } package_libreoffice-extension-validator() { pkgdesc="Validator extension for LibreOffice" #arch=('any') - depends=('libreoffice') + depends=('libreoffice-common' 'java-environment') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -690,7 +898,7 @@ package_libreoffice-extension-wiki-publisher() { pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" #arch=('any') - depends=('libreoffice') + depends=('libreoffice-common' 'java-environment') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions @@ -701,7 +909,7 @@ package_libreoffice-extension-watch-window() { pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen." #arch=('any') - depends=('libreoffice') + depends=('libreoffice-common' 'java-environment') groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions diff --git a/extra/libreoffice/libreoffice.install b/extra/libreoffice/libreoffice.install index 177f0d4e6..0bccb81f3 100644 --- a/extra/libreoffice/libreoffice.install +++ b/extra/libreoffice/libreoffice.install @@ -5,9 +5,20 @@ update-desktop-database -q update-mime-database usr/share/mime > /dev/null 2>&1 echo " * see https://wiki.archlinux.org/index.php/LibreOffice" +echo "-------------------------------------------------------------------" +echo "LibreOffice has been split into several packages:" +echo "- libreoffice-common" +echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" +echo "- libreoffice-{gnome,kde4} - desktop integration plugins" +echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" +echo " the LibreOffice APIs and for creating" +echo " extensions (UNO components)." +echo "-------------------------------------------------------------------" +echo " * you need to install at least one libreoffice-langpack" echo " * you may want to pacman -Ss libreoffice-extensions" -echo " to see what extensions are prepared to install" -echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg for spell checking" +echo " to see what additional extensions are prepared to install" +echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg + for spell checking" echo " * make sure you have installed some ttf font (ttf-dejavu recommended)" } @@ -16,6 +27,17 @@ post_upgrade() { gtk-update-icon-cache -f -q /usr/share/icons/hicolor update-desktop-database -q update-mime-database usr/share/mime > /dev/null 2>&1 + if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then + # important upgrade notice + echo "LibreOffice has been split into several packages:" + echo "- libreoffice-common" + echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" + echo "- libreoffice-{gnome,kde4} - desktop integration plugins" + echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" + echo " the LibreOffice APIs and for creating" + echo " extensions (UNO components)." + echo "Now you need to install at least one libreoffice-langpack!" + fi } post_remove() { diff --git a/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff b/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff new file mode 100644 index 000000000..fd61cb4ca --- /dev/null +++ b/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff @@ -0,0 +1,15 @@ +--- scp2/inc/macros.inc.old 2011-05-18 17:51:47.000000000 +0200 ++++ scp2/inc/macros.inc 2011-07-18 19:58:27.000000000 +0200 +@@ -92,10 +92,10 @@ + #endif + + #define BIN_FILE_BODY \ +- UnixRights = 555 ++ UnixRights = 755 + + #define TXT_FILE_BODY \ +- UnixRights = 444 ++ UnixRights = 644 + + #define USER_FILE_BODY \ + UnixRights = 644 diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 62858d9a7..53cf9a6d0 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132751 2011-07-25 19:30:07Z ibiru $ +# $Id: PKGBUILD 134299 2011-08-02 19:50:28Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.15.6 -pkgrel=3 +pkgver=0.15.7 +pkgrel=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('boost-libs' 'python2') makedepends=('boost') source=(http://libtorrent.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('e6f33b139933ec245e8850558efe52e88081fc6d') +sha1sums=('5ddc5966436f98c146b6aba8595dfe86cecb6724') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index bd218b04c..f3194756d 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 118889 2011-04-09 09:47:57Z jgc $ +# $Id: PKGBUILD 134215 2011-08-02 15:15:42Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.4.3 -pkgrel=2 +pkgver=1.4.4 +pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -14,7 +14,7 @@ license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 xorg.sh xorg.csh) -sha1sums=('174270a0e51614b5077026fc6c20701d4e09aef8' +sha1sums=('2d9d38bfd7003ec60eea0b1999ab72cfd5fa3b90' '4b756387426afb2a5bb7a155631ec42348abf5c1' '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8') diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 431a69083..0e5fa22f6 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,50 +1,39 @@ -# $Id: PKGBUILD 127561 2011-06-16 15:23:47Z andyrtr $ +# $Id: PKGBUILD 134098 2011-08-01 12:57:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa -pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') +pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri') [[ "$CARCH" = "mips64el" ]] && pkgname=('mesa' 'libgl' 'libgles' 'libegl') #_git=true _git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110612 + #pkgver=7.10.99.git20110709 + pkgver=7.11 else - pkgver=7.10.3 + pkgver=7.11 fi pkgrel=1 arch=('i686' 'x86_64' 'mips64el') -makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1' - 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' - 'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake') -[[ "$CARCH" = "mips64el" ]] || makedepends+=('dri2proto=2.3' 'llvm') +makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' + 'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'udev') +[[ "$CARCH" = "mips64el" ]] || makedepends+=('dri2proto=2.6' 'llvm') url="http://mesa3d.sourceforge.net" license=('custom') -source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch mesa-7.5-mips-wmb.patch mesa-loongson.patch) +source=(LICENSE) if [ "${_git}" = "true" ]; then - # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a00dd974699e369b1eb292103fbde8bc6adfb87 - source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-9a00dd974699e369b1eb292103fbde8bc6adfb87.tar.bz2') + # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 + #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') + source=(${source[@]} "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") else - source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip" + source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" ) fi build() { -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - autoreconf -vfi - else - cd "${srcdir}/Mesa-${pkgver}" -fi - -if [ "${_git}" != "true" ]; then -#backport from master to fix gnome-shell shader -#https://bugs.freedesktop.org/show_bug.cgi?id=35714 -patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch" -patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" -fi + cd ${srcdir}/?esa-* # WMB for MIPS patch from Fedora and Gentoo patch -Np1 -i $srcdir/mesa-7.5-mips-wmb.patch @@ -63,46 +52,40 @@ if [ "$CARCH" = "mips64el" ]; then --disable-gallium-egl else if [ "${_git}" = "true" ]; then + autoreconf -vfi ./autogen.sh --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --enable-gallium-r300 \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ + --with-gallium-drivers=r300,r600,nouveau,swrast \ --enable-gallium-llvm \ - --enable-gallium-egl \ - --enable-gallium-swrast \ + --enable-gallium-egl --enable-shared-glapi\ --enable-glx-tls \ --with-driver=dri \ --enable-xcb \ - --with-state-trackers=dri,glx,egl \ --disable-glut \ --enable-gles1 \ --enable-gles2 \ --enable-egl \ - --enable-texture-float + --enable-texture-float \ + --enable-shared-dricore + # --enable-gallium-svga \ - - # --enable-texture-float (enable floating-point textures and renderbuffers) - http://www.phoronix.com/scan.php?page=news_item&px=OTMzMg - #The source code to implement ARB_texture_float extension is included and can be toggled on at compile time only by those who purchased a license from SGI, or are in a country where the patent does not apply. - - #--enable-shared-dricore - http://bugs.gentoo.org/show_bug.cgi?id=357177 else + autoreconf -vfi ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --enable-gallium-radeon \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ - --enable-gallium-swrast \ + --with-gallium-drivers=r300,r600,nouveau,swrast \ + --enable-gallium-llvm \ + --enable-gallium-egl --enable-shared-glapi\ --enable-glx-tls \ --with-driver=dri \ --enable-xcb \ - --with-state-trackers=dri,glx \ --disable-glut \ --enable-gles1 \ --enable-gles2 \ --enable-egl \ - --disable-gallium-egl + --enable-texture-float \ + --enable-shared-dricore fi fi @@ -110,19 +93,17 @@ fi } package_libgl() { - depends=('libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1') + depends=('libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs') pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" [[ "$CARCH" = "mips64el" ]] && pkgdesc="Mesa 3-D graphics library (Xlib)" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi + cd ${srcdir}/?esa-* install -m755 -d "${pkgdir}/usr/lib" install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/" + bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/" + bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/" if [ "$CARCH" != "mips64el" ]; then @@ -131,7 +112,7 @@ fi if [ "${_git}" = "true" ]; then make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install + make -C ${srcdir}/Mesa-${pkgver/rc/-rc}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install fi ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so" ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" @@ -142,15 +123,23 @@ fi install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" } +package_libglapi() { + depends=('glibc') + pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions" + + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/lib" + bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/" + + install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/" +} + package_libgles() { - depends=('libgl') + depends=('libglapi') pkgdesc="Mesa GLES libraries and headers" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi + cd ${srcdir}/?esa-* install -m755 -d "${pkgdir}/usr/lib" install -m755 -d "${pkgdir}/usr/lib/pkgconfig" install -m755 -d "${pkgdir}/usr/include" @@ -168,15 +157,11 @@ fi } package_libegl() { - depends=('libgl') - pkgdesc="Mesa libEGL libraries and headers" + depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev') + pkgdesc="Mesa EGL libraries and headers" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install - else - cd "${srcdir}/Mesa-${pkgver}" -fi + cd ${srcdir}/?esa-* + make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/lib" install -m755 -d "${pkgdir}/usr/lib/pkgconfig" install -m755 -d "${pkgdir}/usr/include" @@ -187,10 +172,8 @@ fi install -m755 -d "${pkgdir}/usr/share/doc" install -m755 -d "${pkgdir}/usr/share/doc/libegl" bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/" -if [ "${_git}" != "true" ]; then install -m755 -d "${pkgdir}/usr/lib/egl" bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/" -fi bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/" bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/" bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" @@ -201,18 +184,15 @@ fi } package_mesa() { - depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.25' 'glproto>=1.4.12') + depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6') # 'dri2proto>=2.6' 'glproto>=1.4.14') optdepends=('opengl-man-pages: for the OpenGL API man pages') pkgdesc="Mesa 3-D graphics libraries and include files" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi + cd ${srcdir}/?esa-* make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/lib/libGL.so"* + rm -f "${pkgdir}/usr/lib/libglapi.so"* rm -f "${pkgdir}/usr/lib/libGLESv"* rm -f "${pkgdir}/usr/lib/libEGL"* rm -rf "${pkgdir}/usr/lib/egl" @@ -233,50 +213,28 @@ package_ati-dri() { pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" conflicts=('xf86-video-ati<6.9.0-6') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C radeon DESTDIR="${pkgdir}" install - make -C r200 DESTDIR="${pkgdir}" install - # classic mesa driver for R300 r300_dri.so - #make -C r300 DESTDIR="${pkgdir}" install <------- deprecated - # gallium3D driver for R300 r300_dri.so -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install -fi - #make -C r600 DESTDIR="${pkgdir}" install + # classic mesa drivers for radeon,r200 + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install + # gallium3D driver for r300,r600 + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install } package_intel-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa DRI drivers for Intel" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C i810 DESTDIR="${pkgdir}" install - make -C i915 DESTDIR="${pkgdir}" install - make -C i965 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install } package_unichrome-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C unichrome DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install } package_mach64-dri() { @@ -284,12 +242,7 @@ package_mach64-dri() { pkgdesc="Mesa DRI drivers for ATI Mach64" conflicts=('xf86-video-mach64<6.8.2') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C mach64 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install } package_mga-dri() { @@ -297,12 +250,7 @@ package_mga-dri() { pkgdesc="Mesa DRI drivers for Matrox" conflicts=('xf86-video-mga<1.4.11') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C mga DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install } package_r128-dri() { @@ -310,12 +258,7 @@ package_r128-dri() { pkgdesc="Mesa DRI drivers for ATI Rage128" conflicts=('xf86-video-r128<6.8.1') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C r128 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install } package_savage-dri() { @@ -323,12 +266,7 @@ package_savage-dri() { pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage" conflicts=('xf86-video-savage<2.3.1') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C savage DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install } package_sis-dri() { @@ -336,12 +274,7 @@ package_sis-dri() { pkgdesc="Mesa DRI drivers for SiS" conflicts=('xf86-video-sis<0.10.2') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C sis DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install } package_tdfx-dri() { @@ -349,33 +282,17 @@ package_tdfx-dri() { pkgdesc="Mesa DRI drivers for 3dfx" conflicts=('xf86-video-tdfx<1.4.3') -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C tdfx DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install } package_nouveau-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau" -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C nouveau DESTDIR="${pkgdir}" install - + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install -fi + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install } #package_llvm-dri() { @@ -396,14 +313,3 @@ fi # make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install #fi #} -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '3ec78f340f9387abd7a37b195e764cbf' - '67c87b77cc2236b52a3b47dad3fbb5d4' - 'c7788f2495060bf133771aef6ad25929' - '614d063ecd170940d9ae7b355d365d59') -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '3ec78f340f9387abd7a37b195e764cbf' - '67c87b77cc2236b52a3b47dad3fbb5d4' - 'c7788f2495060bf133771aef6ad25929' - '598c24dccfcdcc99c07d883f7c09f36a' - '614d063ecd170940d9ae7b355d365d59') diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index 7c31710ba..a93082f48 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 120652 2011-04-25 20:44:03Z eric $ +# $Id: PKGBUILD 134321 2011-08-02 21:54:35Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=mpg123 pkgver=1.13.3 -pkgrel=1 +pkgrel=2 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/mpg123" license=('GPL2' 'LGPL2.1') depends=('libtool' 'alsa-lib') -makedepends=('esound' 'sdl' 'jack' 'libpulse') -optdepends=('esound: for esd audio support' - 'sdl: for sdl audio support' +makedepends=('sdl' 'jack' 'libpulse') +optdepends=('sdl: for sdl audio support' 'jack: for jack audio support' 'libpulse: for pulse audio support') conflicts=('mpg321') @@ -23,7 +22,7 @@ sha1sums=('899af289bfcbbb13cbe66d5d0541c25cecf5400d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-audio="alsa esd sdl jack pulse" + ./configure --prefix=/usr --with-audio="alsa sdl jack pulse" make } diff --git a/extra/quodlibet/PKGBUILD b/extra/quodlibet/PKGBUILD index a40324d62..f49e53fac 100644 --- a/extra/quodlibet/PKGBUILD +++ b/extra/quodlibet/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 117459 2011-04-02 23:31:59Z eric $ +#$Id: PKGBUILD 134307 2011-08-02 21:13:14Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=quodlibet -pkgver=2.3 +pkgver=2.3.1 pkgrel=1 pkgdesc="An audio player written in pygtk" arch=('i686' 'x86_64' 'mips64el') @@ -17,16 +17,16 @@ optdepends=('gstreamer0.10-ffmpeg: for ffmpeg (ASF/WMA) support ' 'notification-daemon: for notification support' 'libgpod: for ipod support' 'python-feedparser: for audio feeds (podcast) support' - 'hal: for media devices support' + 'udisks: for media devices support' 'media-player-info: for media devices support') options=('!makeflags') source=(http://quodlibet.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('e6bdb97decba40c33bd57e039d82c217') -sha1sums=('dae756e8224139989f6b253ef2afe18eca55ef9f') +md5sums=('354b411bd68b3ae4a687c35f6666265b') +sha1sums=('2521011633d0195084e5937eeeb01c0efefa69b1') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's#env python#env python2#' *.py + sed -i 's#env python#env python2#' *.py quodlibet/util/fmps.py ./setup.py build } diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD index 85b0373fe..5ac96556b 100644 --- a/extra/vice/PKGBUILD +++ b/extra/vice/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 111554 2011-02-27 17:55:34Z giovanni $ +# $Id: PKGBUILD 134333 2011-08-02 23:08:23Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vice pkgver=2.3 -pkgrel=1 +pkgrel=3 pkgdesc="A Versatile Commodore Emulator" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.viceteam.org/" -depends=('esound' 'gcc-libs' 'giflib' 'lame' 'libxrandr' 'libxv' 'libjpeg>=8' 'libpng>=1.4.0' 'libxaw' 'libxxf86vm') +depends=('alsa-lib' 'gcc-libs' 'giflib' 'lame' 'libxrandr' 'libxv' 'libjpeg' 'libpng' 'libxaw' +'libxxf86vm') makedepends=('xorg-font-utils') options=('!makeflags') source=(http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz @@ -20,14 +21,15 @@ md5sums=('b48d137874daad50c087a0686cbdde34' build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/vice-2.3-x11video.patch || return 1 + patch -Np1 -i ${srcdir}/vice-2.3-x11video.patch ./configure --prefix=/usr \ + --with-alsa \ --enable-fullscreen - make || return 1 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD index 4973f9502..47b339cd1 100644 --- a/extra/xf86-video-ati/PKGBUILD +++ b/extra/xf86-video-ati/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 115444 2011-03-18 07:49:48Z andyrtr $ +# $Id: PKGBUILD 125569 2011-05-26 19:49:03Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-ati -pkgver=6.14.1 +pkgver=6.14.2 pkgrel=1 pkgdesc="X.org ati video driver" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.10.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -md5sums=('395e23ad026e4246dd70bbd2143688b5') +md5sums=('111ec4aef32a4298df7e38afa8bef373') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD index 25cbcff4a..41a83c7ac 100644 --- a/extra/xf86-video-mach64/PKGBUILD +++ b/extra/xf86-video-mach64/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 115331 2011-03-17 17:51:48Z andyrtr $ +# $Id: PKGBUILD 130722 2011-07-07 22:12:01Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-mach64 -pkgver=6.8.2 -pkgrel=6 +pkgver=6.9.0 +pkgrel=1 pkgdesc="X.org mach64 video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -15,14 +15,18 @@ groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 mach64-fix-pixmap.patch) -sha1sums=('b7303689a6a971b956061fd81399dc81adb865af' +sha1sums=('95a7ec9761fe11dadbcd9078c55148198a91b2f1' '9658d16b964c1c0a3f8aa68f6706bd643cef321e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/mach64-fix-pixmap.patch +# patch -Np1 -i ${srcdir}/mach64-fix-pixmap.patch ./configure --prefix=/usr --enable-dri make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index 4a5e4993c..c86785a07 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 125879 2011-05-31 11:40:47Z ibiru $ +# $Id: PKGBUILD 132822 2011-07-26 12:31:08Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: buddabrod <buddabrod@gmail.com> pkgname=xf86-video-nouveau -_gitdate=20110531 +_gitdate=20110726 pkgver=0.0.16_git${_gitdate} # see configure.ac pkgrel=1 pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)" @@ -12,12 +12,12 @@ url="http://nouveau.freedesktop.org/wiki/" license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e depends=('libdrm' 'udev') optdepends=('nouveau-dri: experimental gallium3d features') -makedepends=('xorg-server-devel' 'libdrm>=2.4.24' 'xf86driproto') +makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto') conflicts=('xorg-server<1.10.0') options=('!libtool') install=${pkgname}.install source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2) -md5sums=('37e6e9d79ed6e658066cb2e80caaeef9') +md5sums=('8af188f6c2c90dfca3427809cd8fb76f') # source PKGBUILD && mksource mksource() { diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD index 6dc55356a..90020879c 100644 --- a/extra/xmms/PKGBUILD +++ b/extra/xmms/PKGBUILD @@ -1,38 +1,38 @@ -# $Id: PKGBUILD 95269 2010-10-18 00:20:50Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 134338 2011-08-02 23:29:16Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xmms pkgver=1.2.11 -pkgrel=3 +pkgrel=4 pkgdesc="The X MultiMedia System - a multimedia player" arch=('i686' 'x86_64' 'mips64el') url="http://legacy.xmms2.org/" license=('GPL') -depends=('gtk' 'libxxf86vm' 'libsm') -makedepends=('mesa' 'libmikmod' 'libvorbis' 'esound' 'alsa-lib' 'libgl') +depends=('gtk' 'libxxf86vm' 'libsm' 'desktop-file-utils') +makedepends=('mesa' 'libmikmod' 'libvorbis' 'alsa-lib' 'libgl') optdepends=('libmikmod: for the MikMod input plugin' \ 'libvorbis: for the Ogg Vorbis input plugin' \ - 'esound: for the esound output plugin' \ 'alsa-lib: for the alsa output plugin' \ 'libgl: for the OpenGL Spectrum analyser visualization plugin') options=('!libtool') +install=xmms.install source=(http://legacy.xmms2.org/${pkgname}-${pkgver}.tar.bz2 \ xmms-menu.patch xmms-1.2.10-crossfade-0.3.9.patch xmms-fix.diff \ xmms-1.2.11-CVE-2007-0653.0654.patch xmms-1.2.11-fix-http-title-mpg123.patch \ xmms-1.2.11-3dse.patch xmms-1.2.10-recode-id3.patch \ xmms-1.2.10-fonts.patch xmms.16.png xmms.32.png xmms.48.png) -md5sums=('f3e6dbaf0b3f571a532ab575656be506' 'b7b6f1811bad8d14e4c4534240e45980'\ - '4eb222111a82a2e1ebe63b5f6109133d' 'd7f9dc3712c486658149c4504f7478a7'\ - 'e59e8c66f4e4077a8096ad98c77f0eb6' '25609a6b5b7632e4c8e6de927f8d70db'\ - '2b534832b0dbb0d06dbcc829e2b702e6' 'd1715c291d35ee8854e5d926912e8b0d'\ - '408ea5e28c4c4c221cf3c8ded76fd1f0' '3c328565c99c85d92ac0b9918805da46'\ - '128406a02c07cd477dc901f2a658add5' 'd022280df4379383732a8a26abea1d08') -sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d' '27fb6e21bd6db923a425a8df8bd07a2a93867ddb'\ - 'ff5c172752c8bee708d9a9ecd53864cc95a4bcc5' 'c227284955f2cc16f027dade670155c0f0fbc4ff'\ - '4ef47c34b27b6c868d4301b7a078b257c8604471' '0c060385561ea2a4b1c7ad3bd35d3646ae9554f5'\ - '6f6db13c780ba4cbddb8613f0abd2db2823f3021' '2a3b1bf17054b6bd8b1e5937de5c0ad49af8dc92'\ - '31abd37c9c57bd13b2088eb11a1e54e5aa312bf3' '0089d11aa3bce67f3496592d68ee65837406e220'\ - 'f24071ae484d9b55e61dba076801fa8e7976ff2f' '485c67cb8c8d4678bb3b0b280d2e233b14153b22') +sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d' + '27fb6e21bd6db923a425a8df8bd07a2a93867ddb' + 'ff5c172752c8bee708d9a9ecd53864cc95a4bcc5' + 'c227284955f2cc16f027dade670155c0f0fbc4ff' + '4ef47c34b27b6c868d4301b7a078b257c8604471' + '0c060385561ea2a4b1c7ad3bd35d3646ae9554f5' + '6f6db13c780ba4cbddb8613f0abd2db2823f3021' + '2a3b1bf17054b6bd8b1e5937de5c0ad49af8dc92' + '31abd37c9c57bd13b2088eb11a1e54e5aa312bf3' + '0089d11aa3bce67f3496592d68ee65837406e220' + 'f24071ae484d9b55e61dba076801fa8e7976ff2f' + '485c67cb8c8d4678bb3b0b280d2e233b14153b22') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xmms/xmms.install b/extra/xmms/xmms.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/extra/xmms/xmms.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index ae05c054f..d40dd9d01 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130970 2011-07-09 09:10:44Z andyrtr $ +# $Id: PKGBUILD 130953 2011-07-09 08:01:22Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') pkgver=1.10.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" diff --git a/extra/xorg-twm/PKGBUILD b/extra/xorg-twm/PKGBUILD index b5b62d210..d77f13207 100644 --- a/extra/xorg-twm/PKGBUILD +++ b/extra/xorg-twm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 113881 2011-03-10 17:47:05Z jgc $ +# $Id: PKGBUILD 134274 2011-08-02 18:36:40Z jgc $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=xorg-twm -pkgver=1.0.6 -pkgrel=2 +pkgver=1.0.7 +pkgrel=1 pkgdesc="Tab Window Manager for the X Window System" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -13,7 +13,7 @@ license=('custom') depends=('libxmu') makedepends=('xorg-util-macros') source=(${url}/releases/individual/app/twm-${pkgver}.tar.bz2) -sha1sums=('5c28194c9c620b34df56fdee140d662425ba8a86') +sha256sums=('0f5d53dec62540fa97c96b4e983695cc32114836d256b64885253ab58b5bcd44') build() { cd "${srcdir}/twm-${pkgver}" diff --git a/extra/xorg-x11perf/PKGBUILD b/extra/xorg-x11perf/PKGBUILD index c350c59bb..7c7479dca 100644 --- a/extra/xorg-x11perf/PKGBUILD +++ b/extra/xorg-x11perf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113703 2011-03-10 14:49:36Z jgc $ +# $Id: PKGBUILD 134289 2011-08-02 18:59:18Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-x11perf -pkgver=1.5.3 -pkgrel=2 +pkgver=1.5.4 +pkgrel=1 pkgdesc="Simple X server performance benchmarker" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libx11' 'libxmu' 'libxrender' 'libxft' 'libxext') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/x11perf-${pkgver}.tar.bz2) -sha1sums=('2fd00ba38c36c569751bbe3d60917df2a39e10ba') +sha256sums=('24ee8857a2bf414b360addabf1c27ef797f7f504ee9bc409c151760bfbe53184') build() { cd "${srcdir}/x11perf-${pkgver}" diff --git a/extra/xorg-xset/PKGBUILD b/extra/xorg-xset/PKGBUILD index d812a5a11..e483f0646 100644 --- a/extra/xorg-xset/PKGBUILD +++ b/extra/xorg-xset/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113831 2011-03-10 15:57:21Z jgc $ +# $Id: PKGBUILD 134284 2011-08-02 18:56:04Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xset -pkgver=1.2.1 -pkgrel=2 +pkgver=1.2.2 +pkgrel=1 pkgdesc="User preference utility for X" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libxmu') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xset-${pkgver}.tar.bz2) -sha1sums=('9b1eb8835637dd70eea1a1365df5d909a306cc2c') +sha256sums=('61371c140030b8b05075a1378b34a4d7c438ed9159496a95f10782c6f4aec1e8') build() { cd "${srcdir}/xset-${pkgver}" diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 146e8e880..400399311 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 126558 2011-06-06 09:30:30Z jgc $ +# $Id: PKGBUILD 134190 2011-08-02 13:30:23Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=270 +pkgver=271 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('92d654f3aa4ad694a4f61d980d14c24b' +md5sums=('e07b05bd3d3a666a8cf086fcc8d227f3' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/testing/lm_sensors/PKGBUILD b/testing/lm_sensors/PKGBUILD new file mode 100644 index 000000000..9d6c1ff6e --- /dev/null +++ b/testing/lm_sensors/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 134304 2011-08-02 20:34:25Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=lm_sensors +pkgver=3.3.1 +pkgrel=2 +pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" +arch=('i686' 'x86_64') +url="http://www.lm-sensors.org/" +license=('GPL' 'LGPL') +depends=('perl' 'sysfsutils') +makedepends=('rrdtool') +optdepends=('rrdtool: for logging with sensord') +backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord') +options=('!emptydirs') +source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \ + sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \ + sensord.rc daemonarg.patch linux_3.0.patch) +md5sums=('8c0eebda8524fc87da1393b4564d279b' + 'c370f5e620bfe41113354a1e22c0c18c' + '232bedf043dd5dedde82df1a399c682c' + '6549050897c237514aeaa2bb6cfd29ea' + 'f8af587038b0e2a89c441f7eeaa5e640' + '970408d2e509dc4138927020efefe323' + '96a8dd468e81d455ec9b165bdf33e0b7' + '41a5c20854bbff00ea7174bd2276b736' + '40c8eb16af8249a0f1d851fc1057ea15' + '5c1be382963145f7191d9c4e45ca9f67') +sha1sums=('cb819e5a93adb36ef00e6d3c5363f5f474efa78a' + 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5' + 'a068ac0a3115a6191a487e11422506baa922b40a' + '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' + '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' + 'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' + 'de8d4d65406815c389f8a04e2a8508a1ae6749c8' + '72a60251d1d55a67307dab4105d9f3f01a080af4' + '34241388c4001bfb6e49b7e10da1217e29a258d6' + '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \ + -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service} + patch -p1 < ../daemonarg.patch + patch -p0 < ../linux_3.0.patch + make PREFIX=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \ + PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install + install -D -m644 prog/init/lm_sensors.service "${pkgdir}/lib/systemd/system/lm_sensors.service" + install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors" + install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol" + install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" + install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd" + install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd" + install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord" + install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" +} diff --git a/testing/lm_sensors/daemonarg.patch b/testing/lm_sensors/daemonarg.patch new file mode 100644 index 000000000..4b80cef19 --- /dev/null +++ b/testing/lm_sensors/daemonarg.patch @@ -0,0 +1,50 @@ +diff -ru lm_sensors-3.1.2-1/prog/pwm/fancontrol lm_sensors-3.1.2-1_pyropeter/usr/sbin/fancontrol +--- lm_sensors-3.1.2-1/prog/pwm/fancontrol 2010-02-03 03:45:15.000000000 +0100 ++++ lm_sensors-3.1.2-1_pyropeter/prog/pwm/fancontrol 2010-03-07 01:37:09.000000000 +0100 +@@ -5,7 +5,9 @@ + # + # Version 0.70 + # +-# Usage: fancontrol [CONFIGFILE] ++# Usage: fancontrol [-D] [CONFIGFILE] ++# ++# (-D causes fancontrol to 'fork' to the background after some tests) + # + # Dependencies: + # bash, egrep, sed, cut, sleep, readlink, lm_sensors :) +@@ -43,6 +45,12 @@ + #DEBUG=1 + MAX=255 + ++DAEMON=0 ++if [ "$1" = "-D" ]; then ++ DAEMON=1 ++ shift ++fi ++ + declare -i pwmval + + function LoadConfig { +@@ -303,7 +311,6 @@ + echo "File $PIDFILE exists, is fancontrol already running?" + exit 1 + fi +-echo $$ > "$PIDFILE" + + # $1 = pwm file name + function pwmdisable() +@@ -475,6 +482,14 @@ + let fcvcount=$fcvcount+1 + done + ++if [ "$DAEMON" -gt 0 ]; then ++ echo "Forking..." ++ $0 $* &> /dev/null & ++ exit 0 ++fi ++ ++echo $$ > "$PIDFILE" ++ + echo 'Starting automatic fan control...' + + # main loop calling the main function at specified intervals diff --git a/testing/lm_sensors/fancontrol.rc b/testing/lm_sensors/fancontrol.rc new file mode 100644 index 000000000..8e98d06f2 --- /dev/null +++ b/testing/lm_sensors/fancontrol.rc @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof -o %PPID -x /usr/sbin/fancontrol) +case "$1" in + start) + stat_busy "Starting fancontrol" + [ -z "$PID" ] && /usr/sbin/fancontrol -D &>/dev/null + if [ $? -gt 0 -o -n "$PID" ]; then + stat_fail + else + add_daemon fancontrol + stat_done + fi + ;; + stop) + stat_busy "Stopping fancontrol" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon fancontrol + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/lm_sensors/healthd b/testing/lm_sensors/healthd new file mode 100644 index 000000000..0315dd788 --- /dev/null +++ b/testing/lm_sensors/healthd @@ -0,0 +1,46 @@ +#!/bin/bash + +# +# /usr/sbin/healthd +# + +. /etc/conf.d/healthd + +cmd="${ALARM_CMD}" +addr="${ADMIN_EMAIL}" +slp="${ALARM_SLEEP}" +sensors="/usr/bin/sensors" + + +while [ $# -gt 0 ] ; do + case "${1}" in + -c ) cmd="${2}" ; shift 2 ;; + -m ) addr="${2}" ; shift 2 ;; + -s ) slp="${2}" ; shift 2 ;; + * ) shift 1 ;; + esac +done + +[ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \ + [ -n "${addr}" ] || exit 1 + +[ "${slp}" -ge 2 ] || slp=600 + +while true ; do + sleep 15 + message="$( $sensors )" + case "$message" in + '' ) message='Could not get any sensor values !' ;; + *ALARM* ) : ;; + * ) message='' ;; + esac + if [ -n "$message" ]; then + if [ -n "${addr}" ]; then + echo "$message" | mail -s \ + "Sensors ALARM detected at host: $( hostname )" \ + "${addr}" + fi + [ -z "${cmd}" ] || ${cmd} & + sleep ${slp} + fi +done & diff --git a/testing/lm_sensors/healthd.conf b/testing/lm_sensors/healthd.conf new file mode 100644 index 000000000..a8b2c3fa3 --- /dev/null +++ b/testing/lm_sensors/healthd.conf @@ -0,0 +1,17 @@ +# +# /etc/conf.d/healthd +# + +# reset any pending alarms on startup +ALARM_RESET="yes" + +# where to sent mails on alarm +ADMIN_EMAIL="root" + +# Seconds to sleep when alarm detected before checking again +# If you want to fill up your mail inbox set this to 2. ;-) +ALARM_SLEEP=600 + +# command to run in background on each alarm +# N.B.: If you choose to use the beep command, you'll need to install it: pacman -S beep +ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600" diff --git a/testing/lm_sensors/healthd.rc b/testing/lm_sensors/healthd.rc new file mode 100644 index 000000000..7bb79519f --- /dev/null +++ b/testing/lm_sensors/healthd.rc @@ -0,0 +1,52 @@ +#!/bin/bash + +# +# /etc/rc.d/healthd +# + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/healthd + +maybe_alarm_reset() { + case "${ALARM_RESET}" in + yes) /usr/bin/sensors > /dev/null + ;; + no) true + ;; + *) false + esac + return $? +} + +PID=$(pidof -x -o %PPID /usr/sbin/healthd) +case "${1}" in + start) + stat_busy "Starting Health Daemon" + [ -z "${PID}" ] && maybe_alarm_reset && /usr/sbin/healthd &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + echo "${PID}" > /var/run/healthd.pid + add_daemon healthd + stat_done + fi + ;; + stop) + stat_busy "Stopping Health Daemon" + [ ! -z "${PID}" ] && kill ${PID} &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon healthd + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/lm_sensors/linux_3.0.patch b/testing/lm_sensors/linux_3.0.patch new file mode 100644 index 000000000..da02a3d49 --- /dev/null +++ b/testing/lm_sensors/linux_3.0.patch @@ -0,0 +1,11 @@ +--- prog/detect/sensors-detect 2011-08-02 10:23:46.000000000 +0200 ++++ prog/detect/sensors-detect 2011-08-02 10:24:04.000000000 +0200 +@@ -2472,7 +2472,7 @@ + + sub initialize_kernel_version + { +- `uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/; ++ `uname -r` =~ /(\d+)\.(\d+)(.*)/; + @kernel_version = ($1, $2, $3, $4); + chomp($kernel_arch = `uname -m`); + diff --git a/testing/lm_sensors/sensord.conf b/testing/lm_sensors/sensord.conf new file mode 100644 index 000000000..a1cf091c1 --- /dev/null +++ b/testing/lm_sensors/sensord.conf @@ -0,0 +1,4 @@ +# +# Parameters to be passed to sensord +# +SENSORD_ARGS="" diff --git a/testing/lm_sensors/sensord.rc b/testing/lm_sensors/sensord.rc new file mode 100644 index 000000000..e3ef4d26d --- /dev/null +++ b/testing/lm_sensors/sensord.rc @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/sensord + +PID=$(pidof -o %PPID /usr/sbin/sensord) +case "$1" in + start) + stat_busy "Starting sensord" + [ -z "$PID" ] && /usr/sbin/sensord ${SENSORD_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon sensord + stat_done + fi + ;; + stop) + stat_busy "Stopping sensord" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon sensord + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/lm_sensors/sensors.rc b/testing/lm_sensors/sensors.rc new file mode 100644 index 000000000..4acde2202 --- /dev/null +++ b/testing/lm_sensors/sensors.rc @@ -0,0 +1,119 @@ +#!/bin/bash + +# description: sensors is used for monitoring motherboard sensor values. +# config: /etc/conf.d/lm_sensors + +# See also the lm_sensors homepage at: +# http://www2.lm-sensors.nu/~lm78/index.html + +# It uses a config file /etc/conf.d/lm_sensors that contains the modules to +# be loaded/unloaded. That file is sourced into this one. + +# The format of that file a shell script that simply defines the modules +# in order as normal shell variables with the special names: +# MODULE_1, MODULE_2, MODULE_3, etc. + +. /etc/rc.conf +. /etc/rc.d/functions + +PSENSORS=/usr/bin/sensors + +if $(grep -q sysfs /proc/mounts); then + WITHSYS=1 +else + WITHSYS=0 +fi + +if [ $WITHSYS == "0" ]; then + # If sensors isn't supported by the kernel, try loading the module... + [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null + + # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have support for sensors. + if ! [ -e /proc/sys/dev/sensors ]; then + echo "lm_sensors: kernel does not have sensors support" + stat_fail + fi + + # If sensors was not already running, unload the module... + [ -e /var/run/daemons/sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null +fi + +if [ -e /etc/conf.d/lm_sensors ]; then + CONFIG=/etc/conf.d/lm_sensors +elif [ -e /etc/sysconfig/lm_sensors ]; then + # Moving config to new Arch-specific location + mv /etc/sysconfig/lm_sensors /etc/conf.d/lm_sensors + CONFIG=/etc/conf.d/lm_sensors +fi + +case "$1" in + start) + stat_busy "Starting Up Sensors" + + if [ -r "$CONFIG" ]; then + . "$CONFIG" + modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ') + i=0 + while [ $i -lt $modules ] ; do + module=$(eval echo '$'MODULE_$i) + # echo starting module __${module}__ #debug + /sbin/modprobe $module &>/dev/null + i=$(expr $i + 1) + done + fi + + $PSENSORS -s + + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon sensors + stat_done + fi + ;; + + stop) + stat_busy "Shutting Down Sensors" + + if [ -r "$CONFIG" ]; then + . "$CONFIG" + modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ') + i=$(expr $modules - 1) + while [ $i -ge 0 ] ; do + module=$(eval echo '$'MODULE_$i) + # echo stoping module __${module}__ #debug + /sbin/modprobe -r $module &>/dev/null + i=$(expr $i - 1) + done + fi + + if [ $WITHSYS == "0" ]; then + /sbin/modprobe -r i2c-proc &>/dev/null + fi + + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon sensors + stat_done + fi + ;; + + status) + $PSENSORS + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + condrestart) + [ -e /var/run/daemons/sensors ] && $0 restart || : + ;; + + *) + echo "Usage: $0 {start|stop|restart|status|condrestart}" +esac +exit 0 diff --git a/testing/syslinux/PKGBUILD b/testing/syslinux/PKGBUILD new file mode 100644 index 000000000..a999277f1 --- /dev/null +++ b/testing/syslinux/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 134206 2011-08-02 14:26:49Z ibiru $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=syslinux +pkgver=4.04 +pkgrel=2 +arch=('i686' 'x86_64') +pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE" +url="http://syslinux.zytor.com/" +license=('GPL2') +depends=('perl' 'glibc') +optdepends=('perl-passwd-md5: For md5pass' + 'perl-digest-sha1: For sha1pass' + 'mtools: For mkdiskimage and syslinux' + ) +makedepends=('nasm') +backup=('boot/syslinux/syslinux.cfg') +install=syslinux.install +source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.tar.bz2 + syslinux-dont-build-dos-windows-targets.patch + syslinux.cfg + syslinux-install_update) +md5sums=('a3936208767eb7ced65320abe2e33a10' + '5274062f91931eae6573f1ec3cd5b640' + '4dc27d8ab3802f8e50f3dda28168ce6d' + 'b5b4953c0a5a01cd16441402f6321765') + +build() { + # Do not try to build syslinux with our default LDFLAGS, it will fail + unset LDFLAGS + cd "$srcdir"/$pkgname-${pkgver} + # Do not try to build the Windows or DOS installers + patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch + # Fix FHS manpage path + sed 's|/usr/man|/usr/share/man|g' -i MCONFIG + make +} + +package() { + cd "$srcdir"/$pkgname-${pkgver} + make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install + + # Install the default configuration + install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg + # Install the installation and update script + # This script is maintained at git://gist.github.com/772138.git + install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update +} diff --git a/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch b/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch new file mode 100644 index 000000000..7355e4acb --- /dev/null +++ b/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch @@ -0,0 +1,12 @@ +diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile +--- syslinux-4.02.orig//Makefile 2010-07-21 21:33:13.000000000 +0200 ++++ syslinux-4.02//Makefile 2010-07-22 11:14:03.325522937 +0200 +@@ -55,7 +55,7 @@ + # files that depend only on the B phase, but may have to be regenerated + # for "make installer". + BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ +- diag libinstaller dos win32 win64 dosutil ++ libinstaller + ITARGET = + IOBJECTS = $(ITARGET) \ + utils/gethostip utils/isohybrid utils/mkdiskimage \ diff --git a/testing/syslinux/syslinux-install_update b/testing/syslinux/syslinux-install_update new file mode 100644 index 000000000..f7cd123e1 --- /dev/null +++ b/testing/syslinux/syslinux-install_update @@ -0,0 +1,459 @@ +#!/bin/bash +# +# Sylinux Installer / Updater Scripts +# Copyright (C) 2011 Matthew Gyurgyik <pyther@pyther.net> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +#----------------- +# Exit Codes: +# 1 - get_boot_device or other function failed +# 2 - install/update failed +# 3 - set_active failed +# 4 - install_mbr failed +# +shopt -s nullglob + +libpath="/usr/lib/syslinux" +bootpath="/boot/syslinux" +extlinux="/sbin/extlinux" + +autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE +com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com) +pciids_file=/usr/share/hwdata/pci.ids + +## Helper functions ## +# Taken from libui-sh +# $1 needle +# $2 set (array) haystack +check_is_in() { + local needle="$1" element + shift + for element; do + [[ $element = $needle ]] && return 0 + done + return 1 +} + +# return true when blockdevice is an md raid, otherwise return a unset value +# get all devices that are part of raid device $1 +device_is_raid() { + [[ $1 && -f /proc/mdstat ]] || return 1 + local devmajor=$(stat -c %t "$1") + (( devmajor == 9 )) +} + +mdraid_all_slaves() { + local slave slaves + for slave in /sys/class/block/${1##*/}/slaves/*; do + source "$slave/uevent" + slaves="$slaves/dev/$DEVNAME " + unset DEVNAME + done + echo $slaves +} + +# Check /sys/block to see if device is partitioned +# If we have a partitioned block device (sda1) /sys/block/sda1/dev will not exist +# However, if we have an unpartitioned block device (sda) /sys/block/sda/dev will exist +dev_is_part() { + # $1 - blockdevice + local dev=$1 + + # If block device uevent file should be found + # If a partition is passed in path shouldn't exist + if [[ $dev = *cciss* ]]; then + [[ -f /sys/block/cciss\!${dev##*/}/dev ]] && return 1 + elif [[ $dev = *ida* ]]; then + [[ -f /sys/block/ida\!${dev##*/}/dev ]] && return 1 + else + [[ -f /sys/block/${dev##*/}/dev ]] && return 1 + fi + + return 0 +} + +# If EFI PART is present in the first 8 bytes then it must be a GPT disk +device_is_gpt() { + local partsig=$(dd if="$1" skip=64 bs=8 count=1 2>/dev/null) + [[ $partsig = "EFI PART" ]] +} + +clear_gpt_attr2() { + # $1 - Block Device, no partitions + local disk=$1 + + # Special Exception for cciss controllers + if [[ $disk = *cciss* ]]; then + for part in /dev/cciss/${disk##*/}*p*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + # Smart 2 Controllers + elif [[ $disk = *ida* ]]; then + for part in /dev/ida/${disk##*/}*p*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + else + for part in /sys/block/${disk##*/}/${disk##*/}*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + fi + return 0 +} + +usage() { +cat << EOF +usage: $0 options + +This script will install or upgrade Syslinux + +OPTIONS: + -h Show this message + -i Install Syslinux + -u Update Syslinux + -a Set Boot flag on boot partiton + -m Install Syslinux MBR + -s Updates Syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists + + Arguments Required: + -c Chroot install (ex: -c /mnt) + +Example Usage: syslinux-install_update.sh -i -a -m (install, set boot flag, install mbr) + syslinux-install_update.sh -u (update) +EOF +} + +# Trys to find the partition that /boot resides on +# This will either be on /boot or / (root) +getBoot() { + if [[ ! -d "$bootpath" ]]; then + echo "Could not find $bootpath" + echo "Is boot mounted? Is Syslinux installed?" + exit 1 + fi + + syslinux_fs=(ext2 ext3 ext4 btrfs vfat) + + # Use DATA from findmnt see rc.sysint for more info + if [[ -f /proc/self/mountinfo ]]; then + read rootdev rootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/") + read bootdev bootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/boot") + else + echo "Could not find /proc/self/mountinfo" + echo "Are you running a kernel greater than 2.6.24?" + exit 1 + fi + + if [[ $bootfs ]]; then + if ! check_is_in "$bootfs" "${syslinux_fs[@]}"; then + echo "/boot file system is not supported by Syslinux" + exit 1 + fi + boot="boot" + bootpart="$bootdev" + elif [[ $rootfs ]]; then + if ! check_is_in "$rootfs" "${syslinux_fs[@]}"; then + echo "/ (root) file system is not supported by Syslinux" + exit 1 + fi + boot="root" + bootpart="$rootdev" + else + echo "Could not find filesystem on / (root) or /boot." + exit 1 + fi +} + +# We store the partition table type either gpt or mbr in var ptb +# In rare cases a user could have one raid disk using mbr and another using gpt +# In such cases we accept that the output may be incomplete + +# Calls get_ptb() for $bootpart or for all device in RAID +declare -A bootdevs +get_boot_devices() { + if device_is_raid "$bootpart"; then + slaves=$(mdraid_all_slaves "$bootpart") + + for slave in ${slaves[@]}; do + local disk="${slave%%[[:digit:]]*}" + device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" + bootdevs[$slave]="$ptb" + done + else + local disk="${bootpart%%[[:digit:]]*}" + device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" + bootdevs[$bootpart]="$ptb" + fi +} + +# Function Assumes the boot partition should be marked as active +# All other partitions should not have the boot flag set +set_active() { + # If any bootdev is a block device without partitions bail + # we want to set the boot flag on partitioned disk + for dev in "${!bootdevs[@]}"; do + dev_is_part $dev || { echo "$dev - is a block device. Aborting set_active!"; return 1; } + done + + # Clear BIOS Bootable Legacy Attribute for GPT drives + # In rare cases where a RAID device has slaves on the same block device + # Attribute 2 will be cleared for each partition multiple times + for dev in "${!bootdevs[@]}"; do + local ptb="${bootdevs[$dev]}" + if [[ "$ptb" = GPT ]]; then + local disk="${dev%%[[:digit:]]*}" #ex: /dev/sda + clear_gpt_attr2 "$disk" + fi + done + + # Set the boot flag on bootdevs (generated from get_boot_devices) + for part in "${!bootdevs[@]}"; do + local ptb="${bootdevs[$part]}" + local partnum="${part##*[[:alpha:]]}" + case "$part" in + *[[:digit:]]p[[:digit:]]*) + local disk="${part%%p$partnum}" # get everything before p1 + ;; + *) + local disk="${part%%[[:digit:]]*}" + ;; + esac + + if [[ "$ptb" = MBR ]]; then + if sfdisk "$disk" -A "$partnum" &>/dev/null; then + echo "Boot Flag Set - $part" + else + echo "FAILED to Set the boot flag on $part" + exit 3 + fi + elif [[ "$ptb" = GPT ]]; then + if sgdisk "$disk" --attributes="$partnum":set:2 &>/dev/null; then + echo "Attribute Legacy Bios Bootable Set - $part" + else + echo "FAILED to set attribute Legacy BIOS Bootable on $part" + exit 3 + fi + fi + done + return 0 +} + +install_mbr() { + # If any bootdev is a block device without partitions bail + # we want to install the mbr to a partitioned disk + for dev in "${!bootdevs[@]}"; do + dev_is_part "$dev" || { echo "$dev - is a block device. Aborting MBR install"; return 1; } + done + + for part in "${!bootdevs[@]}"; do + local partnum="${part##*[[:alpha:]]}" + case "$part" in + *[[:digit:]]p[[:digit:]]*) + local disk="${part%%p$partnum}" # get everything before p1 + ;; + *) + local disk="${part%%[[:digit:]]*}" + ;; + esac + local ptb="${bootdevs[$part]}" + + # We want to install to the root of the block device + # If the device is a partition - ABORT! + dev_is_part "$disk" && \ + { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;} + + if [[ "$ptb" = MBR ]]; then + mbrfile="$libpath/mbr.bin" + elif [[ "$ptb" = GPT ]]; then + mbrfile="$libpath/gptmbr.bin" + fi + + if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then + echo "Installed MBR ($mbrfile) to $disk" + else + echo "Error Installing MBR ($mbrfile) to $disk" + exit 4 + fi + done + return 0 +} + +_install() { + # Copy files to /boot + for file in "${com32_files[@]}"; do + # Symlink files even if links exist + if [[ "$boot" = root ]]; then + ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null + elif [[ "$boot" = boot ]]; then + cp "$libpath/$file" "$bootpath/$file" + fi + done + + # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS + if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then + if [[ "$boot" = root ]]; then + ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null + elif [[ "$boot" = boot ]]; then + cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + fi + fi + + if device_is_raid "$bootpart"; then + echo "Detected RAID on /boot - installing Syslinux with --raid" + "$extlinux" --install "$bootpath" -r > /dev/null 2>&1 + else + "$extlinux" --install "$bootpath" > /dev/null 2>&1 + fi + + if (( $? )); then + echo "Syslinux install failed" + exit 2 + else + echo "Syslinux install successful" + fi + + touch "$CHROOT/$autoupdate_file" +} + +update() { + # Update any com and c32 files in /boot + if [[ "$boot" = boot ]]; then + for file in "$bootpath"/*.{c32,com}; do + file=$(basename "$file") + cp "$libpath/$file" "$bootpath/$file" &> /dev/null + done + if [[ -f "$bootpath/pci.ids" ]]; then + cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + fi + fi + + if device_is_raid $bootpart; then + echo "Detected RAID on /boot - installing Syslinux with --raid" + "$extlinux" --update "$bootpath" -r &> /dev/null + else + "$extlinux" --update "$bootpath" &> /dev/null + fi + + if (($?)); then + echo "Syslinux update failed" + exit 2 + else + echo "Syslinux update successful" + fi +} + +# Make sure only root can run our script +if (( $(id -u) != 0 )); then + echo "This script must be run as root" 1>&2 + exit 1 +fi + +if (( $# == 0 )); then + usage + exit 1 +fi + +while getopts "c:uihmas" opt; do + case $opt in + c) + CHROOT=$(readlink -e "$OPTARG") + if [[ -z $CHROOT ]]; then + echo "error: chroot path ``$OPTARG does not exist"; + exit 1 + fi + ;; + h) + usage + exit 0 + ;; + i) + INSTALL="True" + ;; + u) + UPDATE="True" + ;; + m) + MBR="True" + ;; + a) + SET_ACTIVE="True" + ;; + s) + # If AUTOUPDATE_FILE does not exist exit the script + if [[ -f $autoupdate_file ]]; then + UPDATE="True" + else + exit 0 + fi + ;; + *) + usage + exit 1 + ;; + esac +done + +# Display Usage Information if both Install and Update are passed +if [[ $INSTALL && $UPDATE ]]; then + usage + exit 1 +fi + +# If a chroot dir is path set variables to reflect chroot +if [[ "$CHROOT" ]]; then + libpath="$CHROOT$libpath" + bootpath="$CHROOT$bootpath" + extlinux="$CHROOT$extlinux" +fi + +# Exit if no /boot path exists +if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then + echo "Error: $bootpath is empty!" + echo "Is /boot mounted?" + exit 1 +fi + +# Get the boot device if any of these options are passed +if [[ $INSTALL || $UPDATE || $SET_ACTIVE || $MBR ]]; then + getBoot +fi + +# Install or Update +if [[ $INSTALL ]]; then + _install || exit +elif [[ $UPDATE ]]; then + update || exit +fi + + +# SET_ACTIVE and MBR +if [[ $SET_ACTIVE ]] || [[ $MBR ]]; then + get_boot_devices + + if [[ $SET_ACTIVE ]]; then + set_active || exit + fi + + if [[ $MBR ]]; then + install_mbr || exit + fi +fi + +exit 0 + +# vim: set et sw=4: diff --git a/testing/syslinux/syslinux.cfg b/testing/syslinux/syslinux.cfg new file mode 100644 index 000000000..02127d21d --- /dev/null +++ b/testing/syslinux/syslinux.cfg @@ -0,0 +1,79 @@ +# Config file for Syslinux - +# /boot/syslinux/syslinux.cfg +# +# Comboot modules: +# * menu.c32 - provides a text menu +# * vesamenu.c32 - provides a graphical menu +# * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders +# * hdt.c32 - hardware detection tool +# * reboot.c32 - reboots the system +# * poweroff.com - shutdown the system +# +# To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux. +# If /usr and /boot are on the same file system, symlink the files instead +# of copying them. +# +# If you do not use a menu, a 'boot:' prompt will be shown and the system +# will boot automatically after 5 seconds. +# +# Please review the wiki: https://wiki.archlinux.org/index.php/Syslinux +# The wiki provides further configuration examples + +DEFAULT arch +PROMPT 0 # Change to 1 if you do not want to use a menu +TIMEOUT 50 +# You can create syslinux keymaps with the keytab-lilo tool +#KBDMAP de.ktl + +# Menu Configuration +# Either menu.c32 or vesamenu32.c32 must be copied to /boot/syslinux +UI menu.c32 +#UI vesamenu.c32 + +# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu +MENU TITLE Arch Linux +#MENU BACKGROUND splash.png +MENU COLOR border 30;44 #40ffffff #a0000000 std +MENU COLOR title 1;36;44 #9033ccff #a0000000 std +MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all +MENU COLOR unsel 37;44 #50ffffff #a0000000 std +MENU COLOR help 37;40 #c0ffffff #a0000000 std +MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std +MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std +MENU COLOR msg07 37;40 #90ffffff #a0000000 std +MENU COLOR tabmsg 31;40 #30ffffff #00000000 std + +# boot sections follow +# +# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line. +# +#-* + +LABEL arch + MENU LABEL Arch Linux + LINUX ../vmlinuz-linux + APPEND root=/dev/sda3 ro + INITRD ../initramfs-linux.img + +LABEL archfallback + MENU LABEL Arch Linux Fallback + LINUX ../vmlinuz-linux + APPEND root=/dev/sda3 ro + INITRD ../initramfs-linux-fallback.img + +#LABEL windows +# MENU LABEL Windows +# COM32 chain.c32 +# APPEND hd0 1 + +LABEL hdt + MENU LABEL HDT (Hardware Detection Tool) + COM32 hdt.c32 + +LABEL reboot + MENU LABEL Reboot + COM32 reboot.c32 + +LABEL off + MENU LABEL Power Off + COMBOOT poweroff.com diff --git a/testing/syslinux/syslinux.install b/testing/syslinux/syslinux.install new file mode 100644 index 000000000..0dc0ece36 --- /dev/null +++ b/testing/syslinux/syslinux.install @@ -0,0 +1,13 @@ +post_install() { + echo "==> If you want to use syslinux as your bootloader" + echo "==> edit /boot/syslinux/syslinux.cfg and run" + echo "==> # /usr/sbin/syslinux-install_update -i -a -m" + echo "==> to install it." +} + +post_upgrade() { + # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists + /usr/sbin/syslinux-install_update -s +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD index b5d4c9222..bab6a2cbe 100644 --- a/testing/udev/PKGBUILD +++ b/testing/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 133994 2011-07-31 12:10:23Z tomegun $ +# $Id: PKGBUILD 134147 2011-08-02 11:38:00Z tomegun $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> @@ -7,7 +7,7 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') pkgver=173 -pkgrel=2 +pkgrel=3 arch=(i686 x86_64) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') @@ -16,10 +16,13 @@ groups=('base') options=(!makeflags !libtool) makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 + bluetooth.patch 81-arch.rules) build() { cd $srcdir/$pkgbase-$pkgver + # fix https://bugs.archlinux.org/task/25356 (submitted upstream) + patch -Np1 -i ../bluetooth.patch ./configure --sysconfdir=/etc\ --with-rootlibdir=/lib\ --libexecdir=/lib/udev\ @@ -94,4 +97,5 @@ package_udev-compat() { mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0 } md5sums=('91a88a359b60bbd074b024883cc0dbde' + '36cb9bfb55a8d931b7498d2e46730745' 'ec529eb1ddaabb70c61b38f80bb8462a') diff --git a/testing/udev/bluetooth.patch b/testing/udev/bluetooth.patch new file mode 100644 index 000000000..96f5d6901 --- /dev/null +++ b/testing/udev/bluetooth.patch @@ -0,0 +1,36 @@ +From 7462d61442f606cc118722e0572ac8db48fa2540 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org> +Date: Tue, 2 Aug 2011 10:56:33 +0200 +Subject: [PATCH] rules: input - fix detection of bluetooth hid devices in + Xorg + +Commit c49df20758e0f22778cfc93b598f2929f4c86272 prevented udev from +creating broken symlinks for bluetooth hid devices. Unfortunately, +it also removed the ID_INPUT=1 and ID_INPUT_{KEY,MOUSE}=1 properties +from those devices. Xorg relies on these properties for cold- and +hotplugging of input devices. + +With this patch, udev still omits the broken symlinks, but also +imports the input_id properties again. +--- + rules/rules.d/60-persistent-input.rules | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/rules/rules.d/60-persistent-input.rules b/rules/rules.d/60-persistent-input.rules +index 65a6381..28d50d2 100644 +--- a/rules/rules.d/60-persistent-input.rules ++++ b/rules/rules.d/60-persistent-input.rules +@@ -2,9 +2,9 @@ + + ACTION=="remove", GOTO="persistent_input_end" + SUBSYSTEM!="input", GOTO="persistent_input_end" +-SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end" + + ENV{ID_INPUT}=="", IMPORT{program}="input_id %p" ++SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end" + SUBSYSTEMS=="usb", ENV{ID_BUS}=="", IMPORT{program}="usb_id --export %p" + + # determine class name for persistent symlinks +-- +1.7.6 + |