fix support for gtk2 built for quartz instead of x11

5 files changed, 118 insertions, 1 deletions

diff --git a/x11/py-gtk2/distinfo b/x11/py-gtk2/distinfo
index 60ec36b54e8..4122cefb073 100644
--- a/x11/py-gtk2/distinfo
+++ b/x11/py-gtk2/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.29 2015/11/04 03:28:51 agc Exp $
+$NetBSD: distinfo,v 1.30 2016/04/11 07:50:32 dbj Exp $
 
 SHA1 (pygtk-2.24.0.tar.bz2) = 344e6a32a5e8c7e0aaeb807e0636a163095231c2
 RMD160 (pygtk-2.24.0.tar.bz2) = 33f597def646261483cbbf5491aeb27bf0d22ea6
 SHA512 (pygtk-2.24.0.tar.bz2) = 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da
 Size (pygtk-2.24.0.tar.bz2) = 2361097 bytes
 SHA1 (patch-aa) = 5ea14628612cb204323ef6e169acb57a0887e737
+SHA1 (patch-configure) = 30ef4f05e737f7f29a841ebcff3595afb5a1dc2b
+SHA1 (patch-configure.ac) = f09ff6d8e2f8989a175b60ae288408a56d41f233
+SHA1 (patch-gtk_Makefile.am) = 50556ac7074c9156db574e4a60863ff00e638981
+SHA1 (patch-gtk_Makefile.in) = 4fed9e802bd0e306e5070cf2ac7e44c86715a3e7
diff --git a/x11/py-gtk2/patches/patch-configure b/x11/py-gtk2/patches/patch-configure
new file mode 100644
index 00000000000..54b0f088740
--- /dev/null
+++ b/x11/py-gtk2/patches/patch-configure
@@ -0,0 +1,54 @@
+$NetBSD: patch-configure,v 1.1 2016/04/11 07:50:32 dbj Exp $
+
+--- configure.orig	2011-04-01 10:41:02.000000000 +0000
++++ configure
+@@ -748,6 +748,8 @@ ac_subst_vars='am__EXEEXT_FALSE
+ am__EXEEXT_TRUE
+ LTLIBOBJS
+ LIBOBJS
++USE_QUARTZ_FALSE
++USE_QUARTZ_TRUE
+ BUILD_GTKUNIXPRINT_FALSE
+ BUILD_GTKUNIXPRINT_TRUE
+ GTKUNIXPRINT_LIBS
+@@ -14688,6 +14690,25 @@ case $gdk_target in
+         ;;
+ esac
+ 
++if test "x$gdk_target" = "xquartz"; then
++   if true; then
++  USE_QUARTZ_TRUE=
++  USE_QUARTZ_FALSE='#'
++else
++  USE_QUARTZ_TRUE='#'
++  USE_QUARTZ_FALSE=
++fi
++
++else
++   if false; then
++  USE_QUARTZ_TRUE=
++  USE_QUARTZ_FALSE='#'
++else
++  USE_QUARTZ_TRUE='#'
++  USE_QUARTZ_FALSE=
++fi
++
++fi
+ 
+ # Check whether --enable-numpy was given.
+ if test "${enable_numpy+set}" = set; then :
+@@ -15074,6 +15095,14 @@ if test -z "${BUILD_GTKUNIXPRINT_TRUE}" 
+   as_fn_error $? "conditional \"BUILD_GTKUNIXPRINT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then
++  as_fn_error $? "conditional \"USE_QUARTZ\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then
++  as_fn_error $? "conditional \"USE_QUARTZ\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ 
+ : ${CONFIG_STATUS=./config.status}
+ ac_write_fail=0
diff --git a/x11/py-gtk2/patches/patch-configure.ac b/x11/py-gtk2/patches/patch-configure.ac
new file mode 100644
index 00000000000..decd4ce7afd
--- /dev/null
+++ b/x11/py-gtk2/patches/patch-configure.ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-configure.ac,v 1.1 2016/04/11 07:50:32 dbj Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=646743
+
+--- configure.ac.orig	2011-04-01 10:37:44.000000000 +0000
++++ configure.ac
+@@ -445,6 +445,11 @@ case $gdk_target in
+         ;;
+ esac
+ 
++if test "x$gdk_target" = "xquartz"; then
++  AM_CONDITIONAL(USE_QUARTZ, true)
++else
++  AM_CONDITIONAL(USE_QUARTZ, false)
++fi
+ 
+ dnl checks to see if numpy is installed.
+ AC_ARG_ENABLE(numpy,
diff --git a/x11/py-gtk2/patches/patch-gtk_Makefile.am b/x11/py-gtk2/patches/patch-gtk_Makefile.am
new file mode 100644
index 00000000000..7a7ec722d7e
--- /dev/null
+++ b/x11/py-gtk2/patches/patch-gtk_Makefile.am
@@ -0,0 +1,18 @@
+$NetBSD: patch-gtk_Makefile.am,v 1.1 2016/04/11 07:50:32 dbj Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=646743
+
+--- gtk/Makefile.am.orig	2011-04-01 10:37:25.000000000 +0000
++++ gtk/Makefile.am
+@@ -9,6 +9,11 @@ INCLUDES = \
+ 	$(PYGOBJECT_CFLAGS) \
+ 	-I$(srcdir)/gtk
+ 
++if USE_QUARTZ
++# same as in gtk+/gdk/quartz/Makefile.am
++INCLUDES += "-xobjective-c"
++endif
++
+ # defs files
+ defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
+ defs_DATA =
diff --git a/x11/py-gtk2/patches/patch-gtk_Makefile.in b/x11/py-gtk2/patches/patch-gtk_Makefile.in
new file mode 100644
index 00000000000..f4c9b30cde5
--- /dev/null
+++ b/x11/py-gtk2/patches/patch-gtk_Makefile.in
@@ -0,0 +1,23 @@
+$NetBSD: patch-gtk_Makefile.in,v 1.1 2016/04/11 07:50:32 dbj Exp $
+
+Manually constructed to avoid having to rerun autoconf
+
+--- gtk/Makefile.in.orig	2011-04-01 10:41:04.000000000 +0000
++++ gtk/Makefile.in
+@@ -71,6 +71,7 @@ host_triplet = @host@
+ @BUILD_GTKUNIXPRINT_TRUE@am__append_32 = $(GTKUNIXPRINT_DEFS) $(GTKUNIXPRINT_TYPES_DEFS)
+ @PLATFORM_WIN32_TRUE@am__append_33 = -DPLATFORM_WIN32
+ @HAVE_GIO_TYPES_DEFS_TRUE@am__append_34 = --register $(PYGOBJECT_DEFSDIR)/gio-types.defs
++@USE_QUARTZ_TRUE@am__append_35 = "-xobjective-c"
+ subdir = gtk
+ DIST_COMMON = $(pkginclude_HEADERS) $(pygtk_PYTHON) \
+ 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -366,7 +367,7 @@ EXTRA_DIST = gtk-extrafuncs.defs $(GDK_D
+ INCLUDES = \
+ 	$(PYTHON_INCLUDES) \
+ 	$(PYGOBJECT_CFLAGS) \
+-	-I$(srcdir)/gtk
++	-I$(srcdir)/gtk $(am__append_35)
+ 
+ 
+ # defs files