diff options
| -rw-r--r-- | .AURINFO | 14 | ||||
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | PKGBUILD | 38 | ||||
| -rw-r--r-- | giflib-5.1.0.patch | 21 |
4 files changed, 59 insertions, 29 deletions
@@ -1,8 +1,8 @@ pkgbase = windowmaker-crm-git pkgdesc = An X11 window manager with a NEXTSTEP look and feel - pkgver = 0.95.5.r440.gf33c89e + pkgver = 0.95.5.r473.gb431dcc pkgrel = 1 - url = http://www.windowmaker.org + url = http://www.windowmaker.org/ arch = i686 arch = x86_64 license = GPL @@ -10,20 +10,18 @@ pkgbase = windowmaker-crm-git makedepends = git depends = libxinerama depends = libxrandr - depends = libbsd + depends = libxmu depends = libxpm depends = libxft - depends = libtiff>=3.9.1 + depends = libtiff depends = giflib - depends = libxmu - depends = imagemagick - depends = libwebp + depends = libexif provides = windowmaker conflicts = windowmaker conflicts = windowmaker-git source = windowmaker-crm-git::git://repo.or.cz/wmaker-crm.git#branch=next source = wmaker.desktop - options = !libtool + source = giflib-5.1.0.patch pkgname = windowmaker-crm-git @@ -1,8 +1,8 @@ pkgbase = windowmaker-crm-git pkgdesc = An X11 window manager with a NEXTSTEP look and feel - pkgver = 0.95.5.r440.gf33c89e + pkgver = 0.95.5.r473.gb431dcc pkgrel = 1 - url = http://www.windowmaker.org + url = http://www.windowmaker.org/ arch = i686 arch = x86_64 license = GPL @@ -10,22 +10,21 @@ pkgbase = windowmaker-crm-git makedepends = git depends = libxinerama depends = libxrandr - depends = libbsd + depends = libxmu depends = libxpm depends = libxft - depends = libtiff>=3.9.1 + depends = libtiff depends = giflib - depends = libxmu - depends = imagemagick - depends = libwebp + depends = libexif provides = windowmaker conflicts = windowmaker conflicts = windowmaker-git - options = !libtool source = windowmaker-crm-git::git://repo.or.cz/wmaker-crm.git#branch=next source = wmaker.desktop + source = giflib-5.1.0.patch md5sums = SKIP md5sums = 2fba97bebfd691836b92b8f0db79ff13 + md5sums = 59ec642cd64a1b5222ba672a19afe489 pkgname = windowmaker-crm-git @@ -1,22 +1,25 @@ +# $Id: PKGBUILD 215171 2014-06-14 19:17:25Z andyrtr $ # Maintainer: Brian Bidulock <bidulock@openss7.org> # Contributor: Daniel Isenmann <daniel@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=windowmaker-crm-git -pkgver=0.95.5.r440.gf33c89e +pkgver=0.95.5.r473.gb431dcc pkgrel=1 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" -arch=(i686 x86_64) -url="http://www.windowmaker.org" +arch=('i686' 'x86_64') +url="http://www.windowmaker.org/" license=('GPL' 'custom') -depends=('libxinerama' 'libxrandr' 'libbsd' 'libxpm' 'libxft' 'libtiff>=3.9.1' 'giflib' 'libxmu' 'imagemagick' 'libwebp') -makedepends=('git') -options=('!libtool') provides=('windowmaker') conflicts=('windowmaker' 'windowmaker-git') +makedepends=('git') +depends=('libxinerama' 'libxrandr' 'libxmu' 'libxpm' 'libxft' 'libtiff' 'giflib' 'libexif') source=("$pkgname::git://repo.or.cz/wmaker-crm.git#branch=next" - "wmaker.desktop") + wmaker.desktop + giflib-5.1.0.patch) md5sums=('SKIP' - '2fba97bebfd691836b92b8f0db79ff13') + '2fba97bebfd691836b92b8f0db79ff13' + '59ec642cd64a1b5222ba672a19afe489') pkgver() { cd $pkgname @@ -25,10 +28,18 @@ pkgver() { prepare() { cd $pkgname - sed -e 's/^RLoadWEBP.*/RLoadWEBP(const char *file_name, int index)/' \ - -i wrlib/load_webp.c - [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'|tr '\n' ' '`" - ./autogen.sh + patch -Np2 -b -z .orig -i ../giflib-5.1.0.patch + + autoreconf -fi + + # fix some paths FS#3080 - ckeck also Gentoo ebuild + for file in WindowMaker/*menu* util/wmgenmenu.c; do + if [[ -r $file ]] ; then + sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:/usr/lib/GNUstep/Applications/WPrefs.app:g;" "$file" + sed -i -e "s:/usr/local/share/WindowMaker:/usr/share/WindowMaker:g;" "$file" + sed -i -e "s:/opt/share/WindowMaker:/usr/share/WindowMaker:g;" "$file" + fi; + done; } build() { @@ -45,5 +56,6 @@ package() { 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" + install -D -m644 ../wmaker.desktop "$pkgdir/usr/share/xsessions/wmaker.desktop" } + diff --git a/giflib-5.1.0.patch b/giflib-5.1.0.patch new file mode 100644 index 000000000000..06505689af08 --- /dev/null +++ b/giflib-5.1.0.patch @@ -0,0 +1,21 @@ +diff -up src/windowmaker-crm-git/wrlib/load_gif.c.orig src/windowmaker-crm-git/wrlib/load_gif.c +--- src/windowmaker-crm-git/wrlib/load_gif.c.orig 2014-06-18 04:27:12.000000000 -0600 ++++ src/windowmaker-crm-git/wrlib/load_gif.c 2014-06-18 04:27:37.000000000 -0600 +@@ -81,7 +81,7 @@ RImage *RLoadGIF(const char *file, int i + } + + if (gif->SWidth < 1 || gif->SHeight < 1) { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + RErrorCode = RERR_BADIMAGEFILE; + return NULL; + } +@@ -216,7 +216,7 @@ RImage *RLoadGIF(const char *file, int i + free(buffer); + + if (gif) +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + + return image; + } |