xfwm4-better-smartplacement: upgrade to 4.12.2

Signed-off-by: Olivier Brunel <jjk@jjacky.com>

3 files changed, 5 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db32f383f1e5..b7258bc43d50 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xfwm4-better-smartplacement
 	pkgdesc = Xfce window manager w/ better smart placement of new windows
-	pkgver = 4.12.1
+	pkgver = 4.12.2
 	pkgrel = 1
 	url = http://www.xfce.org/
 	install = xfwm4-better-smartplacement.install
@@ -16,13 +16,11 @@ pkgbase = xfwm4-better-smartplacement
 	provides = xfwm4
 	conflicts = xfwm4
 	options = !libtool
-	source = http://archive.xfce.org/src/xfce/xfwm4/4.12/xfwm4-4.12.1.tar.bz2
-	source = 0001-Fix-a-mishmash-between-width-and-height.patch
+	source = http://archive.xfce.org/src/xfce/xfwm4/4.12/xfwm4-4.12.2.tar.bz2
 	source = 0001-Rewrote-smartPlacement.patch
 	source = 0002-smartPlacement-w-snap_to_border-we-snap-to-bottom-ri.patch
 	source = 0003-Fix-new-window-always-top-left-when-screen-not-full.patch
-	sha1sums = e7470b69bba29c9c0e0bcd1471e80b73c6ccfd91
-	sha1sums = 2fc881cf4fbdbd7c6f55eb5d4900dc133516ee14
+	sha1sums = fb9e9bd6f8a5e1838933355565b92cd40941b90b
 	sha1sums = ea46b6b9561bdd2e4f5225b4aeed811b2ed5d890
 	sha1sums = e179b132c8da76a6b75e51bb7364e19ba9ecf7de
 	sha1sums = 9356911cd08c9703f356c0b7993a6392302dbcad
diff --git a/0001-Fix-a-mishmash-between-width-and-height.patch b/0001-Fix-a-mishmash-between-width-and-height.patch
deleted file mode 100644
index 1cb314cab421..000000000000
--- a/0001-Fix-a-mishmash-between-width-and-height.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From adcf17fe8a136c89196f952185056c12c3829a01 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <fourdan@xfce.org>
-Date: Sun, 15 Mar 2015 11:24:15 +0100
-Subject: [PATCH] Fix a mishmash between width and height
-
-Bug: 11700
-
-Duh...
-
-Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
----
- src/client.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/client.c b/src/client.c
-index 7fa9e36..38ecc6f 100644
---- a/src/client.c
-+++ b/src/client.c
-@@ -543,12 +543,12 @@ clientAdjustCoordGravity (Client *c, int gravity, XWindowChanges *wc, unsigned l
- 
-     if (*mask & CWWidth)
-     {
--        wc->width = clientCheckHeight (c, wc->width, TRUE);
-+        wc->width = clientCheckWidth (c, wc->width, TRUE);
-     }
- 
--    if (*mask & CWWidth)
-+    if (*mask & CWHeight)
-     {
--        wc->height = clientCheckWidth (c, wc->height, TRUE);
-+        wc->height = clientCheckHeight (c, wc->height, TRUE);
-     }
- 
-     switch (gravity)
--- 
-2.3.3
-
diff --git a/PKGBUILD b/PKGBUILD
index d34de054e491..23290313e3ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 _pkgname=xfwm4
 pkgname=$_pkgname-better-smartplacement
-pkgver=4.12.1
+pkgver=4.12.2
 pkgrel=1
 pkgdesc="Xfce window manager w/ better smart placement of new windows"
 arch=('i686' 'x86_64')
@@ -18,19 +18,16 @@ provides=($_pkgname)
 conflicts=($_pkgname)
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/xfce/${_pkgname}/4.12/${_pkgname}-${pkgver}.tar.bz2
-        0001-Fix-a-mishmash-between-width-and-height.patch
         0001-Rewrote-smartPlacement.patch
         0002-smartPlacement-w-snap_to_border-we-snap-to-bottom-ri.patch
         0003-Fix-new-window-always-top-left-when-screen-not-full.patch)
-sha1sums=('e7470b69bba29c9c0e0bcd1471e80b73c6ccfd91'
-          '2fc881cf4fbdbd7c6f55eb5d4900dc133516ee14'
+sha1sums=('fb9e9bd6f8a5e1838933355565b92cd40941b90b'
           'ea46b6b9561bdd2e4f5225b4aeed811b2ed5d890'
           'e179b132c8da76a6b75e51bb7364e19ba9ecf7de'
           '9356911cd08c9703f356c0b7993a6392302dbcad')
 
 prepare() {
   cd ${srcdir}/${_pkgname}-${pkgver}
-  patch -p1 -i ../0001-Fix-a-mishmash-between-width-and-height.patch
   patch -p1 -i ../0001-Rewrote-smartPlacement.patch
   patch -p1 -i ../0002-smartPlacement-w-snap_to_border-we-snap-to-bottom-ri.patch
   patch -p1 -i ../0003-Fix-new-window-always-top-left-when-screen-not-full.patch