Sat Jul 21 00:02:19 UTC 2012

14 files changed, 153 insertions, 85 deletions

diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD
index 8263db504..9b5159460 100644
--- a/extra/cogl/PKGBUILD
+++ b/extra/cogl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156728 2012-04-23 09:04:10Z ibiru $
+# $Id: PKGBUILD 163754 2012-07-19 07:57:34Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cogl
-pkgver=1.10.2
+pkgver=1.10.4
 pkgrel=1
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
 makedepends=('mesa' 'gobject-introspection')
 options=(!libtool !emptydirs)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('042cf87ec35d2eac78719856356e415dd5333f9f613093c5db8b438630c1ecb3')
+sha256sums=('0b5c9989f1d07dbda000a68640eb7ebf734513d52e3707668c41eed19991adf9')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index df9c03b32..6891c7144 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161285 2012-06-08 22:49:59Z ibiru $
+# $Id: PKGBUILD 163768 2012-07-19 08:37:29Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=eog
-pkgver=3.4.2
+pkgver=3.4.3
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8dd79cd2118ba6055efc4ebe815bdeeeb3c1310bb915035c1a56ef3188c75d5a')
+sha256sums=('66e468f09de4b8097671cb6e56cd057c0e7869d836a2345e640b6cf4c404d5d9')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD
index d237d821b..c7473ed80 100644
--- a/extra/glibmm/PKGBUILD
+++ b/extra/glibmm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156794 2012-04-23 09:05:47Z ibiru $
+# $Id: PKGBUILD 163765 2012-07-19 08:32:36Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=glibmm
 pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.32.0
+pkgver=2.32.1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
 url="http://www.gtkmm.org/"
-sha256sums=('e1806f884c6e9f904ee2af0d39dd8d4de3f91a039f897f54333b0890de06f94b')
+sha256sums=('d6ed4d38e8739813941a0f0fec471c00ea93c5ed46179543340821c7ca798a2f')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 82b87b799..fb7d66d75 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163094 2012-07-06 22:39:28Z eric $
+# $Id: PKGBUILD 163750 2012-07-19 04:55:07Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.8.1
+pkgver=6.7.8.4
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
@@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
              'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('b14046ed6dead94ad78a7c710fd214482bf4715a'
+sha1sums=('3cca01dad3596502a149229e28226b1b2a037915'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD
index 0f033c092..52659e26a 100644
--- a/extra/libchamplain/PKGBUILD
+++ b/extra/libchamplain/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 156888 2012-04-23 09:08:23Z ibiru $
+# $Id: PKGBUILD 163767 2012-07-19 08:35:19Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Michael Kanis <mkanis@gmx.de>
 
 pkgname=libchamplain
-pkgver=0.12.2
+pkgver=0.12.3
 pkgrel=1
 pkgdesc="Gtk3 widget for displaying rasterized maps"
 url="http://projects.gnome.org/libchamplain/"
 license=('LGPL')
 arch=('i686' 'x86_64')
 options=('!libtool')
-depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite3')
+depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d23f97875e407fdc3e8fc86bef538a377c42f37f5be4fc8ec6063e7446fd7e2e')
+sha256sums=('3d03d4e6892305a3b5b78e0718e486f6a13271df33d82383fd8361ef71f3e658')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD
index fb206c7a1..a67c313c2 100644
--- a/extra/php-apc/PKGBUILD
+++ b/extra/php-apc/PKGBUILD
@@ -1,23 +1,20 @@
-# $Id: PKGBUILD 161426 2012-06-11 09:03:14Z pierre $
+# $Id: PKGBUILD 163778 2012-07-19 22:22:31Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-apc
-pkgver=3.1.10
-pkgrel=3
+pkgver=3.1.11
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code'
 url='http://pecl.php.net/package/APC'
 depends=('php')
 license=('PHP')
-source=("http://pecl.php.net/get/APC-${pkgver}.tgz"
-        'svn.patch')
+source=("http://pecl.php.net/get/APC-${pkgver}.tgz")
 backup=('etc/php/conf.d/apc.ini')
-md5sums=('f4a6b91903d6ba9dce89fc87bb6f26c9'
-         'ce07a1b49b5af496e16362899df3e3c4')
+md5sums=('199b69ed1423aa869acafff485ef5f06')
 
 build() {
 	cd $srcdir/APC-$pkgver
-	patch -p0 -i ${srcdir}/svn.patch
 	phpize
 	./configure --prefix=/usr
 	make
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index d6c4bfb03..19e1b6663 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161823 2012-06-15 06:04:39Z pierre $
+# $Id: PKGBUILD 163752 2012-07-19 05:20:23Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.4.4
+pkgver=5.4.5
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -33,10 +33,10 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('1fd98dc3f6f3805cd67bff12a26ed77f'
+md5sums=('ffcc7f4dcf2b79d667fe0c110e6cb724'
          '0b0bc7a917fc592bdf11dcd3c5c255e9'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
-         'aabda9f3f2f8b9d8fdc9558c31c718db'
+         '6d46667e00d65933ec0c958279c0a803'
          '825e580dd5708d959b50944afa1b12b6'
          'f56b5bb7e93c802ae8519182fbea3387'
          '86c73d481f3099e740e602869bacf637'
diff --git a/extra/php/rc.d.php-fpm b/extra/php/rc.d.php-fpm
index 3b3ec20de..47f0886ac 100644
--- a/extra/php/rc.d.php-fpm
+++ b/extra/php/rc.d.php-fpm
@@ -86,7 +86,7 @@ case "$1" in
 
 		kill -QUIT `cat /run/php-fpm/php-fpm.pid`
 
-		wait_for_pid removed /run/php-fpm.pid
+		wait_for_pid removed /run/php-fpm/php-fpm.pid
 
 		if [ -n "$try" ] ; then
 			stat_fail
diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index cca5f2472..0dad5f6fa 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160369 2012-06-01 12:58:42Z dreisner $
+# $Id: PKGBUILD 163774 2012-07-19 19:37:59Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -7,8 +7,8 @@
 pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
-pkgver=2.0
-pkgrel=2
+pkgver=2.1
+pkgrel=1
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/PulseAudio"
 license=(GPL LGPL)
@@ -18,17 +18,13 @@ makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
              libsystemd)
 options=(!emptydirs !libtool)
 source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
-        pulseaudio.xinit 0001-Remove-usage-of-deprecated-udev_get_-_path.patch)
-sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061'
-            'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf'
-            '13e3cbe5499e462e8d818aa1faa2419aa880888ec18b4757cabbd7f5fcd6e803')
+        pulseaudio.xinit)
+sha256sums=('ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f'
+            'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf')
 
 build() {
   cd $pkgbase-$pkgver
 
-  # libudev.so.1.0.0
-  patch -Np1 -i ../0001-Remove-usage-of-deprecated-udev_get_-_path.patch
-
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 37f872972..dbe5821f2 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158542 2012-05-04 17:15:31Z heftig $
+# $Id: PKGBUILD 163766 2012-07-19 08:34:09Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=0.14.1
+pkgver=0.14.2
 _tver=${pkgver%.*}
 pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
@@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('17ac4125d02c5f820eae9a785ac1c90b0e93682730a3950f82fd4a3dff238a43')
+sha256sums=('9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index f83c7c6ba..d15b41d82 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,57 +1,35 @@
-# $Id: PKGBUILD 162867 2012-07-02 14:58:51Z andyrtr $
+# $Id: PKGBUILD 163776 2012-07-19 20:25:09Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgbase=xf86-video-intel
-pkgname=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-pkgver=2.19.0
-pkgrel=6
+pkgname=xf86-video-intel
+pkgver=2.20.0
+pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
+install=$pkgname.install
+pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'systemd-tools')
 makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgbase}-${pkgver}.tar.bz2)
-sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  mkdir build-{UXA,SNA}
-
-  pushd build-UXA
-  ../configure --prefix=/usr --enable-dri --enable-uxa
-  make
-  popd
-
-  pushd build-SNA
-  ../configure --prefix=/usr --enable-dri --enable-sna --enable-vmap
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+    --enable-dri
   make
-  popd
 }
 
-package_xf86-video-intel-uxa() {
-	
-  pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with UXA acceleration"
-  provides=('xf86-video-intel')
-  replaces=('xf86-video-intel')
-  conflicts=('xf86-video-intel-sna' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy' 'xf86-video-intel')
-  
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install -C build-UXA
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
-
-package_xf86-video-intel-sna() {
-
-  pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with SNA acceleration"
-  provides=('xf86-video-intel')
-  conflicts=('xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy' 'xf86-video-intel')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install -C build-SNA
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/extra/xf86-video-intel/xf86-video-intel.install b/extra/xf86-video-intel/xf86-video-intel.install
new file mode 100644
index 000000000..e3ddb5522
--- /dev/null
+++ b/extra/xf86-video-intel/xf86-video-intel.install
@@ -0,0 +1,8 @@
+post_install() {
+  echo ">>> This driver now allows to switch"
+  echo ">>> between several acceleration methods."
+  echo ">>> Add to the device section in /etc/X11/xorg.conf"
+  echo ">>>   Option \"AccelMethod\" \"sna\""
+  echo ">>> use uxa/xaa method if you run into trouble with sna."
+}
+
diff --git a/extra/xfwm4/PKGBUILD b/extra/xfwm4/PKGBUILD
index d03daab07..7fd1b766f 100644
--- a/extra/xfwm4/PKGBUILD
+++ b/extra/xfwm4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157909 2012-04-30 04:21:48Z foutrelis $
+# $Id: PKGBUILD 163772 2012-07-19 16:30:24Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfwm4
 pkgver=4.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Xfce window manager"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -14,12 +14,17 @@ depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+        xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch)
+sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c'
+            'f088a56cc05d1856af8d68dae9e40bc53b724d9dde4d8c2b78a88922c0ee6d1d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Fix https://bugzilla.xfce.org/show_bug.cgi?id=8949 (FS#29970)
+  patch -Np1 -i "$srcdir/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch"
+
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch b/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch
new file mode 100644
index 000000000..f01b554ce
--- /dev/null
+++ b/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch
@@ -0,0 +1,84 @@
+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