summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Brunel2015-03-16 22:32:59 +0100
committerOlivier Brunel2015-06-08 19:25:25 +0200
commit75566fd533aa60360aa6c58b82f1db28021931d1 (patch)
tree4b7c0d165b783e4b6a437dde6655aefb296c8749
parent13dc19b6ccd4edcc9695d2941f3cf54240efbda9 (diff)
downloadaur-75566fd533aa60360aa6c58b82f1db28021931d1.tar.gz
xfwm4-hover-inactive: upgrade to 4.12.2
Signed-off-by: Olivier Brunel <jjk@jjacky.com>
-rw-r--r--.SRCINFO8
-rw-r--r--0001-Fix-a-mishmash-between-width-and-height.patch37
-rw-r--r--PKGBUILD7
3 files changed, 5 insertions, 47 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f7fb0d5d088..96856eb307ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xfwm4-hover-inactive
pkgdesc = Xfce window manager w/ hover effect for inactive windows
- pkgver = 4.12.1
+ pkgver = 4.12.2
pkgrel = 1
url = http://www.xfce.org/
install = xfwm4-hover-inactive.install
@@ -16,11 +16,9 @@ pkgbase = xfwm4-hover-inactive
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-Add-hover-effects-for-titlebar-s-buttons-of-inactive.patch
- sha1sums = e7470b69bba29c9c0e0bcd1471e80b73c6ccfd91
- sha1sums = 2fc881cf4fbdbd7c6f55eb5d4900dc133516ee14
+ sha1sums = fb9e9bd6f8a5e1838933355565b92cd40941b90b
sha1sums = 80e75265a7a4146035b0ba201e1cebb398e75e32
pkgname = xfwm4-hover-inactive
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 d1034e9fe1f0..4587acc4b4fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_pkgname=xfwm4
pkgname=$_pkgname-hover-inactive
-pkgver=4.12.1
+pkgver=4.12.2
pkgrel=1
pkgdesc="Xfce window manager w/ hover effect for inactive windows"
arch=('i686' 'x86_64')
@@ -18,15 +18,12 @@ 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-Add-hover-effects-for-titlebar-s-buttons-of-inactive.patch)
-sha1sums=('e7470b69bba29c9c0e0bcd1471e80b73c6ccfd91'
- '2fc881cf4fbdbd7c6f55eb5d4900dc133516ee14'
+sha1sums=('fb9e9bd6f8a5e1838933355565b92cd40941b90b'
'80e75265a7a4146035b0ba201e1cebb398e75e32')
prepare() {
cd ${srcdir}/${_pkgname}-${pkgver}
- patch -p1 -i ../0001-Fix-a-mishmash-between-width-and-height.patch
patch -p1 -i ../0001-Add-hover-effects-for-titlebar-s-buttons-of-inactive.patch
}