[49240] trunk/dports/x11/xorg-server

[jeremyhu at macports.org]

Revision: 49240
          http://trac.macports.org/changeset/49240
Author:   jeremyhu at macports.org
Date:     2009-04-05 19:36:02 -0700 (Sun, 05 Apr 2009)
Log Message:
-----------
xorg-server: bump to 1.4.2-apple40

Modified Paths:
--------------
    trunk/dports/x11/xorg-server/Portfile

Removed Paths:
-------------
    trunk/dports/x11/xorg-server/files/bgmouse.patch

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2009-04-06 02:35:53 UTC (rev 49239)
+++ trunk/dports/x11/xorg-server/Portfile	2009-04-06 02:36:02 UTC (rev 49240)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name		xorg-server
-version		1.4.2-apple38
+version		1.4.2-apple40
 categories	x11 devel
 maintainers	jeremyhu openmaintainer
 description	The X.org / Xquartz X server.
@@ -19,10 +19,10 @@
 distfiles	[suffix ${distname}]:xq \
 		[suffix MesaLib-${mesavers}]:mesa
 
-checksums           xorg-server-1.4.2-apple38.tar.bz2 \
-                    md5     790ffd684af48c81ac10fbfe64dc5f13 \
-                    sha1    2cdf21d33fccd8c188b2cfd694f6c30b86f84595 \
-                    rmd160  61d839be263d9111914b901b8bf620e4e35f0c6c \
+checksums           xorg-server-1.4.2-apple40.tar.bz2 \
+                    md5     d8b1f53e29b2d7314314975c955c1d12 \
+                    sha1    854498d0f133c13913b39989237a9a5b443e2d42 \
+                    rmd160  878e5b694b4ff9f546d0e8a9554b58f50169a2af \
                     MesaLib-7.0.4.tar.bz2 \
                     md5     8d7bacbe0234742a5d08c8088c4619e9 \
                     sha1    7e2ecbe89d245510d2681d04e959aee6adc205c5 \
@@ -65,8 +65,6 @@
 	port:xorg-libAppleWM \
 	port:xorg-libXfixes
 
-patchfiles bgmouse.patch
-
 post-patch {
 	reinplace "s|ensure_path(X11BINDIR);|ensure_path(X11BINDIR); ensure_path(\"${x11prefix}/bin\");|" ${worksrcpath}/hw/xquartz/mach-startup/bundle-main.c
 

Deleted: trunk/dports/x11/xorg-server/files/bgmouse.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/bgmouse.patch	2009-04-06 02:35:53 UTC (rev 49239)
+++ trunk/dports/x11/xorg-server/files/bgmouse.patch	2009-04-06 02:36:02 UTC (rev 49240)
@@ -1,36 +0,0 @@
-diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
-index 6a0e011..e459b4c 100644
---- hw/xquartz/X11Application.m
-+++ hw/xquartz/X11Application.m
-@@ -1067,15 +1067,14 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
-                 pDev = darwinTabletCurrent;
-             }
- 
-+            if(!quartzServerVisible) {
-+#if 0
- /* Seems this has somehow triggered 100% CPU usage while X11.app is in the
-  * background on some obscure HW configurations.
-  * http://xquartz.macosforge.org/trac/ticket/241
-  */
--#if 0
-+//#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION > 0
- /* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */
--#ifdef XPLUGIN_VERSION
--#if XPLUGIN_VERSION > 0
--            if(!quartzServerVisible) {
-                 xp_window_id wid;
- 
-                 /* Sigh. Need to check that we're really over one of
-@@ -1088,11 +1087,9 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
-                 
-                 if (xp_find_window(pointer_x, pointer_y, 0, &wid) == XP_Success &&
-                     wid == 0)
-+#endif
-                     return;        
-             }
--#endif
--#endif
--#endif
-             
-             DarwinSendPointerEvents(pDev, ev_type, ev_button, pointer_x, pointer_y,
-                                     pressure, tilt_x, tilt_y);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090405/b0b90a08/attachment-0001.html>