diff options
Diffstat (limited to 'abs/extra')
109 files changed, 6479 insertions, 2642 deletions
diff --git a/abs/extra/alsa-firmware/PKGBUILD b/abs/extra/alsa-firmware/PKGBUILD new file mode 100644 index 0000000..d9c890b --- /dev/null +++ b/abs/extra/alsa-firmware/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 79046 2010-04-30 05:38:39Z tpowa $ +# Contributor: Jochen Immendörfer <jochen dot immendoerfer at gmail dot com> +# Package Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=alsa-firmware +pkgver=1.0.23 +pkgrel=1 +pkgdesc="ALSA firmware package" +arch=('i686' 'x86_64') +url="http://alsa-project.org/" +license=('GPL') +source=(ftp://ftp.alsa-project.org/pub/firmware/$pkgname-$pkgver.tar.bz2) +options=(!strip) + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 + make DESTDIR=$pkgdir install || return 1 + # remove files which conflicts with kernel26-firmware + rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_kernel.fw || return 1 + rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_minisrc.fw || return 1 + rm -rf ${pkgdir}/lib/firmware/korg/k1212.dsp || return 1 + rm -rf ${pkgdir}/lib/firmware/sb16/alaw_main.csp || return 1 + rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_capture.csp || return 1 + rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_init.csp || return 1 + rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_playback.csp || return 1 + rm -rf ${pkgdir}/lib/firmware/sb16/mulaw_main.csp || return 1 + rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_ctrl.fw || return 1 + rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_dsp.fw || return 1 + rm -rf ${pkgdir}/lib/firmware/yamaha/ds1e_ctrl.fw || return 1 + rm -rf ${pkgdir}/lib/firmware/yamaha/yss225_registers.bin || return 1 +} +md5sums=('e3f755331d6d485f6fd697249b90f877') diff --git a/abs/extra/autofs/PKGBUILD b/abs/extra/autofs/PKGBUILD index ac317d2..ae04100 100755 --- a/abs/extra/autofs/PKGBUILD +++ b/abs/extra/autofs/PKGBUILD @@ -5,7 +5,7 @@ pkgname=autofs pkgver=5.0.5 -pkgrel=1 +pkgrel=3 pkgdesc="A kernel-based automounter for Linux" arch=('i686' 'x86_64') url="http://wiki.autofs.net/FrontPage" @@ -14,8 +14,14 @@ depends=('libldap' 'libxml2' 'heimdal') backup=(etc/autofs/auto.master etc/autofs/auto.misc etc/conf.d/autofs) install=${pkgname}.install source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" - 'autofs.conf.d' 'auto.master' 'auto.misc' - 'heimdal.patch' 'run' 'log.run' 'finish') + 'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc' + 'heimdal.patch') +md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a' + 'e307bf6d2638e46eeb916cf42fe029b2' + '47f597c870410055e0fdb66103daf928' + 'a6cefb591e77b31b79dbb7243646c96b' + 'd8a15ec9186c5c0b36e5cea1e2739e8a' + 'efd46b6406b940cb48f7c6197790fb8e') build() { export MAKEFLAGS="-j1" @@ -39,19 +45,6 @@ package(){ install -Dm644 ${srcdir}/auto.master ${pkgdir}/etc/autofs/auto.master || return 1 install -Dm644 ${srcdir}/auto.misc ${pkgdir}/etc/autofs/auto.misc || return 1 + install -Dm755 ${srcdir}/autofs ${pkgdir}/etc/rc.d/autofs || return 1 install -Dm644 ${srcdir}/autofs.conf.d ${pkgdir}/etc/conf.d/autofs || return 1 - mkdir -p ${pkgdir}/etc/sv/autofs/supervise - mkdir -p ${pkgdir}/etc/sv/autofs/log/supervise - install -Dm744 ${srcdir}/run ${pkgdir}/etc/sv/autofs || return 1 - install -Dm744 ${srcdir}/finish ${pkgdir}/etc/sv/autofs || return 1 - install -Dm744 ${srcdir}/log.run ${pkgdir}/etc/sv/autofs/log/run || return 1 } - -md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a' - '47f597c870410055e0fdb66103daf928' - 'a6cefb591e77b31b79dbb7243646c96b' - 'd8a15ec9186c5c0b36e5cea1e2739e8a' - 'efd46b6406b940cb48f7c6197790fb8e' - 'f2048c24da7fa1421c2e8b0b90fb17f9' - '518e277f960a1af837ba6c5cca13c615' - '5b30948886b6d71287652d784fccf1fb') diff --git a/abs/extra/autofs/autofs b/abs/extra/autofs/autofs index 59ea4f5..08bd3e1 100644 --- a/abs/extra/autofs/autofs +++ b/abs/extra/autofs/autofs @@ -1,5 +1,7 @@ #!/bin/bash +daemon_name=autofs + . /etc/rc.conf . /etc/rc.d/functions @@ -13,31 +15,36 @@ fi PID=`cat /var/run/autofs-running 2> /dev/null` case "$1" in start) - stat_busy "Starting Automounter" + stat_busy "Starting $daemon_name daemon" [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null if [ $? -gt 0 ]; then stat_fail else - add_daemon autofs + add_daemon $daemon_name stat_done fi ;; stop) - stat_busy "Stopping Automounter" + stat_busy "Stopping $daemon_name daemon" [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm_daemon autofs + rm_daemon $daemon_name stat_done fi ;; restart) + stat_busy "Restarting $daemon_name daemon" $0 stop sleep 1 $0 start ;; + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart|status}" esac exit 0 diff --git a/abs/extra/bluez/rc.bluetooth b/abs/extra/bluez/rc.bluetooth deleted file mode 100644 index 38b6216..0000000 --- a/abs/extra/bluez/rc.bluetooth +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# -# Start/stop the Bluetooth daemons -# - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="bluetoothd" -HID2HCI_NAME="hid2hci" -HIDD_NAME="hidd" -RFCOMM_NAME="rfcomm" -PAND_NAME="pand" -DUND_NAME="dund" - -DAEMON_EXEC="/usr/sbin/bluetoothd" -HID2HCI_EXEC="/usr/sbin/hid2hci" -HIDD_EXEC="/usr/bin/hidd" -RFCOMM_EXEC="/usr/bin/rfcomm" -PAND_EXEC="/usr/bin/pand" -DUND_EXEC="/usr/bin/dund" - -DAEMON_ENABLE="true" -HID2HCI_ENABLE="false" -HIDD_ENABLE="false" -RFCOMM_ENABLE="false" -DUND_ENABLE="false" -PAND_ENABLE="false" - -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -HIDD_OPTIONS="" -DUND_OPTIONS="" -PAND_OPTIONS="" - -[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth - -case "$1" in - start) - stat_busy "Starting bluetooth subsystem:" - if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then - stat_append " $DAEMON_NAME" - $DAEMON_EXEC - fi - if [ "$HID2HCI_ENABLE" = "true" -a -x "$HID2HCI_EXEC" ] ; then - stat_append " $HID2HCI_NAME" - $HID2HCI_EXEC --tohci > /dev/null 2>&1 || true - fi - if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then - stat_append " $SDPD_NAME" - $SDPD_EXEC - fi - if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then - stat_append " $HIDD_NAME" - $HIDD_EXEC $HIDD_OPTIONS --server - fi - if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all - fi - if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then - stat_append " $DUND_NAME" - $DUND_EXEC $DUND_OPTIONS - fi - if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then - stat_append " $PAND_NAME" - $PAND_EXEC $PAND_OPTIONS - fi - add_daemon bluetooth - stat_done - ;; - stop) - stat_busy "Stopping bluetooth subsystem:" - - stat_append " $PAND_NAME" - killall $PAND_NAME >/dev/null 2>&1 - - stat_append " $DUND_NAME" - killall $DUND_NAME >/dev/null 2>&1 - - if [ -x "$RFCOMM_EXEC" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC release all >/dev/null 2>&1 - fi - - stat_append " $HIDD_NAME" - killall $HIDD_NAME >/dev/null 2>&1 - - stat_append " $SDPD_NAME" - killall $SDPD_NAME >/dev/null 2>&1 - - stat_append " $DAEMON_NAME" - killall $DAEMON_NAME >/dev/null 2>&1 - - rm_daemon bluetooth - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/extra/community/cwiid-svn/PKGBUILD b/abs/extra/community/cwiid-svn/PKGBUILD deleted file mode 100644 index eba6523..0000000 --- a/abs/extra/community/cwiid-svn/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -#Contributor:Andrea Tarocchi <valdar@email.it> -pkgname=cwiid-svn -#pkgver=`date +%Y%m%d` -pkgver=184 -pkgrel=3 -pkgdesc="Cwiid-svn is the bleeding edge version of a wiimote's driver and utility tools" -arch=(i686 x86_64) -url="http://abstrakraft.org/cwiid/" -license=('GPL') - -depends=('gawk' 'bluez-libs' 'gtk2') -makedepends=('subversion') -conflicts=('cwiid') -provides=('cwiid') -install=('cwiid.install') -source=() -md5sums=('b3966beecae0de200c90523af8f3bf0e') - -_svntrunk=http://abstrakraft.org/cwiid/svn/trunk/ -_svnmod=cwiid - -build() { - cd $startdir/src - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - #svn co $_svntrunk --config-dir ./ $_svnmod - - msg "SVN checkout done or server timeout" - msg "Starting make..." - - cp -r $_svnmod $_svnmod-build - cd $_svnmod-build - - autoreconf - - ./configure --prefix=/usr --disable-ldconfig --sysconfdir=/etc - make - - install -d $startdir/pkg/usr/bin - install -d $startdir/pkg/etc - install -d $startdir/pkg/usr/lib - install -d $startdir/pkg/usr/include - - make prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc install - - install -D -m644 ./wminput/README $pkgdir/usr/share/doc/cwiid-svn/wminput - - rm -rf $startdir/src/$_svnmod-build -} diff --git a/abs/extra/community/cwiid-svn/cwiid.install b/abs/extra/community/cwiid-svn/cwiid.install deleted file mode 100644 index 6f3dccc..0000000 --- a/abs/extra/community/cwiid-svn/cwiid.install +++ /dev/null @@ -1,16 +0,0 @@ -# arg 1: the new package version -post_install() { -echo -e "Note:" -echo -e "\033[1;31m==> In order to use wminput you have to load the uinput kernel module:\033[0m" -echo -e "\033[1;31m==> modprobe uinput (as root)\033[0m" -echo -e "\033[1;31m==> and you have to assign correct right acces to /dev/uinput\033[0m" -echo -e "\033[1;31m==> PLEASE READ /usr/share/doc/cwiid-svn/wminput\033[0m" -} - -post_upgrade() { - post_install $1 -} - -op=$1 -shift -$op $* diff --git a/abs/extra/community/jre/PKGBUILD b/abs/extra/community/jre/PKGBUILD deleted file mode 100644 index cd9a932..0000000 --- a/abs/extra/community/jre/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD,v 1.6 2009/06/01 19:10:05 wonder Exp $ -# Maintainer: Jason Chu <jason@archlinux.org> - -pkgname=jre -pkgver=6u14 -pkgrel=1 -pkgdesc="Sun's java runtime environment" -arch=('i686' 'x86_64') - [ "$CARCH" = "i686" ] && _arch=i586 - [ "$CARCH" = "x86_64" ] && _arch=amd64 -url="http://java.sun.com" -depends=('glibc' 'libxtst') -install="jre.install" -source=(http://download.java.net/dlj/binaries/jdk-$pkgver-dlj-linux-$_arch.bin - https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh - jre.profile) -[ "$CARCH" = "i686" ] && md5sums=('299c445e4b14bfbb2a05323734d89c0c' - '94065b612df0046d9ae758943f9f6a75' - '50b4f5ac4129097461d246645d73a622') -[ "$CARCH" = "x86_64" ] && md5sums=('6e866db04748296fc34ed83a92420403' - '94065b612df0046d9ae758943f9f6a75' - '50b4f5ac4129097461d246645d73a622') - - -replaces=('j2re') -conflicts=('j2re' 'java-runtime') -provides=('j2re' 'java-runtime=6') -license=('custom') - -build() { - cd $startdir/src - - mkdir unbundle-jdk - cd unbundle-jdk - - sh ../jdk-$pkgver-dlj-linux-$_arch.bin --accept-license - - cd .. - - sh construct.sh unbundle-jdk linux-jdk linux-jre - - mkdir -p $startdir/pkg/opt/java - mv linux-jdk/jre $startdir/pkg/opt/java - - install -D -m755 $startdir/src/${pkgname}.profile $startdir/pkg/etc/profile.d/${pkgname}.sh - - mkdir -p $startdir/pkg/usr/lib/mozilla/plugins - - if [ "$CARCH" = "i686" ]; then - ln -s /opt/java/jre/lib/i386/libnpjp2.so $startdir/pkg/usr/lib/mozilla/plugins - else ln -s /opt/java/jre/lib/amd64/libnpjp2.so $startdir/pkg/usr/lib/mozilla/plugins - fi - - mkdir -p $startdir/pkg/usr/share/licenses/jre - cp $startdir/pkg/opt/java/jre/COPYRIGHT $startdir/pkg/usr/share/licenses/jre - cp $startdir/pkg/opt/java/jre/LICENSE $startdir/pkg/usr/share/licenses/jre - cp $startdir/pkg/opt/java/jre/THIRDPARTYLICENSEREADME.txt $startdir/pkg/usr/share/licenses/jre -} diff --git a/abs/extra/community/libmatroska/PKGBUILD b/abs/extra/community/libmatroska/PKGBUILD deleted file mode 100644 index 0011c13..0000000 --- a/abs/extra/community/libmatroska/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: damir <damir@archlinux.org> -# Contributor 03/08/04 <lefungus@altern.org> - -pkgname=libmatroska -pkgver=0.8.1 -pkgrel=1 -pkgdesc="Matroska library" -arch=(i686 x86_64) -url="http://dl.matroska.org/downloads/libmatroska/" -depends=('libebml>=0.7.6') -#source=(http://www.bunkus.org/videotools/mkvtoolnix/sources/$pkgname-$pkgver.tar.bz2) -source=($url/$pkgname-$pkgver.tar.bz2) - -build() { - cd $startdir/src/$pkgname-$pkgver/make/linux - make sharedlib || return 1 - make prefix=$startdir/pkg/usr install -} - -md5sums=('20cf624ace0c58a54c7752eebfbc0b19') diff --git a/abs/extra/community/libmpcdec/PKGBUILD b/abs/extra/community/libmpcdec/PKGBUILD deleted file mode 100644 index feeaf8b..0000000 --- a/abs/extra/community/libmpcdec/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libmpcdec -pkgver=1.2.6 -pkgrel=1 -pkgdesc="Musepack decoding library" -arch=(i686 x86_64) -license=('custom') -depends=('glibc') -options=('!libtool') -source=(http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2) -url="http://musepack.net/" -md5sums=('7f7a060e83b4278acf4b77d7a7b9d2c0') - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-static - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 - install -Dm644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING -} diff --git a/abs/extra/community/moblockcontrol/PKGBUILD b/abs/extra/community/moblockcontrol/PKGBUILD deleted file mode 100644 index 5a912e2..0000000 --- a/abs/extra/community/moblockcontrol/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Contributor: marinz <marinz@email.it> - -pkgname=moblockcontrol -pkgver=1.0 -pkgrel=10 -pkgdesc="moblock-control" -arch=('i686' 'x86_64') -url="http://moblock-deb.sourceforge.net/" -license=('GPL') -groups=() -depends=('moblock') -makedepends=() -install=moblockcontrol.install -source=(http://download.sourceforge.net/moblock-deb/moblock-control-1.0.tar.gz \ - moblock_control.patch moblock-control-update.sh) -md5sums=('1399e5465028e116e941cd1e01f6f7fc' - 'dc269c6c47bc423b9093919d52e97d63') -backup=('etc/moblock/moblock.conf' 'etc/moblock/blocklists.list') - -build() { - - cd $startdir/src/moblock-control-1.0 - - patch -Np1 -i ../moblock_control.patch || return 1 - - install -d ${pkgdir}/usr/bin ${pkgdir}/etc/moblock ${pkgdir}/etc/default ${pkgdir}/var/spool/moblock/user ${pkgdir}/lib/lsb ${pkgdir}/var/log - install -m 755 moblock-control ${pkgdir}/usr/bin/moblock-control - install -m 755 blocklists.list ${pkgdir}/etc/moblock/blocklists.list - install -m 755 moblock.conf ${pkgdir}/etc/moblock/moblock.conf - install -m 755 moblock.default ${pkgdir}/etc/default/moblock - install -m 755 init-functions ${pkgdir}/lib/lsb/init-functions - install -m 755 iptables-custom-insert.sh ${pkgdir}/etc/iptables-custom-insert.sh - install -m 755 iptables-custom-remove.sh ${pkgdir}/etc/iptables-custom-remove.sh - - touch ${pkgdir}/var/log/moblock-control.log - touch ${pkgdir}/etc/moblock/guarding.p2p - - cd $startdir/src - install -m 755 moblock-control-update.sh ${pkgdir}/usr/bin/moblock-control-update.sh - sed -i "s/config\/templist.gz/config\/badpeers.gz/" $startdir/pkg/etc/moblock/blocklists.list -} - diff --git a/abs/extra/community/moblockcontrol/moblock-control-update.sh b/abs/extra/community/moblockcontrol/moblock-control-update.sh deleted file mode 100644 index 8da564d..0000000 --- a/abs/extra/community/moblockcontrol/moblock-control-update.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -. /etc/profile -/usr/bin/moblock-control update diff --git a/abs/extra/community/moblockcontrol/moblock_control.patch b/abs/extra/community/moblockcontrol/moblock_control.patch deleted file mode 100644 index db6bbf9..0000000 --- a/abs/extra/community/moblockcontrol/moblock_control.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- moblockcontrol/moblock-control_2 2008-09-25 23:22:39.000000000 +0200 -+++ moblockcontrol/moblock-control 2008-12-28 09:33:51.000000000 +0100 -@@ -954,7 +954,7 @@ - else - # The options Moblock is started with - # The same like above, but with a "&" to start moblock in the background -- DAEMON_OPTS="-$BLOCKLIST_FORMAT $BLOCKLIST $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT $LOG_TIMESTAMP_OPT -r $REJECT_MARK -a $ACCEPT_MARK $DAEMON_LOG &" -+ DAEMON_OPTS="-$BLOCKLIST_FORMAT $BLOCKLIST $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT $DAEMON_LOG & " - # Start MoBlock - start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS # The init-functions provided with moblock-control depend on this syntax! - fi diff --git a/abs/extra/community/moblockcontrol/moblockcontrol.install b/abs/extra/community/moblockcontrol/moblockcontrol.install deleted file mode 100644 index 439a3ee..0000000 --- a/abs/extra/community/moblockcontrol/moblockcontrol.install +++ /dev/null @@ -1,28 +0,0 @@ -post_install() { - if [ ! -d /var/spool/moblock/used ] - then - mkdir -p /var/spool/moblock/used - fi - - if [ ! -e /etc/cron.daily/moblock-control-update.sh ] - then - ln -s /usr/bin/moblock-control-update.sh /etc/cron.daily/moblock-control-update.sh - fi -} - -post_upgrade() { - if [ ! -d /var/spool/moblock/used ] - then - mkdir -p /var/spool/moblock/used - fi - - if [ ! -e /etc/cron.daily/moblock-control-update.sh ] - then - ln -s /usr/bin/moblock-control-update.sh /etc/cron.daily/moblock-control-update.sh - fi -} - -op=$1 -shift -$op $* - diff --git a/abs/extra/community/mre/PKGBUILD b/abs/extra/community/mre/PKGBUILD index 72d3bc3..0987904 100644 --- a/abs/extra/community/mre/PKGBUILD +++ b/abs/extra/community/mre/PKGBUILD @@ -1,14 +1,14 @@ arch=('i686') pkgname=mre pkgver=1.1.2 -pkgrel=2 +pkgrel=5 _kernver=2.6.28-LinHES pkgdesc="Myth Recording Extender" url="http://sourceforge.net/projects/mythtv-tools/" license=('GPL-2') depends=('PearDB' 'PearLog') makedepends=() -source=('mre-1.1.2.tar.gz' 'patch.diff' 'livescores.tgz' 'run' 'mre.lr') +source=('mre-1.1.2.tar.gz' 'patch.diff' 'run' 'mre.lr') install=('mre.install') build() { @@ -18,24 +18,20 @@ build() { make INST_ROOT=$startdir/pkg install cp $startdir/src/mre-1.1.2/conf/mre.conf $startdir/pkg/etc/mre.conf cp $startdir/src/mre-1.1.2/test/test_title_subtitle.php\ - $startdir/pkg/usr/local/bin/ + $startdir/pkg/usr/local/bin/ chmod a+x $startdir/pkg/usr/local/bin/test_title_subtitle.php rm -r $startdir/pkg/etc/init.d - mkdir -p $startdir/pkg/var/log/mre + mkdir -p $startdir/pkg/var/log/mre + chown root:log "$startdir/pkg/var/log/mre" touch $startdir/pkg/var/log/mre/mre.log chown mythtv:mythtv "$startdir/pkg/var/log/mre/mre.log" mkdir -p $startdir/pkg/etc/sv/mre cp $startdir/src/run $startdir/pkg/etc/sv/mre/run mkdir -p $startdir/pkg/etc/logrotate.d cp $startdir/src/mre.lr $startdir/pkg/etc/logrotate.d/mre.lr - mkdir -p $startdir/pkg/data/srv/http/htdocs/ - cp -r $startdir/src/scores /$startdir/pkg/data/srv/http/htdocs/ - chown -R http:users "$startdir/pkg/data/srv/http/htdocs/scores" } - md5sums=('8ab312e7597ae9413a57bd5e9a068096' - 'd2591989da512c0faa567408721b6e95' - 'fcc02a234b22ba5c2714a6b8dbaf3bef' - 'dea22d4e0f2c1dd8a2debd2f50756dda' + 'ed6cb9012c88d589e26132796132bf25' + '10e01d572b45ad718e49ff9ef5c230c5' '6d71ab57afd974c5130c994b94e8746f') diff --git a/abs/extra/community/mre/livescores.tgz b/abs/extra/community/mre/livescores.tgz Binary files differdeleted file mode 100644 index d97175b..0000000 --- a/abs/extra/community/mre/livescores.tgz +++ /dev/null diff --git a/abs/extra/community/mre/mre.install b/abs/extra/community/mre/mre.install index 4e3fb0d..bb08427 100755 --- a/abs/extra/community/mre/mre.install +++ b/abs/extra/community/mre/mre.install @@ -5,7 +5,7 @@ post_install() { } post_upgrade() { - + /bin/true } diff --git a/abs/extra/community/mre/patch.diff b/abs/extra/community/mre/patch.diff index 66390d9..38a501a 100644 --- a/abs/extra/community/mre/patch.diff +++ b/abs/extra/community/mre/patch.diff @@ -9,65 +9,6 @@ return $matches[1]; return '0'; } ---- ../mre-1.1.2/class/NHLEvent.php.original 2006-11-05 17:06:57.000000000 -0600 -+++ ../mre-1.1.2/class/NHLEvent.php 2010-05-21 00:44:49.000000000 -0500 -@@ -27,7 +27,7 @@ - /** - * URL to grab game info from - */ -- const url = 'http://scores.espn.go.com/nhl/scoreboard'; -+ const url = 'http://localhost/scores/nhl.php'; - - /** - * Class constructor. -@@ -39,32 +39,27 @@ - parent::__construct(); - - $criteria = $this->generateSearchTerms($gameInfo); -+ - if(!sizeof($criteria)) - trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING); - else - { - $data = file(self::url); -- if($data !== FALSE) -- foreach($criteria as $term) -- { -- $status = ''; -- foreach($data as $line) -- if(preg_match('/' . preg_quote($term) . '/', $line)) -- { -- $status = $line; -- break; -- } -- if(preg_match('/id.*st"\>(.*)\<\/td/U', $status, $match)) -- { -- $this->setStatus($match[1]); -- if(preg_match('/^Final/', $match[1])) -- $this->setEventOver(TRUE); -- else -- $this->setEventOver(FALSE); -- $this->setValid(TRUE); -- break; -- } -+ if($data) -+ { -+ foreach($data as $line) -+ { -+ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) -+ { -+ if(strpos($line,'FINAL')) -+ $this->setEventOver(TRUE); -+ else -+ $this->setEventOver(FALSE); -+ $this->setValid(TRUE); -+ break; -+ } - } -+ } - } - if(!$this->isValid()) - trigger_error("Unable to find NHL info for '$gameInfo'! The NHL parser may need to be updated.", E_USER_WARNING); --- ../mre-1.1.2/conf/mre.conf.in.original 2006-08-13 16:48:57.000000000 -0500 +++ ../mre-1.1.2/conf/mre.conf.in 2010-05-04 00:25:26.000000000 -0500 @@ -28,9 +28,9 @@ @@ -82,18 +23,29 @@ ; Number of minutes to sleep between runs sleep = 5 ; Logging level (0 = normal, 1 = +error, 2 = +warning, 3 = +debug) +--- ../mre-1.1.2/class/EventFactory.php.original 2006-09-22 10:18:07.000000000 -0500 ++++ ../mre-1.1.2/class/EventFactory.php 2010-08-28 00:02:37.000000000 -0500 +@@ -50,7 +50,7 @@ + $obj = new NHLEvent($data['subtitle']); break; + case 'MLB Baseball': + $obj = new MLBEvent($data['subtitle']); break; +- case 'NFL Football': ++ case ($data['title']=='NFL Football' || $data['title']=='NFL Preseason Football'): + $obj = new NFLEvent($data['subtitle']); break; + case 'College Football': + $obj = new NCAAFEvent($data['subtitle']); break; --- ../mre-1.1.2/class/MLBEvent.php.original 2006-11-05 17:06:57.000000000 -0600 -+++ ../mre-1.1.2/class/MLBEvent.php 2010-05-21 20:08:30.000000000 -0500 ++++ ../mre-1.1.2/class/MLBEvent.php 2010-08-28 00:02:37.000000000 -0500 @@ -27,7 +27,7 @@ /** * URL to grab game info from */ - const url = 'http://scores.espn.go.com/mlb/scoreboard'; -+ const url = 'http://localhost/scores/mlb.php'; ++ const url = 'http://sports.espn.go.com/mlb/bottomline/scores'; /** * Class constructor. -@@ -43,41 +43,22 @@ +@@ -43,41 +43,25 @@ trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING); else { @@ -133,9 +85,12 @@ + $data = file(self::url); + if($data) + { -+ foreach($data as $line) -+ { -+ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) ++ $data_array=explode("&", $data[0]); ++ foreach($data_array as $line) ++ { ++ $line=str_replace("%20", " ", $line); ++ $line=str_replace("Chicago Sox", "Chicago White Sox", $line); #Program guide gives Chicago White Sox, website gives Chicago Sox ++ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) + { + if((strpos($line,'FINAL'))or(strpos($line,'Postponed'))) + $this->setEventOver(TRUE); @@ -150,18 +105,80 @@ } if(!$this->isValid()) trigger_error("Unable to find MLB info for '$gameInfo'! The MLB parser may need to be updated.", E_USER_WARNING); +--- ../mre-1.1.2/class/NFLEvent.php.original 2006-11-05 17:06:57.000000000 -0600 ++++ ../mre-1.1.2/class/NFLEvent.php 2010-08-28 00:06:56.000000000 -0500 +@@ -27,7 +27,7 @@ + /** + * URL to grab game info from + */ +- const url = 'http://scores.espn.go.com/nfl/scoreboard'; ++ const url = 'http://sports.espn.go.com/nfl/bottomline/scores'; + + /** + * Class constructor. +@@ -44,33 +44,23 @@ + else + { + $data = file(self::url); +- $games = array(); +- if($data !== FALSE) +- { +- // Split the huge string into individual game data +- foreach($data as $line) +- if(preg_match('/\<td class="teamTop.*".*\>.*/', $line)) +- $games[] = $line; +- if(!sizeof($games)) +- trigger_error("Unable to find valid game data within source!", E_USER_WARNING); +- foreach($criteria as $term) +- { +- foreach($games as $game) +- { +- if(preg_match('/' . preg_quote($term) . '/', $game)) +- if(preg_match('/teamTop.*\>(.*)\<\/td\>/U', $game, $matches)) +- { +- $this->setStatus($matches[1]); +- if(preg_match('/^(Final|Postponed)/', $matches[1])) +- $this->setEventOver(TRUE); +- else +- $this->setEventOver(FALSE); +- $this->setValid(TRUE); +- break 2; +- } +- } +- } +- } ++ if($data) ++ { ++ $data_array=explode("&", $data[0]); ++ foreach($data_array as $line) ++ { ++ $line=str_replace("%20", " ", $line); ++ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) ++ { ++ if(strpos($line,'FINAL')) ++ $this->setEventOver(TRUE); ++ else ++ $this->setEventOver(FALSE); ++ $this->setValid(TRUE); ++ break; ++ } ++ } ++ } + } + if(!$this->isValid()) + trigger_error("Unable to find NFL info for '$gameInfo'! The NFL parser may need to be updated.", E_USER_WARNING); --- ../mre-1.1.2/class/NBAEvent.php.original 2006-11-05 17:06:57.000000000 -0600 -+++ ../mre-1.1.2/class/NBAEvent.php 2010-05-21 21:15:42.000000000 -0500 ++++ ../mre-1.1.2/class/NBAEvent.php 2010-08-28 00:09:50.000000000 -0500 @@ -27,7 +27,7 @@ /** * URL to grab game info from */ - const url = 'http://scores.espn.go.com/nba/scoreboard'; -+ const url = 'http://localhost/scores/nba.php'; ++ const url = 'http://sports.espn.go.com/nba/bottomline/scores'; /** * Class constructor. -@@ -44,35 +44,21 @@ +@@ -44,35 +44,23 @@ else { $data = file(self::url); @@ -194,10 +211,12 @@ - break; - } + if($data) -+ { -+ foreach($data as $line) -+ { -+ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) ++ { ++ $data_array=explode("&", $data[0]); ++ foreach($data_array as $line) ++ { ++ $line=str_replace("%20", " ", $line); ++ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) + { + if(strpos($line,'FINAL')) + $this->setEventOver(TRUE); @@ -211,63 +230,64 @@ } if(!$this->isValid()) trigger_error("Unable to find NBA info for '$gameInfo'! The NBA parser may need to be updated.", E_USER_WARNING); ---- ../mre-1.1.2/class/NFLEvent.php.original 2006-11-05 17:06:57.000000000 -0600 -+++ ../mre-1.1.2/class/NFLEvent.php 2010-05-21 19:09:36.000000000 -0500 +--- ../mre-1.1.2/class/NHLEvent.php.original 2006-11-05 17:06:57.000000000 -0600 ++++ ../mre-1.1.2/class/NHLEvent.php 2010-08-28 00:09:04.000000000 -0500 @@ -27,7 +27,7 @@ /** * URL to grab game info from */ -- const url = 'http://scores.espn.go.com/nfl/scoreboard'; -+ const url = 'http://localhost/scores/nfl.php'; +- const url = 'http://scores.espn.go.com/nhl/scoreboard'; ++ const url = 'http://sports.espn.go.com/nhl/bottomline/scores'; /** * Class constructor. -@@ -44,33 +44,21 @@ +@@ -39,32 +39,29 @@ + parent::__construct(); + + $criteria = $this->generateSearchTerms($gameInfo); ++ + if(!sizeof($criteria)) + trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING); else { $data = file(self::url); -- $games = array(); - if($data !== FALSE) -- { -- // Split the huge string into individual game data -- foreach($data as $line) -- if(preg_match('/\<td class="teamTop.*".*\>.*/', $line)) -- $games[] = $line; -- if(!sizeof($games)) -- trigger_error("Unable to find valid game data within source!", E_USER_WARNING); - foreach($criteria as $term) - { -- foreach($games as $game) +- $status = ''; +- foreach($data as $line) +- if(preg_match('/' . preg_quote($term) . '/', $line)) +- { +- $status = $line; +- break; +- } +- if(preg_match('/id.*st"\>(.*)\<\/td/U', $status, $match)) - { -- if(preg_match('/' . preg_quote($term) . '/', $game)) -- if(preg_match('/teamTop.*\>(.*)\<\/td\>/U', $game, $matches)) -- { -- $this->setStatus($matches[1]); -- if(preg_match('/^(Final|Postponed)/', $matches[1])) -- $this->setEventOver(TRUE); -- else -- $this->setEventOver(FALSE); -- $this->setValid(TRUE); -- break 2; -- } +- $this->setStatus($match[1]); +- if(preg_match('/^Final/', $match[1])) +- $this->setEventOver(TRUE); +- else +- $this->setEventOver(FALSE); +- $this->setValid(TRUE); +- break; - } -- } -- } -+ if($data) ++ if($data) + { -+ foreach($data as $line) ++ $data_array=explode("&", $data[0]); ++ foreach($data_array as $line) + { -+ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) ++ $line=str_replace("%20", " ", $line); ++ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) + { -+ if(strpos($line,'FINAL')) ++ if(strpos($line,'FINAL')) + $this->setEventOver(TRUE); + else + $this->setEventOver(FALSE); + $this->setValid(TRUE); + break; + } -+ } -+ } + } ++ } } if(!$this->isValid()) - trigger_error("Unable to find NFL info for '$gameInfo'! The NFL parser may need to be updated.", E_USER_WARNING); + trigger_error("Unable to find NHL info for '$gameInfo'! The NHL parser may need to be updated.", E_USER_WARNING);
\ No newline at end of file diff --git a/abs/extra/community/mre/run b/abs/extra/community/mre/run index 84d08e5..94381b3 100755 --- a/abs/extra/community/mre/run +++ b/abs/extra/community/mre/run @@ -4,6 +4,8 @@ export TERM=linux . /etc/rc.d/functions stat_runit "Starting mythrecordingextender" +export HOME=/home/mythtv + sv start mythbackend || exit 1 sleep 5 diff --git a/abs/extra/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/PKGBUILD b/abs/extra/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/PKGBUILD new file mode 120000 index 0000000..45a9d6a --- /dev/null +++ b/abs/extra/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/PKGBUILD @@ -0,0 +1 @@ +/data/LinHES-PKGBUILD/abs/extra-testing/community/torrentflux/PKGBUILD
\ No newline at end of file diff --git a/abs/extra/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/torrentflux.install b/abs/extra/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/torrentflux.install new file mode 120000 index 0000000..8ce21bd --- /dev/null +++ b/abs/extra/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/torrentflux.install @@ -0,0 +1 @@ +/data/LinHES-PKGBUILD/abs/extra-testing/community/torrentflux/torrentflux.install
\ No newline at end of file diff --git a/abs/extra/community/transmission-cli/ChangeLog b/abs/extra/community/transmission-cli/ChangeLog deleted file mode 100644 index 57a8a01..0000000 --- a/abs/extra/community/transmission-cli/ChangeLog +++ /dev/null @@ -1,60 +0,0 @@ -2008-12-27 Alexander Fehr <pizzapunk gmail com> - - * transmission-cli-1.42-1: - New upstream release. - -2008-11-26 Alexander Fehr <pizzapunk gmail com> - - * transmission-cli-1.40-1: - New upstream release. - Enabled web client. - -2008-09-17 Alexander Fehr <pizzapunk gmail com> - - * transmission-cli-1.34-1: - New upstream release. - -2008-08-23 Alexander Fehr <pizzapunk gmail com> - - * transmission-cli-1.33-1: - New upstream release. - -2008-08-09 Alexander Fehr <pizzapunk gmail com> - - * transmission-cli-1.32-1: - New upstream release. - -2008-08-07 Alexander Fehr <pizzapunk gmail com> - - * transmission-cli-1.31-1: - New upstream release. - Replaced transmission-remote -q with kill in init script. - Removed install message on upgrade. - -2008-07-20 Alexander Fehr <pizzapunk gmail com> - - * transmission-cli-1.22-1: - New upstream release. - Renamed from transmission to transmission-cli. - New maintainer. - Split out GTK+ GUI into transmission-gtk. - Changed url. - Added make dependency on intltool. - Cleaned up init script. - Cleaned up install file. - -2008-01-07 Varun Acharya <varun@archlinux.org> - - * transmission-1.00-1: - Adopted and moved to extra. - -2007-06-26 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - - * transmission-0.72-4: - I had to use gentoo's sources because the tarball provided by the official site is broken. - transmission-{daemon,remote} are back. - -2007-06-19 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - - * transmission-0.72-3: - Rebuild against libevent-1.3b. diff --git a/abs/extra/community/transmission-cli/transmissiond b/abs/extra/community/transmission-cli/transmissiond deleted file mode 100644 index b2c9322..0000000 --- a/abs/extra/community/transmission-cli/transmissiond +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/transmissiond - -PID=`pidof -o %PPID /usr/bin/transmission-daemon` -case "$1" in - start) - stat_busy "Starting Transmission Daemon" - [ -z "$PID" ] && su -l -c "/usr/bin/transmission-daemon" $TRANS_USER - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon transmissiond - stat_done - fi - ;; - stop) - stat_busy "Stopping Transmission Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon transmissiond - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/extra/community/xbmc-svn/CHANGELOG b/abs/extra/community/xbmc-svn/CHANGELOG deleted file mode 100644 index ddcbd53..0000000 --- a/abs/extra/community/xbmc-svn/CHANGELOG +++ /dev/null @@ -1,110 +0,0 @@ -xbmc-svn Change log: --------------------- -2nd July 2009 -21333 haggy: updated to current svn head which has media flagging support if your skin - supports it (the shipped PM3HD does already, also Aeon and MediaStream redux) - -3rd June 2009 -20896 haggy: enabled external libs for every lib supported despite python and ffmpeg - enabling external python breaks python support in xbmc due to Arch's python - compiled with UCS2 support whereas xbmc expects UCS4. Enabling external ffmpeg - disables VDPAU and we don't want that for sure. - - IMPORTANT NOTE: If compilation breaks at configure step with some message about - not being able to compute the size of int or size_t, try running makepkg as root - with 'sudo makepkg --asroot'. This is a known issue and happens only on systems - linked to nvidia's libgl which causes binaries to segfault within a fakeroot - environment. pacman 3.3 will fix this by splitting configure and installation steps. - -1st June 2009 -20818 haggy: this is the last revision before external-libs-support got patched - in. Unfortunately this will not compile with fakeroot. waiting for - pacman 3.3 which can split up configure and make install steps. - -30th May 2009 -20793 haggy: removed gcc44-fixes.patch - got merged into svn - -29th May 2009 -20755 haggy: pushed rev as requested - -27th May 2009 -20705 haggy: added a patch which fixed compilation with GCC 4.4. - -21th May 2009 -20509 haggy: xbmc got updates on goom due to the jaunty build system update. i - i wiped all goom specific hacks from the PKGBUILD and it compiled - fine, so let's see what you guys achieve. - -19th May 2009 -20449-1 richy: 1. Removed the autoreconf line as it didn't seem to help - 2. Added !makeflags - 3. Rev push :-) - -16th May 2009 -20343-1 richy: 1. added python as a depenency and removed x-server (namcap advised), - 2. added autoreconf to goom before aclocal - another pot-shot at the goom compile prob. - 3. added flax and bison to makedepends - I thought they were implicitely provided, but - some users didn't have them. - 4. Rev push to 20343 - 5. Removed the --quiet flag form SVN for now as sourcforge was timing out and - failing silently. - - Note: namcap advised a number of other changes which I ignored for now. - -15th May 2009 -20231-3 - haggy: added libsamplerate as a dependency, it is needed for the recent smoothvideo patches - -14th May 2009 -20231-2 - haggy: another shot in the dark to fix that damn goom compilation error - -13th May 2009 -20231 - haggy: smoothvideo! - -12th May 2009 -20172 - haggy: a shot in the dark: try another autoreconf inside goom and see if it helps. - -11th May 2009 -20149 - haggy: pushed rev, removed 'hitting-o-breaks...'-patch - it got fixed in svn - -9th May 2009 -20101 - haggy: an updated PM3 skin made it into xbmc. added conflicts hint to this PKGBUILD - -8th May 2009 -20059 - haggy: minor push past 9.04, removed copying the source tree to a build tree which wastes space, - takes ages and stresses the hdd for no reason. instead we now use svn to revert to a - clean build dir. - -5th May 2009 -19941 - rich: heaps more tickets closed, Mexican translation - -30th April 2009 -19841 - haggy: lots of closed tickets worth a release, removed xsession patch - -27th April 2009 -19753 - haggy: added patch for xsession file breaking installation into fakeroot. - -22nd April 2009 -19602 - richy: version bump to address problem with python scripts and plugins - -20th April 2009 -19550 - haggy: pushed rev, some .mov fixes and better i18n in xbmc - -17th April 2009 -19517 - haggy: pushed rev, re-added installfile -19516-2- richy: Added back autoreconf -vif in libdvdcss - still required for some folk (me) -19516 - haggy: pushed rev, moved patches to patchfiles, added 'safe fullscreen patch', several cleanups - -15th April 2009 -19484 - haggy: pushed rev, re-enabled MAKEFLAGS to allow a more streamlined package - -14th April 2009 -19463 - haggy: added install file -19463 - richy: moved _svn* back inside build() on Haggy's suggestion. Let's try and avoid broken releases! -19463 - richy: makedepends 'subversion' instead of 'svn' because that's what's in the guidelines -19463 - richy: changed licens from ('GPL' 'custom') to ('GPL', 'LGPL') - See: http://xbmc.org/about/ - -13th April 2009 - initial upload to AUR, tested on 32bit and 64bit. -19444 - richy: Moved _svn* outside of build so that users get the latest SVN. -19444 - richy: Added a symlink for XBMCtex to usr/bin/XBMCtex -19444 - richy: Moved libcdio into depends from opt-depends - right now it is a dependency. - diff --git a/abs/extra/community/xbmc-svn/Lircmap.xml b/abs/extra/community/xbmc-svn/Lircmap.xml deleted file mode 100644 index 600567f..0000000 --- a/abs/extra/community/xbmc-svn/Lircmap.xml +++ /dev/null @@ -1,233 +0,0 @@ -<!-- This file contains the mapping of LIRC keys to XBMC keys used in Keymap.xml --> -<!-- --> -<!-- How to add remotes --> -<!-- <remote device="name_Lirc_calls_the_remote"> --> -<!-- --> -<!-- For the commands the layout following layout is used --> -<!-- <XBMC_COMMAND>LircButtonName</XBMC_COMMAND> --> -<!-- --> -<!-- For a list of XBMC_COMMAND's check out the <remote> sections of keymap.xml --> - -<lircmap> - <remote device="mceusb"> - <pause>Pause</pause> - <stop>Stop</stop> - <forward>Forward</forward> - <reverse>Rewind</reverse> - <left>Left</left> - <right>Right</right> - <up>Up</up> - <down>Down</down> - <select>OK</select> - <pageplus>ChanUp</pageplus> - <pageminus>ChanDown</pageminus> - <back>Back</back> - <menu>PreviousMenu</menu> - <title>Play</title> - <info>More</info> - <skipplus>Skip</skipplus> - <skipminus>Replay</skipminus> - <display>Teletext</display> - <start>Home</start> - <record>Record</record> - <volumeplus>VolUp</volumeplus> - <volumeminus>VolDown</volumeminus> - <mute>Mute</mute> - <power>Power</power> - <myvideo>Videos</myvideo> - <mymusic>Music</mymusic> - <mypictures>Pictures</mypictures> - <mytv>TV</mytv> - <one>One</one> - <two>Two</two> - <three>Three</three> - <four>Four</four> - <five>Five</five> - <six>Six</six> - <seven>Seven</seven> - <eight>Eight</eight> - <nine>Nine</nine> - <zero>Zero</zero> - <mytv>Red</mytv> - <mymusic>Green</mymusic> - <mypictures>Yellow</mypictures> - <myvideo>Blue</myvideo> - </remote> - - <remote device="mceusb2"> - <pause>Pause</pause> - <stop>Stop</stop> - <forward>Forward</forward> - <reverse>Rewind</reverse> - <left>Left</left> - <right>Right</right> - <up>Up</up> - <down>Down</down> - <select>OK</select> - <pageplus>ChanUp</pageplus> - <pageminus>ChanDown</pageminus> - <back>Back</back> - <menu>PreviousMenu</menu> - <title>Play</title> - <info>More</info> - <skipplus>Skip</skipplus> - <skipminus>Replay</skipminus> - <display>Teletext</display> - <start>Home</start> - <record>Record</record> - <volumeplus>VolUp</volumeplus> - <volumeminus>VolDown</volumeminus> - <mute>Mute</mute> - <power>Power</power> - <myvideo>Videos</myvideo> - <mymusic>Music</mymusic> - <mypictures>Pictures</mypictures> - <mytv>TV</mytv> - <one>One</one> - <two>Two</two> - <three>Three</three> - <four>Four</four> - <five>Five</five> - <six>Six</six> - <seven>Seven</seven> - <eight>Eight</eight> - <nine>Nine</nine> - <zero>Zero</zero> - <mytv>Red</mytv> - <mymusic>Green</mymusic> - <mypictures>Yellow</mypictures> - <myvideo>Blue</myvideo> - </remote> - - <remote device="XboxDVDDongle"> - <play>PLAY</play> - <pause>PAUSE</pause> - <stop>STOP</stop> - <forward>FORWARD</forward> - <reverse>REVERSE</reverse> - <left>LEFT</left> - <right>RIGHT</right> - <up>UP</up> - <down>DOWN</down> - <select>SELECT</select> - <back>BACK</back> - <menu>MENU</menu> - <title>TITLE</title> - <info>INFO</info> - <skipplus>SKIP+</skipplus> - <skipminus>SKIP-</skipminus> - <display>DISPLAY</display> - <one>1</one> - <two>2</two> - <three>3</three> - <four>4</four> - <five>5</five> - <six>6</six> - <seven>7</seven> - <eight>8</eight> - <nine>9</nine> - <zero>0</zero> - </remote> - - <remote device="Microsoft_Xbox"> - <play>PLAY</play> - <pause>PAUSE</pause> - <stop>STOP</stop> - <forward>FORWARD</forward> - <reverse>REVERSE</reverse> - <left>LEFT</left> - <right>RIGHT</right> - <up>UP</up> - <down>DOWN</down> - <select>SELECT</select> - <back>BACK</back> - <menu>MENU</menu> - <title>TITLE</title> - <info>INFO</info> - <skipplus>SKIP+</skipplus> - <skipminus>SKIP-</skipminus> - <display>DISPLAY</display> - <one>1</one> - <two>2</two> - <three>3</three> - <four>4</four> - <five>5</five> - <six>6</six> - <seven>7</seven> - <eight>8</eight> - <nine>9</nine> - <zero>0</zero> - </remote> - - <remote device="PinnacleSysPCTVRemote"> - <play>Play</play> - <pause>pause</pause> - <stop>Stop</stop> - <forward>FForward</forward> - <reverse>Rewind</reverse> - <left>Vol-Rew</left> - <right>Vol+FF</right> - <up>Chan+Play</up> - <down>Chan-Stop</down> - <pageplus>channel+</pageplus> - <pageminus>channel-</pageminus> - <select>middle</select> - <back>undo</back> - <menu>Menu</menu> - <title>L</title> - <info>Info</info> - <skipplus>next</skipplus> - <display>Fullscreen</display> - <record>Record</record> - <volumeplus>vol+</volumeplus> - <volumeminus>vol-</volumeminus> - <mute>Mute</mute> - <power>Power</power> - <one>1</one> - <two>2</two> - <three>3</three> - <four>4</four> - <five>5</five> - <six>6</six> - <seven>7</seven> - <eight>8</eight> - <nine>9</nine> - <zero>0</zero> - </remote> - - <remote device="Streamzap_PC_Remote"> - <play>PLAY</play> - <pause>PAUSE</pause> - <stop>STOP</stop> - <forward>>></forward> - <reverse><<</reverse> - <left>LEFT</left> - <right>RIGHT</right> - <up>UP</up> - <down>DOWN</down> - <pageplus>CH_UP</pageplus> - <pageminus>CH_DOWN</pageminus> - <select>OK</select> - <back>EXIT</back> - <menu>MENU</menu> - <title>RED</title> - <info>GREEN</info> - <skipplus>>>|</skipplus> - <display>YELLOW</display> - <record>RECORD</record> - <volumeplus>VOL_UP</volumeplus> - <volumeminus>VOL_DOWN</volumeminus> - <mute>MUTE</mute> - <power>POWER</power> - <one>1</one> - <two>2</two> - <three>3</three> - <four>4</four> - <five>5</five> - <six>6</six> - <seven>7</seven> - <eight>8</eight> - <nine>9</nine> - <zero>0</zero> - </remote> -</lircmap> diff --git a/abs/extra/community/xbmc-svn/PKGBUILD b/abs/extra/community/xbmc-svn/PKGBUILD deleted file mode 100644 index 45d6671..0000000 --- a/abs/extra/community/xbmc-svn/PKGBUILD +++ /dev/null @@ -1,139 +0,0 @@ -# Contributors : Richard Atkinson atkinsonr-at-gmail -# Ralf Barth <archlinux dot org at haggy dot org> -# -# Original credits go to Edgar Hucek <gimli at dark-green dot com> -# for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD - -pkgname=xbmc-svn -pkgver=21748 -pkgrel=1 -pkgdesc="XBMC Media Center from SVN (linuxport branch)" -provides=('xbmc') -conflicts=('xbmc' 'xbmc-smoothvideo' 'xbmc-vdpau') -arch=('i686' 'x86_64') -url="http://xbmc.org" -license=('GPL' 'LGPL') -depends=('alsa-lib' 'curl' 'enca' 'faac' 'freetype2' 'fribidi' 'gawk' 'glew' - 'hal' 'jasper' 'libgl' 'libjpeg>=6b-5' 'libmad' 'libmysqlclient' - 'libxinerama' 'libxrandr' 'lzo2' 'sdl_image' 'sdl_mixer' 'sqlite3' - 'tre' 'unzip' 'libcdio' 'libsamplerate' 'python' 'avahi' 'libmad' - 'a52dec' 'libdca' 'faad2' 'libmpeg2' 'libvorbis' 'libogg' 'libmms' - 'libmpcdec' 'flac' 'wavpack' 'xorg-utils') -makedepends=('subversion' 'autoconf' 'automake' 'boost' 'cmake' 'gcc' 'gperf' - 'libtool>=2.2.6a-1' 'make' 'nasm' 'patch' 'pkgconfig' 'zip' 'flex' 'bison') -optdepends=('lirc: remote controller support' - 'pmount: mount removable devices as normal user' - 'smbclient: access windows shares' - 'unrar: access compressed files without unpacking them') -install=("${pkgname}.install") -source=('libcurl-not-in-lib64.patch' - 'Lircmap.xml') -noextract=('libcurl-not-in-lib64.patch' - 'Lircmap.xml') -md5sums=('c5e808703d0c9e392e1c2837fea1a5ef' - '3f93186f1ea4aad73011d00754c7265a') - -options=(!makeflags) - -build() { - - _svntrunk=http://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport/XBMC - _svnmod=XBMC - _prefix=/usr - - cd ${srcdir}/ - if [ -d $_svnmod/.svn ]; then - msg "SVN tree found, reverting changes and updating to -r$pkgver" - (cd $_svnmod && svn revert -R . && svn up -r $pkgver) || return 1 - else - msg "Checking out SVN tree of -r$pkgver" - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod || return 1 - fi - - # Apply patches - cd "$srcdir/$_svnmod" - - # Arch's libcurl lives in /usr/lib, not /usr/lib64 - fix the path: - msg "Patching with libcurl-not-in-lib64.patch" - patch -p0 < "$srcdir/libcurl-not-in-lib64.patch" || return 1 - - # Goom also needs a fixup due to newer autotools - cd "$srcdir/$_svnmod/xbmc/visualizations/Goom/goom2k4-0" - aclocal - libtoolize --copy --force - ./autogen.sh --enable-static --with-pic - - cd "$srcdir/$_svnmod" - - # Configure XBMC - # - # Note on external-libs: - # - We cannot use external python because Arch's python was built with - # UCS2 unicode support, whereas xbmc expects UCS4 support - # - We cannot use external ffmpeg as we would loose VDPAU functionality - # because Arch's ffmpeg package does not support VDPAU - # - We don't want to rely on AUR packages, so we also don't use libass - # as long as it's in AUR - msg "Configuring XBMC" - make clean - ./configure --prefix=${_prefix} \ - --enable-external-libmad \ - --enable-external-liba52 \ - --enable-external-libdts \ - --enable-external-libfaad \ - --enable-external-libmpeg2 \ - --enable-external-libvorbis \ - --enable-external-libogg \ - --enable-external-libmpcdec \ - --enable-external-libflac \ - --enable-external-libwavpack \ - --disable-external-libass \ - --disable-external-python \ - --disable-external-ffmpeg \ - --disable-pulse \ - --disable-debug || return 1 - - # Fix false negative detections of realloc that happens some times - msg "Fixing false negative detections of realloc" - if grep -q 'HAVE_REALLOC 0' config.h; then - sed -e 's|#define HAVE_REALLOC 0|#define HAVE_REALLOC 1|' \ - -e 's|#define realloc rpl_realloc|/* #define realloc rpl_realloc */|' \ - -i config.h || return 1 - fi - - # XBMCTex will segfault on systems with nvidia installed if linked to OpenGL - msg "Fixing XBMCTex on systems using the nvidia driver blob" - sed -e 's/-lGLU -lGLEW -lGL//' \ - -i ${srcdir}/$_svnmod/tools/XBMCTex/Makefile - - # Now (finally) build - msg "Running make" - make || return 1 - msg "Running make install" - make prefix=${pkgdir}${_prefix} install || return 1 - - # Install - install -Dm755 ${srcdir}/$_svnmod/xbmc-xrandr \ - ${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr || return 1 - - install -Dm644 ${srcdir}/$_svnmod/tools/Linux/xbmc.desktop \ - ${pkgdir}${_prefix}/share/applications/xbmc.desktop || return 1 - - install -Dm644 ${srcdir}/$_svnmod/tools/Linux/xbmc.png \ - ${pkgdir}${_prefix}/share/pixmaps/xbmc.png || return 1 - - install -Dm755 ${srcdir}/$_svnmod/tools/XBMCTex/XBMCTex \ - ${pkgdir}${_prefix}/share/xbmc/tools/xbmctex || return 1 - - # Skins often use build.sh that looks for /usr/bin/XBMCTex - ln -s "${_prefix}/share/xbmc/tools/xbmctex" "$pkgdir/usr/bin/XBMCTex" - - install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname} - for licensef in LICENSE.GPL README.linux copying.txt; do - mv ${pkgdir}${_prefix}/share/xbmc/${licensef} \ - ${pkgdir}${_prefix}/share/licenses/${pkgname} || return 1 - done - - # Use custom Lircmap to support StreamZap remote - cp ${srcdir}/Lircmap.xml ${pkgdir}${_prefix}/share/xbmc/system/Lircmap.xml -} diff --git a/abs/extra/community/xbmc-svn/__changelog b/abs/extra/community/xbmc-svn/__changelog deleted file mode 100644 index bbf1705..0000000 --- a/abs/extra/community/xbmc-svn/__changelog +++ /dev/null @@ -1 +0,0 @@ -Added Lircmap.xml to PKGBUILD to support MCE2 and StreamZap remotes diff --git a/abs/extra/community/xbmc-svn/libcurl-not-in-lib64.patch b/abs/extra/community/xbmc-svn/libcurl-not-in-lib64.patch deleted file mode 100644 index 0bfbc4c..0000000 --- a/abs/extra/community/xbmc-svn/libcurl-not-in-lib64.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile.include.in -=================================================================== ---- Makefile.include.in (revision 21447) -+++ Makefile.include.in (working copy) -@@ -25,7 +25,7 @@ - - ifeq (linux,$(findstring linux, $(ARCH))) - ifeq ($(ARCH), x86_64-linux) -- DEFINES+=-DDLL_PATH_LIBCURL="\"/usr/lib64/libcurl.so.4\"" -+ DEFINES+=-DDLL_PATH_LIBCURL="\"/usr/lib/libcurl.so.4\"" - else - DEFINES+=-DDLL_PATH_LIBCURL="\"/usr/lib/libcurl.so.4\"" - endif diff --git a/abs/extra/community/xbmc-svn/xbmc-svn.install b/abs/extra/community/xbmc-svn/xbmc-svn.install deleted file mode 100644 index acf409c..0000000 --- a/abs/extra/community/xbmc-svn/xbmc-svn.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - echo ">> If XBMC won't start, but just segfaults, double check your X.Org config" - echo ">> so that your display depth is at least 24-bit. Eg: change " - echo ">> \"DefaultDepth 16\" under the \"Screen\" section so it says 24 instead" - echo ">> of 16." - echo ">> If you have problems or suggestions for this PKGBUILD, have a look at its" - echo ">> dedicated forum thread: http://bbs.archlinux.org/viewtopic.php?pid=559107" - echo ">> or the wiki: http://xbmc.org/wiki/?title=XBMC_on_Arch_Linux_(Unofficial)" - echo - /bin/true -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/extra/community/xbmc/ChangeLog b/abs/extra/community/xbmc/ChangeLog deleted file mode 100644 index 59f2370..0000000 --- a/abs/extra/community/xbmc/ChangeLog +++ /dev/null @@ -1,64 +0,0 @@ -2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-10 : - Try and fix some autoconf issues (thanks Gentoo ebuild). - -2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-9 : - Replace some libtool 'ltmain.sh' scripts with the one from libtool - installed with Arch. - Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault - on systems using the nvidia driver. - -2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-8 : - Fix some include's so that gcc 4.3.x is happy, shouldn't complain about - undefined '::realloc' anymore. - Remove Mac OS X specific files. - -2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-7 : - Moved libcdio, pmount, smbclient and unrar to optdepends. - Removed unneeded dependency on sdl_gfx. - Removed dependency on libpng as sdl_image depends on it. - -2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-6 : - Added libpng to dependency list. - Added gawk to dependency list. - Removed '--disable-mms' and '--enable-halmount' configure flags as they - are not mentioned as supported in the configure script. - -2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-5 : - Added libmad to the dependency list. - Streamripper 1.64.0+ does not include tre anymore, removed streamripper - and added tre instead. - Removed subversion from makedepends. - -2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-4 : - Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not - fail any longer. - -2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-3 : - Added lirc to the optdepends array. - -2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-2 : - Added install file which informs users that a display depth of at - least 24-bit is required. - -2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-1 : - Initial package, based on previous work by Zeqadious. diff --git a/abs/extra/community/xbmc/PKGBUILD b/abs/extra/community/xbmc/PKGBUILD deleted file mode 100644 index 950d704..0000000 --- a/abs/extra/community/xbmc/PKGBUILD +++ /dev/null @@ -1,118 +0,0 @@ -# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> -# Contributor: Zeqadious <zeqadious.at.gmail.dot.com> - -pkgname=xbmc -pkgver=8.10 -pkgrel=10 -pkgdesc="XBMC Media Center" -arch=('i686' 'x86_64') -url="http://xbmc.org" -license=('GPL' 'custom') -depends=('alsa-lib' 'curl' 'enca' 'faac' 'freetype2' 'fribidi' 'gawk' 'glew' \ - 'hal' 'jasper' 'libgl' 'libjpeg>=6b-5' 'libmad' 'libmysqlclient' \ - 'libxinerama' 'libxrandr' 'lzo2' 'sdl_image' 'sdl_mixer' 'sqlite3' \ - 'tre' 'unzip' 'x-server') -makedepends=('autoconf' 'automake' 'boost' 'cmake' 'gcc' 'gperf' - 'libtool>=2.2.6a-1' 'make' 'nasm' 'patch' 'pkgconfig' 'zip') -optdepends=('libcdio: optical disc support' - 'lirc: remote controller support' - 'pmount: mount removable devices as normal user' - 'smbclient: access windows shares' - 'unrar: access compressed files without unpacking them') -install=("${pkgname}.install") -source=("http://downloads.sourceforge.net/${pkgname}/XBMC-${pkgver}.src.tar.gz") -md5sums=('2d20d255a211223eaa47f1c6bcf4be8e') - -build() { - cd "${srcdir}/XBMC" - - # Remove Mac OS X specific files - rm -rf system/python/lib-osx/ - rm system/players/dvdplayer/*-osx* - - # Fix permissions for the configure scripts - find -type f -name "configure"|xargs chmod a+x || return 1 - - # Fix other permissions - find -type f -name "*.pl"|xargs chmod a+x || return 1 - - # Make it gcc 4.3.x compatible - sed '92i#include <stdlib.h>' -i guilib/system.h || return 1 - - # Clean up the configure files and make sure they support C++. - for file in `find . -type f -name configure.in -or -name configure.ac`; do - echo 'AC_PROG_CXX' >> "${file}" - sed -e '/AM_PATH_XMMS/ c\echo' \ - -e '/AM_PATH_SDL2/ c\echo' \ - -i ${file} || return 1 - done - sed -e 's/test_libFLAC++//g' \ - -i "${srcdir}/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/Makefile.am" || return 1 - - # Fix some autoconf issues - touch ${srcdir}/XBMC/xbmc/cores/dvdplayer/Codecs/libmad/{NEWS,AUTHORS,ChangeLog} || return 1 - touch ${srcdir}/XBMC/xbmc/visualizations/Goom/goom2k4-0/ylwrap || return 1 - touch ${srcdir}/XBMC/xbmc/lib/libid3tag/libid3tag/{NEWS,README,AUTHORS,ChangeLog} || return 1 - for dir in \ - . \ - xbmc/cores/dvdplayer/Codecs/libDVDCSS \ - xbmc/cores/dvdplayer/Codecs/libdts \ - xbmc/cores/dvdplayer/Codecs/libdvdnav \ - xbmc/cores/dvdplayer/Codecs/libfaad2 \ - xbmc/cores/dvdplayer/Codecs/libmad \ - xbmc/cores/dvdplayer/Codecs/libmpeg2 \ - xbmc/cores/paplayer/flac-1.2.1 \ - xbmc/cores/paplayer/vorbisfile/libvorbis \ - xbmc/cores/paplayer/vorbisfile/ogg \ - xbmc/visualizations/Goom/goom2k4-0 \ - xbmc/lib/libass \ - xbmc/lib/libid3tag/libid3tag - do - autoreconf --install "${srcdir}/XBMC/${dir}" || return 1 - done - - cd "${srcdir}/XBMC/" - - # Configure XBMC - ./configure --prefix=/usr \ - --disable-debug || return 1 - - # Fix false negative detections of realloc that happens some times - if grep -q 'HAVE_REALLOC 0' config.h; then - sed -e 's|#define HAVE_REALLOC 0|#define HAVE_REALLOC 1|' \ - -e 's|#define realloc rpl_realloc|/* #define realloc rpl_realloc */|' \ - -i config.h || return 1 - fi - - # XBMCTex will segfault on systems with nvidia instaleld if linked to OpenGL - sed -e 's/-lGLU -lGLEW -lGL//' \ - -i ${srcdir}/XBMC/tools/XBMCTex/Makefile - - # Now (finally) build - make || return 1 - make prefix=${pkgdir}/usr install || return 1 - - # Fix the shell script - sed -i '4iexport SDL_AUDIODRIVER=alsa' ${pkgdir}/usr/bin/xbmc - - # Xrandr - install -Dm755 ${srcdir}/XBMC/xbmc-xrandr \ - ${pkgdir}/usr/share/xbmc/xbmc-xrandr || return 1 - - # Menu item - install -Dm644 ${srcdir}/XBMC/tools/Linux/xbmc.desktop \ - ${pkgdir}/usr/share/applications/xbmc.desktop || return 1 - install -Dm644 ${srcdir}/XBMC/tools/Linux/xbmc.png \ - ${pkgdir}/usr/share/pixmaps/xbmc.png || return 1 - - # XBMCTex - install -Dm755 ${srcdir}/XBMC/tools/XBMCTex/XBMCTex \ - ${pkgdir}/usr/share/xbmc/tools/xbmctex || return 1 - - # License(s) - install -dm755 ${pkgdir}/usr/share/licenses/${pkgname} - for licensef in LICENSE.GPL README.linux copying.txt; do - mv ${pkgdir}/usr/share/xbmc/${licensef} \ - ${pkgdir}/usr/share/licenses/${pkgname} || return 1 - done -} diff --git a/abs/extra/community/xbmc/xbmc.install b/abs/extra/community/xbmc/xbmc.install deleted file mode 100644 index 9316bc8..0000000 --- a/abs/extra/community/xbmc/xbmc.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - echo ">> If XBMC won't start, but just segfaults, double check your X.Org config" - echo ">> so that your display depth is at least 24-bit. Eg: change " - echo ">> \"DefaultDepth 16\" under the \"Screen\" section so it says 24 instead" - echo ">> of 16." - /bin/true -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/extra/consolekit/PKGBUILD b/abs/extra/consolekit/PKGBUILD new file mode 100644 index 0000000..10a1f7f --- /dev/null +++ b/abs/extra/consolekit/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 87085 2010-08-10 18:29:16Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: onestep_ua <onestep@ukr.net> + +pkgname=consolekit +pkgver=0.4.1 +pkgrel=4 +pkgdesc="A framework for defining and tracking users, login sessions, and seats" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/ConsoleKit" +license=('GPL') +depends=('polkit>=0.95' 'zlib' 'libx11>=1.2.2') +makedepends=('pkgconfig' 'xmlto' 'docbook-xsl') +options=(!libtool) +source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${pkgver}.tar.bz2 + pam-foreground-compat.ck + nodaemon.patch + reorder-initialization.patch + add_since_option.patch + consolekit.logrotate) +md5sums=('48eda4483cc97841d5f88e8e003eb6d7' + 'a8a4de71d9b0549b8143e5f6c2a36fc7' + 'a5bfd56bc89411ff5bb18276a68cb212' + '99fa8cb1bf232050cc0c076378e216c5' + 'bd5e72397fe2d42a933a897d28d58155' + '6fefa451d9fe2fc6d6269629d3529793') + +build() { + cd "${srcdir}/ConsoleKit-${pkgver}" + patch -Np1 -i "${srcdir}/nodaemon.patch" + patch -Np1 -i "${srcdir}/reorder-initialization.patch" + patch -Np1 -i "${srcdir}/add_since_option.patch" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/ConsoleKit \ + --enable-pam-module \ + --enable-docbook-docs + make + make DESTDIR="${pkgdir}" install + install -m755 "${srcdir}/pam-foreground-compat.ck" "${pkgdir}/usr/lib/ConsoleKit/run-session.d/" + + # install the logrotate config + install -D -m644 ${srcdir}/consolekit.logrotate ${pkgdir}/etc/logrotate.d/consolekit +} diff --git a/abs/extra/consolekit/add_since_option.patch b/abs/extra/consolekit/add_since_option.patch new file mode 100644 index 0000000..50c1421 --- /dev/null +++ b/abs/extra/consolekit/add_since_option.patch @@ -0,0 +1,220 @@ +From c9f2292339540d4b9d8940bcef16b7485480c8d9 Mon Sep 17 00:00:00 2001 +From: William Jon McCann <jmccann@redhat.com> +Date: Fri, 11 Jun 2010 19:53:22 +0000 +Subject: Add a --since option to show entries in a time window + +Doesn't load any history files it doesn't need to which should +help performance on systems with long histories. + +https://bugs.freedesktop.org/show_bug.cgi?id=25660 +--- +diff --git a/tools/ck-history.c b/tools/ck-history.c +index 606106c..d02caaa 100644 +--- a/tools/ck-history.c ++++ b/tools/ck-history.c +@@ -62,8 +62,8 @@ typedef enum { + + static GList *all_events = NULL; + +-static gboolean +-process_event_line (const char *line) ++static CkLogEvent * ++parse_event_line (const char *line) + { + GString *str; + CkLogEvent *event; +@@ -72,47 +72,80 @@ process_event_line (const char *line) + event = ck_log_event_new_from_string (str); + g_string_free (str, TRUE); + +- if (event != NULL) { +- all_events = g_list_prepend (all_events, event); +- } +- +- return TRUE; ++ return event; + } + + static gboolean +-process_log_gzstream (gzFile *fstream) ++process_log_gzstream (gzFile *fstream, ++ GTimeVal *since) + { +- char line[MAX_LINE_LEN]; ++ char line[MAX_LINE_LEN]; ++ gboolean hit_since; ++ GList *events; + ++ events = NULL; ++ hit_since = FALSE; + while (gzgets (fstream, line, sizeof (line)) != Z_NULL) { ++ CkLogEvent *event; ++ + if (strlen (line) == sizeof (line) - 1) { + g_warning ("Log line truncated"); + } + +- process_event_line (line); ++ event = parse_event_line (line); ++ if (event == NULL) { ++ continue; ++ } ++ ++ if (since == NULL || event->timestamp.tv_sec >= since->tv_sec) { ++ events = g_list_prepend (events, event); ++ } else { ++ hit_since = TRUE; ++ } + } + +- return TRUE; ++ all_events = g_list_concat (all_events, events); ++ ++ return !hit_since; + } + + static gboolean +-process_log_stream (FILE *fstream) ++process_log_stream (FILE *fstream, ++ GTimeVal *since) + { +- char line[MAX_LINE_LEN]; ++ char line[MAX_LINE_LEN]; ++ gboolean hit_since; ++ GList *events; + ++ events = NULL; ++ hit_since = FALSE; + while (fgets (line, sizeof (line), fstream) != NULL) { ++ CkLogEvent *event; ++ + if (strlen (line) == sizeof (line) - 1) { + g_warning ("Log line truncated"); + } + +- process_event_line (line); ++ event = parse_event_line (line); ++ if (event == NULL) { ++ continue; ++ } ++ ++ if (since == NULL || event->timestamp.tv_sec >= since->tv_sec) { ++ events = g_list_prepend (events, event); ++ } else { ++ hit_since = TRUE; ++ } + } + +- return TRUE; ++ all_events = g_list_concat (all_events, events); ++ ++ return !hit_since; + } + + static gboolean +-process_log_file (const char *filename) ++process_log_file (const char *filename, ++ GTimeVal *since) + { + gboolean ret; + +@@ -131,7 +164,7 @@ process_log_file (const char *filename) + errmsg); + return FALSE; + } +- ret = process_log_gzstream (f); ++ ret = process_log_gzstream (f, since); + gzclose (f); + } else { + FILE *f; +@@ -143,7 +176,7 @@ process_log_file (const char *filename) + g_strerror (errno)); + return FALSE; + } +- ret = process_log_stream (f); ++ ret = process_log_stream (f, since); + fclose (f); + } + +@@ -180,11 +213,14 @@ get_log_file_list (void) + files = g_list_prepend (files, filename); + }; + ++ /* Return the list in reverse time order, newest first */ ++ files = g_list_reverse (files); ++ + return files; + } + + static gboolean +-process_logs (void) ++process_logs (GTimeVal *since) + { + gboolean ret; + GList *files; +@@ -199,8 +235,7 @@ process_logs (void) + char *filename; + + filename = l->data; +- +- res = process_log_file (filename); ++ res = process_log_file (filename, since); + if (! res) { + goto out; + } +@@ -843,6 +878,8 @@ main (int argc, + GError *error = NULL; + int report_type; + int uid; ++ GTimeVal timestamp; ++ gboolean use_since; + static gboolean do_version = FALSE; + static gboolean report_last_compat = FALSE; + static gboolean report_last = FALSE; +@@ -851,6 +888,7 @@ main (int argc, + static char *username = NULL; + static char *seat = NULL; + static char *session_type = NULL; ++ static char *since = NULL; + static GOptionEntry entries [] = { + { "version", 'V', 0, G_OPTION_ARG_NONE, &do_version, N_("Version of this application"), NULL }, + { "frequent", 0, 0, G_OPTION_ARG_NONE, &report_frequent, N_("Show listing of frequent users"), NULL }, +@@ -860,6 +898,7 @@ main (int argc, + { "seat", 's', 0, G_OPTION_ARG_STRING, &seat, N_("Show entries for the specified seat"), N_("SEAT") }, + { "session-type", 't', 0, G_OPTION_ARG_STRING, &session_type, N_("Show entries for the specified session type"), N_("TYPE") }, + { "user", 'u', 0, G_OPTION_ARG_STRING, &username, N_("Show entries for the specified user"), N_("NAME") }, ++ { "since", 0, 0, G_OPTION_ARG_STRING, &since, N_("Show entries since the specified time (ISO 8601 format)"), N_("DATETIME") }, + { NULL } + }; + +@@ -880,6 +919,15 @@ main (int argc, + exit (1); + } + ++ use_since = FALSE; ++ if (since != NULL) { ++ use_since = g_time_val_from_iso8601 (since, ×tamp); ++ if (! use_since) { ++ g_warning ("Invalid ISO 8601 time value"); ++ exit (1); ++ } ++ } ++ + if (report_last_compat) { + report_type = REPORT_TYPE_LAST_COMPAT; + } else if (report_last) { +@@ -902,7 +950,11 @@ main (int argc, + uid = -1; + } + +- process_logs (); ++ if (use_since) { ++ process_logs (×tamp); ++ } else { ++ process_logs (NULL); ++ } + generate_report (report_type, uid, seat, session_type); + free_events (); + +-- +cgit v0.8.3-6-g21f6 diff --git a/abs/extra/consolekit/consolekit.logrotate b/abs/extra/consolekit/consolekit.logrotate new file mode 100644 index 0000000..7c5346e --- /dev/null +++ b/abs/extra/consolekit/consolekit.logrotate @@ -0,0 +1,5 @@ +/var/log/ConsoleKit/history { + missingok + notifempty + delaycompress +} diff --git a/abs/extra/consolekit/nodaemon.patch b/abs/extra/consolekit/nodaemon.patch new file mode 100644 index 0000000..c4c08e9 --- /dev/null +++ b/abs/extra/consolekit/nodaemon.patch @@ -0,0 +1,9 @@ +diff -up ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in +--- ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon 2009-12-15 10:56:39.839818556 -0500 ++++ ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in 2009-12-15 10:56:50.177792048 -0500 +@@ -1,4 +1,4 @@ + [D-BUS Service] + Name=org.freedesktop.ConsoleKit +-Exec=@sbindir@/console-kit-daemon ++Exec=@sbindir@/console-kit-daemon --no-daemon + User=root diff --git a/abs/extra/consolekit/pam-foreground-compat.ck b/abs/extra/consolekit/pam-foreground-compat.ck new file mode 100644 index 0000000..7f6b122 --- /dev/null +++ b/abs/extra/consolekit/pam-foreground-compat.ck @@ -0,0 +1,16 @@ +#!/bin/sh +TAGDIR=/var/run/console + +[ -n "$CK_SESSION_USER_UID" ] || exit 1 + +TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`" + +if [ "$1" = "session_added" ]; then + mkdir -p "$TAGDIR" + echo "$CK_SESSION_ID" >> "$TAGFILE" +fi + +if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then + sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE" + [ -s "$TAGFILE" ] || rm -f "$TAGFILE" +fi diff --git a/abs/extra/consolekit/reorder-initialization.patch b/abs/extra/consolekit/reorder-initialization.patch new file mode 100644 index 0000000..f65abd5 --- /dev/null +++ b/abs/extra/consolekit/reorder-initialization.patch @@ -0,0 +1,40 @@ +diff -up ConsoleKit-0.4.1/src/main.c.reorder-initialization ConsoleKit-0.4.1/src/main.c +--- ConsoleKit-0.4.1/src/main.c.reorder-initialization 2009-12-18 14:51:38.821212946 -0500 ++++ ConsoleKit-0.4.1/src/main.c 2009-12-18 14:52:19.246211176 -0500 +@@ -294,11 +294,19 @@ main (int argc, + + setup_debug_log (debug); + ++ g_debug ("initializing console-kit-daemon %s", VERSION); ++ + connection = get_system_bus (); + if (connection == NULL) { + goto out; + } + ++ manager = ck_manager_new (); ++ ++ if (manager == NULL) { ++ goto out; ++ } ++ + bus_proxy = get_bus_proxy (connection); + if (bus_proxy == NULL) { + g_warning ("Could not construct bus_proxy object; bailing out"); +@@ -310,16 +318,8 @@ main (int argc, + goto out; + } + +- g_debug ("initializing console-kit-daemon %s", VERSION); +- + create_pid_file (); + +- manager = ck_manager_new (); +- +- if (manager == NULL) { +- goto out; +- } +- + loop = g_main_loop_new (NULL, FALSE); + + g_signal_connect (bus_proxy, diff --git a/abs/extra/cups/PKGBUILD b/abs/extra/cups/PKGBUILD new file mode 100644 index 0000000..e1f13b7 --- /dev/null +++ b/abs/extra/cups/PKGBUILD @@ -0,0 +1,105 @@ +# $Id: PKGBUILD 82848 2010-06-18 06:18:19Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgbase="cups" +pkgname=('libcups' 'cups') +pkgver=1.4.4 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.cups.org/" +makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.12.3' + 'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme') +source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 + cups-avahi.patch + cups cups.logrotate cups.pam) +#options=('!emptydirs') +md5sums=('8776403ad60fea9e85eab9c04d88560d' + '3388dbe3fc20f16f37912e60a8ec46bc' + '5c85b7d8d2ddd02c2c64955cebbf55ea' + 'f861b18f4446c43918c8643dcbbd7f6d' + '96f82c38f3f540b53f3e5144900acf17') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + # Avahi support in the dnssd backend. patch from Fedora + patch -Np1 -i ${srcdir}/cups-avahi.patch || return 1 + # Rebuild configure script for --enable-avahi. + aclocal -I config-scripts + autoconf -I config-scripts + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \ + --with-cups-user=daemon --with-cups-group=lp --enable-pam=yes \ + --disable-ldap --libdir=/usr/lib --enable-raw-printing \ + --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-dnssd\ + --with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS" + make || return 1 +} + +package_libcups() { +pkgdesc="The CUPS Printing System - client libraries and headers" +depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1') +optdepends=('avahi: for the "dnssd" CUPS backend') + + + cd ${srcdir}/${pkgbase}-${pkgver} + make BUILDROOT=${pkgdir} install-headers install-libs || return 1 + # put this into the libs pkg to make other software find the libs(no pkg-config file included) + mkdir -p ${pkgdir}/usr/bin + install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config +} + +package_cups() { +pkgdesc="The CUPS Printing System - deamon package" +install=cups.install +backup=(etc/cups/cupsd.conf + etc/cups/mime.convs + etc/cups/mime.types + etc/cups/snmp.conf + etc/cups/printers.conf + etc/cups/classes.conf + etc/cups/client.conf + etc/cups/subscriptions.conf + etc/dbus-1/system.d/cups.conf + etc/logrotate.d/cups + etc/pam.d/cups + etc/xinetd.d/cups-lpd) +depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb' 'dbus-core' 'hicolor-icon-theme') +optdepends=('php: for included phpcups.so module') + + cd ${srcdir}/${pkgbase}-${pkgver} + make BUILDROOT=${pkgdir} install-data install-exec || return 1 + + # this one we ship in the libcups pkg + rm -f ${pkgdir}/usr/bin/cups-config + + # kill the sysv stuff + rm -rf ${pkgdir}/etc/rc*.d + rm -rf ${pkgdir}/etc/init.d + install -D -m755 ../cups ${pkgdir}/etc/rc.d/cups + install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups + install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups + + # fix perms on /var/spool and /etc + chmod 755 ${pkgdir}/var/spool + chmod 755 ${pkgdir}/etc + + # install ssl directory where to store the certs, solves some samba issues + install -dm700 -g lp ${pkgdir}/etc/cups/ssl + install -dm511 -g lp ${pkgdir}/var/run/cups/certs + + # install some more configuration files that will get filled by cupsd + touch ${pkgdir}/etc/cups/printers.conf + touch ${pkgdir}/etc/cups/classes.conf + touch ${pkgdir}/etc/cups/client.conf + echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf + echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf + touch ${pkgdir}/etc/cups/subscriptions.conf + chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf} + + # fix .desktop file + sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop + + # compress some driver files, adopted from Fedora + find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f +} diff --git a/abs/extra/ddclient/ddclient.rc b/abs/extra/cups/cups index a9093f7..4afaf5a 100644..100755 --- a/abs/extra/ddclient/ddclient.rc +++ b/abs/extra/cups/cups @@ -1,29 +1,29 @@ #!/bin/bash -[ -f /etc/conf.d/ddclient ] && . /etc/conf.d/ddclient - . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /usr/sbin/ddclient` +PID=`pidof -o %PPID /usr/sbin/cupsd` case "$1" in start) - stat_busy "Starting ddclient" - [ -z "$PID" ] && /usr/sbin/ddclient ${EXTRA_ARGS} + stat_busy "Starting CUPS Daemon" + [ -z "$PID" ] && /usr/sbin/cupsd if [ $? -gt 0 ]; then stat_fail else - add_daemon ddclient + echo $(pidof -o %PPID -x /usr/sbin/cupsd) > /var/run/cups.pid + add_daemon cups stat_done fi ;; stop) - stat_busy "Stopping ddclient" - [ -n "$PID" ] && kill -15 $PID >/dev/null + stat_busy "Stopping CUPS Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm_daemon ddclient + rm /var/run/cups.pid + rm_daemon cups stat_done fi ;; @@ -35,3 +35,4 @@ case "$1" in *) echo "usage: $0 {start|stop|restart}" esac +exit 0 diff --git a/abs/extra/cups/cups-1.3.7-peercred.patch b/abs/extra/cups/cups-1.3.7-peercred.patch new file mode 100644 index 0000000..eda2c93 --- /dev/null +++ b/abs/extra/cups/cups-1.3.7-peercred.patch @@ -0,0 +1,11 @@ +diff -Naur cups-1.3.7/scheduler/auth.c cups-1.3.7.new/scheduler/auth.c +--- cups-1.3.7/scheduler/auth.c 2008-03-20 21:58:16.000000000 +0100 ++++ cups-1.3.7.new/scheduler/auth.c 2008-06-09 14:53:45.535194741 +0200 +@@ -54,6 +54,7 @@ + * Include necessary headers... + */ + ++#define _GNU_SOURCE + #include "cupsd.h" + #include <grp.h> + #ifdef HAVE_SHADOW_H diff --git a/abs/extra/cups/cups-avahi.patch b/abs/extra/cups/cups-avahi.patch new file mode 100644 index 0000000..01fcb1a --- /dev/null +++ b/abs/extra/cups/cups-avahi.patch @@ -0,0 +1,1089 @@ +diff -up cups-1.4.0/backend/dnssd.c.avahi cups-1.4.0/backend/dnssd.c +--- cups-1.4.0/backend/dnssd.c.avahi 2009-08-07 23:27:12.000000000 +0100 ++++ cups-1.4.0/backend/dnssd.c 2009-09-04 14:57:04.730388833 +0100 +@@ -22,6 +22,7 @@ + * exec_backend() - Execute the backend that corresponds to the + * resolved service name. + * get_device() - Create or update a device. ++* find_device() + * query_callback() - Process query data. + * sigterm_handler() - Handle termination signals... + * unquote() - Unquote a name string. +@@ -33,7 +34,18 @@ + + #include "backend-private.h" + #include <cups/array.h> +-#include <dns_sd.h> ++#ifdef HAVE_DNSSD ++# include <dns_sd.h> ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++# include <avahi-client/client.h> ++# include <avahi-client/lookup.h> ++# include <avahi-common/simple-watch.h> ++# include <avahi-common/domain.h> ++# include <avahi-common/error.h> ++# include <avahi-common/malloc.h> ++#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX ++#endif /* HAVE_AVAHI */ + + + /* +@@ -52,7 +64,12 @@ typedef enum + + typedef struct + { ++#ifdef HAVE_DNSSD + DNSServiceRef ref; /* Service reference for resolve */ ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ int resolved; /* Did we resolve the device? */ ++#endif /* HAVE_AVAHI */ + char *name, /* Service name */ + *domain, /* Domain name */ + *fullName, /* Full name */ +@@ -64,6 +81,20 @@ typedef struct + sent; /* Did we list the device? */ + } cups_device_t; + ++typedef struct ++{ ++ char key[256]; ++ char value[256]; ++ ++#ifdef HAVE_DNSSD ++ const uint8_t *data; ++ const uint8_t *datanext; ++ const uint8_t *dataend; ++#else /* HAVE_AVAHI */ ++ AvahiStringList *txt; ++#endif /* HAVE_DNSSD */ ++} cups_txt_records_t; ++ + + /* + * Local globals... +@@ -77,6 +108,7 @@ static int job_canceled = 0; + * Local functions... + */ + ++#ifdef HAVE_DNSSD + static void browse_callback(DNSServiceRef sdRef, + DNSServiceFlags flags, + uint32_t interfaceIndex, +@@ -92,12 +124,6 @@ static void browse_local_callback(DNSSe + const char *regtype, + const char *replyDomain, + void *context); +-static int compare_devices(cups_device_t *a, cups_device_t *b); +-static void exec_backend(char **argv); +-static cups_device_t *get_device(cups_array_t *devices, +- const char *serviceName, +- const char *regtype, +- const char *replyDomain); + static void query_callback(DNSServiceRef sdRef, + DNSServiceFlags flags, + uint32_t interfaceIndex, +@@ -106,9 +132,111 @@ static void query_callback(DNSServiceRe + uint16_t rrclass, uint16_t rdlen, + const void *rdata, uint32_t ttl, + void *context); ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++static void avahi_client_callback (AvahiClient *client, ++ AvahiClientState state, ++ void *context); ++static void avahi_browse_callback (AvahiServiceBrowser *browser, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiBrowserEvent event, ++ const char *serviceName, ++ const char *regtype, ++ const char *replyDomain, ++ AvahiLookupResultFlags flags, ++ void *context); ++#endif /* HAVE_AVAHI */ ++ ++static cups_device_t * find_device (cups_array_t *devices, ++ cups_txt_records_t *txt, ++ cups_device_t *dkey); ++static int compare_devices(cups_device_t *a, cups_device_t *b); ++static void exec_backend(char **argv); ++static cups_device_t *get_device(cups_array_t *devices, ++ const char *serviceName, ++ const char *regtype, ++ const char *replyDomain); + static void sigterm_handler(int sig); + static void unquote(char *dst, const char *src, size_t dstsize); + ++#ifdef HAVE_AVAHI ++static AvahiSimplePoll *simple_poll = NULL; ++static int avahi_got_callback; ++#endif /* HAVE_AVAHI */ ++ ++ ++/* ++ * cups_txt_records_t access functions ++ */ ++static cups_txt_records_t * ++next_txt_record (cups_txt_records_t *txt) ++{ ++#ifdef HAVE_DNSSD ++ txt->data = txt->datanext; ++#else /* HAVE_AVAHI */ ++ txt->txt = avahi_string_list_get_next (txt->txt); ++ if (txt->txt == NULL) ++ return NULL; ++#endif /* HAVE_DNSSD */ ++ ++ return txt; ++} ++ ++static int ++parse_txt_record_pair (cups_txt_records_t *txt) ++{ ++#ifdef HAVE_DNSSD ++ uint8_t datalen; ++ uint8_t *data = txt->data; ++ char *ptr; ++ ++ /* ++ * Read a key/value pair starting with an 8-bit length. Since the ++ * length is 8 bits and the size of the key/value buffers is 256, we ++ * don't need to check for overflow... ++ */ ++ ++ datalen = *data++; ++ if (!datalen || (data + datalen) >= txt->dataend) ++ return NULL; ++ txt->datanext = data + datalen; ++ ++ for (ptr = txt->key; data < txt->datanext && *data != '='; data ++) ++ *ptr++ = *data; ++ *ptr = '\0'; ++ ++ if (data < txt->datanext && *data == '=') ++ { ++ data++; ++ ++ if (data < datanext) ++ memcpy (txt->value, data, txt->datanext - data); ++ value[txt->datanext - data] = '\0'; ++ } ++ else ++ return 1; ++#else /* HAVE_AVAHI */ ++ char *key, *value; ++ size_t len; ++ avahi_string_list_get_pair (txt->txt, &key, &value, &len); ++ if (len > sizeof (txt->value) - 1) ++ len = sizeof (txt->value) - 1; ++ ++ memcpy (txt->value, value, len); ++ txt->value[len] = '\0'; ++ len = strlen (key); ++ if (len > sizeof (txt->key) - 1) ++ len = sizeof (txt->key) - 1; ++ ++ memcpy (txt->key, key, len); ++ txt->key[len] = '\0'; ++ avahi_free (key); ++ avahi_free (value); ++#endif /* HAVE_AVAHI */ ++ ++ return 0; ++} + + /* + * 'main()' - Browse for printers. +@@ -119,6 +247,13 @@ main(int argc, /* I - Number of comm + char *argv[]) /* I - Command-line arguments */ + { + const char *name; /* Backend name */ ++ cups_array_t *devices; /* Device array */ ++ cups_device_t *device; /* Current device */ ++ char uriName[1024]; /* Unquoted fullName for URI */ ++#ifdef HAVE_DNSSD ++ int fd; /* Main file descriptor */ ++ fd_set input; /* Input set for select() */ ++ struct timeval timeout; /* Timeout for select() */ + DNSServiceRef main_ref, /* Main service reference */ + fax_ipp_ref, /* IPP fax service reference */ + ipp_ref, /* IPP service reference */ +@@ -130,12 +265,11 @@ main(int argc, /* I - Number of comm + pdl_datastream_ref, /* AppSocket service reference */ + printer_ref, /* LPD service reference */ + riousbprint_ref; /* Remote IO service reference */ +- int fd; /* Main file descriptor */ +- fd_set input; /* Input set for select() */ +- struct timeval timeout; /* Timeout for select() */ +- cups_array_t *devices; /* Device array */ +- cups_device_t *device; /* Current device */ +- char uriName[1024]; /* Unquoted fullName for URI */ ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ AvahiClient *client; ++ int error; ++#endif /* HAVE_AVAHI */ + #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) + struct sigaction action; /* Actions for POSIX signals */ + #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ +@@ -194,6 +328,49 @@ main(int argc, /* I - Number of comm + * Browse for different kinds of printers... + */ + ++#ifdef HAVE_AVAHI ++ if ((simple_poll = avahi_simple_poll_new ()) == NULL) ++ { ++ perror ("ERROR: Unable to create avahi simple poll object"); ++ return (1); ++ } ++ ++ client = avahi_client_new (avahi_simple_poll_get (simple_poll), ++ 0, avahi_client_callback, NULL, &error); ++ if (!client) ++ { ++ perror ("ERROR: Unable to create avahi client"); ++ return (1); ++ } ++ ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_fax-ipp._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_ipp._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_ipp-tls._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_pdl-datastream._tcp", ++ NULL, 0, ++ avahi_browse_callback, ++ devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_printer._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_riousbprint._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++#endif /* HAVE_AVAHI */ ++#ifdef HAVE_DNSSD + if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError) + { + perror("ERROR: Unable to create service connection"); +@@ -245,6 +422,7 @@ main(int argc, /* I - Number of comm + riousbprint_ref = main_ref; + DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0, + "_riousbprint._tcp", NULL, browse_callback, devices); ++#endif /* HAVE_DNSSD */ + + /* + * Loop until we are killed... +@@ -252,6 +430,9 @@ main(int argc, /* I - Number of comm + + while (!job_canceled) + { ++ int announce = 0; ++ ++#ifdef HAVE_DNSSD + FD_ZERO(&input); + FD_SET(fd, &input); + +@@ -271,11 +452,35 @@ main(int argc, /* I - Number of comm + } + else + { ++ announce = 1; ++ } ++#else /* HAVE_AVAHI */ ++ int r; ++ avahi_got_callback = 0; ++ r = avahi_simple_poll_iterate (simple_poll, 1); ++ if (r != 0 && r != EINTR) ++ { ++ /* ++ * We've been told to exit the loop. Perhaps the connection to ++ * avahi failed. ++ */ ++ ++ break; ++ } ++ ++ if (avahi_got_callback) ++ announce = 1; ++#endif /* HAVE_DNSSD */ ++ ++ if (announce) ++ { + /* + * Announce any devices we've found... + */ + ++#ifdef HAVE_DNSSD + DNSServiceErrorType status; /* DNS query status */ ++#endif /* HAVE_DNSSD */ + cups_device_t *best; /* Best matching device */ + char device_uri[1024]; /* Device URI */ + int count; /* Number of queries */ +@@ -285,6 +490,7 @@ main(int argc, /* I - Number of comm + best = NULL, count = 0; + device; + device = (cups_device_t *)cupsArrayNext(devices)) ++#ifdef HAVE_DNSSD + if (!device->ref && !device->sent) + { + /* +@@ -313,14 +519,23 @@ main(int argc, /* I - Number of comm + count ++; + } + } +- else if (!device->sent) ++ else ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ if (!device->resolved) ++ continue; ++ else ++#endif /* HAVE_AVAHI */ ++ if (!device->sent) + { ++#ifdef HAVE_DNSSD + /* + * Got the TXT records, now report the device... + */ + + DNSServiceRefDeallocate(device->ref); + device->ref = 0; ++#endif /* HAVE_DNSSD */ + + if (!best) + best = device; +@@ -372,6 +587,7 @@ main(int argc, /* I - Number of comm + * 'browse_callback()' - Browse devices. + */ + ++#ifdef HAVE_DNSSD + static void + browse_callback( + DNSServiceRef sdRef, /* I - Service reference */ +@@ -405,12 +621,14 @@ browse_callback( + + get_device((cups_array_t *)context, serviceName, regtype, replyDomain); + } ++#endif /* HAVE_DNSSD */ + + + /* + * 'browse_local_callback()' - Browse local devices. + */ + ++#ifdef HAVE_DNSSD + static void + browse_local_callback( + DNSServiceRef sdRef, /* I - Service reference */ +@@ -456,6 +674,7 @@ browse_local_callback( + device->fullName); + device->sent = 1; + } ++#endif /* HAVE_DNSSD */ + + + /* +@@ -528,6 +747,32 @@ exec_backend(char **argv) /* I - Comman + exit(CUPS_BACKEND_STOP); + } + ++static int ++device_type (const char *regtype) ++{ ++#ifdef HAVE_AVAHI ++ if (!strcmp(regtype, "_ipp._tcp") || ++ !strcmp(regtype, "_ipp-tls._tcp")) ++ return (CUPS_DEVICE_IPP); ++ else if (!strcmp(regtype, "_fax-ipp._tcp")) ++ return (CUPS_DEVICE_FAX_IPP); ++ else if (!strcmp(regtype, "_printer._tcp")) ++ return (CUPS_DEVICE_PDL_DATASTREAM); ++#else ++ if (!strcmp(regtype, "_ipp._tcp.") || ++ !strcmp(regtype, "_ipp-tls._tcp.")) ++ return (CUPS_DEVICE_IPP); ++ else if (!strcmp(regtype, "_fax-ipp._tcp.")) ++ return (CUPS_DEVICE_FAX_IPP); ++ else if (!strcmp(regtype, "_printer._tcp.")) ++ return (CUPS_DEVICE_PRINTER); ++ else if (!strcmp(regtype, "_pdl-datastream._tcp.")) ++ return (CUPS_DEVICE_PDL_DATASTREAM); ++#endif /* HAVE_AVAHI */ ++ ++ return (CUPS_DEVICE_RIOUSBPRINT); ++} ++ + + /* + * 'get_device()' - Create or update a device. +@@ -550,18 +795,7 @@ get_device(cups_array_t *devices, /* I - + */ + + key.name = (char *)serviceName; +- +- if (!strcmp(regtype, "_ipp._tcp.") || +- !strcmp(regtype, "_ipp-tls._tcp.")) +- key.type = CUPS_DEVICE_IPP; +- else if (!strcmp(regtype, "_fax-ipp._tcp.")) +- key.type = CUPS_DEVICE_FAX_IPP; +- else if (!strcmp(regtype, "_printer._tcp.")) +- key.type = CUPS_DEVICE_PRINTER; +- else if (!strcmp(regtype, "_pdl-datastream._tcp.")) +- key.type = CUPS_DEVICE_PDL_DATASTREAM; +- else +- key.type = CUPS_DEVICE_RIOUSBPRINT; ++ key.type = device_type (regtype); + + for (device = cupsArrayFind(devices, &key); + device; +@@ -581,8 +815,14 @@ get_device(cups_array_t *devices, /* I - + free(device->domain); + device->domain = strdup(replyDomain); + ++#ifdef HAVE_DNSSD + DNSServiceConstructFullName(fullName, device->name, regtype, + replyDomain); ++#else /* HAVE_AVAHI */ ++ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, ++ serviceName, regtype, replyDomain); ++#endif /* HAVE_DNSSD */ ++ + free(device->fullName); + device->fullName = strdup(fullName); + } +@@ -602,6 +842,9 @@ get_device(cups_array_t *devices, /* I - + device->domain = strdup(replyDomain); + device->type = key.type; + device->priority = 50; ++#ifdef HAVE_AVAHI ++ device->resolved = 0; ++#endif /* HAVE_AVAHI */ + + cupsArrayAdd(devices, device); + +@@ -609,7 +852,13 @@ get_device(cups_array_t *devices, /* I - + * Set the "full name" of this service, which is used for queries... + */ + ++#ifdef HAVE_DNSSD + DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain); ++#else /* HAVE_AVAHI */ ++ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, ++ serviceName, regtype, replyDomain); ++#endif /* HAVE_DNSSD */ ++ + device->fullName = strdup(fullName); + + return (device); +@@ -620,6 +869,7 @@ get_device(cups_array_t *devices, /* I - + * 'query_callback()' - Process query data. + */ + ++#ifdef HAVE_DNSSD + static void + query_callback( + DNSServiceRef sdRef, /* I - Service reference */ +@@ -639,7 +889,7 @@ query_callback( + *ptr; /* Pointer into string */ + cups_device_t dkey, /* Search key */ + *device; /* Device */ +- ++ cups_txt_records_t txt; + + fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, " + "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " +@@ -673,84 +923,212 @@ query_callback( + if ((ptr = strstr(name, "._")) != NULL) + *ptr = '\0'; + +- if (strstr(fullName, "_ipp._tcp.") || +- strstr(fullName, "_ipp-tls._tcp.")) +- dkey.type = CUPS_DEVICE_IPP; +- else if (strstr(fullName, "_fax-ipp._tcp.")) +- dkey.type = CUPS_DEVICE_FAX_IPP; +- else if (strstr(fullName, "_printer._tcp.")) +- dkey.type = CUPS_DEVICE_PRINTER; +- else if (strstr(fullName, "_pdl-datastream._tcp.")) +- dkey.type = CUPS_DEVICE_PDL_DATASTREAM; ++ dkey.type = device_type (fullName); ++ ++ txt.data = rdata; ++ txt.dataend = rdata + rdlen; ++ device = find_device ((cups_array_t *) context, &txt, &dkey); ++ if (!device) ++ fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); ++} ++#endif /* HAVE_DNSSD */ ++ ++#ifdef HAVE_AVAHI ++static void ++avahi_client_callback(AvahiClient *client, ++ AvahiClientState state, ++ void *context) ++{ ++ /* ++ * If the connection drops, quit. ++ */ ++ ++ if (state == AVAHI_CLIENT_FAILURE) ++ { ++ fprintf (stderr, "ERROR: Avahi connection failed\n"); ++ avahi_simple_poll_quit (simple_poll); ++ } ++} ++ ++static void ++avahi_query_callback(AvahiServiceResolver *resolver, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiResolverEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ const char *host_name, ++ const AvahiAddress *address, ++ uint16_t port, ++ AvahiStringList *txt, ++ AvahiLookupResultFlags flags, ++ void *context) ++{ ++ AvahiClient *client; ++ cups_device_t key, ++ *device; ++ char uqname[1024], ++ *ptr; ++ cups_txt_records_t txtr; ++ ++ client = avahi_service_resolver_get_client (resolver); ++ if (event != AVAHI_RESOLVER_FOUND) ++ { ++ if (event == AVAHI_RESOLVER_FAILURE) ++ { ++ fprintf (stderr, "ERROR: %s\n", ++ avahi_strerror (avahi_client_errno (client))); ++ } ++ ++ avahi_service_resolver_free (resolver); ++ return; ++ } ++ ++ /* ++ * Set search key for device. ++ */ ++ ++ key.name = uqname; ++ unquote (uqname, name, sizeof (uqname)); ++ if ((ptr = strstr(name, "._")) != NULL) ++ *ptr = '\0'; ++ ++ key.domain = (char *) domain; ++ key.type = device_type (type); ++ ++ /* ++ * Find the device and the the TXT information. ++ */ ++ ++ txtr.txt = txt; ++ device = find_device ((cups_array_t *) context, &txtr, &key); ++ if (device) ++ { ++ /* ++ * Let the main loop know to announce the device. ++ */ ++ ++ device->resolved = 1; ++ avahi_got_callback = 1; ++ } + else +- dkey.type = CUPS_DEVICE_RIOUSBPRINT; ++ fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name); ++ ++ avahi_service_resolver_free (resolver); ++} ++ ++static void ++avahi_browse_callback(AvahiServiceBrowser *browser, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiBrowserEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ AvahiLookupResultFlags flags, ++ void *context) ++{ ++ AvahiClient *client = avahi_service_browser_get_client (browser); ++ ++ switch (event) ++ { ++ case AVAHI_BROWSER_FAILURE: ++ fprintf (stderr, "ERROR: %s\n", ++ avahi_strerror (avahi_client_errno (client))); ++ avahi_simple_poll_quit (simple_poll); ++ return; ++ ++ case AVAHI_BROWSER_NEW: ++ /* ++ * This object is new on the network. ++ */ ++ ++ if (flags & AVAHI_LOOKUP_RESULT_LOCAL) ++ { ++ /* ++ * This comes from the local machine so ignore it. ++ */ ++ ++ fprintf (stderr, "DEBUG: ignoring local service %s\n", name); ++ } ++ else ++ { ++ /* ++ * Create a device entry for it if it doesn't yet exist. ++ */ ++ ++ get_device ((cups_array_t *)context, name, type, domain); ++ ++ /* ++ * Now look for a TXT entry. ++ */ ++ ++ if (avahi_service_resolver_new (client, interface, protocol, ++ name, type, domain, ++ AVAHI_PROTO_UNSPEC, 0, ++ avahi_query_callback, context) == NULL) ++ { ++ fprintf (stderr, "ERROR: failed to resolve service %s: %s\n", ++ name, avahi_strerror (avahi_client_errno (client))); ++ } ++ } ++ ++ break; + +- for (device = cupsArrayFind(devices, &dkey); ++ case AVAHI_BROWSER_REMOVE: ++ case AVAHI_BROWSER_ALL_FOR_NOW: ++ case AVAHI_BROWSER_CACHE_EXHAUSTED: ++ break; ++ } ++} ++#endif /* HAVE_AVAHI */ ++ ++static cups_device_t * ++find_device (cups_array_t *devices, ++ cups_txt_records_t *txt, ++ cups_device_t *dkey) ++{ ++ cups_device_t *device; ++ char *ptr; ++ ++ for (device = cupsArrayFind(devices, dkey); + device; + device = cupsArrayNext(devices)) + { +- if (strcasecmp(device->name, dkey.name) || +- strcasecmp(device->domain, dkey.domain)) ++ if (strcasecmp(device->name, dkey->name) || ++ strcasecmp(device->domain, dkey->domain)) + { + device = NULL; + break; + } +- else if (device->type == dkey.type) ++ else if (device->type == dkey->type) + { + /* + * Found it, pull out the priority and make and model from the TXT + * record and save it... + */ + +- const uint8_t *data, /* Pointer into data */ +- *datanext, /* Next key/value pair */ +- *dataend; /* End of entire TXT record */ +- uint8_t datalen; /* Length of current key/value pair */ +- char key[256], /* Key string */ +- value[256], /* Value string */ +- make_and_model[512], ++ char make_and_model[512], + /* Manufacturer and model */ + model[256], /* Model */ +- device_id[2048];/* 1284 device ID */ +- ++ device_id[2048]; /* 1284 device ID */ + + device_id[0] = '\0'; + make_and_model[0] = '\0'; + + strcpy(model, "Unknown"); + +- for (data = rdata, dataend = data + rdlen; +- data < dataend; +- data = datanext) ++ for (;;) + { +- /* +- * Read a key/value pair starting with an 8-bit length. Since the +- * length is 8 bits and the size of the key/value buffers is 256, we +- * don't need to check for overflow... +- */ +- +- datalen = *data++; +- +- if (!datalen || (data + datalen) >= dataend) +- break; +- +- datanext = data + datalen; ++ char *key; ++ char *value; + +- for (ptr = key; data < datanext && *data != '='; data ++) +- *ptr++ = *data; +- *ptr = '\0'; +- +- if (data < datanext && *data == '=') +- { +- data ++; +- +- if (data < datanext) +- memcpy(value, data, datanext - data); +- value[datanext - data] = '\0'; +- } +- else +- continue; ++ if (parse_txt_record_pair (txt)) ++ goto next; + ++ key = txt->key; ++ value = txt->value; + if (!strncasecmp(key, "usb_", 4)) + { + /* +@@ -805,6 +1183,10 @@ query_callback( + if (device->type == CUPS_DEVICE_PRINTER) + device->sent = 1; + } ++ ++ next: ++ if (next_txt_record (txt) == NULL) ++ break; + } + + if (device->device_id) +@@ -854,11 +1236,9 @@ query_callback( + } + } + +- if (!device) +- fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); ++ return device; + } + +- + /* + * 'sigterm_handler()' - Handle termination signals... + */ +diff -up cups-1.4.0/config.h.in.avahi cups-1.4.0/config.h.in +--- cups-1.4.0/config.h.in.avahi 2009-06-10 16:51:21.000000000 +0100 ++++ cups-1.4.0/config.h.in 2009-09-04 14:57:04.733388405 +0100 +@@ -336,6 +336,13 @@ + + + /* ++ * Do we have Avahi for DNS Service Discovery? ++ */ ++ ++#undef HAVE_AVAHI ++ ++ ++/* + * Do we have <sys/ioctl.h>? + */ + +diff -up cups-1.4.0/config-scripts/cups-dnssd.m4.avahi cups-1.4.0/config-scripts/cups-dnssd.m4 +--- cups-1.4.0/config-scripts/cups-dnssd.m4.avahi 2009-02-10 17:05:35.000000000 +0000 ++++ cups-1.4.0/config-scripts/cups-dnssd.m4 2009-09-04 14:57:04.731388902 +0100 +@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn + DNSSDLIBS="" + DNSSD_BACKEND="" + ++AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no], ++ [if test x$enable_avahi = xyes; then ++ AC_MSG_CHECKING(for Avahi) ++ if $PKGCONFIG --exists avahi-client; then ++ AC_MSG_RESULT(yes) ++ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`" ++ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" ++ DNSSD_BACKEND="dnssd" ++ AC_DEFINE(HAVE_AVAHI) ++ enable_dnssd=no ++ else ++ AC_MSG_RESULT(no) ++ fi ++ fi]) ++ + if test x$enable_dnssd != xno; then + AC_CHECK_HEADER(dns_sd.h, [ + case "$uname" in +diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c +--- cups-1.4.0/cups/http-support.c.avahi 2009-06-12 01:21:58.000000000 +0100 ++++ cups-1.4.0/cups/http-support.c 2009-09-04 14:57:04.736398674 +0100 +@@ -55,6 +55,11 @@ + # include <dns_sd.h> + # include <poll.h> + #endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++# include <avahi-client/client.h> ++# include <avahi-client/lookup.h> ++# include <avahi-common/simple-watch.h> ++#endif /* HAVE_AVAHI */ + + + /* +@@ -121,6 +126,24 @@ static void resolve_callback(DNSService + void *context); + #endif /* HAVE_DNSSD */ + ++#ifdef HAVE_AVAHI ++static void avahi_resolve_uri_client_cb(AvahiClient *client, ++ AvahiClientState state, ++ void *simple_poll); ++static void avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiResolverEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ const char *host_name, ++ const AvahiAddress *address, ++ uint16_t port, ++ AvahiStringList *txt, ++ AvahiLookupResultFlags flags, ++ void *context); ++#endif /* HAVE_AVAHI */ + + /* + * 'httpAssembleURI()' - Assemble a uniform resource identifier from its +@@ -1349,15 +1372,26 @@ _httpResolveURI( + + if (strstr(hostname, "._tcp")) + { ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) ++ char *regtype, /* Pointer to type in hostname */ ++ *domain; /* Pointer to domain in hostname */ + #ifdef HAVE_DNSSD + DNSServiceRef ref, /* DNS-SD master service reference */ + domainref, /* DNS-SD service reference for domain */ + localref; /* DNS-SD service reference for .local */ + int domainsent = 0; /* Send the domain resolve? */ +- char *regtype, /* Pointer to type in hostname */ +- *domain; /* Pointer to domain in hostname */ + _http_uribuf_t uribuf; /* URI buffer */ + struct pollfd polldata; /* Polling data */ ++#else /* HAVE_AVAHI */ ++ AvahiSimplePoll *simple_poll; ++ AvahiClient *client; ++ int error; ++ struct ++ { ++ AvahiSimplePoll *poll; ++ _http_uribuf_t uribuf; ++ } user_data; ++#endif /* HAVE_DNSSD */ + + + if (logit) +@@ -1395,8 +1429,13 @@ _httpResolveURI( + if (domain) + *domain++ = '\0'; + ++#ifdef HAVE_DNSSD + uribuf.buffer = resolved_uri; + uribuf.bufsize = resolved_size; ++#else ++ user_data.uribuf.buffer = resolved_uri; ++ user_data.uribuf.bufsize = resolved_size; ++#endif + + resolved_uri[0] = '\0'; + +@@ -1411,6 +1450,7 @@ _httpResolveURI( + + uri = NULL; + ++#ifdef HAVE_DNSSD + if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) + { + localref = ref; +@@ -1486,6 +1526,36 @@ _httpResolveURI( + + DNSServiceRefDeallocate(ref); + } ++#else /* HAVE_AVAHI */ ++ if ((simple_poll = avahi_simple_poll_new ()) != NULL) ++ { ++ if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll), ++ 0, avahi_resolve_uri_client_cb, ++ &simple_poll, &error)) != NULL) ++ { ++ user_data.poll = simple_poll; ++ if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, hostname, ++ regtype, domain, AVAHI_PROTO_UNSPEC, 0, ++ avahi_resolve_uri_resolver_cb, ++ &user_data) != NULL) ++ { ++ avahi_simple_poll_loop (simple_poll); ++ ++ /* ++ * Collect the result. ++ */ ++ ++ if (resolved_uri[0]) ++ uri = resolved_uri; ++ } ++ ++ avahi_client_free (client); ++ } ++ ++ avahi_simple_poll_free (simple_poll); ++ } ++#endif /* HAVE_DNSSD */ + + if (logit) + { +@@ -1497,13 +1567,13 @@ _httpResolveURI( + fputs("STATE: -connecting-to-device\n", stderr); + } + +-#else ++#else /* HAVE_DNSSD || HAVE_AVAHI */ + /* + * No DNS-SD support... + */ + + uri = NULL; +-#endif /* HAVE_DNSSD */ ++#endif /* HAVE_DNSSD || HAVE_AVAHI */ + + if (logit && !uri) + _cupsLangPuts(stderr, _("Unable to find printer!\n")); +@@ -1708,6 +1778,105 @@ resolve_callback( + } + #endif /* HAVE_DNSSD */ + ++#ifdef HAVE_AVAHI ++static void ++avahi_resolve_uri_client_cb (AvahiClient *client, ++ AvahiClientState state, ++ void *simple_poll) ++{ ++ DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, " ++ "simple_poll=%p)\n", client, state, simple_poll)); ++ ++ /* ++ * If the connection drops, quit. ++ */ ++ ++ if (state == AVAHI_CLIENT_FAILURE) ++ avahi_simple_poll_quit (simple_poll); ++} ++ ++static void ++avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiResolverEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ const char *host_name, ++ const AvahiAddress *address, ++ uint16_t port, ++ AvahiStringList *txt, ++ AvahiLookupResultFlags flags, ++ void *context) ++{ ++ const char *scheme; /* URI scheme */ ++ char rp[256]; /* Remote printer */ ++ AvahiStringList *pair; ++ char *value; ++ size_t valueLen = 0; ++ char addr[AVAHI_ADDRESS_STR_MAX]; ++ struct ++ { ++ AvahiSimplePoll *poll; ++ _http_uribuf_t uribuf; ++ } *poll_uribuf = context; ++ ++ DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, " ++ "interface=%d, protocol=%d, event=%d, name=\"%s\", " ++ "type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, " ++ "port=%d, txt=%p, flags=%d, context=%p)\n", ++ resolver, interface, protocol, event, name, type, domain, ++ host_name, address, port, txt, flags, context)); ++ ++ if (event != AVAHI_RESOLVER_FOUND) ++ { ++ avahi_service_resolver_free (resolver); ++ avahi_simple_poll_quit (poll_uribuf->poll); ++ return; ++ } ++ ++ /* ++ * Figure out the scheme from the full name... ++ */ ++ ++ if (strstr(type, "_ipp.")) ++ scheme = "ipp"; ++ else if (strstr(type, "_printer.")) ++ scheme = "lpd"; ++ else if (strstr(type, "_pdl-datastream.")) ++ scheme = "socket"; ++ else ++ scheme = "riousbprint"; ++ ++ /* ++ * Extract the "remote printer key from the TXT record... ++ */ ++ ++ if ((pair = avahi_string_list_find (txt, "rp")) != NULL) ++ { ++ avahi_string_list_get_pair (pair, NULL, &value, &valueLen); ++ rp[0] = '/'; ++ memcpy (rp + 1, value, valueLen); ++ rp[valueLen + 1] = '\0'; ++ } ++ else ++ rp[0] = '\0'; ++ ++ /* ++ * Assemble the final device URI... ++ */ ++ ++ avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address); ++ httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer, ++ poll_uribuf->uribuf.bufsize, scheme, NULL, ++ addr, port, rp); ++ DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n", ++ poll_uribuf->uribuf.buffer)); ++ avahi_simple_poll_quit (poll_uribuf->poll); ++} ++#endif /* HAVE_AVAHI */ ++ + + /* + * End of "$Id: http-support.c 8705 2009-06-12 00:21:58Z mike $". + diff --git a/abs/extra/cups/cups.install b/abs/extra/cups/cups.install new file mode 100644 index 0000000..97fda5a --- /dev/null +++ b/abs/extra/cups/cups.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/abs/extra/cups/cups.logrotate b/abs/extra/cups/cups.logrotate new file mode 100644 index 0000000..9c49bbd --- /dev/null +++ b/abs/extra/cups/cups.logrotate @@ -0,0 +1,8 @@ +/var/log/cups/*log { + missingok + notifempty + delaycompress + postrotate + /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/abs/extra/cups/cups.pam b/abs/extra/cups/cups.pam new file mode 100644 index 0000000..53724d1 --- /dev/null +++ b/abs/extra/cups/cups.pam @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/abs/extra/cups/fix-infinite-usb-loop.patch b/abs/extra/cups/fix-infinite-usb-loop.patch new file mode 100644 index 0000000..bad179e --- /dev/null +++ b/abs/extra/cups/fix-infinite-usb-loop.patch @@ -0,0 +1,35 @@ +diff -urNad cups-1.4.0~/backend/usb-libusb.c cups-1.4.0/backend/usb-libusb.c +--- cups-1.4.0~/backend/usb-libusb.c 2009-08-08 00:24:14.000000000 +0200 ++++ cups-1.4.0/backend/usb-libusb.c 2009-09-02 16:37:31.000000000 +0200 +@@ -158,7 +158,7 @@ + + while (poll(pfds, 2, -1) > 0) + { +- if (pfds[0].revents & POLLIN) ++ if (pfds[0].revents & (POLLIN + POLLHUP)) + { + if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0) + { +@@ -179,7 +179,12 @@ + } + + if (pfds[1].revents & POLLIN) +- tbytes += side_cb(printer, print_fd); ++ { ++ if ((bytes = side_cb(printer, print_fd)) < 0) ++ pfds[1].events = 0; /* Filter has gone away... */ ++ else ++ tbytes += bytes; ++ } + } + } + +@@ -747,7 +752,7 @@ + if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0)) + { + _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n")); +- return (0); ++ return (-1); + } + + switch (command) diff --git a/abs/extra/cvs/PKGBUILD b/abs/extra/cvs/PKGBUILD index 488f4a0..26b95db 100644 --- a/abs/extra/cvs/PKGBUILD +++ b/abs/extra/cvs/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 20493 2008-12-05 11:27:50Z allan $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 75326 2010-04-01 10:25:20Z allan $ +# Contributor: dorphell <dorphell@archlinux.org> + pkgname=cvs pkgver=1.11.23 -pkgrel=3 +pkgrel=5 pkgdesc="Concurrent Versions System - a source control system" arch=(i686 x86_64) -url="http://ximbiot.com/cvs/wiki/index.php" +url="http://cvs.nongnu.org" license=('GPL') -depends=('heimdal>=1.2') -source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('0213ea514e231559d6ff8f80a34117f0') +depends=('heimdal>=1.3.1') +optdepends=('openssh: for using cvs over ssh' 'inetutils: for using cvs over rsh') +install=cvs.install +source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/$pkgver/$pkgname-$pkgver.tar.bz2 + cvs-1.11.23-getline64.patch) +sha256sums=('400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9' + '9126d7992ace943980ad8a10d5a09aeb6f1eeeb9b921fc796fe31de7b1c220cf') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver unset EDITOR VISUAL + + patch -Np1 -i $srcdir/cvs-1.11.23-getline64.patch || return 1 ./configure --prefix=/usr make || return 1 - make DESTDIR=$startdir/pkg install + make DESTDIR=$pkgdir install + rm ${pkgdir}/usr/share/info/dir } diff --git a/abs/extra/cvs/cvs-1.11.23-getline64.patch b/abs/extra/cvs/cvs-1.11.23-getline64.patch new file mode 100644 index 0000000..99942e0 --- /dev/null +++ b/abs/extra/cvs/cvs-1.11.23-getline64.patch @@ -0,0 +1,34 @@ +--- cvs-1.11.23/lib/getline.c 2005-04-04 22:46:05.000000000 +0200 ++++ cvs-1.11.23/lib/getline.c.old 2008-06-03 19:06:25.000000000 +0200 +@@ -154,7 +154,7 @@ + return ret; + } + +-int ++ssize_t + getline (lineptr, n, stream) + char **lineptr; + size_t *n; +@@ -163,7 +163,7 @@ + return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT); + } + +-int ++ssize_t + getline_safe (lineptr, n, stream, limit) + char **lineptr; + size_t *n; +--- cvs-1.11.23/lib/getline.h 2005-04-04 22:46:05.000000000 +0200 ++++ cvs-1.11.23/lib/getline.h.old 2008-06-03 19:06:27.000000000 +0200 +@@ -11,9 +11,9 @@ + + #define GETLINE_NO_LIMIT -1 + +-int ++ssize_t + getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); +-int ++ssize_t + getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, + int limit)); + int diff --git a/abs/extra/cvs/cvs.install b/abs/extra/cvs/cvs.install new file mode 100644 index 0000000..f1cdd1f --- /dev/null +++ b/abs/extra/cvs/cvs.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(cvs.info cvs-info-1 cvs-info-2 cvsclient.info) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/ddclient/ChangeLog b/abs/extra/ddclient/ChangeLog deleted file mode 100644 index 4520b69..0000000 --- a/abs/extra/ddclient/ChangeLog +++ /dev/null @@ -1,22 +0,0 @@ -2008-08-07 Abhishek Dasgupta <abhidg@gmail.com> - - * ddclient 3.7.3-2 - * added /etc/conf.d/ddclient for modifying - daemon poll frequency. This overrides the - setting specified in /etc/ddclient/ddclient.conf - when ddclient is called as an rc script. - -2007-08-08 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - - * ddclient-3.7.3-1 - * version bump - * GPL -> GPL2 - * shortened pkgdesc - -2007-07-02 tardo <tardo@nagi-fanboi.net> - - * Built for x86_64 - -2007-06-29 Georg Grabler (STiAT) <ggrabler@gmail.com> - - * Version Bump to 3.7.2 diff --git a/abs/extra/ddclient/ddclient.conf.d b/abs/extra/ddclient/ddclient.conf.d deleted file mode 100644 index 8b754a3..0000000 --- a/abs/extra/ddclient/ddclient.conf.d +++ /dev/null @@ -1,2 +0,0 @@ -# Parameters passed to ddclient -EXTRA_ARGS="-daemon 300" diff --git a/abs/extra/ddclient/ddclient.install b/abs/extra/ddclient/ddclient.install deleted file mode 100644 index d6edc0e..0000000 --- a/abs/extra/ddclient/ddclient.install +++ /dev/null @@ -1,41 +0,0 @@ -# arg 1: the new package version -post_install() { -cat << EOM - -If you want to use ddclient with dhcpcd, cron or pppd, -see /etc/ddclient/samples for further instructions. - -If you have ddclient in the DAEMONS array of /etc/rc.conf: -- Change /etc/conf.d/ddclient according to your needs. -- This setting OVERRIDES any setting in - /etc/ddclient/ddclient.conf - -EOM -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - -if [ -f /etc/ddclient/ddclient.cache ]; then - echo -n "Moving ddclient.cache from /etc/ddclient/ to /var/cache/ddclient/." - mv /etc/ddclient/ddclient.cache /var/cache/ddclient/ - echo " (done)" -fi - -if [ "$(vercmp $2 3.7.3-2)" -lt 0 ]; then -cat << EOM - -If you have ddclient in the DAEMONS array of /etc/rc.conf: -- Change /etc/conf.d/ddclient according to your needs. -- This setting OVERRIDES any setting in - /etc/ddclient/ddclient.conf - -EOM -fi - -} - -op=$1 -shift -$op $* diff --git a/abs/extra/gconf/01_xml-gettext-domain.patch b/abs/extra/gconf/01_xml-gettext-domain.patch index 7491ca8..d1323f6 100644 --- a/abs/extra/gconf/01_xml-gettext-domain.patch +++ b/abs/extra/gconf/01_xml-gettext-domain.patch @@ -1,26 +1,17 @@ # Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks. # Ubuntu: https://bugs.launchpad.net/bugs/123025 # Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845 -diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/backends/markup-tree.c gconf-2.25.0.new/backends/markup-tree.c ---- gconf-2.25.0/backends/markup-tree.c 2009-01-10 05:55:08.000000000 +0100 -+++ gconf-2.25.0.new/backends/markup-tree.c 2009-01-23 12:11:48.000000000 +0100 -@@ -52,6 +52,7 @@ +--- GConf-2.26.0/backends/markup-tree.c.gettext 2009-04-26 23:33:05.258484987 -0400 ++++ GConf-2.26.0/backends/markup-tree.c 2009-04-26 23:34:25.026700526 -0400 +@@ -52,6 +52,7 @@ struct _MarkupEntry char *schema_name; char *mod_user; GTime mod_time; -+ char *gettext_domain; ++ const char *gettext_domain; }; static LocalSchemaInfo* local_schema_info_new (void); -@@ -1351,6 +1352,7 @@ - gconf_value_free (entry->value); - g_free (entry->schema_name); - g_free (entry->mod_user); -+ g_free (entry->gettext_domain); - - g_slist_foreach (entry->local_schemas, - (GFunc) local_schema_info_free, -@@ -1593,6 +1595,8 @@ +@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry gconf_schema_get_type (schema)); gconf_schema_set_owner (current_schema, gconf_schema_get_owner (schema)); @@ -29,7 +20,7 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/backends/markup-tree.c gconf-2.25.0.n } /* Update mod time */ -@@ -1805,6 +1809,8 @@ +@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent else if (c_local_schema && c_local_schema->long_desc) gconf_schema_set_long_desc (schema, c_local_schema->long_desc); @@ -38,7 +29,7 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/backends/markup-tree.c gconf-2.25.0.n return retval; } } -@@ -2339,8 +2345,9 @@ +@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext const char *ltype; const char *list_type; const char *owner; @@ -49,7 +40,7 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/backends/markup-tree.c gconf-2.25.0.n #if 0 g_assert (ELEMENT_IS ("entry") || -@@ -2377,6 +2384,7 @@ +@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext "muser", &dummy2, "mtime", &dummy3, "schema", &dummy4, @@ -57,7 +48,7 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/backends/markup-tree.c gconf-2.25.0.n NULL)) return; -@@ -2682,6 +2690,7 @@ +@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext const char *mtime; const char *schema; const char *type; @@ -65,7 +56,7 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/backends/markup-tree.c gconf-2.25.0.n const char *dummy1, *dummy2, *dummy3, *dummy4; const char *dummy5, *dummy6, *dummy7; GConfValue *value; -@@ -2692,6 +2701,7 @@ +@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext mtime = NULL; schema = NULL; type = NULL; @@ -73,7 +64,7 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/backends/markup-tree.c gconf-2.25.0.n if (!locate_attributes (context, element_name, attribute_names, attribute_values, error, -@@ -2700,6 +2710,7 @@ +@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext "mtime", &mtime, "schema", &schema, "type", &type, @@ -81,17 +72,17 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/backends/markup-tree.c gconf-2.25.0.n /* These are allowed but we don't use them until * parse_value_element -@@ -2767,6 +2778,9 @@ +@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext */ if (schema) entry->schema_name = g_strdup (schema); + + if (gettext_domain) -+ entry->gettext_domain = g_strdup (gettext_domain); ++ entry->gettext_domain = g_intern_string (gettext_domain); } else { -@@ -3705,6 +3719,7 @@ +@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value, GConfSchema *schema; GConfValueType stype; const char *owner; @@ -99,7 +90,7 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/backends/markup-tree.c gconf-2.25.0.n schema = gconf_value_get_schema (value); -@@ -3730,6 +3745,23 @@ +@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value, g_free (s); } @@ -123,35 +114,79 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/backends/markup-tree.c gconf-2.25.0.n if (stype == GCONF_VALUE_LIST) { -diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconf-schema.c gconf-2.25.0.new/gconf/gconf-schema.c ---- gconf-2.25.0/gconf/gconf-schema.c 2009-01-10 05:55:07.000000000 +0100 -+++ gconf-2.25.0.new/gconf/gconf-schema.c 2009-01-23 12:11:48.000000000 +0100 -@@ -35,6 +35,7 @@ - gchar* owner; /* Name of creating application */ +diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd +--- GConf-2.26.0/doc/gconf-1.0.dtd.gettext 2009-04-26 23:33:17.240736103 -0400 ++++ GConf-2.26.0/doc/gconf-1.0.dtd 2009-04-26 23:34:25.027700384 -0400 +@@ -7,7 +7,7 @@ + <!-- A single schema. What I am trying to say is "this set of + elements, in any order". Duplicate elements (apart from <locale>) are + not allowed). --> +-<!ELEMENT schema (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*)*> ++<!ELEMENT schema (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*|gettext_domain?)*> + + <!-- The key for this schema (e.g. /schemas/apps/foo/bar) --> + <!ELEMENT key (#PCDATA)> +diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c +--- GConf-2.26.0/gconf/gconf-internals.c.gettext 2009-04-26 23:34:10.994700035 -0400 ++++ GConf-2.26.0/gconf/gconf-internals.c 2009-04-26 23:34:53.767450191 -0400 +@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem + cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : ""); + cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : ""); + cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : ""); ++ cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : ""); + + { + gchar* encoded; +@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con + gconf_schema_set_owner(sc, cs->owner); + } + ++ if (*cs->gettext_domain != '\0') ++ { ++ if (!g_utf8_validate (cs->gettext_domain, -1, NULL)) ++ gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema")); ++ else ++ gconf_schema_set_gettext_domain(sc, cs->gettext_domain); ++ } ++ + { + GConfValue* val; + +diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c +--- GConf-2.26.0/gconf/gconf-schema.c.gettext 2009-04-26 23:33:26.787483545 -0400 ++++ GConf-2.26.0/gconf/gconf-schema.c 2009-04-26 23:35:54.240450142 -0400 +@@ -32,9 +32,10 @@ typedef struct { + GConfValueType car_type; /* Pair car type of the described entry */ + GConfValueType cdr_type; /* Pair cdr type of the described entry */ + gchar* locale; /* Schema locale */ +- gchar* owner; /* Name of creating application */ ++ const gchar* owner; /* Name of creating application */ gchar* short_desc; /* 40 char or less description, no newlines */ gchar* long_desc; /* could be a paragraph or so */ -+ gchar* gettext_domain; /* description gettext domain */ ++ const gchar* gettext_domain; /* description gettext domain */ GConfValue* default_value; /* Default value of the key */ } GConfRealSchema; -@@ -63,6 +64,7 @@ +@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc) g_free (real->locale); g_free (real->short_desc); g_free (real->long_desc); -+ g_free (real->gettext_domain); - g_free (real->owner); +- g_free (real->owner); if (real->default_value) -@@ -91,6 +93,8 @@ + gconf_value_free (real->default_value); +@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc dest->long_desc = g_strdup (real->long_desc); -+ dest->gettext_domain = g_strdup (real->gettext_domain); +- dest->owner = g_strdup (real->owner); ++ dest->gettext_domain = real->gettext_domain; + - dest->owner = g_strdup (real->owner); ++ dest->owner = real->owner; dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL; -@@ -136,6 +140,20 @@ + +@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc REAL_SCHEMA (sc)->locale = NULL; } @@ -160,11 +195,8 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconf-schema.c gconf-2.25.0.new +{ + g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL)); + -+ if (REAL_SCHEMA (sc)->gettext_domain) -+ g_free (REAL_SCHEMA (sc)->gettext_domain); -+ + if (domain) -+ REAL_SCHEMA (sc)->gettext_domain = g_strdup (domain); ++ REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain); + else + REAL_SCHEMA (sc)->gettext_domain = NULL; +} @@ -172,7 +204,20 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconf-schema.c gconf-2.25.0.new void gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc) { -@@ -228,6 +246,14 @@ +@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc, + { + g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL)); + +- if (REAL_SCHEMA (sc)->owner) +- g_free (REAL_SCHEMA (sc)->owner); +- + if (owner) +- REAL_SCHEMA (sc)->owner = g_strdup (owner); ++ REAL_SCHEMA (sc)->owner = g_intern_string (owner); + else + REAL_SCHEMA (sc)->owner = NULL; + } +@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema return FALSE; } @@ -187,7 +232,7 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconf-schema.c gconf-2.25.0.new if (real->owner && !g_utf8_validate (real->owner, -1, NULL)) { g_set_error (err, GCONF_ERROR, -@@ -299,11 +325,22 @@ +@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche } const char* @@ -198,35 +243,42 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconf-schema.c gconf-2.25.0.new + return REAL_SCHEMA (schema)->gettext_domain; +} + ++static inline const char * ++schema_translate (const GConfSchema *schema, ++ const char *string) ++{ ++ if (REAL_SCHEMA (schema)->gettext_domain) ++ { ++ bind_textdomain_codeset (REAL_SCHEMA (schema)->gettext_domain, "UTF-8"); ++ return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string); ++ } ++ else ++ return string; ++} ++ +const char* gconf_schema_get_short_desc (const GConfSchema *schema) { g_return_val_if_fail (schema != NULL, NULL); - return REAL_SCHEMA (schema)->short_desc; -+ if (REAL_SCHEMA (schema)->gettext_domain) -+ return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, REAL_SCHEMA (schema)->short_desc); -+ else -+ return REAL_SCHEMA (schema)->short_desc; ++ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc); } const char* -@@ -311,7 +348,10 @@ +@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS { g_return_val_if_fail (schema != NULL, NULL); - return REAL_SCHEMA (schema)->long_desc; -+ if (REAL_SCHEMA (schema)->gettext_domain) -+ return dgettext(REAL_SCHEMA (schema)->gettext_domain, REAL_SCHEMA (schema)->long_desc); -+ else -+ return REAL_SCHEMA (schema)->long_desc; ++ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc); } const char* -diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconf-schema.h gconf-2.25.0.new/gconf/gconf-schema.h ---- gconf-2.25.0/gconf/gconf-schema.h 2009-01-10 05:55:07.000000000 +0100 -+++ gconf-2.25.0.new/gconf/gconf-schema.h 2009-01-23 12:11:48.000000000 +0100 -@@ -48,6 +48,8 @@ +diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h +--- GConf-2.26.0/gconf/gconf-schema.h.gettext 2009-04-26 23:33:33.979744088 -0400 ++++ GConf-2.26.0/gconf/gconf-schema.h 2009-04-26 23:34:25.030737043 -0400 +@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type GConfValueType type); void gconf_schema_set_locale (GConfSchema *sc, const gchar *locale); @@ -235,7 +287,7 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconf-schema.h gconf-2.25.0.new void gconf_schema_set_short_desc (GConfSchema *sc, const gchar *desc); void gconf_schema_set_long_desc (GConfSchema *sc, -@@ -65,6 +67,7 @@ +@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ GConfValueType gconf_schema_get_car_type (const GConfSchema *schema); GConfValueType gconf_schema_get_cdr_type (const GConfSchema *schema); const char* gconf_schema_get_locale (const GConfSchema *schema); @@ -243,10 +295,10 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconf-schema.h gconf-2.25.0.new const char* gconf_schema_get_short_desc (const GConfSchema *schema); const char* gconf_schema_get_long_desc (const GConfSchema *schema); const char* gconf_schema_get_owner (const GConfSchema *schema); -diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconftool.c gconf-2.25.0.new/gconf/gconftool.c ---- gconf-2.25.0/gconf/gconftool.c 2009-01-10 05:55:07.000000000 +0100 -+++ gconf-2.25.0.new/gconf/gconftool.c 2009-01-23 12:11:48.000000000 +0100 -@@ -3293,6 +3293,7 @@ +diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c +--- GConf-2.26.0/gconf/gconftool.c.gettext 2009-04-26 23:33:41.907451190 -0400 ++++ GConf-2.26.0/gconf/gconftool.c 2009-04-26 23:34:25.034736752 -0400 +@@ -3295,6 +3295,7 @@ struct _SchemaInfo { GConfValueType cdr_type; GConfValue* global_default; GHashTable* hash; @@ -254,7 +306,7 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconftool.c gconf-2.25.0.new/gc }; static int -@@ -3545,6 +3546,15 @@ +@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node, else g_printerr (_("WARNING: empty <applyto> node")); } @@ -270,7 +322,7 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconftool.c gconf-2.25.0.new/gc else g_printerr (_("WARNING: node <%s> not understood below <schema>\n"), iter->name); -@@ -3634,6 +3644,9 @@ +@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch if (info->owner != NULL) gconf_schema_set_owner(schema, info->owner); @@ -280,7 +332,7 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconftool.c gconf-2.25.0.new/gc xmlFree(name); /* Locale-specific info */ -@@ -3763,6 +3776,7 @@ +@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch info.apply_to = NULL; info.owner = NULL; info.global_default = NULL; @@ -288,7 +340,7 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconftool.c gconf-2.25.0.new/gc info.hash = g_hash_table_new(g_str_hash, g_str_equal); extract_global_info(node, &info); -@@ -3799,6 +3813,8 @@ +@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch ; /* nothing */ else if (strcmp((char *)iter->name, "applyto") == 0) ; /* nothing */ @@ -297,3 +349,14 @@ diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconftool.c gconf-2.25.0.new/gc else if (strcmp((char *)iter->name, "locale") == 0) { process_locale_info(iter, &info); +diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl +--- GConf-2.26.0/gconf/GConfX.idl.gettext 2009-04-26 23:33:58.457483190 -0400 ++++ GConf-2.26.0/gconf/GConfX.idl 2009-04-26 23:34:53.764448732 -0400 +@@ -16,6 +16,7 @@ struct ConfigSchema { + string short_desc; + string long_desc; + string owner; ++ string gettext_domain; + // Work around lack of recursive data types + string encoded_default_value; + }; diff --git a/abs/extra/gconf/05_from_vuntz_gconf2-pk-default-path.patch b/abs/extra/gconf/05_from_vuntz_gconf2-pk-default-path.patch deleted file mode 100644 index c303e19..0000000 --- a/abs/extra/gconf/05_from_vuntz_gconf2-pk-default-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur -x '*.orig' -x '*~' gconf-2.25.2/defaults/gconf-defaults.c gconf-2.25.2.new/defaults/gconf-defaults.c ---- gconf-2.25.2/defaults/gconf-defaults.c 2009-02-17 01:15:19.000000000 +0100 -+++ gconf-2.25.2.new/defaults/gconf-defaults.c 2009-02-17 11:12:39.000000000 +0100 -@@ -507,7 +507,7 @@ - else { - annotation_key = "org.gnome.gconf.defaults.set-system.prefix"; - default_action = "org.gnome.gconf.defaults.set-system"; -- dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.system"; -+ dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.defaults"; - } - - for (i = 0; includes[i]; i++) { diff --git a/abs/extra/gconf/PKGBUILD b/abs/extra/gconf/PKGBUILD index 053e26a..3da7a0c 100644 --- a/abs/extra/gconf/PKGBUILD +++ b/abs/extra/gconf/PKGBUILD @@ -1,45 +1,38 @@ -# $Id: PKGBUILD 33882 2009-04-05 19:42:30Z jgc $ +# $Id: PKGBUILD 74317 2010-03-30 19:00:27Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gconf -pkgver=2.26.0 -pkgrel=3 +pkgver=2.28.1 +pkgrel=1 pkgdesc="A configuration database system" arch=(i686 x86_64) license=('LGPL') -depends=('orbit2>=2.14.17' 'gtk2>=2.16.0' 'libxml2>=2.7.3' 'policykit>=0.9' 'libldap>=2.3.43') -makedepends=('pkgconfig' 'intltool>=0.40.6' 'gtk-doc>=1.10') +depends=('orbit2>=2.14.17' 'gtk2>=2.20.0' 'libxml2>=2.7.7' 'polkit>=0.96' 'libldap>=2.4.18' 'dbus') +makedepends=('pkgconfig' 'intltool' 'gtk-doc') options=('!libtool') install=gconf.install url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.26/GConf-${pkgver}.tar.bz2 - gconf-merge-schema - gconfpkg - gconf-reload.patch - xml-gettext-domain.patch - 05_from_vuntz_gconf2-pk-default-path.patch) -md5sums=('b010f0de356ea093c6a73778b13de956' +source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.28/GConf-${pkgver}.tar.bz2 + gconf-merge-schema + gconfpkg + gconf-reload.patch + 01_xml-gettext-domain.patch) +md5sums=('27663faf0af4f6a6d534de9270f6d24a' '240b473fa17b748fc9020caf372d936c' 'b745f04b4121d8724c002b14a4c110b6' 'cfcc8e15be7b8a48de4aa34336ff6090' - '1c8a0eece8202c4c2fbba596fe0d9c67' - 'd9a02aee25ec04f2340f4e98963aabb0') + '1f9362976d71312bdb57c57fa031681d') build() { cd "${srcdir}/GConf-${pkgver}" # Patch from fedora - reloads gconf after installing schemas patch -Np1 -i "${srcdir}/gconf-reload.patch" || return 1 # http://bugzilla.gnome.org/show_bug.cgi?id=568845 - patch -Np1 -i "${srcdir}/xml-gettext-domain.patch" || return 1 - # Patch from Ubuntu: change default path - patch -Np1 -i "${srcdir}/05_from_vuntz_gconf2-pk-default-path.patch" || return 1 - libtoolize --force --copy || return 1 - aclocal || return 1 - autoconf || return 1 - automake --add-missing || return 1 + patch -Np1 -i "${srcdir}/01_xml-gettext-domain.patch" || return 1 + ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/GConf \ - --disable-static --enable-defaults-service || return 1 + --localstatedir=/var --libexecdir=/usr/lib/GConf \ + --disable-static --enable-defaults-service || return 1 make pkglibdir=/usr/lib/GConf || return 1 make DESTDIR="${pkgdir}" install || return 1 install -m755 -d "${pkgdir}/etc/gconf/gconf.xml.system" || return 1 diff --git a/abs/extra/gconf/xml-gettext-domain.patch b/abs/extra/gconf/xml-gettext-domain.patch deleted file mode 100644 index 1c5a78e..0000000 --- a/abs/extra/gconf/xml-gettext-domain.patch +++ /dev/null @@ -1,367 +0,0 @@ -diff -ru GConf-2.26.0/backends/markup-tree.c GConf-2.26.0.patched/backends/markup-tree.c ---- GConf-2.26.0/backends/markup-tree.c 2009-02-16 18:17:43.000000000 +0000 -+++ GConf-2.26.0.patched/backends/markup-tree.c 2009-04-05 19:36:42.000000000 +0000 -@@ -52,6 +52,7 @@ - char *schema_name; - char *mod_user; - GTime mod_time; -+ char *gettext_domain; - }; - - static LocalSchemaInfo* local_schema_info_new (void); -@@ -1351,6 +1352,7 @@ - gconf_value_free (entry->value); - g_free (entry->schema_name); - g_free (entry->mod_user); -+ g_free (entry->gettext_domain); - - g_slist_foreach (entry->local_schemas, - (GFunc) local_schema_info_free, -@@ -1593,6 +1595,8 @@ - gconf_schema_get_type (schema)); - gconf_schema_set_owner (current_schema, - gconf_schema_get_owner (schema)); -+ gconf_schema_set_gettext_domain (current_schema, -+ gconf_schema_get_gettext_domain (schema)); - } - - /* Update mod time */ -@@ -1805,6 +1809,8 @@ - else if (c_local_schema && c_local_schema->long_desc) - gconf_schema_set_long_desc (schema, c_local_schema->long_desc); - -+ gconf_schema_set_gettext_domain (schema, entry->gettext_domain); -+ - return retval; - } - } -@@ -2339,8 +2345,9 @@ - const char *ltype; - const char *list_type; - const char *owner; -+ - GConfValueType vtype; -- const char *dummy1, *dummy2, *dummy3, *dummy4; -+ const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5; - - #if 0 - g_assert (ELEMENT_IS ("entry") || -@@ -2377,6 +2384,7 @@ - "muser", &dummy2, - "mtime", &dummy3, - "schema", &dummy4, -+ "gettext_domain", &dummy5, - - NULL)) - return; -@@ -2683,6 +2691,7 @@ - const char *mtime; - const char *schema; - const char *type; -+ const char *gettext_domain; - const char *dummy1, *dummy2, *dummy3, *dummy4; - const char *dummy5, *dummy6, *dummy7; - GConfValue *value; -@@ -2693,6 +2702,7 @@ - mtime = NULL; - schema = NULL; - type = NULL; -+ gettext_domain = NULL; - - if (!locate_attributes (context, element_name, attribute_names, attribute_values, - error, -@@ -2701,6 +2711,7 @@ - "mtime", &mtime, - "schema", &schema, - "type", &type, -+ "gettext_domain", &gettext_domain, - - /* These are allowed but we don't use them until - * parse_value_element -@@ -2768,6 +2779,9 @@ - */ - if (schema) - entry->schema_name = g_strdup (schema); -+ -+ if (gettext_domain) -+ entry->gettext_domain = g_strdup (gettext_domain); - } - else - { -@@ -3716,6 +3730,7 @@ - GConfSchema *schema; - GConfValueType stype; - const char *owner; -+ const char *gettext_domain; - - schema = gconf_value_get_schema (value); - -@@ -3741,6 +3756,23 @@ - - g_free (s); - } -+ -+ gettext_domain = gconf_schema_get_gettext_domain (schema); -+ -+ if (gettext_domain) -+ { -+ char *s; -+ -+ s = g_markup_escape_text (gettext_domain, -1); -+ -+ if (fprintf (f, " gettext_domain=\"%s\"", s) < 0) -+ { -+ g_free (s); -+ return FALSE; -+ } -+ -+ g_free (s); -+ } - - if (stype == GCONF_VALUE_LIST) - { -Only in GConf-2.26.0.patched/backends: markup-tree.c.orig -diff -ru GConf-2.26.0/doc/gconf-1.0.dtd GConf-2.26.0.patched/doc/gconf-1.0.dtd ---- GConf-2.26.0/doc/gconf-1.0.dtd 2008-05-09 14:29:51.000000000 +0000 -+++ GConf-2.26.0.patched/doc/gconf-1.0.dtd 2009-04-05 19:36:42.000000000 +0000 -@@ -7,7 +7,7 @@ - <!-- A single schema. What I am trying to say is "this set of - elements, in any order". Duplicate elements (apart from <locale>) are - not allowed). --> --<!ELEMENT schema (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*)*> -+<!ELEMENT schema (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*|gettext_domain?)*> - - <!-- The key for this schema (e.g. /schemas/apps/foo/bar) --> - <!ELEMENT key (#PCDATA)> -diff -ru GConf-2.26.0/gconf/GConfX.idl GConf-2.26.0.patched/gconf/GConfX.idl ---- GConf-2.26.0/gconf/GConfX.idl 2008-05-09 14:29:51.000000000 +0000 -+++ GConf-2.26.0.patched/gconf/GConfX.idl 2009-04-05 19:36:46.000000000 +0000 -@@ -16,6 +16,7 @@ - string short_desc; - string long_desc; - string owner; -+ string gettext_domain; - // Work around lack of recursive data types - string encoded_default_value; - }; -diff -ru GConf-2.26.0/gconf/gconf-internals.c GConf-2.26.0.patched/gconf/gconf-internals.c ---- GConf-2.26.0/gconf/gconf-internals.c 2009-03-17 02:47:13.000000000 +0000 -+++ GConf-2.26.0.patched/gconf/gconf-internals.c 2009-04-05 19:36:46.000000000 +0000 -@@ -513,6 +513,7 @@ - cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : ""); - cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : ""); - cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : ""); -+ cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : ""); - - { - gchar* encoded; -@@ -600,6 +601,14 @@ - gconf_schema_set_owner(sc, cs->owner); - } - -+ if (*cs->gettext_domain != '\0') -+ { -+ if (!g_utf8_validate (cs->gettext_domain, -1, NULL)) -+ gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema")); -+ else -+ gconf_schema_set_gettext_domain(sc, cs->gettext_domain); -+ } -+ - { - GConfValue* val; - -diff -ru GConf-2.26.0/gconf/gconf-schema.c GConf-2.26.0.patched/gconf/gconf-schema.c ---- GConf-2.26.0/gconf/gconf-schema.c 2008-10-09 17:51:31.000000000 +0000 -+++ GConf-2.26.0.patched/gconf/gconf-schema.c 2009-04-05 19:36:42.000000000 +0000 -@@ -32,9 +32,10 @@ - GConfValueType car_type; /* Pair car type of the described entry */ - GConfValueType cdr_type; /* Pair cdr type of the described entry */ - gchar* locale; /* Schema locale */ -- gchar* owner; /* Name of creating application */ -+ const gchar* owner; /* Name of creating application */ - gchar* short_desc; /* 40 char or less description, no newlines */ - gchar* long_desc; /* could be a paragraph or so */ -+ const gchar* gettext_domain; /* description gettext domain */ - GConfValue* default_value; /* Default value of the key */ - } GConfRealSchema; - -@@ -63,7 +64,6 @@ - g_free (real->locale); - g_free (real->short_desc); - g_free (real->long_desc); -- g_free (real->owner); - - if (real->default_value) - gconf_value_free (real->default_value); -@@ -91,7 +91,9 @@ - - dest->long_desc = g_strdup (real->long_desc); - -- dest->owner = g_strdup (real->owner); -+ dest->gettext_domain = real->gettext_domain; -+ -+ dest->owner = real->owner; - - dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL; - -@@ -136,6 +138,17 @@ - REAL_SCHEMA (sc)->locale = NULL; - } - -+void -+gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain) -+{ -+ g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL)); -+ -+ if (domain) -+ REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain); -+ else -+ REAL_SCHEMA (sc)->gettext_domain = NULL; -+} -+ - void - gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc) - { -@@ -169,11 +182,8 @@ - { - g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL)); - -- if (REAL_SCHEMA (sc)->owner) -- g_free (REAL_SCHEMA (sc)->owner); -- - if (owner) -- REAL_SCHEMA (sc)->owner = g_strdup (owner); -+ REAL_SCHEMA (sc)->owner = g_intern_string (owner); - else - REAL_SCHEMA (sc)->owner = NULL; - } -@@ -228,6 +238,14 @@ - return FALSE; - } - -+ if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL)) -+ { -+ g_set_error (err, GCONF_ERROR, -+ GCONF_ERROR_FAILED, -+ _("Schema contains invalid UTF-8")); -+ return FALSE; -+ } -+ - if (real->owner && !g_utf8_validate (real->owner, -1, NULL)) - { - g_set_error (err, GCONF_ERROR, -@@ -299,11 +317,29 @@ - } - - const char* -+gconf_schema_get_gettext_domain (const GConfSchema *schema) -+{ -+ g_return_val_if_fail (schema != NULL, NULL); -+ -+ return REAL_SCHEMA (schema)->gettext_domain; -+} -+ -+static inline const char * -+schema_translate (const GConfSchema *schema, -+ const char *string) -+{ -+ if (REAL_SCHEMA (schema)->gettext_domain) -+ return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string); -+ else -+ return string; -+} -+ -+const char* - gconf_schema_get_short_desc (const GConfSchema *schema) - { - g_return_val_if_fail (schema != NULL, NULL); - -- return REAL_SCHEMA (schema)->short_desc; -+ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc); - } - - const char* -@@ -311,7 +347,7 @@ - { - g_return_val_if_fail (schema != NULL, NULL); - -- return REAL_SCHEMA (schema)->long_desc; -+ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc); - } - - const char* -diff -ru GConf-2.26.0/gconf/gconf-schema.h GConf-2.26.0.patched/gconf/gconf-schema.h ---- GConf-2.26.0/gconf/gconf-schema.h 2008-10-09 17:51:29.000000000 +0000 -+++ GConf-2.26.0.patched/gconf/gconf-schema.h 2009-04-05 19:36:42.000000000 +0000 -@@ -48,6 +48,8 @@ - GConfValueType type); - void gconf_schema_set_locale (GConfSchema *sc, - const gchar *locale); -+void gconf_schema_set_gettext_domain (GConfSchema *sc, -+ const gchar *domain); - void gconf_schema_set_short_desc (GConfSchema *sc, - const gchar *desc); - void gconf_schema_set_long_desc (GConfSchema *sc, -@@ -65,6 +67,7 @@ - GConfValueType gconf_schema_get_car_type (const GConfSchema *schema); - GConfValueType gconf_schema_get_cdr_type (const GConfSchema *schema); - const char* gconf_schema_get_locale (const GConfSchema *schema); -+const char* gconf_schema_get_gettext_domain(const GConfSchema *schema); - const char* gconf_schema_get_short_desc (const GConfSchema *schema); - const char* gconf_schema_get_long_desc (const GConfSchema *schema); - const char* gconf_schema_get_owner (const GConfSchema *schema); -diff -ru GConf-2.26.0/gconf/gconftool.c GConf-2.26.0.patched/gconf/gconftool.c ---- GConf-2.26.0/gconf/gconftool.c 2009-02-16 18:17:43.000000000 +0000 -+++ GConf-2.26.0.patched/gconf/gconftool.c 2009-04-05 19:36:42.000000000 +0000 -@@ -3295,6 +3295,7 @@ - GConfValueType cdr_type; - GConfValue* global_default; - GHashTable* hash; -+ gchar* gettext_domain; - }; - - static int -@@ -3547,6 +3548,15 @@ - else - g_printerr (_("WARNING: empty <applyto> node")); - } -+ else if (strcmp((char *)iter->name, "gettext_domain") == 0) -+ { -+ tmp = (char *)xmlNodeGetContent(iter); -+ if (tmp) -+ { -+ info->gettext_domain = g_strdup(tmp); -+ xmlFree(tmp); -+ } -+ } - else - g_printerr (_("WARNING: node <%s> not understood below <schema>\n"), - iter->name); -@@ -3636,6 +3646,9 @@ - if (info->owner != NULL) - gconf_schema_set_owner(schema, info->owner); - -+ if (info->gettext_domain != NULL) -+ gconf_schema_set_gettext_domain(schema, info->gettext_domain); -+ - xmlFree(name); - - /* Locale-specific info */ -@@ -3765,6 +3778,7 @@ - info.apply_to = NULL; - info.owner = NULL; - info.global_default = NULL; -+ info.gettext_domain = NULL; - info.hash = g_hash_table_new(g_str_hash, g_str_equal); - - extract_global_info(node, &info); -@@ -3801,6 +3815,8 @@ - ; /* nothing */ - else if (strcmp((char *)iter->name, "applyto") == 0) - ; /* nothing */ -+ else if (strcmp((char *)iter->name, "gettext_domain") == 0) -+ ; /* nothing */ - else if (strcmp((char *)iter->name, "locale") == 0) - { - process_locale_info(iter, &info); -Only in GConf-2.26.0.patched/gconf: gconftool.c.orig diff --git a/abs/extra/gnome-common/PKGBUILD b/abs/extra/gnome-common/PKGBUILD new file mode 100644 index 0000000..e0078dd --- /dev/null +++ b/abs/extra/gnome-common/PKGBUILD @@ -0,0 +1,19 @@ +# $Id: PKGBUILD 54859 2009-10-11 19:55:23Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-common +pkgver=2.28.0 +pkgrel=1 +pkgdesc="Common development macros for GNOME2" +arch=(any) +license=('GPL') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/abs/extra/gnome-vfs/PKGBUILD b/abs/extra/gnome-vfs/PKGBUILD index 9a54cdd..b8434a7 100644 --- a/abs/extra/gnome-vfs/PKGBUILD +++ b/abs/extra/gnome-vfs/PKGBUILD @@ -1,35 +1,45 @@ -# $Id: PKGBUILD 30314 2009-03-18 21:34:12Z jgc $ +# $Id: PKGBUILD 75359 2010-04-01 11:48:46Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-vfs -pkgver=2.24.1 +pkgver=2.24.3 pkgrel=2 pkgdesc="The GNOME Virtual File System" arch=(i686 x86_64) license=('LGPL') -depends=('fam' 'gconf>=2.26.0-2' 'hal>=0.5.11' 'bzip2' 'avahi>=0.6.24' 'smbclient>=3.3.1' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.2.1' 'gnutls>=2.6.4') -makedepends=('pkgconfig' 'intltool') -options=('!libtool' '!emptydirs') +depends=('fam' 'gconf>=2.28.0' 'hal>=0.5.13' 'bzip2' 'avahi>=0.6.25' 'smbclient>=3.3.7' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.3.1' 'gnutls>=2.8.3') +makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common') +options=('!libtool' '!emptydirs' '!makeflags') conflicts=(gnome-vfs-samba) provides=(gnome-vfs-samba) replaces=(gnome-vfs-samba gnome-vfs-extras) url="http://www.gnome.org" install=gnome-vfs.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2 - hal-show-volume-names.patch) -md5sums=('100f9af16dc659e375ee8da45175a28d' '109d07aa1dc8cb6523c47c4984047dce') + hal-show-volume-names.patch + gnutls-config.patch) +sha256sums=('3b0f342e79813bfc11d8e636db96b3ffd16c9ca48b07306410e09a3fd1065b4a' + 'b38b86d6c966dcf64f9140d800aebe8a14845bb8ce7c045f52d4df483cacd23b' + '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d') build() { cd "${srcdir}/${pkgname}-${pkgver}" #Archlinux patch (b.g.o #321498) - patch -Np1 -i ${startdir}/src/hal-show-volume-names.patch || return 1 + patch -Np1 -i "${srcdir}/hal-show-volume-names.patch" || return 1 + #Fix build with new gnutls + patch -Np1 -i "${srcdir}/gnutls-config.patch" || return 1 + libtoolize --force || return 1 + gtkdocize || return 1 + aclocal || return 1 + autoconf || return 1 + automake || return 1 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-vfs-2.0 \ - --enable-samba --enable-hal \ - --enable-avahi --disable-howl \ - --disable-openssl --enable-gnutls || return 1 + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gnome-vfs-2.0 \ + --enable-samba --enable-hal \ + --enable-avahi --disable-howl \ + --disable-openssl --enable-gnutls || return 1 make || return 1 make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 diff --git a/abs/extra/gnome-vfs/gnutls-config.patch b/abs/extra/gnome-vfs/gnutls-config.patch new file mode 100644 index 0000000..f6fa18b --- /dev/null +++ b/abs/extra/gnome-vfs/gnutls-config.patch @@ -0,0 +1,25 @@ +# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0 +# Use pkg-config in place of gnutls own macro since it's not present anymore. +--- a/configure.in 2009-03-07 19:59:53.805507753 +0100 ++++ b/configure.in 2009-03-07 18:34:36.928169018 +0100 +@@ -686,14 +686,14 @@ + AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***]) + else + AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***])) +- AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) +- have_ssl=true]) ++ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) ++ have_ssl=true]) + + if test "x${LIBGNUTLS_LIBS}" = "x"; then +- AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) +- AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) +- have_ssl=true], +- AC_MSG_ERROR([Unable to find GNUTLS])) ++ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) ++ AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) ++ have_ssl=true], ++ AC_MSG_ERROR([Unable to find GNUTLS])) + fi + fi + fi diff --git a/abs/extra/irqbalance/irqbalance.rc.d b/abs/extra/irqbalance/irqbalance.rc.d deleted file mode 100644 index c8d197f..0000000 --- a/abs/extra/irqbalance/irqbalance.rc.d +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# source application-specific settings -ONESHOT=0 -[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance - -if [ "$ONESHOT" -ne 0 ]; then - ONESHOT_CMD="oneshot" -fi - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/irqbalance` -case "$1" in - start) - stat_busy "Starting IRQ balancing" - [ -z "$PID" ] && /usr/sbin/irqbalance $ONESHOT_CMD - if [ $? -gt 0 ]; then - stat_fail - else - if [ "$ONESHOT" -eq 0 ]; then - add_daemon irqbalance - fi - stat_done - fi - ;; - stop) - stat_busy "Stopping IRQ balancing" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon irqbalance - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/extra/java-sun/PKGBUILD b/abs/extra/java-sun/PKGBUILD new file mode 100644 index 0000000..b348f0d --- /dev/null +++ b/abs/extra/java-sun/PKGBUILD @@ -0,0 +1,123 @@ +# $Id: PKGBUILD 22893 2010-07-31 09:47:07Z ibiru $ +# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Guillaume ALAUX <Guillaume at alaux dot net> + +pkgname=('jre' 'jdk') +pkgbase=java-sun +pkgver=6u21 +pkgrel=1 +pkgdesc="Sun/Oracle's implementation of tha Java 6 specification" +arch=('i686' 'x86_64') + [ "$CARCH" = "i686" ] && _arch=i586 + [ "$CARCH" = "x86_64" ] && _arch=amd64 +url="http://java.sun.com" +license=('custom') +makedepends=('java-runtime') +source=(http://download.java.net/dlj/binaries/jdk-${pkgver}-dlj-linux-${_arch}.bin + https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh + jdk.profile + java-control-panel.desktop + java-monitoring-and-management-console.desktop + java-policy-settings.desktop + java-visualvm.desktop + java-web-start.desktop + jre.profile) + +[ "$CARCH" = "i686" ] && md5sums=('b3fbbe55bafedb3f8f93e91d4e809390' + '94065b612df0046d9ae758943f9f6a75' + '7aaac9ec3e440b92361c6561ac00424a' + 'e4d814c0f310d77ed6990c731bccd0fb' + '4bc2b0be93f76ed07b471e3c89eb5a8a' + '8e3cec7ab641ec449cabd068be583f5c' + '9ba148ebabce8ed3351b813a9a66b6e5' + '568451cf45fc8c7adb83a222a61ca2c6' + '50b4f5ac4129097461d246645d73a622') +[ "$CARCH" = "x86_64" ] && md5sums=('7961051f95c014a9b94ffe3e95ea66e6' + '94065b612df0046d9ae758943f9f6a75' + '7aaac9ec3e440b92361c6561ac00424a' + 'e4d814c0f310d77ed6990c731bccd0fb' + '4bc2b0be93f76ed07b471e3c89eb5a8a' + '8e3cec7ab641ec449cabd068be583f5c' + '9ba148ebabce8ed3351b813a9a66b6e5' + '568451cf45fc8c7adb83a222a61ca2c6' + '50b4f5ac4129097461d246645d73a622') + +build() { + cd ${srcdir} + mkdir unbundle-jdk + cd unbundle-jdk + sh ../jdk-${pkgver}-dlj-linux-$_arch.bin --accept-license + cd .. + sh construct.sh unbundle-jdk linux-jdk linux-jre +} + +package_jre() { + pkgdesc="Sun/Oracle's Java Runtime Environment" + depends=('glibc' 'libxtst') + provides=('j2re' 'java-runtime=6') + conflicts=('j2re' 'java-runtime') + replaces=('j2re') + install='jre.install' + + cd ${srcdir} + + mkdir -p ${pkgdir}/opt/java + cp -R linux-jdk/jre ${pkgdir}/opt/java + + install -Dm755 ${srcdir}/jre.profile ${pkgdir}/etc/profile.d/jre.sh + + mkdir -p ${pkgdir}/usr/lib/mozilla/plugins + + if [ "$CARCH" = "i686" ]; then + ln -s /opt/java/jre/lib/i386/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins + else ln -s /opt/java/jre/lib/amd64/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins + fi + + mkdir -p ${pkgdir}/usr/share/licenses/jre + cp ${pkgdir}/opt/java/jre/COPYRIGHT ${pkgdir}/usr/share/licenses/jre + cp ${pkgdir}/opt/java/jre/LICENSE ${pkgdir}/usr/share/licenses/jre + cp ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt ${pkgdir}/usr/share/licenses/jre + + # Fix system prefs folder (FS#18872) + install -dm755 ${pkgdir}/etc/.java/.systemPrefs +} + +package_jdk() { + pkgdesc="Sun/Oracle's Java Development Kit" + depends=('glibc' 'jre') + provides=('java-environment=6' 'j2sdk') + conflicts=('java-environment' 'j2sdk') + replaces=('j2sdk') + install='jdk.install' + + cd ${srcdir} + + #copy icon + install -Dm644 ${srcdir}/linux-jdk/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png \ + ${pkgdir}/usr/share/pixmaps/java.png + + rm -rf linux-jdk/jre + mkdir -p ${pkgdir}/opt + mv linux-jdk ${pkgdir}/opt/java + + install -D -m755 ${srcdir}/jdk.profile ${pkgdir}/etc/profile.d/jdk.sh + + mkdir -p ${pkgdir}/usr/share/licenses/jdk + cp ${pkgdir}/opt/java/COPYRIGHT ${pkgdir}/usr/share/licenses/jdk + cp ${pkgdir}/opt/java/LICENSE ${pkgdir}/usr/share/licenses/jdk + cp ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt ${pkgdir}/usr/share/licenses/jdk + + #desktop entries + install -Dm644 ${srcdir}/java-control-panel.desktop \ + ${pkgdir}/usr/share/applications/java-control-panel.desktop + install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \ + ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop + install -Dm644 ${srcdir}/java-policy-settings.desktop \ + ${pkgdir}/usr/share/applications/java-policy-settings.desktop + install -Dm644 ${srcdir}/java-visualvm.desktop \ + ${pkgdir}/usr/share/applications/java-visualvm.desktop + install -Dm644 ${srcdir}/java-web-start.desktop \ + ${pkgdir}/usr/share/applications/java-web-start.desktop +} diff --git a/abs/extra/java-sun/java-control-panel.desktop b/abs/extra/java-sun/java-control-panel.desktop new file mode 100644 index 0000000..476e04a --- /dev/null +++ b/abs/extra/java-sun/java-control-panel.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Exec=/opt/java/bin/jcontrol +GenericName[cs]=Nastavenà prostÅ™edà Java +GenericName=Java Environment Settings +Icon=java +Name[cs]=Nastavenà Javy +Name=Java Control Panel +Path= +StartupNotify=true +Terminal=false +Type=Application +Categories=Settings;Java; diff --git a/abs/extra/java-sun/java-monitoring-and-management-console.desktop b/abs/extra/java-sun/java-monitoring-and-management-console.desktop new file mode 100644 index 0000000..c0e1e59 --- /dev/null +++ b/abs/extra/java-sun/java-monitoring-and-management-console.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Exec=/opt/java/bin/jconsole +Icon=java +Name[cs]=Konzole monitorovánà a správy prostÅ™edà Java +Name=Java Monitoring and Management Console +StartupNotify=true +Terminal=false +Type=Application +Categories=Development;Java; diff --git a/abs/extra/java-sun/java-policy-settings.desktop b/abs/extra/java-sun/java-policy-settings.desktop new file mode 100644 index 0000000..1009301 --- /dev/null +++ b/abs/extra/java-sun/java-policy-settings.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Exec=/opt/java/bin/policytool +Icon=java +Name[cs]=Nastavenà politiky Java aplikacà +Name=Java Policy Settings +Path= +StartupNotify=true +Terminal=false +Type=Application +Categories=Settings;Java; diff --git a/abs/extra/java-sun/java-visualvm.desktop b/abs/extra/java-sun/java-visualvm.desktop new file mode 100644 index 0000000..8aa9527 --- /dev/null +++ b/abs/extra/java-sun/java-visualvm.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Exec=/opt/java/bin/jvisualvm +GenericName[cs]=Nástroj pro monitorovánà a sledovánà výkonu Java aplikacà +GenericName=Java Monitoring and Performance Monitoring Tool +Icon=java +Name=Java VisualVM +Path= +StartupNotify=true +Terminal=false +Type=Application +Categories=Development;Java; diff --git a/abs/extra/java-sun/java-web-start.desktop b/abs/extra/java-sun/java-web-start.desktop new file mode 100644 index 0000000..573ddc0 --- /dev/null +++ b/abs/extra/java-sun/java-web-start.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Exec=/opt/java/bin/javaws -viewer +GenericName[cs]=Spravovat a spouÅ¡tÄ›t aplikace Java Web Start +GenericName=Manage and run Java Web Start Applications +Icon=java +MimeType=application/x-java-jnlp-file; +Name[cs]=Java Web Start +Name=Java Web Start +Path= +StartupNotify=true +Terminal=false +Type=Application +Categories=Network;Java; diff --git a/abs/extra/java-sun/jdk.install b/abs/extra/java-sun/jdk.install new file mode 100644 index 0000000..ae439b1 --- /dev/null +++ b/abs/extra/java-sun/jdk.install @@ -0,0 +1,11 @@ +post_upgrade() { + post_install $1 +} + +post_install() { + echo "The jdk package is licensed software." + echo "You MUST read and agree to the license stored in" + echo "/opt/java/LICENSE before using it." + +} + diff --git a/abs/extra/java-sun/jdk.profile b/abs/extra/java-sun/jdk.profile new file mode 100644 index 0000000..9bee9a7 --- /dev/null +++ b/abs/extra/java-sun/jdk.profile @@ -0,0 +1,4 @@ +export J2SDKDIR=/opt/java +export PATH=$PATH:/opt/java/bin +export JAVA_HOME=/opt/java +export DERBY_HOME=/opt/java/db diff --git a/abs/extra/community/jre/jre.install b/abs/extra/java-sun/jre.install index 4e557a7..41e698f 100644 --- a/abs/extra/community/jre/jre.install +++ b/abs/extra/java-sun/jre.install @@ -20,7 +20,3 @@ post_remove() { rm /etc/mailcap fi } - -op=$1 -shift -$op $* diff --git a/abs/extra/community/jre/jre.profile b/abs/extra/java-sun/jre.profile index af3e373..af3e373 100644 --- a/abs/extra/community/jre/jre.profile +++ b/abs/extra/java-sun/jre.profile diff --git a/abs/extra/libffi/PKGBUILD b/abs/extra/libffi/PKGBUILD new file mode 100644 index 0000000..555f0eb --- /dev/null +++ b/abs/extra/libffi/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 72255 2010-03-13 20:43:14Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libffi +pkgver=3.0.9 +pkgrel=1 +pkgdesc="A portable, high level programming interface to various calling conventions." +arch=('i686' 'x86_64') +license=('MIT') +url="http://sourceware.org/libffi" +depends=('glibc' 'texinfo') +options=('!libtool' 'force') +install=libffi.install +source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz) +md5sums=('1f300a7a7f975d4046f51c3022fa5ff1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 +} diff --git a/abs/extra/libffi/libffi.install b/abs/extra/libffi/libffi.install new file mode 100644 index 0000000..151b79b --- /dev/null +++ b/abs/extra/libffi/libffi.install @@ -0,0 +1,18 @@ +infodir=/usr/share/info +filelist=(libffi.info.gz) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/abs/extra/libglade/PKGBUILD b/abs/extra/libglade/PKGBUILD deleted file mode 100644 index 95eff9b..0000000 --- a/abs/extra/libglade/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 30217 2009-03-17 18:11:58Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libglade -pkgver=2.6.4 -pkgrel=1 -pkgdesc="Allows you to load glade interface files in a program at runtime" -arch=(i686 x86_64) -license=('LGPL') -depends=('gtk2>=2.16.0' 'libxml2>=2.7.3') -makedepends=('python' 'pkgconfig') -optdepends=('python: libglade-convert script') -options=('!libtool') -install=glade.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.6/${pkgname}-${pkgver}.tar.bz2 - libglade-2.0.1-nowarning.patch) -url="http://www.gnome.org" -md5sums=('d1776b40f4e166b5e9c107f1c8fe4139' - '4f879c0ce550004905aa0fb24f25c353') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch" || return 1 - ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 libglade-convert "${pkgdir}/usr/bin/" || return 1 -} diff --git a/abs/extra/libglade/glade.install b/abs/extra/libglade/glade.install deleted file mode 100644 index a7f05c5..0000000 --- a/abs/extra/libglade/glade.install +++ /dev/null @@ -1,25 +0,0 @@ -post_install() { - if [ ! -d etc/xml ]; then - mkdir -p etc/xml - fi - if [ ! -e etc/xml/catalog ]; then - xmlcatalog --noout --create etc/xml/catalog - fi - xmlcatalog --noout --add "system" \ - "http://glade.gnome.org/glade-2.0.dtd" \ - /usr/share/xml/libglade/glade-2.0.dtd etc/xml/catalog -} - -pre_upgrade() { - post_remove -} - -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -post_remove() { - xmlcatalog --noout --del \ - /usr/share/xml/libglade/glade-2.0.dtd etc/xml/catalog -} diff --git a/abs/extra/libglade/libglade-2.0.1-nowarning.patch b/abs/extra/libglade/libglade-2.0.1-nowarning.patch deleted file mode 100644 index fd07121..0000000 --- a/abs/extra/libglade/libglade-2.0.1-nowarning.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- libglade-2.0.1/glade/glade-gtk.c.nowarning 2003-08-29 14:50:10.000000000 -0400 -+++ libglade-2.0.1/glade/glade-gtk.c 2003-08-29 14:58:41.000000000 -0400 -@@ -639,9 +639,8 @@ - if (!strcmp (childinfo->properties[j].name, "label")) { - label = childinfo->properties[j].value; - break; -- } else { -- g_warning ("Unknown CList child property: %s", childinfo->properties[j].name); - } -+ /* Ignore all other properties */ - } - - if (label) { -@@ -683,6 +682,7 @@ - char *icon = NULL; - gboolean use_stock = FALSE, active = FALSE, new_group = FALSE; - gboolean use_underline = FALSE; -+ gboolean sensitive = TRUE; - GtkWidget *iconw = NULL; - int j; - -@@ -708,6 +708,8 @@ - group_name = value; - } else if (!strcmp (name, "new_group")) { - new_group = BOOL (value); -+ } else if (!strcmp (name, "sensitive")) { -+ sensitive = BOOL (value); - } else if (!strcmp (name, "visible")) { - /* ignore for now */ - } else if (!strcmp (name, "tooltip")) { -@@ -785,6 +787,8 @@ - gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label), - TRUE); - } -+ -+ gtk_widget_set_sensitive (child, sensitive); - - glade_xml_set_common_params (xml, child, childinfo->child); - } else { diff --git a/abs/extra/libgnomeui/PKGBUILD b/abs/extra/libgnomeui/PKGBUILD index f52b649..f34cbf5 100644 --- a/abs/extra/libgnomeui/PKGBUILD +++ b/abs/extra/libgnomeui/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 29431 2009-03-08 17:37:38Z jgc $ +# $Id: PKGBUILD 74363 2010-03-30 20:45:54Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgnomeui -pkgver=2.24.1 +pkgver=2.24.3 pkgrel=1 pkgdesc="User Interface library for GNOME" arch=('i686' 'x86_64') license=('LGPL') -depends=('libbonoboui>=2.24.1' 'gnome-keyring>=2.24.1') +depends=('libbonoboui>=2.24.3' 'libgnome-keyring>=2.29.4' 'libsm') makedepends=('intltool' 'pkgconfig') -options=('!libtool' 'force') +options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2) -md5sums=('8e7d36dd1decfcf5cc4d5cb93bc4d217') +sha256sums=('04c81f3bb5a337cdf3ed1230916f82d29857ee95eb884f58dd2f5c6860efe803') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/libgnomeui || return 1 + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/libgnomeui || return 1 make || return 1 make DESTDIR="${pkgdir}" install || return 1 } diff --git a/abs/extra/libmng/PKGBUILD b/abs/extra/libmng/PKGBUILD new file mode 100644 index 0000000..6607718 --- /dev/null +++ b/abs/extra/libmng/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 63248 2010-01-16 20:44:09Z jgc $ +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Maintainer: judd <jvinet@zeroflux.org> +pkgname=libmng +pkgver=1.0.10 +pkgrel=3 +pkgdesc="A collection of routines used to create and manipulate MNG format graphics files" +arch=('i686' 'x86_64') +url="http://www.libmng.com/" +license=('custom') +depends=('zlib' 'libjpeg>=8') +options=(!libtool) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('a464ae7d679781beebdf7440d144b7bd') + +build() { + cd $srcdir/$pkgname-$pkgver + ln -s makefiles/configure.in . + ln -s makefiles/Makefile.am . + autoreconf --force --install + ./configure --prefix=/usr + make || return 1 + make DESTDIR=$pkgdir install || return 1 + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/abs/extra/libxp/PKGBUILD b/abs/extra/libxp/PKGBUILD deleted file mode 100644 index 1812082..0000000 --- a/abs/extra/libxp/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 4458 2008-07-07 16:34:45Z jgc $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libxp -pkgver=1.0.0 -pkgrel=2 -pkgdesc="X11 X Print Library" -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('libxext' 'printproto') -makedepends=('pkgconfig') -options=('!libtool') -source=(${url}/releases/individual/lib/libXp-${pkgver}.tar.bz2) -md5sums=('0f4ac39108c1ae8c443cdfac259b58fa') - -build() { - cd ${srcdir}/libXp-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 -} diff --git a/abs/extra/neon/PKGBUILD b/abs/extra/neon/PKGBUILD index 4aa3802..c87a5f0 100644 --- a/abs/extra/neon/PKGBUILD +++ b/abs/extra/neon/PKGBUILD @@ -1,22 +1,29 @@ -# $Id: PKGBUILD 10269 2008-08-25 13:23:04Z andyrtr $ +# $Id: PKGBUILD 77208 2010-04-11 13:31:45Z pierre $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Juergen Hoetzel <juergen@archlinux.org> # KEEP LIBTOOL FILES! pkgname=neon -pkgver=0.28.3 +pkgver=0.29.3 pkgrel=2 pkgdesc="HTTP and WebDAV client library with a C interface" arch=('i686' 'x86_64') license=('GPL' 'LGPL') -depends=('openssl>=0.9.8g-4' 'heimdal>=1.2.1' 'zlib' 'expat>=2.0.1' 'db>=4.7.25') +depends=('heimdal' 'expat' 'ca-certificates') url="http://www.webdav.org/neon/" -source=(http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz) -md5sums=('47599a328862ce64ac3c52726d6daa12') +source=("http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz") +md5sums=('ba1015b59c112d44d7797b62fe7bee51') +options=('libtool') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --with-ssl --with-expat --enable-shared --disable-static + ./configure --prefix=/usr \ + --with-expat --enable-shared --disable-static \ + --with-ssl=openssl --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt make || return 1 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/abs/extra/nvram-wake/PKGBUILD b/abs/extra/nvram-wake/PKGBUILD deleted file mode 100755 index d2d76b1..0000000 --- a/abs/extra/nvram-wake/PKGBUILD +++ /dev/null @@ -1,16 +0,0 @@ -pkgname=nvram-wake -pkgver=0.99b -pkgrel=1 -pkgdesc="set the wakeup time of the localpc" -license="GPL" -arch=(i686) -url="http://sourceforge.net/projects/nvram-wakeup/" -source=(http://superb-west.dl.sourceforge.net/sourceforge/nvram-wakeup/nvram-wakup-0.99b.tar.gz ) - - -build() { - cd $startdir/src/$pkgname-$pkgver - make || return 1 - make prefix=$startdir/pkg/usr install -} - diff --git a/abs/extra/openjpeg/30_fix_build_for_debian.dpatch b/abs/extra/openjpeg/30_fix_build_for_debian.dpatch new file mode 100644 index 0000000..afd9950 --- /dev/null +++ b/abs/extra/openjpeg/30_fix_build_for_debian.dpatch @@ -0,0 +1,70 @@ + +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_fix_build_for_debian.dpatch by <robin.cornelius@gmail.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Dont apply the -s strip flag to the shared lib debian will do it for us +## DP: where necessary +## DP: Remove unnecessary linkage on lstdc++ and lm and add missing linkage for -lm + +@DPATCH@ + +Index: ./Makefile +=================================================================== +--- ./Makefile (revision 96) ++++ ./Makefile (working copy) +@@ -18,8 +18,7 @@ + # Converts cr/lf to just lf + DOS2UNIX = dos2unix + +-COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC +-LIBRARIES = -lstdc++ ++COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC -g $(EXTRA_CFLAGS) + + MODULES = $(SRCS:.c=.o) + CFLAGS = $(COMPILERFLAGS) $(INCLUDE) +@@ -54,7 +53,7 @@ + $(AR) r $@ $(MODULES) + + $(SHAREDLIB): $(MODULES) +- $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES) ++ $(CC) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) -lm + + install: OpenJPEG + install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)' + +Index: ./indexer_JPIP/Makefile +=================================================================== +--- ./indexer_JPIP/Makefile (revision 95) ++++ ./indexer_JPIP/Makefile (working copy) +@@ -1,7 +1,6 @@ + CC = gcc + +-LDFLAGS = -lm +-CFLAGS = -Wall ++CFLAGS = -Wall $(EXTRA_CFLAGS) + + all: index_create + +Index: ./codec/Makefile +=================================================================== +--- ./codec/Makefile (revision 96) ++++ ./codec/Makefile (working copy) +@@ -1,13 +1,13 @@ + # Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k + +-CFLAGS = -O3 -lstdc++ # -g -p -pg ++CFLAGS = $(EXTRA_CFLAGS) # -g -p -pg + + all: j2k_to_image image_to_j2k + +-j2k_to_image: j2k_to_image.c ../libopenjpeg.a ++j2k_to_image: j2k_to_image.c + gcc $(CFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff + +-image_to_j2k: image_to_j2k.c ../libopenjpeg.a ++image_to_j2k: image_to_j2k.c + gcc $(CFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff + + clean: + diff --git a/abs/extra/openjpeg/PKGBUILD b/abs/extra/openjpeg/PKGBUILD new file mode 100644 index 0000000..087da2f --- /dev/null +++ b/abs/extra/openjpeg/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=openjpeg +pkgver=1.3 +_pkgver=v1_3 +pkgrel=3 +pkgdesc="An open source JPEG 2000 codec" +arch=(i686 x86_64) +license=('BSD') +url="http://www.openjpeg.org" +depends=('glibc') +source=(http://www.openjpeg.org/openjpeg_${_pkgver}.tar.gz + 30_fix_build_for_debian.dpatch) +md5sums=('f9a3ccfa91ac34b589e9bf7577ce8ff9' + '2557f485513e77f6dcea77f4741c4fa1') + +build() { + cd "${srcdir}/OpenJPEG_${_pkgver}" + patch -Np1 -i "${srcdir}/30_fix_build_for_debian.dpatch" || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg" + tr '\r' '\n' < license.txt > "${pkgdir}/usr/share/licenses/openjpeg/license.txt" || return 1 + chmod 644 "${pkgdir}/usr/share/licenses/openjpeg/license.txt" || return 1 + ln -s libopenjpeg.so.2 "${pkgdir}/usr/lib/libopenjpeg.so" || return 1 +} diff --git a/abs/extra/openslp/PKGBUILD b/abs/extra/openslp/PKGBUILD new file mode 100644 index 0000000..9ba1f94 --- /dev/null +++ b/abs/extra/openslp/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 75251 2010-04-01 04:53:24Z allan $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=openslp +pkgver=1.2.1 +pkgrel=3 +pkgdesc="Open-source implementation of Service Location Protocol" +arch=(i686 x86_64) +url="http://www.openslp.org" +license=('BSD') +depends=('glibc' 'bash' 'openssl') +backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd) +md5sums=('ff9999d1b44017281dd00ed2c4d32330' '4f6889a5944894b8be2c01404a9566d2') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR=${pkgdir} DOC_DIR=/usr/share/doc/openslp-${pkgver} install || return 1 + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -D -m755 ../rc.slpd ${pkgdir}/etc/rc.d/slpd +} diff --git a/abs/extra/lcdproc/lcdd b/abs/extra/openslp/rc.slpd index a124c00..4330c37 100755 --- a/abs/extra/lcdproc/lcdd +++ b/abs/extra/openslp/rc.slpd @@ -3,27 +3,27 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /usr/sbin/LCDd` +PID=`pidof -o %PPID /usr/sbin/slpd` case "$1" in start) - stat_busy "Starting LCDd daemon" - [ -z "$PID" ] && /usr/sbin/LCDd -c /etc/LCDd.conf + stat_busy "Starting SLPD" + [ -z "$PID" ] && /usr/sbin/slpd if [ $? -gt 0 ]; then stat_fail else - echo $PID > /var/run/lcdd.pid - add_daemon lcdd + echo $PID > /var/run/slpd.pid + add_daemon slpd stat_done fi ;; stop) - stat_busy "Stopping LCDd daemon" + stat_busy "Stopping SLPD" [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm /var/run/lcdd.pid - rm_daemon lcdd + rm /var/run/slpd.pid + rm_daemon slpd stat_done fi ;; diff --git a/abs/extra/pm-quirks/PKGBUILD b/abs/extra/pm-quirks/PKGBUILD new file mode 100644 index 0000000..4420a62 --- /dev/null +++ b/abs/extra/pm-quirks/PKGBUILD @@ -0,0 +1,19 @@ +# $Id: PKGBUILD 83844 2010-06-23 08:48:25Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=pm-quirks +_date=20100619 +pkgver=0.${_date} +pkgrel=1 +pkgdesc="Quirks data for pm-utils" +arch=(any) +license=('GPL') +url="http://pm-utils.freedesktop.org/wiki/" +source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${_date}.tar.gz) +md5sums=('3b6ee39056b9ece0cd5e073a4c272b05') + +build() { + cd "${srcdir}"/video-quirks + install -m755 -d "${pkgdir}/usr/lib/pm-utils/video-quirks" + install -m644 *.quirkdb "${pkgdir}/usr/lib/pm-utils/video-quirks/" || return 1 +} diff --git a/abs/extra/policykit-gnome/PKGBUILD b/abs/extra/policykit-gnome/PKGBUILD deleted file mode 100644 index e6a7d9c..0000000 --- a/abs/extra/policykit-gnome/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: onestep_ua <onestep@ukr.net> - -pkgname=policykit-gnome -pkgver=0.9.2 -pkgrel=2 -pkgdesc="PolicyKit integration for the GNOME desktop" -arch=('i686' 'x86_64') -url="http://hal.freedesktop.org/docs/PolicyKit-gnome/" -license=('GPL') -depends=('gconf>=2.24.0') -makedepends=('intltool' 'gtk-doc' 'gnome-doc-utils>=0.14.0') -options=(!emptydirs !libtool) -install=${pkgname}.install -source=(http://hal.freedesktop.org/releases/PolicyKit-gnome-${pkgver}.tar.bz2) -md5sums=('fc478b168d0c926a9766b0b415ff4bbf') - -build() { - cd "${srcdir}/PolicyKit-gnome-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/PolicyKit \ - --disable-gtk-doc \ - --disable-examples || return 1 - make || return 1 - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 - - install -m 755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/abs/extra/policykit-gnome/policykit-gnome.install b/abs/extra/policykit-gnome/policykit-gnome.install deleted file mode 100644 index e2593d3..0000000 --- a/abs/extra/policykit-gnome/policykit-gnome.install +++ /dev/null @@ -1,23 +0,0 @@ -pkgname=policykit-gnome - -## arg 1: the new package version -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -## arg 1: the new package version -## arg 2: the old package version -pre_upgrade() { - pre_remove $1 -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - post_install $1 -} - -## arg 1: the old package version -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/abs/extra/policykit/PKGBUILD b/abs/extra/policykit/PKGBUILD deleted file mode 100644 index d7dd90e..0000000 --- a/abs/extra/policykit/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=policykit -pkgver=0.9 -pkgrel=9 -pkgdesc="Application development toolkit for controlling system-wide privileges" -arch=(i686 x86_64) -license=('custom') -url="http://hal.freedesktop.org/docs/PolicyKit/" -depends=('dbus-glib>=0.80' 'expat>=2.0.1' 'pam') -makedepends=('intltool' 'docbook-xsl' 'gtk-doc') -options=('!libtool') -backup=('etc/PolicyKit/PolicyKit.conf') -install=policykit.install -source=(http://hal.freedesktop.org/releases/PolicyKit-${pkgver}.tar.gz - polkit.pam - pk-ck-api-change.patch - polkit-0.8-dbus-policy.patch - entry-leak.patch) -md5sums=('802fd13ae41f73d79359e5ecb0a98716' - '6564f95878297b954f0572bc1610dd15' - '15b42b41e98410d8d7ec4f91d0cff190' - 'da5129eee9517d00985a354055d778a9' - '62adbf90657b17dae429fc92937af513') - -build() { - cd "${srcdir}/PolicyKit-${pkgver}" - patch -Np1 -i "${srcdir}/pk-ck-api-change.patch" || return 1 - patch -Np1 -i "${srcdir}/polkit-0.8-dbus-policy.patch" || return 1 - patch -Np1 -i "${srcdir}/entry-leak.patch" || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/PolicyKit --disable-static \ - --with-polkit-user=policykit --with-polkit-group=policykit || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 - - rm -rf "${pkgdir}/etc/profile.d" - install -m644 "${srcdir}/polkit.pam" "${pkgdir}/etc/pam.d/polkit" || return 1 -} diff --git a/abs/extra/policykit/entry-leak.patch b/abs/extra/policykit/entry-leak.patch deleted file mode 100644 index f6b3295..0000000 --- a/abs/extra/policykit/entry-leak.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up PolicyKit-0.9/src/polkit/polkit-policy-file-entry.c.entry-leak PolicyKit-0.9/src/polkit/polkit-policy-file-entry.c ---- PolicyKit-0.9/src/polkit/polkit-policy-file-entry.c.entry-leak 2008-08-29 21:47:22.000000000 -0400 -+++ PolicyKit-0.9/src/polkit/polkit-policy-file-entry.c 2008-08-29 21:50:13.000000000 -0400 -@@ -95,9 +95,11 @@ _polkit_policy_file_entry_new (const c - char *contents; - size_t contents_size; - PolKitPolicyFileEntry *pfe; -+ char **tokens; - - path = NULL; - contents = NULL; -+ tokens = NULL; - - kit_return_val_if_fail (action_id != NULL && polkit_action_validate_id (action_id), NULL); - -@@ -153,7 +155,6 @@ _polkit_policy_file_entry_new (const c - } - - if (contents != NULL) { -- char **tokens; - size_t num_tokens; - PolKitResult any; - PolKitResult inactive; -@@ -183,11 +184,13 @@ _polkit_policy_file_entry_new (const c - - kit_free (path); - kit_free (contents); -+ kit_strfreev (tokens); - - return pfe; - error: - kit_free (path); - kit_free (contents); -+ kit_strfreev (tokens); - if (pfe != NULL) - polkit_policy_file_entry_unref (pfe); - return NULL; diff --git a/abs/extra/policykit/pk-ck-api-change.patch b/abs/extra/policykit/pk-ck-api-change.patch deleted file mode 100644 index ae477f9..0000000 --- a/abs/extra/policykit/pk-ck-api-change.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/src/polkit-dbus/polkit-dbus.c b/src/polkit-dbus/polkit-dbus.c -index f7be03f..cad4a76 100644 ---- a/src/polkit-dbus/polkit-dbus.c -+++ b/src/polkit-dbus/polkit-dbus.c -@@ -214,11 +214,17 @@ polkit_session_new_from_objpath (DBusConnection *con, const char *objpath, uid_t - dbus_message_unref (reply); - goto out; - } -+ /* GetUnixUser API Changed in CK 0.3.0 */ - if (!dbus_message_get_args (reply, NULL, -- DBUS_TYPE_INT32, &uid, -+ DBUS_TYPE_UINT32, &uid, - DBUS_TYPE_INVALID)) { -- kit_warning ("Invalid GetUnixUser reply from CK"); -- goto out; -+ /* try the older API */ -+ if (!dbus_message_get_args (reply, NULL, -+ DBUS_TYPE_INT32, &uid, -+ DBUS_TYPE_INVALID)) { -+ kit_warning ("Invalid GetUnixUser reply from CK"); -+ goto out; -+ } - } - dbus_message_unref (message); - dbus_message_unref (reply); -@@ -1326,16 +1332,21 @@ polkit_tracker_dbus_func (PolKitTracker *pk_tracker, DBusMessage *message) - - dbus_error_init (&error); - seat_objpath = dbus_message_get_path (message); -- if (!dbus_message_get_args (message, &error, -- DBUS_TYPE_STRING, &session_objpath, -+ /* API fixed in CK 0.3 to match spec */ -+ if (!dbus_message_get_args (message, &error, -+ DBUS_TYPE_OBJECT_PATH, &session_objpath, - DBUS_TYPE_INVALID)) { -+ if (!dbus_message_get_args (message, &error, -+ DBUS_TYPE_STRING, &session_objpath, -+ DBUS_TYPE_INVALID)) { - -- /* TODO: should be _pk_critical */ -- kit_warning ("The SessionAdded signal on the org.freedesktop.ConsoleKit.Seat " -- "interface for object %s has the wrong signature! " -- "Your system is misconfigured.", seat_objpath); -+ /* TODO: should be _pk_critical */ -+ kit_warning ("The SessionAdded signal on the org.freedesktop.ConsoleKit.Seat " -+ "interface for object %s has the wrong signature! " -+ "Your system is misconfigured.", seat_objpath); - -- goto out; -+ goto out; -+ } - } - - /* TODO: add to sessions - see polkit_tracker_is_authorization_relevant() */ -@@ -1353,16 +1364,21 @@ polkit_tracker_dbus_func (PolKitTracker *pk_tracker, DBusMessage *message) - - dbus_error_init (&error); - seat_objpath = dbus_message_get_path (message); -- if (!dbus_message_get_args (message, &error, -- DBUS_TYPE_STRING, &session_objpath, -+ /* API fixed in CK 0.3 to match spec */ -+ if (!dbus_message_get_args (message, &error, -+ DBUS_TYPE_OBJECT_PATH, &session_objpath, - DBUS_TYPE_INVALID)) { -+ if (!dbus_message_get_args (message, &error, -+ DBUS_TYPE_STRING, &session_objpath, -+ DBUS_TYPE_INVALID)) { - -- /* TODO: should be _pk_critical */ -- kit_warning ("The SessionRemoved signal on the org.freedesktop.ConsoleKit.Seat " -- "interface for object %s has the wrong signature! " -- "Your system is misconfigured.", seat_objpath); -+ /* TODO: should be _pk_critical */ -+ kit_warning ("The SessionRemoved signal on the org.freedesktop.ConsoleKit.Seat " -+ "interface for object %s has the wrong signature! " -+ "Your system is misconfigured.", seat_objpath); - -- goto out; -+ goto out; -+ } - } - - _remove_caller_by_session (pk_tracker, session_objpath); diff --git a/abs/extra/policykit/policykit.install b/abs/extra/policykit/policykit.install deleted file mode 100644 index 7bc653e..0000000 --- a/abs/extra/policykit/policykit.install +++ /dev/null @@ -1,30 +0,0 @@ -post_install() { - getent group policykit >/dev/null || usr/sbin/groupadd -g 102 policykit - getent passwd policykit >/dev/null || usr/sbin/useradd -c 'PolicyKit' -u 102 -g policykit -d '/' -s /sbin/nologin policykit - usr/bin/passwd -l policykit &>/dev/null - - # set correct permissions - chgrp policykit var/{run,lib}/PolicyKit - chown policykit var/lib/PolicyKit-public - chown policykit:policykit var/lib/misc/PolicyKit.reload - - chown policykit usr/lib/PolicyKit/polkit-set-default-helper - chmod u+s usr/lib/PolicyKit/polkit-set-default-helper - - for i in polkit-read-auth-helper polkit-revoke-helper polkit-grant-helper polkit-explicit-grant-helper; do - chgrp policykit usr/lib/PolicyKit/$i - chmod g+s usr/lib/PolicyKit/$i - done - - chgrp policykit usr/lib/PolicyKit/polkit-grant-helper-pam - chmod u+s usr/lib/PolicyKit/polkit-grant-helper-pam -} - -post_upgrade() { - post_install -} - -post_remove() { - usr/sbin/userdel policykit &>/dev/null - usr/sbin/groupdel policykit &>/dev/null -} diff --git a/abs/extra/policykit/polkit-0.8-dbus-policy.patch b/abs/extra/policykit/polkit-0.8-dbus-policy.patch deleted file mode 100644 index fa84936..0000000 --- a/abs/extra/policykit/polkit-0.8-dbus-policy.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- PolicyKit-0.8.orig/polkitd/org.freedesktop.PolicyKit.conf.in 2008-12-08 10:55:12.000000000 -0500 -+++ PolicyKit-0.8/polkitd/org.freedesktop.PolicyKit.conf.in 2008-12-08 12:05:33.000000000 -0500 -@@ -8,4 +8,9 @@ - <policy user="@polkituser@"> - <allow own="org.freedesktop.PolicyKit"/> - </policy> -+ -+ <!-- any user can talk to the service (fd.o #18948) --> -+ <policy context="default"> -+ <allow send_destination="org.freedesktop.PolicyKit"/> -+ </policy> - </busconfig> diff --git a/abs/extra/polkit-gnome/PKGBUILD b/abs/extra/polkit-gnome/PKGBUILD new file mode 100644 index 0000000..06c375c --- /dev/null +++ b/abs/extra/polkit-gnome/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: onestep_ua <onestep@ukr.net> + +pkgname=polkit-gnome +pkgver=0.96 +pkgrel=3 +pkgdesc="PolicyKit integration for the GNOME desktop" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/PolicyKit" +license=('LGPL') +depends=('polkit>=0.96' 'gtk2>=2.18.6') +makedepends=('intltool') +replaces=('policykit-gnome') +options=(!libtool !makeflags) +source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2) +md5sums=('611cf39fba2945320fc7a9ec49087e69') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e 's/OnlyShowIn=GNOME/NotShowIn=KDE/' src/polkit-gnome-authentication-agent-1.desktop.in.in || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/polkit-gnome --disable-static --disable-introspection || return 1 + make || return 1 + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 +} diff --git a/abs/extra/polkit/PKGBUILD b/abs/extra/polkit/PKGBUILD new file mode 100644 index 0000000..78cbc77 --- /dev/null +++ b/abs/extra/polkit/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 72186 2010-03-13 19:06:23Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=polkit +pkgver=0.96 +pkgrel=2 +pkgdesc="Application development toolkit for controlling system-wide privileges" +arch=(i686 x86_64) +license=('LGPL') +url="http://www.freedesktop.org/wiki/Software/Policykit" +depends=('eggdbus>=0.6' 'pam') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection') +replaces=('policykit') +options=('!libtool') +source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz + polkit.pam) +md5sums=('e0a06da501b04ed3bab986a9df5b5aa2' + '6564f95878297b954f0572bc1610dd15') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ + --disable-static --enable-gtk-doc || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + + install -m644 "${srcdir}/polkit.pam" "${pkgdir}/etc/pam.d/polkit-1" || return 1 +} diff --git a/abs/extra/policykit/polkit.pam b/abs/extra/polkit/polkit.pam index 04f53e0..04f53e0 100644 --- a/abs/extra/policykit/polkit.pam +++ b/abs/extra/polkit/polkit.pam diff --git a/abs/extra/poppler-data/PKGBUILD b/abs/extra/poppler-data/PKGBUILD new file mode 100644 index 0000000..6b22ea3 --- /dev/null +++ b/abs/extra/poppler-data/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 22380 2008-12-26 16:33:15Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=poppler-data +pkgver=0.4.3 +pkgrel=1 +pkgdesc="Encoding data for the poppler PDF rendering library" +arch=(any) +license=('custom' 'GPL2') +conflicts=('poppler<0.10.5') +url="http://poppler.freedesktop.org/" +source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz) +md5sums=('2d648047e5d0b315df1571b460ee6a96') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix=/usr DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING COPYING.adobe \ + "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/abs/extra/poppler/PKGBUILD b/abs/extra/poppler/PKGBUILD new file mode 100644 index 0000000..092abab --- /dev/null +++ b/abs/extra/poppler/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 83716 2010-06-22 17:55:04Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=poppler +pkgname=('poppler' 'poppler-glib' 'poppler-qt') +pkgver=0.14.0 +pkgrel=2 +arch=(i686 x86_64) +license=('GPL') +makedepends=('libjpeg>=8.0.2' 'gcc-libs>=4.5.0' 'cairo>=1.8.10' 'libxml2>=2.7.7' 'fontconfig>=2.8.0' 'openjpeg>=1.3-3' 'gtk2>=2.20.1' 'qt>=4.6.3' 'pkgconfig' 'lcms>=1.18') +options=('!libtool') +url="http://poppler.freedesktop.org/" +source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz) +md5sums=('76f003b8fa2b905674088c306aa857c5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export CPPFLAGS=" $CPPFLAGS -I /usr/include/gdk -I /usr/include/glib-2.0 -I /usr/lib/glib/include/ -I /usr/include/cairo -I /usr/include/gtk-2.0/gdk/" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-cairo-output \ + --enable-xpdf-headers \ + --enable-libjpeg --enable-zlib \ + --enable-poppler-qt4 \ + --enable-poppler-glib + make +} + +package_poppler() { + pkgdesc="PDF rendering library based on xpdf 3.0" + depends=('libjpeg>=8.0.2' 'gcc-libs>=4.5.0' 'cairo>=1.8.10' 'libxml2>=2.7.7' 'fontconfig>=2.8.0' 'openjpeg>=1.3-3' 'lcms>=1.18' 'poppler-data>=0.4.2') + conflicts=("poppler-qt3<${pkgver}") + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/include/poppler/{glib,qt4} + rm -f "${pkgdir}"/usr/lib/libpoppler-{glib,qt4}.so* + rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc + rm -rf "${pkgdir}/usr/share/gtk-doc" +} + +package_poppler-glib() { + pkgdesc="Poppler glib bindings" + depends=("poppler=${pkgver}" 'gtk2>=2.20.1') + + cd "${srcdir}/${pkgbase}-${pkgver}/poppler" + make DESTDIR="${pkgdir}" install-libLTLIBRARIES + cd "${srcdir}/${pkgbase}-${pkgver}/glib" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* +} + +package_poppler-qt() { + pkgdesc="Poppler Qt bindings" + depends=("poppler=${pkgver}" 'qt>=4.6.3') + + cd "${srcdir}/${pkgbase}-${pkgver}/poppler" + make DESTDIR="${pkgdir}" install-libLTLIBRARIES + cd "${srcdir}/${pkgbase}-${pkgver}/qt4" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* +} diff --git a/abs/extra/printproto/PKGBUILD b/abs/extra/printproto/PKGBUILD deleted file mode 100644 index 11595db..0000000 --- a/abs/extra/printproto/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 567 2008-04-21 09:43:18Z alexander $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -pkgname=printproto -pkgver=1.0.4 -pkgrel=1 -pkgdesc="X11 print extension wire protocol" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 - - install -D -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING -} -md5sums=('7321847a60748b4d2f1fa16db4b6ede8') diff --git a/abs/extra/removecommercials/PKGBUILD b/abs/extra/removecommercials/PKGBUILD deleted file mode 100755 index 312f965..0000000 --- a/abs/extra/removecommercials/PKGBUILD +++ /dev/null @@ -1,11 +0,0 @@ -pkgname=removecommercials -pkgver=0.1 -pkgrel=1 -arch=("i686") -pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" -source=( removecommercials ) - -build() { - cd $startdir - install -D -m 755 removecommercials $startdir/pkg/usr/bin/removecommercials -} diff --git a/abs/extra/removecommercials/removecommercials b/abs/extra/removecommercials/removecommercials deleted file mode 100755 index d7b910f..0000000 --- a/abs/extra/removecommercials/removecommercials +++ /dev/null @@ -1,195 +0,0 @@ -#!/bin/sh -# remove commercials from recording -# version 0.1 - -# usage: -# first parameter must be %DIR% of the recording -# second parameter must be %FILE% of the recording -# third parameter must be %CHANID% -# fourth parameter must be %STARTTIME% -# fifth parameter must be %JOBID% for the User Job status to be updated in MythTV -# in the mythtv setup screen invoke this script like this: -# MYTHTV User Job Command: -# /usr/LH/bin/removecommercials "%DIR%" "%FILE%" "%CHANID%" "%STARTTIME%" "%JOBID%" - -# Auguments passed from command line -VIDEODIR=$1 -FILENAME=$2 -CHANID=$3 -STARTTIME=$4 -JOBID=$5 - -# database settings -BACKEND_HOSTNAME=${BACKEND_HOSTNAME:-"localhost"} -DBUSERNAME=${DBUSERNAME:-"mythtv"} -DBPASSWORD=${DBPASSWORD:-"mythtv"} -SQLCMD="mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -e" - -#------FUNCTIONS--------------- -update_comment() -# Arg_1 = COMMENT -{ -if [ $NO_JOBID = 0 ]; then - `$SQLCMD "update jobqueue set comment=\"$1\" where id=\"$JOBID\";"` -fi -} - -update_status() -# Arg_1 = status code -{ -if [ $NO_JOBID = 0 ]; then - `$SQLCMD "update jobqueue set status=\"$1\" where id=\"$JOBID\";"` -fi -} - -check_myth_jobcmds() -# check the myth database for stop pause or resume commands -{ -if [ $NO_JOBID = 0 ]; then - CURRENT_CMD=`$SQLCMD "select cmds from jobqueue where id=\"$JOBID\";" | sed '/[0-9]/!d'` - case "$CURRENT_CMD" in - # JOB_RUN - 0) ;; - # JOB_PAUSE - 1) update_status 6 - kill -s STOP $TPID ;; - # JOB_RESUME - 2) update_status 4 - `$SQLCMD "update jobqueue set cmds=\"0\" where id=\"$JOBID\";"` - kill -s CONT $TPID ;; - # JOB_STOP - 4) update_status 5 - `$SQLCMD "update jobqueue set cmds=\"0\" where id=\"$JOBID\";"` - kill -9 $TPID - clean_up_files - echo "Cancelled" - update_status 320 - exit ;; - esac -fi -} - -check_background_progress() -#check progress in background -{ -while [ `tail -1 $STATUSFILE | grep -c "Done"` = 0 ] -do - sleep 5 - check_myth_jobcmds - current_status=`tail -1 $STATUSFILE` - if [ `expr match "$current_status" '.*\complete'` -ne 0 ]; then - prog_percent=`echo "$current_status" | awk '{print $3}'` - if [ -n "$prog_percent" ]; then - echo "Removing Commercials - $prog_percent Completed" - update_comment "Removing Commercials - $prog_percent Completed" - fi - fi -done -} - -get_pid() -{ -process_name="" -i1=1 -while [ "$process_name" != "found" ]; do - if [ "`ps $TPID | grep mythtranscode | sed 's_.*\(mythtranscode\).*_\1_'`" = "mythtranscode" ]; then - process_name="found" - else - TPID=`expr $TPID + 1` - fi - i1=`expr $i1 + 1` - if [ $i1 -gt 20 ]; then - break - fi -done -} - -clean_up_files() -# clean up left over files -{ -unlink $TMPFILE 2> /dev/null -unlink $TMPFILE.map 2> /dev/null -unlink $STATUSFILE 2> /dev/null -unlink $VIDEODIR/$FILENAME.tmp 2> /dev/null -} - -#-------MAIN SCRIPT------------ -# check if %JOBID% is passed from command line -JOBID=$5 -if [ -z "$JOBID" ]; then - NO_JOBID=1 -else - NO_JOBID=0 -fi -# check if file is a .mpg -if [ `expr match "$FILENAME" '.*\.mpg'` -ne 0 ]; then - MPEG="--mpeg2" -else - MPEG="" -fi - -# create temp filename so multiple instances won't conflict -TMPNAME=rmvCOMMS-$$ -TMPFILE=$VIDEODIR/$FILENAME-$$ -STATUSFILE=/myth/tmp/$TMPNAME-status.log - -touch $STATUSFILE - -update_status 4 - -check_myth_jobcmds - -# check for cutlist -MYTHCOMMFRAMES=`mythcommflag --getcutlist -f $VIDEODIR/$FILENAME | grep 'Cutlist:' | cut -d \ -f 2` -if [ -n "$MYTHCOMMFRAMES" ]; then - echo "Extracting cutlist..." - update_comment "Removing Commercials..." - ( /usr/bin/nice -n19 /usr/bin/mythtranscode -c $CHANID -s $STARTTIME -o $TMPFILE $MPEG --honorcutlist --showprogress > $STATUSFILE 2>&1 ; echo "Done" >> $STATUSFILE ) & - TPID=$! - get_pid - check_background_progress - ERROR=$? - if [ $ERROR -ne 0 ]; then - echo "Transcoding failed for ${FILENAME} with error $ERROR" - exit $ERROR - fi - - check_myth_jobcmds - # move temp file to output location - echo "Moving file..." - update_comment "Moving file..." - if [ `$SQLCMD "select data from settings where value='SaveTranscoding';" | sed '/[0-9]/!d'` = 1 ]; then - echo "DB is set to save transcodeing" - mv $VIDEODIR/$FILENAME $VIDEODIR/$FILENAME.old - fi - mv $TMPFILE $VIDEODIR/$FILENAME - - # file has changed, rebuild index - echo "Rebuilding index..." - update_comment "Rebuilding index..." - mythcommflag -c $CHANID -s $STARTTIME --rebuild - ERROR=$? - if [ $ERROR -ne 0 ]; then - echo "Rebuilding seek list failed for ${FILENAME} with error $ERROR" - exit $ERROR - fi - - # remove old cutlist - echo "Removing old cutlist..." - update_comment "Removing old cutlist..." - mythcommflag -c $CHANID -s $STARTTIME --clearcutlist - ERROR=$? - if [ $ERROR -eq 0 ]; then - # Fix the database entry for the file - `$SQLCMD UPDATE recorded SET cutlist = 0, filesize = $(ls -l $VIDEODIR/$FILENAME | awk '{print $5}') WHERE basename = '$FILENAME';` > /dev/null - else - echo "Clearing cutlist failed for ${FILENAME} with error $ERROR" - exit $ERROR - fi - clean_up_files - echo "Commercials Removed" - update_status 272 - update_comment "Sucessfully Completed." -else - echo "No cutlist found." -fi diff --git a/abs/extra/subversion/ChangeLog b/abs/extra/subversion/ChangeLog index 369cb3b..b223bd8 100644 --- a/abs/extra/subversion/ChangeLog +++ b/abs/extra/subversion/ChangeLog @@ -1,3 +1,51 @@ +2009-12-27 Ionut Biru <ionut@archlinux.ro> + + * subversion 1.6.6-3: adding svn bash completion script + +2009-08-07 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated to: 1.6.4 + +2009-08-02 Eric Belanger <eric@archlinux.org> + + * subversion 1.6.3-2: Rebuilt against ruby 1.9 + +2009-06-07 Douglas Soares de Andrade <douglas@archlinux.org> + + * Now hopefully fixed git issues + +2009-05-16 Douglas Soares de Andrade <douglas@archlinux.org> + + * Fixing wrong link against ruby 1.9 + +2009-05-11 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated for i686: 1.6.2 + +2009-04-17 Douglas Soares de Andrade <douglas@archlinux.org> + + * Back to use svnmerge.py from trunk + +2009-04-11 Douglas Soares de Andrade <douglas@archlinux.org> + + * Removing libtool files + +2009-04-10 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated for i686: 1.6.1 + * Added gerardo patch to fix insecure rpaths + +2009-03-24 Douglas Soares de Andrade <douglas@archlinux.org> + + * Added sqlite3 as a dep + +2009-03-21 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated for i686: 1.6.0 + +2009-02-26 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated for i686: 1.5.6 2008-10-10 Douglas Soares de Andrade <douglas@archlinux.org> diff --git a/abs/extra/subversion/PKGBUILD b/abs/extra/subversion/PKGBUILD index 4ad7460..dd24fd5 100644 --- a/abs/extra/subversion/PKGBUILD +++ b/abs/extra/subversion/PKGBUILD @@ -1,90 +1,94 @@ -# $Id: PKGBUILD 15639 2008-10-16 10:28:54Z douglas $ -# Contributer: Jason Chu <jason@archlinux.org> -# Maintainer: Jason Chu <jason@archlinux.org> +# $Id: PKGBUILD 77223 2010-04-11 14:13:33Z pierre $ +# Maintainer: Paul Mattal <paul@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.5.3 +pkgver=1.6.9 pkgrel=5 pkgdesc="Replacement for CVS, another versioning system (svn)" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('apache' 'bsd') -depends=('neon>=0.28.2-2' 'apr-util>=1.3.2-2') -makedepends=('heimdal>=1.2.1' 'db>=4.7' 'python>=2.5.2-4' - 'perl>=5.10.0-3' 'autoconf') -source=(http://svn.collab.net/tarballs/${pkgname}-${pkgver}.tar.gz - svnserve svn svnserve.conf) - -md5sums=('37533b0435caaa3e4e1be359389fcbb9' - 'c5a2e490b3e58c6bd2ca3a2e72b71845' - 'a0db6dd43af33952739b6ec089852630' - 'c459e299192552f61578f3438abf0664') - +depends=('neon' 'apr-util') +makedepends=('heimdal' 'apache' 'python' 'perl' 'swig' 'ruby' 'java-runtime' + 'autoconf' 'sqlite3' 'db' 'e2fsprogs' ) +source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 + svnserve svn svnserve.conf svnmerge.py + subversion.rpath.fix.patch + subversion.suppress.deprecation.warnings.patch) + backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') url="http://subversion.tigris.org/" provides=('svn') -options=('!makeflags' 'libtool') - -md5sums=('6a57efcc9e487e9bffc554931c98d3a0' - 'c5a2e490b3e58c6bd2ca3a2e72b71845' - 'a0db6dd43af33952739b6ec089852630' - 'c459e299192552f61578f3438abf0664') +options=('!makeflags' '!libtool') +optdepends=( 'bash-completion: for svn bash completion') build() { - cd $startdir/src/${pkgname}-${pkgver} - - - #patch -Np1 -i $startdir/src/subversion-neon.patch + cd ${srcdir}/${pkgname}-${pkgver} || return 1 - #sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.4\)"/\1 0.27.2 0.28.0 0.28.1 0.28.2"/' -i configure.in + # apply patches + patch -p0 < $srcdir/subversion.rpath.fix.patch || return 1 + patch -p1 -i $srcdir/subversion.suppress.deprecation.warnings.patch \ + || return 1 -# libtoolize --force --copy -# aclocal -I build/ac-macros -# autoconf - - autoreconf + # configure + autoreconf || return 1 ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --disable-ldap - - (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) || return 1 - - export LD_LIBRARY_PATH=$startdir/pkg/usr/lib:$LD_LIBRARY_PATH - make DESTDIR=$startdir/pkg install || return 1 - -# make DESTDIR=$startdir/pkg swig-py || return 1 -# make install-swig-py DESTDIR=$startdir/pkg || return 1 - - # mkdir -p $startdir/pkg/usr/lib/python2.5 - # mv $startdir/pkg/usr/lib/svn-python/ $startdir/pkg/usr/lib/python2.5/site-packages - - - mkdir -p $startdir/pkg/usr/share/subversion - install -d -m 755 tools/hook-scripts $startdir/pkg/usr/share/subversion/ - rm -f $startdir/pkg/usr/share/subversion/hook-scripts/*.in - -# make DESTDIR=$startdir/pkg swig-pl || return 1 -# make install-swig-pl DESTDIR=$startdir/pkg INSTALLDIRS=vendor || return 1 - rm -f $startdir/pkg/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -rf $startdir/pkg/usr/lib/perl5/core_perl - -# make DESTDIR=$startdir/pkg swig-rb || return 1 -# make install-swig-rb DESTDIR=$startdir/pkg || return 1 - -# make DESTDIR=$startdir/pkg javahl || return 1 -# make DESTDIR=$startdir/pkg install-javahl || return 1 - - mkdir -p $startdir/pkg/etc/rc.d - mkdir -p $startdir/pkg/etc/xinetd.d - mkdir -p $startdir/pkg/etc/conf.d - - install -m 755 $startdir/src/svnserve $startdir/pkg/etc/rc.d - install -m 644 $startdir/src/svn $startdir/pkg/etc/xinetd.d - install -m 644 $startdir/src/svnserve.conf $startdir/pkg/etc/conf.d/svnserve - install -m 755 $startdir/src/subversion-$pkgver/contrib/client-side/svnmerge/svnmerge.py $startdir/pkg/usr/bin/svnmerge - install -D -m 644 $startdir/src/subversion-$pkgver/COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE - - #libtoolslay not all because of kdesdk -# find ${startdir}/pkg/usr/lib/httpd/modules -name '*.la' -exec rm {} \; -# find ${startdir}/pkg/usr/lib/ruby -name '*.la' -exec rm {} \; -# find ${startdir}/pkg/usr/lib/python2.5 -name '*.la' -exec rm {} \; + --with-zlib=/usr --with-neon=/usr --with-apxs \ + --with-sqlite=/usr \ + --enable-javahl || return 1 + + # build + (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) \ + || return 1 + + # install + export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH + make DESTDIR=${pkgdir} install || return 1 + + make DESTDIR=${pkgdir} swig-py || return 1 + make install-swig-py DESTDIR=${pkgdir} || return 1 + + mkdir -p ${pkgdir}/usr/lib/python2.6 || return 1 + mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.6/site-packages \ + || return 1 + + mkdir -p ${pkgdir}/usr/share/subversion || return 1 + install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/ \ + || return 1 + rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in || return 1 + + make DESTDIR=${pkgdir} swig-pl || return 1 + make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor || return 1 + rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist \ + || return 1 + rm -rf ${pkgdir}/usr/lib/perl5/core_perl || return 1 + + make DESTDIR=${pkgdir} swig-rb || return 1 + make install-swig-rb DESTDIR=${pkgdir} || return 1 + + make DESTDIR=${pkgdir} javahl || return 1 + make DESTDIR=${pkgdir} install-javahl || return 1 + + mkdir -p ${pkgdir}/etc/rc.d || return 1 + mkdir -p ${pkgdir}/etc/xinetd.d || return 1 + mkdir -p ${pkgdir}/etc/conf.d || return 1 + + install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d || return 1 + install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d || return 1 + install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve \ + || return 1 + install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge || return 1 + install -D -m 644 ${srcdir}/subversion-$pkgver/COPYING \ + ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1 + + # bash completion + install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \ + ${pkgdir}/etc/bash_completion.d/subversion || return 1 } - +md5sums=('9c30a47b1d48664e7afef68bb4834c53' + 'a2b029e8385007ffb99b437b30521c90' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + '21bf3aa5b797ce98eba8307f30e9c070' + '6b4340ba9d8845cd8497e013ae01be3f' + '1166f3b7413d7e7450299b3525680bbe') diff --git a/abs/extra/subversion/__changelog b/abs/extra/subversion/__changelog new file mode 100644 index 0000000..b91d08d --- /dev/null +++ b/abs/extra/subversion/__changelog @@ -0,0 +1 @@ +removed kwallet and gnome diff --git a/abs/extra/subversion/subversion.rpath.fix.patch b/abs/extra/subversion/subversion.rpath.fix.patch new file mode 100644 index 0000000..ba6ee9e --- /dev/null +++ b/abs/extra/subversion/subversion.rpath.fix.patch @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 ++++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 +@@ -678,6 +678,7 @@ + + $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL + cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ++ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} + + swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ + $(SWIG_PL_DIR)/native/Makefile diff --git a/abs/extra/subversion/subversion.suppress.deprecation.warnings.patch b/abs/extra/subversion/subversion.suppress.deprecation.warnings.patch new file mode 100644 index 0000000..94ce89b --- /dev/null +++ b/abs/extra/subversion/subversion.suppress.deprecation.warnings.patch @@ -0,0 +1,22 @@ +diff -urN subversion-1.6.9/subversion/bindings/swig/python/svn/core.py subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py +--- subversion-1.6.9/subversion/bindings/swig/python/svn/core.py 2009-02-13 11:22:26.000000000 -0500 ++++ subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py 2010-02-08 07:46:29.000000000 -0500 +@@ -19,6 +19,7 @@ + from libsvn.core import * + import libsvn.core as _libsvncore + import atexit as _atexit ++import warnings + + class SubversionException(Exception): + def __init__(self, message=None, apr_err=None, child=None, +@@ -44,7 +45,9 @@ + Exception.__init__(self, *args) + + self.apr_err = apr_err +- self.message = message ++ with warnings.catch_warnings(): ++ warnings.simplefilter("ignore", DeprecationWarning) ++ self.message = message + self.child = child + self.file = file + self.line = line diff --git a/abs/extra/subversion/svnmerge.py b/abs/extra/subversion/svnmerge.py new file mode 100644 index 0000000..da05949 --- /dev/null +++ b/abs/extra/subversion/svnmerge.py @@ -0,0 +1,2370 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (c) 2005, Giovanni Bajo +# Copyright (c) 2004-2005, Awarix, Inc. +# All rights reserved. +# +# 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 +# +# Author: Archie Cobbs <archie at awarix dot com> +# Rewritten in Python by: Giovanni Bajo <rasky at develer dot com> +# +# Acknowledgments: +# John Belmonte <john at neggie dot net> - metadata and usability +# improvements +# Blair Zajac <blair at orcaware dot com> - random improvements +# Raman Gupta <rocketraman at fastmail dot fm> - bidirectional and transitive +# merging support +# Dustin J. Mitchell <dustin at zmanda dot com> - support for multiple +# location identifier formats +# +# $HeadURL$ +# $LastChangedDate$ +# $LastChangedBy$ +# $LastChangedRevision$ +# +# Requisites: +# svnmerge.py has been tested with all SVN major versions since 1.1 (both +# client and server). It is unknown if it works with previous versions. +# +# Differences from svnmerge.sh: +# - More portable: tested as working in FreeBSD and OS/2. +# - Add double-verbose mode, which shows every svn command executed (-v -v). +# - "svnmerge avail" now only shows commits in source, not also commits in +# other parts of the repository. +# - Add "svnmerge block" to flag some revisions as blocked, so that +# they will not show up anymore in the available list. Added also +# the complementary "svnmerge unblock". +# - "svnmerge avail" has grown two new options: +# -B to display a list of the blocked revisions +# -A to display both the blocked and the available revisions. +# - Improved generated commit message to make it machine parsable even when +# merging commits which are themselves merges. +# - Add --force option to skip working copy check +# - Add --record-only option to "svnmerge merge" to avoid performing +# an actual merge, yet record that a merge happened. +# - Can use a variety of location-identifier formats +# +# TODO: +# - Add "svnmerge avail -R": show logs in reverse order +# +# Information for Hackers: +# +# Identifiers for branches: +# A branch is identified in three ways within this source: +# - as a working copy (variable name usually includes 'dir') +# - as a fully qualified URL +# - as a path identifier (an opaque string indicating a particular path +# in a particular repository; variable name includes 'pathid') +# A "target" is generally user-specified, and may be a working copy or +# a URL. + +import sys, os, getopt, re, types, tempfile, time, locale +from bisect import bisect +from xml.dom import pulldom + +NAME = "svnmerge" +if not hasattr(sys, "version_info") or sys.version_info < (2, 0): + error("requires Python 2.0 or newer") + +# Set up the separator used to separate individual log messages from +# each revision merged into the target location. Also, create a +# regular expression that will find this same separator in already +# committed log messages, so that the separator used for this run of +# svnmerge.py will have one more LOG_SEPARATOR appended to the longest +# separator found in all the commits. +LOG_SEPARATOR = 8 * '.' +LOG_SEPARATOR_RE = re.compile('^((%s)+)' % re.escape(LOG_SEPARATOR), + re.MULTILINE) + +# Each line of the embedded log messages will be prefixed by LOG_LINE_PREFIX. +LOG_LINE_PREFIX = 2 * ' ' + +# Set python to the default locale as per environment settings, same as svn +# TODO we should really parse config and if log-encoding is specified, set +# the locale to match that encoding +locale.setlocale(locale.LC_ALL, '') + +# We want the svn output (such as svn info) to be non-localized +# Using LC_MESSAGES should not affect localized output of svn log, for example +if os.environ.has_key("LC_ALL"): + del os.environ["LC_ALL"] +os.environ["LC_MESSAGES"] = "C" + +############################################################################### +# Support for older Python versions +############################################################################### + +# True/False constants are Python 2.2+ +try: + True, False +except NameError: + True, False = 1, 0 + +def lstrip(s, ch): + """Replacement for str.lstrip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + i = 0 + try: + while s[i] == ch: + i = i+1 + return s[i:] + except IndexError: + return "" + +def rstrip(s, ch): + """Replacement for str.rstrip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + try: + if s[-1] != ch: + return s + i = -2 + while s[i] == ch: + i = i-1 + return s[:i+1] + except IndexError: + return "" + +def strip(s, ch): + """Replacement for str.strip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + return lstrip(rstrip(s, ch), ch) + +def rsplit(s, sep, maxsplits=0): + """Like str.rsplit, which is Python 2.4+ only.""" + L = s.split(sep) + if not 0 < maxsplits <= len(L): + return L + return [sep.join(L[0:-maxsplits])] + L[-maxsplits:] + +############################################################################### + +def kwextract(s): + """Extract info from a svn keyword string.""" + try: + return strip(s, "$").strip().split(": ")[1] + except IndexError: + return "<unknown>" + +__revision__ = kwextract('$Rev$') +__date__ = kwextract('$Date$') + +# Additional options, not (yet?) mapped to command line flags +default_opts = { + "svn": "svn", + "prop": NAME + "-integrated", + "block-prop": NAME + "-blocked", + "commit-verbose": True, + "verbose": 0, +} +logs = {} + +def console_width(): + """Get the width of the console screen (if any).""" + try: + return int(os.environ["COLUMNS"]) + except (KeyError, ValueError): + pass + + try: + # Call the Windows API (requires ctypes library) + from ctypes import windll, create_string_buffer + h = windll.kernel32.GetStdHandle(-11) + csbi = create_string_buffer(22) + res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi) + if res: + import struct + (bufx, bufy, + curx, cury, wattr, + left, top, right, bottom, + maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw) + return right - left + 1 + except ImportError: + pass + + # Parse the output of stty -a + if os.isatty(1): + out = os.popen("stty -a").read() + m = re.search(r"columns (\d+);", out) + if m: + return int(m.group(1)) + + # sensible default + return 80 + +def error(s): + """Subroutine to output an error and bail.""" + print >> sys.stderr, "%s: %s" % (NAME, s) + sys.exit(1) + +def report(s): + """Subroutine to output progress message, unless in quiet mode.""" + if opts["verbose"]: + print "%s: %s" % (NAME, s) + +def prefix_lines(prefix, lines): + """Given a string representing one or more lines of text, insert the + specified prefix at the beginning of each line, and return the result. + The input must be terminated by a newline.""" + assert lines[-1] == "\n" + return prefix + lines[:-1].replace("\n", "\n"+prefix) + "\n" + +def recode_stdout_to_file(s): + if locale.getdefaultlocale()[1] is None or not hasattr(sys.stdout, "encoding") \ + or sys.stdout.encoding is None: + return s + u = s.decode(sys.stdout.encoding) + return u.encode(locale.getdefaultlocale()[1]) + +class LaunchError(Exception): + """Signal a failure in execution of an external command. Parameters are the + exit code of the process, the original command line, and the output of the + command.""" + +try: + """Launch a sub-process. Return its output (both stdout and stderr), + optionally split by lines (if split_lines is True). Raise a LaunchError + exception if the exit code of the process is non-zero (failure). + + This function has two implementations, one based on subprocess (preferred), + and one based on popen (for compatibility). + """ + import subprocess + import shlex + + def launch(cmd, split_lines=True): + # Requiring python 2.4 or higher, on some platforms we get + # much faster performance from the subprocess module (where python + # doesn't try to close an exhorbitant number of file descriptors) + stdout = "" + stderr = "" + try: + if os.name == 'nt': + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, \ + close_fds=False, stderr=subprocess.PIPE) + else: + # Use shlex to break up the parameters intelligently, + # respecting quotes. shlex can't handle unicode. + args = shlex.split(cmd.encode('ascii')) + p = subprocess.Popen(args, stdout=subprocess.PIPE, \ + close_fds=False, stderr=subprocess.PIPE) + stdoutAndErr = p.communicate() + stdout = stdoutAndErr[0] + stderr = stdoutAndErr[1] + except OSError, inst: + # Using 1 as failure code; should get actual number somehow? For + # examples see svnmerge_test.py's TestCase_launch.test_failure and + # TestCase_launch.test_failurecode. + raise LaunchError(1, cmd, stdout + " " + stderr + ": " + str(inst)) + + if p.returncode == 0: + if split_lines: + # Setting keepends=True for compatibility with previous logic + # (where file.readlines() preserves newlines) + return stdout.splitlines(True) + else: + return stdout + else: + raise LaunchError(p.returncode, cmd, stdout + stderr) +except ImportError: + # support versions of python before 2.4 (slower on some systems) + def launch(cmd, split_lines=True): + if os.name not in ['nt', 'os2']: + import popen2 + p = popen2.Popen4(cmd) + p.tochild.close() + if split_lines: + out = p.fromchild.readlines() + else: + out = p.fromchild.read() + ret = p.wait() + if ret == 0: + ret = None + else: + ret >>= 8 + else: + i,k = os.popen4(cmd) + i.close() + if split_lines: + out = k.readlines() + else: + out = k.read() + ret = k.close() + + if ret is None: + return out + raise LaunchError(ret, cmd, out) + +def launchsvn(s, show=False, pretend=False, **kwargs): + """Launch SVN and grab its output.""" + username = password = configdir = "" + if opts.get("username", None): + username = "--username=" + opts["username"] + if opts.get("password", None): + password = "--password=" + opts["password"] + if opts.get("config-dir", None): + configdir = "--config-dir=" + opts["config-dir"] + cmd = ' '.join(filter(None, [opts["svn"], "--non-interactive", + username, password, configdir, s])) + if show or opts["verbose"] >= 2: + print cmd + if pretend: + return None + return launch(cmd, **kwargs) + +def svn_command(s): + """Do (or pretend to do) an SVN command.""" + out = launchsvn(s, show=opts["show-changes"] or opts["dry-run"], + pretend=opts["dry-run"], + split_lines=False) + if not opts["dry-run"]: + print out + +def check_dir_clean(dir): + """Check the current status of dir for local mods.""" + if opts["force"]: + report('skipping status check because of --force') + return + report('checking status of "%s"' % dir) + + # Checking with -q does not show unversioned files or external + # directories. Though it displays a debug message for external + # directories, after a blank line. So, practically, the first line + # matters: if it's non-empty there is a modification. + out = launchsvn("status -q %s" % dir) + if out and out[0].strip(): + error('"%s" has local modifications; it must be clean' % dir) + +class PathIdentifier: + """Abstraction for a path identifier, so that we can start talking + about it before we know the form that it takes in the properties (its + external_form). Objects are referenced in the class variable 'locobjs', + keyed by all known forms.""" + + # a map of UUID (or None) to repository root URL. + repo_hints = {} + + # a map from any known string form to the corresponding PathIdentifier + locobjs = {} + + def __init__(self, repo_relative_path, uuid=None, url=None, external_form=None): + self.repo_relative_path = repo_relative_path + self.uuid = uuid + self.url = url + self.external_form = external_form + + def __repr__(self): + return "<PathIdentifier " + ', '.join('%s=%r' % i for i in self.__dict__.items()) + '>' + + def __str__(self): + """Return a printable string representation""" + if self.external_form: + return self.external_form + if self.url: + return self.format('url') + if self.uuid: + return self.format('uuid') + return self.format('path') + + def from_pathid(pathid_str): + """convert pathid_str to a PathIdentifier""" + if not PathIdentifier.locobjs.has_key(pathid_str): + if is_url(pathid_str): + # we can determine every form; PathIdentifier.hint knows how to do that + PathIdentifier.hint(pathid_str) + elif pathid_str[:7] == 'uuid://': + mo = re.match('uuid://([^/]*)(.*)', pathid_str) + if not mo: + error("Invalid path identifier '%s'" % pathid_str) + uuid, repo_relative_path = mo.groups() + pathid = PathIdentifier(repo_relative_path, uuid=uuid) + # we can cache this by uuid:// pathid and by repo-relative path + PathIdentifier.locobjs[pathid_str] = PathIdentifier.locobjs[repo_relative_path] = pathid + elif pathid_str and pathid_str[0] == '/': + # strip any trailing slashes + pathid_str = pathid_str.rstrip('/') + pathid = PathIdentifier(repo_relative_path=pathid_str) + # we can only cache this by repo-relative path + PathIdentifier.locobjs[pathid_str] = pathid + else: + error("Invalid path identifier '%s'" % pathid_str) + return PathIdentifier.locobjs[pathid_str] + from_pathid = staticmethod(from_pathid) + + def from_target(target): + """Convert a target (either a working copy path or an URL) into a + path identifier.""" + # prime the cache first if we don't know about this target yet + if not PathIdentifier.locobjs.has_key(target): + PathIdentifier.hint(target) + + try: + return PathIdentifier.locobjs[target] + except KeyError: + error("Could not recognize path identifier '%s'" % target) + from_target = staticmethod(from_target) + + def hint(target): + """Cache some information about target, as it may be referenced by + repo-relative path in subversion properties; the cache can help to + expand such a relative path to a full path identifier.""" + if PathIdentifier.locobjs.has_key(target): return + if not is_url(target) and not is_wc(target): return + + url = target_to_url(target) + + root = get_repo_root(url) + assert root[-1] != "/" + assert url[:len(root)] == root, "url=%r, root=%r" % (url, root) + repo_relative_path = url[len(root):] + + try: + uuid = get_svninfo(target)['Repository UUID'] + uuid_pathid = 'uuid://%s%s' % (uuid, repo_relative_path) + except KeyError: + uuid = None + uuid_pathid = None + + locobj = PathIdentifier.locobjs.get(url) or \ + (uuid_pathid and PathIdentifier.locobjs.get(uuid_pathid)) + if not locobj: + locobj = PathIdentifier(repo_relative_path, uuid=uuid, url=url) + + PathIdentifier.repo_hints[uuid] = root # (uuid may be None) + + PathIdentifier.locobjs[target] = locobj + PathIdentifier.locobjs[url] = locobj + if uuid_pathid: + PathIdentifier.locobjs[uuid_pathid] = locobj + if not PathIdentifier.locobjs.has_key(repo_relative_path): + PathIdentifier.locobjs[repo_relative_path] = locobj + hint = staticmethod(hint) + + def format(self, fmt): + if fmt == 'path': + return self.repo_relative_path + elif fmt == 'uuid': + return "uuid://%s%s" % (self.uuid, self.repo_relative_path) + elif fmt == 'url': + return self.url + else: + error("Unkonwn path type '%s'" % fmt) + + def match_substring(self, str): + """Test whether str is a substring of any representation of this + PathIdentifier.""" + if self.repo_relative_path.find(str) >= 0: + return True + + if self.uuid: + if ("uuid://%s%s" % (self.uuid, self.repo_relative_path)).find(str) >= 0: + return True + + if self.url: + if (self.url + self.repo_relative_path).find(str) >= 0: + return True + + return False + + def get_url(self): + """Convert a pathid into a URL. If this is not possible, error out.""" + if self.url: + return self.url + # if we have a uuid and happen to know the URL for it, use that + elif self.uuid and PathIdentifier.repo_hints.has_key(self.uuid): + self.url = PathIdentifier.repo_hints[self.uuid] + self.repo_relative_path + PathIdentifier.locobjs[self.url] = self + return self.url + # if we've only seen one rep, use that (a guess, but an educated one) + elif not self.uuid and len(PathIdentifier.repo_hints) == 1: + uuid, root = PathIdentifier.repo_hints.items()[0] + if uuid: + self.uuid = uuid + PathIdentifier.locobjs['uuid://%s%s' % (uuid, self.repo_relative_path)] = self + self.url = root + self.repo_relative_path + PathIdentifier.locobjs[self.url] = self + report("Guessing that '%s' refers to '%s'" % (self, self.url)) + return self.url + else: + error("Cannot determine URL for '%s'; " % self + + "Explicit source argument (-S/--source) required.\n") + +class RevisionLog: + """ + A log of the revisions which affected a given URL between two + revisions. + """ + + def __init__(self, url, begin, end, find_propchanges=False): + """ + Create a new RevisionLog object, which stores, in self.revs, a list + of the revisions which affected the specified URL between begin and + end. If find_propchanges is True, self.propchange_revs will contain a + list of the revisions which changed properties directly on the + specified URL. URL must be the URL for a directory in the repository. + """ + self.url = url + + # Setup the log options (--quiet, so we don't show log messages) + log_opts = '--xml --quiet -r%s:%s "%s"' % (begin, end, url) + if find_propchanges: + # The --verbose flag lets us grab merge tracking information + # by looking at propchanges + log_opts = "--verbose " + log_opts + + # Read the log to look for revision numbers and merge-tracking info + self.revs = [] + self.propchange_revs = [] + repos_pathid = PathIdentifier.from_target(url) + for chg in SvnLogParser(launchsvn("log %s" % log_opts, + split_lines=False)): + self.revs.append(chg.revision()) + for p in chg.paths(): + if p.action() == 'M' and p.pathid() == repos_pathid.repo_relative_path: + self.propchange_revs.append(chg.revision()) + + # Save the range of the log + self.begin = int(begin) + if end == "HEAD": + # If end is not provided, we do not know which is the latest + # revision in the repository. So we set 'end' to the latest + # known revision. + self.end = self.revs[-1] + else: + self.end = int(end) + + self._merges = None + self._blocks = None + + def merge_metadata(self): + """ + Return a VersionedProperty object, with a cached view of the merge + metadata in the range of this log. + """ + + # Load merge metadata if necessary + if not self._merges: + self._merges = VersionedProperty(self.url, opts["prop"]) + self._merges.load(self) + + return self._merges + + def block_metadata(self): + if not self._blocks: + self._blocks = VersionedProperty(self.url, opts["block-prop"]) + self._blocks.load(self) + + return self._blocks + + +class VersionedProperty: + """ + A read-only, cached view of a versioned property. + + self.revs contains a list of the revisions in which the property changes. + self.values stores the new values at each corresponding revision. If the + value of the property is unknown, it is set to None. + + Initially, we set self.revs to [0] and self.values to [None]. This + indicates that, as of revision zero, we know nothing about the value of + the property. + + Later, if you run self.load(log), we cache the value of this property over + the entire range of the log by noting each revision in which the property + was changed. At the end of the range of the log, we invalidate our cache + by adding the value "None" to our cache for any revisions which fall out + of the range of our log. + + Once self.revs and self.values are filled, we can find the value of the + property at any arbitrary revision using a binary search on self.revs. + Once we find the last revision during which the property was changed, + we can lookup the associated value in self.values. (If the associated + value is None, the associated value was not cached and we have to do + a full propget.) + + An example: We know that the 'svnmerge' property was added in r10, and + changed in r21. We gathered log info up until r40. + + revs = [0, 10, 21, 40] + values = [None, "val1", "val2", None] + + What these values say: + - From r0 to r9, we know nothing about the property. + - In r10, the property was set to "val1". This property stayed the same + until r21, when it was changed to "val2". + - We don't know what happened after r40. + """ + + def __init__(self, url, name): + """View the history of a versioned property at URL with name""" + self.url = url + self.name = name + + # We know nothing about the value of the property. Setup revs + # and values to indicate as such. + self.revs = [0] + self.values = [None] + + # We don't have any revisions cached + self._initial_value = None + self._changed_revs = [] + self._changed_values = [] + + def load(self, log): + """ + Load the history of property changes from the specified + RevisionLog object. + """ + + # Get the property value before the range of the log + if log.begin > 1: + self.revs.append(log.begin-1) + try: + self._initial_value = self.raw_get(log.begin-1) + except LaunchError: + # The specified URL might not exist before the + # range of the log. If so, we can safely assume + # that the property was empty at that time. + self._initial_value = { } + self.values.append(self._initial_value) + else: + self._initial_value = { } + self.values[0] = self._initial_value + + # Cache the property values in the log range + old_value = self._initial_value + for rev in log.propchange_revs: + new_value = self.raw_get(rev) + if new_value != old_value: + self._changed_revs.append(rev) + self._changed_values.append(new_value) + self.revs.append(rev) + self.values.append(new_value) + old_value = new_value + + # Indicate that we know nothing about the value of the property + # after the range of the log. + if log.revs: + self.revs.append(log.end+1) + self.values.append(None) + + def raw_get(self, rev=None): + """ + Get the property at revision REV. If rev is not specified, get + the property at revision HEAD. + """ + return get_revlist_prop(self.url, self.name, rev) + + def get(self, rev=None): + """ + Get the property at revision REV. If rev is not specified, get + the property at revision HEAD. + """ + + if rev is not None: + + # Find the index using a binary search + i = bisect(self.revs, rev) - 1 + + # Return the value of the property, if it was cached + if self.values[i] is not None: + return self.values[i] + + # Get the current value of the property + return self.raw_get(rev) + + def changed_revs(self, key=None): + """ + Get a list of the revisions in which the specified dictionary + key was changed in this property. If key is not specified, + return a list of revisions in which any key was changed. + """ + if key is None: + return self._changed_revs + else: + changed_revs = [] + old_val = self._initial_value + for rev, val in zip(self._changed_revs, self._changed_values): + if val.get(key) != old_val.get(key): + changed_revs.append(rev) + old_val = val + return changed_revs + + def initialized_revs(self): + """ + Get a list of the revisions in which keys were added or + removed in this property. + """ + initialized_revs = [] + old_len = len(self._initial_value) + for rev, val in zip(self._changed_revs, self._changed_values): + if len(val) != old_len: + initialized_revs.append(rev) + old_len = len(val) + return initialized_revs + +class RevisionSet: + """ + A set of revisions, held in dictionary form for easy manipulation. If we + were to rewrite this script for Python 2.3+, we would subclass this from + set (or UserSet). As this class does not include branch + information, it's assumed that one instance will be used per + branch. + """ + def __init__(self, parm): + """Constructs a RevisionSet from a string in property form, or from + a dictionary whose keys are the revisions. Raises ValueError if the + input string is invalid.""" + + self._revs = {} + + revision_range_split_re = re.compile('[-:]') + + if isinstance(parm, types.DictType): + self._revs = parm.copy() + elif isinstance(parm, types.ListType): + for R in parm: + self._revs[int(R)] = 1 + else: + parm = parm.strip() + if parm: + for R in parm.split(","): + rev_or_revs = re.split(revision_range_split_re, R) + if len(rev_or_revs) == 1: + self._revs[int(rev_or_revs[0])] = 1 + elif len(rev_or_revs) == 2: + for rev in range(int(rev_or_revs[0]), + int(rev_or_revs[1])+1): + self._revs[rev] = 1 + else: + raise ValueError, 'Ill formatted revision range: ' + R + + def sorted(self): + revnums = self._revs.keys() + revnums.sort() + return revnums + + def normalized(self): + """Returns a normalized version of the revision set, which is an + ordered list of couples (start,end), with the minimum number of + intervals.""" + revnums = self.sorted() + revnums.reverse() + ret = [] + while revnums: + s = e = revnums.pop() + while revnums and revnums[-1] in (e, e+1): + e = revnums.pop() + ret.append((s, e)) + return ret + + def __str__(self): + """Convert the revision set to a string, using its normalized form.""" + L = [] + for s,e in self.normalized(): + if s == e: + L.append(str(s)) + else: + L.append(str(s) + "-" + str(e)) + return ",".join(L) + + def __contains__(self, rev): + return self._revs.has_key(rev) + + def __sub__(self, rs): + """Compute subtraction as in sets.""" + revs = {} + for r in self._revs.keys(): + if r not in rs: + revs[r] = 1 + return RevisionSet(revs) + + def __and__(self, rs): + """Compute intersections as in sets.""" + revs = {} + for r in self._revs.keys(): + if r in rs: + revs[r] = 1 + return RevisionSet(revs) + + def __nonzero__(self): + return len(self._revs) != 0 + + def __len__(self): + """Return the number of revisions in the set.""" + return len(self._revs) + + def __iter__(self): + return iter(self.sorted()) + + def __or__(self, rs): + """Compute set union.""" + revs = self._revs.copy() + revs.update(rs._revs) + return RevisionSet(revs) + +def merge_props_to_revision_set(merge_props, pathid): + """A converter which returns a RevisionSet instance containing the + revisions from PATH as known to BRANCH_PROPS. BRANCH_PROPS is a + dictionary of pathid -> revision set branch integration information + (as returned by get_merge_props()).""" + if not merge_props.has_key(pathid): + error('no integration info available for path "%s"' % pathid) + return RevisionSet(merge_props[pathid]) + +def dict_from_revlist_prop(propvalue): + """Given a property value as a string containing per-source revision + lists, return a dictionary whose key is a source path identifier + and whose value is the revisions for that source.""" + prop = {} + + # Multiple sources are separated by any whitespace. + for L in propvalue.split(): + # We use rsplit to play safe and allow colons in pathids. + pathid_str, revs = rsplit(L.strip(), ":", 1) + + pathid = PathIdentifier.from_pathid(pathid_str) + + # cache the "external" form we saw + pathid.external_form = pathid_str + + prop[pathid] = revs + return prop + +def get_revlist_prop(url_or_dir, propname, rev=None): + """Given a repository URL or working copy path and a property + name, extract the values of the property which store per-source + revision lists and return a dictionary whose key is a source path + identifier, and whose value is the revisions for that source.""" + + # Note that propget does not return an error if the property does + # not exist, it simply does not output anything. So we do not need + # to check for LaunchError here. + args = '--strict "%s" "%s"' % (propname, url_or_dir) + if rev: + args = '-r %s %s' % (rev, args) + out = launchsvn('propget %s' % args, split_lines=False) + + return dict_from_revlist_prop(out) + +def get_merge_props(dir): + """Extract the merged revisions.""" + return get_revlist_prop(dir, opts["prop"]) + +def get_block_props(dir): + """Extract the blocked revisions.""" + return get_revlist_prop(dir, opts["block-prop"]) + +def get_blocked_revs(dir, source_pathid): + p = get_block_props(dir) + if p.has_key(source_pathid): + return RevisionSet(p[source_pathid]) + return RevisionSet("") + +def format_merge_props(props, sep=" "): + """Formats the hash PROPS as a string suitable for use as a + Subversion property value.""" + assert sep in ["\t", "\n", " "] # must be a whitespace + props = props.items() + props.sort() + L = [] + for h, r in props: + L.append("%s:%s" % (h, r)) + return sep.join(L) + +def _run_propset(dir, prop, value): + """Set the property 'prop' of directory 'dir' to value 'value'. We go + through a temporary file to not run into command line length limits.""" + try: + fd, fname = tempfile.mkstemp() + f = os.fdopen(fd, "wb") + except AttributeError: + # Fallback for Python <= 2.3 which does not have mkstemp (mktemp + # suffers from race conditions. Not that we care...) + fname = tempfile.mktemp() + f = open(fname, "wb") + + try: + f.write(value) + f.close() + report("property data written to temp file: %s" % value) + svn_command('propset "%s" -F "%s" "%s"' % (prop, fname, dir)) + finally: + os.remove(fname) + +def set_props(dir, name, props): + props = format_merge_props(props) + if props: + _run_propset(dir, name, props) + else: + # Check if NAME exists on DIR before trying to delete it. + # As of 1.6 propdel no longer supports deleting a + # non-existent property. + out = launchsvn('propget "%s" "%s"' % (name, dir)) + if out: + svn_command('propdel "%s" "%s"' % (name, dir)) + +def set_merge_props(dir, props): + set_props(dir, opts["prop"], props) + +def set_block_props(dir, props): + set_props(dir, opts["block-prop"], props) + +def set_blocked_revs(dir, source_pathid, revs): + props = get_block_props(dir) + if revs: + props[source_pathid] = str(revs) + elif props.has_key(source_pathid): + del props[source_pathid] + set_block_props(dir, props) + +def is_url(url): + """Check if url looks like a valid url.""" + return re.search(r"^[a-zA-Z][-+\.\w]*://[^\s]+$", url) is not None and url[:4] != 'uuid' + +def check_url(url): + """Similar to is_url, but actually invoke get_svninfo to find out""" + return get_svninfo(url) != {} + +def is_pathid(pathid): + return isinstance(pathid, PathIdentifier) + +def is_wc(dir): + """Check if a directory is a working copy.""" + return os.path.isdir(os.path.join(dir, ".svn")) or \ + os.path.isdir(os.path.join(dir, "_svn")) + +_cache_svninfo = {} +def get_svninfo(target): + """Extract the subversion information for a target (through 'svn info'). + This function uses an internal cache to let clients query information + many times.""" + if _cache_svninfo.has_key(target): + return _cache_svninfo[target] + info = {} + for L in launchsvn('info "%s"' % target): + L = L.strip() + if not L: + continue + key, value = L.split(": ", 1) + info[key] = value.strip() + _cache_svninfo[target] = info + return info + +def target_to_url(target): + """Convert working copy path or repos URL to a repos URL.""" + if is_wc(target): + info = get_svninfo(target) + return info["URL"] + return target + +_cache_reporoot = {} +def get_repo_root(target): + """Compute the root repos URL given a working-copy path, or a URL.""" + # Try using "svn info WCDIR". This works only on SVN clients >= 1.3 + if not is_url(target): + try: + info = get_svninfo(target) + root = info["Repository Root"] + _cache_reporoot[root] = None + return root + except KeyError: + pass + url = target_to_url(target) + assert url[-1] != '/' + else: + url = target + + # Go through the cache of the repository roots. This avoids extra + # server round-trips if we are asking the root of different URLs + # in the same repository (the cache in get_svninfo() cannot detect + # that of course and would issue a remote command). + assert is_url(url) + for r in _cache_reporoot: + if url.startswith(r): + return r + + # Try using "svn info URL". This works only on SVN clients >= 1.2 + try: + info = get_svninfo(url) + # info may be {}, in which case we'll see KeyError here + root = info["Repository Root"] + _cache_reporoot[root] = None + return root + except (KeyError, LaunchError): + pass + + # Constrained to older svn clients, we are stuck with this ugly + # trial-and-error implementation. It could be made faster with a + # binary search. + while url: + temp = os.path.dirname(url) + try: + launchsvn('proplist "%s"' % temp) + except LaunchError: + _cache_reporoot[url] = None + return rstrip(url, "/") + url = temp + + error("svn repos root of %s not found" % target) + +class SvnLogParser: + """ + Parse the "svn log", going through the XML output and using pulldom (which + would even allow streaming the command output). + """ + def __init__(self, xml): + self._events = pulldom.parseString(xml) + def __getitem__(self, idx): + for event, node in self._events: + if event == pulldom.START_ELEMENT and node.tagName == "logentry": + self._events.expandNode(node) + return self.SvnLogRevision(node) + raise IndexError, "Could not find 'logentry' tag in xml" + + class SvnLogRevision: + def __init__(self, xmlnode): + self.n = xmlnode + def revision(self): + return int(self.n.getAttribute("revision")) + def author(self): + return self.n.getElementsByTagName("author")[0].firstChild.data + def paths(self): + return [self.SvnLogPath(n) + for n in self.n.getElementsByTagName("path")] + + class SvnLogPath: + def __init__(self, xmlnode): + self.n = xmlnode + def action(self): + return self.n.getAttribute("action") + def pathid(self): + return self.n.firstChild.data + def copyfrom_rev(self): + try: return self.n.getAttribute("copyfrom-rev") + except KeyError: return None + def copyfrom_pathid(self): + try: return self.n.getAttribute("copyfrom-path") + except KeyError: return None + +def get_copyfrom(target): + """Get copyfrom info for a given target (it represents the + repository-relative path from where it was branched). NOTE: + repos root has no copyfrom info. In this case None is returned. + + Returns the: + - source file or directory from which the copy was made + - revision from which that source was copied + - revision in which the copy was committed + """ + repos_path = PathIdentifier.from_target(target).repo_relative_path + for chg in SvnLogParser(launchsvn('log -v --xml --stop-on-copy "%s"' + % target, split_lines=False)): + for p in chg.paths(): + if p.action() == 'A' and p.pathid() == repos_path: + # These values will be None if the corresponding elements are + # not found in the log. + return p.copyfrom_pathid(), p.copyfrom_rev(), chg.revision() + return None,None,None + +def get_latest_rev(url): + """Get the latest revision of the repository of which URL is part.""" + try: + info = get_svninfo(url) + if not info.has_key("Revision"): + error("Not a valid URL: %s" % url) + return info["Revision"] + except LaunchError: + # Alternative method for latest revision checking (for svn < 1.2) + report('checking latest revision of "%s"' % url) + L = launchsvn('proplist --revprop -r HEAD "%s"' % opts["source-url"])[0] + rev = re.search("revision (\d+)", L).group(1) + report('latest revision of "%s" is %s' % (url, rev)) + return rev + +def get_created_rev(url): + """Lookup the revision at which the path identified by the + provided URL was first created.""" + oldest_rev = -1 + report('determining oldest revision for URL "%s"' % url) + ### TODO: Refactor this to use a modified RevisionLog class. + lines = None + cmd = "log -r1:HEAD --stop-on-copy -q " + url + try: + lines = launchsvn(cmd + " --limit=1") + except LaunchError: + # Assume that --limit isn't supported by the installed 'svn'. + lines = launchsvn(cmd) + if lines and len(lines) > 1: + i = lines[1].find(" ") + if i != -1: + oldest_rev = int(lines[1][1:i]) + if oldest_rev == -1: + error('unable to determine oldest revision for URL "%s"' % url) + return oldest_rev + +def get_commit_log(url, revnum): + """Return the log message for a specific integer revision + number.""" + out = launchsvn("log --incremental -r%d %s" % (revnum, url)) + return recode_stdout_to_file("".join(out[1:])) + +def construct_merged_log_message(url, revnums): + """Return a commit log message containing all the commit messages + in the specified revisions at the given URL. The separator used + in this log message is determined by searching for the longest + svnmerge separator existing in the commit log messages and + extending it by one more separator. This results in a new commit + log message that is clearer in describing merges that contain + other merges. Trailing newlines are removed from the embedded + log messages.""" + messages = [''] + longest_sep = '' + for r in revnums.sorted(): + message = get_commit_log(url, r) + if message: + message = re.sub(r'(\r\n|\r|\n)', "\n", message) + message = rstrip(message, "\n") + "\n" + messages.append(prefix_lines(LOG_LINE_PREFIX, message)) + for match in LOG_SEPARATOR_RE.findall(message): + sep = match[1] + if len(sep) > len(longest_sep): + longest_sep = sep + + longest_sep += LOG_SEPARATOR + "\n" + messages.append('') + return longest_sep.join(messages) + +def get_default_source(branch_target, branch_props): + """Return the default source for branch_target (given its branch_props). + Error out if there is ambiguity.""" + if not branch_props: + error("no integration info available") + + props = branch_props.copy() + pathid = PathIdentifier.from_target(branch_target) + + # To make bidirectional merges easier, find the target's + # repository local path so it can be removed from the list of + # possible integration sources. + if props.has_key(pathid): + del props[pathid] + + if len(props) > 1: + err_msg = "multiple sources found. " + err_msg += "Explicit source argument (-S/--source) required.\n" + err_msg += "The merge sources available are:" + for prop in props: + err_msg += "\n " + str(prop) + error(err_msg) + + return props.keys()[0] + +def should_find_reflected(branch_dir): + should_find_reflected = opts["bidirectional"] + + # If the source has integration info for the target, set find_reflected + # even if --bidirectional wasn't specified + if not should_find_reflected: + source_props = get_merge_props(opts["source-url"]) + should_find_reflected = source_props.has_key(PathIdentifier.from_target(branch_dir)) + + return should_find_reflected + +def analyze_revs(target_pathid, url, begin=1, end=None, + find_reflected=False): + """For the source of the merges in the source URL being merged into + target_pathid, analyze the revisions in the interval begin-end (which + defaults to 1-HEAD), to find out which revisions are changes in + the url, which are changes elsewhere (so-called 'phantom' + revisions), optionally which are reflected changes (to avoid + conflicts that can occur when doing bidirectional merging between + branches), and which revisions initialize merge tracking against other + branches. Return a tuple of four RevisionSet's: + (real_revs, phantom_revs, reflected_revs, initialized_revs). + + NOTE: To maximize speed, if "end" is not provided, the function is + not able to find phantom revisions following the last real + revision in the URL. + """ + + begin = str(begin) + if end is None: + end = "HEAD" + else: + end = str(end) + if long(begin) > long(end): + return RevisionSet(""), RevisionSet(""), \ + RevisionSet(""), RevisionSet("") + + logs[url] = RevisionLog(url, begin, end, find_reflected) + revs = RevisionSet(logs[url].revs) + + if end == "HEAD": + # If end is not provided, we do not know which is the latest revision + # in the repository. So return the phantom revision set only up to + # the latest known revision. + end = str(list(revs)[-1]) + + phantom_revs = RevisionSet("%s-%s" % (begin, end)) - revs + + if find_reflected: + reflected_revs = logs[url].merge_metadata().changed_revs(target_pathid) + reflected_revs += logs[url].block_metadata().changed_revs(target_pathid) + else: + reflected_revs = [] + + initialized_revs = RevisionSet(logs[url].merge_metadata().initialized_revs()) + reflected_revs = RevisionSet(reflected_revs) + + return revs, phantom_revs, reflected_revs, initialized_revs + +def analyze_source_revs(branch_target, source_url, **kwargs): + """For the given branch and source, extract the real and phantom + source revisions.""" + branch_url = target_to_url(branch_target) + branch_pathid = PathIdentifier.from_target(branch_target) + + # Extract the latest repository revision from the URL of the branch + # directory (which is already cached at this point). + end_rev = get_latest_rev(source_url) + + # Calculate the base of analysis. If there is a "1-XX" interval in the + # merged_revs, we do not need to check those. + base = 1 + r = opts["merged-revs"].normalized() + if r and r[0][0] == 1: + base = r[0][1] + 1 + + # See if the user filtered the revision set. If so, we are not + # interested in something outside that range. + if opts["revision"]: + revs = RevisionSet(opts["revision"]).sorted() + if base < revs[0]: + base = revs[0] + if end_rev > revs[-1]: + end_rev = revs[-1] + + return analyze_revs(branch_pathid, source_url, base, end_rev, **kwargs) + +def minimal_merge_intervals(revs, phantom_revs): + """Produce the smallest number of intervals suitable for merging. revs + is the RevisionSet which we want to merge, and phantom_revs are phantom + revisions which can be used to concatenate intervals, thus minimizing the + number of operations.""" + revnums = revs.normalized() + ret = [] + + cur = revnums.pop() + while revnums: + next = revnums.pop() + assert next[1] < cur[0] # otherwise it is not ordered + assert cur[0] - next[1] > 1 # otherwise it is not normalized + for i in range(next[1]+1, cur[0]): + if i not in phantom_revs: + ret.append(cur) + cur = next + break + else: + cur = (next[0], cur[1]) + + ret.append(cur) + ret.reverse() + return ret + +def display_revisions(revs, display_style, revisions_msg, source_url): + """Show REVS as dictated by DISPLAY_STYLE, either numerically, in + log format, or as diffs. When displaying revisions numerically, + prefix output with REVISIONS_MSG when in verbose mode. Otherwise, + request logs or diffs using SOURCE_URL.""" + if display_style == "revisions": + if revs: + report(revisions_msg) + print revs + elif display_style == "logs": + for start,end in revs.normalized(): + svn_command('log --incremental -v -r %d:%d %s' % \ + (start, end, source_url)) + elif display_style in ("diffs", "summarize"): + if display_style == 'summarize': + summarize = '--summarize ' + else: + summarize = '' + + for start, end in revs.normalized(): + print + if start == end: + print "%s: changes in revision %d follow" % (NAME, start) + else: + print "%s: changes in revisions %d-%d follow" % (NAME, + start, end) + print + + # Note: the starting revision number to 'svn diff' is + # NOT inclusive so we have to subtract one from ${START}. + svn_command("diff -r %d:%d %s %s" % (start - 1, end, summarize, + source_url)) + else: + assert False, "unhandled display style: %s" % display_style + +def action_init(target_dir, target_props): + """Initialize for merges.""" + # Check that directory is ready for being modified + check_dir_clean(target_dir) + + target_pathid = PathIdentifier.from_target(target_dir) + source_pathid = opts['source-pathid'] + if source_pathid == target_pathid: + error("cannot init integration source path '%s'\nIts path identifier does not " + "differ from the path identifier of the current directory, '%s'." + % (source_pathid, target_pathid)) + + source_url = opts['source-url'] + + # If the user hasn't specified the revisions to use, see if the + # "source" is a copy from the current tree and if so, we can use + # the version data obtained from it. + revision_range = opts["revision"] + if not revision_range: + # If source was originally copied from target, and we are merging + # changes from source to target (the copy target is the merge source, + # and the copy source is the merge target), then we want to mark as + # integrated up to the rev in which the copy was committed which + # created the merge source: + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(source_url) + + cf_pathid = None + if cf_source: + cf_url = get_repo_root(source_url) + cf_source + if is_url(cf_url) and check_url(cf_url): + cf_pathid = PathIdentifier.from_target(cf_url) + + if target_pathid == cf_pathid: + report('the source "%s" was copied from "%s" in rev %s and committed in rev %s' % + (source_url, target_dir, cf_rev, copy_committed_in_rev)) + revision_range = "1-" + str(copy_committed_in_rev) + + if not revision_range: + # If the reverse is true: copy source is the merge source, and + # the copy target is the merge target, then we want to mark as + # integrated up to the specific rev of the merge target from + # which the merge source was copied. (Longer discussion at: + # http://subversion.tigris.org/issues/show_bug.cgi?id=2810 ) + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(target_dir) + + cf_pathid = None + if cf_source: + cf_url = get_repo_root(target_dir) + cf_source + if is_url(cf_url) and check_url(cf_url): + cf_pathid = PathIdentifier.from_target(cf_url) + + source_pathid = PathIdentifier.from_target(source_url) + if source_pathid == cf_pathid: + report('the target "%s" was copied the source "%s" in rev %s and committed in rev %s' % + (target_dir, source_url, cf_rev, copy_committed_in_rev)) + revision_range = "1-" + cf_rev + + # When neither the merge source nor target is a copy of the other, and + # the user did not specify a revision range, then choose a default which is + # the current revision; saying, in effect, "everything has been merged, so + # mark as integrated up to the latest rev on source url). + if not revision_range: + revision_range = "1-" + get_latest_rev(source_url) + + revs = RevisionSet(revision_range) + + report('marking "%s" as already containing revisions "%s" of "%s"' % + (target_dir, revs, source_url)) + + revs = str(revs) + # If the local svnmerge-integrated property already has an entry + # for the source-pathid, simply error out. + if not opts["force"] and target_props.has_key(source_pathid): + error('Repository-relative path %s has already been initialized at %s\n' + 'Use --force to re-initialize' % (source_pathid, target_dir)) + # set the pathid's external_form based on the user's options + source_pathid.external_form = source_pathid.format(opts['location-type']) + + revs = str(revs) + target_props[source_pathid] = revs + + # Set property + set_merge_props(target_dir, target_props) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Initialized merge tracking via "%s" with revisions "%s" from ' \ + % (NAME, revs) + print >>f, '%s' % source_url + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_avail(branch_dir, branch_props): + """Show commits available for merges.""" + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"], + find_reflected= + should_find_reflected(branch_dir)) + report('skipping phantom revisions: %s' % phantom_revs) + if reflected_revs: + report('skipping reflected revisions: %s' % reflected_revs) + report('skipping initialized revisions: %s' % initialized_revs) + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + avail_revs = source_revs - opts["merged-revs"] - blocked_revs - \ + reflected_revs - initialized_revs + + # Compose the set of revisions to show + revs = RevisionSet("") + report_msg = "revisions available to be merged are:" + if "avail" in opts["avail-showwhat"]: + revs |= avail_revs + if "blocked" in opts["avail-showwhat"]: + revs |= blocked_revs + report_msg = "revisions blocked are:" + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs = revs & RevisionSet(opts["revision"]) + + display_revisions(revs, opts["avail-display"], + report_msg, + opts["source-url"]) + +def action_integrated(branch_dir, branch_props): + """Show change sets already merged. This set of revisions is + calculated from taking svnmerge-integrated property from the + branch, and subtracting any revision older than the branch + creation revision.""" + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + revs = merge_props_to_revision_set(branch_props, opts["source-pathid"]) + + # Lookup the oldest revision on the branch path. + oldest_src_rev = get_created_rev(opts["source-url"]) + + # Subtract any revisions which pre-date the branch. + report("subtracting revisions which pre-date the source URL (%d)" % + oldest_src_rev) + revs = revs - RevisionSet(range(1, oldest_src_rev)) + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs = revs & RevisionSet(opts["revision"]) + + display_revisions(revs, opts["integrated-display"], + "revisions already integrated are:", opts["source-url"]) + +def action_merge(branch_dir, branch_props): + """Record merge meta data, and do the actual merge (if not + requested otherwise via --record-only).""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"], + find_reflected= + should_find_reflected(branch_dir)) + + if opts["revision"]: + revs = RevisionSet(opts["revision"]) + else: + revs = source_revs + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + merged_revs = opts["merged-revs"] + + # Show what we're doing + if opts["verbose"]: # just to avoid useless calculations + if merged_revs & revs: + report('"%s" already contains revisions %s' % (branch_dir, + merged_revs & revs)) + if phantom_revs: + report('memorizing phantom revision(s): %s' % phantom_revs) + if reflected_revs: + report('memorizing reflected revision(s): %s' % reflected_revs) + if blocked_revs & revs: + report('skipping blocked revisions(s): %s' % (blocked_revs & revs)) + if initialized_revs: + report('skipping initialized revision(s): %s' % initialized_revs) + + # Compute final merge set. + revs = revs - merged_revs - blocked_revs - reflected_revs - \ + phantom_revs - initialized_revs + if not revs: + report('no revisions to merge, exiting') + return + + # When manually marking revisions as merged, we only update the + # integration meta data, and don't perform an actual merge. + record_only = opts["record-only"] + + if record_only: + report('recording merge of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + else: + report('merging in revision(s) %s from "%s"' % + (revs, opts["source-url"])) + + # Do the merge(s). Note: the starting revision number to 'svn merge' + # is NOT inclusive so we have to subtract one from start. + # We try to keep the number of merge operations as low as possible, + # because it is faster and reduces the number of conflicts. + old_block_props = get_block_props(branch_dir) + merge_metadata = logs[opts["source-url"]].merge_metadata() + block_metadata = logs[opts["source-url"]].block_metadata() + for start,end in minimal_merge_intervals(revs, phantom_revs): + if not record_only: + # Preset merge/blocked properties to the source value at + # the start rev to avoid spurious property conflicts + set_merge_props(branch_dir, merge_metadata.get(start - 1)) + set_block_props(branch_dir, block_metadata.get(start - 1)) + # Do the merge + svn_command("merge --force -r %d:%d %s %s" % \ + (start - 1, end, opts["source-url"], branch_dir)) + # TODO: to support graph merging, add logic to merge the property + # meta-data manually + + # Update the set of merged revisions. + merged_revs = merged_revs | revs | reflected_revs | phantom_revs | initialized_revs + branch_props[opts["source-pathid"]] = str(merged_revs) + set_merge_props(branch_dir, branch_props) + # Reset the blocked revs + set_block_props(branch_dir, old_block_props) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + if record_only: + print >>f, 'Recorded merge of revisions %s via %s from ' % \ + (revs, NAME) + else: + print >>f, 'Merged revisions %s via %s from ' % \ + (revs, NAME) + print >>f, '%s' % opts["source-url"] + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], revs), + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_block(branch_dir, branch_props): + """Block revisions.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"]) + revs_to_block = source_revs - opts["merged-revs"] + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs_to_block = RevisionSet(opts["revision"]) & revs_to_block + + if not revs_to_block: + error('no available revisions to block') + + # Change blocked information + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + blocked_revs = blocked_revs | revs_to_block + set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Blocked revisions %s via %s' % (revs_to_block, NAME) + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], + revs_to_block), + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_unblock(branch_dir, branch_props): + """Unblock revisions.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + revs_to_unblock = blocked_revs + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs_to_unblock = revs_to_unblock & RevisionSet(opts["revision"]) + + if not revs_to_unblock: + error('no available revisions to unblock') + + # Change blocked information + blocked_revs = blocked_revs - revs_to_unblock + set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Unblocked revisions %s via %s' % (revs_to_unblock, NAME) + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], + revs_to_unblock), + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_rollback(branch_dir, branch_props): + """Rollback previously integrated revisions.""" + + # Make sure the revision arguments are present + if not opts["revision"]: + error("The '-r' option is mandatory for rollback") + + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + # Get the list of all revisions already merged into this source-pathid. + merged_revs = merge_props_to_revision_set(branch_props, + opts["source-pathid"]) + + # At which revision was the src created? + oldest_src_rev = get_created_rev(opts["source-url"]) + src_pre_exist_range = RevisionSet("1-%d" % oldest_src_rev) + + # Limit to revisions specified by -r (if any) + revs = merged_revs & RevisionSet(opts["revision"]) + + # make sure there's some revision to rollback + if not revs: + report("Nothing to rollback in revision range r%s" % opts["revision"]) + return + + # If even one specified revision lies outside the lifetime of the + # merge source, error out. + if revs & src_pre_exist_range: + err_str = "Specified revision range falls out of the rollback range.\n" + err_str += "%s was created at r%d" % (opts["source-pathid"], + oldest_src_rev) + error(err_str) + + record_only = opts["record-only"] + + if record_only: + report('recording rollback of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + else: + report('rollback of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + + # Do the reverse merge(s). Note: the starting revision number + # to 'svn merge' is NOT inclusive so we have to subtract one from start. + # We try to keep the number of merge operations as low as possible, + # because it is faster and reduces the number of conflicts. + rollback_intervals = minimal_merge_intervals(revs, []) + # rollback in the reverse order of merge + rollback_intervals.reverse() + for start, end in rollback_intervals: + if not record_only: + # Do the merge + svn_command("merge --force -r %d:%d %s %s" % \ + (end, start - 1, opts["source-url"], branch_dir)) + + # Write out commit message if desired + # calculate the phantom revs first + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + if record_only: + print >>f, 'Recorded rollback of revisions %s via %s from ' % \ + (revs , NAME) + else: + print >>f, 'Rolled back revisions %s via %s from ' % \ + (revs , NAME) + print >>f, '%s' % opts["source-url"] + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + + # Update the set of merged revisions. + merged_revs = merged_revs - revs + branch_props[opts["source-pathid"]] = str(merged_revs) + set_merge_props(branch_dir, branch_props) + +def action_uninit(branch_dir, branch_props): + """Uninit SOURCE URL.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + # If the source-pathid does not have an entry in the svnmerge-integrated + # property, simply error out. + if not branch_props.has_key(opts["source-pathid"]): + error('Repository-relative path "%s" does not contain merge ' + 'tracking information for "%s"' \ + % (opts["source-pathid"], branch_dir)) + + del branch_props[opts["source-pathid"]] + + # Set merge property with the selected source deleted + set_merge_props(branch_dir, branch_props) + + # Set blocked revisions for the selected source to None + set_blocked_revs(branch_dir, opts["source-pathid"], None) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Removed merge tracking for "%s" for ' % NAME + print >>f, '%s' % opts["source-url"] + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +############################################################################### +# Command line parsing -- options and commands management +############################################################################### + +class OptBase: + def __init__(self, *args, **kwargs): + self.help = kwargs["help"] + del kwargs["help"] + self.lflags = [] + self.sflags = [] + for a in args: + if a.startswith("--"): self.lflags.append(a) + elif a.startswith("-"): self.sflags.append(a) + else: + raise TypeError, "invalid flag name: %s" % a + if kwargs.has_key("dest"): + self.dest = kwargs["dest"] + del kwargs["dest"] + else: + if not self.lflags: + raise TypeError, "cannot deduce dest name without long options" + self.dest = self.lflags[0][2:] + if kwargs: + raise TypeError, "invalid keyword arguments: %r" % kwargs.keys() + def repr_flags(self): + f = self.sflags + self.lflags + r = f[0] + for fl in f[1:]: + r += " [%s]" % fl + return r + +class Option(OptBase): + def __init__(self, *args, **kwargs): + self.default = kwargs.setdefault("default", 0) + del kwargs["default"] + self.value = kwargs.setdefault("value", None) + del kwargs["value"] + OptBase.__init__(self, *args, **kwargs) + def apply(self, state, value): + assert value == "" + if self.value is not None: + state[self.dest] = self.value + else: + state[self.dest] += 1 + +class OptionArg(OptBase): + def __init__(self, *args, **kwargs): + self.default = kwargs["default"] + del kwargs["default"] + self.metavar = kwargs.setdefault("metavar", None) + del kwargs["metavar"] + OptBase.__init__(self, *args, **kwargs) + + if self.metavar is None: + if self.dest is not None: + self.metavar = self.dest.upper() + else: + self.metavar = "arg" + if self.default: + self.help += " (default: %s)" % self.default + def apply(self, state, value): + assert value is not None + state[self.dest] = value + def repr_flags(self): + r = OptBase.repr_flags(self) + return r + " " + self.metavar + +class CommandOpts: + class Cmd: + def __init__(self, *args): + self.name, self.func, self.usage, self.help, self.opts = args + def short_help(self): + return self.help.split(".")[0] + def __str__(self): + return self.name + def __call__(self, *args, **kwargs): + return self.func(*args, **kwargs) + + def __init__(self, global_opts, common_opts, command_table, version=None): + self.progname = NAME + self.version = version.replace("%prog", self.progname) + self.cwidth = console_width() - 2 + self.ctable = command_table.copy() + self.gopts = global_opts[:] + self.copts = common_opts[:] + self._add_builtins() + for k in self.ctable.keys(): + cmd = self.Cmd(k, *self.ctable[k]) + opts = [] + for o in cmd.opts: + if isinstance(o, types.StringType) or \ + isinstance(o, types.UnicodeType): + o = self._find_common(o) + opts.append(o) + cmd.opts = opts + self.ctable[k] = cmd + + def _add_builtins(self): + self.gopts.append( + Option("-h", "--help", help="show help for this command and exit")) + if self.version is not None: + self.gopts.append( + Option("-V", "--version", help="show version info and exit")) + self.ctable["help"] = (self._cmd_help, + "help [COMMAND]", + "Display help for a specific command. If COMMAND is omitted, " + "display brief command description.", + []) + + def _cmd_help(self, cmd=None, *args): + if args: + self.error("wrong number of arguments", "help") + if cmd is not None: + cmd = self._command(cmd) + self.print_command_help(cmd) + else: + self.print_command_list() + + def _paragraph(self, text, width=78): + chunks = re.split("\s+", text.strip()) + chunks.reverse() + lines = [] + while chunks: + L = chunks.pop() + while chunks and len(L) + len(chunks[-1]) + 1 <= width: + L += " " + chunks.pop() + lines.append(L) + return lines + + def _paragraphs(self, text, *args, **kwargs): + pars = text.split("\n\n") + lines = self._paragraph(pars[0], *args, **kwargs) + for p in pars[1:]: + lines.append("") + lines.extend(self._paragraph(p, *args, **kwargs)) + return lines + + def _print_wrapped(self, text, indent=0): + text = self._paragraphs(text, self.cwidth - indent) + print text.pop(0) + for t in text: + print " " * indent + t + + def _find_common(self, fl): + for o in self.copts: + if fl in o.lflags+o.sflags: + return o + assert False, fl + + def _compute_flags(self, opts, check_conflicts=True): + back = {} + sfl = "" + lfl = [] + for o in opts: + sapp = lapp = "" + if isinstance(o, OptionArg): + sapp, lapp = ":", "=" + for s in o.sflags: + if check_conflicts and back.has_key(s): + raise RuntimeError, "option conflict: %s" % s + back[s] = o + sfl += s[1:] + sapp + for l in o.lflags: + if check_conflicts and back.has_key(l): + raise RuntimeError, "option conflict: %s" % l + back[l] = o + lfl.append(l[2:] + lapp) + return sfl, lfl, back + + def _extract_command(self, args): + """ + Try to extract the command name from the argument list. This is + non-trivial because we want to allow command-specific options even + before the command itself. + """ + opts = self.gopts[:] + for cmd in self.ctable.values(): + opts.extend(cmd.opts) + sfl, lfl, _ = self._compute_flags(opts, check_conflicts=False) + + lopts,largs = getopt.getopt(args, sfl, lfl) + if not largs: + return None + return self._command(largs[0]) + + def _fancy_getopt(self, args, opts, state=None): + if state is None: + state= {} + for o in opts: + if not state.has_key(o.dest): + state[o.dest] = o.default + + sfl, lfl, back = self._compute_flags(opts) + try: + lopts,args = getopt.gnu_getopt(args, sfl, lfl) + except AttributeError: + # Before Python 2.3, there was no gnu_getopt support. + # So we can't parse intermixed positional arguments + # and options. + lopts,args = getopt.getopt(args, sfl, lfl) + + for o,v in lopts: + back[o].apply(state, v) + return state, args + + def _command(self, cmd): + if not self.ctable.has_key(cmd): + self.error("unknown command: '%s'" % cmd) + return self.ctable[cmd] + + def parse(self, args): + if not args: + self.print_small_help() + sys.exit(0) + + cmd = None + try: + cmd = self._extract_command(args) + opts = self.gopts[:] + if cmd: + opts.extend(cmd.opts) + args.remove(cmd.name) + state, args = self._fancy_getopt(args, opts) + except getopt.GetoptError, e: + self.error(e, cmd) + + # Handle builtins + if self.version is not None and state["version"]: + self.print_version() + sys.exit(0) + if state["help"]: # special case for --help + if cmd: + self.print_command_help(cmd) + sys.exit(0) + cmd = self.ctable["help"] + else: + if cmd is None: + self.error("command argument required") + if str(cmd) == "help": + cmd(*args) + sys.exit(0) + return cmd, args, state + + def error(self, s, cmd=None): + print >>sys.stderr, "%s: %s" % (self.progname, s) + if cmd is not None: + self.print_command_help(cmd) + else: + self.print_small_help() + sys.exit(1) + def print_small_help(self): + print "Type '%s help' for usage" % self.progname + def print_usage_line(self): + print "usage: %s <subcommand> [options...] [args...]\n" % self.progname + def print_command_list(self): + print "Available commands (use '%s help COMMAND' for more details):\n" \ + % self.progname + cmds = self.ctable.keys() + cmds.sort() + indent = max(map(len, cmds)) + for c in cmds: + h = self.ctable[c].short_help() + print " %-*s " % (indent, c), + self._print_wrapped(h, indent+6) + def print_command_help(self, cmd): + cmd = self.ctable[str(cmd)] + print 'usage: %s %s\n' % (self.progname, cmd.usage) + self._print_wrapped(cmd.help) + def print_opts(opts, self=self): + if not opts: return + flags = [o.repr_flags() for o in opts] + indent = max(map(len, flags)) + for f,o in zip(flags, opts): + print " %-*s :" % (indent, f), + self._print_wrapped(o.help, indent+5) + print '\nCommand options:' + print_opts(cmd.opts) + print '\nGlobal options:' + print_opts(self.gopts) + + def print_version(self): + print self.version + +############################################################################### +# Options and Commands description +############################################################################### + +global_opts = [ + Option("-F", "--force", + help="force operation even if the working copy is not clean, or " + "there are pending updates"), + Option("-n", "--dry-run", + help="don't actually change anything, just pretend; " + "implies --show-changes"), + Option("-s", "--show-changes", + help="show subversion commands that make changes"), + Option("-v", "--verbose", + help="verbose mode: output more information about progress"), + OptionArg("-u", "--username", + default=None, + help="invoke subversion commands with the supplied username"), + OptionArg("-p", "--password", + default=None, + help="invoke subversion commands with the supplied password"), + OptionArg("-c", "--config-dir", metavar="DIR", + default=None, + help="cause subversion commands to consult runtime config directory DIR"), +] + +common_opts = [ + Option("-b", "--bidirectional", + value=True, + default=False, + help="remove reflected and initialized revisions from merge candidates. " + "Not required but may be specified to speed things up slightly"), + OptionArg("-f", "--commit-file", metavar="FILE", + default="svnmerge-commit-message.txt", + help="set the name of the file where the suggested log message " + "is written to"), + Option("-M", "--record-only", + value=True, + default=False, + help="do not perform an actual merge of the changes, yet record " + "that a merge happened"), + OptionArg("-r", "--revision", + metavar="REVLIST", + default="", + help="specify a revision list, consisting of revision numbers " + 'and ranges separated by commas, e.g., "534,537-539,540"'), + OptionArg("-S", "--source", "--head", + default=None, + help="specify a merge source for this branch. It can be either " + "a working directory path, a full URL, or an unambiguous " + "substring of one of the locations for which merge tracking was " + "already initialized. Needed only to disambiguate in case of " + "multiple merge sources"), +] + +command_table = { + "init": (action_init, + "init [OPTION...] [SOURCE]", + """Initialize merge tracking from SOURCE on the current working + directory. + + If SOURCE is specified, all the revisions in SOURCE are marked as already + merged; if this is not correct, you can use --revision to specify the + exact list of already-merged revisions. + + If SOURCE is omitted, then it is computed from the "svn cp" history of the + current working directory (searching back for the branch point); in this + case, %s assumes that no revision has been integrated yet since + the branch point (unless you teach it with --revision).""" % NAME, + [ + "-f", "-r", # import common opts + OptionArg("-L", "--location-type", + dest="location-type", + default="path", + help="Use this type of location identifier in the new " + + "Subversion properties; 'uuid', 'url', or 'path' " + + "(default)"), + ]), + + "avail": (action_avail, + "avail [OPTION...] [PATH]", + """Show unmerged revisions available for PATH as a revision list. + If --revision is given, the revisions shown will be limited to those + also specified in the option. + + When svnmerge is used to bidirectionally merge changes between a + branch and its source, it is necessary to not merge the same changes + forth and back: e.g., if you committed a merge of a certain + revision of the branch into the source, you do not want that commit + to appear as available to merged into the branch (as the code + originated in the branch itself!). svnmerge will automatically + exclude these so-called "reflected" revisions.""", + [ + Option("-A", "--all", + dest="avail-showwhat", + value=["blocked", "avail"], + default=["avail"], + help="show both available and blocked revisions (aka ignore " + "blocked revisions)"), + "-b", + Option("-B", "--blocked", + dest="avail-showwhat", + value=["blocked"], + help="show the blocked revision list (see '%s block')" % NAME), + Option("-d", "--diff", + dest="avail-display", + value="diffs", + default="revisions", + help="show corresponding diff instead of revision list"), + Option("--summarize", + dest="avail-display", + value="summarize", + help="show summarized diff instead of revision list"), + Option("-l", "--log", + dest="avail-display", + value="logs", + help="show corresponding log history instead of revision list"), + "-r", + "-S", + ]), + + "integrated": (action_integrated, + "integrated [OPTION...] [PATH]", + """Show merged revisions available for PATH as a revision list. + If --revision is given, the revisions shown will be limited to + those also specified in the option.""", + [ + Option("-d", "--diff", + dest="integrated-display", + value="diffs", + default="revisions", + help="show corresponding diff instead of revision list"), + Option("-l", "--log", + dest="integrated-display", + value="logs", + help="show corresponding log history instead of revision list"), + "-r", + "-S", + ]), + + "rollback": (action_rollback, + "rollback [OPTION...] [PATH]", + """Rollback previously merged in revisions from PATH. The + --revision option is mandatory, and specifies which revisions + will be rolled back. Only the previously integrated merges + will be rolled back. + + When manually rolling back changes, --record-only can be used to + instruct %s that a manual rollback of a certain revision + already happened, so that it can record it and offer that + revision for merge henceforth.""" % (NAME), + [ + "-f", "-r", "-S", "-M", # import common opts + ]), + + "merge": (action_merge, + "merge [OPTION...] [PATH]", + """Merge in revisions into PATH from its source. If --revision is omitted, + all the available revisions will be merged. In any case, already merged-in + revisions will NOT be merged again. + + When svnmerge is used to bidirectionally merge changes between a + branch and its source, it is necessary to not merge the same changes + forth and back: e.g., if you committed a merge of a certain + revision of the branch into the source, you do not want that commit + to appear as available to merged into the branch (as the code + originated in the branch itself!). svnmerge will automatically + exclude these so-called "reflected" revisions. + + When manually merging changes across branches, --record-only can + be used to instruct %s that a manual merge of a certain revision + already happened, so that it can record it and not offer that + revision for merge anymore. Conversely, when there are revisions + which should not be merged, use '%s block'.""" % (NAME, NAME), + [ + "-b", "-f", "-r", "-S", "-M", # import common opts + ]), + + "block": (action_block, + "block [OPTION...] [PATH]", + """Block revisions within PATH so that they disappear from the available + list. This is useful to hide revisions which will not be integrated. + If --revision is omitted, it defaults to all the available revisions. + + Do not use this option to hide revisions that were manually merged + into the branch. Instead, use '%s merge --record-only', which + records that a merge happened (as opposed to a merge which should + not happen).""" % NAME, + [ + "-f", "-r", "-S", # import common opts + ]), + + "unblock": (action_unblock, + "unblock [OPTION...] [PATH]", + """Revert the effect of '%s block'. If --revision is omitted, all the + blocked revisions are unblocked""" % NAME, + [ + "-f", "-r", "-S", # import common opts + ]), + + "uninit": (action_uninit, + "uninit [OPTION...] [PATH]", + """Remove merge tracking information from PATH. It cleans any kind of merge + tracking information (including the list of blocked revisions). If there + are multiple sources, use --source to indicate which source you want to + forget about.""", + [ + "-f", "-S", # import common opts + ]), +} + + +def main(args): + global opts + + # Initialize default options + opts = default_opts.copy() + logs.clear() + + optsparser = CommandOpts(global_opts, common_opts, command_table, + version="%%prog r%s\n modified: %s\n\n" + "Copyright (C) 2004,2005 Awarix Inc.\n" + "Copyright (C) 2005, Giovanni Bajo" + % (__revision__, __date__)) + + cmd, args, state = optsparser.parse(args) + opts.update(state) + + source = opts.get("source", None) + branch_dir = "." + + if str(cmd) == "init": + if len(args) == 1: + source = args[0] + elif len(args) > 1: + optsparser.error("wrong number of parameters", cmd) + elif str(cmd) in command_table.keys(): + if len(args) == 1: + branch_dir = args[0] + elif len(args) > 1: + optsparser.error("wrong number of parameters", cmd) + else: + assert False, "command not handled: %s" % cmd + + # Validate branch_dir + if not is_wc(branch_dir): + if str(cmd) == "avail": + info = None + # it should be noted here that svn info does not error exit + # if an invalid target is specified to it (as is + # intuitive). so the try, except code is not absolutely + # necessary. but, I retain it to indicate the intuitive + # handling. + try: + info = get_svninfo(branch_dir) + except LaunchError: + pass + # test that we definitely targeted a subversion directory, + # mirroring the purpose of the earlier is_wc() call + if info is None or not info.has_key("Node Kind") or info["Node Kind"] != "directory": + error('"%s" is neither a valid URL, nor a working directory' % branch_dir) + else: + error('"%s" is not a subversion working directory' % branch_dir) + + # give out some hints as to potential pathids + PathIdentifier.hint(branch_dir) + if source: PathIdentifier.hint(source) + + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + + # Calculate source_url and source_path + report("calculate source path for the branch") + if not source: + if str(cmd) == "init": + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(branch_dir) + if not cf_source: + error('no copyfrom info available. ' + 'Explicit source argument (-S/--source) required.') + opts["source-url"] = get_repo_root(branch_dir) + cf_source + opts["source-pathid"] = PathIdentifier.from_target(opts["source-url"]) + + if not opts["revision"]: + opts["revision"] = "1-" + cf_rev + else: + opts["source-pathid"] = get_default_source(branch_dir, branch_props) + opts["source-url"] = opts["source-pathid"].get_url() + + assert is_pathid(opts["source-pathid"]) + assert is_url(opts["source-url"]) + else: + # The source was given as a command line argument and is stored in + # SOURCE. Ensure that the specified source does not end in a /, + # otherwise it's easy to have the same source path listed more + # than once in the integrated version properties, with and without + # trailing /'s. + source = rstrip(source, "/") + if not is_wc(source) and not is_url(source): + # Check if it is a substring of a pathid recorded + # within the branch properties. + found = [] + for pathid in branch_props.keys(): + if pathid.match_substring(source): + found.append(pathid) + if len(found) == 1: + # (assumes pathid is a repository-relative-path) + source_pathid = found[0] + source = source_pathid.get_url() + else: + error('"%s" is neither a valid URL, nor an unambiguous ' + 'substring of a repository path, nor a working directory' + % source) + else: + source_pathid = PathIdentifier.from_target(source) + + source_pathid = PathIdentifier.from_target(source) + if str(cmd) == "init" and \ + source_pathid == PathIdentifier.from_target("."): + error("cannot init integration source path '%s'\n" + "Its repository-relative path must differ from the " + "repository-relative path of the current directory." + % source_pathid) + opts["source-pathid"] = source_pathid + opts["source-url"] = target_to_url(source) + + # Sanity check source_url + assert is_url(opts["source-url"]) + # SVN does not support non-normalized URL (and we should not + # have created them) + assert opts["source-url"].find("/..") < 0 + + report('source is "%s"' % opts["source-url"]) + + # Get previously merged revisions (except when command is init) + if str(cmd) != "init": + opts["merged-revs"] = merge_props_to_revision_set(branch_props, + opts["source-pathid"]) + + # Perform the action + cmd(branch_dir, branch_props) + + +if __name__ == "__main__": + try: + main(sys.argv[1:]) + except LaunchError, (ret, cmd, out): + err_msg = "command execution failed (exit code: %d)\n" % ret + err_msg += cmd + "\n" + err_msg += "".join(out) + error(err_msg) + except KeyboardInterrupt: + # Avoid traceback on CTRL+C + print "aborted by user" + sys.exit(1) diff --git a/abs/extra/subversion/svnserve b/abs/extra/subversion/svnserve index 2f433b6..670fee7 100755 --- a/abs/extra/subversion/svnserve +++ b/abs/extra/subversion/svnserve @@ -10,7 +10,7 @@ case "$1" in stat_busy "Starting svnserve" if [ -z "$PID" ]; then if [ -n "$SVNSERVE_USER" ]; then - su $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & + su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & else /usr/bin/svnserve -d $SVNSERVE_ARGS & fi diff --git a/abs/extra/unison/PKGBUILD b/abs/extra/unison/PKGBUILD index b1efa5b..6b3dc00 100644 --- a/abs/extra/unison/PKGBUILD +++ b/abs/extra/unison/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id: PKGBUILD 57697 2009-11-01 15:08:02Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=unison -pkgver=2.27.57 +pkgver=2.32.52 pkgrel=1 pkgdesc="Unison is a file-synchronization tool" arch=(i686 x86_64) @@ -10,6 +10,7 @@ license=('GPL2') url="http://www.cis.upenn.edu/~bcpierce/unison" depends=('glibc') #makedepends=('ocaml' 'lablgtk' 'lablgtk2' 'imagemagick') +#makedepends=('ocaml' 'imagemagick') makedepends=('ocaml' ) source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz \ $pkgname.desktop) @@ -23,6 +24,21 @@ build() { make UISTYLE=text DEBUGGING=false THREADS=true || return 1 mkdir -p $startdir/pkg/usr/bin install -Dm755 unison $startdir/pkg/usr/bin/unison + # clean the builddir and rebuild with gtk support +# make clean +# make UISTYLE=gtk DEBUGGING=false THREADS=true || return 1 +# install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk + # clean the builddir and rebuild with gtk2 support +# make clean +# make UISTYLE=gtk2 DEBUGGING=false THREADS=true || return 1 +# install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk2 + # install a .desktop file; create a compliant icon from ico file and install the png + # install -Dm644 ../$pkgname.desktop $startdir/pkg/usr/share/applications/$pkgname.desktop + # convert win32rc/U.ico unison.png + # install -Dm644 ${pkgname}-1.png $startdir/pkg/usr/share/pixmaps/$pkgname.png + # make symlink for .desktop file + # cd $startdir/pkg//usr/bin + # ln -s unison-gtk2 unison-x11 } -md5sums=('4ba0a3e4bf4b4ad0c063f86391371f78' +md5sums=('0701f095c1721776a0454b94607eda48' '2daecba7705455a8e4b769e48b059872') diff --git a/abs/extra/unison/ocaml-3.08-extnames.patch b/abs/extra/unison/ocaml-3.08-extnames.patch deleted file mode 100644 index e959be2..0000000 --- a/abs/extra/unison/ocaml-3.08-extnames.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur unison-2.9.1/ubase/uprintf.ml unison-2.9.1.patched/ubase/uprintf.ml ---- unison-2.9.1/ubase/uprintf.ml 2002-04-11 07:13:23.000000000 +0200 -+++ unison-2.9.1.patched/ubase/uprintf.ml 2004-08-08 14:10:09.784776851 +0200 -@@ -10,8 +10,8 @@ - (* *) - (***********************************************************************) - --external format_int: string -> int -> string = "format_int" --external format_float: string -> float -> string = "format_float" -+external format_int: string -> int -> string = "caml_format_int" -+external format_float: string -> float -> string = "caml_format_float" - - let fprintf outchan doafter format = - let format = (Obj.magic format : string) in diff --git a/abs/extra/windowmaker/windowmaker
.build.log b/abs/extra/windowmaker/windowmaker
.build.log new file mode 100644 index 0000000..799b6ef --- /dev/null +++ b/abs/extra/windowmaker/windowmaker .build.log @@ -0,0 +1,1276 @@ +bumped windowmaker release from 6 to 7
+---------------
+==> Making package: windowmaker 0.92.0-7 i686 (Thu Oct 1 02:50:15 UTC 2009)
+==> WARNING: Running makepkg as root...
+==> Checking Runtime Dependencies...
+==> Checking Buildtime Dependencies...
+==> Retrieving Sources...
+ -> Using cached copy of WindowMaker-0.92.0.tar.bz2
+ -> Found windowmaker-gcc4.patch.tar.bz2 in build dir
+==> Validating source files with md5sums...
+ WindowMaker-0.92.0.tar.bz2 ... Passed
+ windowmaker-gcc4.patch.tar.bz2 ... Passed
+==> Extracting Sources...
+ -> bsdtar -x -f WindowMaker-0.92.0.tar.bz2
+ -> bsdtar -x -f windowmaker-gcc4.patch.tar.bz2
+==> Removing existing pkg/ directory...
+==> Starting build()...
+patching file ChangeLog
+patching file WINGs/Examples/server.c
+patching file WINGs/Makefile.am
+patching file WINGs/connection.c
+patching file WINGs/dragdestination.c
+patching file WINGs/po/de.po
+patching file WINGs/selection.c
+patching file WINGs/wapplication.c
+patching file WINGs/wcolor.c
+patching file WINGs/wfont.c
+patching file WINGs/wfontpanel.c
+patching file WINGs/widgets.c
+patching file WINGs/wtext.c
+patching file WINGs/wview.c
+patching file WPrefs.app/FontSimple.c
+patching file WPrefs.app/Makefile.am
+patching file WPrefs.app/main.c
+patching file WPrefs.app/po/de.po
+patching file configure.ac
+patching file po/de.po
+patching file src/actions.c
+patching file src/event.c
+patching file src/icon.c
+patching file src/misc.c
+patching file src/moveres.c
+patching file src/properties.c
+patching file src/startup.c
+patching file src/window.c
+patching file src/window.h
+patching file test/wtest.c
+patching file util/wmsetbg.c
+patching file wrlib/convert.c
+patching file wrlib/gradient.c
+patching file wrlib/ppm.c
+patching file wrlib/raster.c
+patching file wrlib/x86_specific.c
+libtoolize: putting auxiliary files in `.'.
+libtoolize: copying file `./ltmain.sh'
+libtoolize: You should add the contents of the following files to `aclocal.m4':
+libtoolize: `/usr/share/aclocal/libtool.m4'
+libtoolize: `/usr/share/aclocal/ltoptions.m4'
+libtoolize: `/usr/share/aclocal/ltversion.m4'
+libtoolize: `/usr/share/aclocal/ltsugar.m4'
+libtoolize: `/usr/share/aclocal/lt~obsolete.m4'
+libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
+libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
+libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
+libtoolize: `AC_PROG_RANLIB' is rendered obsolete by `LT_INIT'
+acinclude.m4:6: warning: underquoted definition of WM_CHECK_LIB
+acinclude.m4:6: run info '(automake)Extending aclocal'
+acinclude.m4:6: or see http://sources.redhat.com/automake/automake.html#Extending-aclocal
+configure: WARNING: unrecognized options: --with-gnustepdir
+checking for a BSD-compatible install... /bin/install -c
+checking whether build environment is sane... yes
+checking for a thread-safe mkdir -p... /bin/mkdir -p
+checking for gawk... gawk
+checking whether make sets $(MAKE)... yes
+checking build system type... i686-pc-linux-gnu
+checking host system type... i686-pc-linux-gnu
+checking for style of include used by make... GNU
+checking for gcc... gcc
+checking for C compiler default output file name... a.out
+checking whether the C compiler works... yes
+checking whether we are cross compiling... no
+checking for suffix of executables...
+checking for suffix of object files... o
+checking whether we are using the GNU C compiler... yes
+checking whether gcc accepts -g... yes
+checking for gcc option to accept ISO C89... none needed
+checking dependency style of gcc... none
+checking for a sed that does not truncate output... /bin/sed
+checking for grep that handles long lines and -e... /bin/grep
+checking for egrep... /bin/grep -E
+checking for fgrep... /bin/grep -F
+checking for ld used by gcc... /usr/bin/ld
+checking if the linker (/usr/bin/ld) is GNU ld... yes
+checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
+checking the name lister (/usr/bin/nm -B) interface... BSD nm
+checking whether ln -s works... yes
+checking the maximum length of command line arguments... 1572864
+checking whether the shell understands some XSI constructs... yes
+checking whether the shell understands "+="... yes
+checking for /usr/bin/ld option to reload object files... -r
+checking for objdump... objdump
+checking how to recognize dependent libraries... pass_all
+checking for ar... ar
+checking for strip... strip
+checking for ranlib... ranlib
+checking command to parse /usr/bin/nm -B output from gcc object... ok
+checking how to run the C preprocessor... gcc -E
+checking for ANSI C header files... yes
+checking for sys/types.h... yes
+checking for sys/stat.h... yes
+checking for stdlib.h... yes
+checking for string.h... yes
+checking for memory.h... yes
+checking for strings.h... yes
+checking for inttypes.h... yes
+checking for stdint.h... yes
+checking for unistd.h... yes
+checking for dlfcn.h... yes
+checking for objdir... .libs
+checking if gcc supports -fno-rtti -fno-exceptions... no
+checking for gcc option to produce PIC... -fPIC -DPIC
+checking if gcc PIC flag -fPIC -DPIC works... yes
+checking if gcc static flag -static works... yes
+checking if gcc supports -c -o file.o... yes
+checking if gcc supports -c -o file.o... (cached) yes
+checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes
+checking whether -lc should be explicitly linked in... no
+checking dynamic linker characteristics... GNU/Linux ld.so
+checking how to hardcode library paths into programs... immediate
+checking whether stripping libraries is possible... yes
+checking if libtool supports shared libraries... yes
+checking whether to build shared libraries... yes
+checking whether to build static libraries... yes
+checking for library containing strerror... none required
+checking for gcc... (cached) gcc
+checking whether we are using the GNU C compiler... (cached) yes
+checking whether gcc accepts -g... (cached) yes
+checking for gcc option to accept ISO C89... (cached) none needed
+checking dependency style of gcc... (cached) none
+checking whether ln -s works... yes
+checking whether gcc needs -traditional... no
+checking for vprintf... yes
+checking for _doprnt... no
+checking for working alloca.h... yes
+checking for alloca... yes
+checking for gethostname... yes
+checking for select... yes
+checking for poll... yes
+checking for strerror... yes
+checking for strcasecmp... yes
+checking for strncasecmp... yes
+checking for setsid... yes
+checking for atexit... yes
+checking for mallinfo... yes
+checking for mkstemp... yes
+checking for snprintf... yes
+checking for vsnprintf... yes
+checking for asprintf... yes
+checking for vasprintf... yes
+checking for C99 vsnprintf... yes
+checking for dlopen... no
+checking for dlopen in -ldl... yes
+checking for dlfcn.h... (cached) yes
+checking for cpp... /usr/bin/cpp
+checking for sys/wait.h that is POSIX.1 compatible... yes
+checking whether time.h and sys/time.h may both be included... yes
+checking fcntl.h usability... yes
+checking fcntl.h presence... yes
+checking for fcntl.h... yes
+checking limits.h usability... yes
+checking limits.h presence... yes
+checking for limits.h... yes
+checking sys/ioctl.h usability... yes
+checking sys/ioctl.h presence... yes
+checking for sys/ioctl.h... yes
+checking sys/time.h usability... yes
+checking sys/time.h presence... yes
+checking for sys/time.h... yes
+checking for sys/types.h... (cached) yes
+checking libintl.h usability... yes
+checking libintl.h presence... yes
+checking for libintl.h... yes
+checking sys/select.h usability... yes
+checking sys/select.h presence... yes
+checking for sys/select.h... yes
+checking poll.h usability... yes
+checking poll.h presence... yes
+checking for poll.h... yes
+checking malloc.h usability... yes
+checking malloc.h presence... yes
+checking for malloc.h... yes
+checking ctype.h usability... yes
+checking ctype.h presence... yes
+checking for ctype.h... yes
+checking for string.h... (cached) yes
+checking for strings.h... (cached) yes
+checking whether sys_siglist is declared... yes
+checking for an ANSI C-conforming const... yes
+checking return type of signal handlers... void
+checking whether gcc supports x86 inline asm... yes
+checking whether gcc supports MMX(tm) inline asm... yes
+checking for pkg-config... pkg-config
+checking for gettext... yes
+checking for xgettext... xgettext
+xgettext and gettext() exist; will build i18n support for be
+bg
+bs
+ca
+cs
+da
+de
+el
+es
+et
+fi
+fr
+gl
+hr
+hu
+it
+ja
+ko
+ms
+nl
+no
+pl
+pt
+ro
+ru
+sk
+sv
+tr
+zh_CN
+zh_TW
+checking for connect... yes
+checking for gethostbyname... yes
+checking for inet_aton... yes
+checking for X... libraries , headers
+checking for gethostbyname... (cached) yes
+checking for connect... (cached) yes
+checking for remove... yes
+checking for shmat... yes
+checking for IceConnectionNumber in -lICE... yes
+checking for _Xsetlocale in -lX11... no
+checking for XInternAtoms in -lX11... yes
+checking for XConvertCase in -lX11... yes
+checking for XShapeSelectInput in -lXext... yes
+checking for the Xft2 library... found
+checking whether libXft is at least version 2.1.0... yes
+checking for XineramaQueryScreens in -lXinerama... yes
+checking for XineramaGetInfo in -lXext... no
+checking for XShmAttach in -lXext... yes
+checking for shmget... yes
+checking for XpmCreatePixmapFromData in -lXpm... yes
+checking X11/xpm.h usability... yes
+checking X11/xpm.h presence... yes
+checking for X11/xpm.h... yes
+checking for png_get_valid in -lpng... yes
+checking png.h usability... yes
+checking png.h presence... yes
+checking for png.h... yes
+checking for jpeg_destroy_compress in -ljpeg... yes
+checking jpeglib.h usability... yes
+checking jpeglib.h presence... yes
+checking for jpeglib.h... yes
+checking for DGifOpenFileName in -lungif... yes
+checking gif_lib.h usability... yes
+checking gif_lib.h presence... yes
+checking for gif_lib.h... yes
+checking for TIFFGetVersion in -ltiff... yes
+checking tiffio.h usability... yes
+checking tiffio.h presence... yes
+checking for tiffio.h... yes
+checking for stdlib.h... (cached) yes
+configure: creating ./config.status
+config.status: creating Makefile
+config.status: creating po/Makefile
+config.status: creating util/Makefile
+config.status: creating test/Makefile
+config.status: creating WINGs/Makefile
+config.status: creating WINGs/WINGs/Makefile
+config.status: creating WINGs/Documentation/Makefile
+config.status: creating WINGs/Examples/Makefile
+config.status: creating WINGs/Resources/Makefile
+config.status: creating WINGs/Tests/Makefile
+config.status: creating WINGs/Extras/Makefile
+config.status: creating WINGs/po/Makefile
+config.status: creating wmlib/Makefile
+config.status: creating wrlib/Makefile
+config.status: creating wrlib/tests/Makefile
+config.status: creating src/Makefile
+config.status: creating src/wconfig.h
+config.status: creating doc/Makefile
+config.status: creating doc/sk/Makefile
+config.status: creating WindowMaker/Makefile
+config.status: creating WindowMaker/Backgrounds/Makefile
+config.status: creating WindowMaker/Defaults/Makefile
+config.status: creating WindowMaker/IconSets/Makefile
+config.status: creating WindowMaker/Icons/Makefile
+config.status: creating WindowMaker/Pixmaps/Makefile
+config.status: creating WindowMaker/Styles/Makefile
+config.status: creating WindowMaker/Themes/Makefile
+config.status: creating WPrefs.app/Makefile
+config.status: creating WPrefs.app/tiff/Makefile
+config.status: creating WPrefs.app/xpm/Makefile
+config.status: creating WPrefs.app/po/Makefile
+config.status: creating contrib/Makefile
+config.status: creating contrib/WindowMaker.spec
+config.status: creating src/config.h
+config.status: executing depfiles commands
+config.status: executing libtool commands
+configure: WARNING: unrecognized options: --with-gnustepdir
+
+Window Maker was configured as follows:
+
+Installation path prefix : /usr
+Installation path for binaries : /usr/bin
+Installation path for WPrefs.app : /usr/share/GNUstep/Applications
+Supported graphic format libraries : XPM PNG JPEG GIF TIFF builtin-PPM
+Use assembly routines for wrlib : yes
+Use inline MMX(tm) x86 assembly : yes
+Antialiased text support in WINGs : yes
+Xinerama extension support : yes
+Translated message files to install : be.mo bg.mo bs.mo ca.mo cs.mo da.mo de.mo el.mo es.mo et.mo fi.mo fr.mo gl.mo hr.mo hu.mo it.mo ja.mo ko.mo ms.mo nl.mo no.mo pl.mo pt.mo ro.mo ru.mo sk.mo sv.mo tr.mo zh_CN.mo zh_TW.mo
+Installation path for translations : /usr/share/locale
+
+Making all in wrlib
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'
+Making all in .
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'
+/bin/sh ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c -o raster.lo raster.c
+/bin/sh ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c -o gradient.lo gradient.c
+/bin/sh ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c -o convert.lo convert.c
+`echo /bin/sh ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe | sed -e s/-fomit-frame-pointer//` -O0 -c x86_specific.c
+/bin/sh ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c -o ppm.lo ppm.c
+libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c convert.c -fPIC -DPIC -o .libs/convert.o
+libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c ppm.c -fPIC -DPIC -o .libs/ppm.o
+libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c raster.c -fPIC -DPIC -o .libs/raster.o
+libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -O0 -c x86_specific.c -fPIC -DPIC -o .libs/x86_specific.o
+libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -O0 -c x86_specific.c -o x86_specific.o >/dev/null 2>&1
+libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c gradient.c -fPIC -DPIC -o .libs/gradient.o
+libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c ppm.c -o ppm.o >/dev/null 2>&1
+libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c raster.c -o raster.o >/dev/null 2>&1
+libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c gradient.c -o gradient.o >/dev/null 2>&1
+libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c convert.c -o convert.o >/dev/null 2>&1
+/bin/sh ../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -version-info 4:0:1 -o libwraster.la -rpath /usr/lib LookupCmap.lo StdCmap.lo CrCmap.lo DelCmap.lo CmapAlloc.lo raster.lo draw.lo color.lo load.lo save.lo gradient.lo xpixmap.lo convert.lo x86_specific.lo context.lo misc.lo scale.lo rotate.lo convolve.lo nxpm.lo xpm.lo xutil.lo ppm.lo png.lo jpeg.lo tiff.lo gif.lo -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lX11 -lm
+libtool: link: rm -fr .libs/libwraster.a .libs/libwraster.la .libs/libwraster.lai .libs/libwraster.so .libs/libwraster.so.3 .libs/libwraster.so.3.1.0
+libtool: link: gcc -shared .libs/LookupCmap.o .libs/StdCmap.o .libs/CrCmap.o .libs/DelCmap.o .libs/CmapAlloc.o .libs/raster.o .libs/draw.o .libs/color.o .libs/load.o .libs/save.o .libs/gradient.o .libs/xpixmap.o .libs/convert.o .libs/x86_specific.o .libs/context.o .libs/misc.o .libs/scale.o .libs/rotate.o .libs/convolve.o .libs/nxpm.o .libs/xpm.o .libs/xutil.o .libs/ppm.o .libs/png.o .libs/jpeg.o .libs/tiff.o .libs/gif.o -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lX11 -lm -march=i686 -mtune=generic -Wl,-soname -Wl,libwraster.so.3 -o .libs/libwraster.so.3.1.0
+libtool: link: (cd ".libs" && rm -f "libwraster.so.3" && ln -s "libwraster.so.3.1.0" "libwraster.so.3")
+libtool: link: (cd ".libs" && rm -f "libwraster.so" && ln -s "libwraster.so.3.1.0" "libwraster.so")
+libtool: link: ar cru .libs/libwraster.a LookupCmap.o StdCmap.o CrCmap.o DelCmap.o CmapAlloc.o raster.o draw.o color.o load.o save.o gradient.o xpixmap.o convert.o x86_specific.o context.o misc.o scale.o rotate.o convolve.o nxpm.o xpm.o xutil.o ppm.o png.o jpeg.o tiff.o gif.o
+libtool: link: ranlib .libs/libwraster.a
+libtool: link: ( cd ".libs" && rm -f "libwraster.la" && ln -s "../libwraster.la" "libwraster.la" )
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'
+Making all in tests
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib/tests'
+/bin/sh ../../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o testdraw testdraw.o ../../wrlib/libwraster.la
+/bin/sh ../../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o testgrad testgrad.o ../../wrlib/libwraster.la
+/bin/sh ../../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o testrot testrot.o ../../wrlib/libwraster.la
+/bin/sh ../../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o view view.o ../../wrlib/libwraster.la
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/testgrad testgrad.o ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lX11 -lm
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/testdraw testdraw.o ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lX11 -lm
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/testrot testrot.o ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lX11 -lm
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/view view.o ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lX11 -lm
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib/tests'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'
+Making all in WINGs
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'
+Making all in WINGs
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/WINGs'
+make[2]: Nothing to be done for `all'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/WINGs'
+Making all in .
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'
+gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2 -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c connection.c
+gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2 -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c dragdestination.c
+gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2 -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c selection.c
+gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2 -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c wapplication.c
+gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2 -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c wcolor.c
+gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2 -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c wfont.c
+gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2 -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c wfontpanel.c
+gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2 -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c widgets.c
+gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2 -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c wtext.c
+gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2 -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c wview.c
+rm -f libWUtil.a
+ar cru libWUtil.a array.o bagtree.o connection.o data.o error.o findfile.o handlers.o hashtable.o host.o international.o memory.o misc.o notification.o proplist.o snprintf.o string.o tree.o userdefaults.o usleep.o wapplication.o wutil.o
+ranlib libWUtil.a
+rm -f libWINGs.a
+ar cru libWINGs.a array.o bagtree.o configuration.o connection.o data.o dragcommon.o dragdestination.o dragsource.o error.o findfile.o handlers.o hashtable.o host.o international.o memory.o misc.o notification.o proplist.o selection.o snprintf.o string.o tree.o userdefaults.o usleep.o wapplication.o wappresource.o wballoon.o wbox.o wbrowser.o wbutton.o wcolor.o wcolorpanel.o wcolorwell.o wevent.o wfilepanel.o wframe.o wfont.o wfontpanel.o widgets.o winputmethod.o wlabel.o wlist.o wmenuitem.o wmisc.o wpanel.o wpixmap.o wpopupbutton.o wprogressindicator.o wruler.o wscroller.o wscrollview.o wslider.o wsplitview.o wtabview.o wtext.o wtextfield.o wview.o wwindow.o
+ranlib libWINGs.a
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'
+Making all in po
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/po'
+msgfmt -c -o de.mo de.po
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/po'
+Making all in Documentation
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Documentation'
+make[2]: Nothing to be done for `all'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Documentation'
+Making all in Resources
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Resources'
+make[2]: Nothing to be done for `all'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Resources'
+Making all in Examples
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Examples'
+gcc -DHAVE_CONFIG_H -I. -I../../src -I../../WINGs -I../../wrlib -I../../src -DRESOURCE_PATH=\"/usr/share/WINGs\" -I/usr/include -DDEBUG -march=i686 -mtune=generic -O2 -pipe -c server.c
+/bin/sh ../../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o connect connect.o ../../WINGs/libWUtil.a -L/usr/lib
+/bin/sh ../../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o fontl fontl.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11
+/bin/sh ../../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o puzzle puzzle.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11
+/bin/sh ../../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o colorpick colorpick.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o connect connect.o ../../WINGs/libWUtil.a -L/usr/lib
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/puzzle puzzle.o ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/colorpick colorpick.o ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/fontl fontl.o ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11
+/bin/sh ../../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o server server.o ../../WINGs/libWUtil.a -L/usr/lib
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o server server.o ../../WINGs/libWUtil.a -L/usr/lib
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Examples'
+Making all in Extras
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Extras'
+/bin/sh ../../libtool --tag=CC --mode=link gcc -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -o test test.o wtableview.o wtabledelegates.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11
+libtool: link: gcc -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -o .libs/test test.o wtableview.o wtabledelegates.o ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Extras'
+Making all in Tests
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Tests'
+/bin/sh ../../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o wtest wtest.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11
+/bin/sh ../../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o wmquery wmquery.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11
+/bin/sh ../../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o wmfile wmfile.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11
+/bin/sh ../../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o testmywidget testmywidget.o mywidget.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/wmquery wmquery.o ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/wmfile wmfile.o ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/wtest wtest.o ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/testmywidget testmywidget.o mywidget.o ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Tests'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'
+Making all in src
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'
+cd .. && /bin/sh /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/missing --run autoheader
+rm -f stamp-h1
+touch config.h.in
+cd .. && /bin/sh ./config.status src/config.h
+config.status: creating src/config.h
+make all-am
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'
+gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c actions.c
+gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c event.c
+gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c icon.c
+gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c misc.c
+gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c moveres.c
+gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c properties.c
+gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c startup.c
+gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c window.c
+/bin/sh ../libtool --tag=CC --mode=link gcc -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -o wmaker actions.o appicon.o application.o appmenu.o balloon.o client.o colormap.o cycling.o defaults.o dialog.o dock.o dockedapp.o event.o framewin.o geomview.o icon.o main.o menu.o misc.o monitor.o motif.o moveres.o pixmap.o placement.o properties.o resources.o rootmenu.o screen.o session.o shutdown.o switchpanel.o stacking.o startup.o superfluous.o switchmenu.o texture.o usermenu.o xdnd.o xinerama.o xmodifier.o xutil.o wcore.o wdefaults.o window.o winmenu.o winspector.o wmspec.o workspace.o wsound.o text.o ../WINGs/libWINGs.a ../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11 -lXinerama -lXext -lX11 -ldl
+libtool: link: gcc -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -o .libs/wmaker actions.o appicon.o application.o appmenu.o balloon.o client.o colormap.o cycling.o defaults.o dialog.o dock.o dockedapp.o event.o framewin.o geomview.o icon.o main.o menu.o misc.o monitor.o motif.o moveres.o pixmap.o placement.o properties.o resources.o rootmenu.o screen.o session.o shutdown.o switchpanel.o stacking.o startup.o superfluous.o switchmenu.o texture.o usermenu.o xdnd.o xinerama.o xmodifier.o xutil.o wcore.o wdefaults.o window.o winmenu.o winspector.o wmspec.o workspace.o wsound.o text.o ../WINGs/libWINGs.a ../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lm -lXft -lXrender -lfontconfig -lfreetype -lXinerama -lXext -lX11 -ldl
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'
+Making all in util
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/util'
+/bin/sh ../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o wdwrite wdwrite.o ../WINGs/libWUtil.a -L/usr/lib
+/bin/sh ../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o wdread wdread.o ../WINGs/libWUtil.a -L/usr/lib
+/bin/sh ../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o getstyle getstyle.o fontconv.o ../WINGs/libWUtil.a -L/usr/lib
+/bin/sh ../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o setstyle setstyle.o fontconv.o ../WINGs/libWUtil.a -lXinerama -lXext -lX11 -L/usr/lib
+/bin/sh ../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o convertfonts convertfonts.o fontconv.o ../WINGs/libWUtil.a -L/usr/lib
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o wdwrite wdwrite.o ../WINGs/libWUtil.a -L/usr/lib
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o getstyle getstyle.o fontconv.o ../WINGs/libWUtil.a -L/usr/lib
+/bin/sh ../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o seticons seticons.o ../WINGs/libWUtil.a -L/usr/lib
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o convertfonts convertfonts.o fontconv.o ../WINGs/libWUtil.a -L/usr/lib
+/bin/sh ../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o geticonset geticonset.o ../WINGs/libWUtil.a -L/usr/lib
+gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs -I../wrlib -I/usr/include -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\" -march=i686 -mtune=generic -O2 -pipe -c wmsetbg.c
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o seticons seticons.o ../WINGs/libWUtil.a -L/usr/lib
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o wdread wdread.o ../WINGs/libWUtil.a -L/usr/lib
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o geticonset geticonset.o ../WINGs/libWUtil.a -L/usr/lib
+/bin/sh ../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o wmsetup wmsetup.o ../WINGs/libWINGs.a ../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11 -ldl
+/bin/sh ../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o wmagnify wmagnify.o ../WINGs/libWINGs.a ../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11 -ldl
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o setstyle setstyle.o fontconv.o ../WINGs/libWUtil.a -lXinerama -lXext -lX11 -L/usr/lib
+rm -f wmaker.inst
+sed -e "s|#pkgdatadir#|/usr/share/WindowMaker|" \
+ -e "s|#sysconfdir#|/etc/WindowMaker|" \
+ -e "s|#version#|0.92.0|" \
+ -e "s|#bindir#|/usr/bin|" \
+ -e "s|#LITE#||" \
+ ./wmaker.inst.in >wmaker.inst
+chmod 755 wmaker.inst
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/wmsetup wmsetup.o ../WINGs/libWINGs.a ../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11 -ldl
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/wmagnify wmagnify.o ../WINGs/libWINGs.a ../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11 -ldl
+/bin/sh ../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o wmsetbg wmsetbg.o ../WINGs/libWINGs.a ../wrlib/libwraster.la -lXinerama -lXext -lX11 -lXft -lXrender -lfontconfig -lfreetype -lX11 -ldl
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/wmsetbg wmsetbg.o ../WINGs/libWINGs.a ../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lm -lXinerama -lXext -lXft -lXrender -lfontconfig -lfreetype -lX11 -ldl
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/util'
+Making all in po
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/po'
+msgfmt -c -o de.mo de.po
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/po'
+Making all in WindowMaker
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'
+Making all in Backgrounds
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Backgrounds'
+make[2]: Nothing to be done for `all'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Backgrounds'
+Making all in Defaults
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Defaults'
+make[2]: Nothing to be done for `all'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Defaults'
+Making all in IconSets
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/IconSets'
+make[2]: Nothing to be done for `all'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/IconSets'
+Making all in Icons
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Icons'
+make[2]: Nothing to be done for `all'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Icons'
+Making all in Pixmaps
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Pixmaps'
+make[2]: Nothing to be done for `all'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Pixmaps'
+Making all in Styles
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Styles'
+make[2]: Nothing to be done for `all'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Styles'
+Making all in Themes
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Themes'
+make[2]: Nothing to be done for `all'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Themes'
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'
+make[2]: Nothing to be done for `all-am'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'
+Making all in wmlib
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wmlib'
+make[1]: Nothing to be done for `all'.
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wmlib'
+Making all in test
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/test'
+gcc -DHAVE_CONFIG_H -I. -I../src -g -D_BSD_SOURCE -I../wmlib -march=i686 -mtune=generic -O2 -pipe -c wtest.c
+/bin/sh ../libtool --tag=CC --mode=link gcc -march=i686 -mtune=generic -O2 -pipe -o wtest wtest.o ../wmlib/libWMaker.a -lXinerama -lXext -lX11
+libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o wtest wtest.o ../wmlib/libWMaker.a -lXinerama -lXext -lX11
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/test'
+Making all in WPrefs.app
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'
+Making all in xpm
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/xpm'
+make[2]: Nothing to be done for `all'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/xpm'
+Making all in tiff
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'
+make[2]: Nothing to be done for `all'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'
+Making all in po
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/po'
+msgfmt -c -o de.mo de.po
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/po'
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'
+gcc -DHAVE_CONFIG_H -I. -I../src -I../wrlib -I../WINGs -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/GNUstep/Applications/WPrefs.app\" -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c main.c
+gcc -DHAVE_CONFIG_H -I. -I../src -I../wrlib -I../WINGs -I/usr/include -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/GNUstep/Applications/WPrefs.app\" -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c FontSimple.c
+/bin/sh ../libtool --tag=CC --mode=link gcc -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -o WPrefs main.o WPrefs.o Appearance.o Configurations.o Expert.o Focus.o FontSimple.o Icons.o KeyboardSettings.o KeyboardShortcuts.o Menu.o MenuPreferences.o MouseSettings.o Paths.o Preferences.o TexturePanel.o Themes.o WindowHandling.o Workspace.o double.o editmenu.o imagebrowser.o xmodifier.o ../WINGs/libWINGs.a ../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11
+libtool: link: gcc -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -o .libs/WPrefs main.o WPrefs.o Appearance.o Configurations.o Expert.o Focus.o FontSimple.o Icons.o KeyboardSettings.o KeyboardShortcuts.o Menu.o MenuPreferences.o MouseSettings.o Paths.o Preferences.o TexturePanel.o Themes.o WindowHandling.o Workspace.o double.o editmenu.o imagebrowser.o xmodifier.o ../WINGs/libWINGs.a ../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'
+Making all in doc
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'
+Making all in sk
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc/sk'
+make[2]: Nothing to be done for `all'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc/sk'
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'
+make[2]: Nothing to be done for `all-am'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'
+Making all in contrib
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/contrib'
+make[1]: Nothing to be done for `all'.
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/contrib'
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0'
+make[1]: Nothing to be done for `all-am'.
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0'
+Making install in wrlib
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'
+Making install in .
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'
+test -z "/usr/bin" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin"
+/bin/sh ../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig
+test -z "/usr/lib" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib"
+test -z "/usr/include" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include"
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig
+ /bin/install -c 'get-wraster-flags' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/get-wraster-flags'
+/bin/install -c -m 644 wrlib.pc /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig/
+ /bin/sh ../libtool --mode=install /bin/install -c 'libwraster.la' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libwraster.la'
+ /bin/install -c -m 644 'wraster.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/wraster.h'
+libtool: install: /bin/install -c .libs/libwraster.so.3.1.0 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libwraster.so.3.1.0
+libtool: install: (cd /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib && { ln -s -f libwraster.so.3.1.0 libwraster.so.3 || { rm -f libwraster.so.3 && ln -s libwraster.so.3.1.0 libwraster.so.3; }; })
+libtool: install: (cd /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib && { ln -s -f libwraster.so.3.1.0 libwraster.so || { rm -f libwraster.so && ln -s libwraster.so.3.1.0 libwraster.so; }; })
+libtool: install: /bin/install -c .libs/libwraster.lai /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libwraster.la
+libtool: install: /bin/install -c .libs/libwraster.a /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libwraster.a
+libtool: install: chmod 644 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libwraster.a
+libtool: install: ranlib /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libwraster.a
+libtool: install: warning: remember to run `libtool --finish /usr/lib'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'
+Making install in tests
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib/tests'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib/tests'
+make[3]: Nothing to be done for `install-exec-am'.
+make[3]: Nothing to be done for `install-data-am'.
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib/tests'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib/tests'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'
+Making install in WINGs
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'
+Making install in WINGs
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/WINGs'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/WINGs'
+make[3]: Nothing to be done for `install-exec-am'.
+test -z "/usr/include/WINGs" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs"
+ /bin/install -c -m 644 'WINGs.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs/WINGs.h'
+ /bin/install -c -m 644 'WUtil.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs/WUtil.h'
+ /bin/install -c -m 644 'WINGsP.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs/WINGsP.h'
+ /bin/install -c -m 644 'proplist-compat.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs/proplist-compat.h'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/WINGs'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/WINGs'
+Making install in .
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'
+test -z "/usr/bin" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin"
+/bin/sh ../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig
+test -z "/usr/lib" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib"
+make[3]: Nothing to be done for `install-data-am'.
+/bin/install -c -m 644 WINGs.pc /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig/
+ /bin/install -c 'get-wings-flags' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/get-wings-flags'
+ /bin/install -c -m 644 'libWINGs.a' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libWINGs.a'
+ /bin/install -c 'get-wutil-flags' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/get-wutil-flags'
+ /bin/install -c -m 644 'libWUtil.a' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libWUtil.a'
+ ranlib '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libWINGs.a'
+ ranlib '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libWUtil.a'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'
+Making install in po
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/po'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/po'
+make[3]: Nothing to be done for `install-exec-am'.
+/bin/sh ../../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale
+chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale
+for n in bg.mo ca.mo cs.mo de.mo fr.mo sk.mo __DuMmY ; do \
+ if test "$n" -a "$n" != "__DuMmY" ; then \
+ l=`basename $n .mo`; \
+ /bin/sh ../../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES; \
+ chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l; \
+ chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES; \
+ /bin/install -c -m 644 -m 644 $n /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES/WINGs.mo; \
+ fi; \
+ done
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/bg
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/bg/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ca
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ca/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/cs
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/cs/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/de
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/de/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/fr
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/fr/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/sk
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/sk/LC_MESSAGES
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/po'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/po'
+Making install in Documentation
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Documentation'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Documentation'
+make[3]: Nothing to be done for `install-exec-am'.
+make[3]: Nothing to be done for `install-data-am'.
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Documentation'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Documentation'
+Making install in Resources
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Resources'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Resources'
+make[3]: Nothing to be done for `install-exec-am'.
+test -z "/usr/share/WINGs" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WINGs"
+ /bin/install -c -m 644 'Images.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WINGs/Images.tiff'
+ /bin/install -c -m 644 'Images.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WINGs/Images.xpm'
+ /bin/install -c -m 644 'defaultIcon.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WINGs/defaultIcon.tiff'
+ /bin/install -c -m 644 'defaultIcon.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WINGs/defaultIcon.xpm'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Resources'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Resources'
+Making install in Examples
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Examples'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Examples'
+make[3]: Nothing to be done for `install-exec-am'.
+make[3]: Nothing to be done for `install-data-am'.
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Examples'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Examples'
+Making install in Extras
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Extras'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Extras'
+test -z "/usr/lib" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib"
+test -z "/usr/include/WINGs" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs"
+ /bin/install -c -m 644 'libExtraWINGs.a' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libExtraWINGs.a'
+ /bin/install -c -m 644 'wtableview.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs/wtableview.h'
+ /bin/install -c -m 644 'wtabledelegates.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs/wtabledelegates.h'
+ ranlib '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libExtraWINGs.a'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Extras'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Extras'
+Making install in Tests
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Tests'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Tests'
+make[3]: Nothing to be done for `install-exec-am'.
+make[3]: Nothing to be done for `install-data-am'.
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Tests'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Tests'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'
+Making install in src
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'
+make install-am
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'
+test -z "/usr/bin" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin"
+make[3]: Nothing to be done for `install-data-am'.
+ /bin/sh ../libtool --mode=install /bin/install -c 'wmaker' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmaker'
+libtool: install: warning: `../wrlib/libwraster.la' has not been installed in `/usr/lib'
+libtool: install: /bin/install -c .libs/wmaker /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmaker
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'
+Making install in util
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/util'
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/util'
+test -z "/usr/bin" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin"
+test -z "/usr/bin" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin"
+make[2]: Nothing to be done for `install-data-am'.
+ /bin/install -c 'wmaker.inst' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmaker.inst'
+ /bin/sh ../libtool --mode=install /bin/install -c 'wxcopy' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wxcopy'
+ /bin/install -c 'wm-oldmenu2new' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wm-oldmenu2new'
+ /bin/install -c 'wkdemenu.pl' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wkdemenu.pl'
+libtool: install: /bin/install -c wxcopy /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wxcopy
+ /bin/sh ../libtool --mode=install /bin/install -c 'wxpaste' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wxpaste'
+libtool: install: /bin/install -c wxpaste /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wxpaste
+ /bin/sh ../libtool --mode=install /bin/install -c 'wdwrite' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wdwrite'
+libtool: install: /bin/install -c wdwrite /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wdwrite
+ /bin/sh ../libtool --mode=install /bin/install -c 'wdread' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wdread'
+libtool: install: /bin/install -c wdread /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wdread
+ /bin/sh ../libtool --mode=install /bin/install -c 'getstyle' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/getstyle'
+libtool: install: /bin/install -c getstyle /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/getstyle
+ /bin/sh ../libtool --mode=install /bin/install -c 'setstyle' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/setstyle'
+libtool: install: /bin/install -c setstyle /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/setstyle
+ /bin/sh ../libtool --mode=install /bin/install -c 'convertfonts' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/convertfonts'
+libtool: install: /bin/install -c convertfonts /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/convertfonts
+ /bin/sh ../libtool --mode=install /bin/install -c 'seticons' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/seticons'
+libtool: install: /bin/install -c seticons /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/seticons
+ /bin/sh ../libtool --mode=install /bin/install -c 'geticonset' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/geticonset'
+libtool: install: /bin/install -c geticonset /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/geticonset
+ /bin/sh ../libtool --mode=install /bin/install -c 'wmsetbg' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmsetbg'
+libtool: install: warning: `../wrlib/libwraster.la' has not been installed in `/usr/lib'
+libtool: install: /bin/install -c .libs/wmsetbg /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmsetbg
+ /bin/sh ../libtool --mode=install /bin/install -c 'wmsetup' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmsetup'
+libtool: install: warning: `../wrlib/libwraster.la' has not been installed in `/usr/lib'
+libtool: install: /bin/install -c .libs/wmsetup /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmsetup
+ /bin/sh ../libtool --mode=install /bin/install -c 'wmagnify' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmagnify'
+libtool: install: warning: `../wrlib/libwraster.la' has not been installed in `/usr/lib'
+libtool: install: /bin/install -c .libs/wmagnify /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmagnify
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/util'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/util'
+Making install in po
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/po'
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/po'
+make[2]: Nothing to be done for `install-exec-am'.
+/bin/sh ../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale
+chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale
+for n in be.mo bg.mo bs.mo ca.mo cs.mo da.mo de.mo el.mo es.mo et.mo fi.mo fr.mo gl.mo hr.mo hu.mo it.mo ja.mo ko.mo ms.mo nl.mo no.mo pl.mo pt.mo ro.mo ru.mo sk.mo sv.mo tr.mo zh_CN.mo zh_TW.mo __DuMmY ; do \
+ if test "$n" -a "$n" != "__DuMmY" ; then \
+ l=`basename $n .mo`; \
+ /bin/sh ../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES; \
+ chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l; \
+ chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES; \
+ /bin/install -c -m 644 -m 644 $n /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES/WindowMaker.mo; \
+ fi; \
+ done
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/be
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/be/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/bs
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/bs/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/da
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/da/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/el
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/el/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/es
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/es/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/et
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/et/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/fi
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/fi/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/gl
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/gl/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/hr
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/hr/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/hu
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/hu/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/it
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/it/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ja
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ja/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ko
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ko/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ms
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ms/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/nl
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/nl/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/no
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/no/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/pl
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/pl/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/pt
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/pt/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ro
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ro/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ru
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ru/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/sv
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/sv/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/tr
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/tr/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/zh_CN
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/zh_CN/LC_MESSAGES
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/zh_TW
+mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/zh_TW/LC_MESSAGES
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/po'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/po'
+Making install in WindowMaker
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'
+Making install in Backgrounds
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Backgrounds'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Backgrounds'
+make[3]: Nothing to be done for `install-exec-am'.
+test -z "/usr/share/WindowMaker/Backgrounds" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Backgrounds"
+ /bin/install -c -m 644 'BlueImage.jpeg' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Backgrounds/BlueImage.jpeg'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Backgrounds'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Backgrounds'
+Making install in Defaults
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Defaults'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Defaults'
+make[3]: Nothing to be done for `install-exec-am'.
+test -z "/etc/WindowMaker" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/etc/WindowMaker"
+ /bin/install -c -m 644 'WMRootMenu' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/etc/WindowMaker/WMRootMenu'
+ /bin/install -c -m 644 'WMWindowAttributes' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/etc/WindowMaker/WMWindowAttributes'
+ /bin/install -c -m 644 'WindowMaker' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/etc/WindowMaker/WindowMaker'
+ /bin/install -c -m 644 'WMState' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/etc/WindowMaker/WMState'
+ /bin/install -c -m 644 'WMGLOBAL' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/etc/WindowMaker/WMGLOBAL'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Defaults'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Defaults'
+Making install in IconSets
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/IconSets'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/IconSets'
+make[3]: Nothing to be done for `install-exec-am'.
+test -z "/usr/share/WindowMaker/IconSets" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/IconSets"
+ /bin/install -c -m 644 'Default.iconset' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/IconSets/Default.iconset'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/IconSets'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/IconSets'
+Making install in Icons
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Icons'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Icons'
+make[3]: Nothing to be done for `install-exec-am'.
+test -z "/usr/share/WindowMaker/Icons" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons"
+ /bin/install -c -m 644 'BitchX.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/BitchX.tiff'
+ /bin/install -c -m 644 'DefaultAppIcon.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/DefaultAppIcon.tiff'
+ /bin/install -c -m 644 'Ftp.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Ftp.png'
+ /bin/install -c -m 644 'GNUstep.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUstep.tiff'
+ /bin/install -c -m 644 'GNUstep3D.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUstep3D.tiff'
+ /bin/install -c -m 644 'GNUstepGlow.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUstepGlow.tiff'
+ /bin/install -c -m 644 'GNUterm.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUterm.tiff'
+ /bin/install -c -m 644 'GreenWilber.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GreenWilber.png'
+ /bin/install -c -m 644 'ICQ.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/ICQ.png'
+ /bin/install -c -m 644 'Jabber.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Jabber.png'
+ /bin/install -c -m 644 'Mozilla.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Mozilla.png'
+ /bin/install -c -m 644 'Netscape.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Netscape.png'
+ /bin/install -c -m 644 'Pen.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Pen.png'
+ /bin/install -c -m 644 'Pencil.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Pencil.png'
+ /bin/install -c -m 644 'Real.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Real.png'
+ /bin/install -c -m 644 'Shell.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Shell.png'
+ /bin/install -c -m 644 'Speaker.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Speaker.png'
+ /bin/install -c -m 644 'Terminal.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Terminal.tiff'
+ /bin/install -c -m 644 'TerminalGNUstep.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/TerminalGNUstep.tiff'
+ /bin/install -c -m 644 'TerminalLinux.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/TerminalLinux.tiff'
+ /bin/install -c -m 644 'XChat.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/XChat.png'
+ /bin/install -c -m 644 'clip.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/clip.tiff'
+ /bin/install -c -m 644 'defaultAppIcon.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/defaultAppIcon.tiff'
+ /bin/install -c -m 644 'defaultterm.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/defaultterm.tiff'
+ /bin/install -c -m 644 'draw.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/draw.tiff'
+ /bin/install -c -m 644 'linuxterm.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/linuxterm.tiff'
+ /bin/install -c -m 644 'mixer.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/mixer.tiff'
+ /bin/install -c -m 644 'notepad.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/notepad.tiff'
+ /bin/install -c -m 644 'pdf.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/pdf.tiff'
+ /bin/install -c -m 644 'ps.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/ps.tiff'
+ /bin/install -c -m 644 'real.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/real.tiff'
+ /bin/install -c -m 644 'sgiterm.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/sgiterm.tiff'
+ /bin/install -c -m 644 'sound.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/sound.tiff'
+ /bin/install -c -m 644 'staroffice2.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/staroffice2.tiff'
+ /bin/install -c -m 644 'timer.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/timer.tiff'
+ /bin/install -c -m 644 'wilber.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/wilber.tiff'
+ /bin/install -c -m 644 'write.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/write.tiff'
+ /bin/install -c -m 644 'xdvi.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/xdvi.tiff'
+ /bin/install -c -m 644 'xv.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/xv.tiff'
+ /bin/install -c -m 644 'BitchX.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/BitchX.xpm'
+ /bin/install -c -m 644 'GNUstep.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUstep.xpm'
+ /bin/install -c -m 644 'GNUstep3D.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUstep3D.xpm'
+ /bin/install -c -m 644 'GNUstepGlow.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUstepGlow.xpm'
+ /bin/install -c -m 644 'GNUterm.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUterm.xpm'
+ /bin/install -c -m 644 'Terminal.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Terminal.xpm'
+ /bin/install -c -m 644 'TerminalGNUstep.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/TerminalGNUstep.xpm'
+ /bin/install -c -m 644 'TerminalLinux.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/TerminalLinux.xpm'
+ /bin/install -c -m 644 'clip.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/clip.xpm'
+ /bin/install -c -m 644 'defaultAppIcon.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/defaultAppIcon.xpm'
+ /bin/install -c -m 644 'defaultterm.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/defaultterm.xpm'
+ /bin/install -c -m 644 'draw.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/draw.xpm'
+ /bin/install -c -m 644 'linuxterm.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/linuxterm.xpm'
+ /bin/install -c -m 644 'mixer.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/mixer.xpm'
+ /bin/install -c -m 644 'notepad.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/notepad.xpm'
+ /bin/install -c -m 644 'pdf.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/pdf.xpm'
+ /bin/install -c -m 644 'ps.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/ps.xpm'
+ /bin/install -c -m 644 'real.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/real.xpm'
+ /bin/install -c -m 644 'sgiterm.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/sgiterm.xpm'
+ /bin/install -c -m 644 'sound.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/sound.xpm'
+ /bin/install -c -m 644 'staroffice2.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/staroffice2.xpm'
+ /bin/install -c -m 644 'timer.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/timer.xpm'
+ /bin/install -c -m 644 'wilber.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/wilber.xpm'
+ /bin/install -c -m 644 'write.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/write.xpm'
+ /bin/install -c -m 644 'xdvi.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/xdvi.xpm'
+ /bin/install -c -m 644 'xv.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/xv.xpm'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Icons'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Icons'
+Making install in Pixmaps
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Pixmaps'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Pixmaps'
+make[3]: Nothing to be done for `install-exec-am'.
+test -z "/usr/share/WindowMaker/Pixmaps" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Pixmaps"
+ /bin/install -c -m 644 'tile.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Pixmaps/tile.tiff'
+ /bin/install -c -m 644 'tile.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Pixmaps/tile.xpm'
+ /bin/install -c -m 644 'swtile.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Pixmaps/swtile.png'
+ /bin/install -c -m 644 'swback.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Pixmaps/swback.png'
+ /bin/install -c -m 644 'swback2.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Pixmaps/swback2.png'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Pixmaps'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Pixmaps'
+Making install in Styles
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Styles'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Styles'
+make[3]: Nothing to be done for `install-exec-am'.
+test -z "/usr/share/WindowMaker/Styles" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles"
+ /bin/install -c -m 644 'Autumn.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Autumn.style'
+ /bin/install -c -m 644 'Black.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Black.style'
+ /bin/install -c -m 644 'BlackTexture.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/BlackTexture.style'
+ /bin/install -c -m 644 'Blue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Blue.style'
+ /bin/install -c -m 644 'BlueDawn.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/BlueDawn.style'
+ /bin/install -c -m 644 'BlueishGreen.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/BlueishGreen.style'
+ /bin/install -c -m 644 'Brown.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Brown.style'
+ /bin/install -c -m 644 'Brownish.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Brownish.style'
+ /bin/install -c -m 644 'Chumbo.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Chumbo.style'
+ /bin/install -c -m 644 'Copper.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Copper.style'
+ /bin/install -c -m 644 'DarkBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/DarkBlue.style'
+ /bin/install -c -m 644 'DarkRed.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/DarkRed.style'
+ /bin/install -c -m 644 'Emerald.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Emerald.style'
+ /bin/install -c -m 644 'Fire.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Fire.style'
+ /bin/install -c -m 644 'Food.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Food.style'
+ /bin/install -c -m 644 'Golden.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Golden.style'
+ /bin/install -c -m 644 'Green.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Green.style'
+ /bin/install -c -m 644 'GreyBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/GreyBlue.style'
+ /bin/install -c -m 644 'Gtk.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Gtk.style'
+ /bin/install -c -m 644 'Interlace.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Interlace.style'
+ /bin/install -c -m 644 'IRednBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/IRednBlue.style'
+ /bin/install -c -m 644 'LightBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/LightBlue.style'
+ /bin/install -c -m 644 'NewBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/NewBlue.style'
+ /bin/install -c -m 644 'NightSky.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/NightSky.style'
+ /bin/install -c -m 644 'Pastel.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Pastel.style'
+ /bin/install -c -m 644 'Pink.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Pink.style'
+ /bin/install -c -m 644 'Pumpkin.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Pumpkin.style'
+ /bin/install -c -m 644 'Purple.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Purple.style'
+ /bin/install -c -m 644 'Purplish.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Purplish.style'
+ /bin/install -c -m 644 'Red.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Red.style'
+ /bin/install -c -m 644 'RednBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/RednBlue.style'
+ /bin/install -c -m 644 'Spring.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Spring.style'
+ /bin/install -c -m 644 'Summer.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Summer.style'
+ /bin/install -c -m 644 'Traditional.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Traditional.style'
+ /bin/install -c -m 644 'VioletBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/VioletBlue.style'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Styles'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Styles'
+Making install in Themes
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Themes'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Themes'
+make[3]: Nothing to be done for `install-exec-am'.
+test -z "/usr/share/WindowMaker/Themes" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Themes"
+ /bin/install -c -m 644 'Default.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Themes/Default.style'
+ /bin/install -c -m 644 'OpenStep.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Themes/OpenStep.style'
+ /bin/install -c -m 644 'Pastel.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Themes/Pastel.style'
+ /bin/install -c -m 644 'SteelBlueSilk.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Themes/SteelBlueSilk.style'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Themes'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Themes'
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'
+make[3]: Nothing to be done for `install-exec-am'.
+test -z "/usr/share/WindowMaker" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker"
+ /bin/install -c -m 644 'README' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/README'
+ /bin/install -c -m 644 'README.themes' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/README.themes'
+ /bin/install -c -m 644 'autostart.sh' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/autostart.sh'
+ /bin/install -c -m 644 'exitscript.sh' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/exitscript.sh'
+ /bin/install -c -m 644 'menu' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu'
+ /bin/install -c -m 644 'menu.bg' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.bg'
+ /bin/install -c -m 644 'menu.ca' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.ca'
+ /bin/install -c -m 644 'menu.cz' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.cz'
+ /bin/install -c -m 644 'menu.da' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.da'
+ /bin/install -c -m 644 'menu.de' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.de'
+ /bin/install -c -m 644 'menu.el' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.el'
+ /bin/install -c -m 644 'menu.es' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.es'
+ /bin/install -c -m 644 'menu.fi' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.fi'
+ /bin/install -c -m 644 'menu.fr' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.fr'
+ /bin/install -c -m 644 'menu.gl' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.gl'
+ /bin/install -c -m 644 'menu.he' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.he'
+ /bin/install -c -m 644 'menu.hr' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.hr'
+ /bin/install -c -m 644 'menu.hu' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.hu'
+ /bin/install -c -m 644 'menu.it' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.it'
+ /bin/install -c -m 644 'menu.ja' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.ja'
+ /bin/install -c -m 644 'menu.ko' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.ko'
+ /bin/install -c -m 644 'menu.nl' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.nl'
+ /bin/install -c -m 644 'menu.no' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.no'
+ /bin/install -c -m 644 'menu.pl' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.pl'
+ /bin/install -c -m 644 'menu.pt' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.pt'
+ /bin/install -c -m 644 'menu.ro' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.ro'
+ /bin/install -c -m 644 'menu.ru' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.ru'
+ /bin/install -c -m 644 'menu.se' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.se'
+ /bin/install -c -m 644 'menu.sk' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.sk'
+ /bin/install -c -m 644 'menu.sl' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.sl'
+ /bin/install -c -m 644 'menu.tr' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.tr'
+ /bin/install -c -m 644 'menu.zh_CN' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.zh_CN'
+ /bin/install -c -m 644 'menu.zh_TW' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.zh_TW'
+ /bin/install -c -m 644 'plmenu' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu'
+ /bin/install -c -m 644 'plmenu.bg' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.bg'
+ /bin/install -c -m 644 'plmenu.da' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.da'
+ /bin/install -c -m 644 'plmenu.de' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.de'
+ /bin/install -c -m 644 'plmenu.es' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.es'
+ /bin/install -c -m 644 'plmenu.fi' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.fi'
+ /bin/install -c -m 644 'plmenu.fr' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.fr'
+ /bin/install -c -m 644 'plmenu.hr' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.hr'
+ /bin/install -c -m 644 'plmenu.it' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.it'
+ /bin/install -c -m 644 'plmenu.ja' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.ja'
+ /bin/install -c -m 644 'plmenu.ko' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.ko'
+ /bin/install -c -m 644 'plmenu.pl' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.pl'
+ /bin/install -c -m 644 'plmenu.ro' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.ro'
+ /bin/install -c -m 644 'plmenu.sk' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.sk'
+ /bin/install -c -m 644 'plmenu.zh_CN' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.zh_CN'
+ /bin/install -c -m 644 'plmenu.zh_TW' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.zh_TW'
+ /bin/install -c -m 644 'wmmacros' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/wmmacros'
+ /bin/install -c -m 644 'xtree.dat' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/xtree.dat'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'
+Making install in wmlib
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wmlib'
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wmlib'
+/bin/sh ../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig
+test -z "/usr/lib" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib"
+test -z "/usr/include" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include"
+/bin/install -c -m 644 wmlib.pc /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig/
+ /bin/install -c -m 644 'libWMaker.a' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libWMaker.a'
+ /bin/install -c -m 644 'WMaker.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WMaker.h'
+ ranlib '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libWMaker.a'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wmlib'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wmlib'
+Making install in test
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/test'
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/test'
+make[2]: Nothing to be done for `install-exec-am'.
+make[2]: Nothing to be done for `install-data-am'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/test'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/test'
+Making install in WPrefs.app
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'
+Making install in xpm
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/xpm'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/xpm'
+make[3]: Nothing to be done for `install-exec-am'.
+if [ tiff = "xpm" -a x"" = "x" ] ; then\
+ make install-data XPM_FILES="advancetonewworkspace.xpm animations.xpm appearance.xpm clip.xpm configs.xpm cycleworkspaces.xpm dock.xpm dontlinkworkspaces.xpm ergonomic.xpm expert.xpm fonts.xpm iconprefs.xpm keyboard.xpm keyboardprefs.xpm keyshortcuts.xpm menualign1.xpm menualign2.xpm menuprefs.xpm menus.xpm moreanim.xpm mousesettings.xpm mousespeed.xpm msty1.xpm msty2.xpm msty3.xpm newstyle.xpm nonopaque.xpm oldstyle.xpm opaque.xpm paths.xpm smooth.xpm sound.xpm speed0.xpm speed0s.xpm speed1.xpm speed1s.xpm speed2.xpm speed2s.xpm speed3.xpm speed3s.xpm speed4.xpm speed4s.xpm tdel.xpm tedit.xpm textr.xpm theme.xpm timer0.xpm timer0s.xpm timer1.xpm timer1s.xpm timer2.xpm timer2s.xpm timer3.xpm timer3s.xpm timer4.xpm timer4s.xpm timer5.xpm timer5s.xpm tnew.xpm whandling.xpm windowfocus.xpm workspace.xpm workspacename.xpm xis.xpm ";\
+ fi
+test -z "/usr/share/GNUstep/Applications/WPrefs.app/xpm" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/xpm"
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/xpm'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/xpm'
+Making install in tiff
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'
+make[3]: Nothing to be done for `install-exec-am'.
+if [ tiff = "tiff" -a x"" = "x" ] ; then\
+ make install-data TIFF_FILES="advancetonewworkspace.tiff animations.tiff appearance.tiff clip.tiff configs.tiff cycleworkspaces.tiff dock.tiff dontlinkworkspaces.tiff ergonomic.tiff expert.tiff fonts.tiff iconprefs.tiff keyboard.tiff keyboardprefs.tiff keyshortcuts.tiff menualign1.tiff menualign2.tiff menuprefs.tiff menus.tiff moreanim.tiff mousesettings.tiff mousespeed.tiff msty1.tiff msty2.tiff msty3.tiff newstyle.tiff nonopaque.tiff oldstyle.tiff opaque.tiff paths.tiff smooth.tiff sound.tiff speed0.tiff speed0s.tiff speed1.tiff speed1s.tiff speed2.tiff speed2s.tiff speed3.tiff speed3s.tiff speed4.tiff speed4s.tiff tdel.tiff tedit.tiff textr.tiff theme.tiff timer0.tiff timer0s.tiff timer1.tiff timer1s.tiff timer2.tiff timer2s.tiff timer3.tiff timer3s.tiff timer4.tiff timer4s.tiff timer5.tiff timer5s.tiff tnew.tiff whandling.tiff windowfocus.tiff workspace.tiff workspacename.tiff xis.tiff ";\
+ fi
+test -z "/usr/share/GNUstep/Applications/WPrefs.app/tiff" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff"
+make[4]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'
+if [ tiff = "tiff" -a x"advancetonewworkspace.tiff animations.tiff appearance.tiff clip.tiff configs.tiff cycleworkspaces.tiff dock.tiff dontlinkworkspaces.tiff ergonomic.tiff expert.tiff fonts.tiff iconprefs.tiff keyboard.tiff keyboardprefs.tiff keyshortcuts.tiff menualign1.tiff menualign2.tiff menuprefs.tiff menus.tiff moreanim.tiff mousesettings.tiff mousespeed.tiff msty1.tiff msty2.tiff msty3.tiff newstyle.tiff nonopaque.tiff oldstyle.tiff opaque.tiff paths.tiff smooth.tiff sound.tiff speed0.tiff speed0s.tiff speed1.tiff speed1s.tiff speed2.tiff speed2s.tiff speed3.tiff speed3s.tiff speed4.tiff speed4s.tiff tdel.tiff tedit.tiff textr.tiff theme.tiff timer0.tiff timer0s.tiff timer1.tiff timer1s.tiff timer2.tiff timer2s.tiff timer3.tiff timer3s.tiff timer4.tiff timer4s.tiff timer5.tiff timer5s.tiff tnew.tiff whandling.tiff windowfocus.tiff workspace.tiff workspacename.tiff xis.tiff " = "x" ] ; then\
+ make install-data TIFF_FILES="advancetonewworkspace.tiff animations.tiff appearance.tiff clip.tiff configs.tiff cycleworkspaces.tiff dock.tiff dontlinkworkspaces.tiff ergonomic.tiff expert.tiff fonts.tiff iconprefs.tiff keyboard.tiff keyboardprefs.tiff keyshortcuts.tiff menualign1.tiff menualign2.tiff menuprefs.tiff menus.tiff moreanim.tiff mousesettings.tiff mousespeed.tiff msty1.tiff msty2.tiff msty3.tiff newstyle.tiff nonopaque.tiff oldstyle.tiff opaque.tiff paths.tiff smooth.tiff sound.tiff speed0.tiff speed0s.tiff speed1.tiff speed1s.tiff speed2.tiff speed2s.tiff speed3.tiff speed3s.tiff speed4.tiff speed4s.tiff tdel.tiff tedit.tiff textr.tiff theme.tiff timer0.tiff timer0s.tiff timer1.tiff timer1s.tiff timer2.tiff timer2s.tiff timer3.tiff timer3s.tiff timer4.tiff timer4s.tiff timer5.tiff timer5s.tiff tnew.tiff whandling.tiff windowfocus.tiff workspace.tiff workspacename.tiff xis.tiff ";\
+ fi
+test -z "/usr/share/GNUstep/Applications/WPrefs.app/tiff" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff"
+ /bin/install -c -m 644 'advancetonewworkspace.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/advancetonewworkspace.tiff'
+ /bin/install -c -m 644 'animations.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/animations.tiff'
+ /bin/install -c -m 644 'appearance.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/appearance.tiff'
+ /bin/install -c -m 644 'clip.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/clip.tiff'
+ /bin/install -c -m 644 'configs.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/configs.tiff'
+ /bin/install -c -m 644 'cycleworkspaces.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/cycleworkspaces.tiff'
+ /bin/install -c -m 644 'dock.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/dock.tiff'
+ /bin/install -c -m 644 'dontlinkworkspaces.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/dontlinkworkspaces.tiff'
+ /bin/install -c -m 644 'ergonomic.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff'
+ /bin/install -c -m 644 'expert.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/expert.tiff'
+ /bin/install -c -m 644 'fonts.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/fonts.tiff'
+ /bin/install -c -m 644 'iconprefs.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/iconprefs.tiff'
+ /bin/install -c -m 644 'keyboard.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/keyboard.tiff'
+ /bin/install -c -m 644 'keyboardprefs.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/keyboardprefs.tiff'
+ /bin/install -c -m 644 'keyshortcuts.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/keyshortcuts.tiff'
+ /bin/install -c -m 644 'menualign1.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/menualign1.tiff'
+ /bin/install -c -m 644 'menualign2.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/menualign2.tiff'
+ /bin/install -c -m 644 'menuprefs.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/menuprefs.tiff'
+ /bin/install -c -m 644 'menus.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/menus.tiff'
+ /bin/install -c -m 644 'moreanim.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/moreanim.tiff'
+ /bin/install -c -m 644 'mousesettings.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/mousesettings.tiff'
+ /bin/install -c -m 644 'mousespeed.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/mousespeed.tiff'
+ /bin/install -c -m 644 'msty1.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/msty1.tiff'
+ /bin/install -c -m 644 'msty2.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/msty2.tiff'
+ /bin/install -c -m 644 'msty3.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/msty3.tiff'
+ /bin/install -c -m 644 'newstyle.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/newstyle.tiff'
+ /bin/install -c -m 644 'nonopaque.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/nonopaque.tiff'
+ /bin/install -c -m 644 'oldstyle.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/oldstyle.tiff'
+ /bin/install -c -m 644 'opaque.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/opaque.tiff'
+ /bin/install -c -m 644 'paths.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/paths.tiff'
+ /bin/install -c -m 644 'smooth.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/smooth.tiff'
+ /bin/install -c -m 644 'sound.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/sound.tiff'
+ /bin/install -c -m 644 'speed0.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed0.tiff'
+ /bin/install -c -m 644 'speed0s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed0s.tiff'
+ /bin/install -c -m 644 'speed1.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed1.tiff'
+ /bin/install -c -m 644 'speed1s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed1s.tiff'
+ /bin/install -c -m 644 'speed2.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed2.tiff'
+ /bin/install -c -m 644 'speed2s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed2s.tiff'
+ /bin/install -c -m 644 'speed3.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed3.tiff'
+ /bin/install -c -m 644 'speed3s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed3s.tiff'
+ /bin/install -c -m 644 'speed4.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed4.tiff'
+ /bin/install -c -m 644 'speed4s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed4s.tiff'
+ /bin/install -c -m 644 'tdel.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/tdel.tiff'
+ /bin/install -c -m 644 'tedit.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/tedit.tiff'
+ /bin/install -c -m 644 'textr.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/textr.tiff'
+ /bin/install -c -m 644 'theme.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/theme.tiff'
+ /bin/install -c -m 644 'timer0.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer0.tiff'
+ /bin/install -c -m 644 'timer0s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer0s.tiff'
+ /bin/install -c -m 644 'timer1.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer1.tiff'
+ /bin/install -c -m 644 'timer1s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer1s.tiff'
+ /bin/install -c -m 644 'timer2.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer2.tiff'
+ /bin/install -c -m 644 'timer2s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer2s.tiff'
+ /bin/install -c -m 644 'timer3.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer3.tiff'
+ /bin/install -c -m 644 'timer3s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer3s.tiff'
+ /bin/install -c -m 644 'timer4.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer4.tiff'
+ /bin/install -c -m 644 'timer4s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer4s.tiff'
+ /bin/install -c -m 644 'timer5.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer5.tiff'
+ /bin/install -c -m 644 'timer5s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer5s.tiff'
+ /bin/install -c -m 644 'tnew.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/tnew.tiff'
+ /bin/install -c -m 644 'whandling.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/whandling.tiff'
+ /bin/install -c -m 644 'windowfocus.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/windowfocus.tiff'
+ /bin/install -c -m 644 'workspace.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/workspace.tiff'
+ /bin/install -c -m 644 'workspacename.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff'
+ /bin/install -c -m 644 'xis.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/xis.tiff'
+make[4]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'
+Making install in po
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/po'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/po'
+make[3]: Nothing to be done for `install-exec-am'.
+/bin/sh ../../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale
+chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale
+for n in bg.mo ca.mo cs.mo de.mo es.mo et.mo fi.mo fr.mo hr.mo hu.mo it.mo ja.mo ko.mo pt.mo ru.mo sk.mo zh_CN.mo zh_TW.mo __DuMmY ; do \
+ if test "$n" -a "$n" != "__DuMmY" ; then \
+ l=`basename $n .mo`; \
+ /bin/sh ../../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES; \
+ chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l; \
+ chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES; \
+ /bin/install -c -m 644 -m 644 $n /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES/WPrefs.mo; \
+ fi; \
+ done
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/po'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/po'
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'
+test -z "/usr/share/GNUstep/Applications/WPrefs.app" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app"
+test -z "/usr/share/GNUstep/Applications/WPrefs.app" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app"
+ /bin/sh ../libtool --mode=install /bin/install -c 'WPrefs' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/WPrefs'
+ /bin/install -c -m 644 'WPrefs.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/WPrefs.tiff'
+ /bin/install -c -m 644 'WPrefs.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/WPrefs.xpm'
+libtool: install: warning: `../wrlib/libwraster.la' has not been installed in `/usr/lib'
+libtool: install: /bin/install -c .libs/WPrefs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/WPrefs
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'
+Making install in doc
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'
+Making install in sk
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc/sk'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc/sk'
+make[3]: Nothing to be done for `install-exec-am'.
+test -z "/usr/share/man/sk/man1" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1"
+ /bin/install -c -m 644 'geticonset.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/geticonset.1x'
+ /bin/install -c -m 644 'setstyle.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/setstyle.1x'
+ /bin/install -c -m 644 'wxpaste.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/wxpaste.1x'
+ /bin/install -c -m 644 'getstyle.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/getstyle.1x'
+ /bin/install -c -m 644 'wdwrite.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/wdwrite.1x'
+ /bin/install -c -m 644 'wmsetbg.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/wmsetbg.1x'
+ /bin/install -c -m 644 'seticons.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/seticons.1x'
+ /bin/install -c -m 644 'wmaker.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/wmaker.1x'
+ /bin/install -c -m 644 'wxcopy.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/wxcopy.1x'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc/sk'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc/sk'
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'
+make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'
+make[3]: Nothing to be done for `install-exec-am'.
+test -z "/usr/share/man/man1" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1"
+ /bin/install -c -m 644 'geticonset.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/geticonset.1x'
+ /bin/install -c -m 644 'getstyle.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/getstyle.1x'
+ /bin/install -c -m 644 'seticons.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/seticons.1x'
+ /bin/install -c -m 644 'setstyle.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/setstyle.1x'
+ /bin/install -c -m 644 'wdwrite.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/wdwrite.1x'
+ /bin/install -c -m 644 'wmaker.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/wmaker.1x'
+ /bin/install -c -m 644 'wmsetbg.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/wmsetbg.1x'
+ /bin/install -c -m 644 'wxcopy.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/wxcopy.1x'
+ /bin/install -c -m 644 'wxpaste.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/wxpaste.1x'
+make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'
+Making install in contrib
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/contrib'
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/contrib'
+make[2]: Nothing to be done for `install-exec-am'.
+make[2]: Nothing to be done for `install-data-am'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/contrib'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/contrib'
+make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0'
+make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0'
+make[2]: Nothing to be done for `install-exec-am'.
+make[2]: Nothing to be done for `install-data-am'.
+make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0'
+make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0'
+==> Tidying install...
+ -> Removing info/doc files...
+ -> Compressing man pages...
+ -> Stripping debugging symbols from binaries and libraries...
+ -> Removing libtool .la files...
+==> Creating package...
+ -> Generating .PKGINFO file...
+ -> Compressing package...
+==> Finished making: windowmaker 0.92.0-7 i686 (Thu Oct 1 02:50:48 UTC 2009)
+---------updating database ----------
+
+DOCROOT=/data/pkg_repo/i686/extra-testing
+
+Removing old packages from i686/extra-testing:
+removed `windowmaker-0.92.0-6-i686.pkg.tar.gz'
+
+Updating i686/extra-testing with windowmaker-0.92.0-7-i686.pkg.tar.gz
+==> Extracting database to a temporary location...
+==> Adding package '/data/pkg_repo/i686/extra-testing/windowmaker-0.92.0-7-i686.pkg.tar.gz'
+ -> Removing existing package 'windowmaker-0.92.0-6'...
+ -> Creating 'desc' db entry...
+ -> Computing md5 checksums...
+ -> Creating 'depends' db entry...
+==> Creating updated database file '/data/pkg_repo/i686/extra-testing/extra-testing.db.tar.gz'
+/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker
+----------creating source package---------
+==> Making package: windowmaker 0.92.0-7 i686 (Thu Oct 1 02:50:49 UTC 2009)
+==> WARNING: Running makepkg as root...
+==> Creating source package...
+ -> Adding PKGBUILD...
+ -> Adding windowmaker-gcc4.patch.tar.bz2...
+ -> Compressing source package...
+==> Source package created: windowmaker (Thu Oct 1 02:50:49 UTC 2009)
+Removing old src pkg
+Creating src_pkg directory
+removed `/data/pkg_repo/src_packages/extra-testing/windowmaker-0.92.0-6.src.tar.gz'
+copying src_pkg to /data/pkg_repo/src_packages/extra-testing
+0
\ No newline at end of file |