version 0.95.5.r231.gd30b942-1

4 files changed, 92 insertions, 30 deletions

diff --git a/.AURINFO b/.AURINFO
new file mode 100644
index 000000000000..92d45b3b467e
--- /dev/null
+++ b/.AURINFO
@@ -0,0 +1,27 @@
+pkgbase = windowmaker-git
+	pkgdesc = An X11 window manager with a NEXTSTEP look and feel
+	pkgver = 0.95.5.r231.gd30b942
+	pkgrel = 1
+	url = http://www.windowmaker.org/
+	arch = i686
+	arch = x86_64
+	license = GPL
+	license = custom
+	makedepends = git
+	depends = libxinerama
+	depends = libxrandr
+	depends = libxmu
+	depends = libbsd
+	depends = libxpm
+	depends = libxft
+	depends = libtiff
+	depends = giflib
+	depends = libexif
+	provides = windowmaker
+	conflicts = windowmaker
+	source = windowmaker-git::git://repo.or.cz/wmaker-crm.git
+	source = wmaker.desktop
+	source = giflib-5.1.0.patch
+
+pkgname = windowmaker-git
+
diff --git a/.SRCINFO b/.SRCINFO
index f1bbaea01087..792988e85fd9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = windowmaker-git
 	pkgdesc = An X11 window manager with a NEXTSTEP look and feel
-	pkgver = 20130821
+	pkgver = 0.95.5.r231.gd30b942
 	pkgrel = 1
-	url = http://www.windowmaker.org
+	url = http://www.windowmaker.org/
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -10,21 +10,21 @@ pkgbase = windowmaker-git
 	makedepends = git
 	depends = libxinerama
 	depends = libxrandr
-	depends = libpng
+	depends = libxmu
+	depends = libbsd
 	depends = libxpm
 	depends = libxft
-	depends = libtiff>=3.9.1
+	depends = libtiff
 	depends = giflib
-	depends = libxmu
+	depends = libexif
 	provides = windowmaker
 	conflicts = windowmaker
-	options = !libtool
-	source = git://repo.or.cz/wmaker-crm.git
+	source = windowmaker-git::git://repo.or.cz/wmaker-crm.git
 	source = wmaker.desktop
-	source = wm-giflib.patch
+	source = giflib-5.1.0.patch
 	md5sums = SKIP
 	md5sums = 2fba97bebfd691836b92b8f0db79ff13
-	md5sums = 05d8e98fb579f2fa5a097b629374e6b8
+	md5sums = 59ec642cd64a1b5222ba672a19afe489
 
 pkgname = windowmaker-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 04f9e3a3167d..7873187a1bb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,61 @@
+# $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-git
-pkgver=20130821
+pkgver=0.95.5.r231.gd30b942
 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' 'libpng' 'libxpm' 'libxft' 'libtiff>=3.9.1' 'giflib' 'libxmu')
-makedepends=('git')
-options=('!libtool')
 provides=('windowmaker')
 conflicts=('windowmaker')
-source=("git://repo.or.cz/wmaker-crm.git"
+makedepends=('git')
+depends=('libxinerama' 'libxrandr' 'libxmu' 'libbsd' 'libxpm' 'libxft' 'libtiff' 'giflib' 'libexif')
+source=("$pkgname::git://repo.or.cz/wmaker-crm.git"
 	wmaker.desktop
-	wm-giflib.patch)
+	giflib-5.1.0.patch)
 md5sums=('SKIP'
          '2fba97bebfd691836b92b8f0db79ff13'
-         '05d8e98fb579f2fa5a097b629374e6b8')
-
-_gitname="wmaker-crm"
+         '59ec642cd64a1b5222ba672a19afe489')
 
 pkgver() {
-  date -uI | sed s',-,,g'
+  cd $pkgname
+  git describe --long | sed -r 's/wmaker.//;s/([^-]*-g)/r\1/;s/-/./g'
+}
+
+prepare() {
+  cd $pkgname
+  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() {
-  cd "$srcdir/$_gitname"
-  patch -Np0 -i "$srcdir/wm-giflib.patch"
-  [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-  ./autogen.sh
+  cd $pkgname
+  [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'|tr '\n' ' '`"
   ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \
     --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \
     --enable-usermenu --enable-modelock --enable-xrandr
-  make
+  make V=0
 }
 
 package() {
-  cd "$srcdir/$_gitname"
+  cd $pkgname
 
   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"
-
-  rm -rf $srcdir/$_gitname-build
+  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;
+ }