Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xfce-base/xfwm4/ChangeLog8
-rw-r--r--xfce-base/xfwm4/Manifest29
-rw-r--r--xfce-base/xfwm4/files/digest-xfwm4-4.4.1-r13
-rw-r--r--xfce-base/xfwm4/files/xfwm4-gtk212.patch157
-rw-r--r--xfce-base/xfwm4/xfwm4-4.4.1-r1.ebuild50
5 files changed, 242 insertions, 5 deletions
diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog
index 332ef36098dc..839b16f57885 100644
--- a/xfce-base/xfwm4/ChangeLog
+++ b/xfce-base/xfwm4/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for xfce-base/xfwm4
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.103 2007/06/07 18:36:12 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.104 2007/09/21 19:34:22 angelos Exp $
+
+*xfwm4-4.4.1-r1 (21 Sep 2007)
+
+ 21 Sep 2007; Christoph Mende <angelos@gentoo.org>
+ +files/xfwm4-gtk212.patch, +xfwm4-4.4.1-r1.ebuild:
+ Fixed freeze with gtk+-2.12
07 Jun 2007; Samuli Suominen <drac@gentoo.org> xfwm4-4.4.1.ebuild:
Stable on arm.
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 3a351f95ccce..7ac01d820565 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xfwm4-gtk212.patch 5606 RMD160 153f7bff7f6ae99698072f922524c7c21dd826f6 SHA1 dd74f3102e54ca3ad7b6bdcd97d7af9aab4346e9 SHA256 a119dcbc0d5dc336fe670c82db339f94d04d238eacb869f77228d4bd6d938994
+MD5 73765d05f08d9519fa7b7f7976bbc4c1 files/xfwm4-gtk212.patch 5606
+RMD160 153f7bff7f6ae99698072f922524c7c21dd826f6 files/xfwm4-gtk212.patch 5606
+SHA256 a119dcbc0d5dc336fe670c82db339f94d04d238eacb869f77228d4bd6d938994 files/xfwm4-gtk212.patch 5606
DIST xfwm4-4.4.1.tar.bz2 1645973 RMD160 6bd28775d3625b799f5443d3ba28dafb75215bb8 SHA1 1f1c0cb374941bce2bd59eedd8d9bd05591c65a0 SHA256 4c7def1dfe4fe723dfd2728187d70b96682896649461507d230906aafffc0475
+EBUILD xfwm4-4.4.1-r1.ebuild 1339 RMD160 2f23eb195d88fee723a5dd3d2c1915a5c356bddd SHA1 11acf3b125727cf5dd0fadd2851de2df0dc688c5 SHA256 e1c350889d907af82069ff976ff247870e58e9d211506e0177b41b0147f8cc57
+MD5 077e16b37b7f457f859511a2084ac280 xfwm4-4.4.1-r1.ebuild 1339
+RMD160 2f23eb195d88fee723a5dd3d2c1915a5c356bddd xfwm4-4.4.1-r1.ebuild 1339
+SHA256 e1c350889d907af82069ff976ff247870e58e9d211506e0177b41b0147f8cc57 xfwm4-4.4.1-r1.ebuild 1339
EBUILD xfwm4-4.4.1.ebuild 1232 RMD160 2df1a266a9df001ae5805f45f8ca094eaca925fe SHA1 ae34b6941cede2147b9f0480ed3740a901697338 SHA256 4d0b723491b81c52082dd3d9767dbe9abf7b0d03feee8f7657523ad9494b862e
MD5 454801a8a20402d7cbe3c255b4798641 xfwm4-4.4.1.ebuild 1232
RMD160 2df1a266a9df001ae5805f45f8ca094eaca925fe xfwm4-4.4.1.ebuild 1232
SHA256 4d0b723491b81c52082dd3d9767dbe9abf7b0d03feee8f7657523ad9494b862e xfwm4-4.4.1.ebuild 1232
-MISC ChangeLog 11757 RMD160 4df6b8fe3fa09cb043444746b12a8b43aab9185f SHA1 a997fed43848538961247e62cc91b8acf0310682 SHA256 d1c0ee8d4e9c8f459469ecc5b759d9e50940a24ae13887767293bf3f31d8f645
-MD5 22332640b79a3c1131d95fa5193f1253 ChangeLog 11757
-RMD160 4df6b8fe3fa09cb043444746b12a8b43aab9185f ChangeLog 11757
-SHA256 d1c0ee8d4e9c8f459469ecc5b759d9e50940a24ae13887767293bf3f31d8f645 ChangeLog 11757
+MISC ChangeLog 11927 RMD160 8919fb9d68f2d10e9079024af35085aa86f4b9f6 SHA1 578dacac021332081356ec8e2f52f902b657a279 SHA256 7b9ebdce9548c8473ecff14af58e444ce739a45a2b8d57d16081c23ef6c2b2ce
+MD5 faede019565ddbc0e61af7116d291836 ChangeLog 11927
+RMD160 8919fb9d68f2d10e9079024af35085aa86f4b9f6 ChangeLog 11927
+SHA256 7b9ebdce9548c8473ecff14af58e444ce739a45a2b8d57d16081c23ef6c2b2ce ChangeLog 11927
MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -14,3 +25,13 @@ SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata
MD5 a61a1b824a0234cc9fc0668a8d3ca028 files/digest-xfwm4-4.4.1 241
RMD160 2b3cdd7afdd005d970254075d39b0328f5a69662 files/digest-xfwm4-4.4.1 241
SHA256 a2bad18f9b1b43e5a52608ed006e918b333d0a7f5adcda94b3a15b717daf7a5e files/digest-xfwm4-4.4.1 241
+MD5 a61a1b824a0234cc9fc0668a8d3ca028 files/digest-xfwm4-4.4.1-r1 241
+RMD160 2b3cdd7afdd005d970254075d39b0328f5a69662 files/digest-xfwm4-4.4.1-r1 241
+SHA256 a2bad18f9b1b43e5a52608ed006e918b333d0a7f5adcda94b3a15b717daf7a5e files/digest-xfwm4-4.4.1-r1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFG9BzEKhnDs22gwa8RAvrcAJ4jzLhVk7fYBgnkAeMpOI1WyIgNRgCgiKdv
+eO6mWlDpuYzgib/y+/M/qOg=
+=ICsk
+-----END PGP SIGNATURE-----
diff --git a/xfce-base/xfwm4/files/digest-xfwm4-4.4.1-r1 b/xfce-base/xfwm4/files/digest-xfwm4-4.4.1-r1
new file mode 100644
index 000000000000..f6e739481d03
--- /dev/null
+++ b/xfce-base/xfwm4/files/digest-xfwm4-4.4.1-r1
@@ -0,0 +1,3 @@
+MD5 c531edad76c909001acccc02936404f2 xfwm4-4.4.1.tar.bz2 1645973
+RMD160 6bd28775d3625b799f5443d3ba28dafb75215bb8 xfwm4-4.4.1.tar.bz2 1645973
+SHA256 4c7def1dfe4fe723dfd2728187d70b96682896649461507d230906aafffc0475 xfwm4-4.4.1.tar.bz2 1645973
diff --git a/xfce-base/xfwm4/files/xfwm4-gtk212.patch b/xfce-base/xfwm4/files/xfwm4-gtk212.patch
new file mode 100644
index 000000000000..c8112f44995c
--- /dev/null
+++ b/xfce-base/xfwm4/files/xfwm4-gtk212.patch
@@ -0,0 +1,157 @@
+Index: src/display.c
+===================================================================
+--- src/display.c (revision 25830)
++++ src/display.c (revision 25831)
+@@ -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 25830)
++++ src/display.h (revision 25831)
+@@ -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 25830)
++++ src/client.c (revision 25831)
+@@ -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 25830)
++++ src/hints.c (revision 25831)
+@@ -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 25830)
++++ src/hints.h (revision 25831)
+@@ -269,6 +269,7 @@
+ int,
+ Window ,
+ Window);
++void updateXserverTime (DisplayInfo *);
+ Time getXServerTime (DisplayInfo *);
+
+ #ifdef ENABLE_KDE_SYSTRAY_PROXY
diff --git a/xfce-base/xfwm4/xfwm4-4.4.1-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.4.1-r1.ebuild
new file mode 100644
index 000000000000..f9a543967c8d
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.4.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.4.1-r1.ebuild,v 1.1 2007/09/21 19:34:22 angelos Exp $
+
+inherit xfce44 eutils
+
+XFCE_VERSION=4.4.1
+xfce44
+
+DESCRIPTION="Window manager"
+HOMEPAGE="http://www.xfce.org/projects/xfwm4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug startup-notification xcomposite"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXpm
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ xcomposite? ( x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXfixes )
+ >=dev-libs/glib-2.6
+ >=x11-libs/gtk+-2.6
+ x11-libs/pango
+ startup-notification? ( x11-libs/startup-notification )
+ >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
+ >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+ >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+ >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ dev-util/intltool"
+
+XFCE_CONFIG="${XFCE_CONFIG} --enable-xsync --enable-render --enable-randr \
+ $(use_enable xcomposite compositor)"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}/${PN}-gtk212.patch"
+}
+
+DOCS="AUTHORS ChangeLog COMPOSITOR NEWS README TODO"
+
+xfce44_core_package