44 lines
1.2 KiB
Diff
44 lines
1.2 KiB
Diff
https://bugs.gentoo.org/attachment.cgi?id=278091&action=diff&context=patch&collapsed=&headers=1&format=raw
|
|
https://bugs.gentoo.org/show_bug.cgi?id=372953
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=642085
|
|
|
|
--- gtk/Makefile.am~ 2011-10-18 00:38:28.000000000 +0200
|
|
+++ gtk/Makefile.am 2011-10-18 20:28:40.187219540 +0200
|
|
@@ -32,7 +32,7 @@
|
|
endif
|
|
endif
|
|
|
|
-INCLUDES = \
|
|
+INCLUDES_COMMON = \
|
|
-DG_LOG_DOMAIN=\"Gtk\" \
|
|
-DGTK_LIBDIR=\"$(libdir)\" \
|
|
-DGTK_DATADIR=\"$(datadir)\" \
|
|
@@ -52,9 +52,18 @@
|
|
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
|
|
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
|
|
$(GTK_DEBUG_FLAGS) \
|
|
- $(GTK_DEP_CFLAGS) \
|
|
+ $(GTK_DEP_CFLAGS)
|
|
+
|
|
+
|
|
+INCLUDES= \
|
|
+ $(INCLUDES_COMMON) \
|
|
$(INCLUDED_IMMODULE_DEFINE)
|
|
|
|
+
|
|
+INCLUDES_GIR= \
|
|
+ $(INCLUDES_COMMON) \
|
|
+ $(INCLUDED_IMMODULE_DEFINE)
|
|
+
|
|
gtarget=$(gdktarget)
|
|
|
|
if PLATFORM_WIN32
|
|
@@ -1016,7 +1025,7 @@
|
|
endif
|
|
Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0
|
|
Gtk_2_0_gir_CFLAGS = \
|
|
- $(INCLUDES) \
|
|
+ $(INCLUDES_GIR) \
|
|
-UGDK_DISABLE_DEPRECATED \
|
|
-UGTK_DISABLE_DEPRECATED \
|
|
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
|