xfwm4-hover-inactive: upgrade to 4.10.1

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

4 files changed, 56 insertions, 127 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b05c311c295..78be6e1deae7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xfwm4-hover-inactive
 	pkgdesc = Xfce window manager w/ hover effect for inactive windows
-	pkgver = 4.10.0
-	pkgrel = 2
+	pkgver = 4.10.1
+	pkgrel = 1
 	url = http://www.xfce.org/
 	install = xfwm4-hover-inactive.install
 	arch = i686
@@ -13,18 +13,13 @@ pkgbase = xfwm4-hover-inactive
 	depends = libxfce4ui
 	depends = libwnck
 	depends = hicolor-icon-theme
-	provides = xfwm4=4.10.0
+	provides = xfwm4=4.10.1
 	conflicts = xfwm4
 	options = !libtool
-	source = http://archive.xfce.org/src/xfce/xfwm4/4.10/xfwm4-4.10.0.tar.bz2
-	source = hover-inactive.patch
-	source = xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch
-	md5sums = 333e5e25a85411c304e9b4474bf00537
-	md5sums = de495984f2477d3b270b6fb2031278bc
-	md5sums = eb4bf4a6cc300355400c45eb511563e8
-	sha1sums = 1549954949b5e1f38a2279a39a477b52bb5339f2
-	sha1sums = 180be7953007c17d1ea64bcfb2cd116291759fc1
-	sha1sums = 32dd678f8477a5b30d17641a0d75c5a54c4dca52
+	source = http://archive.xfce.org/src/xfce/xfwm4/4.10/xfwm4-4.10.1.tar.bz2
+	source = 0001-Add-hover-effects-for-titlebar-s-buttons-of-inactive.patch
+	sha1sums = cbfb1beee0e952f133ef851526823b472992de1d
+	sha1sums = b0421e8147411083028e3dfe0df69ce959ac435d
 
 pkgname = xfwm4-hover-inactive
 
diff --git a/hover-inactive.patch b/0001-Add-hover-effects-for-titlebar-s-buttons-of-inactive.patch
index 81622f5e21a2..9bc2c2099853 100644
--- a/hover-inactive.patch
+++ b/0001-Add-hover-effects-for-titlebar-s-buttons-of-inactive.patch
@@ -1,7 +1,23 @@
-diff -r c7e59386ff22 src/client.c
---- a/src/client.c	Mon Apr 30 10:18:03 2012 +0200
-+++ b/src/client.c	Mon Apr 30 10:52:33 2012 +0200
-@@ -3851,6 +3851,12 @@
+From b1d3fb99c60bc716ec9e648790fd2a0f30b6891c Mon Sep 17 00:00:00 2001
+From: jjacky <i.am.jack.mail@gmail.com>
+Date: Thu, 4 Apr 2013 16:58:07 +0200
+Subject: [PATCH] Add hover effects for (titlebar's) buttons of inactive
+ windows
+
+Importing this old patch from the old mercurial repo (too lazy to convert it,
+and there was no history anyways).
+
+Signed-off-by: jjacky <i.am.jack.mail@gmail.com>
+---
+ src/client.c | 12 ++++++------
+ src/events.c | 21 +++++++++------------
+ 2 files changed, 15 insertions(+), 18 deletions(-)
+
+diff --git a/src/client.c b/src/client.c
+index 4e86808..bb89029 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -3851,6 +3851,12 @@ clientGetButtonPixmap (Client *c, int button, int state)
  int
  clientGetButtonState (Client *c, int button, int state)
  {
@@ -14,7 +30,7 @@ diff -r c7e59386ff22 src/client.c
      if (state == INACTIVE)
      {
          return (state);
-@@ -3862,12 +3868,6 @@
+@@ -3862,12 +3868,6 @@ clientGetButtonState (Client *c, int button, int state)
          return (PRESSED);
      }
  
@@ -27,10 +43,11 @@ diff -r c7e59386ff22 src/client.c
      return (ACTIVE);
  }
  
-diff -r c7e59386ff22 src/events.c
---- a/src/events.c	Mon Apr 30 10:18:03 2012 +0200
-+++ b/src/events.c	Mon Apr 30 10:52:33 2012 +0200
-@@ -1394,23 +1394,20 @@
+diff --git a/src/events.c b/src/events.c
+index 4b49171..f5e782c 100644
+--- a/src/events.c
++++ b/src/events.c
+@@ -1394,23 +1394,20 @@ handleEnterNotify (DisplayInfo *display_info, XCrossingEvent * ev)
                  clientClearDelayedFocus ();
              }
          }
@@ -63,3 +80,6 @@ diff -r c7e59386ff22 src/events.c
          }
  
          /* No need to process the event any further */
+-- 
+1.8.2.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 986426f74440..26fc05193dec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 _pkgname=xfwm4
 pkgname=$_pkgname-hover-inactive
-pkgver=4.10.0
-pkgrel=2
+pkgver=4.10.1
+pkgrel=1
 pkgdesc="Xfce window manager w/ hover effect for inactive windows"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -14,33 +14,31 @@ groups=('xfce4')
 depends=("libxfce4ui" 'libwnck' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
-provides=('xfwm4=4.10.0')
+provides=('xfwm4=4.10.1')
 conflicts=('xfwm4')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/xfce/${_pkgname}/4.10/${_pkgname}-${pkgver}.tar.bz2
-	hover-inactive.patch xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch)
-md5sums=('333e5e25a85411c304e9b4474bf00537'
-         'de495984f2477d3b270b6fb2031278bc'
-         'eb4bf4a6cc300355400c45eb511563e8')
-sha1sums=('1549954949b5e1f38a2279a39a477b52bb5339f2'
-          '180be7953007c17d1ea64bcfb2cd116291759fc1'
-          '32dd678f8477a5b30d17641a0d75c5a54c4dca52')
+        0001-Add-hover-effects-for-titlebar-s-buttons-of-inactive.patch)
+sha1sums=('cbfb1beee0e952f133ef851526823b472992de1d'
+          'b0421e8147411083028e3dfe0df69ce959ac435d')
+
+prepare() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+  patch -p1 -i ../0001-Add-hover-effects-for-titlebar-s-buttons-of-inactive.patch
+}
 
 build() {
   cd ${srcdir}/${_pkgname}-${pkgver}
-  patch -p1 -i ../hover-inactive.patch
-  # fixes https://bugzilla.xfce.org/show_bug.cgi?id=8949
-  patch -Np1 -i ../xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch
   ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--enable-startup-notification \
-	--enable-randr \
-	--enable-compositor \
-	--enable-xsync \
-	--disable-debug
+      --sysconfdir=/etc \
+      --libexecdir=/usr/lib \
+      --localstatedir=/var \
+      --disable-static \
+      --enable-startup-notification \
+      --enable-randr \
+      --enable-compositor \
+      --enable-xsync \
+      --disable-debug
   make
 }
 
diff --git a/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch b/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch
deleted file mode 100644
index f141ed646ac4..000000000000
--- a/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 099614e3f045e06db7ab509e174510ea74857adb Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <fourdan@xfce.org>
-Date: Wed, 18 Jul 2012 20:12:07 +0000
-Subject: Implement NET_WM_MOVERESIZE_CANCEL message (bug #8949)
-
-as gtk+-3.4 now uses it.
----
-diff --git a/src/display.h b/src/display.h
-index 1ad2ef8..8797237 100644
---- a/src/display.h
-+++ b/src/display.h
-@@ -163,7 +163,8 @@ enum
-     NET_WM_MOVERESIZE_SIZE_LEFT,
-     NET_WM_MOVERESIZE_MOVE,
-     NET_WM_MOVERESIZE_SIZE_KEYBOARD,
--    NET_WM_MOVERESIZE_MOVE_KEYBOARD
-+    NET_WM_MOVERESIZE_MOVE_KEYBOARD,
-+    NET_WM_MOVERESIZE_CANCEL
- };
-
- enum
-diff --git a/src/moveresize.c b/src/moveresize.c
-index 9893c30..a98bdf7 100644
---- a/src/moveresize.c
-+++ b/src/moveresize.c
-@@ -827,7 +827,7 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
-     eventFilterStatus status = EVENT_FILTER_STOP;
-     MoveResizeData *passdata = (MoveResizeData *) data;
-     Client *c = NULL;
--    gboolean moving = TRUE;
-+    gboolean moving;
-     XWindowChanges wc;
-     int prev_x, prev_y;
-
-@@ -840,6 +840,12 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
-     display_info = screen_info->display_info;
-     configure_flags = NO_CFG_FLAG;
-
-+    /*
-+     * Clients may choose to end the move operation,
-+     * we use XFWM_FLAG_MOVING_RESIZING for that.
-+     */
-+    moving = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
-+
-     /* Update the display time */
-     myDisplayUpdateCurrentTime (display_info, xevent);
-
-@@ -1294,7 +1300,12 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
-     screen_info = c->screen_info;
-     display_info = screen_info->display_info;
-     status = EVENT_FILTER_STOP;
--    resizing = TRUE;
-+
-+    /*
-+     * Clients may choose to end the resize operation,
-+     * we use XFWM_FLAG_MOVING_RESIZING for that.
-+     */
-+    resizing = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
-
-     frame_x = frameX (c);
-     frame_y = frameY (c);
-diff --git a/src/netwm.c b/src/netwm.c
-index 545e64a..1352f08 100644
---- a/src/netwm.c
-+++ b/src/netwm.c
-@@ -695,10 +695,15 @@ clientNetMoveResize (Client * c, XClientMessageEvent * ev)
-             resize = TRUE; /* Resize */
-             break;
-         case NET_WM_MOVERESIZE_MOVE:
--        default:
-             event->type = ButtonPress;
-             resize = FALSE; /* Move */
-             break;
-+        case NET_WM_MOVERESIZE_CANCEL:
-+            FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
-+            /* Walk through */
-+        default: /* Do nothing */
-+            return;
-+            break;
-     }
-
-     if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
---
-cgit v0.9.0.3