[Pkg-xfce-commits] r2569 - in desktop/branches/svn-snapshots/xfwm4/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-12-13 09:58:17 +0000 (Sat, 13 Dec 2008)
New Revision: 2569

Added:
   desktop/branches/svn-snapshots/xfwm4/debian/patches/
   desktop/branches/svn-snapshots/xfwm4/debian/patches/01_fix-maximize-bug.patch
Modified:
   desktop/branches/svn-snapshots/xfwm4/debian/changelog
   desktop/branches/svn-snapshots/xfwm4/debian/control
   desktop/branches/svn-snapshots/xfwm4/debian/rules
Log:
* debian/patches:
  - 01_fix-maximize-bug, fix maximization bug.                closes: #508352
* 

Modified: desktop/branches/svn-snapshots/xfwm4/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfwm4/debian/changelog	2008-12-10 12:57:08 UTC (rev 2568)
+++ desktop/branches/svn-snapshots/xfwm4/debian/changelog	2008-12-13 09:58:17 UTC (rev 2569)
@@ -26,6 +26,8 @@
   * new upstream beta release.
   * debian/control:
     - update build-deps for Hopper.
+  * debian/patches:
+    - 01_fix-maximize-bug, fix maximization bug.                closes: #508352
 
   [ Michael Casadevall ]
   [ Xfce 4.6 Beta 1 "Fuzzy" ]
@@ -34,8 +36,11 @@
   * debian/control:
     - Added myself to uploaders
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 11 Nov 2008 14:41:51 +0100
+  [ Yves-Alexis Perez ]
+  * 
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 13 Dec 2008 10:43:11 +0100
+
 xfwm4 (4.4.2-5) unstable; urgency=low
 
   * switch to triggers:

Modified: desktop/branches/svn-snapshots/xfwm4/debian/control
===================================================================
--- desktop/branches/svn-snapshots/xfwm4/debian/control	2008-12-10 12:57:08 UTC (rev 2568)
+++ desktop/branches/svn-snapshots/xfwm4/debian/control	2008-12-13 09:58:17 UTC (rev 2569)
@@ -3,7 +3,10 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
-Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.6), libxft-dev, libxdamage-dev, libxrender-dev, libxcomposite-dev, libxfixes-dev, chrpath, libglade2-dev, libxfce4util-dev (>= 4.5.92), libxfcegui4-dev (>= 4.5.92), libxfconf-0-dev, libwnck-dev, intltool
+Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.6),
+ libxft-dev, libxdamage-dev, libxrender-dev, libxcomposite-dev,
+ libxfixes-dev, chrpath, libglade2-dev, libxfce4util-dev (>= 4.5.92),
+ libxfcegui4-dev (>= 4.5.92), libxfconf-0-dev, libwnck-dev, intltool, quilt
 Standards-Version: 3.8.0
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfwm4/

Added: desktop/branches/svn-snapshots/xfwm4/debian/patches/01_fix-maximize-bug.patch
===================================================================
--- desktop/branches/svn-snapshots/xfwm4/debian/patches/01_fix-maximize-bug.patch	                        (rev 0)
+++ desktop/branches/svn-snapshots/xfwm4/debian/patches/01_fix-maximize-bug.patch	2008-12-13 09:58:17 UTC (rev 2569)
@@ -0,0 +1,26 @@
+commit 612e718fec0996ba93639df8a3bd198447444bcf
+Author: olivier <olivier at a0aa69c2-05f4-0310-b83c-d5d913b14636>
+Date:   Fri Dec 12 23:58:50 2008 +0000
+
+    	* src/client.c: Remove maximization if a client updates its size max
+    	  size hint (Bug #4706)
+    
+    git-svn-id: http://svn.xfce.org/svn/xfce/xfwm4/trunk@29015 a0aa69c2-05f4-0310-b83c-d5d913b14636
+
+diff --git a/src/client.c b/src/client.c
+index 96c244f..902d5a1 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -1143,7 +1143,11 @@ clientGetWMNormalHints (Client * c, gboolean update)
+     {
+         if ((c->width != wc.width) || (c->height != wc.height))
+         {
+-            clientConfigure (c, &wc, CWX | CWY | CWWidth | CWHeight, CFG_CONSTRAINED);
++            if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED))
++            {
++                clientRemoveMaximizeFlag (c);
++            }
++            clientConfigure (c, &wc, CWX | CWY | CWWidth | CWHeight, CFG_CONSTRAINED | CFG_FORCE_REDRAW);
+         }
+         else if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_IS_RESIZABLE) != previous_value)
+         {

Modified: desktop/branches/svn-snapshots/xfwm4/debian/rules
===================================================================
--- desktop/branches/svn-snapshots/xfwm4/debian/rules	2008-12-10 12:57:08 UTC (rev 2568)
+++ desktop/branches/svn-snapshots/xfwm4/debian/rules	2008-12-13 09:58:17 UTC (rev 2569)
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+include /usr/share/quilt/quilt.make
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -10,7 +11,7 @@
 endif
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --enable-final --enable-compositor --libexecdir=\$${prefix}/lib
@@ -23,7 +24,7 @@
 	$(MAKE)
 	touch build-stamp
 
-clean: 
+clean: unpatch
 	
 	dh_testdir
 	dh_testroot