September 2009 - Xquartz-changes - lists.macosforge.org

[372] AppleSGLX/tags/AppleSGLX-58/
by source_changes＠macosforge.org 30 Sep '09

30 Sep '09

Revision: 372 http://trac.macosforge.org/projects/xquartz/changeset/372 Author: jeremyhu(a)freedesktop.org Date: 2009-09-30 12:31:21 -0700 (Wed, 30 Sep 2009) Log Message: ----------- Tagging AppleSGLX-58 Added Paths: ----------- AppleSGLX/tags/AppleSGLX-58/

1 0

[371] AppleSGLX/trunk
by source_changes＠macosforge.org 30 Sep '09

30 Sep '09

Revision: 371 http://trac.macosforge.org/projects/xquartz/changeset/371 Author: jeremyhu(a)freedesktop.org Date: 2009-09-30 12:11:00 -0700 (Wed, 30 Sep 2009) Log Message: ----------- Don't crash when trying to initialize GLX when run as a remote client. This should fix the crash mentioned in ticket #317 Modified Paths: -------------- AppleSGLX/trunk/glxcmds.c AppleSGLX/trunk/glxext.c Modified: AppleSGLX/trunk/glxcmds.c =================================================================== --- AppleSGLX/trunk/glxcmds.c 2009-09-17 01:21:29 UTC (rev 370) +++ AppleSGLX/trunk/glxcmds.c 2009-09-30 19:11:00 UTC (rev 371) @@ -1401,6 +1401,10 @@ int i; *nelements = 0; + + if(!priv) + return NULL; + if ( (priv->screenConfigs != NULL) && (screen >= 0) && (screen <= ScreenCount(dpy)) && (priv->screenConfigs[screen].configs != NULL) Modified: AppleSGLX/trunk/glxext.c =================================================================== --- AppleSGLX/trunk/glxext.c 2009-09-17 01:21:29 UTC (rev 370) +++ AppleSGLX/trunk/glxext.c 2009-09-30 19:11:00 UTC (rev 371) @@ -758,9 +758,8 @@ if (glx_direct) dpyPriv->driswDisplay = driswCreateDisplay(dpy); #endif - apple_init_glx(dpy); - if (!AllocAndFetchScreenConfigs(dpy, dpyPriv)) { + if (apple_init_glx(dpy) || !AllocAndFetchScreenConfigs(dpy, dpyPriv)) { __glXUnlock(); Xfree((char*) dpyPriv); Xfree((char*) private);

1 0

[370] trunk/pkg/scripts
by source_changes＠macosforge.org 17 Sep '09

17 Sep '09

Revision: 370 http://trac.macosforge.org/projects/xquartz/changeset/370 Author: jeremyhu(a)freedesktop.org Date: 2009-09-16 18:21:29 -0700 (Wed, 16 Sep 2009) Log Message: ----------- sl postinst script Added Paths: ----------- trunk/pkg/scripts/postinst_leo.sh trunk/pkg/scripts/postinst_sl.sh trunk/pkg/scripts/preinst_leo.sh Removed Paths: ------------- trunk/pkg/scripts/postinst.sh trunk/pkg/scripts/preinst.sh Deleted: trunk/pkg/scripts/postinst.sh =================================================================== --- trunk/pkg/scripts/postinst.sh 2009-08-13 14:53:01 UTC (rev 369) +++ trunk/pkg/scripts/postinst.sh 2009-09-17 01:21:29 UTC (rev 370) @@ -1,13 +0,0 @@ -#!/bin/sh -# Cache system fonts -/usr/X11/bin/font_cache --force --system - -# Load the privileged_startx daemon -/bin/launchctl unload -w /System/Library/LaunchDaemons/org.x.privileged_startx.plist >& /dev/null -/bin/launchctl load -w /System/Library/LaunchDaemons/org.x.privileged_startx.plist - -if [ -d /usr/X11/share/X11/xkb ] ; then - rm -rf /usr/X11/share/X11/xkb -fi - -exit 0 Copied: trunk/pkg/scripts/postinst_leo.sh (from rev 369, trunk/pkg/scripts/postinst.sh) =================================================================== --- trunk/pkg/scripts/postinst_leo.sh (rev 0) +++ trunk/pkg/scripts/postinst_leo.sh 2009-09-17 01:21:29 UTC (rev 370) @@ -0,0 +1,13 @@ +#!/bin/sh +# Cache system fonts +/usr/X11/bin/font_cache --force --system + +# Load the privileged_startx daemon +/bin/launchctl unload -w /System/Library/LaunchDaemons/org.x.privileged_startx.plist >& /dev/null +/bin/launchctl load -w /System/Library/LaunchDaemons/org.x.privileged_startx.plist + +if [ -d /usr/X11/share/X11/xkb ] ; then + rm -rf /usr/X11/share/X11/xkb +fi + +exit 0 Added: trunk/pkg/scripts/postinst_sl.sh =================================================================== --- trunk/pkg/scripts/postinst_sl.sh (rev 0) +++ trunk/pkg/scripts/postinst_sl.sh 2009-09-17 01:21:29 UTC (rev 370) @@ -0,0 +1,5 @@ +#!/bin/sh +# Cache system fonts +/opt/X11/bin/font_cache --force --system + +exit 0 Property changes on: trunk/pkg/scripts/postinst_sl.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/pkg/scripts/preinst.sh =================================================================== --- trunk/pkg/scripts/preinst.sh 2009-08-13 14:53:01 UTC (rev 369) +++ trunk/pkg/scripts/preinst.sh 2009-09-17 01:21:29 UTC (rev 370) @@ -1,47 +0,0 @@ -#!/bin/sh -# Kill off old X11.app before installing because relocation will use this one -if [ -d /usr/X11/X11.app ] ; then - rm -rf /usr/X11/X11.app -fi - -# Remove these, so the new compressed man pages are used -if [[ -f /usr/share/man/man1/quartz-wm.1 ]] ; then - rm /usr/share/man/man1/quartz-wm.1 -fi -if [[ -d /usr/X11/man && ! -h /usr/X11/man ]] ; then - rm -rf /usr/X11/man -fi - -# This plist is the old name (and the future name for X11.app) -if [ -f /System/Library/LaunchAgents/org.x.X11.plist ] ; then - /bin/launchctl unload -w /System/Library/LaunchAgents/org.x.X11.plist - rm /System/Library/LaunchAgents/org.x.X11.plist -fi -if [ -f /Library/LaunchAgents/org.x.X11.plist ] ; then - /bin/launchctl unload -w /Library/LaunchAgents/org.x.X11.plist - rm /Library/LaunchAgents/org.x.X11.plist -fi - -# This is done now by startx -if [ -f /System/Library/LaunchAgents/org.x.fontconfig.plist ] ; then - /bin/launchctl unload -w /System/Library/LaunchAgents/org.x.fontconfig.plist - rm /System/Library/LaunchAgents/org.x.fontconfig.plist -fi - -# This is done now by privileged_startx -if [ -f /System/Library/LaunchDaemons/org.x.font_cache.plist ] ; then - /bin/launchctl unload -w /System/Library/LaunchDaemons/org.x.font_cache.plist - rm /System/Library/LaunchDaemons/org.x.font_cache.plist -fi - -# This stuff was moved to xinit dir in the final release of 2.2.0 -[ -f /usr/X11/bin/privileged_startx ] && rm /usr/X11/bin/privileged_startx -[ -f /usr/X11/sbin/privileged_startx.sh ] && rm /usr/X11/sbin/privileged_startx.sh - -# Renamed to drop the .sh -[ -f /usr/X11/bin/font_cache.sh ] && rm /usr/X11/bin/font_cache.sh - -[ -f /usr/X11/lib/X11/xinit/xinitrc.d/98-pbproxy.sh ] && rm /usr/X11/lib/X11/xinit/xinitrc.d/98-pbproxy.sh -[ -f /usr/X11/lib/X11/xinit/xinitrc.d/98-xpbproxy.sh ] && rm /usr/X11/lib/X11/xinit/xinitrc.d/98-xpbproxy.sh - -exit 0 Copied: trunk/pkg/scripts/preinst_leo.sh (from rev 369, trunk/pkg/scripts/preinst.sh) =================================================================== --- trunk/pkg/scripts/preinst_leo.sh (rev 0) +++ trunk/pkg/scripts/preinst_leo.sh 2009-09-17 01:21:29 UTC (rev 370) @@ -0,0 +1,47 @@ +#!/bin/sh +# Kill off old X11.app before installing because relocation will use this one +if [ -d /usr/X11/X11.app ] ; then + rm -rf /usr/X11/X11.app +fi + +# Remove these, so the new compressed man pages are used +if [[ -f /usr/share/man/man1/quartz-wm.1 ]] ; then + rm /usr/share/man/man1/quartz-wm.1 +fi +if [[ -d /usr/X11/man && ! -h /usr/X11/man ]] ; then + rm -rf /usr/X11/man +fi + +# This plist is the old name (and the future name for X11.app) +if [ -f /System/Library/LaunchAgents/org.x.X11.plist ] ; then + /bin/launchctl unload -w /System/Library/LaunchAgents/org.x.X11.plist + rm /System/Library/LaunchAgents/org.x.X11.plist +fi +if [ -f /Library/LaunchAgents/org.x.X11.plist ] ; then + /bin/launchctl unload -w /Library/LaunchAgents/org.x.X11.plist + rm /Library/LaunchAgents/org.x.X11.plist +fi + +# This is done now by startx +if [ -f /System/Library/LaunchAgents/org.x.fontconfig.plist ] ; then + /bin/launchctl unload -w /System/Library/LaunchAgents/org.x.fontconfig.plist + rm /System/Library/LaunchAgents/org.x.fontconfig.plist +fi + +# This is done now by privileged_startx +if [ -f /System/Library/LaunchDaemons/org.x.font_cache.plist ] ; then + /bin/launchctl unload -w /System/Library/LaunchDaemons/org.x.font_cache.plist + rm /System/Library/LaunchDaemons/org.x.font_cache.plist +fi + +# This stuff was moved to xinit dir in the final release of 2.2.0 +[ -f /usr/X11/bin/privileged_startx ] && rm /usr/X11/bin/privileged_startx +[ -f /usr/X11/sbin/privileged_startx.sh ] && rm /usr/X11/sbin/privileged_startx.sh + +# Renamed to drop the .sh +[ -f /usr/X11/bin/font_cache.sh ] && rm /usr/X11/bin/font_cache.sh + +[ -f /usr/X11/lib/X11/xinit/xinitrc.d/98-pbproxy.sh ] && rm /usr/X11/lib/X11/xinit/xinitrc.d/98-pbproxy.sh +[ -f /usr/X11/lib/X11/xinit/xinitrc.d/98-xpbproxy.sh ] && rm /usr/X11/lib/X11/xinit/xinitrc.d/98-xpbproxy.sh + +exit 0

1 0