[arch-commits] Commit in xfwm4/trunk (2 files)

[Evangelos Foutras]

    Date: Sunday, March 15, 2015 @ 21:29:00
  Author: foutrelis
Revision: 233885

upgpkg: xfwm4 4.12.2-1

New upstream release.

Modified:
  xfwm4/trunk/PKGBUILD
Deleted:
  xfwm4/trunk/0001-Fix-a-mishmash-between-width-and-height.patch

----------------------------------------------------+
 0001-Fix-a-mishmash-between-width-and-height.patch |   37 -------------------
 PKGBUILD                                           |   17 ++------
 2 files changed, 4 insertions(+), 50 deletions(-)

Deleted: 0001-Fix-a-mishmash-between-width-and-height.patch
===================================================================
--- 0001-Fix-a-mishmash-between-width-and-height.patch	2015-03-15 19:51:13 UTC (rev 233884)
+++ 0001-Fix-a-mishmash-between-width-and-height.patch	2015-03-15 20:29:00 UTC (rev 233885)
@@ -1,37 +0,0 @@
-From adcf17fe8a136c89196f952185056c12c3829a01 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <fourdan at 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 at 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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-15 19:51:13 UTC (rev 233884)
+++ PKGBUILD	2015-03-15 20:29:00 UTC (rev 233885)
@@ -3,8 +3,8 @@
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfwm4
-pkgver=4.12.1
-pkgrel=2
+pkgver=4.12.2
+pkgrel=1
 pkgdesc="Xfce window manager"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -13,18 +13,9 @@
 depends=('libxfce4ui' 'libwnck' 'libdrm' 'hicolor-icon-theme')
 makedepends=('intltool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-        0001-Fix-a-mishmash-between-width-and-height.patch)
-sha256sums=('4e9b94517cc1550c4ff4ff8ac252c95ef0d3345b1f5f04dbf2ca9e3c708de1bb'
-            '79c7d1b494f56f9a2d5da1ceb9cdad8014f6d45547b972326fe2d2d74b6970ae')
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('5bb5f72b41060d10bd3823f8b69abcd462bbd8853fdf9c82041450ae68e7d75a')
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=11700
-  patch -Np1 -i ../0001-Fix-a-mishmash-between-width-and-height.patch
-}
-
 build() {
   cd "$srcdir/$pkgname-$pkgver"