Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre/abslibre

1 files changed, 15 insertions, 6 deletions

diff --git a/pcr/wmii-hg/PKGBUILD b/pcr/wmii-hg/PKGBUILD
index 0bbd17b50..52f636636 100644
--- a/pcr/wmii-hg/PKGBUILD
+++ b/pcr/wmii-hg/PKGBUILD
@@ -12,13 +12,15 @@ license=("MIT")
 provides=("wmii")
 conflicts=("wmii")
 
-pkgrel=1
+pkgrel=2
 arch=("i686" "x86_64")
 depends=('libxft' 'libxrandr' 'libxinerama')
 makedepends=('txt2tags' 'libixp') # libixp is statically linked
 
-source=("https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('8228a299cb83258ab3988b6131d2cbb8')
+source=("https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+       fix-for-weird-xinerama-settings.patch)
+md5sums=('8228a299cb83258ab3988b6131d2cbb8'
+         '39a1381c701e67a71deb434b3cb74c31')
 
 mkdepends=('mercurial')
 mksource=("$pkgname-$pkgver::hg+https://code.google.com/p/wmii/#revision=${pkgver}")
@@ -28,16 +30,23 @@ mksource() {
 	rm "${srcdir}/${pkgname}-${pkgver}/lib/libutf/libutf.a"
 }
 
-build() {
+prepare() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	export LDFLAGS+=',--no-as-needed'
+	patch -p1 -N -i ../fix-for-weird-xinerama-settings.patch
+	sed -i 's# !=#!=#' mk/hdr.mk
+	
 	sed -i 's|PREFIX = /usr/local|PREFIX = /usr|' config.mk
 	sed -i 's|ETC = $(PREFIX)/etc|ETC = /etc|' config.mk
 	sed -i 's|PYTHON = .*|PYTHON = python2|' config.mk
+	sed -i '/^CFLAGS += -O2$/d' config.mk
 	echo 'CFLAGS += -O2' >> config.mk
-	sed -i 's# !=#!=#' mk/hdr.mk
+}
 
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	export LDFLAGS+=',--no-as-needed'
 	export MAKEFLAGS="-j1"
 	make
 }