Ticket #39270: skip-Build-Applet.patch

trunk/dports/lang/python27/Portfile

@@ -8 +8 @@
 epoch               2
 # Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
 version             2.7.5
+revision            1
 
 set major           [lindex [split $version .] 0]
 set branch          [join [lrange [split ${version} .] 0 1] .]
@@ -39 +40 @@
                     patch-configure.diff \
                     patch-libedit.diff
 
+# TODO Delete when updating to 2.7.6, which will incorporate this fix.
+patchfiles-append   skip-Build-Applet.patch
+
 depends_lib         port:gettext \
                     port:zlib \
                     port:openssl \

new file trunk/dports/lang/python27/files/skip-Build-Applet.patch

@@ +1 @@
+
+# HG changeset patch
+# User Ned Deily <nad@acm.org>
+# Date 1369898069 25200
+# Node ID cfdb4598c935015e7b1dc93332d25792b9f49d28
+# Parent  bcbad715c2ce45c09c4191e20ac097c3226fe3c5
+Issue #18098: The deprecated OS X Build Applet.app fails to build on
+OS X 10.8 systems because the Apple-deprecated QuickDraw headers have
+been removed from Xcode 4.  Skip building it in this case.
+
+diff --git Lib/plat-mac/EasyDialogs.py Lib/plat-mac/EasyDialogs.py
+--- Lib/plat-mac/EasyDialogs.py
++++ Lib/plat-mac/EasyDialogs.py
+@@ -243,8 +243,15 @@ def AskYesNoCancel(question, default = 0
+ 
+ 
+ 
++# The deprecated Carbon QuickDraw APIs are no longer available as of
++# OS X 10.8.  Raise an ImportError here in that case so that callers
++# of EasyDialogs, like BuildApplet, will do the right thing.
+ 
+-screenbounds = Qd.GetQDGlobalsScreenBits().bounds
++try:
++    screenbounds = Qd.GetQDGlobalsScreenBits().bounds
++except AttributeError:
++    raise ImportError("QuickDraw APIs not available")
++
+ screenbounds = screenbounds[0]+4, screenbounds[1]+4, \
+     screenbounds[2]-4, screenbounds[3]-4
+ 
+diff --git Mac/Makefile.in Mac/Makefile.in
+--- Mac/Makefile.in
++++ Mac/Makefile.in
+@@ -202,15 +202,22 @@ install_IDLE:
+        cd IDLE && make install
+ 
+ install_BuildApplet:
+-       $(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) $(srcdir)/scripts/BuildApplet.py \
+-               --destroot "$(DESTDIR)" \
+-               --python=$(prefix)/Resources/Python.app/Contents/MacOS/Python \
+-               --output "$(DESTDIR)$(PYTHONAPPSDIR)/Build Applet.app" \
+-               $(srcdir)/scripts/BuildApplet.py
+-ifneq ($(LIPO_32BIT_FLAGS),)
+-       rm "$(DESTDIR)$(PYTHONAPPSDIR)/Build Applet.app/Contents/MacOS/Python"
+-       lipo $(LIPO_32BIT_FLAGS) -output "$(DESTDIR)$(PYTHONAPPSDIR)/Build Applet.app/Contents/MacOS/Python" $(BUILDPYTHON)
+-endif   
++       if ! $(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) \
++                       -c 'import EasyDialogs' 2>/dev/null ; then \
++               echo "EasyDialogs not available in this Python - skipping Build Applet.app" ; \
++       else \
++               $(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) $(srcdir)/scripts/BuildApplet.py \
++                       --destroot "$(DESTDIR)" \
++                       --python=$(prefix)/Resources/Python.app/Contents/MacOS/Python \
++                       --output "$(DESTDIR)$(PYTHONAPPSDIR)/Build Applet.app" \
++                       $(srcdir)/scripts/BuildApplet.py && \
++               if [ -n "$(LIPO_32BIT_FLAGS)" ] ; then \
++                       rm "$(DESTDIR)$(PYTHONAPPSDIR)/Build Applet.app/Contents/MacOS/Python" && \
++                       lipo $(LIPO_32BIT_FLAGS) \
++                               -output "$(DESTDIR)$(PYTHONAPPSDIR)/Build Applet.app/Contents/MacOS/Python" \
++                               $(BUILDPYTHON) ; \
++               fi \
++       fi
+ 
+ MACLIBDEST=$(LIBDEST)/plat-mac
+ MACTOOLSDEST=$(prefix)/Mac/Tools
+diff --git Mac/README Mac/README
+--- Mac/README
++++ Mac/README
+@@ -209,9 +209,11 @@ script to set runtime options. These opt
+ through PythonLauncher's preferences dialog.
+ 
+ "BuildApplet.app" creates an applet from a Python script. Drop the script on it
+-and out comes a full-featured MacOS application. There is much more to this,
+-to be supplied later. Some useful (but outdated) info can be found in
+-Mac/Demo.
++and out comes a full-featured MacOS application.  BuildApplet.app is now
++deprecated and has been removed in Python 3.  As of OS X 10.8, Xcode 4 no
++longer supplies the headers for the deprecated QuickDraw APIs used by
++the EasyDialogs module making BuildApplet unusable as an app.  It will
++not be built by the Mac/Makefile in this case.
+ 
+ The commandline scripts /usr/local/bin/python and pythonw can be used to run
+ non-GUI and GUI python scripts from the command line, respectively.
+diff --git Misc/NEWS Misc/NEWS
+--- Misc/NEWS
++++ Misc/NEWS
+@@ -37,6 +37,13 @@ Library
+   the default for linking if LDSHARED is not also overriden.  This restores
+   Distutils behavior introduced in 2.7.3 and inadvertently dropped in 2.7.4.
+ 
++Build
++-----
++
++- Issue #18098: The deprecated OS X Build Applet.app fails to build on
++  OS X 10.8 systems because the Apple-deprecated QuickDraw headers have
++  been removed from Xcode 4.  Skip building it in this case.
++
+ IDLE
+ ----
+ 
+diff --git configure configure
+--- configure
++++ configure
+@@ -2981,6 +2981,7 @@ fi
+ 
+ 
+ 
++ARCH_RUN_32BIT=""
+ 
+ UNIVERSAL_ARCHS="32-bit"
+ 
+@@ -7996,7 +7997,6 @@ case $ac_sys_system/$ac_sys_release in
+ esac
+ 
+ 
+-ARCH_RUN_32BIT=""
+ 
+ case $ac_sys_system/$ac_sys_release in
+   Darwin/[01567]\..*)
+diff --git configure.ac configure.ac
+--- configure.ac
++++ configure.ac
+@@ -145,6 +145,7 @@ fi
+ AC_SUBST(UNIVERSALSDK)
+ 
+ AC_SUBST(ARCH_RUN_32BIT)
++ARCH_RUN_32BIT=""
+ 
+ UNIVERSAL_ARCHS="32-bit"
+ AC_SUBST(LIPO_32BIT_FLAGS)
+@@ -1801,7 +1802,6 @@ case $ac_sys_system/$ac_sys_release in
+ esac
+ 
+ 
+-ARCH_RUN_32BIT=""
+ AC_SUBST(LIBTOOL_CRUFT)
+ case $ac_sys_system/$ac_sys_release in
+   Darwin/@<:@01567@:>@\..*) 
+