| 1 |
grobian 11/06/27 06:36:21 |
| 2 |
|
| 3 |
Added: gtk+-2.24.5-darwin-quartz-introspection.patch |
| 4 |
gtk+-3.0.11-darwin-quartz-introspection.patch |
| 5 |
Log: |
| 6 |
Fix compilation with introspection on Darwin, bug #372953, patch by Naohiro Aota |
| 7 |
|
| 8 |
(Portage version: 2.2.01.18826-prefix/cvs/Darwin powerpc) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 x11-libs/gtk+/files/gtk+-2.24.5-darwin-quartz-introspection.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.24.5-darwin-quartz-introspection.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.24.5-darwin-quartz-introspection.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: gtk+-2.24.5-darwin-quartz-introspection.patch |
| 17 |
=================================================================== |
| 18 |
https://bugs.gentoo.org/attachment.cgi?id=278091&action=diff&context=patch&collapsed=&headers=1&format=raw |
| 19 |
https://bugs.gentoo.org/show_bug.cgi?id=372953 |
| 20 |
|
| 21 |
--- a/gtk/Makefile.am |
| 22 |
+++ a/gtk/Makefile.am |
| 23 |
@@ -32,7 +32,7 @@ endif |
| 24 |
endif |
| 25 |
endif |
| 26 |
|
| 27 |
-INCLUDES = \ |
| 28 |
+INCLUDES_COMMON = \ |
| 29 |
-DG_LOG_DOMAIN=\"Gtk\" \ |
| 30 |
-DGTK_LIBDIR=\"$(libdir)\" \ |
| 31 |
-DGTK_DATADIR=\"$(datadir)\" \ |
| 32 |
@@ -52,10 +52,17 @@ INCLUDES = \ |
| 33 |
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ |
| 34 |
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ |
| 35 |
$(GTK_DEBUG_FLAGS) \ |
| 36 |
- $(GTK_DEP_CFLAGS) \ |
| 37 |
+ $(GTK_DEP_CFLAGS) |
| 38 |
+ |
| 39 |
+INCLUDES= \ |
| 40 |
+ $(INCLUDES_COMMON) \ |
| 41 |
$(gtk_clipboard_dnd_c_sources_CFLAGS) \ |
| 42 |
$(INCLUDED_IMMODULE_DEFINE) |
| 43 |
|
| 44 |
+INCLUDES_GIR= \ |
| 45 |
+ $(INCLUDES_COMMON) \ |
| 46 |
+ $(INCLUDED_IMMODULE_DEFINE) |
| 47 |
+ |
| 48 |
gtarget=$(gdktarget) |
| 49 |
|
| 50 |
if PLATFORM_WIN32 |
| 51 |
@@ -999,7 +1006,7 @@ Gtk_2_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11 |
| 52 |
endif |
| 53 |
Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0 |
| 54 |
Gtk_2_0_gir_CFLAGS = \ |
| 55 |
- $(INCLUDES) \ |
| 56 |
+ $(INCLUDES_GIR) \ |
| 57 |
-UGDK_DISABLE_DEPRECATED \ |
| 58 |
-UGTK_DISABLE_DEPRECATED \ |
| 59 |
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.1 x11-libs/gtk+/files/gtk+-3.0.11-darwin-quartz-introspection.patch |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-3.0.11-darwin-quartz-introspection.patch?rev=1.1&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-3.0.11-darwin-quartz-introspection.patch?rev=1.1&content-type=text/plain |
| 67 |
|
| 68 |
Index: gtk+-3.0.11-darwin-quartz-introspection.patch |
| 69 |
=================================================================== |
| 70 |
forward port of the patch from: |
| 71 |
|
| 72 |
https://bugs.gentoo.org/attachment.cgi?id=278091&action=diff&context=patch&collapsed=&headers=1&format=raw |
| 73 |
https://bugs.gentoo.org/show_bug.cgi?id=372953 |
| 74 |
|
| 75 |
--- gtk/Makefile.am |
| 76 |
+++ gtk/Makefile.am |
| 77 |
@@ -32,7 +32,7 @@ |
| 78 |
endif |
| 79 |
endif |
| 80 |
|
| 81 |
-INCLUDES = \ |
| 82 |
+INCLUDES_COMMON = \ |
| 83 |
-DG_LOG_DOMAIN=\"Gtk\" \ |
| 84 |
-DGTK_LIBDIR=\"$(libdir)\" \ |
| 85 |
-DGTK_DATADIR=\"$(datadir)\" \ |
| 86 |
@@ -53,10 +53,17 @@ |
| 87 |
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ |
| 88 |
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ |
| 89 |
$(GTK_DEBUG_FLAGS) \ |
| 90 |
- $(GTK_DEP_CFLAGS) \ |
| 91 |
+ $(GTK_DEP_CFLAGS) |
| 92 |
+ |
| 93 |
+INCLUDES = \ |
| 94 |
+ $(INCLUDES_COMMON) \ |
| 95 |
$(gtk_clipboard_dnd_c_sources_CFLAGS) \ |
| 96 |
$(INCLUDED_IMMODULE_DEFINE) |
| 97 |
|
| 98 |
+INCLUDES_GIR = \ |
| 99 |
+ $(INCLUDES_COMMON) \ |
| 100 |
+ $(INCLUDED_IMMODULE_DEFINE) |
| 101 |
+ |
| 102 |
if PLATFORM_WIN32 |
| 103 |
no_undefined = -no-undefined |
| 104 |
endif |
| 105 |
@@ -997,7 +1004,7 @@ |
| 106 |
Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h" |
| 107 |
Gtk_3_0_gir_INCLUDES = Atk-1.0 |
| 108 |
Gtk_3_0_gir_CFLAGS = \ |
| 109 |
- $(INCLUDES) \ |
| 110 |
+ $(INCLUDES_GIR) \ |
| 111 |
-UGDK_DISABLE_DEPRECATED \ |
| 112 |
-UGTK_DISABLE_DEPRECATED \ |
| 113 |
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API |
| 114 |
--- gtk/Makefile.in |
| 115 |
+++ gtk/Makefile.in |
| 116 |
@@ -708,7 +708,7 @@ |
| 117 |
@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi |
| 118 |
@HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups |
| 119 |
@HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups |
| 120 |
-INCLUDES = \ |
| 121 |
+COMMON_INCLUDES = \ |
| 122 |
-DG_LOG_DOMAIN=\"Gtk\" \ |
| 123 |
-DGTK_LIBDIR=\"$(libdir)\" \ |
| 124 |
-DGTK_DATADIR=\"$(datadir)\" \ |
| 125 |
@@ -729,10 +729,17 @@ |
| 126 |
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ |
| 127 |
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ |
| 128 |
$(GTK_DEBUG_FLAGS) \ |
| 129 |
- $(GTK_DEP_CFLAGS) \ |
| 130 |
+ $(GTK_DEP_CFLAGS) |
| 131 |
+ |
| 132 |
+INCLUDES = \ |
| 133 |
+ $(COMMON_INCLUDES) \ |
| 134 |
$(gtk_clipboard_dnd_c_sources_CFLAGS) \ |
| 135 |
$(INCLUDED_IMMODULE_DEFINE) |
| 136 |
|
| 137 |
+INCLUDES_GIR = \ |
| 138 |
+ $(COMMON_INCLUDES) \ |
| 139 |
+ $(INCLUDED_IMMODULE_DEFINE) |
| 140 |
+ |
| 141 |
@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined |
| 142 |
@OS_WIN32_TRUE@gtk_def = gtk.def |
| 143 |
@OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def |
| 144 |
@@ -1407,7 +1414,7 @@ |
| 145 |
@HAVE_INTROSPECTION_TRUE@ --c-include="gtk/gtkx.h" |
| 146 |
@HAVE_INTROSPECTION_TRUE@Gtk_3_0_gir_INCLUDES = Atk-1.0 |
| 147 |
@HAVE_INTROSPECTION_TRUE@Gtk_3_0_gir_CFLAGS = \ |
| 148 |
-@HAVE_INTROSPECTION_TRUE@ $(INCLUDES) \ |
| 149 |
+@HAVE_INTROSPECTION_TRUE@ $(INCLUDES_GIR) \ |
| 150 |
@HAVE_INTROSPECTION_TRUE@ -UGDK_DISABLE_DEPRECATED \ |
| 151 |
@HAVE_INTROSPECTION_TRUE@ -UGTK_DISABLE_DEPRECATED \ |
| 152 |
@HAVE_INTROSPECTION_TRUE@ -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API |
Archives