[35466] trunk/dports/xfce/xfwm4

[afb at macports.org]

Revision: 35466
          http://trac.macosforge.org/projects/macports/changeset/35466
Author:   afb at macports.org
Date:     2008-03-28 12:00:47 -0700 (Fri, 28 Mar 2008)

Log Message:
-----------
mass upgrade from Xfce 4.2.4 to Xfce 4.4.2 (#12749)

Modified Paths:
--------------
    trunk/dports/xfce/xfwm4/Portfile

Added Paths:
-----------
    trunk/dports/xfce/xfwm4/files/patch-frame.c

Removed Paths:
-------------
    trunk/dports/xfce/xfwm4/files/patch-events.c
    trunk/dports/xfce/xfwm4/files/patch-keyboard.c

Modified: trunk/dports/xfce/xfwm4/Portfile
===================================================================
--- trunk/dports/xfce/xfwm4/Portfile	2008-03-28 19:00:40 UTC (rev 35465)
+++ trunk/dports/xfce/xfwm4/Portfile	2008-03-28 19:00:47 UTC (rev 35466)
@@ -3,21 +3,19 @@
 PortSystem 1.0
 
 name		xfwm4
-version		4.2.4
-revision	2
+version		4.4.2
 categories	xfce
 platforms	darwin
-maintainers	nomaintainer
-description	Next generation window manager for xfce
+maintainers	afb at macports.org
+description	The window manager for Xfce
 long_description ${description}
 homepage	http://www.xfce.org/
-master_sites	http://www.us.xfce.org/archive/xfce-${version}/src/
-checksums	md5 20dff9e377102d64b17047133e4c9993 \
-		sha1 fd6882e800d20eb1a329b20832346deb78993408 \
-		rmd160 f9caca43d4eac386ecbc3c18afef1ca6c46da7ae
+master_sites	http://www.ca-us.xfce.org/archive/xfce-${version}/src/
+use_bzip2	yes
+checksums	md5 21da77e50b07e72bba784bf3418ca067 \
+		sha1 a6d8b3b1493ff98141cfb7232ef6b4940224bce9 \
+		rmd160 b3ced6edac44b0b232be4312ca2281095c03e14b
 
-configure.args	--disable-debug --enable-final  --enable-randr
-###		--enable-startup-notification  --enable-compositor
-depends_lib	port:xfce-mcs-manager port:gtk2
-
-patchfiles	patch-events.c patch-keyboard.c
+configure.args	--enable-randr --enable-startup-notification \
+		--disable-compositor --disable-xsync
+depends_lib	port:xfce-mcs-manager port:gtk2 lib:libXrandr:XFree86

Deleted: trunk/dports/xfce/xfwm4/files/patch-events.c
===================================================================
--- trunk/dports/xfce/xfwm4/files/patch-events.c	2008-03-28 19:00:40 UTC (rev 35465)
+++ trunk/dports/xfce/xfwm4/files/patch-events.c	2008-03-28 19:00:47 UTC (rev 35466)
@@ -1,23 +0,0 @@
---- src/events.c.orig	2007-01-13 22:48:07.000000000 +0100
-+++ src/events.c	2007-09-22 13:10:49.000000000 +0200
-@@ -857,15 +857,17 @@
-         win = ev->subwindow;
-         screen_info = c->screen_info;
- 
--        if ((ev->button == Button1) && (state == AltMask) && (screen_info->params->easy_click))
-+        /* On Darwin, the alt keys can be mapped over to "XK_Mode_switch" - which causes AltMask to be zero... */
-+
-+        if ((ev->button == Button1) && (state == AltMask && AltMask != 0) && (screen_info->params->easy_click))
-         {
-             button1Action (c, ev);
-         }
--        else if ((ev->button == Button2) && (state == AltMask) && (screen_info->params->easy_click))
-+        else if ((ev->button == Button2) && (state == AltMask && AltMask != 0) && (screen_info->params->easy_click))
-         {
-             clientLower (c);
-         }
--        else if ((ev->button == Button3) && (state == AltMask) && (screen_info->params->easy_click))
-+        else if ((ev->button == Button3) && (state == AltMask && AltMask != 0) && (screen_info->params->easy_click))
-         {
-             if ((ev->x < c->width / 2) && (ev->y < c->height / 2))
-             {

Added: trunk/dports/xfce/xfwm4/files/patch-frame.c
===================================================================
--- trunk/dports/xfce/xfwm4/files/patch-frame.c	                        (rev 0)
+++ trunk/dports/xfce/xfwm4/files/patch-frame.c	2008-03-28 19:00:47 UTC (rev 35466)
@@ -0,0 +1,11 @@
+--- src/frame.c	2007-04-02 14:32:01.000000000 -0500
++++ src/frame.c	2007-09-10 00:09:10.000000000 -0500
+@@ -38,7 +38,7 @@
+ #include "compositor.h"
+ 
+ #ifndef ShapeInput
+-#define ShapeInput 2;
++#define ShapeInput 2
+ #endif
+ 
+ int


Property changes on: trunk/dports/xfce/xfwm4/files/patch-frame.c
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: trunk/dports/xfce/xfwm4/files/patch-keyboard.c
===================================================================
--- trunk/dports/xfce/xfwm4/files/patch-keyboard.c	2008-03-28 19:00:40 UTC (rev 35465)
+++ trunk/dports/xfce/xfwm4/files/patch-keyboard.c	2008-03-28 19:00:47 UTC (rev 35466)
@@ -1,28 +0,0 @@
---- src/keyboard.c.orig	2007-09-22 13:32:29.000000000 +0200
-+++ src/keyboard.c	2007-09-22 13:51:01.000000000 +0200
-@@ -255,6 +255,7 @@
-     int max_keycode;
- 
-     AltMask = 0;
-+    int ModeMask = 0;
-     MetaMask = 0;
-     NumLockMask = 0;
-     ScrollLockMask = 0;
-@@ -303,9 +304,17 @@
-                 {
-                     AltMask |= (1 << ( i / modmap->max_keypermod));
-                 }
-+                else if (syms[j] == XK_Mode_switch)
-+                {
-+                    ModeMask |= (1 << ( i / modmap->max_keypermod));
-+                }
-             }
-         }
-     }
-+     
-+    if (AltMask == 0) /* if we don't have any alt keys, use the option keys */
-+        AltMask = ModeMask;
-+    
-     KeyMask =
-         ControlMask | ShiftMask | AltMask | MetaMask | SuperMask | HyperMask;
- 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080328/2cf6940a/attachment.html