summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authormartti <martti@pkgsrc.org>2007-12-07 19:43:19 +0000
committermartti <martti@pkgsrc.org>2007-12-07 19:43:19 +0000
commitf6f5ea854dc4e890fc171fca003318f87fb4c3b6 (patch)
treeb13a72118dfeb40f0301f5034c64ed4656b8e1d0 /wm
parent7c0ef9ca1d18e3e0a7c6f6a7bfbffe73de43c98f (diff)
downloadpkgsrc-f6f5ea854dc4e890fc171fca003318f87fb4c3b6.tar.gz
Updated Xfce to 4.4.2
Lots of bug fixes. For the official ChangeLog, please see http://www.xfce.org/documentation/changelogs/4.4.2
Diffstat (limited to 'wm')
-rw-r--r--wm/xfce4-wm-themes/buildlink3.mk4
-rw-r--r--wm/xfce4-wm-themes/distinfo8
-rw-r--r--wm/xfce4-wm/Makefile4
-rw-r--r--wm/xfce4-wm/PLIST4
-rw-r--r--wm/xfce4-wm/buildlink3.mk4
-rw-r--r--wm/xfce4-wm/distinfo10
-rw-r--r--wm/xfce4-wm/patches/patch-aa13
-rw-r--r--wm/xfce4-wm/patches/patch-ab159
8 files changed, 17 insertions, 189 deletions
diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk
index b307500f990..094069919c6 100644
--- a/wm/xfce4-wm-themes/buildlink3.mk
+++ b/wm/xfce4-wm-themes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2007/04/12 09:55:20 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2007/12/07 19:43:24 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_WM_THEMES_BUILDLINK3_MK:= ${XFCE4_WM_THEMES_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-wm-themes
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wm-themes
.if ${XFCE4_WM_THEMES_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-wm-themes+= xfce4-wm-themes>=4.4.1
+BUILDLINK_API_DEPENDS.xfce4-wm-themes+= xfce4-wm-themes>=4.4.2
BUILDLINK_PKGSRCDIR.xfce4-wm-themes?= ../../wm/xfce4-wm-themes
.endif # XFCE4_WM_THEMES_BUILDLINK3_MK
diff --git a/wm/xfce4-wm-themes/distinfo b/wm/xfce4-wm-themes/distinfo
index 4977575e9a4..bbe2d71a572 100644
--- a/wm/xfce4-wm-themes/distinfo
+++ b/wm/xfce4-wm-themes/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2007/04/12 09:55:20 martti Exp $
+$NetBSD: distinfo,v 1.14 2007/12/07 19:43:25 martti Exp $
-SHA1 (xfwm4-themes-4.4.1.tar.bz2) = e02932600d9971716e4058252588c0f7bff509ec
-RMD160 (xfwm4-themes-4.4.1.tar.bz2) = 00c14c73a26091e721f0b4534c9e26a142400ae7
-Size (xfwm4-themes-4.4.1.tar.bz2) = 498155 bytes
+SHA1 (xfwm4-themes-4.4.2.tar.bz2) = ce682c0713fda99b34e6569df5bd053ce8bd4928
+RMD160 (xfwm4-themes-4.4.2.tar.bz2) = dd483527b1c5da63f0341d21399ecc578b46dedc
+Size (xfwm4-themes-4.4.2.tar.bz2) = 479305 bytes
diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile
index 8adefa0a108..bd085b393d8 100644
--- a/wm/xfce4-wm/Makefile
+++ b/wm/xfce4-wm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2007/10/03 10:24:42 martti Exp $
+# $NetBSD: Makefile,v 1.25 2007/12/07 19:43:23 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfwm4-${XFCE4_VERSION}
PKGNAME= xfce4-wm-${XFCE4_VERSION}
-PKGREVISION= 1
+#PKGREVISION= 1
CATEGORIES= wm
COMMENT= Xfce window manager
diff --git a/wm/xfce4-wm/PLIST b/wm/xfce4-wm/PLIST
index 0f7cf909487..0d93a2f8b6b 100644
--- a/wm/xfce4-wm/PLIST
+++ b/wm/xfce4-wm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2007/04/12 09:55:19 martti Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/12/07 19:43:23 martti Exp $
bin/xfwm4
lib/xfce4/mcs-plugins/wmtweaks_plugin.la
lib/xfce4/mcs-plugins/workspaces_plugin.la
@@ -12,6 +12,7 @@ share/icons/hicolor/48x48/apps/xfwm4.png
share/icons/hicolor/scalable/apps/wmtweaks.svg
share/icons/hicolor/scalable/apps/xfce4-workspaces.svg
share/icons/hicolor/scalable/apps/xfwm4.svg
+share/locale/am/LC_MESSAGES/xfwm4.mo
share/locale/ar/LC_MESSAGES/xfwm4.mo
share/locale/az/LC_MESSAGES/xfwm4.mo
share/locale/be/LC_MESSAGES/xfwm4.mo
@@ -41,6 +42,7 @@ share/locale/ja/LC_MESSAGES/xfwm4.mo
share/locale/ka/LC_MESSAGES/xfwm4.mo
share/locale/ko/LC_MESSAGES/xfwm4.mo
share/locale/lt/LC_MESSAGES/xfwm4.mo
+share/locale/lv/LC_MESSAGES/xfwm4.mo
share/locale/mk/LC_MESSAGES/xfwm4.mo
share/locale/mr/LC_MESSAGES/xfwm4.mo
share/locale/ms/LC_MESSAGES/xfwm4.mo
diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk
index 515b143a448..c0eaf89743f 100644
--- a/wm/xfce4-wm/buildlink3.mk
+++ b/wm/xfce4-wm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2007/10/03 10:24:42 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2007/12/07 19:43:24 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_WM_BUILDLINK3_MK:= ${XFCE4_WM_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-wm
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wm
.if ${XFCE4_WM_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-wm+= xfce4-wm>=4.4.1nb1
+BUILDLINK_API_DEPENDS.xfce4-wm+= xfce4-wm>=4.4.2
BUILDLINK_PKGSRCDIR.xfce4-wm?= ../../wm/xfce4-wm
.endif # XFCE4_WM_BUILDLINK3_MK
diff --git a/wm/xfce4-wm/distinfo b/wm/xfce4-wm/distinfo
index 6eef32f7b5c..59923423830 100644
--- a/wm/xfce4-wm/distinfo
+++ b/wm/xfce4-wm/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.17 2007/10/03 10:24:42 martti Exp $
+$NetBSD: distinfo,v 1.18 2007/12/07 19:43:24 martti Exp $
-SHA1 (xfwm4-4.4.1.tar.bz2) = 1f1c0cb374941bce2bd59eedd8d9bd05591c65a0
-RMD160 (xfwm4-4.4.1.tar.bz2) = 6bd28775d3625b799f5443d3ba28dafb75215bb8
-Size (xfwm4-4.4.1.tar.bz2) = 1645973 bytes
-SHA1 (patch-aa) = adca693a9a740544416fb3dcf28e4aa0b24c5488
-SHA1 (patch-ab) = c98996a922e4808662f7c7a81fd4786f7ef385ce
+SHA1 (xfwm4-4.4.2.tar.bz2) = a6d8b3b1493ff98141cfb7232ef6b4940224bce9
+RMD160 (xfwm4-4.4.2.tar.bz2) = b3ced6edac44b0b232be4312ca2281095c03e14b
+Size (xfwm4-4.4.2.tar.bz2) = 1548533 bytes
diff --git a/wm/xfce4-wm/patches/patch-aa b/wm/xfce4-wm/patches/patch-aa
deleted file mode 100644
index 249cfe46994..00000000000
--- a/wm/xfce4-wm/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/04/12 09:55:20 martti Exp $
-
---- src/frame.c.orig 2007-04-11 16:58:58.000000000 +0300
-+++ src/frame.c 2007-04-11 16:59:04.000000000 +0300
-@@ -38,7 +38,7 @@
- #include "compositor.h"
-
- #ifndef ShapeInput
--#define ShapeInput 2;
-+#define ShapeInput 2
- #endif
-
- int
diff --git a/wm/xfce4-wm/patches/patch-ab b/wm/xfce4-wm/patches/patch-ab
deleted file mode 100644
index 9e6b1da9e62..00000000000
--- a/wm/xfce4-wm/patches/patch-ab
+++ /dev/null
@@ -1,159 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/10/03 10:24:42 martti Exp $
-
-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