180 lines
7.5 KiB
Diff
180 lines
7.5 KiB
Diff
|
Index: gtk+-2.90.7/gtk/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- gtk+-2.90.7.orig/gtk/Makefile.am
|
||
|
|
+++ gtk+-2.90.7/gtk/Makefile.am
|
||
|
|
@@ -158,7 +158,6 @@ gtk_public_h_sources = \
|
||
|
|
gtkactivatable.h \
|
||
|
|
gtkadjustment.h \
|
||
|
|
gtkalignment.h \
|
||
|
|
- gtkapplication.h \
|
||
|
|
gtkarrow.h \
|
||
|
|
gtkaspectframe.h \
|
||
|
|
gtkassistant.h \
|
||
|
|
@@ -418,7 +417,6 @@ gtk_base_c_sources = \
|
||
|
|
gtkactivatable.c \
|
||
|
|
gtkadjustment.c \
|
||
|
|
gtkalignment.c \
|
||
|
|
- gtkapplication.c \
|
||
|
|
gtkarrow.c \
|
||
|
|
gtkaspectframe.c \
|
||
|
|
gtkassistant.c \
|
||
|
|
Index: gtk+-2.90.7/gtk/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- gtk+-2.90.7.orig/gtk/Makefile.in
|
||
|
|
+++ gtk+-2.90.7/gtk/Makefile.in
|
||
|
|
@@ -120,7 +120,7 @@ am__libgtk_quartz_3_0_la_SOURCES_DIST =
|
||
|
|
gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
|
||
|
|
gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
|
||
|
|
gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
|
||
|
|
- gtkalignment.c gtkapplication.c gtkarrow.c gtkaspectframe.c \
|
||
|
|
+ gtkalignment.c gtkarrow.c gtkaspectframe.c \
|
||
|
|
gtkassistant.c gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c \
|
||
|
|
gtkbuildable.c gtkbuilder.c gtkbuilderparser.c gtkbutton.c \
|
||
|
|
gtkcalendar.c gtkcelleditable.c gtkcelllayout.c \
|
||
|
|
@@ -201,7 +201,7 @@ am__objects_2 = gtkquery.lo gtksearcheng
|
||
|
|
gtkaccelgroup.lo gtkaccellabel.lo gtkaccelmap.lo \
|
||
|
|
gtkaccessible.lo gtkaction.lo gtkactiongroup.lo \
|
||
|
|
gtkactivatable.lo gtkadjustment.lo gtkalignment.lo \
|
||
|
|
- gtkapplication.lo gtkarrow.lo gtkaspectframe.lo \
|
||
|
|
+ gtkarrow.lo gtkaspectframe.lo \
|
||
|
|
gtkassistant.lo gtkbbox.lo gtkbin.lo gtkbindings.lo gtkbox.lo \
|
||
|
|
gtkbuildable.lo gtkbuilder.lo gtkbuilderparser.lo gtkbutton.lo \
|
||
|
|
gtkcalendar.lo gtkcelleditable.lo gtkcelllayout.lo \
|
||
|
|
@@ -304,7 +304,7 @@ am__libgtk_win32_3_0_la_SOURCES_DIST = g
|
||
|
|
gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
|
||
|
|
gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
|
||
|
|
gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
|
||
|
|
- gtkalignment.c gtkapplication.c gtkarrow.c gtkaspectframe.c \
|
||
|
|
+ gtkalignment.c gtkarrow.c gtkaspectframe.c \
|
||
|
|
gtkassistant.c gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c \
|
||
|
|
gtkbuildable.c gtkbuilder.c gtkbuilderparser.c gtkbutton.c \
|
||
|
|
gtkcalendar.c gtkcelleditable.c gtkcelllayout.c \
|
||
|
|
@@ -387,7 +387,7 @@ am__libgtk_x11_3_0_la_SOURCES_DIST = gtk
|
||
|
|
gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
|
||
|
|
gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
|
||
|
|
gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
|
||
|
|
- gtkalignment.c gtkapplication.c gtkarrow.c gtkaspectframe.c \
|
||
|
|
+ gtkalignment.c gtkarrow.c gtkaspectframe.c \
|
||
|
|
gtkassistant.c gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c \
|
||
|
|
gtkbuildable.c gtkbuilder.c gtkbuilderparser.c gtkbutton.c \
|
||
|
|
gtkcalendar.c gtkcelleditable.c gtkcelllayout.c \
|
||
|
|
@@ -910,7 +910,6 @@ gtk_public_h_sources = \
|
||
|
|
gtkactivatable.h \
|
||
|
|
gtkadjustment.h \
|
||
|
|
gtkalignment.h \
|
||
|
|
- gtkapplication.h \
|
||
|
|
gtkarrow.h \
|
||
|
|
gtkaspectframe.h \
|
||
|
|
gtkassistant.h \
|
||
|
|
@@ -1142,7 +1141,6 @@ gtk_base_c_sources = \
|
||
|
|
gtkactivatable.c \
|
||
|
|
gtkadjustment.c \
|
||
|
|
gtkalignment.c \
|
||
|
|
- gtkapplication.c \
|
||
|
|
gtkarrow.c \
|
||
|
|
gtkaspectframe.c \
|
||
|
|
gtkassistant.c \
|
||
|
|
@@ -1947,7 +1945,6 @@ distclean-compile:
|
||
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkactivatable.Plo@am__quote@
|
||
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkadjustment.Plo@am__quote@
|
||
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkalignment.Plo@am__quote@
|
||
|
|
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkapplication.Plo@am__quote@
|
||
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkarrow.Plo@am__quote@
|
||
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkaspectframe.Plo@am__quote@
|
||
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkassistant.Plo@am__quote@
|
||
|
|
Index: gtk+-2.90.7/gtk/gtk.h
|
||
|
|
===================================================================
|
||
|
|
--- gtk+-2.90.7.orig/gtk/gtk.h
|
||
|
|
+++ gtk+-2.90.7/gtk/gtk.h
|
||
|
|
@@ -40,7 +40,6 @@
|
||
|
|
#include <gtk/gtkactivatable.h>
|
||
|
|
#include <gtk/gtkadjustment.h>
|
||
|
|
#include <gtk/gtkalignment.h>
|
||
|
|
-#include <gtk/gtkapplication.h>
|
||
|
|
#include <gtk/gtkarrow.h>
|
||
|
|
#include <gtk/gtkaspectframe.h>
|
||
|
|
#include <gtk/gtkassistant.h>
|
||
|
|
Index: gtk+-2.90.7/gtk/tests/defaultvalue.c
|
||
|
|
===================================================================
|
||
|
|
--- gtk+-2.90.7.orig/gtk/tests/defaultvalue.c
|
||
|
|
+++ gtk+-2.90.7/gtk/tests/defaultvalue.c
|
||
|
|
@@ -75,7 +75,7 @@ test_type (gconstpointer data)
|
||
|
|
|
||
|
|
/* These can't be freely constructed/destroyed */
|
||
|
|
if (g_type_is_a (type, GTK_TYPE_PRINT_JOB) ||
|
||
|
|
- g_type_is_a (type, GTK_TYPE_APPLICATION) ||
|
||
|
|
+ /* g_type_is_a (type, GTK_TYPE_APPLICATION) || */
|
||
|
|
g_type_is_a (type, GDK_TYPE_PIXBUF_LOADER) ||
|
||
|
|
g_type_is_a (type, gdk_pixbuf_simple_anim_iter_get_type ()))
|
||
|
|
return;
|
||
|
|
Index: gtk+-2.90.7/gtk/tests/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- gtk+-2.90.7.orig/gtk/tests/Makefile.am
|
||
|
|
+++ gtk+-2.90.7/gtk/tests/Makefile.am
|
||
|
|
@@ -92,7 +92,7 @@ TEST_PROGS += action
|
||
|
|
action_SOURCES = action.c
|
||
|
|
action_LDADD = $(progs_ldadd)
|
||
|
|
|
||
|
|
-SAMPLE_PROGS = gtk-example-application
|
||
|
|
+#SAMPLE_PROGS = gtk-example-application
|
||
|
|
gtk_example_application_SOURCES = gtk-example-application.c
|
||
|
|
gtk_example_application_LDADD = $(progs_ldadd)
|
||
|
|
|
||
|
|
Index: gtk+-2.90.7/gtk/tests/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- gtk+-2.90.7.orig/gtk/tests/Makefile.in
|
||
|
|
+++ gtk+-2.90.7/gtk/tests/Makefile.in
|
||
|
|
@@ -56,7 +56,7 @@ am__EXEEXT_2 = testing$(EXEEXT) liststor
|
||
|
|
recentmanager$(EXEEXT) floating$(EXEEXT) object$(EXEEXT) \
|
||
|
|
builder$(EXEEXT) $(am__EXEEXT_1) textbuffer$(EXEEXT) \
|
||
|
|
filtermodel$(EXEEXT) expander$(EXEEXT) action$(EXEEXT)
|
||
|
|
-am__EXEEXT_3 = gtk-example-application$(EXEEXT)
|
||
|
|
+#am__EXEEXT_3 = gtk-example-application$(EXEEXT)
|
||
|
|
PROGRAMS = $(noinst_PROGRAMS)
|
||
|
|
am_action_OBJECTS = action.$(OBJEXT)
|
||
|
|
action_OBJECTS = $(am_action_OBJECTS)
|
||
|
|
@@ -474,7 +474,7 @@ expander_SOURCES = expander.c
|
||
|
|
expander_LDADD = $(progs_ldadd)
|
||
|
|
action_SOURCES = action.c
|
||
|
|
action_LDADD = $(progs_ldadd)
|
||
|
|
-SAMPLE_PROGS = gtk-example-application
|
||
|
|
+#SAMPLE_PROGS = gtk-example-application
|
||
|
|
gtk_example_application_SOURCES = gtk-example-application.c
|
||
|
|
gtk_example_application_LDADD = $(progs_ldadd)
|
||
|
|
all: all-am
|
||
|
|
Index: gtk+-2.90.7/tests/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- gtk+-2.90.7.orig/tests/Makefile.am
|
||
|
|
+++ gtk+-2.90.7/tests/Makefile.am
|
||
|
|
@@ -93,7 +93,7 @@ noinst_PROGRAMS = $(TEST_PROGS) \
|
||
|
|
testwrapbox
|
||
|
|
|
||
|
|
if USE_X11
|
||
|
|
-noinst_PROGRAMS += testapplication
|
||
|
|
+#noinst_PROGRAMS += testapplication
|
||
|
|
endif
|
||
|
|
|
||
|
|
if HAVE_CXX
|
||
|
|
Index: gtk+-2.90.7/tests/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- gtk+-2.90.7.orig/tests/Makefile.in
|
||
|
|
+++ gtk+-2.90.7/tests/Makefile.in
|
||
|
|
@@ -69,7 +69,7 @@ noinst_PROGRAMS = $(am__EXEEXT_1) simple
|
||
|
|
testtooltips$(EXEEXT) testexpander$(EXEEXT) \
|
||
|
|
testvolumebutton$(EXEEXT) testwrapbox$(EXEEXT) $(am__EXEEXT_3) \
|
||
|
|
$(am__EXEEXT_4)
|
||
|
|
-@USE_X11_TRUE@am__append_1 = testapplication
|
||
|
|
+#@USE_X11_TRUE@am__append_1 = testapplication
|
||
|
|
@HAVE_CXX_TRUE@am__append_2 = autotestkeywords
|
||
|
|
@HAVE_CXX_TRUE@TESTS = autotestkeywords$(EXEEXT)
|
||
|
|
@HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@am__append_3 = -DHAVE_OBJC=1 -x objective-c++
|
||
|
|
@@ -86,7 +86,7 @@ CONFIG_CLEAN_VPATH_FILES =
|
||
|
|
am__EXEEXT_1 =
|
||
|
|
@USE_X11_TRUE@am__EXEEXT_2 = testsocket$(EXEEXT) \
|
||
|
|
@USE_X11_TRUE@ testsocket_child$(EXEEXT)
|
||
|
|
-@USE_X11_TRUE@am__EXEEXT_3 = testapplication$(EXEEXT)
|
||
|
|
+#@USE_X11_TRUE@am__EXEEXT_3 = testapplication$(EXEEXT)
|
||
|
|
@HAVE_CXX_TRUE@am__EXEEXT_4 = autotestkeywords$(EXEEXT)
|
||
|
|
PROGRAMS = $(noinst_PROGRAMS)
|
||
|
|
am__autotestkeywords_SOURCES_DIST = autotestkeywords.cc
|