[69745] trunk/dports/x11/xorg-server-devel
jeremyhu at macports.org
jeremyhu at macports.org
Thu Jul 15 01:06:10 PDT 2010
Revision: 69745
http://trac.macports.org/changeset/69745
Author: jeremyhu at macports.org
Date: 2010-07-15 01:06:07 -0700 (Thu, 15 Jul 2010)
Log Message:
-----------
xorg-server-devel: Bump to 1.8.99.905 (1.9 RC5)
Modified Paths:
--------------
trunk/dports/x11/xorg-server-devel/Portfile
Removed Paths:
-------------
trunk/dports/x11/xorg-server-devel/files/0005-XQuartz-Remove-some-dead-code.patch
trunk/dports/x11/xorg-server-devel/files/0025-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch
Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile 2010-07-15 07:58:26 UTC (rev 69744)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2010-07-15 08:06:07 UTC (rev 69745)
@@ -5,8 +5,7 @@
name xorg-server-devel
conflicts xorg-server
set my_name xorg-server
-version 1.8.99.904
-revision 1
+version 1.8.99.905
categories x11 devel
maintainers jeremyhu openmaintainer
description The X.org / Xquartz X server.
@@ -20,9 +19,9 @@
dist_subdir ${my_name}
distname ${my_name}-${version}
-checksums md5 5e987ddbd3796718b52ee0b7c06b3c68 \
- sha1 d0c3d76c873a40074c6bb2e3dc7c13c189a4a93b \
- rmd160 cba4c0cccc3ed1667b047b3ad4303d033c976bd1
+checksums md5 7772d0bdcf6819332fb3a896fa854bd8 \
+ sha1 10500fee2558edf69353932c3219c222d11be52f \
+ rmd160 67a55f934f0e2ab0932c410cc588cbaa1f027023
use_bzip2 yes
use_parallel_build yes
@@ -84,8 +83,6 @@
RAWCPP=${configure.cpp}
patchfiles \
- 0025-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch \
- 0005-XQuartz-Remove-some-dead-code.patch \
0006-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
0007-fb-Revert-fb-changes-that-broke-XQuartz.patch
Deleted: trunk/dports/x11/xorg-server-devel/files/0005-XQuartz-Remove-some-dead-code.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0005-XQuartz-Remove-some-dead-code.patch 2010-07-15 07:58:26 UTC (rev 69744)
+++ trunk/dports/x11/xorg-server-devel/files/0005-XQuartz-Remove-some-dead-code.patch 2010-07-15 08:06:07 UTC (rev 69745)
@@ -1,96 +0,0 @@
-From 162f3143ff4d498c35880a1e569189c3fdf9dbae Mon Sep 17 00:00:00 2001
-From: Jan Hauffa <hauffa at in.tum.de>
-Date: Wed, 16 Jun 2010 09:25:41 -0700
-Subject: [PATCH 5/7] XQuartz: Remove some dead code.
-
-Signed-off-by: Jan Hauffa <hauffa at in.tum.de>
-Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- hw/xquartz/quartz.c | 4 ----
- hw/xquartz/quartzCocoa.m | 11 -----------
- hw/xquartz/quartzCommon.h | 15 ---------------
- 3 files changed, 0 insertions(+), 30 deletions(-)
-
-diff --git xorg-server-1.8.99.901/hw/xquartz/quartz.c xorg-server-1.8.99.901/hw/xquartz/quartz.c
-index 2828c57..bdaa262 100644
---- xorg-server-1.8.99.901/hw/xquartz/quartz.c
-+++ xorg-server-1.8.99.901/hw/xquartz/quartz.c
-@@ -67,12 +67,8 @@
- #define FAKE_RANDR 1
-
- // Shared global variables for Quartz modes
--int quartzEventWriteFD = -1;
- int quartzUseSysBeep = 0;
--int quartzUseAGL = 1;
--int quartzEnableKeyEquivalents = 1;
- int quartzServerVisible = FALSE;
--int quartzServerQuitting = FALSE;
- DevPrivateKeyRec quartzScreenKeyRec;
- int aquaMenuBarHeight = 0;
- QuartzModeProcsPtr quartzProcs = NULL;
-diff --git xorg-server-1.8.99.901/hw/xquartz/quartzCocoa.m xorg-server-1.8.99.901/hw/xquartz/quartzCocoa.m
-index 4501472..54c900d 100644
---- xorg-server-1.8.99.901/hw/xquartz/quartzCocoa.m
-+++ xorg-server-1.8.99.901/hw/xquartz/quartzCocoa.m
-@@ -44,17 +44,6 @@
- #include "darwin.h"
-
- /*
-- * QuartzFSUseQDCursor
-- * Return whether the screen should use a QuickDraw cursor.
-- */
--int QuartzFSUseQDCursor(
-- int depth) // screen depth
--{
-- return TRUE;
--}
--
--
--/*
- * QuartzBlockHandler
- * Clean out any autoreleased objects.
- */
-diff --git xorg-server-1.8.99.901/hw/xquartz/quartzCommon.h xorg-server-1.8.99.901/hw/xquartz/quartzCommon.h
-index c038ed0..eb761ed 100644
---- xorg-server-1.8.99.901/hw/xquartz/quartzCommon.h
-+++ xorg-server-1.8.99.901/hw/xquartz/quartzCommon.h
-@@ -51,20 +51,13 @@ typedef struct {
- #define QUARTZ_PRIV(pScreen) \
- ((QuartzScreenPtr)dixLookupPrivate(&pScreen->devPrivates, quartzScreenKey))
-
--// Data stored at startup for Cocoa front end
--extern int quartzEventWriteFD;
--
- // User preferences used by Quartz modes
- extern int quartzUseSysBeep;
--extern int focusOnNewWindow;
--extern int quartzUseAGL;
--extern int quartzEnableKeyEquivalents;
- extern int quartzFullscreenDisableHotkeys;
- extern int quartzOptionSendsAlt;
-
- // Other shared data
- extern int quartzServerVisible;
--extern int quartzServerQuitting;
- extern DevPrivateKeyRec quartzScreenKeyRec;
- #define quartzScreenKey (&quartzScreenKeyRec)
- extern int aquaMenuBarHeight;
-@@ -72,14 +65,6 @@ extern int aquaMenuBarHeight;
- // Name of GLX bundle for native OpenGL
- extern const char *quartzOpenGLBundle;
-
--void QuartzReadPreferences(void);
--void QuartzMessageMainThread(unsigned msg, void *data, unsigned length);
--void QuartzMessageServerThread(int type, int argc, ...);
--void QuartzSetWindowMenu(int nitems, const char **items,
-- const char *shortcuts);
--void QuartzFSCapture(void);
--void QuartzFSRelease(void);
--int QuartzFSUseQDCursor(int depth);
- void QuartzBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask);
- void QuartzWakeupHandler(pointer blockData, int result, pointer pReadmask);
-
---
-1.7.1
-
Deleted: trunk/dports/x11/xorg-server-devel/files/0025-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0025-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch 2010-07-15 07:58:26 UTC (rev 69744)
+++ trunk/dports/x11/xorg-server-devel/files/0025-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch 2010-07-15 08:06:07 UTC (rev 69745)
@@ -1,51 +0,0 @@
-From 648d189548530fa23d97d1e8737f89d297f1c443 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Tue, 13 Jul 2010 08:25:27 -0700
-Subject: [PATCH 25/29] XQuartz: Avoid a crash when mistakenly free()ing in QuartzSetCursor on some configs
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- hw/xquartz/xpr/xprCursor.c | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git xorg-server-1.8.99.904/hw/xquartz/xpr/xprCursor.c xorg-server-1.8.99.904/hw/xquartz/xpr/xprCursor.c
-index 67fcbe7..a106e72 100644
---- xorg-server-1.8.99.904/hw/xquartz/xpr/xprCursor.c
-+++ xorg-server-1.8.99.904/hw/xquartz/xpr/xprCursor.c
-@@ -67,6 +67,7 @@ static Bool
- load_cursor(CursorPtr src, int screen)
- {
- uint32_t *data;
-+ Bool free_data = FALSE;
- uint32_t rowbytes;
- int width, height;
- int hot_x, hot_y;
-@@ -95,6 +96,7 @@ load_cursor(CursorPtr src, int screen)
- unsigned i;
- rowbytes = src->bits->width * sizeof (CARD32);
- data = malloc(rowbytes * src->bits->height);
-+ free_data = TRUE;
- if(!data) {
- FatalError("Failed to allocate memory in %s\n", __func__);
- }
-@@ -121,6 +123,7 @@ load_cursor(CursorPtr src, int screen)
- /* round up to 8 pixel boundary so we can convert whole bytes */
- rowbytes = ((src->bits->width * 4) + 31) & ~31;
- data = malloc(rowbytes * src->bits->height);
-+ free_data = TRUE;
- if(!data) {
- FatalError("Failed to allocate memory in %s\n", __func__);
- }
-@@ -173,7 +176,8 @@ load_cursor(CursorPtr src, int screen)
- }
-
- err = xp_set_cursor(width, height, hot_x, hot_y, data, rowbytes);
-- free(data);
-+ if(free_data)
-+ free(data);
- return err == Success;
- }
-
---
-1.7.1.1
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100715/d6f68e4a/attachment-0001.html>
More information about the macports-changes
mailing list