[gtk-osx] Change Bug 655065 patch to match what I actually committed.

[John Ralls <jralls src gnome org>]

commit 86271af285ab6af16a932de78b497ae2eb84e0a3
Author: John Ralls <jralls ceridwen us>
Date:   Fri Apr 20 15:43:35 2012 -0700

    Change Bug 655065 patch to match what I actually committed.

 modulesets-stable/gtk-osx.modules                  |    2 +-
 patches/gtk+-Bug-655065-Better-Fix.patch           |   86 ++++++++++++++++++++
 .../gtk+-Bug-655065-autotestkeywords-ldadd.patch   |   13 ---
 3 files changed, 87 insertions(+), 14 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 7102d68..126f30e 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -183,7 +183,7 @@
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0004-Bug-571582-GtkSelection-implementation-for-quartz.patch"; strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch"; strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch"; strip="1"/>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gtk+-Bug-655065-autotestkeywords-ldadd.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gtk+-Bug-655065-Better-Fix.patch"; strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-670373-gtk2-modules-printing-cups-gtkprintbackendcups.patch"; strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0002-gtk2-Extract-reasons-and-reasons_desc-arrays-to-file-leve.patch"; strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0003-gtk2-Create-enum-PrinterStateLevel.patch"; strip="1"/>
diff --git a/patches/gtk+-Bug-655065-Better-Fix.patch b/patches/gtk+-Bug-655065-Better-Fix.patch
new file mode 100644
index 0000000..da36d78
--- /dev/null
+++ b/patches/gtk+-Bug-655065-Better-Fix.patch
@@ -0,0 +1,86 @@
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index e011484..c34b72e 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -14,7 +14,7 @@ DEPS =									\
+ 	$(top_builddir)/gdk/$(gdktargetlib)				\
+ 	$(top_builddir)/gtk/$(gtktargetlib)
+ 
+-LDADDS =								\
++LDADD =								\
+ 	$(top_builddir)/gdk/$(gdktargetlib)				\
+ 	$(top_builddir)/gtk/$(gtktargetlib)				\
+ 	$(GTK_DEP_LIBS)							\
+@@ -166,72 +166,6 @@ testtooltips_DEPENDENCIES = $(TEST_DEPS)
+ testvolumebutton_DEPENDENCIES = $(TEST_DEPS)
+ testwindows_DEPENDENCIES = $(TEST_DEPS)
+ 
+-flicker_LDADD = $(LDADDS)
+-simple_LDADD = $(LDADDS)
+-print_editor_LDADD = $(LDADDS)
+-testaccel_LDADD = $(LDADDS)
+-testassistant_LDADD = $(LDADDS)
+-testbbox_LDADD = $(LDADDS)
+-testbuttons_LDADD = $(LDADDS)
+-testframe_LDADD = $(LDADDS)
+-testcairo_LDADD = $(LDADDS)
+-testcalendar_LDADD = $(LDADDS)
+-testcombo_LDADD = $(LDADDS)
+-testcombochange_LDADD = $(LDADDS)
+-testcellrenderertext_LDADD = $(LDADDS)
+-testclientmessage_LDADD = $(LDADDS)
+-testdnd_LDADD = $(LDADDS)
+-testentrycompletion_LDADD = $(LDADDS)
+-testentryicons_LDADD = $(LDADDS)
+-testfilechooser_LDADD = $(LDADDS)
+-testfilechooserbutton_LDADD = $(LDADDS)
+-testgtk_LDADD = $(LDADDS)
+-testicontheme_LDADD = $(LDADDS)
+-testiconview_LDADD = $(LDADDS)
+-testiconview_keynav_LDADD = $(LDADDS)
+-testinput_LDADD = $(LDADDS)
+-testimage_LDADD = $(LDADDS)
+-testmenus_LDADD = $(LDADDS)
+-testmenubars_LDADD = $(LDADDS)
+-testmountoperation_LDADD = $(LDADDS)
+-testmultidisplay_LDADD = $(LDADDS)
+-testmultiscreen_LDADD = $(LDADDS)
+-testnotebookdnd_LDADD = $(LDADDS)
+-testnouiprint_LDADD = $(LDADDS)
+-testoffscreen_LDADD = $(LDADDS)
+-testoffscreenwindow_LDADD = $(LDADDS)
+-testorientable_LDADD = $(LDADDS)
+-testprint_LDADD = $(LDADDS)
+-testrecentchooser_LDADD = $(LDADDS)
+-testrecentchoosermenu_LDADD = $(LDADDS)
+-testrgb_LDADD = $(LDADDS)
+-testrichtext_LDADD = $(LDADDS)
+-testscale_LDADD = $(LDADDS)
+-testselection_LDADD = $(LDADDS)
+-testsocket_LDADD = $(LDADDS)
+-testsocket_child_LDADD = $(LDADDS)
+-testspinbutton_LDADD = $(LDADDS)
+-teststatusicon_LDADD = $(LDADDS)
+-testtoolbar_LDADD = $(LDADDS)
+-stresstest_toolbar_LDADD = $(LDADDS)
+-testtreeedit_LDADD = $(LDADDS)
+-testtreemodel_LDADD = $(LDADDS)
+-testtreeview_LDADD = $(LDADDS)
+-testtreefocus_LDADD = $(LDADDS)
+-testtreeflow_LDADD = $(LDADDS)
+-testtreecolumns_LDADD = $(LDADDS)
+-testtreecolumnsizing_LDADD = $(LDADDS)
+-testtreesort_LDADD = $(LDADDS)
+-testtext_LDADD = $(LDADDS)
+-treestoretest_LDADD = $(LDADDS)
+-testxinerama_LDADD = $(LDADDS)
+-testmerge_LDADD = $(LDADDS)
+-testactions_LDADD = $(LDADDS)
+-testgrouping_LDADD = $(LDADDS)
+-testtooltips_LDADD = $(LDADDS)
+-testvolumebutton_LDADD = $(LDADDS)
+-testwindows_LDADD = $(LDADDS)
+-
+ 
+ testentrycompletion_SOURCES = 	\
+ 	prop-editor.c		\