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

[361] trunk
by source_changes＠macosforge.org 26 Jul '09

26 Jul '09

Revision: 361 http://trac.macosforge.org/projects/xquartz/changeset/361 Author: jeremyhu(a)freedesktop.org Date: 2009-07-26 11:50:07 -0700 (Sun, 26 Jul 2009) Log Message: ----------- Added a script to help users bisect to a working version Modified Paths: -------------- trunk/compile-xserver.sh Added Paths: ----------- trunk/find_version_delta.sh Modified: trunk/compile-xserver.sh =================================================================== --- trunk/compile-xserver.sh 2009-07-24 13:15:47 UTC (rev 360) +++ trunk/compile-xserver.sh 2009-07-26 18:50:07 UTC (rev 361) @@ -1,7 +1,7 @@ #!/bin/bash -CONFIGURE="./autogen.sh" -#CONFIGURE="./configure" +#CONFIGURE="./autogen.sh" +CONFIGURE="./configure" #CONFOPT="--disable-xquartz --disable-launchd --enable-kdrive --disable-xsdl --enable-xnest --enable-xvfb" #CONFOPT="--disable-glx" @@ -15,15 +15,28 @@ . ~/src/strip.sh -export ACLOCAL="aclocal -I /usr/X11/share/aclocal" +ACLOCAL="aclocal -I /usr/X11/share/aclocal" +CFLAGS="-Wall -pipe -DNO_ALLOCA" +CFLAGS="$CFLAGS -O0 -ggdb3" +#CFLAGS="$CFLAGS -O2" +CFLAGS="$CFLAGS -arch i386 -arch ppc" + +LDFLAGS="$CFLAGS" + +CPPFLAGS="$CPPFLAGS -F/Applications/Utilities/X11.app/Contents/Frameworks" +LDFLAGS="$LDFLAGS -F/Applications/Utilities/X11.app/Contents/Frameworks" + +export ACLOCAL CPPFLAGS CFLAGS LDFLAGS + + die() { echo "${@}" >&2 exit 1 } docomp() { - ${CONFIGURE} --prefix=/usr/X11 --with-mesa-source="${MESA}" ${CONFOPT} --disable-dependency-tracking --enable-maintainer-mode --enable-record "${@}" || die "Could not configure xserver" + ${CONFIGURE} --prefix=/usr/X11 --with-mesa-source="${MESA}" ${CONFOPT} --disable-dependency-tracking --enable-maintainer-mode --enable-xcsecurity --enable-record --enable-sparkle "${@}" || die "Could not configure xserver" ${MAKE} clean || die "Unable to make clean" ${MAKE} ${MAKE_OPTS} || die "Could not make xserver" } @@ -35,7 +48,7 @@ dosign() { /opt/local/bin/gmd5sum $1 > $1.md5sum /opt/local/bin/gsha1sum $1 > $1.sha1sum - /opt/local/bin/gpg2 -b $1 + /opt/local/bin/gpg -b $1 } dodist() { Added: trunk/find_version_delta.sh =================================================================== --- trunk/find_version_delta.sh (rev 0) +++ trunk/find_version_delta.sh 2009-07-26 18:50:07 UTC (rev 361) @@ -0,0 +1,54 @@ +#!/bin/bash + +install_version () { + local version=$1 + if [[ ! -f X11.bin-${version} ]] ; then + if [[ ! -f X11.bin-${version}.bz2 ]] ; then + curl -LO http://static.macosforge.org/xquartz/downloads/archive/X11.bin-${version}.b… || die "Failed to fetch version ${version}" + fi + bunzip2 X11.bin-${version}.bz2 || die "Failed to decompress version ${version}" + fi + chmod 755 X11.bin-${version} || die "Failed to chmod version ${version}" + cp X11.bin-${version} /Applications/Utilities/X11.app/Contents/MacOS/X11.bin || die "Failed to install version ${version}. This needs to be done as root (run 'sudo ./find_version_delta.sh')" +} + +die() { + echo "${@}" >&2 + exit 1 +} + +((LO=18)) +((HI=45)) + +TMPDIR=/tmp/test_x11 + +if ! [[ -d ${TMPDIR} ]] ; then + mkdir ${TMPDIR} || die "Could not make #{TMPDIR}" +fi + +cd ${TMPDIR} + +while (( HI - LO > 1 )) ; do + (( TRY = (LO + HI) / 2)) + version="1.4.2-apple${TRY}" + echo "Trying ${version}" + + install_version ${version} + + echo "Please quit X11.app and restart it." + ANSWER="" + while ! [[ ${ANSWER} == "y" || ${ANSWER} == "n" ]] ; do + echo -n "Is this version working (y/n)? " + read ANSWER + done + + # Assuming newer is broken + if [[ ${ANSWER} == "y" ]] ; then + (( LO=TRY )) + else + (( HI=TRY )) + fi +done + +echo "1.4.2-apple${LO} was the last to work" +echo "1.4.2-apple${HI} was the first to break" Property changes on: trunk/find_version_delta.sh ___________________________________________________________________ Added: svn:executable + *

1 0

[360] trunk/pkg
by source_changes＠macosforge.org 24 Jul '09

24 Jul '09

Revision: 360 http://trac.macosforge.org/projects/xquartz/changeset/360 Author: jeremyhu(a)freedesktop.org Date: 2009-07-24 06:15:47 -0700 (Fri, 24 Jul 2009) Log Message: ----------- Updated mkdmg to help Sparkle Modified Paths: -------------- trunk/pkg/README.2.4.0.txt trunk/pkg/mkdmg.sh Modified: trunk/pkg/README.2.4.0.txt =================================================================== --- trunk/pkg/README.2.4.0.txt 2009-07-24 03:08:58 UTC (rev 359) +++ trunk/pkg/README.2.4.0.txt 2009-07-24 13:15:47 UTC (rev 360) @@ -6,7 +6,7 @@ === OS-X Requirements === -OS-X 10.5.6 or later is required to install this package. +OS-X 10.5.7 or later is required to install this package. === Mac OS-X Updates === @@ -51,7 +51,6 @@ * proto: * applewmproto 1.3.0 * dri2proto 2.1 - * fixesproto 4.1 * glproto 1.4.10 * inputproto 1.5.1 * renderproto 0.11 Modified: trunk/pkg/mkdmg.sh =================================================================== --- trunk/pkg/mkdmg.sh 2009-07-24 03:08:58 UTC (rev 359) +++ trunk/pkg/mkdmg.sh 2009-07-24 13:15:47 UTC (rev 360) @@ -1,6 +1,21 @@ -mkdir $1.d -mv $1.pkg $1.d -hdiutil create -srcfolder $1.d -format UDBZ -volname "$1" $1.dmg -mv $1.d/$1.pkg . +#!/bin/bash + +verString=$1 + +mkdir ${verString}.d +mv ${verString}.pkg ${verString}.d/X11.pkg +hdiutil create -srcfolder ${verString}.d -format UDBZ -volname "${verString}" ${verString}.dmg +mv ${verString}.d/X11.pkg ${verString}.pkg rmdir $1.d +dosign ${verString}.dmg + +DSA=$(./sign_update.rb ${verString}.dmg sparkle_priv.pem) +SIZE=$(wc -c ${verString}.dmg | awk '{print $1}') +echo " <item>" +echo " <title>${verString}</title>" +echo " <sparkle:releaseNotesLink>http://xquartz.macosforge.org/trac/wiki/ChangeLog</sparkle:releaseNotesLink>" +echo " <pubDate>$(date)</pubDate>" +echo " <enclosure url=\"http://xquartz.macosforge.org/downloads/${verString}.dmg\" sparkle:version=\"$2\" sparkle:shortVersionString=\"${verString}\" length=\"${SIZE}\" type=\"application/octet-stream\" sparkle:dsaSignature=\"${DSA}\" />" +echo " </item>" +

1 0

[359] trunk/pkg/README.2.4.0.txt
by source_changes＠macosforge.org 24 Jul '09

24 Jul '09

Revision: 359 http://trac.macosforge.org/projects/xquartz/changeset/359 Author: jeremyhu(a)freedesktop.org Date: 2009-07-23 20:08:58 -0700 (Thu, 23 Jul 2009) Log Message: ----------- More 2.4.0 changes... hopefully ready for rc now Modified Paths: -------------- trunk/pkg/README.2.4.0.txt Modified: trunk/pkg/README.2.4.0.txt =================================================================== --- trunk/pkg/README.2.4.0.txt 2009-07-19 04:37:22 UTC (rev 358) +++ trunk/pkg/README.2.4.0.txt 2009-07-24 03:08:58 UTC (rev 359) @@ -51,12 +51,13 @@ * proto: * applewmproto 1.3.0 * dri2proto 2.1 + * fixesproto 4.1 * glproto 1.4.10 * inputproto 1.5.1 * renderproto 0.11 * xcb-proto 1.5 * server: - * Xquartz fixes from xorg-server-1.5.0-apple11 + * Xquartz fixes from xorg-server-1.5.0-apple12 * xserver codebase updated to 1.5 branch * rewritten AIGLX dispatch code * Localization updates

1 0

[358] trunk/pkg/README.2.4.0.txt
by source_changes＠macosforge.org 19 Jul '09

19 Jul '09

Revision: 358 http://trac.macosforge.org/projects/xquartz/changeset/358 Author: jeremyhu(a)freedesktop.org Date: 2009-07-18 21:37:22 -0700 (Sat, 18 Jul 2009) Log Message: ----------- More updates for 2.4.0_beta4 Modified Paths: -------------- trunk/pkg/README.2.4.0.txt Modified: trunk/pkg/README.2.4.0.txt =================================================================== --- trunk/pkg/README.2.4.0.txt 2009-07-16 23:21:47 UTC (rev 357) +++ trunk/pkg/README.2.4.0.txt 2009-07-19 04:37:22 UTC (rev 358) @@ -61,6 +61,8 @@ * rewritten AIGLX dispatch code * Localization updates * Don't zombie "jumpstart" process at launch + * GLXFBConfigs and GLXVisuals don't contain duplicates when using multiple monitors + * Automatic updates using Sparkle == Changes in 2.3.3.2 == * All changes in 2.3.3.1 plus:

1 0

[357] trunk/pkg/README.2.4.0.txt
by source_changes＠macosforge.org 16 Jul '09

16 Jul '09

Revision: 357 http://trac.macosforge.org/projects/xquartz/changeset/357 Author: jeremyhu(a)freedesktop.org Date: 2009-07-16 16:21:47 -0700 (Thu, 16 Jul 2009) Log Message: ----------- More 2.4.0 notes Modified Paths: -------------- trunk/pkg/README.2.4.0.txt Modified: trunk/pkg/README.2.4.0.txt =================================================================== --- trunk/pkg/README.2.4.0.txt 2009-07-16 00:06:01 UTC (rev 356) +++ trunk/pkg/README.2.4.0.txt 2009-07-16 23:21:47 UTC (rev 357) @@ -32,6 +32,8 @@ * lib: * cairo 1.8.8 * fontconfig 2.7.0 + * freetype + * no longer built --with-old-mac-fonts in order to prevent linking against CoreFoundation. See #280 * libAppleWM 1.3.0 * libFS 1.0.2 * libpng 1.2.37 @@ -54,8 +56,9 @@ * renderproto 0.11 * xcb-proto 1.5 * server: - * Xquartz fixes from xorg-server-1.5.0-apple10 + * Xquartz fixes from xorg-server-1.5.0-apple11 * xserver codebase updated to 1.5 branch + * rewritten AIGLX dispatch code * Localization updates * Don't zombie "jumpstart" process at launch

1 0

[356] trunk/pkg/README.2.4.0.txt
by source_changes＠macosforge.org 16 Jul '09

16 Jul '09

Revision: 356 http://trac.macosforge.org/projects/xquartz/changeset/356 Author: jeremyhu(a)freedesktop.org Date: 2009-07-15 17:06:01 -0700 (Wed, 15 Jul 2009) Log Message: ----------- More 2.4.0 updates Modified Paths: -------------- trunk/pkg/README.2.4.0.txt Modified: trunk/pkg/README.2.4.0.txt =================================================================== --- trunk/pkg/README.2.4.0.txt 2009-07-09 04:48:51 UTC (rev 355) +++ trunk/pkg/README.2.4.0.txt 2009-07-16 00:06:01 UTC (rev 356) @@ -35,7 +35,8 @@ * libAppleWM 1.3.0 * libFS 1.0.2 * libpng 1.2.37 - * libxcb 1.3 + * libX11 1.2.2 + * libxcb 1.4 * libXaw 1.0.6 * libXplugin * Fix a possible deadlock when using 8bit visuals @@ -50,6 +51,7 @@ * dri2proto 2.1 * glproto 1.4.10 * inputproto 1.5.1 + * renderproto 0.11 * xcb-proto 1.5 * server: * Xquartz fixes from xorg-server-1.5.0-apple10

1 0

[355] trunk/pkg/README.2.4.0.txt
by source_changes＠macosforge.org 09 Jul '09

09 Jul '09

Revision: 355 http://trac.macosforge.org/projects/xquartz/changeset/355 Author: jeremyhu(a)freedesktop.org Date: 2009-07-08 21:48:51 -0700 (Wed, 08 Jul 2009) Log Message: ----------- More 2.4.0 bumps from upstream Modified Paths: -------------- trunk/pkg/README.2.4.0.txt Modified: trunk/pkg/README.2.4.0.txt =================================================================== --- trunk/pkg/README.2.4.0.txt 2009-07-08 06:52:32 UTC (rev 354) +++ trunk/pkg/README.2.4.0.txt 2009-07-09 04:48:51 UTC (rev 355) @@ -25,6 +25,8 @@ * defaults write org.x.X11 wm_auto_quit_timeout -int 3 * fixed an input bug with fullscreen windows * maximizing a window that is partially offscreen will no longer cause it to be behind the Dock + * setxkbmap 1.1.0 + * xkbcomp 1.1.0 * xfs 1.1.0 * Xephyr, Xnest, Xfake, Xvfb 1.6.2 * lib:

1 0

[354] trunk/pkg/README.2.4.0.txt
by source_changes＠macosforge.org 08 Jul '09

08 Jul '09

Revision: 354 http://trac.macosforge.org/projects/xquartz/changeset/354 Author: jeremyhu(a)freedesktop.org Date: 2009-07-07 23:52:32 -0700 (Tue, 07 Jul 2009) Log Message: ----------- Updated for 2.4.0_beta3 Modified Paths: -------------- trunk/pkg/README.2.4.0.txt Modified: trunk/pkg/README.2.4.0.txt =================================================================== --- trunk/pkg/README.2.4.0.txt 2009-07-04 07:53:42 UTC (rev 353) +++ trunk/pkg/README.2.4.0.txt 2009-07-08 06:52:32 UTC (rev 354) @@ -26,11 +26,12 @@ * fixed an input bug with fullscreen windows * maximizing a window that is partially offscreen will no longer cause it to be behind the Dock * xfs 1.1.0 - * Xephyr, Xnest, Xfake, Xvfb 1.6.1.901 + * Xephyr, Xnest, Xfake, Xvfb 1.6.2 * lib: * cairo 1.8.8 * fontconfig 2.7.0 * libAppleWM 1.3.0 + * libFS 1.0.2 * libpng 1.2.37 * libxcb 1.3 * libXaw 1.0.6

1 0

[353] trunk/pkg/README.2.4.0.txt
by source_changes＠macosforge.org 04 Jul '09

04 Jul '09

Revision: 353 http://trac.macosforge.org/projects/xquartz/changeset/353 Author: jeremyhu(a)freedesktop.org Date: 2009-07-04 00:53:42 -0700 (Sat, 04 Jul 2009) Log Message: ----------- 1.5.3-apple10 Modified Paths: -------------- trunk/pkg/README.2.4.0.txt Modified: trunk/pkg/README.2.4.0.txt =================================================================== --- trunk/pkg/README.2.4.0.txt 2009-07-04 02:43:30 UTC (rev 352) +++ trunk/pkg/README.2.4.0.txt 2009-07-04 07:53:42 UTC (rev 353) @@ -49,7 +49,7 @@ * inputproto 1.5.1 * xcb-proto 1.5 * server: - * Xquartz fixes from xorg-server-1.5.0-apple8 + * Xquartz fixes from xorg-server-1.5.0-apple10 * xserver codebase updated to 1.5 branch * Localization updates * Don't zombie "jumpstart" process at launch

1 0

[352] trunk/pkg/README.2.4.0.txt
by source_changes＠macosforge.org 04 Jul '09

04 Jul '09

Revision: 352 http://trac.macosforge.org/projects/xquartz/changeset/352 Author: jeremyhu(a)freedesktop.org Date: 2009-07-03 19:43:30 -0700 (Fri, 03 Jul 2009) Log Message: ----------- More 2.4.0 gold Modified Paths: -------------- trunk/pkg/README.2.4.0.txt Modified: trunk/pkg/README.2.4.0.txt =================================================================== --- trunk/pkg/README.2.4.0.txt 2009-07-03 18:28:51 UTC (rev 351) +++ trunk/pkg/README.2.4.0.txt 2009-07-04 02:43:30 UTC (rev 352) @@ -29,16 +29,21 @@ * Xephyr, Xnest, Xfake, Xvfb 1.6.1.901 * lib: * cairo 1.8.8 + * fontconfig 2.7.0 + * libAppleWM 1.3.0 + * libpng 1.2.37 * libxcb 1.3 * libXaw 1.0.6 * libXplugin * Fix a possible deadlock when using 8bit visuals + * Added API for attaching transient windows * libXt 1.0.6 * mesa 7.4.4 * libGLU, libglut, and OSMesa * Fixed linking problems with libOSMesa * xcb-util 0.3.5 * proto: + * applewmproto 1.3.0 * dri2proto 2.1 * glproto 1.4.10 * inputproto 1.5.1

1 0