[64900] trunk/dports/x11/xorg-server
jeremyhu at macports.org
jeremyhu at macports.org
Tue Mar 16 19:42:20 PDT 2010
Revision: 64900
http://trac.macports.org/changeset/64900
Author: jeremyhu at macports.org
Date: 2010-03-16 19:42:17 -0700 (Tue, 16 Mar 2010)
Log Message:
-----------
xorg-server: Bump to 1.7.6
Modified Paths:
--------------
trunk/dports/x11/xorg-server/Portfile
Removed Paths:
-------------
trunk/dports/x11/xorg-server/files/0002-XQuartz-clang-static-analysis-fixes.patch
trunk/dports/x11/xorg-server/files/0003-XQuartz-Fix-a-possible-buffer-overrun-in-quartzAudio.patch
trunk/dports/x11/xorg-server/files/0004-XQuartz-Use-an-empty-xkb-keymap-by-default.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2010-03-17 02:14:54 UTC (rev 64899)
+++ trunk/dports/x11/xorg-server/Portfile 2010-03-17 02:42:17 UTC (rev 64900)
@@ -3,7 +3,7 @@
PortSystem 1.0
name xorg-server
-version 1.7.5
+version 1.7.6
categories x11 devel
maintainers jeremyhu openmaintainer
description The X.org / Xquartz X server.
@@ -14,9 +14,9 @@
#master_sites http://xquartz.macosforge.org/downloads/src
master_sites http://xorg.freedesktop.org/archive/individual/xserver/
-checksums md5 2856130aebf56e3df7b7d9be419bfb28 \
- sha1 c385293b66a6b0bc6bad648588f611d844c26ee7 \
- rmd160 900863aeb73967e33265e0445ddaa61feeecc452
+checksums md5 178225f499ec10fa9d312d1c339e6a39 \
+ sha1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 \
+ rmd160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7
use_bzip2 yes
use_parallel_build yes
@@ -74,9 +74,6 @@
configure.cppflags-append -I/usr/include -I${filespath}/dri
patchfiles \
- 0002-XQuartz-clang-static-analysis-fixes.patch \
- 0003-XQuartz-Fix-a-possible-buffer-overrun-in-quartzAudio.patch \
- 0004-XQuartz-Use-an-empty-xkb-keymap-by-default.patch \
0005-fb-Revert-fb-changes-that-broke-XQuartz.patch \
0006-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch
Deleted: trunk/dports/x11/xorg-server/files/0002-XQuartz-clang-static-analysis-fixes.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0002-XQuartz-clang-static-analysis-fixes.patch 2010-03-17 02:14:54 UTC (rev 64899)
+++ trunk/dports/x11/xorg-server/files/0002-XQuartz-clang-static-analysis-fixes.patch 2010-03-17 02:42:17 UTC (rev 64900)
@@ -1,272 +0,0 @@
-From 4127e8e5be5c366eb752bbb8d7f0ff5b519e641b Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Wed, 10 Feb 2010 17:56:30 -0800
-Subject: [PATCH 2/6] XQuartz: clang static analysis fixes
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- hw/xquartz/GL/indirect.c | 2 +-
- hw/xquartz/GL/visualConfigs.c | 3 +--
- hw/xquartz/X11Application.m | 18 ++++++++++--------
- hw/xquartz/mach-startup/bundle-main.c | 30 +++++++++++++++++++++++-------
- hw/xquartz/mach-startup/stub.c | 7 -------
- hw/xquartz/pbproxy/x-selection.h | 9 ---------
- hw/xquartz/quartzAudio.c | 1 +
- hw/xquartz/quartzKeyboard.c | 2 +-
- 8 files changed, 37 insertions(+), 35 deletions(-)
-
-diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
-index 1762825..44380ff 100644
---- a/hw/xquartz/GL/indirect.c
-+++ b/hw/xquartz/GL/indirect.c
-@@ -548,7 +548,7 @@ static CGLPixelFormatObj makeFormat(__GLXconfig *conf) {
- attr[i++] = conf->samples;
- }
-
-- attr[i++] = 0;
-+ attr[i + 1] = 0;
-
- error = CGLChoosePixelFormat(attr, &fobj, &formats);
- if(error) {
-diff --git a/hw/xquartz/GL/visualConfigs.c b/hw/xquartz/GL/visualConfigs.c
-index f926778..bef27f0 100644
---- a/hw/xquartz/GL/visualConfigs.c
-+++ b/hw/xquartz/GL/visualConfigs.c
-@@ -62,7 +62,7 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
- int numConfigs = 0;
- __GLXconfig *visualConfigs, *c;
- struct glCapabilities caps;
-- struct glCapabilitiesConfig *conf = NULL;
-+ struct glCapabilitiesConfig *conf;
- int stereo, depth, aux, buffers, stencil, accum, color, msample;
-
- if(getGlCapabilities(&caps)) {
-@@ -94,7 +94,6 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
- */
-
- assert(NULL != caps.configurations);
-- conf = caps.configurations;
-
- numConfigs = 0;
-
-diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
-index f3c8a30..3faa1cb 100644
---- a/hw/xquartz/X11Application.m
-+++ b/hw/xquartz/X11Application.m
-@@ -482,7 +482,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
- return out;
- }
-
--- (CFPropertyListRef) prefs_get:(NSString *)key {
-+- (CFPropertyListRef) prefs_get_copy:(NSString *)key {
- CFPropertyListRef value;
-
- value = CFPreferencesCopyAppValue ((CFStringRef) key, app_prefs_domain_cfstr);
-@@ -543,7 +543,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
- CFPropertyListRef value;
- int ret;
-
-- value = [self prefs_get:key];
-+ value = [self prefs_get_copy:key];
-
- if (value != NULL && CFGetTypeID (value) == CFNumberGetTypeID ())
- CFNumberGetValue (value, kCFNumberIntType, &ret);
-@@ -561,7 +561,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
- CFPropertyListRef value;
- const char *ret = NULL;
-
-- value = [self prefs_get:key];
-+ value = [self prefs_get_copy:key];
-
- if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
- NSString *s = (NSString *) value;
-@@ -578,12 +578,13 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
- CFPropertyListRef value;
- NSURL *ret = NULL;
-
-- value = [self prefs_get:key];
-+ value = [self prefs_get_copy:key];
-
- if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
- NSString *s = (NSString *) value;
-
- ret = [NSURL URLWithString:s];
-+ [ret retain];
- }
-
- if (value != NULL) CFRelease (value);
-@@ -595,7 +596,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
- CFPropertyListRef value;
- float ret = def;
-
-- value = [self prefs_get:key];
-+ value = [self prefs_get_copy:key];
-
- if (value != NULL
- && CFGetTypeID (value) == CFNumberGetTypeID ()
-@@ -613,7 +614,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
- CFPropertyListRef value;
- int ret = def;
-
-- value = [self prefs_get:key];
-+ value = [self prefs_get_copy:key];
-
- if (value != NULL) {
- if (CFGetTypeID (value) == CFNumberGetTypeID ())
-@@ -637,7 +638,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
- NSArray *ret = nil;
- CFPropertyListRef value;
-
-- value = [self prefs_get:key];
-+ value = [self prefs_get_copy:key];
-
- if (value != NULL) {
- if (CFGetTypeID (value) == CFArrayGetTypeID ())
-@@ -757,7 +758,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
- NSURL *url = [self prefs_copy_url:@PREFS_UPDATE_FEED default:nil];
- if(url) {
- [[SUUpdater sharedUpdater] setFeedURL:url];
-- CFRelease(url);
-+ [url release];
- }
- #endif
- }
-@@ -970,6 +971,7 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
- // [[SUUpdater sharedUpdater] checkForUpdates:X11App];
- #endif
-
-+ [pool release];
- [NSApp run];
- /* not reached */
- }
-diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
-index 0366f3b..4872ff5 100644
---- a/hw/xquartz/mach-startup/bundle-main.c
-+++ b/hw/xquartz/mach-startup/bundle-main.c
-@@ -641,30 +641,46 @@ static int execute(const char *command) {
- static char *command_from_prefs(const char *key, const char *default_value) {
- char *command = NULL;
-
-- CFStringRef cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingASCII);
-- CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
-+ CFStringRef cfKey;
-+ CFPropertyListRef PlistRef;
-+
-+ if(!key)
-+ return NULL;
-+
-+ cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingASCII);
-+
-+ if(!cfKey)
-+ return NULL;
-+
-+ PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
-
- if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
- CFStringRef cfDefaultValue = CFStringCreateWithCString(NULL, default_value, kCFStringEncodingASCII);
- int len = strlen(default_value) + 1;
-
-+ if(!cfDefaultValue)
-+ goto command_from_prefs_out;
-+
- CFPreferencesSetAppValue(cfKey, cfDefaultValue, kCFPreferencesCurrentApplication);
- CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
-+ CFRelease(cfDefaultValue);
-
- command = (char *)malloc(len * sizeof(char));
- if(!command)
-- return NULL;
-+ goto command_from_prefs_out;
- strcpy(command, default_value);
- } else {
- int len = CFStringGetLength((CFStringRef)PlistRef) + 1;
- command = (char *)malloc(len * sizeof(char));
- if(!command)
-- return NULL;
-+ goto command_from_prefs_out;
- CFStringGetCString((CFStringRef)PlistRef, command, len, kCFStringEncodingASCII);
-- }
--
-+ }
-+
-+command_from_prefs_out:
- if (PlistRef)
- CFRelease(PlistRef);
--
-+ if(cfKey)
-+ CFRelease(cfKey);
- return command;
- }
-diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
-index 89f9e10..ccf5ab4 100644
---- a/hw/xquartz/mach-startup/stub.c
-+++ b/hw/xquartz/mach-startup/stub.c
-@@ -73,7 +73,6 @@ static void set_x11_path(void) {
- #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-
- CFURLRef appURL = NULL;
-- CFBundleRef bundle = NULL;
- OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);
-
- switch (osstatus) {
-@@ -84,12 +83,6 @@ static void set_x11_path(void) {
- exit(1);
- }
-
-- bundle = CFBundleCreate(NULL, appURL);
-- if(!bundle) {
-- fprintf(stderr, "Xquartz: Null value returned from CFBundleCreate().\n");
-- exit(2);
-- }
--
- if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) {
- fprintf(stderr, "Xquartz: Error resolving URL for %s\n", kX11AppBundleId);
- exit(3);
-diff --git a/hw/xquartz/pbproxy/x-selection.h b/hw/xquartz/pbproxy/x-selection.h
-index fc903d0..614c8b0 100644
---- a/hw/xquartz/pbproxy/x-selection.h
-+++ b/hw/xquartz/pbproxy/x-selection.h
-@@ -58,15 +58,6 @@ struct atom_list {
- /* The unmapped window we use for fetching selections. */
- Window _selection_window;
-
-- /* Last time we declared anything on the pasteboard. */
-- int _my_last_change;
--
-- /* Name of the selection we're proxying onto the pasteboard. */
-- Atom _proxied_selection;
--
-- /* When true, we're expecting a SelectionNotify event. */
-- unsigned int _pending_notify :1;
--
- Atom request_atom;
-
- struct {
-diff --git a/hw/xquartz/quartzAudio.c b/hw/xquartz/quartzAudio.c
-index af63d18..e4b49fc 100644
---- a/hw/xquartz/quartzAudio.c
-+++ b/hw/xquartz/quartzAudio.c
-@@ -204,6 +204,7 @@ QuartzAudioIOProc(
- if (wasPlaying && !data->playing) {
- OSStatus err;
- err = AudioDeviceStop(inDevice, QuartzAudioIOProc);
-+ fprintf(stderr, "Error stopping audio device: %ld\n", (long int)err);
- }
- pthread_mutex_unlock(&data->lock);
- return 0;
-diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
-index 96b5fa5..3b4eac3 100644
---- a/hw/xquartz/quartzKeyboard.c
-+++ b/hw/xquartz/quartzKeyboard.c
-@@ -368,7 +368,7 @@ void DarwinKeyboardReloadHandler(void) {
- KeySymsRec keySyms;
- CFIndex initialKeyRepeatValue, keyRepeatValue;
- BOOL ok;
-- DeviceIntPtr pDev = darwinKeyboard;
-+ DeviceIntPtr pDev;
- const char *xmodmap = PROJECTROOT "/bin/xmodmap";
- const char *sysmodmap = PROJECTROOT "/lib/X11/xinit/.Xmodmap";
- const char *homedir = getenv("HOME");
---
-1.6.6.1
-
Deleted: trunk/dports/x11/xorg-server/files/0003-XQuartz-Fix-a-possible-buffer-overrun-in-quartzAudio.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0003-XQuartz-Fix-a-possible-buffer-overrun-in-quartzAudio.patch 2010-03-17 02:14:54 UTC (rev 64899)
+++ trunk/dports/x11/xorg-server/files/0003-XQuartz-Fix-a-possible-buffer-overrun-in-quartzAudio.patch 2010-03-17 02:42:17 UTC (rev 64900)
@@ -1,112 +0,0 @@
-From 4e8bf12b13690afa6d9fee0e339d3819ef16fb3f Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Mon, 15 Feb 2010 16:46:21 -0800
-Subject: [PATCH 3/6] XQuartz: Fix a possible buffer overrun in quartzAudio
-
-Also dropped deprecated API while there
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- hw/xquartz/quartzAudio.c | 36 ++++++++++++++++++------------------
- 1 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/hw/xquartz/quartzAudio.c b/hw/xquartz/quartzAudio.c
-index e4b49fc..708202b 100644
---- a/hw/xquartz/quartzAudio.c
-+++ b/hw/xquartz/quartzAudio.c
-@@ -62,7 +62,6 @@ typedef struct QuartzAudioRec {
- UInt32 curFrame;
- UInt32 remainingFrames;
- UInt32 totalFrames;
-- UInt32 bytesPerFrame;
- double sampleRate;
- UInt32 fadeLength;
-
-@@ -117,9 +116,9 @@ static void QuartzFillBuffer(
- unsigned int bufferFrameCount;
- float multiplier, v;
- int i;
--
-+
- buffer = (float *)audiobuffer->mData;
-- bufferFrameCount = audiobuffer->mDataByteSize / data->bytesPerFrame;
-+ bufferFrameCount = audiobuffer->mDataByteSize / (sizeof(float) * audiobuffer->mNumberChannels);
-
- frameCount = min(bufferFrameCount, data->remainingFrames);
-
-@@ -141,7 +140,7 @@ static void QuartzFillBuffer(
- data->prevFrame = 0;
-
- // adjust for space eaten by prev fade
-- buffer += audiobuffer->mNumberChannels*frame;
-+ b += audiobuffer->mNumberChannels*frame;
- bufferFrameCount -= frame;
- frameCount = min(bufferFrameCount, data->remainingFrames);
- }
-@@ -204,7 +203,8 @@ QuartzAudioIOProc(
- if (wasPlaying && !data->playing) {
- OSStatus err;
- err = AudioDeviceStop(inDevice, QuartzAudioIOProc);
-- fprintf(stderr, "Error stopping audio device: %ld\n", (long int)err);
-+ if(err != noErr)
-+ fprintf(stderr, "Error stopping audio device: %ld\n", (long int)err);
- }
- pthread_mutex_unlock(&data->lock);
- return 0;
-@@ -263,16 +263,17 @@ void QuartzAudioInit(void)
- UInt32 propertySize;
- OSStatus status;
- AudioDeviceID outputDevice;
-- AudioStreamBasicDescription outputStreamDescription;
- double sampleRate;
--
-+ AudioObjectPropertyAddress devicePropertyAddress = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
-+ AudioObjectPropertyAddress sampleRatePropertyAddress = { kAudioDevicePropertyNominalSampleRate, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
-+
- // Get the default output device
- propertySize = sizeof(outputDevice);
-- status = AudioHardwareGetProperty(
-- kAudioHardwarePropertyDefaultOutputDevice,
-- &propertySize, &outputDevice);
-+ status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &devicePropertyAddress,
-+ 0, NULL,
-+ &propertySize, &outputDevice);
- if (status) {
-- ErrorF("QuartzAudioInit: AudioHardwareGetProperty returned %ld\n",
-+ ErrorF("QuartzAudioInit: AudioObjectGetPropertyData(output device) returned %ld\n",
- (long)status);
- return;
- }
-@@ -282,23 +283,22 @@ void QuartzAudioInit(void)
- }
-
- // Get the basic device description
-- propertySize = sizeof(outputStreamDescription);
-- status = AudioDeviceGetProperty(outputDevice, 0, FALSE,
-- kAudioDevicePropertyStreamFormat,
-- &propertySize, &outputStreamDescription);
-+ sampleRate = 0.;
-+ propertySize = sizeof(sampleRate);
-+ status = AudioObjectGetPropertyData(outputDevice, &sampleRatePropertyAddress,
-+ 0, NULL,
-+ &propertySize, &sampleRate);
- if (status) {
-- ErrorF("QuartzAudioInit: GetProperty(stream format) returned %ld\n",
-+ ErrorF("QuartzAudioInit: AudioObjectGetPropertyData(sample rate) returned %ld\n",
- (long)status);
- return;
- }
-- sampleRate = outputStreamDescription.mSampleRate;
-
- // Fill in the playback data
- data.frequency = 0;
- data.amplitude = 0;
- data.curFrame = 0;
- data.remainingFrames = 0;
-- data.bytesPerFrame = outputStreamDescription.mBytesPerFrame;
- data.sampleRate = sampleRate;
- // data.bufferByteCount = bufferByteCount;
- data.playing = FALSE;
---
-1.6.6.1
-
Deleted: trunk/dports/x11/xorg-server/files/0004-XQuartz-Use-an-empty-xkb-keymap-by-default.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0004-XQuartz-Use-an-empty-xkb-keymap-by-default.patch 2010-03-17 02:14:54 UTC (rev 64899)
+++ trunk/dports/x11/xorg-server/files/0004-XQuartz-Use-an-empty-xkb-keymap-by-default.patch 2010-03-17 02:42:17 UTC (rev 64900)
@@ -1,86 +0,0 @@
-From 89727d3db19a6eaa06125b982fff866a88901ce9 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Wed, 10 Feb 2010 15:52:14 -0800
-Subject: [PATCH 4/6] XQuartz: Use an empty xkb keymap by default
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- hw/xquartz/darwin.c | 6 ++++++
- hw/xquartz/quartzKeyboard.c | 16 +++++-----------
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
-index 3feacdc..066f5a5 100644
---- a/hw/xquartz/darwin.c
-+++ b/hw/xquartz/darwin.c
-@@ -45,6 +45,7 @@
- #include "site.h"
- #include "globals.h"
- #include "dix.h"
-+#include "xkbsrv.h"
-
- #include <X11/extensions/XI.h>
- #include <X11/extensions/XIproto.h>
-@@ -461,6 +462,11 @@ int DarwinParseModifierList(const char *constmodifiers, int separatelr)
- */
- void InitInput( int argc, char **argv )
- {
-+ XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",
-+ .variant = NULL, .options = NULL };
-+ /* We need to really have rules... or something... */
-+ XkbSetRulesDflts(&rmlvo);
-+
- darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);
- RegisterKeyboardDevice( darwinKeyboard );
- darwinKeyboard->name = strdup("keyboard");
-diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
-index 3b4eac3..7e36a9a 100644
---- a/hw/xquartz/quartzKeyboard.c
-+++ b/hw/xquartz/quartzKeyboard.c
-@@ -301,9 +301,6 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
- // for a kIOHIDParamConnectType connection.
- assert(darwinParamConnect = NXOpenEventStatus());
-
-- /* We need to really have rules... or something... */
-- //XkbSetRulesDflts("base", "pc105", "us", NULL, NULL);
--
- InitKeyboardDeviceStruct(pDev, NULL, DarwinKeyboardBell, DarwinChangeKeyboardControl);
-
- DarwinKeyboardReloadHandler();
-@@ -775,12 +772,9 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
- #endif
- }
-
-- // There seems to be an issue with this in 1.5+, shift-space is not
-- // producing space, it's sending NoSymbol... ?
-- //if (k[3] == k[2]) k[3] = NoSymbol;
-- //if (k[1] == k[0]) k[1] = NoSymbol;
-- //if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
-- //if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol;
-+ if (k[3] == k[2]) k[3] = NoSymbol;
-+ if (k[1] == k[0]) k[1] = NoSymbol;
-+ if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
- }
-
- /* Fix up some things that are normally missing.. */
-@@ -791,7 +785,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
-
- if (k[0] == NoSymbol && k[1] == NoSymbol
- && k[2] == NoSymbol && k[3] == NoSymbol)
-- k[0] = k[1] = k[2] = k[3] = known_keys[i].keysym;
-+ k[0] = known_keys[i].keysym;
- }
- }
-
-@@ -804,7 +798,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
- k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY;
-
- if (k[0] == known_numeric_keys[i].normal)
-- k[0] = k[1] = k[2] = k[3] = known_numeric_keys[i].keypad;
-+ k[0] = known_numeric_keys[i].keypad;
- }
- }
-
---
-1.6.6.1
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100316/080d60b7/attachment.html>
More information about the macports-changes
mailing list