Date: Monday, January 9, 2012 @ 13:41:18 Author: daniel Revision: 146321
archrelease: copy trunk to extra-i686, extra-x86_64 Added: windowmaker/repos/extra-i686/PKGBUILD (from rev 146320, windowmaker/trunk/PKGBUILD) windowmaker/repos/extra-i686/libpng-1.4.patch (from rev 146320, windowmaker/trunk/libpng-1.4.patch) windowmaker/repos/extra-i686/windowmaker-gcc4.patch.tar.bz2 (from rev 146320, windowmaker/trunk/windowmaker-gcc4.patch.tar.bz2) windowmaker/repos/extra-i686/wmaker.desktop (from rev 146320, windowmaker/trunk/wmaker.desktop) windowmaker/repos/extra-x86_64/PKGBUILD (from rev 146320, windowmaker/trunk/PKGBUILD) windowmaker/repos/extra-x86_64/libpng-1.4.patch (from rev 146320, windowmaker/trunk/libpng-1.4.patch) windowmaker/repos/extra-x86_64/windowmaker-gcc4.patch.tar.bz2 (from rev 146320, windowmaker/trunk/windowmaker-gcc4.patch.tar.bz2) windowmaker/repos/extra-x86_64/wmaker.desktop (from rev 146320, windowmaker/trunk/wmaker.desktop) Deleted: windowmaker/repos/extra-i686/PKGBUILD windowmaker/repos/extra-i686/libpng-1.4.patch windowmaker/repos/extra-i686/windowmaker-gcc4.patch.tar.bz2 windowmaker/repos/extra-x86_64/PKGBUILD windowmaker/repos/extra-x86_64/libpng-1.4.patch windowmaker/repos/extra-x86_64/windowmaker-gcc4.patch.tar.bz2 -------------------------------+ extra-i686/PKGBUILD | 69 +++++++++++++++++++--------------------- extra-i686/libpng-1.4.patch | 24 ++++++------- extra-i686/wmaker.desktop | 5 ++ extra-x86_64/PKGBUILD | 69 +++++++++++++++++++--------------------- extra-x86_64/libpng-1.4.patch | 24 ++++++------- extra-x86_64/wmaker.desktop | 5 ++ 6 files changed, 102 insertions(+), 94 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-01-09 18:40:45 UTC (rev 146320) +++ extra-i686/PKGBUILD 2012-01-09 18:41:18 UTC (rev 146321) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Daniel Isenmann <dan...@archlinux.org> -# Contributor: Judd Vinet <jvi...@zeroflux.org> -pkgname=windowmaker -pkgver=0.92.0 -pkgrel=8 -pkgdesc="An X11 window manager with a NEXTSTEP look and feel" -arch=(i686 x86_64) -url="http://www.windowmaker.info/" -license=('GPL' 'custom') -depends=('libxinerama' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') -options=('!libtool') -source=(http://windowmaker.info/pub/source/release/WindowMaker-$pkgver.tar.bz2 windowmaker-gcc4.patch.tar.bz2 libpng-1.4.patch) -md5sums=('aaac5421b686ed2d3e6ab65229c98097' 'd9fb6a9c255f5c03d0e0c83dc3cd2320'\ - '409173062955f4a527d88cd7a007efa7') -sha1sums=('4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c' '764aa4883b289994177fd3735541d050fda5bcdb'\ - '027e1d06360fa38fe95afab6e73b7e9f144da687') - -build() { - cd $srcdir/WindowMaker-$pkgver - patch -p1 < ../libpng-1.4.patch || return 1 - patch -Np1 -i ../windowmaker-gcc4.patch || return 1 - libtoolize --force --copy || return 1 - aclocal || return 1 - autoconf || return 1 - automake || return 1 - [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-gnustepdir=/usr/lib/GNUstep --with-nlsdir=/usr/share/locale \ - --enable-xinerama || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 - install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL -} - Copied: windowmaker/repos/extra-i686/PKGBUILD (from rev 146320, windowmaker/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-01-09 18:41:18 UTC (rev 146321) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Daniel Isenmann <dan...@archlinux.org> +# Contributor: Judd Vinet <jvi...@zeroflux.org> +pkgname=windowmaker +pkgver=0.95.0 +pkgrel=1 +pkgdesc="An X11 window manager with a NEXTSTEP look and feel" +arch=(i686 x86_64) +url="http://www.windowmaker.org/" +license=('GPL' 'custom') +depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') +options=('!libtool') +source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop) +md5sums=('2d89834b4019e0a08641709ea7235db2' + '2fba97bebfd691836b92b8f0db79ff13') + +build() { + cd $srcdir/windowmaker-$pkgver + [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ + --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ + --enable-usermenu --enable-modelock --enable-xrandr + make +} + +package() { + cd $srcdir/windowmaker-$pkgver + + make DESTDIR=$pkgdir install + install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL + install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop +} + Deleted: extra-i686/libpng-1.4.patch =================================================================== --- extra-i686/libpng-1.4.patch 2012-01-09 18:40:45 UTC (rev 146320) +++ extra-i686/libpng-1.4.patch 2012-01-09 18:41:18 UTC (rev 146321) @@ -1,12 +0,0 @@ -diff -Naur WindowMaker-0.92.0-orig/wrlib/load.c WindowMaker-0.92.0/wrlib/load.c ---- WindowMaker-0.92.0-orig/wrlib/load.c 2010-01-21 16:10:39.000000000 -0500 -+++ WindowMaker-0.92.0/wrlib/load.c 2010-01-21 16:13:15.000000000 -0500 -@@ -348,7 +348,7 @@ - - #ifdef USE_PNG - /* check for PNG */ -- if (png_check_sig(buffer, 8)) -+ if (!png_sig_cmp(buffer, 0, 8)) - return IM_PNG; - #endif - Copied: windowmaker/repos/extra-i686/libpng-1.4.patch (from rev 146320, windowmaker/trunk/libpng-1.4.patch) =================================================================== --- extra-i686/libpng-1.4.patch (rev 0) +++ extra-i686/libpng-1.4.patch 2012-01-09 18:41:18 UTC (rev 146321) @@ -0,0 +1,12 @@ +diff -Naur WindowMaker-0.92.0-orig/wrlib/load.c WindowMaker-0.92.0/wrlib/load.c +--- WindowMaker-0.92.0-orig/wrlib/load.c 2010-01-21 16:10:39.000000000 -0500 ++++ WindowMaker-0.92.0/wrlib/load.c 2010-01-21 16:13:15.000000000 -0500 +@@ -348,7 +348,7 @@ + + #ifdef USE_PNG + /* check for PNG */ +- if (png_check_sig(buffer, 8)) ++ if (!png_sig_cmp(buffer, 0, 8)) + return IM_PNG; + #endif + Deleted: extra-i686/windowmaker-gcc4.patch.tar.bz2 =================================================================== (Binary files differ) Copied: windowmaker/repos/extra-i686/windowmaker-gcc4.patch.tar.bz2 (from rev 146320, windowmaker/trunk/windowmaker-gcc4.patch.tar.bz2) =================================================================== (Binary files differ) Copied: windowmaker/repos/extra-i686/wmaker.desktop (from rev 146320, windowmaker/trunk/wmaker.desktop) =================================================================== --- extra-i686/wmaker.desktop (rev 0) +++ extra-i686/wmaker.desktop 2012-01-09 18:41:18 UTC (rev 146321) @@ -0,0 +1,5 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=windowmaker +Exec=/usr/bin/wmaker +Type=Application Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-01-09 18:40:45 UTC (rev 146320) +++ extra-x86_64/PKGBUILD 2012-01-09 18:41:18 UTC (rev 146321) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Daniel Isenmann <dan...@archlinux.org> -# Contributor: Judd Vinet <jvi...@zeroflux.org> -pkgname=windowmaker -pkgver=0.92.0 -pkgrel=8 -pkgdesc="An X11 window manager with a NEXTSTEP look and feel" -arch=(i686 x86_64) -url="http://www.windowmaker.info/" -license=('GPL' 'custom') -depends=('libxinerama' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') -options=('!libtool') -source=(http://windowmaker.info/pub/source/release/WindowMaker-$pkgver.tar.bz2 windowmaker-gcc4.patch.tar.bz2 libpng-1.4.patch) -md5sums=('aaac5421b686ed2d3e6ab65229c98097' 'd9fb6a9c255f5c03d0e0c83dc3cd2320'\ - '409173062955f4a527d88cd7a007efa7') -sha1sums=('4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c' '764aa4883b289994177fd3735541d050fda5bcdb'\ - '027e1d06360fa38fe95afab6e73b7e9f144da687') - -build() { - cd $srcdir/WindowMaker-$pkgver - patch -p1 < ../libpng-1.4.patch || return 1 - patch -Np1 -i ../windowmaker-gcc4.patch || return 1 - libtoolize --force --copy || return 1 - aclocal || return 1 - autoconf || return 1 - automake || return 1 - [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-gnustepdir=/usr/lib/GNUstep --with-nlsdir=/usr/share/locale \ - --enable-xinerama || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 - install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL -} - Copied: windowmaker/repos/extra-x86_64/PKGBUILD (from rev 146320, windowmaker/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-01-09 18:41:18 UTC (rev 146321) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Daniel Isenmann <dan...@archlinux.org> +# Contributor: Judd Vinet <jvi...@zeroflux.org> +pkgname=windowmaker +pkgver=0.95.0 +pkgrel=1 +pkgdesc="An X11 window manager with a NEXTSTEP look and feel" +arch=(i686 x86_64) +url="http://www.windowmaker.org/" +license=('GPL' 'custom') +depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') +options=('!libtool') +source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop) +md5sums=('2d89834b4019e0a08641709ea7235db2' + '2fba97bebfd691836b92b8f0db79ff13') + +build() { + cd $srcdir/windowmaker-$pkgver + [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ + --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ + --enable-usermenu --enable-modelock --enable-xrandr + make +} + +package() { + cd $srcdir/windowmaker-$pkgver + + make DESTDIR=$pkgdir install + install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL + install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop +} + Deleted: extra-x86_64/libpng-1.4.patch =================================================================== --- extra-x86_64/libpng-1.4.patch 2012-01-09 18:40:45 UTC (rev 146320) +++ extra-x86_64/libpng-1.4.patch 2012-01-09 18:41:18 UTC (rev 146321) @@ -1,12 +0,0 @@ -diff -Naur WindowMaker-0.92.0-orig/wrlib/load.c WindowMaker-0.92.0/wrlib/load.c ---- WindowMaker-0.92.0-orig/wrlib/load.c 2010-01-21 16:10:39.000000000 -0500 -+++ WindowMaker-0.92.0/wrlib/load.c 2010-01-21 16:13:15.000000000 -0500 -@@ -348,7 +348,7 @@ - - #ifdef USE_PNG - /* check for PNG */ -- if (png_check_sig(buffer, 8)) -+ if (!png_sig_cmp(buffer, 0, 8)) - return IM_PNG; - #endif - Copied: windowmaker/repos/extra-x86_64/libpng-1.4.patch (from rev 146320, windowmaker/trunk/libpng-1.4.patch) =================================================================== --- extra-x86_64/libpng-1.4.patch (rev 0) +++ extra-x86_64/libpng-1.4.patch 2012-01-09 18:41:18 UTC (rev 146321) @@ -0,0 +1,12 @@ +diff -Naur WindowMaker-0.92.0-orig/wrlib/load.c WindowMaker-0.92.0/wrlib/load.c +--- WindowMaker-0.92.0-orig/wrlib/load.c 2010-01-21 16:10:39.000000000 -0500 ++++ WindowMaker-0.92.0/wrlib/load.c 2010-01-21 16:13:15.000000000 -0500 +@@ -348,7 +348,7 @@ + + #ifdef USE_PNG + /* check for PNG */ +- if (png_check_sig(buffer, 8)) ++ if (!png_sig_cmp(buffer, 0, 8)) + return IM_PNG; + #endif + Deleted: extra-x86_64/windowmaker-gcc4.patch.tar.bz2 =================================================================== (Binary files differ) Copied: windowmaker/repos/extra-x86_64/windowmaker-gcc4.patch.tar.bz2 (from rev 146320, windowmaker/trunk/windowmaker-gcc4.patch.tar.bz2) =================================================================== (Binary files differ) Copied: windowmaker/repos/extra-x86_64/wmaker.desktop (from rev 146320, windowmaker/trunk/wmaker.desktop) =================================================================== --- extra-x86_64/wmaker.desktop (rev 0) +++ extra-x86_64/wmaker.desktop 2012-01-09 18:41:18 UTC (rev 146321) @@ -0,0 +1,5 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=windowmaker +Exec=/usr/bin/wmaker +Type=Application