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

Jan de Groot jgc at archlinux.org
Sun Jul 20 12:29:30 EDT 2008


    Date: Sunday, July 20, 2008 @ 12:29:30
  Author: jgc
Revision: 5742

upgpkg: xfwm4 4.4.2-3
    Add patch to svn instead of grabbing it remote, remove update-desktop-database calls

Added:
  xfwm4/trunk/bug3439.patch
Modified:
  xfwm4/trunk/PKGBUILD
  xfwm4/trunk/xfwm4.install
Deleted:
  xfwm4/trunk/patch_to_fix_hang_with_new_gtk.diff

-------------------------------------+
 PKGBUILD                            |   21 ++--
 bug3439.patch                       |   14 +++
 patch_to_fix_hang_with_new_gtk.diff |  157 ----------------------------------
 xfwm4.install                       |    7 -
 4 files changed, 24 insertions(+), 175 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-20 16:28:23 UTC (rev 5741)
+++ PKGBUILD	2008-07-20 16:29:30 UTC (rev 5742)
@@ -3,7 +3,7 @@
 
 pkgname=xfwm4
 pkgver=4.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -14,20 +14,19 @@
 makedepends=('xfce-mcs-manager' 'pkgconfig')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2 \
-        ftp://ftp.archlinux.org/other/xfce4-graphics/ArchLinux-xfce4-xfwm4.tar.gz \
-        http://svn.xfce.org/index.cgi/xfce/diff/xfwm4/trunk/src/events.c\?rev1=26059\;rev2=26060\;mime=text%2Fplain )
+source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
+        ftp://ftp.archlinux.org/other/xfce4-graphics/ArchLinux-xfce4-xfwm4.tar.gz
+	bug3439.patch)
 md5sums=('21da77e50b07e72bba784bf3418ca067' '8ed0d3c7dc07dde88ba7b38ce5006730' \
-         'cbceeaf790553ec5ce723362c51a7190')
+         'c65b0f59bebd10ea771042e7657ebdef')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}/src
-  patch -Np0 -i ../../events.c\?rev1=26059\;rev2=26060\;mime=text%2Fplain || return 1
-  cd ..
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np0 -i ${srcdir}/bug3439.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
     --localstatedir=/var --disable-static \
-    --enable-compositor --enable-xsync
+    --enable-compositor --enable-xsync || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  cp -R ../ArchLinux ${startdir}/pkg/usr/share/themes
+  make DESTDIR=${pkgdir} install || return 1
+  cp -R ${srcdir}/ArchLinux ${pkgdir}/usr/share/themes || return 1
 }

Added: bug3439.patch
===================================================================
--- bug3439.patch	                        (rev 0)
+++ bug3439.patch	2008-07-20 16:29:30 UTC (rev 5742)
@@ -0,0 +1,14 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=3439
+Index: events.c
+===================================================================
+--- src/events.c	(revision 26059)
++++ src/events.c	(revision 26060)
+@@ -1430,7 +1430,7 @@
+            stealing prevention is not activated, otherwise we just set the "demands attention"
+            flag...
+          */
+-        if ((ev->value_mask & CWStackMode) && (wc.stack_mode == Above) && (wc.sibling == None))
++        if ((ev->value_mask & CWStackMode) && (wc.stack_mode == Above) && (wc.sibling == None) && !(c->type & WINDOW_TYPE_DONT_FOCUS))
+         {
+             Client *last_raised;
+ 

Deleted: patch_to_fix_hang_with_new_gtk.diff
===================================================================
--- patch_to_fix_hang_with_new_gtk.diff	2008-07-20 16:28:23 UTC (rev 5741)
+++ patch_to_fix_hang_with_new_gtk.diff	2008-07-20 16:29:30 UTC (rev 5742)
@@ -1,157 +0,0 @@
-Index: src/display.c
-===================================================================
---- src/display.c	(revision 25820)
-+++ src/display.c	(working copy)
-@@ -178,6 +178,19 @@
-                           FALSE, display_info->atoms) != 0);
- }
- 
-+static void
-+myDisplayCreateTimestampWin (DisplayInfo *display_info)
-+{
-+    XSetWindowAttributes attributes;
-+
-+    attributes.event_mask = PropertyChangeMask;
-+    attributes.override_redirect = TRUE;
-+    display_info->timestamp_win = 
-+        XCreateWindow (display_info->dpy, DefaultRootWindow (display_info->dpy),
-+                       -100, -100, 10, 10, 0, 0, CopyFromParent, CopyFromParent,
-+                       CWEventMask | CWOverrideRedirect, &attributes);
-+}
-+
- DisplayInfo *
- myDisplayInit (GdkDisplay *gdisplay)
- {
-@@ -309,6 +322,8 @@
-     display->resize_cursor[CORNER_COUNT + SIDE_BOTTOM] =
-         XCreateFontCursor (display->dpy, XC_bottom_side);
- 
-+    myDisplayCreateTimestampWin (display);
-+
-     display->xfilter = NULL;
-     display->screens = NULL;
-     display->clients = NULL;
-@@ -340,6 +355,8 @@
-     display->move_cursor = None;
-     XFreeCursor (display->dpy, display->root_cursor);
-     display->root_cursor = None;
-+    XDestroyWindow (display->dpy, display->timestamp_win);
-+    display->timestamp_win = None;
- 
-     if (display->hostname)
-     {
-Index: src/display.h
-===================================================================
---- src/display.h	(revision 25820)
-+++ src/display.h	(working copy)
-@@ -226,6 +226,7 @@
-     gboolean quit;
-     gboolean reload;
- 
-+    Window timestamp_win;
-     Cursor busy_cursor;
-     Cursor move_cursor;
-     Cursor root_cursor;
-Index: src/client.c
-===================================================================
---- src/client.c	(revision 25820)
-+++ src/client.c	(working copy)
-@@ -4868,21 +4868,19 @@
- 
-     if (passdata.c)
-     {
--        GdkPixbuf *icon;
--
-         TRACE ("entering cycle loop");
-         passdata.wireframe = wireframeCreate (passdata.c);
--        icon = getAppIcon (display_info, passdata.c->window, 32, 32);
-         passdata.tabwin = tabwinCreate (passdata.c->screen_info->gscr, c,
-                                         passdata.c, passdata.cycle_range,
-                                         screen_info->params->cycle_workspaces);
-         eventFilterPush (display_info->xfilter, clientCycleEventFilter, &passdata);
-         gtk_main ();
-         eventFilterPop (display_info->xfilter);
--        wireframeDelete (screen_info, passdata.wireframe);
-         TRACE ("leaving cycle loop");
-         tabwinDestroy (passdata.tabwin);
-         g_free (passdata.tabwin);
-+        wireframeDelete (screen_info, passdata.wireframe);
-+        updateXserverTime (display_info);
-     }
- 
-     if (passdata.c)
-Index: src/hints.c
-===================================================================
---- src/hints.c	(revision 25820)
-+++ src/hints.c	(working copy)
-@@ -1167,27 +1167,18 @@
-     return setXAtomManagerOwner(display_info, display_info->atoms[atom_id], root, w);
- }
- 
--
--static Bool
--checkPropEvent (Display *display, XEvent *xevent, XPointer arg)
-+void
-+updateXserverTime (DisplayInfo *display_info)
- {
--    DisplayInfo *display_info;
-     ScreenInfo *screen_info;
-+    char c = '\0';
- 
--    display_info = (DisplayInfo *) arg;
--    g_return_val_if_fail (display_info, FALSE);
-+    g_return_if_fail (display_info);
- 
--    screen_info = myDisplayGetDefaultScreen (display_info);
--    g_return_val_if_fail (screen_info, FALSE);
--
--    if ((xevent->type == PropertyNotify) &&
--        (xevent->xproperty.window == screen_info->xfwm4_win) &&
--        (xevent->xproperty.atom == display_info->atoms[XFWM4_TIMESTAMP_PROP]))
--    {
--        return TRUE;
--    }
--
--    return FALSE;
-+    XChangeProperty (display_info->dpy, display_info->timestamp_win,
-+                     display_info->atoms[XFWM4_TIMESTAMP_PROP],
-+                     display_info->atoms[XFWM4_TIMESTAMP_PROP],
-+                     8, PropModeReplace, (unsigned char *) &c, 1);
- }
- 
- Time
-@@ -1196,7 +1187,6 @@
-     ScreenInfo *screen_info;
-     XEvent xevent;
-     Time timestamp;
--    char c = '\0';
- 
-     g_return_val_if_fail (display_info, (Time) CurrentTime);
-     timestamp = myDisplayGetCurrentTime (display_info);
-@@ -1206,12 +1196,8 @@
-         g_return_val_if_fail (screen_info,  (Time) CurrentTime);
- 
-         TRACE ("getXServerTime: Using X server roundtrip");
--        XChangeProperty (display_info->dpy, screen_info->xfwm4_win, 
--                         display_info->atoms[XFWM4_TIMESTAMP_PROP],
--                         display_info->atoms[XFWM4_TIMESTAMP_PROP],
--                         8, PropModeReplace, (unsigned char *) &c, 1);
--        XIfEvent (display_info->dpy, &xevent, checkPropEvent, (XPointer) display_info);
--
-+        updateXserverTime (display_info);
-+        XWindowEvent (display_info->dpy, display_info->timestamp_win, PropertyChangeMask, &xevent);
-         timestamp = (Time) myDisplayUpdateCurrentTime (display_info, &xevent);
-     }
- 
-Index: src/hints.h
-===================================================================
---- src/hints.h	(revision 25820)
-+++ src/hints.h	(working copy)
-@@ -269,6 +269,7 @@
-                                                                  int, 
-                                                                  Window , 
-                                                                  Window);
-+void                     updateXserverTime                      (DisplayInfo *);
- Time                     getXServerTime                         (DisplayInfo *);
- 
- #ifdef ENABLE_KDE_SYSTRAY_PROXY

Modified: xfwm4.install
===================================================================
--- xfwm4.install	2008-07-20 16:28:23 UTC (rev 5741)
+++ xfwm4.install	2008-07-20 16:29:30 UTC (rev 5742)
@@ -1,5 +1,4 @@
 post_install() {
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -8,11 +7,5 @@
 }
 
 post_remove() {
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*





More information about the arch-commits mailing list