uppkg

2 files changed, 20 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 352d344717ee..9e9c25341c29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = windowmaker-git
 	pkgdesc = An X11 window manager with a NEXTSTEP look and feel
-	pkgver = 0.95.6.r304.gb295a20
+	pkgver = 0.95.8.r0.g5d643a67
 	pkgrel = 1
 	url = http://www.windowmaker.org/
 	arch = i686
@@ -21,8 +21,10 @@ pkgbase = windowmaker-git
 	conflicts = windowmaker
 	source = windowmaker-git::git://repo.or.cz/wmaker-crm.git
 	source = wmaker.desktop
-	md5sums = SKIP
-	md5sums = 2fba97bebfd691836b92b8f0db79ff13
+	source = https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch
+	sha256sums = SKIP
+	sha256sums = 126da08ac9cffc4354bb4f246ec5ed5abd3cd29ed665d05d190c5bf842c84bef
+	sha256sums = e89e8c7638f38296f1fc31d892672122a73ce89ce40c192bb404d852cca06692
 
 pkgname = windowmaker-git
 
diff --git a/PKGBUILD b/PKGBUILD
index f8a37a3e8e6a..f393bf0afa90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 215171 2014-06-14 19:17:25Z andyrtr $
+# vim: set et sw=2:
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 # Contributor: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=windowmaker-git
-pkgver=0.95.6.r304.gb295a20
+pkgver=0.95.8.r0.g5d643a67
 pkgrel=1
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
 arch=('i686' 'x86_64')
@@ -15,9 +15,8 @@ conflicts=('windowmaker')
 makedepends=('git')
 depends=('imagemagick' 'libxinerama' 'libxrandr' 'libxmu' 'libbsd' 'libxpm' 'libxft' 'libwebp' 'libexif')
 source=("$pkgname::git://repo.or.cz/wmaker-crm.git"
-	wmaker.desktop)
-md5sums=('SKIP'
-         '2fba97bebfd691836b92b8f0db79ff13')
+        'wmaker.desktop'
+        'https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch')
 
 pkgver() {
   cd $pkgname
@@ -26,25 +25,26 @@ pkgver() {
 
 prepare() {
   cd $pkgname
+  patch -Np1 -b -z .orig < ../windowmaker-0.95.8-imagemagick7.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;
+        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 $pkgname
-  [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'|tr '\n' ' '`"
+  export LINGUAS="be bg bs ca cs da de el es et fi fr fy gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr uk zh_CN zh_TW"
   ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \
     --localedir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \
-    --enable-usermenu --enable-modelock
+    --enable-usermenu --enable-modelock --enable-randr
   make V=0
 }
 
@@ -56,3 +56,6 @@ package() {
   install -D -m644 ../wmaker.desktop "$pkgdir/usr/share/xsessions/wmaker.desktop"
 }
 
+sha256sums=('SKIP'
+            '126da08ac9cffc4354bb4f246ec5ed5abd3cd29ed665d05d190c5bf842c84bef'
+            'e89e8c7638f38296f1fc31d892672122a73ce89ce40c192bb404d852cca06692')