diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b324fdb..978bf76 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name - runs-on: macos-11 + runs-on: macos-12 steps: - uses: actions/checkout@v4 with: diff --git a/fetch_modules.sh b/fetch_modules.sh index cd20eff..1383a8a 100755 --- a/fetch_modules.sh +++ b/fetch_modules.sh @@ -1,6 +1,6 @@ #!/bin/sh -source pins.sh +source ./pins.sh git clone https://gitlab.gnome.org/GNOME/gtk-osx.git _gtk-osx-modules (cd _gtk-osx-modules && git checkout $PIN_GTK_OSX_COMMIT) diff --git a/modulesets/bootstrap.modules b/modulesets/bootstrap.modules index 59f5796..562a3d2 100644 --- a/modulesets/bootstrap.modules +++ b/modulesets/bootstrap.modules @@ -10,8 +10,8 @@ - - + + + + + + + + + + - + + + + - - - + + + + + - - - + + + + + + + + + - diff --git a/modulesets/gtk-osx-gstreamer.modules b/modulesets/gtk-osx-gstreamer.modules index e64cc05..6e0ea8c 100644 --- a/modulesets/gtk-osx-gstreamer.modules +++ b/modulesets/gtk-osx-gstreamer.modules @@ -11,43 +11,29 @@ default="yes" href="http://gstreamer.freedesktop.org/src/" type="tarball" /> - - - + - - - - - - - + - @@ -65,9 +51,9 @@ - + @@ -76,9 +62,9 @@ - + @@ -86,9 +72,9 @@ - + @@ -97,9 +83,9 @@ - + @@ -107,9 +93,9 @@ - + @@ -119,9 +105,9 @@ - + @@ -130,6 +116,17 @@ + + + + + + + + + @@ -138,6 +135,7 @@ + diff --git a/modulesets/gtk-osx-gtkmm.modules b/modulesets/gtk-osx-gtkmm.modules index 6e45743..dc234b2 100644 --- a/modulesets/gtk-osx-gtkmm.modules +++ b/modulesets/gtk-osx-gtkmm.modules @@ -19,9 +19,9 @@ type="tarball" /> - + hash="sha256:b55c46037dbcdabc5cee3b389ea11cc3910adb68ebe883e9477847aa660862e7" /> - @@ -40,9 +40,9 @@ - @@ -50,9 +50,9 @@ - + @@ -61,9 +61,9 @@ - + @@ -75,7 +75,9 @@ + hash="sha256:1b24c92624ae1275ccb57758175d35f7c39ad3342d8c0b4ba60f0d9849d2d08a" > + + @@ -84,9 +86,9 @@ - + @@ -95,9 +97,9 @@ - + @@ -107,9 +109,9 @@ - + @@ -119,21 +121,21 @@ - + - + - + @@ -148,9 +150,9 @@ - + diff --git a/modulesets/gtk-osx-javascript.modules b/modulesets/gtk-osx-javascript.modules deleted file mode 100644 index 4c8a26d..0000000 --- a/modulesets/gtk-osx-javascript.modules +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules index d007133..7bea8b9 100644 --- a/modulesets/gtk-osx-network.modules +++ b/modulesets/gtk-osx-network.modules @@ -9,10 +9,7 @@ --> - - + @@ -97,9 +96,9 @@ - @@ -107,8 +106,8 @@ autogen-sh="configure" autogenargs="--without-trust-paths"> @@ -123,9 +122,9 @@ autogen-sh="autoreconf" autogenargs="--disable-doc --with-included-unistring"> - @@ -144,20 +143,18 @@ - - - @@ -167,8 +164,8 @@ + version="0.21.4" + hash="sha256:163d08d783be6d4ab9a979ceb5a4fecbc1d9660d3c34168c581301cd53912b20" /> @@ -176,9 +173,9 @@ - + @@ -189,9 +186,9 @@ - + @@ -199,18 +196,18 @@ - + - @@ -219,9 +216,9 @@ - + @@ -231,9 +228,9 @@ - @@ -249,31 +246,41 @@ - + + + + + + + + - + + - - diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules index 0290bf0..af5117a 100644 --- a/modulesets/gtk-osx-python.modules +++ b/modulesets/gtk-osx-python.modules @@ -43,9 +43,9 @@ - @@ -54,12 +54,15 @@ --> + + + - @@ -69,9 +72,9 @@ - + @@ -96,9 +99,10 @@ - + diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules index a8f8625..fbaa2e7 100644 --- a/modulesets/gtk-osx-random.modules +++ b/modulesets/gtk-osx-random.modules @@ -21,47 +21,41 @@ href="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/" type="tarball" /> + href="https://salsa.debian.org/iso-codes-team/" + type="git" /> - - - - + - + - + - + @@ -71,9 +65,9 @@ - @@ -89,12 +83,10 @@ - - @@ -149,9 +141,9 @@ - + @@ -159,58 +151,32 @@ - - - - - - - - - - - - - - - - - - + + https://www.sqlite.org/ - - - @@ -297,12 +262,11 @@ hash="sha256:3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" repo="ftp.gnu.org" /> - + - @@ -310,11 +274,10 @@ autogen-sh="autoreconf" autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'> - - - + @@ -324,9 +287,9 @@ - + diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules index 1ee5859..25d58a9 100644 --- a/modulesets/gtk-osx.modules +++ b/modulesets/gtk-osx.modules @@ -55,8 +55,6 @@ - gtk-osx-python.modules: Python bindings for Gtk. - gtk-osx-gtkmm.modules: C++ wrappers for Gtk. - - gtk-osx-javascript.modules: GJS and its Mozilla JS (aka - spidermonkey) dependency. - gtk-osx-gstreamer.modules: GStreamer library and modules. - gtk-osx-network.modules: The network/crypto stack and WebKit. - gtk-osx-random.modules: "random stuff", has apps for testing GTK+. @@ -69,7 +67,6 @@ - @@ -95,9 +92,9 @@ autogen-sh="configure" autogenargs="--disable-multi-os-directory --disable-docs"> - @@ -105,26 +102,32 @@ autogen-sh="configure" autogenargs="--enable-pcre2-16 --enable-pcre2-32 --enable-jit"> - - - - - - + + + + + + + + + + mesonargs="-Dcoretext=enabled -Dfreetype=enabled -Ddocs=disabled -Dbenchmark=disabled -Dintrospection=disabled -Dtests=disabled"> - - + @@ -174,9 +176,9 @@ - @@ -184,24 +186,23 @@ - + - - + - @@ -212,11 +213,11 @@ freetype it insists that it has to have fontconfig too and that they are both built into cairo. --> - - + + @@ -226,12 +227,12 @@ - + - + @@ -241,10 +242,9 @@ - - @@ -255,9 +255,9 @@ - - + + @@ -297,9 +298,9 @@ - + @@ -316,31 +317,21 @@ repo="hicolor" /> - - - - - - + @@ -358,38 +349,26 @@ - + hash="a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a" + repo="download.gnome.org" /> - - - - - - + - @@ -412,9 +391,9 @@ - + @@ -422,24 +401,16 @@ - - - - - - - + + - + diff --git a/modulesets/patches/0001-Add-G_GNUC_PRINTF-on-all-functions-with-format-strin.patch b/modulesets/patches/0001-Add-G_GNUC_PRINTF-on-all-functions-with-format-strin.patch deleted file mode 100644 index 1072b09..0000000 --- a/modulesets/patches/0001-Add-G_GNUC_PRINTF-on-all-functions-with-format-strin.patch +++ /dev/null @@ -1,387 +0,0 @@ -From 0955160e15ec303d4d3f6a56bd424c68a41b0a54 Mon Sep 17 00:00:00 2001 -From: Henrique Dante de Almeida -Date: Sun, 13 Jan 2013 14:05:14 -0200 -Subject: [PATCH] Add G_GNUC_PRINTF on all functions with format strings - -This allows compilation with clang wihtout errors, even -when -Wformat-nonliteral is active (as long as there are -no real cases of non literal formatting). - -https://bugzilla.gnome.org/show_bug.cgi?id=691608 ---- - gio/gdbusauth.c | 1 + - gio/gdbusauthmechanismsha1.c | 1 + - gio/gdbusdaemon.c | 1 + - gio/gdbuserror.h | 4 ++-- - gio/gdbusmessage.c | 1 + - gio/gdbusmethodinvocation.h | 5 +++-- - gio/gsimpleasyncresult.h | 5 +++-- - gio/gtask.h | 2 +- - glib/gerror.c | 1 + - glib/gerror.h | 2 +- - glib/gmarkup.c | 2 ++ - glib/gmarkup.h | 2 +- - glib/gmessages.h | 4 ++-- - glib/gprintf.h | 8 ++++---- - glib/gstrfuncs.h | 3 ++- - glib/gstring.h | 6 ++++-- - glib/gutils.h | 3 ++- - glib/gvariant-parser.c | 4 ++++ - glib/tests/markup-escape.c | 1 + - glib/tests/string.c | 1 + - glib/tests/test-printf.c | 1 + - 21 files changed, 39 insertions(+), 19 deletions(-) - -diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c -index 962a218..dd4cc2c 100644 ---- a/gio/gdbusauth.c -+++ b/gio/gdbusauth.c -@@ -46,6 +46,7 @@ - - #include "glibintl.h" - -+G_GNUC_PRINTF(1, 2) - static void - debug_print (const gchar *message, ...) - { -diff --git a/gio/gdbusauthmechanismsha1.c b/gio/gdbusauthmechanismsha1.c -index 4729208..5e8b6c0 100644 ---- a/gio/gdbusauthmechanismsha1.c -+++ b/gio/gdbusauthmechanismsha1.c -@@ -469,6 +469,7 @@ keyring_lookup_entry (const gchar *cookie_context, - } - - /* function for logging important events that the system administrator should take notice of */ -+G_GNUC_PRINTF(1, 2) - static void - _log (const gchar *message, - ...) -diff --git a/gio/gdbusdaemon.c b/gio/gdbusdaemon.c -index 35a724c..2393771 100644 ---- a/gio/gdbusdaemon.c -+++ b/gio/gdbusdaemon.c -@@ -1346,6 +1346,7 @@ handle_start_service_by_name (_GFreedesktopDBus *object, - return TRUE; - } - -+G_GNUC_PRINTF(5, 6) - static void - return_error (Client *client, GDBusMessage *message, - GQuark domain, -diff --git a/gio/gdbuserror.h b/gio/gdbuserror.h -index d32b928..c1d3e9c 100644 ---- a/gio/gdbuserror.h -+++ b/gio/gdbuserror.h -@@ -87,12 +87,12 @@ void g_dbus_error_set_dbus_error (GError **error, - const gchar *dbus_error_name, - const gchar *dbus_error_message, - const gchar *format, -- ...); -+ ...) G_GNUC_PRINTF(4, 5); - void g_dbus_error_set_dbus_error_valist (GError **error, - const gchar *dbus_error_name, - const gchar *dbus_error_message, - const gchar *format, -- va_list var_args); -+ va_list var_args) G_GNUC_PRINTF(4, 0); - gchar *g_dbus_error_encode_gerror (const GError *error); - - G_END_DECLS -diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c -index ecbc033..9181029 100644 ---- a/gio/gdbusmessage.c -+++ b/gio/gdbusmessage.c -@@ -827,6 +827,7 @@ g_dbus_message_new_method_error_literal (GDBusMessage *method_call_message, - * - * Since: 2.26 - */ -+G_GNUC_PRINTF(3, 0) - GDBusMessage * - g_dbus_message_new_method_error_valist (GDBusMessage *method_call_message, - const gchar *error_name, -diff --git a/gio/gdbusmethodinvocation.h b/gio/gdbusmethodinvocation.h -index 9146b21..29cfe63 100644 ---- a/gio/gdbusmethodinvocation.h -+++ b/gio/gdbusmethodinvocation.h -@@ -55,12 +55,13 @@ void g_dbus_method_invocation_return_error (GDBusMetho - GQuark domain, - gint code, - const gchar *format, -- ...); -+ ...) G_GNUC_PRINTF(4, 5); - void g_dbus_method_invocation_return_error_valist (GDBusMethodInvocation *invocation, - GQuark domain, - gint code, - const gchar *format, -- va_list var_args); -+ va_list var_args) -+ G_GNUC_PRINTF(4, 0); - void g_dbus_method_invocation_return_error_literal (GDBusMethodInvocation *invocation, - GQuark domain, - gint code, -diff --git a/gio/gsimpleasyncresult.h b/gio/gsimpleasyncresult.h -index 6233369..1ea98f4 100644 ---- a/gio/gsimpleasyncresult.h -+++ b/gio/gsimpleasyncresult.h -@@ -110,7 +110,8 @@ void g_simple_async_result_set_error_va (GSimpleAsyncResult - GQuark domain, - gint code, - const char *format, -- va_list args); -+ va_list args) -+ G_GNUC_PRINTF(4, 0); - gboolean g_simple_async_result_is_valid (GAsyncResult *result, - GObject *source, - gpointer source_tag); -@@ -121,7 +122,7 @@ void g_simple_async_report_error_in_idle (GObject *object, - GQuark domain, - gint code, - const char *format, -- ...); -+ ...) G_GNUC_PRINTF(6, 7); - void g_simple_async_report_gerror_in_idle (GObject *object, - GAsyncReadyCallback callback, - gpointer user_data, -diff --git a/gio/gtask.h b/gio/gtask.h -index bb03226..d5a2d77 100644 ---- a/gio/gtask.h -+++ b/gio/gtask.h -@@ -61,7 +61,7 @@ void g_task_report_new_error (gpointer source_object, - GQuark domain, - gint code, - const char *format, -- ...); -+ ...) G_GNUC_PRINTF(7, 8); - - GLIB_AVAILABLE_IN_2_36 - void g_task_set_task_data (GTask *task, -diff --git a/glib/gerror.c b/glib/gerror.c -index e6ce3c0..2adbdf8 100644 ---- a/glib/gerror.c -+++ b/glib/gerror.c -@@ -645,6 +645,7 @@ g_clear_error (GError **err) - } - } - -+G_GNUC_PRINTF(2, 0) - static void - g_error_add_prefix (gchar **string, - const gchar *format, -diff --git a/glib/gerror.h b/glib/gerror.h -index f9020d6..8b5de28 100644 ---- a/glib/gerror.h -+++ b/glib/gerror.h -@@ -60,7 +60,7 @@ GError* g_error_new_literal (GQuark domain, - GError* g_error_new_valist (GQuark domain, - gint code, - const gchar *format, -- va_list args); -+ va_list args) G_GNUC_PRINTF(3, 0); - - void g_error_free (GError *error); - GError* g_error_copy (const GError *error); -diff --git a/glib/gmarkup.c b/glib/gmarkup.c -index 11f68de..bf7c008 100644 ---- a/glib/gmarkup.c -+++ b/glib/gmarkup.c -@@ -403,6 +403,7 @@ set_error_literal (GMarkupParseContext *context, - g_propagate_error (error, tmp_error); - } - -+G_GNUC_PRINTF(4, 5) - static void - set_error (GMarkupParseContext *context, - GError **error, -@@ -564,6 +565,7 @@ utf8_str (const gchar *utf8, - return buf; - } - -+G_GNUC_PRINTF(5, 6) - static void - set_unescape_error (GMarkupParseContext *context, - GError **error, -diff --git a/glib/gmarkup.h b/glib/gmarkup.h -index d26c2ad..d0eda4f 100644 ---- a/glib/gmarkup.h -+++ b/glib/gmarkup.h -@@ -214,7 +214,7 @@ gchar* g_markup_escape_text (const gchar *text, - gchar *g_markup_printf_escaped (const char *format, - ...) G_GNUC_PRINTF (1, 2); - gchar *g_markup_vprintf_escaped (const char *format, -- va_list args); -+ va_list args) G_GNUC_PRINTF(1, 0); - - typedef enum - { -diff --git a/glib/gmessages.h b/glib/gmessages.h -index 777cda2..d0c1930 100644 ---- a/glib/gmessages.h -+++ b/glib/gmessages.h -@@ -46,7 +46,7 @@ G_BEGIN_DECLS - /* calculate a string size, guaranteed to fit format + args. - */ - gsize g_printf_string_upper_bound (const gchar* format, -- va_list args); -+ va_list args) G_GNUC_PRINTF(1, 0); - - /* Log level shift offset for user defined - * log levels (0-7 are used by GLib). -@@ -101,7 +101,7 @@ void g_log (const gchar *log_domain, - void g_logv (const gchar *log_domain, - GLogLevelFlags log_level, - const gchar *format, -- va_list args); -+ va_list args) G_GNUC_PRINTF(3, 0); - GLogLevelFlags g_log_set_fatal_mask (const gchar *log_domain, - GLogLevelFlags fatal_mask); - GLogLevelFlags g_log_set_always_fatal (GLogLevelFlags fatal_mask); -diff --git a/glib/gprintf.h b/glib/gprintf.h -index d96870f..2ed5ecc 100644 ---- a/glib/gprintf.h -+++ b/glib/gprintf.h -@@ -36,16 +36,16 @@ gint g_sprintf (gchar *string, - ...) G_GNUC_PRINTF (2, 3); - - gint g_vprintf (gchar const *format, -- va_list args); -+ va_list args) G_GNUC_PRINTF(1, 0); - gint g_vfprintf (FILE *file, - gchar const *format, -- va_list args); -+ va_list args) G_GNUC_PRINTF(2, 0); - gint g_vsprintf (gchar *string, - gchar const *format, -- va_list args); -+ va_list args) G_GNUC_PRINTF(2, 0); - gint g_vasprintf (gchar **string, - gchar const *format, -- va_list args); -+ va_list args) G_GNUC_PRINTF(2, 0); - - G_END_DECLS - -diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h -index 3142485..e0752d3 100644 ---- a/glib/gstrfuncs.h -+++ b/glib/gstrfuncs.h -@@ -188,7 +188,8 @@ gchar* g_strdup (const gchar *str) G_GNUC_MALLOC; - gchar* g_strdup_printf (const gchar *format, - ...) G_GNUC_PRINTF (1, 2) G_GNUC_MALLOC; - gchar* g_strdup_vprintf (const gchar *format, -- va_list args) G_GNUC_MALLOC; -+ va_list args) G_GNUC_PRINTF(1, 0) -+ G_GNUC_MALLOC; - gchar* g_strndup (const gchar *str, - gsize n) G_GNUC_MALLOC; - gchar* g_strnfill (gsize length, -diff --git a/glib/gstring.h b/glib/gstring.h -index a97aa4e..c6a11ae 100644 ---- a/glib/gstring.h -+++ b/glib/gstring.h -@@ -109,13 +109,15 @@ GString* g_string_ascii_down (GString *string); - GString* g_string_ascii_up (GString *string); - void g_string_vprintf (GString *string, - const gchar *format, -- va_list args); -+ va_list args) -+ G_GNUC_PRINTF(2, 0); - void g_string_printf (GString *string, - const gchar *format, - ...) G_GNUC_PRINTF (2, 3); - void g_string_append_vprintf (GString *string, - const gchar *format, -- va_list args); -+ va_list args) -+ G_GNUC_PRINTF(2, 0); - void g_string_append_printf (GString *string, - const gchar *format, - ...) G_GNUC_PRINTF (2, 3); -diff --git a/glib/gutils.h b/glib/gutils.h -index 8102f53..6c21bf7 100644 ---- a/glib/gutils.h -+++ b/glib/gutils.h -@@ -187,7 +187,8 @@ gint g_snprintf (gchar *string, - gint g_vsnprintf (gchar *string, - gulong n, - gchar const *format, -- va_list args); -+ va_list args) -+ G_GNUC_PRINTF(3, 0); - - void g_nullify_pointer (gpointer *nullify_location); - -diff --git a/glib/gvariant-parser.c b/glib/gvariant-parser.c -index e2e85ab..d5c036a 100644 ---- a/glib/gvariant-parser.c -+++ b/glib/gvariant-parser.c -@@ -78,6 +78,7 @@ typedef struct - gint start, end; - } SourceRef; - -+G_GNUC_PRINTF(5, 0) - static void - parser_set_error_va (GError **error, - SourceRef *location, -@@ -105,6 +106,7 @@ parser_set_error_va (GError **error, - g_string_free (msg, TRUE); - } - -+G_GNUC_PRINTF(5, 6) - static void - parser_set_error (GError **error, - SourceRef *location, -@@ -130,6 +132,7 @@ typedef struct - } TokenStream; - - -+G_GNUC_PRINTF(5, 6) - static void - token_stream_set_error (TokenStream *stream, - GError **error, -@@ -525,6 +528,7 @@ ast_free (AST *ast) - ast->class->free (ast); - } - -+G_GNUC_PRINTF(5, 6) - static void - ast_set_error (AST *ast, - GError **error, -diff --git a/glib/tests/markup-escape.c b/glib/tests/markup-escape.c -index 0cd90ef..b2de289 100644 ---- a/glib/tests/markup-escape.c -+++ b/glib/tests/markup-escape.c -@@ -96,6 +96,7 @@ unichar_test (gconstpointer d) - escape_test (&t); - } - -+G_GNUC_PRINTF(1, 3) - static void - test_format (const gchar *format, - const gchar *expected, -diff --git a/glib/tests/string.c b/glib/tests/string.c -index 454574b..ba55d3d 100644 ---- a/glib/tests/string.c -+++ b/glib/tests/string.c -@@ -106,6 +106,7 @@ test_string_new (void) - g_string_free (string2, TRUE); - } - -+G_GNUC_PRINTF(2, 3) - static void - my_string_printf (GString *string, - const gchar *format, -diff --git a/glib/tests/test-printf.c b/glib/tests/test-printf.c -index 10d0a1d..dbfc8fc 100644 ---- a/glib/tests/test-printf.c -+++ b/glib/tests/test-printf.c -@@ -942,6 +942,7 @@ _Pragma ("GCC diagnostic pop") - #endif - } - -+G_GNUC_PRINTF(1, 2) - static gsize - upper_bound (const gchar *format, ...) - { --- -1.7.10.4 - diff --git a/modulesets/patches/0001-Bug-571582-GtkSelection-implementation-for-quartz.patch b/modulesets/patches/0001-Bug-571582-GtkSelection-implementation-for-quartz.patch deleted file mode 100644 index 5a2293e..0000000 --- a/modulesets/patches/0001-Bug-571582-GtkSelection-implementation-for-quartz.patch +++ /dev/null @@ -1,875 +0,0 @@ -From 7385087cae85e14bce61f8effba0f04aab070592 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sun, 11 Sep 2011 16:08:22 -0700 -Subject: [PATCH] Bug 571582: GtkSelection implementation for quartz. - ---- - gdk/quartz/gdkselection-quartz.c | 22 +- - gtk/Makefile.am | 4 +- - gtk/gtkselection-quartz.c | 674 ++++++++++++++++++++++++++++++++++++++ - gtk/gtkselection.c | 14 +- - 4 files changed, 701 insertions(+), 13 deletions(-) - create mode 100644 gtk/gtkselection-quartz.c - -diff --git a/gdk/quartz/gdkselection-quartz.c b/gdk/quartz/gdkselection-quartz.c -index 3accf32..f6048c8 100644 ---- a/gdk/quartz/gdkselection-quartz.c -+++ b/gdk/quartz/gdkselection-quartz.c -@@ -32,7 +32,8 @@ _gdk_quartz_display_set_selection_owner (GdkDisplay *display, - guint32 time, - gint send_event) - { -- /* FIXME: Implement */ -+ g_warning ("Not a valid interface on Quartz. Use GtkSelection.\n"); -+ g_return_val_if_reached(TRUE); - return TRUE; - } - -@@ -40,7 +41,7 @@ GdkWindow* - _gdk_quartz_display_get_selection_owner (GdkDisplay *display, - GdkAtom selection) - { -- /* FIXME: Implement */ -+ /* Quartz doesn't have an X-selection, so it doesn't have a gdk_selection. */ - return NULL; - } - -@@ -51,7 +52,9 @@ _gdk_quartz_display_convert_selection (GdkDisplay *display, - GdkAtom target, - guint32 time) - { -- /* FIXME: Implement */ -+ g_warning ("Not a valid interface on Quartz. Use GtkSelection.\n"); -+ g_return_if_reached(); -+ - } - - gint -@@ -61,7 +64,8 @@ _gdk_quartz_display_get_selection_property (GdkDisplay *display, - GdkAtom *ret_type, - gint *ret_format) - { -- /* FIXME: Implement */ -+ g_warning ("Quartz windows do not support properties.\n"); -+ g_return_val_if_reached (-1); - return 0; - } - -@@ -69,8 +73,8 @@ gchar * - _gdk_quartz_display_utf8_to_string_target (GdkDisplay *display, - const gchar *str) - { -- /* FIXME: Implement */ -- return NULL; -+ /* UTF8 is the standard string on OSX */ -+ return g_strdup (str); - } - - static gint -@@ -90,7 +94,7 @@ make_list (const gchar *text, - while (p < text + length) - { - gchar *str; -- -+ - q = p; - while (*q && q < text + length) - q++; -@@ -123,6 +127,8 @@ make_list (const gchar *text, - if (list) - *list = g_new0 (gchar *, n_strings + 1); - -+ (*list)[n_strings] = NULL; -+ - i = n_strings; - tmp_list = strings; - while (tmp_list) -@@ -163,7 +169,7 @@ _gdk_quartz_display_text_property_to_utf8_list (GdkDisplay *display, - { - gchar *enc_name = gdk_atom_name (encoding); - -- g_warning ("gdk_text_property_to_utf8_list_for_display: encoding %s not handled\n", enc_name); -+ g_warning ("gdk_text_property_to_utf8_list: encoding %s not handled\n", enc_name); - g_free (enc_name); - - if (list) -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 55d7f22..de81d57 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -798,7 +798,9 @@ if USE_QUARTZ - gtk_clipboard_dnd_c_sources = \ - gtkclipboard-quartz.c \ - gtkdnd-quartz.c \ -- gtkquartz.c -+ gtkquartz.c \ -+ gtkselection-quartz.c -+ - gtk_clipboard_dnd_h_sources = gtkquartz.h - else - gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c -diff --git a/gtk/gtkselection-quartz.c b/gtk/gtkselection-quartz.c -new file mode 100644 -index 0000000..1e948ad ---- /dev/null -+++ b/gtk/gtkselection-quartz.c -@@ -0,0 +1,674 @@ -+/* GTK - The GIMP Toolkit -+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+/* This file implements most of the work of the ICCCM selection protocol. -+ * The code was written after an intensive study of the equivalent part -+ * of John Ousterhout's Tk toolkit, and does many things in much the -+ * same way. -+ * -+ * The one thing in the ICCCM that isn't fully supported here (or in Tk) -+ * is side effects targets. For these to be handled properly, MULTIPLE -+ * targets need to be done in the order specified. This cannot be -+ * guaranteed with the way we do things, since if we are doing INCR -+ * transfers, the order will depend on the timing of the requestor. -+ * -+ * By Owen Taylor 8/16/97 -+ */ -+ -+/* Terminology note: when not otherwise specified, the term "incr" below -+ * refers to the _sending_ part of the INCR protocol. The receiving -+ * portion is referred to just as "retrieval". (Terminology borrowed -+ * from Tk, because there is no good opposite to "retrieval" in English. -+ * "send" can't be made into a noun gracefully and we're already using -+ * "emission" for something else ....) -+ */ -+ -+/* The MOTIF entry widget seems to ask for the TARGETS target, then -+ (regardless of the reply) ask for the TEXT target. It's slightly -+ possible though that it somehow thinks we are responding negatively -+ to the TARGETS request, though I don't really think so ... */ -+ -+/* -+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS -+ * file for a list of people on the GTK+ Team. See the ChangeLog -+ * files for a list of changes. These files are distributed with -+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. -+ */ -+ -+#include "config.h" -+#include -+#include -+#include "gdk.h" -+ -+#include "gtkmain.h" -+#include "gtkselection.h" -+#include "gtkselectionprivate.h" -+#include "gtktextbufferrichtext.h" -+#include "gtkintl.h" -+#include "gdk-pixbuf/gdk-pixbuf.h" -+#include "gtkclipboard.h" -+ -+#import -+ -+#undef DEBUG_SELECTION -+/* -+ * DON'T USE THIS INTERFACE: USE GTKCLIPBOARD INSTEAD! -+ * -+ * This is the Quartz version of gtkselection. Unlike the other -+ * versions, it was written in 2010, after most code was rewritten to -+ * use GtkClipboard. Quartz, unlike X11, is not a remote-capable -+ * display system, so most of ICCCM is pointless. This implementation -+ * can therefore be much simpler than the X11 implementation. Text is -+ * a lot simpler, too. It's UTF8. No compound text, no legacy -+ * charsets. There's also only one display, so instead of passing it -+ * around, we'll generally just use gdk_display_get_default() when we -+ * need it. -+ * -+ * There are two constraints: The existing code in various GtkWidgets -+ * which uses GDK_SELECTION_CLIPBOARD (which gtkclipboard-quartz sets -+ * to generalPasteboard) for c copies and GDK_SELECTION_PRIMARY -+ * (for which gtkclipboard-quartz creates a separate pasteboard) for -+ * X-style selection transfers, and Apple's X11 Quartz implementation -+ * which by default puts both on the generalPasteboard. We need to -+ * operate with both. -+ * -+ * IMPORTANT: There is no X11 magic in quartz. If you insist on using -+ * this interface (and you really shouldn't), your MUST connect to -+ * selection-get, selection-received, and selection-clear-event for -+ * your widget. -+ */ -+ -+/* Maximum size of a sent chunk, in bytes. Also the default size of -+ our buffers */ -+ -+ -+#define IDLE_ABORT_TIME 30 -+ -+enum { -+ INCR, -+ MULTIPLE, -+ TARGETS, -+ TIMESTAMP, -+ SAVE_TARGETS, -+ LAST_ATOM -+}; -+ -+typedef struct _GtkSelectionInfo GtkSelectionInfo; -+ -+struct _GtkSelectionInfo -+{ -+ GdkAtom selection; -+ GtkWidget *owner; /* widget that owns selection */ -+ guint32 time; /* time used to acquire selection */ -+}; -+ -+ -+/* Local Functions */ -+static void gtk_selection_get_cb (GtkClipboard *clipboard, -+ GtkSelectionData *data, -+ guint info, -+ gpointer widget); -+static void gtk_selection_clear_cb (GtkClipboard *clipboard, -+ gpointer widget); -+static void gtk_selection_default_handler (GtkWidget *widget, -+ GtkSelectionData *data); -+static int gtk_selection_bytes_per_item (gint format); -+static GtkSelectionInfo *gtk_selection_info_get (GdkAtom selection); -+static void gtk_selection_info_remove (GdkAtom selection, -+ GtkWidget *owner); -+static void gtk_selection_info_append (GdkAtom selection, -+ GtkWidget *owner, -+ guint32 time); -+static void gtk_selection_info_clear (GtkWidget *owner); -+static GtkTargetList *gtk_selection_target_list_get (GtkWidget *widget, -+ GdkAtom selection); -+static void gtk_selection_target_list_remove (GtkWidget *widget); -+ -+/* Local Data */ -+static gint initialize = TRUE; -+static GList *current_selections = NULL; -+ -+static GdkAtom gtk_selection_atoms[LAST_ATOM]; -+static const char gtk_selection_handler_key[] = "gtk-selection-handlers"; -+ -+static GtkTargetEntry default_target = {"UTF8_STRING", 0, 1}; -+ -+/** -+ * gtk_selection_owner_set_for_display: -+ * @display: the #Gdkdisplay where the selection is set -+ * @widget: (allow-none): new selection owner (a #GdkWidget), or %NULL. -+ * @selection: an interned atom representing the selection to claim. -+ * @time_: timestamp with which to claim the selection -+ * -+ * Claim ownership of a given selection for a particular widget, or, -+ * if @widget is %NULL, release ownership of the selection. -+ * -+ * Return value: TRUE if the operation succeeded -+ * -+ * Since: 2.2 -+ */ -+gboolean -+gtk_selection_owner_set_for_display (GdkDisplay *display, -+ GtkWidget *widget, -+ GdkAtom selection, -+ guint32 time) -+{ -+ GObject *old_owner; -+ GtkClipboard *clip = gtk_clipboard_get (selection); -+ GtkTargetEntry *targets = &default_target; -+ gint num_targets = 1; -+ GtkTargetList *tlist; -+ -+ g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE); -+ g_return_val_if_fail (selection != GDK_NONE, FALSE); -+ -+ old_owner = gtk_clipboard_get_owner (clip); -+ if (old_owner) -+ gtk_selection_info_remove (selection, GTK_WIDGET(old_owner)); -+ -+ if (widget == NULL) -+ return TRUE; -+ -+ g_return_val_if_fail (gtk_widget_get_display (widget) == display, FALSE); -+ -+ if ((tlist = gtk_selection_target_list_get (widget, selection)) != NULL) -+ targets = gtk_target_table_new_from_list (tlist, &num_targets); -+ -+ if (gtk_clipboard_set_with_owner (clip, targets, num_targets, -+ gtk_selection_get_cb, -+ gtk_selection_clear_cb, -+ G_OBJECT (widget))) -+ { -+ gtk_selection_info_append (selection, widget, GDK_CURRENT_TIME); -+ return TRUE; -+ } -+ return FALSE; -+} -+ -+ -+typedef struct _GtkSelectionTargetList GtkSelectionTargetList; -+ -+struct _GtkSelectionTargetList { -+ GdkAtom selection; -+ GtkTargetList *list; -+}; -+ -+/** -+ * gtk_selection_remove_all: -+ * @widget: a #GtkWidget -+ * -+ * Removes all handlers and unsets ownership of all -+ * selections for a widget. Called when widget is being -+ * destroyed. This function will not generally be -+ * called by applications. -+ **/ -+void -+gtk_selection_remove_all (GtkWidget *widget) -+{ -+ g_return_if_fail(widget == NULL || GTK_IS_WIDGET(widget)); -+ gtk_selection_info_clear (widget); -+ /* Remove all selection lists */ -+ gtk_selection_target_list_remove (widget); -+} -+ -+ -+/** -+ * gtk_selection_convert: -+ * @widget: The widget which acts as requestor -+ * @selection: Which selection to get -+ * @target: Form of information desired (e.g., STRING) -+ * @time_: Time of request (usually of triggering event) -+ In emergency, you could use #GDK_CURRENT_TIME -+ * -+ * Requests the contents of a selection. When received, -+ * a "selection-received" signal will be generated. -+ * -+ * Return value: %TRUE if requested succeeded. %FALSE if we could not process -+ * request. (e.g., there was already a request in process for -+ * this widget). -+ **/ -+gboolean -+gtk_selection_convert (GtkWidget *widget, -+ GdkAtom selection, -+ GdkAtom target, -+ guint32 time_) -+{ -+ GtkClipboard *clip = gtk_clipboard_get (selection); -+ GtkSelectionData *data; -+ -+ g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); -+ g_return_val_if_fail (selection != GDK_NONE, FALSE); -+ -+ data = gtk_clipboard_wait_for_contents (clip, target); -+ if (data == NULL) -+ return FALSE; -+ -+ g_signal_emit_by_name (widget, "selection-received", data, time); -+ -+ return TRUE; -+} -+ -+ -+/** -+ * _gtk_selection_clear: -+ * @widget: a #GtkWidget -+ * @event: the event -+ * -+ * The default handler for the #GtkWidget::selection-clear-event -+ * signal. -+ * -+ * Return value: %TRUE if the event was handled, otherwise false -+ **/ -+gboolean -+_gtk_selection_clear (GtkWidget *widget, -+ GdkEventSelection *event) -+{ -+ gtk_selection_clear_targets (widget, event->selection); -+ return FALSE; -+} -+ -+ -+/************************************************************* -+ * _gtk_selection_request: -+ * Handler for "selection_request_event" -+ * arguments: -+ * widget: -+ * event: -+ * results: -+ *************************************************************/ -+ -+gboolean -+_gtk_selection_request (GtkWidget *widget, -+ GdkEventSelection *event) -+{ -+ g_print ("Selection Request Events should not occur in quartz\n"); -+ return TRUE; -+} -+ -+/************************************************************* -+ * _gtk_selection_incr_event: -+ * Called whenever an PropertyNotify event occurs for an -+ * GdkWindow with user_data == NULL. These will be notifications -+ * that a window we are sending the selection to via the -+ * INCR protocol has deleted a property and is ready for -+ * more data. -+ * -+ * arguments: -+ * window: the requestor window -+ * event: the property event structure -+ * -+ * results: -+ *************************************************************/ -+ -+gboolean -+_gtk_selection_incr_event (GdkWindow *window, -+ GdkEventProperty *event) -+{ -+ g_print ("Selection_INCR_Events should not occur in quartz\n"); -+ return TRUE; -+} -+ -+/************************************************************* -+ * _gtk_selection_notify: -+ * Handler for "selection-notify-event" signals on windows -+ * where a retrieval is currently in process. The selection -+ * owner has responded to our conversion request. -+ * arguments: -+ * widget: Widget getting signal -+ * event: Selection event structure -+ * info: Information about this retrieval -+ * results: -+ * was event handled? -+ *************************************************************/ -+ -+gboolean -+_gtk_selection_notify (GtkWidget *widget, -+ GdkEventSelection *event) -+{ -+ g_print ("Selection_Notifications should not occur in quartz\n"); -+ -+ return TRUE; -+} -+ -+/************************************************************* -+ * _gtk_selection_property_notify: -+ * Handler for "property-notify-event" signals on windows -+ * where a retrieval is currently in process. The selection -+ * owner has added more data. -+ * arguments: -+ * widget: Widget getting signal -+ * event: Property event structure -+ * info: Information about this retrieval -+ * results: -+ * was event handled? -+ *************************************************************/ -+ -+gboolean -+_gtk_selection_property_notify (GtkWidget *widget, -+ GdkEventProperty *event) -+{ -+ g_print ("Selection_Property_Notifications should not occur in quartz\n"); -+ return TRUE; -+} -+ -+ -+/************************************************************* -+ * gtk_selection_get_cb() -+ * @clipboard: The clipboard requesting the data -+ * @data: Pass to selection-get signal; handlers should put requested -+ * data in the structure pointed to. -+ * @info: DND uses this on Windows and X11. It can be ignored for -+ * normal selection use. -+ * @owner: The window to which the information request is sent; it's -+ * the owner set with gtk_selection_owner_set_for_display. -+ * -+ * Emits a signal to the owner window to fill in the provided data structure. -+ *************************************************************/ -+/* GtkClipboardGetFunc */ -+static void -+gtk_selection_get_cb (GtkClipboard* clipboard, -+ GtkSelectionData *data, -+ guint info, -+ gpointer owner) -+{ -+ GtkTargetList *target_list; -+ GtkWidget *widget = GTK_WIDGET (owner); -+ -+ -+ g_return_if_fail (widget != NULL); -+ -+ target_list = gtk_selection_target_list_get (widget, data->selection); -+ -+ if ( data->target == gtk_selection_atoms[TIMESTAMP] || -+ data->target == gtk_selection_atoms[TARGETS] || -+ data->target == gtk_selection_atoms[SAVE_TARGETS]) -+ { -+ gtk_selection_default_handler (widget, data); -+ return; -+ } -+ if (target_list && -+ gtk_target_list_find (target_list, data->target, &info)) -+ { -+ g_signal_emit_by_name (widget, -+ "selection-get", -+ data, -+ info, time); -+ } -+} -+ -+static void -+gtk_selection_clear_cb (GtkClipboard* clipboard, -+ gpointer owner) -+{ -+ GtkWidget *widget = GTK_WIDGET (owner); -+ GdkEventSelection event; -+ event.type = GDK_SELECTION_CLEAR; -+ event.selection = GDK_SELECTION_PRIMARY; -+ event.window = gtk_widget_get_window(widget); -+ g_signal_emit_by_name (widget, -+ "selection-clear-event", -+ &event, -+ NULL); -+} -+ -+/************************************************************* -+ * gtk_selection_default_handler: -+ * Handles some default targets that exist for any widget -+ * If it can't fit results into buffer, returns -1. This -+ * won't happen in any conceivable case, since it would -+ * require 1000 selection targets! -+ * -+ * arguments: -+ * widget: selection owner -+ * data: selection data [INOUT] -+ * -+ *************************************************************/ -+ -+static void -+gtk_selection_default_handler (GtkWidget *widget, -+ GtkSelectionData *data) -+{ -+ if (data->target == gtk_selection_atoms[TIMESTAMP]) -+ { -+ /* Time which was used to obtain selection */ -+ GList *tmp_list; -+ GtkSelectionInfo *selection_info; -+ -+ tmp_list = current_selections; -+ while (tmp_list) -+ { -+ selection_info = (GtkSelectionInfo *)tmp_list->data; -+ if ((selection_info->owner == widget) && -+ (selection_info->selection == data->selection)) -+ { -+ gulong time = selection_info->time; -+ -+ gtk_selection_data_set (data, -+ GDK_SELECTION_TYPE_INTEGER, -+ 32, -+ (guchar *)&time, -+ sizeof (time)); -+ return; -+ } -+ -+ tmp_list = tmp_list->next; -+ } -+ -+ data->length = -1; -+ } -+ else if (data->target == gtk_selection_atoms[TARGETS]) -+ { -+ /* List of all targets supported for this widget/selection pair */ -+ GdkAtom *p; -+ guint count; -+ GList *tmp_list; -+ GtkTargetList *target_list; -+ GtkTargetPair *pair; -+ -+ target_list = gtk_selection_target_list_get (widget, -+ data->selection); -+ count = g_list_length (target_list->list) + 3; -+ -+ data->type = GDK_SELECTION_TYPE_ATOM; -+ data->format = 32; -+ data->length = count * sizeof (GdkAtom); -+ -+ /* selection data is always terminated by a trailing \0 -+ */ -+ p = g_malloc (data->length + 1); -+ data->data = (guchar *)p; -+ data->data[data->length] = '\0'; -+ -+ *p++ = gtk_selection_atoms[TIMESTAMP]; -+ *p++ = gtk_selection_atoms[TARGETS]; -+ *p++ = gtk_selection_atoms[MULTIPLE]; -+ -+ tmp_list = target_list->list; -+ while (tmp_list) -+ { -+ pair = (GtkTargetPair *)tmp_list->data; -+ *p++ = pair->target; -+ -+ tmp_list = tmp_list->next; -+ } -+ } -+ else if (data->target == gtk_selection_atoms[SAVE_TARGETS]) -+ { -+ gtk_selection_data_set (data, -+ gdk_atom_intern_static_string ("NULL"), -+ 32, NULL, 0); -+ } -+ else -+ { -+ data->length = -1; -+ } -+} -+ -+static GtkSelectionInfo * -+gtk_selection_info_get (GdkAtom selection) -+{ -+ GList *tmp_list; -+ GList *next; -+ GtkSelectionInfo *selection_info; -+ -+ tmp_list = current_selections; -+ while (tmp_list) -+ { -+ next = tmp_list->next; -+ selection_info = (GtkSelectionInfo *)tmp_list->data; -+ -+ if (selection_info->selection == selection) -+ { -+ return selection_info; -+ } -+ -+ tmp_list = next; -+ } -+ return NULL; -+} -+ -+static void -+gtk_selection_info_remove (GdkAtom selection, GtkWidget *owner) -+{ -+ GList *tmp_list; -+ GList *next; -+ GtkSelectionInfo *selection_info; -+ -+ g_return_if_fail (GTK_IS_WIDGET (owner)); -+ -+ tmp_list = current_selections; -+ while (tmp_list) -+ { -+ next = tmp_list->next; -+ selection_info = (GtkSelectionInfo *)tmp_list->data; -+ -+ if (selection_info->selection == selection && -+ selection_info->owner == owner) -+ { -+ /* Clear the clipboard; this will send a changedOwner to the -+ pasteboard so that it won't try to retrieve the -+ still-pending types later when the window isn't around to -+ provide them. */ -+ GtkClipboard *clip = gtk_clipboard_get(selection_info->selection); -+ gtk_clipboard_clear(clip); -+ current_selections = g_list_remove_link (current_selections, -+ tmp_list); -+ g_list_free (tmp_list); -+ g_slice_free (GtkSelectionInfo, selection_info); -+ return; -+ } -+ -+ tmp_list = next; -+ } -+} -+static void -+gtk_selection_info_append (GdkAtom selection, GtkWidget *owner, guint32 time) -+{ -+ GtkSelectionInfo *selection_info; -+ -+ g_return_if_fail (GTK_IS_WIDGET (owner)); -+ -+ selection_info = g_slice_new (GtkSelectionInfo); -+ selection_info->selection = selection; -+ selection_info->owner = owner; -+ selection_info->time = time; -+ current_selections = g_list_prepend (current_selections, -+ selection_info); -+} -+ -+static void -+gtk_selection_info_clear (GtkWidget *owner) -+{ -+ GList *tmp_list; -+ GList *next; -+ GtkSelectionInfo *selection_info; -+ -+ g_return_if_fail (GTK_IS_WIDGET (owner)); -+ -+ tmp_list = current_selections; -+ while (tmp_list) -+ { -+ next = tmp_list->next; -+ selection_info = (GtkSelectionInfo *)tmp_list->data; -+ -+ if (selection_info->owner == owner) -+ { -+ current_selections = g_list_remove_link (current_selections, -+ tmp_list); -+ g_list_free (tmp_list); -+ g_slice_free (GtkSelectionInfo, selection_info); -+ } -+ -+ tmp_list = next; -+ } -+} -+ -+static GtkTargetList * -+gtk_selection_target_list_get (GtkWidget *widget, -+ GdkAtom selection) -+{ -+ GtkSelectionTargetList *sellist; -+ GList *tmp_list; -+ GList *lists; -+ -+ lists = g_object_get_data (G_OBJECT (widget), gtk_selection_handler_key); -+ -+ tmp_list = lists; -+ while (tmp_list) -+ { -+ sellist = tmp_list->data; -+ if (sellist->selection == selection) -+ return sellist->list; -+ tmp_list = tmp_list->next; -+ } -+ -+ sellist = g_slice_new (GtkSelectionTargetList); -+ sellist->selection = selection; -+ sellist->list = gtk_target_list_new (NULL, 0); -+ -+ lists = g_list_prepend (lists, sellist); -+ g_object_set_data (G_OBJECT (widget), I_(gtk_selection_handler_key), lists); -+ -+ return sellist->list; -+} -+ -+static void -+gtk_selection_target_list_remove (GtkWidget *widget) -+{ -+ GtkSelectionTargetList *sellist; -+ GList *tmp_list; -+ GList *lists; -+ -+ lists = g_object_get_data (G_OBJECT (widget), gtk_selection_handler_key); -+ -+ tmp_list = lists; -+ while (tmp_list) -+ { -+ sellist = tmp_list->data; -+ -+ gtk_target_list_unref (sellist->list); -+ -+ g_slice_free (GtkSelectionTargetList, sellist); -+ tmp_list = tmp_list->next; -+ } -+ -+ g_list_free (lists); -+ g_object_set_data (G_OBJECT (widget), I_(gtk_selection_handler_key), NULL); -+} -+ -diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c -index 9e2295f..77bb934 100644 ---- a/gtk/gtkselection.c -+++ b/gtk/gtkselection.c -@@ -661,6 +661,7 @@ gtk_target_table_free (GtkTargetEntry *targets, - g_free (targets); - } - -+#ifndef GDK_WINDOWING_QUARTZ /* Quartz handled by gtkselection-quartz.c */ - /** - * gtk_selection_owner_set_for_display: - * @display: the #Gdkdisplay where the selection is set -@@ -763,7 +764,7 @@ gtk_selection_owner_set_for_display (GdkDisplay *display, - else - return FALSE; - } -- -+#endif /* GDK_WINDOWING_QUARTZ */ - /** - * gtk_selection_owner_set: - * @widget: (allow-none): a #GtkWidget, or %NULL. -@@ -965,7 +966,7 @@ gtk_selection_add_targets (GtkWidget *widget, - #endif - } - -- -+#ifndef GDK_WINDOWING_QUARTZ /* Quartz is handled in gtkselection-quartz.c */ - /** - * gtk_selection_remove_all: - * @widget: a #GtkWidget -@@ -1026,8 +1027,9 @@ gtk_selection_remove_all (GtkWidget *widget) - /* Remove all selection lists */ - gtk_selection_target_list_remove (widget); - } -+#endif /* GDK_WINDOWING_QUARTZ */ - -- -+#ifndef GDK_WINDOWING_QUARTZ /* Quartz is handled in gtkselection-quartz.c */ - /** - * gtk_selection_convert: - * @widget: The widget which acts as requestor -@@ -1138,7 +1140,7 @@ gtk_selection_convert (GtkWidget *widget, - - return TRUE; - } -- -+#endif /* GDK_WINDOWING_QUARTZ */ - /** - * gtk_selection_data_get_selection: - * @selection_data: a pointer to a #GtkSelectionData structure. -@@ -2232,6 +2234,7 @@ gtk_selection_init (void) - initialize = FALSE; - } - -+#ifndef GDK_WINDOWING_QUARTZ /* Quartz handled by gtkselection-quartz.c */ - /** - * _gtk_selection_clear: - * @widget: a #GtkWidget -@@ -2652,6 +2655,7 @@ _gtk_selection_incr_event (GdkWindow *window, - - return TRUE; - } -+#endif /* GDK_WINDOWING_QUARTZ */ - - /************************************************************* - * gtk_selection_incr_timeout: -@@ -2706,6 +2710,7 @@ gtk_selection_incr_timeout (GtkIncrInfo *info) - return retval; - } - -+#ifndef GDK_WINDOWING_QUARTZ /* Quartz handled by gtkselection-quartz.c */ - /************************************************************* - * _gtk_selection_notify: - * Handler for "selection-notify-event" signals on windows -@@ -2904,6 +2909,7 @@ _gtk_selection_property_notify (GtkWidget *widget, - - return TRUE; - } -+#endif /* GDK_WINDOWING_QUARTZ */ - - /************************************************************* - * gtk_selection_retrieval_timeout: --- -1.7.6.3.dirty - diff --git a/modulesets/patches/0001-Bug-667759-gtkdnd-quartz.c-is-missing-annotations-fo.patch b/modulesets/patches/0001-Bug-667759-gtkdnd-quartz.c-is-missing-annotations-fo.patch deleted file mode 100644 index 0fbf03e..0000000 --- a/modulesets/patches/0001-Bug-667759-gtkdnd-quartz.c-is-missing-annotations-fo.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4aebe6d4f08297066b231eee7aa15d33d8dd6d98 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Fri, 3 May 2013 10:31:47 -0700 -Subject: [PATCH] Bug 667759 - gtkdnd-quartz.c is missing annotations for - introspection - -Work around this by introspecting gtkclipboard.c and gtkdnd.c instead -of the quartz alternatives. - -Note that this is temporary: The implementation of GdkSelection -will make the quartz alternatives unnecessary. See bug 571582. ---- - gtk/Makefile.am | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 6e7bbf1..0b82797 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -1313,13 +1313,23 @@ LDADDS = \ - $(GTK_DEP_LIBS) - - if HAVE_INTROSPECTION -+# The Quartz clipboard and dnd files aren't annotated for -+# introspection. Rather than copy the annotations over from the -+# regular files, exclude the quartz ones: - introspection_files = \ -- $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) $(deprecatedinclude_HEADERS)) \ -+ $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) $(deprecatedinclude_HEADERS) gtkclipboard-quartz.c gtkdnd-quartz.c) \ - $(gtk_base_c_sources) \ - gtkprintoperation-unix.c \ - gtktypebuiltins.h \ - gtktypebuiltins.c - -+# And include the regular ones: -+if USE_QUARTZ -+introspection_files += \ -+ gtkclipboard.c \ -+ gtkdnd.c -+endif -+ - if USE_X11 - introspection_files += \ - gtksocket.c \ --- -1.8.3.rc0 - diff --git a/modulesets/patches/0001-Bug-670373-gtk2-modules-printing-cups-gtkprintbackendcups.patch b/modulesets/patches/0001-Bug-670373-gtk2-modules-printing-cups-gtkprintbackendcups.patch deleted file mode 100644 index df73840..0000000 --- a/modulesets/patches/0001-Bug-670373-gtk2-modules-printing-cups-gtkprintbackendcups.patch +++ /dev/null @@ -1,332 +0,0 @@ -From bf8d9699ec228a8dd67c1bd1a84c38c398ba0b09 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 25 Feb 2012 17:43:18 -0800 -Subject: [PATCH 1/9] [Bug 670373] modules/printing/cups/gtkprintbackendcups.c - won't build with CUPS 1.6 - - The first, simple changes. Turns off the deprecation warnings and - substitutes macros and short ifdef blocks where feasible. ---- - configure.in | 6 + - modules/printbackends/cups/gtkprintbackendcups.c | 146 +++++++++++++--------- - 2 files changed, 93 insertions(+), 59 deletions(-) - -diff --git a/configure.in b/configure.in -index dff4588..288ad0c 100644 ---- a/configure.in -+++ b/configure.in -@@ -1473,6 +1473,12 @@ else - AC_DEFINE(HAVE_CUPS_API_1_2, 1, - [Define to 1 if CUPS 1.2 API is available]) - fi -+ if test $CUPS_API_MAJOR -gt 1 -o \ -+ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then -+ AC_DEFINE(HAVE_CUPS_API_1_6, 1, -+ [Define to 1 if CUPS 1.6 API is available]) -+ -+ fi - - AC_SUBST(CUPS_API_MAJOR) - AC_SUBST(CUPS_API_MINOR) -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index 59914ba..283a0ff 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -30,6 +30,13 @@ - #include - #include - #include -+/* Cups 1.6 deprecates ppdFindAttr(), ppdFindCustomOption(), -+ * ppdFirstCustomParam(), and ppdNextCustomParam() among others. This -+ * turns off the warning so that it will compile. -+ */ -+#ifdef HAVE_CUPS_API_1_6 -+# define _PPD_DEPRECATED -+#endif - - #include - #include -@@ -235,7 +242,22 @@ pb_module_create (void) - { - return gtk_print_backend_cups_new (); - } -- -+/* CUPS 1.6 Getter/Setter Functions CUPS 1.6 makes private most of the -+ * IPP structures and enforces access via new getter functions, which -+ * are unfortunately not available in earlier versions. We define -+ * below those getter functions as macros for use when building -+ * against earlier CUPS versions. -+ */ -+#ifndef HAVE_CUPS_API_1_6 -+#define ippGetOperation(ipp_request) ipp_request->request.op.operation_id -+#define ippGetInteger(attr, index) attr->values[index].integer -+#define ippGetBoolean(attr, index) attr->values[index].boolean -+#define ippGetString(attr, index, foo) attr->values[index].string.text -+#define ippGetValueTag(attr) attr->value_tag -+#define ippGetName(attr) attr->name -+#define ippGetCount(attr) attr->num_values -+#define ippGetGroupTag(attr) attr->group_tag -+#endif - /* - * GtkPrintBackendCups - */ -@@ -463,7 +485,7 @@ cups_print_cb (GtkPrintBackendCups *print_backend, - ipp_t *response = gtk_cups_result_get_response (result); - - if ((attr = ippFindAttribute (response, "job-id", IPP_TAG_INTEGER)) != NULL) -- job_id = attr->values[0].integer; -+ job_id = ippGetInteger (attr, 0); - - if (!gtk_print_job_get_track_print_status (ps->job) || job_id == 0) - gtk_print_job_set_status (ps->job, GTK_PRINT_STATUS_FINISHED); -@@ -900,7 +922,7 @@ request_password (gpointer data) - - dispatch->backend->authentication_lock = TRUE; - -- switch (dispatch->request->ipp_request->request.op.operation_id) -+ switch (ippGetOperation (dispatch->request->ipp_request)) - { - case IPP_PRINT_JOB: - if (job_title != NULL && printer_name != NULL) -@@ -928,7 +950,7 @@ request_password (gpointer data) - break; - default: - /* work around gcc warning about 0 not being a value for this enum */ -- if (dispatch->request->ipp_request->request.op.operation_id == 0) -+ if (ippGetOperation (dispatch->request->ipp_request) == 0) - prompt = g_strdup_printf ( _("Authentication is required to get a file from %s"), hostname); - else - prompt = g_strdup_printf ( _("Authentication is required on %s"), hostname); -@@ -1516,10 +1538,15 @@ cups_request_job_info_cb (GtkPrintBackendCups *print_backend, - } - - data->counter++; -- -+ - response = gtk_cups_result_get_response (result); - - state = 0; -+ -+#ifdef HAVE_CUPS_API_1_6 -+ attr = ippFindAttribute (response, "job-state", IPP_TAG_INTEGER); -+ state = ippGetInteger (attr, 0); -+#else - for (attr = response->attrs; attr != NULL; attr = attr->next) - { - if (!attr->name) -@@ -1527,7 +1554,8 @@ cups_request_job_info_cb (GtkPrintBackendCups *print_backend, - - _CUPS_MAP_ATTR_INT (attr, state, "job-state"); - } -- -+#endif -+ - done = FALSE; - switch (state) - { -@@ -1760,53 +1788,53 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - gboolean is_accepting_jobs = TRUE; - gboolean default_printer = FALSE; - gboolean got_printer_type = FALSE; -- gchar *default_cover_before = NULL; -- gchar *default_cover_after = NULL; -+ const gchar *default_cover_before = NULL; -+ const gchar *default_cover_after = NULL; - gboolean remote_printer = FALSE; - gchar **auth_info_required = NULL; - - /* Skip leading attributes until we hit a printer... - */ -- while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER) -+ while (attr != NULL && ippGetGroupTag (attr) != IPP_TAG_PRINTER) - attr = attr->next; - - if (attr == NULL) - break; - -- while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER) -+ while (attr != NULL && ippGetGroupTag (attr) == IPP_TAG_PRINTER) - { -- if (strcmp (attr->name, "printer-name") == 0 && -- attr->value_tag == IPP_TAG_NAME) -- printer_name = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-uri-supported") == 0 && -- attr->value_tag == IPP_TAG_URI) -- printer_uri = attr->values[0].string.text; -- else if (strcmp (attr->name, "member-uris") == 0 && -- attr->value_tag == IPP_TAG_URI) -- member_uris = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-location") == 0) -- location = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-info") == 0) -- description = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-state-message") == 0) -- state_msg = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-state-reasons") == 0) -+ if (strcmp (ippGetName (attr), "printer-name") == 0 && -+ ippGetValueTag (attr) == IPP_TAG_NAME) -+ printer_name = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-uri-supported") == 0 && -+ ippGetValueTag (attr) == IPP_TAG_URI) -+ printer_uri = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "member-uris") == 0 && -+ ippGetValueTag (attr) == IPP_TAG_URI) -+ member_uris = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-location") == 0) -+ location = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-info") == 0) -+ description = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-state-message") == 0) -+ state_msg = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-state-reasons") == 0) - /* Store most important reason to reason_msg and set - its importance at printer_state_reason_level */ - { -- for (i = 0; i < attr->num_values; i++) -+ for (i = 0; i < ippGetCount (attr); i++) - { -- if (strcmp (attr->values[i].string.text, "none") != 0) -+ if (strcmp (ippGetString (attr, i, NULL), "none") != 0) - { - /* Sets is_paused flag for paused printer. */ -- if (strcmp (attr->values[i].string.text, "paused") == 0) -+ if (strcmp (ippGetString (attr, i, NULL), "paused") == 0) - { - is_paused = TRUE; - } - - interested_in = FALSE; - for (j = 0; j < G_N_ELEMENTS (reasons); j++) -- if (strncmp (attr->values[i].string.text, reasons[j], strlen (reasons[j])) == 0) -+ if (strncmp (ippGetString (attr, i, NULL), reasons[j], strlen (reasons[j])) == 0) - { - interested_in = TRUE; - break; -@@ -1814,87 +1842,87 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - - if (interested_in) - { -- if (g_str_has_suffix (attr->values[i].string.text, "-report")) -+ if (g_str_has_suffix (ippGetString (attr, i, NULL), "-report")) - { - if (printer_state_reason_level <= 1) - { -- reason_msg = attr->values[i].string.text; -+ reason_msg = ippGetString (attr, i, NULL); - printer_state_reason_level = 1; - } - } -- else if (g_str_has_suffix (attr->values[i].string.text, "-warning")) -+ else if (g_str_has_suffix (ippGetString (attr, i, NULL), "-warning")) - { - if (printer_state_reason_level <= 2) - { -- reason_msg = attr->values[i].string.text; -+ reason_msg = ippGetString (attr, i, NULL); - printer_state_reason_level = 2; -- } -+ } - } - else /* It is error in the case of no suffix. */ - { -- reason_msg = attr->values[i].string.text; -+ reason_msg = ippGetString (attr, i, NULL); - printer_state_reason_level = 3; - } - } - } - } - } -- else if (strcmp (attr->name, "printer-state") == 0) -- state = attr->values[0].integer; -- else if (strcmp (attr->name, "queued-job-count") == 0) -- job_count = attr->values[0].integer; -- else if (strcmp (attr->name, "printer-is-accepting-jobs") == 0) -+ else if (strcmp (ippGetName (attr), "printer-state") == 0) -+ state = ippGetInteger (attr, 0); -+ else if (strcmp (ippGetName (attr), "queued-job-count") == 0) -+ job_count = ippGetInteger (attr, 0); -+ else if (strcmp (ippGetName (attr), "printer-is-accepting-jobs") == 0) - { -- if (attr->values[0].boolean == 1) -+ if (ippGetBoolean (attr, 0) == 1) - is_accepting_jobs = TRUE; - else - is_accepting_jobs = FALSE; - } -- else if (strcmp (attr->name, "job-sheets-supported") == 0) -+ else if (strcmp (ippGetName (attr), "job-sheets-supported") == 0) - { - if (cups_backend->covers == NULL) - { -- cups_backend->number_of_covers = attr->num_values; -+ cups_backend->number_of_covers = ippGetCount (attr); - cups_backend->covers = g_new (char *, cups_backend->number_of_covers + 1); - for (i = 0; i < cups_backend->number_of_covers; i++) -- cups_backend->covers[i] = g_strdup (attr->values[i].string.text); -+ cups_backend->covers[i] = g_strdup (ippGetString (attr, i, NULL)); - cups_backend->covers[cups_backend->number_of_covers] = NULL; - } - } -- else if (strcmp (attr->name, "job-sheets-default") == 0) -+ else if (strcmp (ippGetName (attr), "job-sheets-default") == 0) - { -- if (attr->num_values == 2) -+ if (ippGetCount (attr) == 2) - { -- default_cover_before = attr->values[0].string.text; -- default_cover_after = attr->values[1].string.text; -+ default_cover_before = ippGetString (attr, 0, NULL); -+ default_cover_after = ippGetString (attr, 1, NULL); - } - } -- else if (strcmp (attr->name, "printer-type") == 0) -+ else if (strcmp (ippGetName (attr), "printer-type") == 0) - { - got_printer_type = TRUE; -- if (attr->values[0].integer & 0x00020000) -+ if (ippGetInteger (attr, 0) & 0x00020000) - default_printer = TRUE; - else - default_printer = FALSE; - -- if (attr->values[0].integer & 0x00000002) -+ if (ippGetInteger (attr, 0) & 0x00000002) - remote_printer = TRUE; - else - remote_printer = FALSE; - } -- else if (strcmp (attr->name, "auth-info-required") == 0) -+ else if (strcmp (ippGetName (attr), "auth-info-required") == 0) - { -- if (strcmp (attr->values[0].string.text, "none") != 0) -+ if (strcmp (ippGetString (attr, 0, NULL), "none") != 0) - { -- auth_info_required = g_new0 (gchar *, attr->num_values + 1); -- for (i = 0; i < attr->num_values; i++) -- auth_info_required[i] = g_strdup (attr->values[i].string.text); -+ auth_info_required = g_new0 (gchar *, ippGetCount (attr) + 1); -+ for (i = 0; i < ippGetCount (attr); i++) -+ auth_info_required[i] = g_strdup (ippGetString (attr, i, NULL)); - } - } - else - { - GTK_NOTE (PRINTING, -- g_print ("CUPS Backend: Attribute %s ignored", attr->name)); -+ g_print ("CUPS Backend: Attribute %s ignored", ippGetName (attr))); - } - - attr = attr->next; -@@ -2707,7 +2735,7 @@ cups_request_default_printer_cb (GtkPrintBackendCups *print_backend, - response = gtk_cups_result_get_response (result); - - if ((attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME)) != NULL) -- print_backend->default_printer = g_strdup (attr->values[0].string.text); -+ print_backend->default_printer = g_strdup (ippGetString (attr, 0, NULL)); - - print_backend->got_default_printer = TRUE; - --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0001-Bug-670373-gtk3-modules-printing-cups-gtkprintbackendcups.patch b/modulesets/patches/0001-Bug-670373-gtk3-modules-printing-cups-gtkprintbackendcups.patch deleted file mode 100644 index 0734772..0000000 --- a/modulesets/patches/0001-Bug-670373-gtk3-modules-printing-cups-gtkprintbackendcups.patch +++ /dev/null @@ -1,331 +0,0 @@ -From 3c586545f528e18ef2a9fa9e2ff17fc369e3a38f Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 18 Feb 2012 14:16:27 -0800 -Subject: [PATCH 1/9] [Bug 670373] modules/printing/cups/gtkprintbackendcups.c - won't build with CUPS 1.6 - -The first, simple changes. Turns off the deprecation warnings and substitutes macros and short ifdef blocks where feasible. ---- - configure.in | 6 + - modules/printbackends/cups/gtkprintbackendcups.c | 146 +++++++++++++--------- - 2 files changed, 93 insertions(+), 59 deletions(-) - -diff --git a/configure.in b/configure.in -index 75761d5..85c5960 100644 ---- a/configure.in -+++ b/configure.in -@@ -1473,6 +1473,12 @@ else - AC_DEFINE(HAVE_CUPS_API_1_2, 1, - [Define to 1 if CUPS 1.2 API is available]) - fi -+ if test $CUPS_API_MAJOR -gt 1 -o \ -+ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then -+ AC_DEFINE(HAVE_CUPS_API_1_6, 1, -+ [Define to 1 if CUPS 1.6 API is available]) -+ -+ fi - - AC_SUBST(CUPS_API_MAJOR) - AC_SUBST(CUPS_API_MINOR) -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index 79d66cd..12c6ab6 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -30,6 +30,13 @@ - #include - #include - #include -+/* Cups 1.6 deprecates ppdFindAttr(), ppdFindCustomOption(), -+ * ppdFirstCustomParam(), and ppdNextCustomParam() among others. This -+ * turns off the warning so that it will compile. -+ */ -+#ifdef HAVE_CUPS_API_1_6 -+# define _PPD_DEPRECATED -+#endif - - #include - #include -@@ -235,7 +242,22 @@ pb_module_create (void) - { - return gtk_print_backend_cups_new (); - } -- -+/* CUPS 1.6 Getter/Setter Functions CUPS 1.6 makes private most of the -+ * IPP structures and enforces access via new getter functions, which -+ * are unfortunately not available in earlier versions. We define -+ * below those getter functions as macros for use when building -+ * against earlier CUPS versions. -+ */ -+#ifndef HAVE_CUPS_API_1_6 -+#define ippGetOperation(ipp_request) ipp_request->request.op.operation_id -+#define ippGetInteger(attr, index) attr->values[index].integer -+#define ippGetBoolean(attr, index) attr->values[index].boolean -+#define ippGetString(attr, index, foo) attr->values[index].string.text -+#define ippGetValueTag(attr) attr->value_tag -+#define ippGetName(attr) attr->name -+#define ippGetCount(attr) attr->num_values -+#define ippGetGroupTag(attr) attr->group_tag -+#endif - /* - * GtkPrintBackendCups - */ -@@ -463,7 +485,7 @@ cups_print_cb (GtkPrintBackendCups *print_backend, - ipp_t *response = gtk_cups_result_get_response (result); - - if ((attr = ippFindAttribute (response, "job-id", IPP_TAG_INTEGER)) != NULL) -- job_id = attr->values[0].integer; -+ job_id = ippGetInteger (attr, 0); - - if (!gtk_print_job_get_track_print_status (ps->job) || job_id == 0) - gtk_print_job_set_status (ps->job, GTK_PRINT_STATUS_FINISHED); -@@ -900,7 +922,7 @@ request_password (gpointer data) - - dispatch->backend->authentication_lock = TRUE; - -- switch (dispatch->request->ipp_request->request.op.operation_id) -+ switch (ippGetOperation (dispatch->request->ipp_request)) - { - case IPP_PRINT_JOB: - if (job_title != NULL && printer_name != NULL) -@@ -928,7 +950,7 @@ request_password (gpointer data) - break; - default: - /* work around gcc warning about 0 not being a value for this enum */ -- if (dispatch->request->ipp_request->request.op.operation_id == 0) -+ if (ippGetOperation (dispatch->request->ipp_request) == 0) - prompt = g_strdup_printf ( _("Authentication is required to get a file from %s"), hostname); - else - prompt = g_strdup_printf ( _("Authentication is required on %s"), hostname); -@@ -1516,10 +1538,15 @@ cups_request_job_info_cb (GtkPrintBackendCups *print_backend, - } - - data->counter++; -- -+ - response = gtk_cups_result_get_response (result); - - state = 0; -+ -+#ifdef HAVE_CUPS_API_1_6 -+ attr = ippFindAttribute (response, "job-state", IPP_TAG_INTEGER); -+ state = ippGetInteger (attr, 0); -+#else - for (attr = response->attrs; attr != NULL; attr = attr->next) - { - if (!attr->name) -@@ -1527,7 +1554,8 @@ cups_request_job_info_cb (GtkPrintBackendCups *print_backend, - - _CUPS_MAP_ATTR_INT (attr, state, "job-state"); - } -- -+#endif -+ - done = FALSE; - switch (state) - { -@@ -1760,53 +1788,53 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - gboolean is_accepting_jobs = TRUE; - gboolean default_printer = FALSE; - gboolean got_printer_type = FALSE; -- gchar *default_cover_before = NULL; -- gchar *default_cover_after = NULL; -+ const gchar *default_cover_before = NULL; -+ const gchar *default_cover_after = NULL; - gboolean remote_printer = FALSE; - gchar **auth_info_required = NULL; - - /* Skip leading attributes until we hit a printer... - */ -- while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER) -+ while (attr != NULL && ippGetGroupTag (attr) != IPP_TAG_PRINTER) - attr = attr->next; - - if (attr == NULL) - break; - -- while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER) -+ while (attr != NULL && ippGetGroupTag (attr) == IPP_TAG_PRINTER) - { -- if (strcmp (attr->name, "printer-name") == 0 && -- attr->value_tag == IPP_TAG_NAME) -- printer_name = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-uri-supported") == 0 && -- attr->value_tag == IPP_TAG_URI) -- printer_uri = attr->values[0].string.text; -- else if (strcmp (attr->name, "member-uris") == 0 && -- attr->value_tag == IPP_TAG_URI) -- member_uris = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-location") == 0) -- location = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-info") == 0) -- description = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-state-message") == 0) -- state_msg = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-state-reasons") == 0) -+ if (strcmp (ippGetName (attr), "printer-name") == 0 && -+ ippGetValueTag (attr) == IPP_TAG_NAME) -+ printer_name = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-uri-supported") == 0 && -+ ippGetValueTag (attr) == IPP_TAG_URI) -+ printer_uri = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "member-uris") == 0 && -+ ippGetValueTag (attr) == IPP_TAG_URI) -+ member_uris = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-location") == 0) -+ location = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-info") == 0) -+ description = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-state-message") == 0) -+ state_msg = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-state-reasons") == 0) - /* Store most important reason to reason_msg and set - its importance at printer_state_reason_level */ - { -- for (i = 0; i < attr->num_values; i++) -+ for (i = 0; i < ippGetCount (attr); i++) - { -- if (strcmp (attr->values[i].string.text, "none") != 0) -+ if (strcmp (ippGetString (attr, i, NULL), "none") != 0) - { - /* Sets is_paused flag for paused printer. */ -- if (strcmp (attr->values[i].string.text, "paused") == 0) -+ if (strcmp (ippGetString (attr, i, NULL), "paused") == 0) - { - is_paused = TRUE; - } - - interested_in = FALSE; - for (j = 0; j < G_N_ELEMENTS (reasons); j++) -- if (strncmp (attr->values[i].string.text, reasons[j], strlen (reasons[j])) == 0) -+ if (strncmp (ippGetString (attr, i, NULL), reasons[j], strlen (reasons[j])) == 0) - { - interested_in = TRUE; - break; -@@ -1814,87 +1842,87 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - - if (interested_in) - { -- if (g_str_has_suffix (attr->values[i].string.text, "-report")) -+ if (g_str_has_suffix (ippGetString (attr, i, NULL), "-report")) - { - if (printer_state_reason_level <= 1) - { -- reason_msg = attr->values[i].string.text; -+ reason_msg = ippGetString (attr, i, NULL); - printer_state_reason_level = 1; - } - } -- else if (g_str_has_suffix (attr->values[i].string.text, "-warning")) -+ else if (g_str_has_suffix (ippGetString (attr, i, NULL), "-warning")) - { - if (printer_state_reason_level <= 2) - { -- reason_msg = attr->values[i].string.text; -+ reason_msg = ippGetString (attr, i, NULL); - printer_state_reason_level = 2; -- } -+ } - } - else /* It is error in the case of no suffix. */ - { -- reason_msg = attr->values[i].string.text; -+ reason_msg = ippGetString (attr, i, NULL); - printer_state_reason_level = 3; - } - } - } - } - } -- else if (strcmp (attr->name, "printer-state") == 0) -- state = attr->values[0].integer; -- else if (strcmp (attr->name, "queued-job-count") == 0) -- job_count = attr->values[0].integer; -- else if (strcmp (attr->name, "printer-is-accepting-jobs") == 0) -+ else if (strcmp (ippGetName (attr), "printer-state") == 0) -+ state = ippGetInteger (attr, 0); -+ else if (strcmp (ippGetName (attr), "queued-job-count") == 0) -+ job_count = ippGetInteger (attr, 0); -+ else if (strcmp (ippGetName (attr), "printer-is-accepting-jobs") == 0) - { -- if (attr->values[0].boolean == 1) -+ if (ippGetBoolean (attr, 0) == 1) - is_accepting_jobs = TRUE; - else - is_accepting_jobs = FALSE; - } -- else if (strcmp (attr->name, "job-sheets-supported") == 0) -+ else if (strcmp (ippGetName (attr), "job-sheets-supported") == 0) - { - if (cups_backend->covers == NULL) - { -- cups_backend->number_of_covers = attr->num_values; -+ cups_backend->number_of_covers = ippGetCount (attr); - cups_backend->covers = g_new (char *, cups_backend->number_of_covers + 1); - for (i = 0; i < cups_backend->number_of_covers; i++) -- cups_backend->covers[i] = g_strdup (attr->values[i].string.text); -+ cups_backend->covers[i] = g_strdup (ippGetString (attr, i, NULL)); - cups_backend->covers[cups_backend->number_of_covers] = NULL; - } - } -- else if (strcmp (attr->name, "job-sheets-default") == 0) -+ else if (strcmp (ippGetName (attr), "job-sheets-default") == 0) - { -- if (attr->num_values == 2) -+ if (ippGetCount (attr) == 2) - { -- default_cover_before = attr->values[0].string.text; -- default_cover_after = attr->values[1].string.text; -+ default_cover_before = ippGetString (attr, 0, NULL); -+ default_cover_after = ippGetString (attr, 1, NULL); - } - } -- else if (strcmp (attr->name, "printer-type") == 0) -+ else if (strcmp (ippGetName (attr), "printer-type") == 0) - { - got_printer_type = TRUE; -- if (attr->values[0].integer & 0x00020000) -+ if (ippGetInteger (attr, 0) & 0x00020000) - default_printer = TRUE; - else - default_printer = FALSE; - -- if (attr->values[0].integer & 0x00000002) -+ if (ippGetInteger (attr, 0) & 0x00000002) - remote_printer = TRUE; - else - remote_printer = FALSE; - } -- else if (strcmp (attr->name, "auth-info-required") == 0) -+ else if (strcmp (ippGetName (attr), "auth-info-required") == 0) - { -- if (strcmp (attr->values[0].string.text, "none") != 0) -+ if (strcmp (ippGetString (attr, 0, NULL), "none") != 0) - { -- auth_info_required = g_new0 (gchar *, attr->num_values + 1); -- for (i = 0; i < attr->num_values; i++) -- auth_info_required[i] = g_strdup (attr->values[i].string.text); -+ auth_info_required = g_new0 (gchar *, ippGetCount (attr) + 1); -+ for (i = 0; i < ippGetCount (attr); i++) -+ auth_info_required[i] = g_strdup (ippGetString (attr, i, NULL)); - } - } - else - { - GTK_NOTE (PRINTING, -- g_print ("CUPS Backend: Attribute %s ignored", attr->name)); -+ g_print ("CUPS Backend: Attribute %s ignored", ippGetName (attr))); - } - - attr = attr->next; -@@ -2707,7 +2737,7 @@ cups_request_default_printer_cb (GtkPrintBackendCups *print_backend, - response = gtk_cups_result_get_response (result); - - if ((attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME)) != NULL) -- print_backend->default_printer = g_strdup (attr->values[0].string.text); -+ print_backend->default_printer = g_strdup (ippGetString (attr, 0, NULL)); - - print_backend->got_default_printer = TRUE; - --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0001-Bug-702516-Make-Werror-format-nonliteral-happy.patch b/modulesets/patches/0001-Bug-702516-Make-Werror-format-nonliteral-happy.patch deleted file mode 100644 index 476eea6..0000000 --- a/modulesets/patches/0001-Bug-702516-Make-Werror-format-nonliteral-happy.patch +++ /dev/null @@ -1,253 +0,0 @@ -From 96e40ec7321990fe63fb41b1be0ceead21b3ffc3 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sun, 29 Sep 2013 11:40:25 -0700 -Subject: [PATCH] Bug 702516 - Make -Werror=format-nonliteral happy - ---- - gio/gcontenttype.c | 5 ++++- - gio/gthreadedresolver.c | 5 +++++ - glib/gfileutils.c | 50 +++++++++++++++++++++++++++++++++++-------------- - glib/gmarkup.c | 7 ++++++- - glib/gstrfuncs.c | 6 +++++- - glib/gutils.c | 5 +++++ - 6 files changed, 61 insertions(+), 17 deletions(-) - -diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c -index 575d6fe..8dc5896 100644 ---- a/gio/gcontenttype.c -+++ b/gio/gcontenttype.c -@@ -393,6 +393,8 @@ g_content_type_get_mime_type (const char *type) - return g_strdup (type); - } - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - - static GIcon * - g_content_type_get_icon_internal (const gchar *type, -@@ -423,7 +425,7 @@ g_content_type_get_icon_internal (const gchar *type, - G_LOCK (gio_xdgmime); - xdg_icon = xdg_mime_get_icon (type); - G_UNLOCK (gio_xdgmime); -- if (xdg_icon != NULL) -+ if (xdg_icon != NULL) - xdg_mimetype_icon = g_strdup_printf (file_template, xdg_icon); - - if (xdg_mimetype_icon) -@@ -450,6 +452,7 @@ g_content_type_get_icon_internal (const gchar *type, - - return themed_icon; - } -+#pragma GCC diagnostic pop - - /** - * g_content_type_get_icon: -diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c -index 37f930c..1ffaf15 100644 ---- a/gio/gthreadedresolver.c -+++ b/gio/gthreadedresolver.c -@@ -505,6 +505,9 @@ g_resolver_record_type_to_rrtype (GResolverRecordType type) - g_return_val_if_reached (-1); - } - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" -+ - static GList * - g_resolver_records_from_res_query (const gchar *rrname, - gint rrtype, -@@ -619,6 +622,8 @@ g_resolver_records_from_res_query (const gchar *rrname, - return records; - } - -+#pragma GCC diagnostic pop -+ - #elif defined(G_OS_WIN32) - - static GVariant * -diff --git a/glib/gfileutils.c b/glib/gfileutils.c -index 7e5bedc..eb5baea 100644 ---- a/glib/gfileutils.c -+++ b/glib/gfileutils.c -@@ -1004,25 +1004,47 @@ rename_file (const char *old_name, - return TRUE; - } - --/* format string must have two '%s': -- * -- * - the place for the filename -- * - the place for the strerror -- */ --static void --format_error_message (GError **error, -- const gchar *filename, -+static char * -+format_error_message (const gchar *filename, -+ const gchar *format_string) G_GNUC_FORMAT(2); -+ -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" -+ -+static char * -+format_error_message (const gchar *filename, - const gchar *format_string) - { - gint saved_errno = errno; - gchar *display_name; -+ gchar *msg; - - display_name = g_filename_display_name (filename); -+ msg = g_strdup_printf (format_string, display_name, g_strerror (saved_errno)); -+ g_free (display_name); -+ -+ return msg; -+} - -- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (saved_errno), -- format_string, display_name, g_strerror (saved_errno)); -+#pragma GCC diagnostic pop - -- g_free (display_name); -+/* format string must have two '%s': -+ * -+ * - the place for the filename -+ * - the place for the strerror -+ */ -+static void -+set_file_error (GError **error, -+ const gchar *filename, -+ const gchar *format_string) -+ -+{ -+ int saved_errno = errno; -+ char *msg = format_error_message (filename, format_string); -+ -+ g_set_error_literal (error, G_FILE_ERROR, g_file_error_from_errno (saved_errno), -+ msg); -+ g_free (msg); - } - - static gchar * -@@ -1044,7 +1066,7 @@ write_to_temp_file (const gchar *contents, - - if (fd == -1) - { -- format_error_message (err, tmp_name, _("Failed to create file '%s': %s")); -+ set_file_error (err, tmp_name, _("Failed to create file '%s': %s")); - goto out; - } - -@@ -1068,7 +1090,7 @@ write_to_temp_file (const gchar *contents, - if (errno == EINTR) - continue; - -- format_error_message (err, tmp_name, _("Failed to write file '%s': write() failed: %s")); -+ set_file_error (err, tmp_name, _("Failed to write file '%s': write() failed: %s")); - close (fd); - g_unlink (tmp_name); - -@@ -1108,7 +1130,7 @@ write_to_temp_file (const gchar *contents, - */ - if (g_lstat (dest_file, &statbuf) == 0 && statbuf.st_size > 0 && fsync (fd) != 0) - { -- format_error_message (err, tmp_name, _("Failed to write file '%s': fsync() failed: %s")); -+ set_file_error (err, tmp_name, _("Failed to write file '%s': fsync() failed: %s")); - close (fd); - g_unlink (tmp_name); - -diff --git a/glib/gmarkup.c b/glib/gmarkup.c -index 552773f..fb02a42 100644 ---- a/glib/gmarkup.c -+++ b/glib/gmarkup.c -@@ -2366,6 +2366,9 @@ find_conversion (const char *format, - * - * Since: 2.4 - */ -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" -+ - gchar * - g_markup_vprintf_escaped (const gchar *format, - va_list args) -@@ -2430,6 +2433,7 @@ g_markup_vprintf_escaped (const gchar *format, - G_VA_COPY (args2, args); - - output1 = g_strdup_vprintf (format1->str, args); -+ - if (!output1) - { - va_end (args2); -@@ -2440,7 +2444,6 @@ g_markup_vprintf_escaped (const gchar *format, - va_end (args2); - if (!output2) - goto cleanup; -- - result = g_string_new (NULL); - - /* Iterate through the original format string again, -@@ -2492,6 +2495,8 @@ g_markup_vprintf_escaped (const gchar *format, - return NULL; - } - -+#pragma GCC diagnostic pop -+ - /** - * g_markup_printf_escaped: - * @format: printf() style format string -diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c -index 9509233..4fcd91c 100644 ---- a/glib/gstrfuncs.c -+++ b/glib/gstrfuncs.c -@@ -881,6 +881,9 @@ g_ascii_dtostr (gchar *buffer, - return g_ascii_formatd (buffer, buf_len, "%.17g", d); - } - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" -+ - /** - * g_ascii_formatd: - * @buffer: A buffer to place the resulting string in -@@ -909,7 +912,7 @@ g_ascii_formatd (gchar *buffer, - locale_t old_locale; - - old_locale = uselocale (get_C_locale ()); -- _g_snprintf (buffer, buf_len, format, d); -+ _g_snprintf (buffer, buf_len, format, d); - uselocale (old_locale); - - return buffer; -@@ -988,6 +991,7 @@ g_ascii_formatd (gchar *buffer, - return buffer; - #endif - } -+#pragma GCC diagnostic pop - - #define ISSPACE(c) ((c) == ' ' || (c) == '\f' || (c) == '\n' || \ - (c) == '\r' || (c) == '\t' || (c) == '\v') -diff --git a/glib/gutils.c b/glib/gutils.c -index 0a9944f..2620cb6 100644 ---- a/glib/gutils.c -+++ b/glib/gutils.c -@@ -2148,6 +2148,9 @@ g_format_size (guint64 size) - * Flags to modify the format of the string returned by g_format_size_full(). - */ - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" -+ - /** - * g_format_size_full: - * @size: a size in bytes -@@ -2281,6 +2284,8 @@ g_format_size_full (guint64 size, - return g_string_free (string, FALSE); - } - -+#pragma GCC diagnostic pop -+ - /** - * g_format_size_for_display: - * @size: a size in bytes --- -1.8.3.rc0 - diff --git a/modulesets/patches/0001-Bug-707945-GTK2-Quartz-typeahead-find-in-GtkTreeView.patch b/modulesets/patches/0001-Bug-707945-GTK2-Quartz-typeahead-find-in-GtkTreeView.patch deleted file mode 100644 index c079f83..0000000 --- a/modulesets/patches/0001-Bug-707945-GTK2-Quartz-typeahead-find-in-GtkTreeView.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 8407a6268b69ebf127240f5ad4372cabedb6891a Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sun, 28 Dec 2014 14:54:14 -0800 -Subject: [PATCH] Bug 707945 - GTK2/Quartz: 'typeahead find' in GtkTreeView no - longer - -accepts text input - -Get win from the event rather than from the IMContextQuartz's client window, -because it's the event window that will eventually be called on to insert -the text. ---- - modules/input/imquartz.c | 26 +++++++++++++++++--------- - 1 file changed, 17 insertions(+), 9 deletions(-) - -diff --git a/modules/input/imquartz.c b/modules/input/imquartz.c -index 67c7d6c..b72d05f 100644 ---- a/modules/input/imquartz.c -+++ b/modules/input/imquartz.c -@@ -194,15 +194,6 @@ quartz_filter_keypress (GtkIMContext *context, - if (!qc->client_window) - return FALSE; - -- nsview = gdk_quartz_window_get_nsview (qc->client_window); -- if (GDK_IS_WINDOW (nsview)) -- /* it gets GDK_WINDOW in some cases */ -- return gtk_im_context_filter_keypress (qc->slave, event); -- else -- win = (GdkWindow *)[ (GdkQuartzView *)nsview gdkWindow]; -- GTK_NOTE (MISC, g_print ("client_window: %p, win: %p, nsview: %p\n", -- qc->client_window, win, nsview)); -- - NSEvent *nsevent = gdk_quartz_event_get_nsevent ((GdkEvent *)event); - - if (!nsevent) -@@ -214,6 +205,22 @@ quartz_filter_keypress (GtkIMContext *context, - return gtk_im_context_filter_keypress (qc->slave, event); - } - -+ nsview = gdk_quartz_window_get_nsview (qc->client_window); -+ if (GDK_IS_WINDOW (nsview)) -+ /* it gets GDK_WINDOW in some cases */ -+ return gtk_im_context_filter_keypress (qc->slave, event); -+ else -+ /* It's the window in the event, not the window that Gtk thinks -+ * has focus, that NSTextInputClient calls to insert the text, so -+ * we need to pass the right window to output_result in order to -+ * get it back. -+ */ -+ win = (GdkWindow *)[(GdkQuartzView *)[[nsevent window] contentView] gdkWindow]; -+ -+ GTK_NOTE (MISC, g_print ("client_window: %p, win: %p, nsview: %p\n", -+ qc->client_window, win, nsview)); -+ -+ - if (event->type == GDK_KEY_RELEASE) - return FALSE; - -@@ -226,6 +233,7 @@ quartz_filter_keypress (GtkIMContext *context, - g_object_set_data (G_OBJECT (win), TIC_IN_KEY_DOWN, - GUINT_TO_POINTER (TRUE)); - [nsview keyDown: nsevent]; -+ - } - /* JIS_Eisu || JIS_Kana */ - if (event->hardware_keycode == 102 || event->hardware_keycode == 104) --- -1.8.3.rc0 - diff --git a/modulesets/patches/0001-Bug-708998-Avoid-infinite-loop.patch b/modulesets/patches/0001-Bug-708998-Avoid-infinite-loop.patch deleted file mode 100644 index d5a8e72..0000000 --- a/modulesets/patches/0001-Bug-708998-Avoid-infinite-loop.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e1dcd5c77d52db0033cafd23d84f392c4d9f457e Mon Sep 17 00:00:00 2001 -From: Hamish Mackenzie -Date: Sun, 29 Sep 2013 05:06:53 +1300 -Subject: [PATCH] Fix infinite loop in gdkevents.c _gdk_event_queue_find_first - ---- - gdk/gdkevents.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c -index 327b543..e770f47 100644 ---- a/gdk/gdkevents.c -+++ b/gdk/gdkevents.c -@@ -96,16 +96,16 @@ _gdk_event_queue_find_first (GdkDisplay *display) - { - GdkEventPrivate *event = tmp_list->data; - -- if (event->flags & GDK_EVENT_PENDING) -- continue; -- -- if (pending_motion) -- return pending_motion; -+ if (!(event->flags & GDK_EVENT_PENDING)) -+ { -+ if (pending_motion) -+ return pending_motion; - -- if (event->event.type == GDK_MOTION_NOTIFY && !display->flushing_events) -- pending_motion = tmp_list; -- else -- return tmp_list; -+ if (event->event.type == GDK_MOTION_NOTIFY && !display->flushing_events) -+ pending_motion = tmp_list; -+ else -+ return tmp_list; -+ } - - tmp_list = g_list_next (tmp_list); - } --- -1.7.12.4 (Apple Git-37) - diff --git a/modulesets/patches/0001-Bug-709939-quartz-window-pos.patch b/modulesets/patches/0001-Bug-709939-quartz-window-pos.patch deleted file mode 100644 index e895bc5..0000000 --- a/modulesets/patches/0001-Bug-709939-quartz-window-pos.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c -index e83c87b..e28f3b2 100644 ---- a/gdk/quartz/gdkscreen-quartz.c -+++ b/gdk/quartz/gdkscreen-quartz.c -@@ -208,7 +208,11 @@ _gdk_quartz_screen_update_window_sizes (GdkScreen *screen) - windows = gdk_screen_get_toplevel_windows (screen); - - for (list = windows; list; list = list->next) -- _gdk_quartz_window_update_position (list->data); -+ { -+ if (GDK_WINDOW_TYPE(list->data) == GDK_WINDOW_OFFSCREEN) -+ continue; -+ _gdk_quartz_window_update_position (list->data); -+ } - - g_list_free (windows); - } diff --git a/modulesets/patches/0001-Fix-DnD-Introspection-on-Quartz-Backend.patch b/modulesets/patches/0001-Fix-DnD-Introspection-on-Quartz-Backend.patch deleted file mode 100644 index 637dd99..0000000 --- a/modulesets/patches/0001-Fix-DnD-Introspection-on-Quartz-Backend.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 673013ac67e322ff86193001131255fc24a68d5e Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Fri, 29 May 2015 13:04:07 -0700 -Subject: [PATCH] Fix DnD Introspection on Quartz Backend. - -Don't exclude the -quartz.c files from introspection_files. ---- - gtk/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 51153e6..ae4ae62 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -1331,7 +1331,7 @@ distclean-local: - if HAVE_INTROSPECTION - introspection_files = \ - $(filter-out %private.h gtktextdisplay.h gtktextlayout.h gtkx.h, $(gtkinclude_HEADERS) $(a11yinclude_HEADERS) $(deprecatedinclude_HEADERS)) \ -- $(filter-out %win32.c %quartz.c, $(gtk_base_c_sources)) \ -+ $(filter-out %win32.c, $(gtk_base_c_sources)) \ - gtkprintoperation-unix.c \ - gtktypebuiltins.h \ - gtktypebuiltins.c --- -2.2.2 - diff --git a/modulesets/patches/0001-Fix-relative-module-paths.patch b/modulesets/patches/0001-Fix-relative-module-paths.patch deleted file mode 100644 index e5722ec..0000000 --- a/modulesets/patches/0001-Fix-relative-module-paths.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2332e82a1415696a36f138768b8330c1e97d3a89 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 3 Nov 2012 11:46:59 -0700 -Subject: [PATCH] Fix relative module paths - -So that the created absolute path is where the modules are installed -instead of where the modules file is installed (i.e., -lib/pango/1.8.0/modules instead of etc/pango). ---- - pango/modules.c | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -diff --git a/pango/modules.c b/pango/modules.c -index 644cc9c..c5a19f2 100644 ---- a/pango/modules.c -+++ b/pango/modules.c -@@ -450,11 +450,17 @@ process_module_file (FILE *module_file, const gchar *module_file_dir) - switch (i) - { - case 0: -- if (!g_path_is_absolute (tmp_buf->str)) { -- const gchar *abs_file_name = g_build_filename (module_file_dir, tmp_buf->str, NULL); -- g_string_assign (tmp_buf, abs_file_name); -- g_free ((gpointer) abs_file_name); -- } -+ if (!g_path_is_absolute (tmp_buf->str)) -+ { -+ const gchar *lib_dir = pango_get_lib_subdirectory (); -+ const gchar *abs_file_name = g_build_filename (lib_dir, -+ MODULE_VERSION, -+ "modules", -+ tmp_buf->str, -+ NULL); -+ g_string_assign (tmp_buf, abs_file_name); -+ g_free ((gpointer) abs_file_name); -+ } - pair->module = find_or_create_module (tmp_buf->str); - break; - case 1: --- -1.7.9.6 (Apple Git-31.1) - diff --git a/modulesets/patches/0001-Make-ATSUI-backend-compile-again.patch b/modulesets/patches/0001-Make-ATSUI-backend-compile-again.patch deleted file mode 100644 index b53634a..0000000 --- a/modulesets/patches/0001-Make-ATSUI-backend-compile-again.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 18dc8d4059c6c21f62caa75d0e0ff7d3d14d8649 Mon Sep 17 00:00:00 2001 -From: Kristian Rietveld -Date: Fri, 1 Jul 2011 21:08:39 +0200 -Subject: [PATCH] Make ATSUI backend compile again - -Commit 02f80c9acdec53f58fef0e12f41363c3c4ea1efe broke the build and was -likely committed untested. - -pango-1-29-4 was branched from tag 1.29.3, before this fix was applied -to master. - -Note that the problem affects only OS X 10.4 (Tiger); pango builds on -later OS X versions without this change. ---- - pango/pangoatsui-fontmap.c | 8 ++++++-- - pango/pangoatsui-private.h | 2 ++ - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/pango/pangoatsui-fontmap.c b/pango/pangoatsui-fontmap.c -index 8eb123a..c169f0d 100644 ---- a/pango/pangoatsui-fontmap.c -+++ b/pango/pangoatsui-fontmap.c -@@ -70,6 +70,8 @@ struct _PangoATSUIFace - static GType pango_atsui_family_get_type (void); - static GType pango_atsui_face_get_type (void); - -+static gpointer pango_atsui_face_parent_class; -+ - static const char * - get_real_family (const char *family_name) - { -@@ -200,6 +202,8 @@ pango_atsui_family_is_monospace (PangoFontFamily *family) - return atsuifamily->is_monospace; - } - -+G_DEFINE_TYPE (PangoATSUIFamily, pango_atsui_family, PANGO_TYPE_FONT_FAMILY); -+ - static void - pango_atsui_family_finalize (GObject *object) - { -@@ -219,8 +223,6 @@ pango_atsui_family_finalize (GObject *object) - G_OBJECT_CLASS (pango_atsui_family_parent_class)->finalize (object); - } - --G_DEFINE_TYPE (PangoATSUIFamilyClass, pango_atsui_family, PANGO_TYPE_FONT_FAMILY); -- - static void - pango_atsui_family_class_init (PangoATSUIFamilyClass *class) - { -@@ -337,6 +339,8 @@ pango_atsui_face_class_init (PangoFontFaceClass *class) - { - GObjectClass *object_class = (GObjectClass *)class; - -+ pango_atsui_face_parent_class = g_type_class_peek_parent (class); -+ - object_class->finalize = pango_atsui_face_finalize; - - class->describe = pango_atsui_face_describe; -diff --git a/pango/pangoatsui-private.h b/pango/pangoatsui-private.h -index a5ab0cb..81bcf60 100644 ---- a/pango/pangoatsui-private.h -+++ b/pango/pangoatsui-private.h -@@ -38,6 +38,8 @@ G_BEGIN_DECLS - - - typedef struct _PangoATSUIFamily PangoATSUIFamily; -+typedef struct _PangoFontFamilyClass PangoATSUIFamilyClass; -+ - typedef struct _PangoATSUIFace PangoATSUIFace; - - typedef struct _PangoATSUIFontMap PangoATSUIFontMap; --- -1.7.6.3.dirty - diff --git a/modulesets/patches/0001-Patch-Orbit-2.14.19-to-master-for-current-GLib.patch b/modulesets/patches/0001-Patch-Orbit-2.14.19-to-master-for-current-GLib.patch deleted file mode 100644 index 12ddbc7..0000000 --- a/modulesets/patches/0001-Patch-Orbit-2.14.19-to-master-for-current-GLib.patch +++ /dev/null @@ -1,1963 +0,0 @@ -From 8b6f17f1bf1a253b5d39bfd30c764c63b65001ef Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Tue, 1 Oct 2013 16:37:01 -0700 -Subject: [PATCH] Patch Orbit-2.14.19 to master for current GLib - ---- - NEWS | 7 + - configure.ac | 424 ++++++++++++++++++++++++++++++++ - configure.in | 413 ------------------------------- - include/orbit/GIOP/giop-types.h | 5 + - include/orbit/GIOP/giop.h | 1 + - include/orbit/orb-core/corba-orb-type.h | 3 + - include/orbit/orb-core/corba-orb.h | 2 + - include/orbit/poa/orbit-adaptor.h | 3 + - include/orbit/util/basic_types.h | 8 - - linc2/src/Makefile.am | 6 +- - linc2/src/linc-connection.c | 17 +- - linc2/src/linc-private.h | 3 + - linc2/src/linc-protocols.c | 1 + - linc2/src/linc.c | 40 ++- - linc2/test/Makefile.am | 2 +- - src/idl-compiler/Makefile.am | 2 +- - src/orb/GIOP/Makefile.am | 2 +- - src/orb/GIOP/giop-recv-buffer.c | 14 +- - src/orb/GIOP/giop-send-buffer.c | 9 +- - src/orb/GIOP/giop.c | 38 ++- - src/orb/Makefile.am | 2 +- - src/orb/dynamic/Makefile.am | 2 +- - src/orb/orb-core/Makefile.am | 2 +- - src/orb/orb-core/corba-object.c | 8 + - src/orb/orb-core/corba-orb.c | 24 +- - src/orb/poa/Makefile.am | 2 +- - src/orb/poa/poa.c | 25 +- - src/orb/util/Makefile.am | 2 +- - src/orb/util/genrand.c | 13 +- - src/services/imodule/Makefile.am | 2 +- - src/services/name/Makefile.am | 2 +- - test/Makefile.am | 2 +- - test/everything/Makefile.am | 4 +- - test/everything/client.c | 14 +- - test/everything/server.c | 3 +- - test/inhibit/Makefile.am | 2 +- - test/poa/Makefile.am | 2 +- - test/poa/poatest-basic-shell.c | 3 +- - test/test-corbaloc.c | 4 +- - test/test-dynany.c | 5 +- - test/test-giop.c | 4 +- - test/test-mem.c | 8 +- - test/test-performance.c | 2 + - test/timeout-client.c | 2 + - test/timeout-server.c | 3 +- - 45 files changed, 662 insertions(+), 480 deletions(-) - create mode 100644 configure.ac - delete mode 100644 configure.in - -diff --git a/NEWS b/NEWS -index bddfdff..7734385 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,10 @@ -+ORBit2-2.14.20 -+ -+ - build fixes -+ + Stop using -DG_DISABLE_DEPRECATED since it doesn't build -+ + Use AM_CPPFLAGS instead of INCLUDES -+ + Move configure.in to configure.ac -+ - ORBit2-2.14.19 - - - bug fixes -diff --git a/configure.ac b/configure.ac -new file mode 100644 -index 0000000..61aa74c ---- /dev/null -+++ b/configure.ac -@@ -0,0 +1,424 @@ -+m4_define([orbit_major_version],[2]) -+m4_define([orbit_minor_version],[14]) -+m4_define([orbit_micro_version],[20]) -+m4_define([orbit_version],[orbit_major_version.orbit_minor_version.orbit_micro_version]) -+ -+dnl Process this file with autoconf to produce a configure script. -+AC_INIT([ORBit2],[orbit_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=ORBit2],[ORBit2]) -+ -+# Process this file with autoconf to produce a configure script. -+# require autoconf 2.60 -+AC_PREREQ(2.60) -+ -+# Before making a release, the LT_VERSION string should be modified. -+# The string is of the form C:R:A. -+# - If interfaces have been changed or added, but binary compatibility has -+# been preserved, change to C+1:0:A+1 -+# - If binary compatibility has been broken (eg removed or changed interfaces) -+# change to C+1:0:0 -+# - If the interface is the same as the previous version, change to C:R+1:A -+ -+LT_VERSION=1:0:1 -+AC_SUBST(LT_VERSION) -+ -+ORBIT_MAJOR_VERSION=orbit_major_version -+ORBIT_MINOR_VERSION=orbit_minor_version -+ORBIT_MICRO_VERSION=orbit_micro_version -+ORBIT_VERSION=orbit_version -+AC_SUBST(ORBIT_MAJOR_VERSION) -+AC_SUBST(ORBIT_MINOR_VERSION) -+AC_SUBST(ORBIT_MICRO_VERSION) -+AC_SUBST(ORBIT_VERSION) -+ -+# Increment this every time a feature is added in the .idl compiler -+# that needs help from the main libraries. -+ORBIT_SERIAL=20 -+AC_SUBST(ORBIT_SERIAL) -+ -+# For automake. -+ -+AC_CONFIG_HEADERS([config.h]) -+ -+dnl Initialize automake stuff -+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 no-define]) -+ -+dnl Required by autoconf 2.60 -+AC_SUBST(datarootdir) -+ -+AC_CANONICAL_HOST -+AC_MSG_CHECKING([for Win32]) -+case "$host" in -+ *-*-mingw*) -+ os_win32=yes -+ LIBM= -+ MINGW_LDFLAGS="-Wl,--enable-runtime-pseudo-reloc" -+ ;; -+ *) -+ os_win32=no -+ LIBM=-lm -+ MINGW_LDFLAGS= -+ ;; -+esac -+AC_MSG_RESULT([$os_win32]) -+ -+AM_CONDITIONAL(OS_WIN32, [test "$os_win32" = "yes"]) -+ -+AC_SUBST(LIBM) -+AC_SUBST(MINGW_LDFLAGS) -+LDFLAGS="$MINGW_LDFLAGS $LDFLAGS" -+ -+if test "$os_win32" = "yes"; then -+ if test x$enable_static = xyes -o x$enable_static = x; then -+ AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) -+ enable_static=no -+ fi -+ if test x$enable_shared = xno; then -+ AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) -+ fi -+ enable_shared=yes -+fi -+ -+dnl Checks for programs. -+AC_PROG_CC -+AC_PROG_INSTALL -+ -+AC_LIBTOOL_DLOPEN -+AC_LIBTOOL_WIN32_DLL -+AM_PROG_LIBTOOL -+AM_MAINTAINER_MODE([enable]) -+ -+dnl Useful for automating stuff -+AC_CACHE_CHECK([for aclocal flags], ac_cv_orbit_aclocal_flags,[ -+ ac_cv_orbit_aclocal_flags="$ACLOCAL_FLAGS" -+]) -+ACLOCAL="$ACLOCAL $ac_cv_orbit_aclocal_flags" -+ -+AC_ARG_ENABLE(http, [--enable-http enables http connections],, enable_http=no) -+AM_CONDITIONAL(ENABLE_HTTP, test x"$enable_http" = xyes) -+if test x"$enable_http" = xyes ; then -+ AC_DEFINE(ENABLE_HTTP, 1, [Define if HTTP connections are available]) -+fi -+dnl --enable-compile-warnings -+AC_ARG_ENABLE(compile-warnings, [ --enable-compile-warnings=[no/yes] Turn on compiler warnings.], [enable_compile_warnings="$enableval"],[enable_compile_warnings="yes"]) -+ -+dnl --enable-debug=(yes|minimum|no) -+AC_ARG_ENABLE(debug, [ --enable-debug=[no/yes] turn on debugging [default=no]],,enable_debug=minimum) -+if test "x$enable_debug" = "xyes"; then -+ ORBIT_DEBUG_CFLAGS="-ggdb -O0 -DG_ENABLE_DEBUG" -+else -+ if test "x$enable_debug" = "xno"; then -+ ORBIT_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" -+ else -+ ORBIT_DEBUG_CFLAGS="" -+ fi -+fi -+ -+AC_ARG_ENABLE(purify, [ --enable-purify be clean for memory debuggers], enable_purify=yes, enable_purify=no) -+if test z$enable_purify = zyes; then -+ AC_DEFINE(ORBIT_PURIFY, 1, [defined if purify is enabled]) -+fi -+ -+AC_MSG_CHECKING(which idl compiler to use) -+IDL_COMPILER="\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)" -+AC_ARG_WITH(idl-compiler, -+ [ --with-idl-compiler use specific idl compiler (useful when crosscompiling)], -+ if test "x$withval" != x; then -+ if test -f "$withval"; then -+ IDL_COMPILER=$withval -+ fi -+ fi -+) -+if test x$IDL_COMPILER == x"\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)"; then -+ AC_MSG_RESULT(internal) -+else -+ AC_MSG_RESULT(external ($IDL_COMPILER)) -+fi -+AC_SUBST(IDL_COMPILER) -+ -+AC_PROG_AWK -+ -+GLIB_REQUIRED=2.8.0 -+LIBIDL_REQUIRED=0.8.2 -+AC_SUBST(GLIB_REQUIRED) -+AC_SUBST(LIBIDL_REQUIRED) -+ -+dnl Check for pkg-config version; want >= 0.14.0 because of -pthread bug -+PKG_PROG_PKG_CONFIG([0.18]) -+ -+LOCAL_LINC_LIBS='$(top_builddir)/linc2/src/liblinc.la' -+LOCAL_LINC_CFLAGS='-I$(top_srcdir)/linc2/include -I$(top_builddir)/linc2/include' -+AC_SUBST(LOCAL_LINC_LIBS) -+AC_SUBST(LOCAL_LINC_CFLAGS) -+ -+dnl Checks for libraries. -+PKG_CHECK_MODULES(ORBIT, \ -+ glib-2.0 >= $GLIB_REQUIRED \ -+ gobject-2.0 >= $GLIB_REQUIRED \ -+ gthread-2.0 >= $GLIB_REQUIRED \ -+ gmodule-2.0 >= $GLIB_REQUIRED) -+AC_SUBST(ORBIT_LIBS) -+AC_SUBST(ORBIT_CFLAGS) -+ -+PKG_CHECK_MODULES(ORBIT_IDL, \ -+ libIDL-2.0 >= $LIBIDL_REQUIRED \ -+ glib-2.0 >= $GLIB_REQUIRED \ -+ gobject-2.0 >= $GLIB_REQUIRED \ -+ gmodule-2.0 >= $GLIB_REQUIRED) -+AC_SUBST(ORBIT_IDL_LIBS) -+AC_SUBST(ORBIT_IDL_CFLAGS) -+ -+PKG_CHECK_MODULES(ORBIT_NAME, -+ glib-2.0 >= $GLIB_REQUIRED \ -+ gobject-2.0 >= $GLIB_REQUIRED \ -+ gthread-2.0 >= $GLIB_REQUIRED \ -+ gmodule-2.0 >= $GLIB_REQUIRED) -+AC_SUBST(ORBIT_NAME_LIBS) -+AC_SUBST(ORBIT_NAME_CFLAGS) -+ -+dnl Checks for header files. -+AC_HEADER_STDC -+AC_CHECK_HEADERS(fcntl.h unistd.h sys/endian.h endian.h machine/endian.h) -+AC_CHECK_HEADERS(sys/machine.h sys/isa_defs.h sys/poll.h sys/select.h) -+AC_CHECK_HEADERS(sys/time.h netinet/in.h sys/socket.h arpa/inet.h) -+AC_CHECK_HEADERS(stddef.h wchar.h wcstr.h wctype.h machine/types.h) -+AC_CHECK_HEADERS(sys/un.h sys/uio.h syslog.h) -+AC_CHECK_HEADERS(sys/wait.h netdb.h) -+AC_CHECK_HEADERS(utime.h sys/utime.h) -+AC_CHECK_HEADERS([linux/socket.h]) -+AC_CHECK_HEADERS(sys/sockio.h) -+ -+if test "$os_win32" = "yes"; then -+ AC_CHECK_HEADERS(winsock2.h) -+ if test $ac_cv_header_winsock2_h = yes; then -+ dnl If we have , assume we find the functions -+ dnl in -lws2_32. -+ LIBS="-lws2_32 $LIBS" -+ fi -+fi -+ -+dnl Checks for typedefs, structures, and compiler characteristics. -+AC_C_CONST -+AC_C_INLINE -+AC_TYPE_SIZE_T -+ -+dnl Checks for library functions. -+AC_FUNC_VPRINTF -+ -+AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)]) -+AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) -+AC_CHECK_FUNC(sigaction) -+AC_CHECK_FUNC(syslog) -+ -+dnl This generates warnings from autoconf... -+AC_C_BIGENDIAN -+ -+ -+dnl -+dnl So many people with broken linking setups asked about this -+dnl it turned out to be necessary to check for this. -+dnl -+dofus_save_libs="$LIBS" -+LIBS="$ORBIT_LIBS $LIBS" -+AC_TRY_RUN([ #include -+ main () -+ { -+ return 0; -+ } ],, -+ AC_MSG_ERROR([ -+Linking is badly borked on your system. Please ensure your library path is correct -+Check config.log for details - check near the end of the log above 'failed program was' -+Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the -+prefix you're compiling on: '${prefix}' ]), -+AC_MSG_WARN([Could not check for borked linking while cross-compiling])) -+LIBS="$dofus_save_libs" -+ -+orig_CPPFLAGS=$CPPFLAGS -+CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS" -+AC_CHECK_ALIGNOF(CORBA_octet) -+AC_CHECK_ALIGNOF(CORBA_boolean) -+AC_CHECK_ALIGNOF(CORBA_char) -+AC_CHECK_ALIGNOF(CORBA_wchar) -+AC_CHECK_ALIGNOF(CORBA_short) -+AC_CHECK_ALIGNOF(CORBA_long) -+AC_CHECK_ALIGNOF(CORBA_long_long) -+AC_CHECK_ALIGNOF(CORBA_float) -+AC_CHECK_ALIGNOF(CORBA_double) -+AC_CHECK_ALIGNOF(CORBA_long_double) -+AC_CHECK_ALIGNOF(CORBA_struct) -+AC_CHECK_ALIGNOF(CORBA_pointer) -+CPPFLAGS=$orig_CPPFLAGS -+ -+if test "x$GCC" = "xyes" -a "x$enable_compile_warnings" != "xno"; then -+ WARN_CFLAGS="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations" -+else -+ WARN_CFLAGS= -+fi -+ -+AC_MSG_CHECKING(what warning flags to pass to the C compiler) -+AC_MSG_RESULT($WARN_CFLAGS) -+AC_SUBST(WARN_CFLAGS) -+ -+AC_SUBST(pkglibdir) -+ -+if test "$enable_maintainer_mode" = "yes"; then -+ DISABLE_DEPRECATED_CFLAGS=" \ -+ -DG_DISABLE_SINGLE_INCLUDES" -+ AC_SUBST(DISABLE_DEPRECATED_CFLAGS) -+fi -+ -+dnl -+dnl --------- start linc bits --------- -+dnl -+ -+dnl Checks for libraries. -+PKG_CHECK_MODULES(LINC, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED) -+AC_SUBST(LINC_LIBS) -+AC_SUBST(LINC_CFLAGS) -+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.36 gthread-2.0 gobject-2.0 gmodule-2.0, -+[ -+ AC_DEFINE([HAVE_GLIB_2_36], [1], [Configure g_type_init deprecation]) -+ AC_DEFINE([HAVE_GLIB_2_32], [1], [Configure gthread deprecations]) -+], -+ [PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32 gthread-2.0 gobject-2.0 gmodule-2.0, -+ [ -+ AC_DEFINE([HAVE_GLIB_2_32], [1], [Configure gthread deprecations]) -+ ]) -+]) -+ -+dnl Checks for header files. -+AC_HEADER_STDC -+AC_HEADER_RESOLV -+AC_CHECK_HEADERS(fcntl.h unistd.h sys/endian.h endian.h machine/endian.h sys/machine.h sys/isa_defs.h sys/poll.h) -+AC_CHECK_HEADERS(stddef.h wchar.h wcstr.h wctype.h machine/types.h) -+AC_CHECK_HEADERS(netinet/in.h netinet/tcp.h sys/un.h) -+AC_CHECK_HEADERS(arpa/nameser.h) -+dnl AC_CHECK_HEADERS(linux/irda.h) -+ -+dnl Checks for library functions. -+AC_CHECK_FUNCS(poll basename) -+AC_CHECK_FUNC(res_init,,[AC_CHECK_LIB(resolv,res_init)]) -+AC_CHECK_LIB(resolv,res_9_init) -+AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)]) -+AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) -+AC_CHECK_FUNC(getaddrinfo,,[AC_CHECK_LIB(nsl,getaddrinfo)]) -+if test x"$ac_cv_func_getaddrinfo" = "xyes" ; then -+ AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if getaddrinfo() is available]) -+fi -+AC_CHECK_FUNC(getnameinfo,,[AC_CHECK_LIB(nsl,getnameinfo)]) -+if test x"$ac_cv_func_getnameinfo" = "xyes" ; then -+ AC_DEFINE(HAVE_GETNAMEINFO, 1, [Define if getnameinfo() is available]) -+fi -+have_inet_pton=no -+AC_CHECK_FUNC(inet_pton,,) -+if test x"$ac_cv_func_inet_pton" = "xyes" ; then -+ have_inet_pton=yes -+ AC_DEFINE(HAVE_INET_PTON, 1, [Define if inet_pton() is available]) -+fi -+ -+# AC_CHECK_TYPE doesn't work here. -+AC_MSG_CHECKING([for socklen_t]) -+AC_TRY_COMPILE( -+ [#ifdef _WIN32 -+#include -+#else -+#include -+#include -+#endif], -+ [socklen_t len;], -+ [AC_MSG_RESULT(yes)], -+ [AC_DEFINE(socklen_t, size_t, [Define socklen_t to be of type size_t]) -+ AC_MSG_RESULT(no)]) -+ -+# Blatantly stolen from configure.in in the sample code from -+# "UNIX Network Programming, Volume 1" by W. Richard Stevens -+AC_CACHE_CHECK(if sockaddr has sa_len member, -+ac_cv_sockaddr_has_sa_len, -+ AC_TRY_COMPILE([ -+# include -+# include ], -+ [unsigned int i = sizeof(((struct sockaddr *)0)->sa_len)], -+ ac_cv_sockaddr_has_sa_len=yes, -+ ac_cv_sockaddr_has_sa_len=no)) -+if test x"$ac_cv_sockaddr_has_sa_len" = "xyes" ; then -+ AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Define if sockaddr has sa_len member]) -+fi -+ -+dnl -+dnl --------- end linc bits --------- -+dnl -+ -+dnl -+dnl --------- set additional gcc flags to catch errors --------- -+dnl -+AX_CFLAGS_GCC_OPTION(-Werror-implicit-function-declaration) -+CFLAGS="$CFLAGS $ORBIT_DEBUG_CFLAGS" -+AC_SUBST(CFLAGS) -+ -+ -+dnl ----- gtk-doc ------ -+GTK_DOC_CHECK([1.0]) -+ -+ -+AC_CONFIG_FILES([ -+Makefile -+orbit2-config -+ORBit-2.0.pc -+ORBit-2.0-uninstalled.pc -+ORBit-CosNaming-2.0.pc -+ORBit-CosNaming-2.0-uninstalled.pc -+ORBit-imodule-2.0.pc -+ORBit-imodule-2.0-uninstalled.pc -+ORBit.spec -+orbit2-zip -+src/Makefile -+src/idl-compiler/Makefile -+src/idl-compiler/ORBit-idl-2.0.pc -+src/idl/Makefile -+src/idl/CORBA/Makefile -+src/idl/CORBA_PIDL/Makefile -+src/idl/interop/Makefile -+src/idl/misc/Makefile -+src/orb/Makefile -+src/orb/include/Makefile -+src/orb/util/Makefile -+src/orb/GIOP/Makefile -+src/orb/orb-core/Makefile -+src/orb/dynamic/Makefile -+src/orb/poa/Makefile -+src/services/Makefile -+src/services/name/Makefile -+src/services/imodule/Makefile -+include/Makefile -+include/orbit/Makefile -+include/orbit/orbit-config.h -+include/orbit/GIOP/Makefile -+include/orbit/util/Makefile -+include/orbit/orb-core/Makefile -+include/orbit/poa/Makefile -+include/orbit/dynamic/Makefile -+test/Makefile -+test/everything/Makefile -+test/inhibit/Makefile -+test/poa/Makefile -+docs/Makefile -+docs/devel/Makefile -+docs/internals/Makefile -+docs/api/Makefile -+ -+linc2/Makefile -+linc2/src/Makefile -+linc2/test/Makefile -+linc2/include/Makefile -+linc2/include/linc/Makefile -+linc2/include/linc/linc-config.h -+]) -+ -+AC_OUTPUT -+ -+echo "ORBit configuration: -+ -+ Source code location: ${srcdir} -+ Compiler: ${CC} -+ -+ Purify cleanliness: ${enable_purify} -+" -diff --git a/configure.in b/configure.in -deleted file mode 100644 -index 04d4b2a..0000000 ---- a/configure.in -+++ /dev/null -@@ -1,413 +0,0 @@ --m4_define([orbit_major_version],[2]) --m4_define([orbit_minor_version],[14]) --m4_define([orbit_micro_version],[19]) --m4_define([orbit_version],[orbit_major_version.orbit_minor_version.orbit_micro_version]) -- --dnl Process this file with autoconf to produce a configure script. --AC_INIT([ORBit2],[orbit_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=ORBit2],[ORBit2]) -- --# Process this file with autoconf to produce a configure script. --# require autoconf 2.54 --AC_PREREQ(2.54) -- --# Before making a release, the LT_VERSION string should be modified. --# The string is of the form C:R:A. --# - If interfaces have been changed or added, but binary compatibility has --# been preserved, change to C+1:0:A+1 --# - If binary compatibility has been broken (eg removed or changed interfaces) --# change to C+1:0:0 --# - If the interface is the same as the previous version, change to C:R+1:A -- --LT_VERSION=1:0:1 --AC_SUBST(LT_VERSION) -- --ORBIT_MAJOR_VERSION=orbit_major_version --ORBIT_MINOR_VERSION=orbit_minor_version --ORBIT_MICRO_VERSION=orbit_micro_version --ORBIT_VERSION=orbit_version --AC_SUBST(ORBIT_MAJOR_VERSION) --AC_SUBST(ORBIT_MINOR_VERSION) --AC_SUBST(ORBIT_MICRO_VERSION) --AC_SUBST(ORBIT_VERSION) -- --# Increment this every time a feature is added in the .idl compiler --# that needs help from the main libraries. --ORBIT_SERIAL=20 --AC_SUBST(ORBIT_SERIAL) -- --# For automake. -- --AC_CONFIG_HEADERS([config.h]) -- --dnl Initialize automake stuff --AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 no-define]) -- --dnl Required by autoconf 2.60 --AC_SUBST(datarootdir) -- --AC_CANONICAL_HOST --AC_MSG_CHECKING([for Win32]) --case "$host" in -- *-*-mingw*) -- os_win32=yes -- LIBM= -- MINGW_LDFLAGS="-Wl,--enable-runtime-pseudo-reloc" -- ;; -- *) -- os_win32=no -- LIBM=-lm -- MINGW_LDFLAGS= -- ;; --esac --AC_MSG_RESULT([$os_win32]) -- --AM_CONDITIONAL(OS_WIN32, [test "$os_win32" = "yes"]) -- --AC_SUBST(LIBM) --AC_SUBST(MINGW_LDFLAGS) --LDFLAGS="$MINGW_LDFLAGS $LDFLAGS" -- --if test "$os_win32" = "yes"; then -- if test x$enable_static = xyes -o x$enable_static = x; then -- AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) -- enable_static=no -- fi -- if test x$enable_shared = xno; then -- AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) -- fi -- enable_shared=yes --fi -- --dnl Checks for programs. --AC_PROG_CC --AC_PROG_INSTALL -- --AC_LIBTOOL_DLOPEN --AC_LIBTOOL_WIN32_DLL --AM_PROG_LIBTOOL --AM_MAINTAINER_MODE -- --dnl Useful for automating stuff --AC_CACHE_CHECK([for aclocal flags], ac_cv_orbit_aclocal_flags,[ -- ac_cv_orbit_aclocal_flags="$ACLOCAL_FLAGS" --]) --ACLOCAL="$ACLOCAL $ac_cv_orbit_aclocal_flags" -- --AC_ARG_ENABLE(http, [--enable-http enables http connections],, enable_http=no) --AM_CONDITIONAL(ENABLE_HTTP, test x"$enable_http" = xyes) --if test x"$enable_http" = xyes ; then -- AC_DEFINE(ENABLE_HTTP, 1, [Define if HTTP connections are available]) --fi --dnl --enable-compile-warnings --AC_ARG_ENABLE(compile-warnings, [ --enable-compile-warnings=[no/yes] Turn on compiler warnings.], [enable_compile_warnings="$enableval"],[enable_compile_warnings="yes"]) -- --dnl --enable-debug=(yes|minimum|no) --AC_ARG_ENABLE(debug, [ --enable-debug=[no/yes] turn on debugging [default=no]],,enable_debug=minimum) --if test "x$enable_debug" = "xyes"; then -- ORBIT_DEBUG_CFLAGS="-ggdb -O0 -DG_ENABLE_DEBUG" --else -- if test "x$enable_debug" = "xno"; then -- ORBIT_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" -- else -- ORBIT_DEBUG_CFLAGS="" -- fi --fi -- --AC_ARG_ENABLE(purify, [ --enable-purify be clean for memory debuggers], enable_purify=yes, enable_purify=no) --if test z$enable_purify = zyes; then -- AC_DEFINE(ORBIT_PURIFY, 1, [defined if purify is enabled]) --fi -- --AC_MSG_CHECKING(which idl compiler to use) --IDL_COMPILER="\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)" --AC_ARG_WITH(idl-compiler, -- [ --with-idl-compiler use specific idl compiler (useful when crosscompiling)], -- if test "x$withval" != x; then -- if test -f "$withval"; then -- IDL_COMPILER=$withval -- fi -- fi --) --if test x$IDL_COMPILER == x"\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)"; then -- AC_MSG_RESULT(internal) --else -- AC_MSG_RESULT(external ($IDL_COMPILER)) --fi --AC_SUBST(IDL_COMPILER) -- --AC_PROG_AWK -- --GLIB_REQUIRED=2.8.0 --LIBIDL_REQUIRED=0.8.2 --AC_SUBST(GLIB_REQUIRED) --AC_SUBST(LIBIDL_REQUIRED) -- --dnl Check for pkg-config version; want >= 0.14.0 because of -pthread bug --PKG_PROG_PKG_CONFIG([0.18]) -- --LOCAL_LINC_LIBS='$(top_builddir)/linc2/src/liblinc.la' --LOCAL_LINC_CFLAGS='-I$(top_srcdir)/linc2/include -I$(top_builddir)/linc2/include' --AC_SUBST(LOCAL_LINC_LIBS) --AC_SUBST(LOCAL_LINC_CFLAGS) -- --dnl Checks for libraries. --PKG_CHECK_MODULES(ORBIT, \ -- glib-2.0 >= $GLIB_REQUIRED \ -- gobject-2.0 >= $GLIB_REQUIRED \ -- gthread-2.0 >= $GLIB_REQUIRED \ -- gmodule-2.0 >= $GLIB_REQUIRED) --AC_SUBST(ORBIT_LIBS) --AC_SUBST(ORBIT_CFLAGS) -- --PKG_CHECK_MODULES(ORBIT_IDL, \ -- libIDL-2.0 >= $LIBIDL_REQUIRED \ -- glib-2.0 >= $GLIB_REQUIRED \ -- gobject-2.0 >= $GLIB_REQUIRED \ -- gmodule-2.0 >= $GLIB_REQUIRED) --AC_SUBST(ORBIT_IDL_LIBS) --AC_SUBST(ORBIT_IDL_CFLAGS) -- --PKG_CHECK_MODULES(ORBIT_NAME, -- glib-2.0 >= $GLIB_REQUIRED \ -- gobject-2.0 >= $GLIB_REQUIRED \ -- gthread-2.0 >= $GLIB_REQUIRED \ -- gmodule-2.0 >= $GLIB_REQUIRED) --AC_SUBST(ORBIT_NAME_LIBS) --AC_SUBST(ORBIT_NAME_CFLAGS) -- --dnl Checks for header files. --AC_HEADER_STDC --AC_CHECK_HEADERS(fcntl.h unistd.h sys/endian.h endian.h machine/endian.h) --AC_CHECK_HEADERS(sys/machine.h sys/isa_defs.h sys/poll.h sys/select.h) --AC_CHECK_HEADERS(sys/time.h netinet/in.h sys/socket.h arpa/inet.h) --AC_CHECK_HEADERS(stddef.h wchar.h wcstr.h wctype.h machine/types.h) --AC_CHECK_HEADERS(sys/un.h sys/uio.h syslog.h) --AC_CHECK_HEADERS(sys/wait.h netdb.h) --AC_CHECK_HEADERS(utime.h sys/utime.h) --AC_CHECK_HEADERS([linux/socket.h]) --AC_CHECK_HEADERS(sys/sockio.h) -- --if test "$os_win32" = "yes"; then -- AC_CHECK_HEADERS(winsock2.h) -- if test $ac_cv_header_winsock2_h = yes; then -- dnl If we have , assume we find the functions -- dnl in -lws2_32. -- LIBS="-lws2_32 $LIBS" -- fi --fi -- --dnl Checks for typedefs, structures, and compiler characteristics. --AC_C_CONST --AC_C_INLINE --AC_TYPE_SIZE_T -- --dnl Checks for library functions. --AC_FUNC_VPRINTF -- --AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)]) --AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) --AC_CHECK_FUNC(sigaction) --AC_CHECK_FUNC(syslog) -- --dnl This generates warnings from autoconf... --AC_C_BIGENDIAN -- -- --dnl --dnl So many people with broken linking setups asked about this --dnl it turned out to be necessary to check for this. --dnl --dofus_save_libs="$LIBS" --LIBS="$ORBIT_LIBS $LIBS" --AC_TRY_RUN([ #include -- main () -- { -- return 0; -- } ],, -- AC_MSG_ERROR([ --Linking is badly borked on your system. Please ensure your library path is correct --Check config.log for details - check near the end of the log above 'failed program was' --Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the --prefix you're compiling on: '${prefix}' ]), --AC_MSG_WARN([Could not check for borked linking while cross-compiling])) --LIBS="$dofus_save_libs" -- --orig_CPPFLAGS=$CPPFLAGS --CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS" --AC_CHECK_ALIGNOF(CORBA_octet) --AC_CHECK_ALIGNOF(CORBA_boolean) --AC_CHECK_ALIGNOF(CORBA_char) --AC_CHECK_ALIGNOF(CORBA_wchar) --AC_CHECK_ALIGNOF(CORBA_short) --AC_CHECK_ALIGNOF(CORBA_long) --AC_CHECK_ALIGNOF(CORBA_long_long) --AC_CHECK_ALIGNOF(CORBA_float) --AC_CHECK_ALIGNOF(CORBA_double) --AC_CHECK_ALIGNOF(CORBA_long_double) --AC_CHECK_ALIGNOF(CORBA_struct) --AC_CHECK_ALIGNOF(CORBA_pointer) --CPPFLAGS=$orig_CPPFLAGS -- --if test "x$GCC" = "xyes" -a "x$enable_compile_warnings" != "xno"; then -- WARN_CFLAGS="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations" --else -- WARN_CFLAGS= --fi -- --AC_MSG_CHECKING(what warning flags to pass to the C compiler) --AC_MSG_RESULT($WARN_CFLAGS) --AC_SUBST(WARN_CFLAGS) -- --AC_SUBST(pkglibdir) -- --if test "$enable_maintainer_mode" = "yes"; then -- DISABLE_DEPRECATED_CFLAGS=" \ -- -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES" -- AC_SUBST(DISABLE_DEPRECATED_CFLAGS) --fi -- --dnl --dnl --------- start linc bits --------- --dnl -- --dnl Checks for libraries. --PKG_CHECK_MODULES(LINC, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED) --AC_SUBST(LINC_LIBS) --AC_SUBST(LINC_CFLAGS) -- --dnl Checks for header files. --AC_HEADER_STDC --AC_CHECK_HEADERS(fcntl.h unistd.h sys/endian.h endian.h machine/endian.h sys/machine.h sys/isa_defs.h sys/poll.h) --AC_CHECK_HEADERS(stddef.h wchar.h wcstr.h wctype.h machine/types.h) --AC_CHECK_HEADERS(netinet/in.h netinet/tcp.h sys/un.h) --AC_CHECK_HEADERS(arpa/nameser.h resolv.h) --dnl AC_CHECK_HEADERS(linux/irda.h) -- --dnl Checks for library functions. --AC_CHECK_FUNCS(poll basename) --AC_CHECK_FUNC(res_init,,[AC_CHECK_LIB(resolv,res_init)]) --AC_CHECK_LIB(resolv,res_9_init) --AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)]) --AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) --AC_CHECK_FUNC(getaddrinfo,,[AC_CHECK_LIB(nsl,getaddrinfo)]) --if test x"$ac_cv_func_getaddrinfo" = "xyes" ; then -- AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if getaddrinfo() is available]) --fi --AC_CHECK_FUNC(getnameinfo,,[AC_CHECK_LIB(nsl,getnameinfo)]) --if test x"$ac_cv_func_getnameinfo" = "xyes" ; then -- AC_DEFINE(HAVE_GETNAMEINFO, 1, [Define if getnameinfo() is available]) --fi --have_inet_pton=no --AC_CHECK_FUNC(inet_pton,,) --if test x"$ac_cv_func_inet_pton" = "xyes" ; then -- have_inet_pton=yes -- AC_DEFINE(HAVE_INET_PTON, 1, [Define if inet_pton() is available]) --fi -- --# AC_CHECK_TYPE doesn't work here. --AC_MSG_CHECKING([for socklen_t]) --AC_TRY_COMPILE( -- [#ifdef _WIN32 --#include --#else --#include --#include --#endif], -- [socklen_t len;], -- [AC_MSG_RESULT(yes)], -- [AC_DEFINE(socklen_t, size_t, [Define socklen_t to be of type size_t]) -- AC_MSG_RESULT(no)]) -- --# Blatantly stolen from configure.in in the sample code from --# "UNIX Network Programming, Volume 1" by W. Richard Stevens --AC_CACHE_CHECK(if sockaddr has sa_len member, --ac_cv_sockaddr_has_sa_len, -- AC_TRY_COMPILE([ --# include --# include ], -- [unsigned int i = sizeof(((struct sockaddr *)0)->sa_len)], -- ac_cv_sockaddr_has_sa_len=yes, -- ac_cv_sockaddr_has_sa_len=no)) --if test x"$ac_cv_sockaddr_has_sa_len" = "xyes" ; then -- AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Define if sockaddr has sa_len member]) --fi -- --dnl --dnl --------- end linc bits --------- --dnl -- --dnl --dnl --------- set additional gcc flags to catch errors --------- --dnl --AX_CFLAGS_GCC_OPTION(-Werror-implicit-function-declaration) --CFLAGS="$CFLAGS $ORBIT_DEBUG_CFLAGS" --AC_SUBST(CFLAGS) -- -- --dnl ----- gtk-doc ------ --GTK_DOC_CHECK([1.0]) -- -- --AC_CONFIG_FILES([ --Makefile --orbit2-config --ORBit-2.0.pc --ORBit-2.0-uninstalled.pc --ORBit-CosNaming-2.0.pc --ORBit-CosNaming-2.0-uninstalled.pc --ORBit-imodule-2.0.pc --ORBit-imodule-2.0-uninstalled.pc --ORBit.spec --orbit2-zip --src/Makefile --src/idl-compiler/Makefile --src/idl-compiler/ORBit-idl-2.0.pc --src/idl/Makefile --src/idl/CORBA/Makefile --src/idl/CORBA_PIDL/Makefile --src/idl/interop/Makefile --src/idl/misc/Makefile --src/orb/Makefile --src/orb/include/Makefile --src/orb/util/Makefile --src/orb/GIOP/Makefile --src/orb/orb-core/Makefile --src/orb/dynamic/Makefile --src/orb/poa/Makefile --src/services/Makefile --src/services/name/Makefile --src/services/imodule/Makefile --include/Makefile --include/orbit/Makefile --include/orbit/orbit-config.h --include/orbit/GIOP/Makefile --include/orbit/util/Makefile --include/orbit/orb-core/Makefile --include/orbit/poa/Makefile --include/orbit/dynamic/Makefile --test/Makefile --test/everything/Makefile --test/inhibit/Makefile --test/poa/Makefile --docs/Makefile --docs/devel/Makefile --docs/internals/Makefile --docs/api/Makefile -- --linc2/Makefile --linc2/src/Makefile --linc2/test/Makefile --linc2/include/Makefile --linc2/include/linc/Makefile --linc2/include/linc/linc-config.h --]) -- --AC_OUTPUT -- --echo "ORBit configuration: -- -- Source code location: ${srcdir} -- Compiler: ${CC} -- -- Purify cleanliness: ${enable_purify} --" -diff --git a/include/orbit/GIOP/giop-types.h b/include/orbit/GIOP/giop-types.h -index ddf7f14..d852e1e 100644 ---- a/include/orbit/GIOP/giop-types.h -+++ b/include/orbit/GIOP/giop-types.h -@@ -33,6 +33,11 @@ struct _GIOPThread { - void (*request_handler) (gpointer poa_object, - gpointer recv_buffer, - gpointer dummy); -+#ifdef HAVE_GLIB_2_32 -+ GMutex lock_body; -+ GCond incoming_body; -+#endif -+ - }; - - #define GIOP_INITIAL_MSG_SIZE_LIMIT (256*1024) -diff --git a/include/orbit/GIOP/giop.h b/include/orbit/GIOP/giop.h -index 20a3a32..8d1dd7a 100644 ---- a/include/orbit/GIOP/giop.h -+++ b/include/orbit/GIOP/giop.h -@@ -14,6 +14,7 @@ G_BEGIN_DECLS - - #ifdef ORBIT2_INTERNAL_API - -+void giop_set_main_context (GMainContext *context); - void giop_init (gboolean thread_safe, - gboolean blank_wire_data); - void giop_main_run (void); -diff --git a/include/orbit/orb-core/corba-orb-type.h b/include/orbit/orb-core/corba-orb-type.h -index 3dbac38..1f3ce0f 100644 ---- a/include/orbit/orb-core/corba-orb-type.h -+++ b/include/orbit/orb-core/corba-orb-type.h -@@ -78,6 +78,9 @@ struct CORBA_ORB_type { - * been externalised and refs that we have received. - */ - GHashTable *objrefs; -+#ifdef HAVE_GLIB_2_32 -+ GMutex lock_body; -+#endif - }; - - #endif /* ORBIT2_INTERNAL_API */ -diff --git a/include/orbit/orb-core/corba-orb.h b/include/orbit/orb-core/corba-orb.h -index 2fc409b..3cc5087 100644 ---- a/include/orbit/orb-core/corba-orb.h -+++ b/include/orbit/orb-core/corba-orb.h -@@ -32,6 +32,8 @@ gboolean ORBit_proto_use (const char *name); - */ - glong ORBit_get_giop_recv_limit (void); - -+void ORBit_set_giop_main_context (GMainContext *context); -+ - #ifdef ORBIT2_INTERNAL_API - - void ORBit_ORB_forw_bind (CORBA_ORB orb, -diff --git a/include/orbit/poa/orbit-adaptor.h b/include/orbit/poa/orbit-adaptor.h -index 8756e2e..e4ab7ff 100644 ---- a/include/orbit/poa/orbit-adaptor.h -+++ b/include/orbit/poa/orbit-adaptor.h -@@ -124,6 +124,9 @@ struct ORBit_ObjectAdaptor_type { - ORBitThreadHint thread_hint; - - GMainContext *context; -+#ifdef HAVE_GLIB_2_32 -+ GMutex lock_body; -+#endif - }; - - int ORBit_adaptor_setup (ORBit_ObjectAdaptor adaptor, CORBA_ORB orb); -diff --git a/include/orbit/util/basic_types.h b/include/orbit/util/basic_types.h -index 8702276..c8562ca 100644 ---- a/include/orbit/util/basic_types.h -+++ b/include/orbit/util/basic_types.h -@@ -34,7 +34,6 @@ typedef CORBA_wchar *CORBA_wstring; - typedef struct CORBA_Object_type *CORBA_Object; - #endif - --#ifdef G_HAVE_GINT64 - #define HAVE_CORBA_LONG_LONG - - /* -@@ -44,13 +43,6 @@ typedef struct CORBA_Object_type *CORBA_Object; - typedef gint64 CORBA_long_long; - typedef guint64 CORBA_unsigned_long_long; - --#else --#error "" --#error "You don't G_HAVE_GINT64 defined in glib." --#error "Please make sure you don't have an old glibconfig.h lying around." --#error "" --#endif -- - G_END_DECLS - - #endif -diff --git a/linc2/src/Makefile.am b/linc2/src/Makefile.am -index 357a2dd..17024b5 100644 ---- a/linc2/src/Makefile.am -+++ b/linc2/src/Makefile.am -@@ -8,16 +8,16 @@ endif - - # -I$(top_builddir)/include - # -I$(top_srcdir)/include --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_builddir)/linc2/include \ - -I$(top_srcdir)/linc2/include \ - $(LINC_CFLAGS) \ - $(WARN_CFLAGS) \ -- -DG_DISABLE_DEPRECATED -+ $(DISABLE_DEPRECATED_CFLAGS) - - if OS_WIN32 - else --INCLUDES += -D_GNU_SOURCE -+AM_CPPFLAGS += -D_GNU_SOURCE - endif - - liblinc_la_SOURCES = \ -diff --git a/linc2/src/linc-connection.c b/linc2/src/linc-connection.c -index 77bab0f..d78c033 100644 ---- a/linc2/src/linc-connection.c -+++ b/linc2/src/linc-connection.c -@@ -651,8 +651,12 @@ link_connection_do_initiate (LinkConnection *cnx, - fix_permissions (service); - } - #endif -- -+retry: - LINK_TEMP_FAILURE_RETRY_SOCKET (connect (fd, saddr, saddr_len), rv); -+ if (rv == -1L && errno == EAGAIN) { -+ g_usleep (10000); -+ goto retry; -+ } - #ifdef HAVE_WINSOCK2_H - if (rv == SOCKET_ERROR) { - if ((options & LINK_CONNECTION_NONBLOCKING) && -@@ -1333,9 +1337,12 @@ link_connection_finalize (GObject *obj) - g_free (cnx->remote_serv_info); - - g_free (cnx->priv); -- - if (cnx->timeout_mutex) -+#ifndef HAVE_GLIB_2_32 - g_mutex_free (cnx->timeout_mutex); -+#else -+ g_mutex_clear (cnx->timeout_mutex); -+#endif - if (cnx->timeout_source_id) - link_io_thread_remove_timeout (cnx->timeout_source_id); - -@@ -1350,8 +1357,12 @@ link_connection_init (LinkConnection *cnx) - cnx->priv = g_new0 (LinkConnectionPrivate, 1); - cnx->priv->fd = -1; - cnx->priv->was_disconnected = FALSE; -- -+#ifdef HAVE_GLIB_2_32 -+ cnx->timeout_mutex = &(cnx->priv->timeout_mutex); -+ g_mutex_init (cnx->timeout_mutex); -+#else - cnx->timeout_mutex = NULL; -+#endif - cnx->timeout_msec = 0; - cnx->timeout_source_id = 0; - cnx->timeout_status = LINK_TIMEOUT_UNKNOWN; -diff --git a/linc2/src/linc-private.h b/linc2/src/linc-private.h -index 03c77e9..e1c7d48 100644 ---- a/linc2/src/linc-private.h -+++ b/linc2/src/linc-private.h -@@ -96,6 +96,9 @@ struct _LinkConnectionPrivate { - guint64 total_read_bytes; - guint64 total_written_bytes; - #endif -+#ifdef HAVE_GLIB_2_32 -+ GMutex timeout_mutex; -+#endif - }; - - typedef struct { -diff --git a/linc2/src/linc-protocols.c b/linc2/src/linc-protocols.c -index e6895f4..22a77aa 100644 ---- a/linc2/src/linc-protocols.c -+++ b/linc2/src/linc-protocols.c -@@ -383,6 +383,7 @@ link_protocol_is_local_ipv46 (const LinkProtocolInfo *proto, - memset(&hints, 0, sizeof(hints)); - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_CANONNAME; -+ hints.ai_family = proto->family; - - if (getaddrinfo(link_get_local_hostname(), NULL, &hints, &local_addr) != 0) { - if (!warned++) -diff --git a/linc2/src/linc.c b/linc2/src/linc.c -index 917e036..f231d3a 100644 ---- a/linc2/src/linc.c -+++ b/linc2/src/linc.c -@@ -41,6 +41,12 @@ static GCond *link_main_cond; - static GMutex *link_cmd_queue_lock = NULL; - static GCond *link_cmd_queue_cond = NULL; - static GList *link_cmd_queue = NULL; -+#ifdef HAVE_GLIB_2_32 -+static GMutex link_main_lock_body; -+static GCond link_main_cond_body; -+static GMutex link_cmd_queue_lock_body; -+static GCond link_cmd_queue_cond_body; -+#endif - - static int link_wakeup_fds[2] = { -1, -1 }; - #define LINK_WAKEUP_POLL link_wakeup_fds [0] -@@ -195,14 +201,14 @@ link_init (gboolean thread_safe) - d_printf ("stderr redirected here\n"); - } - #endif -- -+#ifndef HAVE_GLIB_2_32 - if (thread_safe && !g_thread_supported ()) - g_thread_init (NULL); -- -+#endif - link_is_thread_safe = (thread_safe && g_thread_supported()); -- -+#ifndef HAVE_GLIB_2_36 - g_type_init (); -- -+#endif - #ifdef SIGPIPE - /* - * Link's raison d'etre is for ORBit2 and Bonobo -@@ -255,13 +261,26 @@ link_init (gboolean thread_safe) - link_ssl_method = SSLv23_method (); - link_ssl_ctx = SSL_CTX_new (link_ssl_method); - #endif -- -+#ifndef HAVE_GLIB_2_32 - link_main_lock = link_mutex_new (); - link_cmd_queue_lock = link_mutex_new (); -+ - if (link_is_thread_safe) { - link_main_cond = g_cond_new (); - link_cmd_queue_cond = g_cond_new (); - } -+#else -+ g_mutex_init (&link_main_lock_body); -+ g_mutex_init (&link_cmd_queue_lock_body); -+ link_main_lock = &link_main_lock_body; -+ link_cmd_queue_lock = &link_cmd_queue_lock_body; -+ if (link_is_thread_safe) { -+ g_cond_init (&link_main_cond_body); -+ g_cond_init (&link_cmd_queue_cond_body); -+ link_main_cond = &link_main_cond_body; -+ link_cmd_queue_cond = &link_cmd_queue_cond_body; -+ } -+#endif - - #ifdef HAVE_WINSOCK2_H - { -@@ -309,7 +328,7 @@ link_main_loop_run (void) - { - g_main_loop_run (link_loop); - } -- -+#ifndef HAVE_GLIB_2_32 - /** - * link_mutex_new: - * -@@ -317,7 +336,7 @@ link_main_loop_run (void) - * - * Return value: a new GMutex, or NULL if one is not required. - **/ --GMutex * -+ - link_mutex_new (void) - { - if (link_is_thread_safe) -@@ -325,6 +344,7 @@ link_mutex_new (void) - else - return NULL; - } -+#endif - - gboolean - link_in_io_thread (void) -@@ -458,11 +478,13 @@ link_exec_set_io_thread (gpointer data, gboolean immediate) - (link_thread_context, LINK_WAKEUP_POLL, - NULL, (G_IO_IN | G_IO_PRI), - link_mainloop_handle_input, NULL); -- -+#ifndef HAVE_GLIB_2_32 - link_io_thread = g_thread_create_full - (link_io_thread_fn, NULL, 256 * 1024, TRUE, FALSE, - G_THREAD_PRIORITY_NORMAL, &error); -- -+#else -+ link_io_thread = g_thread_new ("link-thread", link_io_thread_fn, NULL); -+#endif - if (!link_io_thread || error) - g_error ("Failed to create linc worker thread"); - -diff --git a/linc2/test/Makefile.am b/linc2/test/Makefile.am -index 1979b9a..c6532fe 100644 ---- a/linc2/test/Makefile.am -+++ b/linc2/test/Makefile.am -@@ -2,7 +2,7 @@ noinst_PROGRAMS = test-linc - - # -I$(top_srcdir)/include - # -I$(top_builddir)/include --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir)/linc2/include \ - -I$(top_builddir)/linc2/include \ - -I$(top_srcdir)/linc2/src \ -diff --git a/src/idl-compiler/Makefile.am b/src/idl-compiler/Makefile.am -index b45cae2..44b600b 100644 ---- a/src/idl-compiler/Makefile.am -+++ b/src/idl-compiler/Makefile.am -@@ -2,7 +2,7 @@ bin_PROGRAMS = orbit-idl-2 - - orbit_backends_dir = $(libdir)/orbit-2.0/idl-backends - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_builddir)/include \ - -I$(top_srcdir) \ -diff --git a/src/orb/GIOP/Makefile.am b/src/orb/GIOP/Makefile.am -index 189f9f8..08b3be3 100644 ---- a/src/orb/GIOP/Makefile.am -+++ b/src/orb/GIOP/Makefile.am -@@ -1,4 +1,4 @@ --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - -DORBIT2_INTERNAL_API \ -diff --git a/src/orb/GIOP/giop-recv-buffer.c b/src/orb/GIOP/giop-recv-buffer.c -index 15b6ab6..cbe50a5 100644 ---- a/src/orb/GIOP/giop-recv-buffer.c -+++ b/src/orb/GIOP/giop-recv-buffer.c -@@ -31,7 +31,9 @@ void (*giop_debug_hook_incoming_mangler) (GIOPRecvBuffer *buf) = NULL; - /* A list of GIOPMessageQueueEntrys */ - static GList *giop_queued_messages = NULL; - static GMutex *giop_queued_messages_lock = NULL; -- -+#ifdef HAVE_GLIB_2_32 -+static GMutex giop_qm_lock_body; -+#endif - /* Don't do this genericaly, union's suck genericaly */ - static gboolean - giop_GIOP_TargetAddress_demarshal (GIOPRecvBuffer *buf, -@@ -813,7 +815,12 @@ giop_recv_buffer_get_opname (GIOPRecvBuffer *buf) - void - giop_recv_buffer_init (void) - { -+#ifdef HAVE_GLIB_2_32 -+ giop_queued_messages_lock = &giop_qm_lock_body; -+ g_mutex_init (giop_queued_messages_lock); -+#else - giop_queued_messages_lock = link_mutex_new (); -+#endif - } - - static void -@@ -1413,10 +1420,11 @@ giop_timeout_add (GIOPConnection *cnx) - goto out; - - giop_connection_ref (cnx); // to be unref'ed by the one who removes the timeout source -- - if (!lcnx->timeout_mutex) -+#ifndef HAVE_GLIB_2_32 - lcnx->timeout_mutex = g_mutex_new (); -- -+ //Otherwise handled by the LinkConnection constructor. -+#endif - g_mutex_lock (lcnx->timeout_mutex); - lcnx->timeout_status = LINK_TIMEOUT_UNKNOWN; - g_mutex_unlock (lcnx->timeout_mutex); -diff --git a/src/orb/GIOP/giop-send-buffer.c b/src/orb/GIOP/giop-send-buffer.c -index 64876f8..9ef76a5 100644 ---- a/src/orb/GIOP/giop-send-buffer.c -+++ b/src/orb/GIOP/giop-send-buffer.c -@@ -14,7 +14,9 @@ - static gboolean giop_blank_wire_data = FALSE; - static GSList *send_buffer_list = NULL; - static GMutex *send_buffer_list_lock = NULL; -- -+#ifdef HAVE_GLIB_2_32 -+static GMutex send_bl_lock_body; -+#endif - static const char giop_zero_buf [GIOP_CHUNK_ALIGN * 10] = {0}; - - void -@@ -25,7 +27,12 @@ giop_send_buffer_init (gboolean wipe) - #else - giop_blank_wire_data = wipe; - #endif -+#ifdef HAVE_GLIB_2_32 -+ send_buffer_list_lock = &send_bl_lock_body; -+ g_mutex_init (send_buffer_list_lock); -+#else - send_buffer_list_lock = link_mutex_new (); -+#endif - } - - /* Marshal it at compile time so we don't have to do it over and over. This just stores codeset info to say that -diff --git a/src/orb/GIOP/giop.c b/src/orb/GIOP/giop.c -index f287733..ac54c92 100644 ---- a/src/orb/GIOP/giop.c -+++ b/src/orb/GIOP/giop.c -@@ -21,12 +21,16 @@ - static int corba_wakeup_fds[2]; - #define WAKEUP_POLL corba_wakeup_fds [0] - #define WAKEUP_WRITE corba_wakeup_fds [1] -+static GMainContext *giop_main_context = NULL; - static GSource *giop_main_source = NULL; - static GIOPThread *giop_main_thread = NULL; - - /* Incoming dispatch thread pool */ - static GThreadPool *giop_thread_pool = NULL; - static GMutex *giop_pool_hash_lock = NULL; -+#ifdef HAVE_GLIB_2_32 -+static GMutex giop_pool_hash_lock_body; -+#endif - static GHashTable *giop_pool_hash = NULL; - - const char giop_version_ids [GIOP_NUM_VERSIONS][2] = { -@@ -302,8 +306,15 @@ giop_thread_new (GMainContext *context) - { - GIOPThread *tdata = g_new0 (GIOPThread, 1); - -+#ifndef HAVE_GLIB_2_32 - tdata->lock = g_mutex_new (); - tdata->incoming = g_cond_new (); -+#else -+ tdata->lock = &(tdata->lock_body); -+ tdata->incoming = &(tdata->incoming_body); -+ g_mutex_init (tdata->lock); -+ g_cond_init (tdata->incoming); -+#endif - tdata->wake_context = context; - tdata->keys = NULL; - tdata->async_ents = NULL; -@@ -351,10 +362,17 @@ giop_thread_free (GIOPThread *tdata) - - g_list_free (tdata->keys); - tdata->keys = NULL; -- -+#ifndef HAVE_GLIB_2_32 - g_mutex_free (tdata->lock); -+#else -+ g_mutex_clear (tdata->lock); -+#endif - tdata->lock = NULL; -+#ifndef HAVE_GLIB_2_32 - g_cond_free (tdata->incoming); -+#else -+ g_cond_clear (tdata->incoming); -+#endif - tdata->incoming = NULL; - - #ifdef G_ENABLE_DEBUG -@@ -530,19 +548,26 @@ ORBit_get_safe_tmp (void) - } - - void -+giop_set_main_context (GMainContext *context) -+{ -+ giop_main_context = context; -+} -+ -+void - giop_init (gboolean thread_safe, gboolean blank_wire_data) - { - link_init (thread_safe); - - if (giop_thread_safe ()) { - GIOPThread *tdata; -+ if (!giop_main_context) -+ giop_main_context = g_main_context_default(); - - /* We need a destructor to clean up if giopthreads are used - * outside of ORBit controlled threads */ - giop_tdata_private = g_private_new ((GDestroyNotify)giop_thread_free); - -- giop_main_thread = tdata = giop_thread_new ( -- g_main_context_default ()); /* main thread */ -+ giop_main_thread = tdata = giop_thread_new (giop_main_context); /* main thread */ - - if (link_pipe (corba_wakeup_fds) < 0) /* cf. g_main_context_init_pipe */ - g_error ("Can't create CORBA main-thread wakeup pipe"); -@@ -556,7 +581,7 @@ giop_init (gboolean thread_safe, gboolean blank_wire_data) - fcntl (WAKEUP_WRITE, F_SETFL, O_NONBLOCK); - #endif - giop_main_source = link_source_create_watch ( -- g_main_context_default (), WAKEUP_POLL, -+ giop_main_context, WAKEUP_POLL, - NULL, (G_IO_IN | G_IO_PRI), - giop_mainloop_handle_input, NULL); - -@@ -565,7 +590,12 @@ giop_init (gboolean thread_safe, gboolean blank_wire_data) - /* Setup thread pool for incoming requests */ - giop_thread_pool = g_thread_pool_new - (giop_request_handler_thread, NULL, -1, FALSE, NULL); -+#ifdef HAVE_GLIB_2_32 -+ giop_pool_hash_lock = &giop_pool_hash_lock_body; -+ g_mutex_init (giop_pool_hash_lock); -+#else - giop_pool_hash_lock = link_mutex_new (); -+#endif - giop_pool_hash = g_hash_table_new (NULL, NULL); - } - -diff --git a/src/orb/Makefile.am b/src/orb/Makefile.am -index 2b443ba..f82227e 100644 ---- a/src/orb/Makefile.am -+++ b/src/orb/Makefile.am -@@ -2,7 +2,7 @@ SUBDIRS=include orb-core util GIOP poa dynamic - - lib_LTLIBRARIES=libORBit-2.la - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I. \ - -I$(srcdir) \ - -I$(top_srcdir)/include \ -diff --git a/src/orb/dynamic/Makefile.am b/src/orb/dynamic/Makefile.am -index 330bf53..11e5785 100644 ---- a/src/orb/dynamic/Makefile.am -+++ b/src/orb/dynamic/Makefile.am -@@ -5,7 +5,7 @@ liborb_dynamic_la_SOURCES= \ - $(DYNAMIC_IDLOUT) \ - dynany.c - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/orb \ - -I$(top_builddir)/include \ -diff --git a/src/orb/orb-core/Makefile.am b/src/orb/orb-core/Makefile.am -index 7cbed96..43b54ac 100644 ---- a/src/orb/orb-core/Makefile.am -+++ b/src/orb/orb-core/Makefile.am -@@ -2,7 +2,7 @@ noinst_LTLIBRARIES=liborb-core.la - - TYPELIB_DIR=$(libdir)/orbit-2.0 - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I. \ - -I$(srcdir) \ - -I$(top_builddir)/include \ -diff --git a/src/orb/orb-core/corba-object.c b/src/orb/orb-core/corba-object.c -index 28900e1..7c23684 100644 ---- a/src/orb/orb-core/corba-object.c -+++ b/src/orb/orb-core/corba-object.c -@@ -9,6 +9,9 @@ - #include "../util/orbit-purify.h" - - static GMutex *object_lock = NULL; -+#ifdef HAVE_GLIB_2_32 -+static GMutex object_lock_body; -+#endif - - #define OBJECT_LOCK(obj) LINK_MUTEX_LOCK (object_lock) - #define OBJECT_UNLOCK(obj) LINK_MUTEX_UNLOCK (object_lock) -@@ -998,5 +1001,10 @@ CORBA_Object__iinterface = { - void - _ORBit_object_init (void) - { -+#ifdef HAVE_GLIB_2_32 -+ object_lock = &object_lock_body; -+ g_mutex_init (object_lock); -+#else - object_lock = link_mutex_new(); -+#endif - } -diff --git a/src/orb/orb-core/corba-orb.c b/src/orb/orb-core/corba-orb.c -index 908535d..34c21b5 100644 ---- a/src/orb/orb-core/corba-orb.c -+++ b/src/orb/orb-core/corba-orb.c -@@ -236,11 +236,18 @@ CORBA_ORB_release_fn (ORBit_RootObject robj) - } - - GMutex *ORBit_RootObject_lifecycle_lock = NULL; -- -+#ifdef HAVE_GLIB_2_32 -+static GMutex ORBit_RO_lifecycle_lock_body; -+#endif - static void - ORBit_locks_initialize (void) - { -+#ifdef HAVE_GLIB_2_32 -+ ORBit_RootObject_lifecycle_lock = &ORBit_RO_lifecycle_lock_body; -+ g_mutex_init (ORBit_RootObject_lifecycle_lock); -+#else - ORBit_RootObject_lifecycle_lock = link_mutex_new (); -+#endif - } - - #ifdef G_ENABLE_DEBUG -@@ -438,7 +445,12 @@ CORBA_ORB_init (int *argc, char **argv, - ORBit_RootObject_init (&retval->root_object, &orb_if); - /* released by CORBA_ORB_destroy */ - _ORBit_orb = ORBit_RootObject_duplicate (retval); -+#ifdef HAVE_GLIB_2_32 -+ _ORBit_orb->lock = &(_ORBit_orb->lock_body); -+ g_mutex_init (_ORBit_orb->lock); -+#else - _ORBit_orb->lock = link_mutex_new (); -+#endif - #ifndef G_OS_WIN32 - /* atexit(), which g_atexit() is just a #define for on Win32, - * often causes breakage when invoked from DLLs. It causes the -@@ -1328,7 +1340,11 @@ CORBA_ORB_destroy (CORBA_ORB orb, - orb->life_flags |= ORBit_LifeF_Destroyed; - - if (orb->lock) { -+#ifndef HAVE_GLIB_2_32 - g_mutex_free (orb->lock); -+#else -+ g_mutex_clear (orb->lock); -+#endif - orb->lock = NULL; - } - -@@ -1442,6 +1458,12 @@ ORBit_get_giop_recv_limit (void) - return giop_recv_get_limit (); - } - -+void -+ORBit_set_giop_main_context (GMainContext *context) -+{ -+ giop_set_main_context (context); -+} -+ - const ORBit_option orbit_supported_options[] = { - { "ORBid", ORBIT_OPTION_STRING, NULL }, /* FIXME: unimplemented */ - { "ORBImplRepoIOR", ORBIT_OPTION_STRING, NULL }, /* FIXME: unimplemented */ -diff --git a/src/orb/poa/Makefile.am b/src/orb/poa/Makefile.am -index c42ae31..f47069c 100644 ---- a/src/orb/poa/Makefile.am -+++ b/src/orb/poa/Makefile.am -@@ -2,7 +2,7 @@ noinst_LTLIBRARIES=liborb-poa.la - - IDL = $(top_builddir)/src/idl-compiler/orbit-idl-2 - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - -I$(top_builddir)/src/orb/orb-core \ -diff --git a/src/orb/poa/poa.c b/src/orb/poa/poa.c -index 6cec95f..0668c36 100644 ---- a/src/orb/poa/poa.c -+++ b/src/orb/poa/poa.c -@@ -20,6 +20,9 @@ - #include "poa-macros.h" - #include "poa-private.h" - #include "orbit-poa.h" -+#ifdef HAVE_GLIB_2_32 -+static GMutex _ORBit_poa_manager_lock_body; -+#endif - - #ifdef DEBUG_LOCKS - # define LOCK_DEBUG(a) g_printerr("%p: %6s file %s: line %d (%s)\n", \ -@@ -41,7 +44,9 @@ - static GMutex *ORBit_class_assignment_lock = NULL; - static GHashTable *ORBit_class_assignments = NULL; - static guint ORBit_class_assignment_counter = 0; -- -+#ifdef HAVE_GLIB_2_32 -+static GMutex ORBit_class_assignment_lock_body; -+#endif - static PortableServer_Servant ORBit_POA_ServantManager_use_servant( - PortableServer_POA poa, - ORBit_POAObject pobj, -@@ -651,8 +656,11 @@ ORBit_POA_free_fn (ORBit_RootObject obj) - g_free (poa->name); - - if (poa->base.lock) -+#ifndef HAVE_GLIB_2_32 - g_mutex_free (poa->base.lock); -- -+#else -+ g_mutex_clear (poa->base.lock); -+#endif - ORBit_RootObject_release_T (poa->orb); - ORBit_RootObject_release_T (poa->poa_manager); - -@@ -823,8 +831,12 @@ ORBit_POA_new (CORBA_ORB orb, - (GHashFunc) ORBit_sequence_CORBA_octet_hash, - (GEqualFunc) ORBit_sequence_CORBA_octet_equal); - -+#ifdef HAVE_GLIB_2_32 -+ poa->base.lock = &(poa->base.lock_body); -+ g_mutex_init (poa->base.lock); -+#else - poa->base.lock = link_mutex_new (); -- -+#endif - ORBit_POAManager_register_poa (manager, poa); - - return ORBit_RootObject_duplicate (poa); -@@ -2491,8 +2503,15 @@ PortableServer_POA_id_to_reference (PortableServer_POA poa, - void - ORBit_poa_init (void) - { -+#ifdef HAVE_GLIB_2_32 -+ ORBit_class_assignment_lock = &ORBit_class_assignment_lock_body; -+ g_mutex_init (ORBit_class_assignment_lock); -+ _ORBit_poa_manager_lock = &_ORBit_poa_manager_lock_body; -+ g_mutex_init (_ORBit_poa_manager_lock); -+#else - ORBit_class_assignment_lock = link_mutex_new (); - _ORBit_poa_manager_lock = link_mutex_new (); -+#endif - giop_thread_set_main_handler (ORBit_POAObject_invoke_incoming_request); - } - -diff --git a/src/orb/util/Makefile.am b/src/orb/util/Makefile.am -index b391cd7..412be1f 100644 ---- a/src/orb/util/Makefile.am -+++ b/src/orb/util/Makefile.am -@@ -1,6 +1,6 @@ - noinst_LTLIBRARIES=liborb-util.la - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbitrc\" \ -diff --git a/src/orb/util/genrand.c b/src/orb/util/genrand.c -index 7fd1bec..9c25edf 100644 ---- a/src/orb/util/genrand.c -+++ b/src/orb/util/genrand.c -@@ -41,6 +41,9 @@ static int genuid_uid = 0; - - /* This is quite possibly a complete waste of cycles */ - static GMutex *inc_lock = NULL; -+#ifdef HAVE_GLIB_2_32 -+static GMutex inc_lock_body; -+#endif - #define INC_LOCK() LINK_MUTEX_LOCK (inc_lock) - #define INC_UNLOCK() LINK_MUTEX_UNLOCK (inc_lock) - -@@ -62,8 +65,12 @@ ORBit_genuid_init (ORBitGenUidType type) - #ifndef G_OS_WIN32 - genuid_uid = getuid (); - #endif -+#ifdef HAVE_GLIB_2_32 -+ inc_lock = &inc_lock_body; -+ g_mutex_init (inc_lock); -+#else - inc_lock = link_mutex_new(); -- -+#endif - glib_prng = g_rand_new (); - g_get_current_time (&time); - g_rand_set_seed (glib_prng, (time.tv_sec << 20) ^ time.tv_usec); -@@ -118,7 +125,11 @@ ORBit_genuid_fini (void) - } - - if (inc_lock) { -+#ifndef HAVE_GLIB_2_32 - g_mutex_free (inc_lock); -+#else -+ g_mutex_clear (inc_lock); -+#endif - inc_lock = NULL; - } - } -diff --git a/src/services/imodule/Makefile.am b/src/services/imodule/Makefile.am -index e0731a4..f63c920 100644 ---- a/src/services/imodule/Makefile.am -+++ b/src/services/imodule/Makefile.am -@@ -2,7 +2,7 @@ NULL = - - lib_LTLIBRARIES = libORBit-imodule-2.la - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - -DORBIT2_INTERNAL_API \ -diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am -index 7212557..deda1ed 100644 ---- a/src/services/name/Makefile.am -+++ b/src/services/name/Makefile.am -@@ -26,7 +26,7 @@ libORBitCosNaming_2_la_LDFLAGS = \ - $(ORBIT_NAME_LIBS) \ - $(top_builddir)/src/orb/libORBit-2.la - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I. \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ -diff --git a/test/Makefile.am b/test/Makefile.am -index a48d38e..87f35af 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -1,6 +1,6 @@ - SUBDIRS = everything inhibit poa - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/orb \ - -I$(top_builddir)/include \ -diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am -index 32beb36..cb4b1d6 100644 ---- a/test/everything/Makefile.am -+++ b/test/everything/Makefile.am -@@ -10,7 +10,7 @@ EVERYTHING_IDLOUT = \ - $(EVERYTHING_BUILT) \ - everything-imodule.c - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - -I$(top_builddir)/src \ -@@ -78,7 +78,7 @@ include $(top_srcdir)/Makefile.shared - BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c - CLEANFILES = ${BUILT_SOURCES} iorfile - --TESTS = $(srcdir)/test.sh -+TESTS = $(top_builddir)/test/everything/test.sh - - EXTRA_DIST = $(IDL_FILES) test.sh $(included_src) - -diff --git a/test/everything/client.c b/test/everything/client.c -index afa6a9b..b5c5597 100644 ---- a/test/everything/client.c -+++ b/test/everything/client.c -@@ -2502,13 +2502,19 @@ run_threaded_tests (test_TestFactory factory, - fprintf (stderr, "Testing with %d threads\n", NUM_THREADS); - - threads = g_new0 (GThread *, NUM_THREADS); -- -+#ifndef HAVE_GLIB_2_32 - for (i = 0; i < NUM_THREADS; i++) { - threads [i] = g_thread_create - ( test_thread, factory, TRUE, &error); - g_assert (!error); - } -- -+#else -+ for (i = 0; i < NUM_THREADS; i++) { -+ gchar *thread_name = g_strdup_printf ("thread_%d", i); -+ threads [i] = g_thread_new ( thread_name, test_thread, NULL); -+ g_free (thread_name); -+ } -+#endif - for (i = 0; i < NUM_THREADS; i++) { - if (!(g_thread_join (threads [i]) == factory)) - g_error ("Wierd thread join problem '%d'", i); -@@ -2555,9 +2561,9 @@ main (int argc, char *argv []) - gboolean gen_imodule = FALSE; - char *orb_name; - int i; -- -+#ifndef HAVE_GLIB_2_32 - g_thread_init (NULL); -- -+#endif - CORBA_exception_init (ev); - - /* FIXME - make this work nicely sometime. -diff --git a/test/everything/server.c b/test/everything/server.c -index 5219f54..0f2940c 100644 ---- a/test/everything/server.c -+++ b/test/everything/server.c -@@ -528,8 +528,9 @@ init_iinterfaces (ORBit_IInterfaces *interfaces, - - free (malloc (8)); /* -lefence */ - -+#ifndef HAVE_GLIB_2_32 - g_thread_init (NULL); -- -+#endif - CORBA_exception_init(&real_ev); - - for (i = 0; i < argc; i++) { -diff --git a/test/inhibit/Makefile.am b/test/inhibit/Makefile.am -index 3974d0d..ef26a21 100644 ---- a/test/inhibit/Makefile.am -+++ b/test/inhibit/Makefile.am -@@ -1,7 +1,7 @@ - noinst_PROGRAMS= \ - test-inhibit - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - $(WARN_CFLAGS) \ -diff --git a/test/poa/Makefile.am b/test/poa/Makefile.am -index becfcfa..6cf9c38 100644 ---- a/test/poa/Makefile.am -+++ b/test/poa/Makefile.am -@@ -1,4 +1,4 @@ --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - $(WARN_CFLAGS) \ -diff --git a/test/poa/poatest-basic-shell.c b/test/poa/poatest-basic-shell.c -index a229fdb..8ec98c8 100644 ---- a/test/poa/poatest-basic-shell.c -+++ b/test/poa/poatest-basic-shell.c -@@ -36,8 +36,9 @@ main (int argc, char **argv) - PortableServer_POAManager poa_mgr; - poatest poatest_obj; - -+#ifndef HAVE_GLIB_2_32 - g_thread_init (NULL); -- -+#endif - CORBA_exception_init (&ev); - - orb = CORBA_ORB_init (&argc, argv, "", &ev); -diff --git a/test/test-corbaloc.c b/test/test-corbaloc.c -index 3cb2c18..95d92a2 100644 ---- a/test/test-corbaloc.c -+++ b/test/test-corbaloc.c -@@ -186,9 +186,9 @@ int main (int argc, char *argv[]) { - - CORBA_Environment ev; - CORBA_ORB orb; -- -+#ifndef HAVE_GLIB_2_32 - g_thread_init (NULL); -- -+#endif - CORBA_exception_init(&ev); - orb = CORBA_ORB_init(&argc, argv, "orbit-local-orb", &ev); - -diff --git a/test/test-dynany.c b/test/test-dynany.c -index 2e47bcb..b535765 100644 ---- a/test/test-dynany.c -+++ b/test/test-dynany.c -@@ -571,11 +571,12 @@ main (int argc, char *argv[]) - - free (malloc (8)); - -+#ifndef HAVE_GLIB_2_32 - g_thread_init (NULL); -- -+#endif - CORBA_exception_init (&ev); - orb = CORBA_ORB_init (NULL, NULL, "orbit-local-orb", &ev); -- -+ - /* - * Since the API is entirely macro generated - * we only need to test a few cases. -diff --git a/test/test-giop.c b/test/test-giop.c -index 84ac07b..f558c2a 100644 ---- a/test/test-giop.c -+++ b/test/test-giop.c -@@ -330,9 +330,9 @@ main (int argc, char *argv[]) - { - CORBA_ORB orb; - CORBA_Environment ev; -- -+#ifndef HAVE_GLIB_2_32 - g_thread_init (NULL); -- -+#endif - CORBA_exception_init (&ev); - - orb = CORBA_ORB_init (&argc, argv, "orbit-local-orb", &ev); -diff --git a/test/test-mem.c b/test/test-mem.c -index 94d82f4..f7e21da 100644 ---- a/test/test-mem.c -+++ b/test/test-mem.c -@@ -236,9 +236,9 @@ main_func(int argc, char *argv[]) { - PortableServer_POAManager_activate(poa_manager, ev); - g_assert (!ORBIT_EX (ev)); - -- LEAK_DETECT_WITH_TOLERANCE (1000, test_ORBit_alloc (), 50); -- LEAK_DETECT_WITH_TOLERANCE (1000, test_ORBit_sequence (), 50); -- LEAK_DETECT_WITH_TOLERANCE (1000, test_activate_deactivate (poa, ev), 50); -+ LEAK_DETECT_WITH_TOLERANCE (1000, test_ORBit_alloc (), 200); -+ LEAK_DETECT_WITH_TOLERANCE (1000, test_ORBit_sequence (), 200); -+ LEAK_DETECT_WITH_TOLERANCE (1000, test_activate_deactivate (poa, ev), 200); - - /* tear down the ORB */ - CORBA_Object_release ((CORBA_Object) poa_manager, ev); -@@ -258,7 +258,9 @@ int - main(int argc, char *argv[]) { - /* ORBit2-2.7.6 leaks on shutdown with about 700KB */ - /* LEAK_DETECT_WITH_TOLERANCE (1, main_func (argc,argv), 20); */ -+#ifndef HAVE_GLIB_2_32 - g_thread_init (NULL); -+#endif - main_func (argc, argv); - exit (0); - } -diff --git a/test/test-performance.c b/test/test-performance.c -index d4c446f..e94058f 100644 ---- a/test/test-performance.c -+++ b/test/test-performance.c -@@ -175,7 +175,9 @@ main (int argc, char *argv[]) - - free (malloc (8)); - -+#ifndef HAVE_GLIB_2_32 - g_thread_init (NULL); -+#endif - - CORBA_exception_init (&ev); - -diff --git a/test/timeout-client.c b/test/timeout-client.c -index 910f57c..0e73a4e 100644 ---- a/test/timeout-client.c -+++ b/test/timeout-client.c -@@ -154,7 +154,9 @@ main (int argc, char *argv[]) - CORBA_ORB orb; - int retv = EXIT_FAILURE; - -+#ifndef HAVE_GLIB_2_32 - g_thread_init (NULL); -+#endif - - CORBA_exception_init (&ev); - -diff --git a/test/timeout-server.c b/test/timeout-server.c -index d6386da..e2f10a6 100644 ---- a/test/timeout-server.c -+++ b/test/timeout-server.c -@@ -92,8 +92,9 @@ main (int argc, char *argv[]) - signal(SIGINT, exit); - signal(SIGTERM, exit); - -+#ifndef HAVE_GLIB_2_32 - g_thread_init (NULL); -- -+#endif - CORBA_exception_init (&ev); - - /* create IPv4 orb */ --- -1.8.3.rc0 - diff --git a/modulesets/patches/0001-Prevent-WebKitWebProcess-from-being-in-the-dock-or-p.patch b/modulesets/patches/0001-Prevent-WebKitWebProcess-from-being-in-the-dock-or-p.patch deleted file mode 100644 index 44c6686..0000000 --- a/modulesets/patches/0001-Prevent-WebKitWebProcess-from-being-in-the-dock-or-p.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 338ef8630d4aa8c15d33e66f438bc5862d4dc930 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Thu, 29 Oct 2020 18:30:08 -0700 -Subject: [PATCH] Prevent WebKitWebProcess from being in the dock or process - switcher. - -Thanks to the Nyxt browser project, https://nyxt.atlas.engineer/. ---- - Source/WebKit/PlatformGTK.cmake | 4 ++++ - Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h | 4 ++++ - Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm | 10 ++++++++++ - Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp | 2 ++ - 4 files changed, 20 insertions(+) - create mode 100644 Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h - create mode 100644 Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm - -diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index f6abc65..7214829 100644 ---- a/Source/WebKit/PlatformGTK.cmake -+++ b/Source/WebKit/PlatformGTK.cmake -@@ -32,6 +32,10 @@ list(APPEND WebKit_UNIFIED_SOURCE_LIST_FILES - "SourcesGTK.txt" - ) - -+find_library(APPKIT_FRAMEWORK NAMES AppKit) -+target_link_libraries(WebKit PRIVATE ${APPKIT_FRAMEWORK}) -+list(APPEND WebKit_SOURCES WebProcess/gtk/NSApplicationActivationPolicy.mm) -+ - list(APPEND WebKit_MESSAGES_IN_FILES - UIProcess/ViewGestureController.messages.in - -diff --git a/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h b/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h -new file mode 100644 -index 0000000..7285942 ---- /dev/null -+++ b/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h -@@ -0,0 +1,4 @@ -+ -+// This is the C "trampoline" function that will be used -+// to invoke a specific Objective-C method FROM C++ -+void SetActivationPolicyProhibited (); -diff --git a/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm b/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm -new file mode 100644 -index 0000000..ce1d75c ---- /dev/null -+++ b/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm -@@ -0,0 +1,10 @@ -+#include "config.h" -+#import "NSApplicationActivationPolicy.h" -+#import -+ -+// C "trampoline" function to invoke Objective-C method -+void SetActivationPolicyProhibited () -+{ -+ [NSApp setActivationPolicy: NSApplicationActivationPolicyProhibited]; -+ return; -+} -diff --git a/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp b/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp -index 6a4a822..5b4064f 100644 ---- a/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp -+++ b/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include "NSApplicationActivationPolicy.h" - - #if PLATFORM(X11) - #include -@@ -58,6 +59,7 @@ public: - - bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); -+ SetActivationPolicyProhibited (); - - return true; - } --- -2.2.2 - diff --git a/modulesets/patches/0001-Restore-gl_GLIBC21-to-configure-needed-for-libcharse.patch b/modulesets/patches/0001-Restore-gl_GLIBC21-to-configure-needed-for-libcharse.patch deleted file mode 100644 index b6f2533..0000000 --- a/modulesets/patches/0001-Restore-gl_GLIBC21-to-configure-needed-for-libcharse.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 859b3aa3dc2af5b73145424c8290ce058f5d8346 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Fri, 4 Oct 2013 11:45:47 -0700 -Subject: [PATCH] Restore gl_GLIBC21 to configure; needed for libcharset - ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 1dde875..d014238 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -878,6 +878,7 @@ AC_STRUCT_DIRENT_D_TYPE - AM_LANGINFO_CODESET - AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) - AC_CHECK_FUNCS(setlocale) -+gl_GLIBC21 - - # check additional type sizes - AC_CHECK_SIZEOF(size_t) --- -1.8.3.rc0 - diff --git a/modulesets/patches/0001-quartz-Fix-the-32-bits-build-on-MacOSX-10.7.patch b/modulesets/patches/0001-quartz-Fix-the-32-bits-build-on-MacOSX-10.7.patch deleted file mode 100644 index 139dcb1..0000000 --- a/modulesets/patches/0001-quartz-Fix-the-32-bits-build-on-MacOSX-10.7.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 1f6a1aaaa75e4c4796bb376140af0213afa32881 Mon Sep 17 00:00:00 2001 -From: Andrea Canciani -Date: Sat, 3 Sep 2011 09:39:24 -0700 -Subject: [PATCH] quartz: Fix the 32-bits build on MacOSX 10.7 - -FMGetATSFontRefFromFont() is not public on Lion nor on 64-bits -Frameworks, but it seems to be available in the dynamic libs, hence we -can dlsym() it just like other private functions. - -Works around the error: -cairo-quartz-font.c: In function 'cairo_quartz_font_face_create_for_atsu_font_id': -cairo-quartz-font.c:830: error: implicit declaration of function 'FMGetATSFontRefFromFont' - -Fixes https://bugs.freedesktop.org/show_bug.cgi?id=39493 ---- - src/cairo-quartz-font.c | 26 ++++++++++++++++++-------- - src/cairo-quartz.h | 2 -- - 2 files changed, 18 insertions(+), 10 deletions(-) - -diff --git a/src/cairo-quartz-font.c b/src/cairo-quartz-font.c -index 2c7e017..d8ec919 100644 ---- a/src/cairo-quartz-font.c -+++ b/src/cairo-quartz-font.c -@@ -90,6 +90,9 @@ static int (*CGFontGetAscentPtr) (CGFontRef fontRef) = NULL; - static int (*CGFontGetDescentPtr) (CGFontRef fontRef) = NULL; - static int (*CGFontGetLeadingPtr) (CGFontRef fontRef) = NULL; - -+/* Not public anymore in 64-bits nor in 10.7 */ -+static ATSFontRef (*FMGetATSFontRefFromFontPtr) (FMFont iFont) = NULL; -+ - static cairo_bool_t _cairo_quartz_font_symbol_lookup_done = FALSE; - static cairo_bool_t _cairo_quartz_font_symbols_present = FALSE; - -@@ -127,6 +130,8 @@ quartz_font_ensure_symbols(void) - CGContextGetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextGetAllowsFontSmoothing"); - CGContextSetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextSetAllowsFontSmoothing"); - -+ FMGetATSFontRefFromFontPtr = dlsym(RTLD_DEFAULT, "FMGetATSFontRefFromFont"); -+ - if ((CGFontCreateWithFontNamePtr || CGFontCreateWithNamePtr) && - CGFontGetGlyphBBoxesPtr && - CGFontGetGlyphsForUnicharsPtr && -@@ -777,7 +782,6 @@ _cairo_quartz_scaled_font_get_cg_font_ref (cairo_scaled_font_t *abstract_font) - return ffont->cgFont; - } - --#ifndef __LP64__ - /* - * compat with old ATSUI backend - */ -@@ -798,15 +802,22 @@ _cairo_quartz_scaled_font_get_cg_font_ref (cairo_scaled_font_t *abstract_font) - cairo_font_face_t * - cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id) - { -- ATSFontRef atsFont = FMGetATSFontRefFromFont (font_id); -- CGFontRef cgFont = CGFontCreateWithPlatformFont (&atsFont); -- cairo_font_face_t *ff; -+ quartz_font_ensure_symbols(); - -- ff = cairo_quartz_font_face_create_for_cgfont (cgFont); -+ if (FMGetATSFontRefFromFontPtr != NULL) { -+ ATSFontRef atsFont = FMGetATSFontRefFromFontPtr (font_id); -+ CGFontRef cgFont = CGFontCreateWithPlatformFont (&atsFont); -+ cairo_font_face_t *ff; - -- CGFontRelease (cgFont); -+ ff = cairo_quartz_font_face_create_for_cgfont (cgFont); -+ -+ CGFontRelease (cgFont); - -- return ff; -+ return ff; -+ } else { -+ _cairo_error_throw (CAIRO_STATUS_NO_MEMORY); -+ return (cairo_font_face_t *)&_cairo_font_face_nil; -+ } - } - - /* This is the old name for the above function, exported for compat purposes */ -@@ -817,4 +828,3 @@ cairo_atsui_font_face_create_for_atsu_font_id (ATSUFontID font_id) - { - return cairo_quartz_font_face_create_for_atsu_font_id (font_id); - } --#endif -diff --git a/src/cairo-quartz.h b/src/cairo-quartz.h -index 8d001c5..9be5f9a 100644 ---- a/src/cairo-quartz.h -+++ b/src/cairo-quartz.h -@@ -66,10 +66,8 @@ cairo_quartz_surface_get_cg_context (cairo_surface_t *surface); - cairo_public cairo_font_face_t * - cairo_quartz_font_face_create_for_cgfont (CGFontRef font); - --#ifndef __LP64__ - cairo_public cairo_font_face_t * - cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id); --#endif - - #endif /* CAIRO_HAS_QUARTZ_FONT */ - --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0001-scanner-split-CC-environment-variable.patch b/modulesets/patches/0001-scanner-split-CC-environment-variable.patch deleted file mode 100644 index 0857e89..0000000 --- a/modulesets/patches/0001-scanner-split-CC-environment-variable.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 33293e16045cb1667c0be8c13cb60daeec0594a9 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Mon, 10 Oct 2011 13:37:55 +0000 -Subject: [PATCH] scanner: split CC environment variable - -This fixes compilation where CC="ccache gcc" and similar. - -https://bugzilla.gnome.org/show_bug.cgi?id=660160 - -Signed-off-by: Natanael Copa ---- - giscanner/sourcescanner.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py -index 5f0ec2d..1e61ecf 100644 ---- a/giscanner/sourcescanner.py -+++ b/giscanner/sourcescanner.py -@@ -274,7 +274,8 @@ class SourceScanner(object): - - defines = ['__GI_SCANNER__'] - undefs = [] -- cpp_args = [os.environ.get('CC', 'cc'), '-E', '-C', '-I.', '-'] -+ cpp_args = os.environ.get('CC', 'cc').split() -+ cpp_args += ['-E', '-C', '-I.', '-'] - - cpp_args += self._cpp_options - proc = subprocess.Popen(cpp_args, --- -1.7.6.3.dirty - diff --git a/modulesets/patches/0002-gtk2-Extract-reasons-and-reasons_desc-arrays-to-file-leve.patch b/modulesets/patches/0002-gtk2-Extract-reasons-and-reasons_desc-arrays-to-file-leve.patch deleted file mode 100644 index 0b70b42..0000000 --- a/modulesets/patches/0002-gtk2-Extract-reasons-and-reasons_desc-arrays-to-file-leve.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 330a278dd3f1b29dc4a29b80ee389691fdd81fe7 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 25 Feb 2012 17:44:13 -0800 -Subject: [PATCH 2/9] Extract reasons and reasons_desc arrays to file level - -So that they can be used from more than one function. Rename them to -avoid naming conflicts. ---- - modules/printbackends/cups/gtkprintbackendcups.c | 70 +++++++++++----------- - 1 files changed, 36 insertions(+), 34 deletions(-) - -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index 283a0ff..875c080 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -1679,6 +1679,42 @@ find_printer (GtkPrinter *printer, - printer_name = gtk_printer_get_name (printer); - return g_ascii_strcasecmp (printer_name, find_name); - } -+/* Printer messages we're interested in */ -+static const char * const printer_messages[] = -+ { -+ "toner-low", -+ "toner-empty", -+ "developer-low", -+ "developer-empty", -+ "marker-supply-low", -+ "marker-supply-empty", -+ "cover-open", -+ "door-open", -+ "media-low", -+ "media-empty", -+ "offline", -+ "other" -+ }; -+/* Our translatable versions of the printer messages */ -+static const char * printer_strings[] = -+ { -+ N_("Printer '%s' is low on toner."), -+ N_("Printer '%s' has no toner left."), -+ /* Translators: "Developer" like on photo development context */ -+ N_("Printer '%s' is low on developer."), -+ /* Translators: "Developer" like on photo development context */ -+ N_("Printer '%s' is out of developer."), -+ /* Translators: "marker" is one color bin of the printer */ -+ N_("Printer '%s' is low on at least one marker supply."), -+ /* Translators: "marker" is one color bin of the printer */ -+ N_("Printer '%s' is out of at least one marker supply."), -+ N_("The cover is open on printer '%s'."), -+ N_("The door is open on printer '%s'."), -+ N_("Printer '%s' is low on paper."), -+ N_("Printer '%s' is out of paper."), -+ N_("Printer '%s' is currently offline."), -+ N_("There is a problem on printer '%s'.") -+ }; - - static void - cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, -@@ -1750,40 +1786,6 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - gint printer_state_reason_level = 0; /* 0 - none, 1 - report, 2 - warning, 3 - error */ - gboolean interested_in = FALSE; - gboolean found = FALSE; -- static const char * const reasons[] = /* Reasons we're interested in */ -- { -- "toner-low", -- "toner-empty", -- "developer-low", -- "developer-empty", -- "marker-supply-low", -- "marker-supply-empty", -- "cover-open", -- "door-open", -- "media-low", -- "media-empty", -- "offline", -- "other" -- }; -- static const char * reasons_descs[] = -- { -- N_("Printer '%s' is low on toner."), -- N_("Printer '%s' has no toner left."), -- /* Translators: "Developer" like on photo development context */ -- N_("Printer '%s' is low on developer."), -- /* Translators: "Developer" like on photo development context */ -- N_("Printer '%s' is out of developer."), -- /* Translators: "marker" is one color bin of the printer */ -- N_("Printer '%s' is low on at least one marker supply."), -- /* Translators: "marker" is one color bin of the printer */ -- N_("Printer '%s' is out of at least one marker supply."), -- N_("The cover is open on printer '%s'."), -- N_("The door is open on printer '%s'."), -- N_("Printer '%s' is low on paper."), -- N_("Printer '%s' is out of paper."), -- N_("Printer '%s' is currently offline."), -- N_("There is a problem on printer '%s'.") -- }; - gboolean is_paused = FALSE; - gboolean is_accepting_jobs = TRUE; - gboolean default_printer = FALSE; --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0002-gtk3-Extract-reasons-and-reasons_desc-arrays-to-file-leve.patch b/modulesets/patches/0002-gtk3-Extract-reasons-and-reasons_desc-arrays-to-file-leve.patch deleted file mode 100644 index db2b79b..0000000 --- a/modulesets/patches/0002-gtk3-Extract-reasons-and-reasons_desc-arrays-to-file-leve.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 0822a32530945c9df43f7224b6a9167674529fdb Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sun, 19 Feb 2012 13:14:36 -0800 -Subject: [PATCH 2/9] Extract reasons and reasons_desc arrays to file level - -So that they can be used from more than one function. Rename them to avoid naming conflicts. ---- - modules/printbackends/cups/gtkprintbackendcups.c | 70 +++++++++++----------- - 1 files changed, 36 insertions(+), 34 deletions(-) - -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index 12c6ab6..88c7137 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -1613,6 +1613,42 @@ find_printer (GtkPrinter *printer, - printer_name = gtk_printer_get_name (printer); - return g_ascii_strcasecmp (printer_name, find_name); - } -+/* Printer messages we're interested in */ -+static const char * const printer_messages[] = -+ { -+ "toner-low", -+ "toner-empty", -+ "developer-low", -+ "developer-empty", -+ "marker-supply-low", -+ "marker-supply-empty", -+ "cover-open", -+ "door-open", -+ "media-low", -+ "media-empty", -+ "offline", -+ "other" -+ }; -+/* Our translatable versions of the printer messages */ -+static const char * printer_strings[] = -+ { -+ N_("Printer '%s' is low on toner."), -+ N_("Printer '%s' has no toner left."), -+ /* Translators: "Developer" like on photo development context */ -+ N_("Printer '%s' is low on developer."), -+ /* Translators: "Developer" like on photo development context */ -+ N_("Printer '%s' is out of developer."), -+ /* Translators: "marker" is one color bin of the printer */ -+ N_("Printer '%s' is low on at least one marker supply."), -+ /* Translators: "marker" is one color bin of the printer */ -+ N_("Printer '%s' is out of at least one marker supply."), -+ N_("The cover is open on printer '%s'."), -+ N_("The door is open on printer '%s'."), -+ N_("Printer '%s' is low on paper."), -+ N_("Printer '%s' is out of paper."), -+ N_("Printer '%s' is currently offline."), -+ N_("There is a problem on printer '%s'.") -+ }; - - static void - cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, -@@ -1684,40 +1720,6 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - gint printer_state_reason_level = 0; /* 0 - none, 1 - report, 2 - warning, 3 - error */ - gboolean interested_in = FALSE; - gboolean found = FALSE; -- static const char * const reasons[] = /* Reasons we're interested in */ -- { -- "toner-low", -- "toner-empty", -- "developer-low", -- "developer-empty", -- "marker-supply-low", -- "marker-supply-empty", -- "cover-open", -- "door-open", -- "media-low", -- "media-empty", -- "offline", -- "other" -- }; -- static const char * reasons_descs[] = -- { -- N_("Printer '%s' is low on toner."), -- N_("Printer '%s' has no toner left."), -- /* Translators: "Developer" like on photo development context */ -- N_("Printer '%s' is low on developer."), -- /* Translators: "Developer" like on photo development context */ -- N_("Printer '%s' is out of developer."), -- /* Translators: "marker" is one color bin of the printer */ -- N_("Printer '%s' is low on at least one marker supply."), -- /* Translators: "marker" is one color bin of the printer */ -- N_("Printer '%s' is out of at least one marker supply."), -- N_("The cover is open on printer '%s'."), -- N_("The door is open on printer '%s'."), -- N_("Printer '%s' is low on paper."), -- N_("Printer '%s' is out of paper."), -- N_("Printer '%s' is currently offline."), -- N_("There is a problem on printer '%s'.") -- }; - gboolean is_paused = FALSE; - gboolean is_accepting_jobs = TRUE; - gboolean default_printer = FALSE; --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0003-Fix-double-free-introduced-in-f86dc163.patch b/modulesets/patches/0003-Fix-double-free-introduced-in-f86dc163.patch deleted file mode 100644 index d6db4a3..0000000 --- a/modulesets/patches/0003-Fix-double-free-introduced-in-f86dc163.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5c820fe22d7484f1f09ebe4c59491c1c5dde34d7 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Fri, 11 Oct 2013 10:40:26 -0700 -Subject: [PATCH 3/4] Fix double-free introduced in f86dc163 - ---- - gtk/gtkdnd-quartz.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c -index 1ec5db5..11a4855 100644 ---- a/gtk/gtkdnd-quartz.c -+++ b/gtk/gtkdnd-quartz.c -@@ -1263,7 +1263,7 @@ gtk_drag_begin_internal (GtkWidget *widget, - window = [(id)[nswindow contentView] gdkWindow]; - g_return_val_if_fail (nsevent != NULL, NULL); - -- context = gdk_drag_begin (window, target_list->list); -+ context = gdk_drag_begin (window, g_list_copy (target_list->list)); - g_return_val_if_fail (context != NULL, NULL); - - info = gtk_drag_get_source_info (context, TRUE); --- -1.8.3.rc0 - diff --git a/modulesets/patches/0003-gtk2-Create-enum-PrinterStateLevel.patch b/modulesets/patches/0003-gtk2-Create-enum-PrinterStateLevel.patch deleted file mode 100644 index 15d242d..0000000 --- a/modulesets/patches/0003-gtk2-Create-enum-PrinterStateLevel.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f11bc5f5e865950d4b2ed99c9a20332e5d2c5b0d Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 25 Feb 2012 17:45:04 -0800 -Subject: [PATCH 3/9] Create enum PrinterStateLevel - -Fixes "magic number" in printer_state_reason_level. ---- - modules/printbackends/cups/gtkprintbackendcups.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index 875c080..ed138fd 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -1716,6 +1716,13 @@ static const char * printer_strings[] = - N_("There is a problem on printer '%s'.") - }; - -+typedef enum -+ { -+ GTK_PRINTER_STATE_LEVEL_NONE = 0, -+ GTK_PRINTER_STATE_LEVEL_INFO = 1, -+ GTK_PRINTER_STATE_LEVEL_WARNING = 2, -+ GTK_PRINTER_STATE_LEVEL_ERROR = 3 -+ } PrinterStateLevel; - static void - cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - GtkCupsResult *result, --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0003-gtk3-Create-enum-PrinterStateLevel.patch b/modulesets/patches/0003-gtk3-Create-enum-PrinterStateLevel.patch deleted file mode 100644 index c76306d..0000000 --- a/modulesets/patches/0003-gtk3-Create-enum-PrinterStateLevel.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6333a3724e1e93b96077c0ce4eb3e01aeb6da453 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sun, 19 Feb 2012 13:15:40 -0800 -Subject: [PATCH 3/9] Create enum PrinterStateLevel - -Fixes "magic number" in printer_state_reason_level. ---- - modules/printbackends/cups/gtkprintbackendcups.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index 88c7137..fab3f40 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -1650,6 +1650,13 @@ static const char * printer_strings[] = - N_("There is a problem on printer '%s'.") - }; - -+typedef enum -+ { -+ GTK_PRINTER_STATE_LEVEL_NONE = 0, -+ GTK_PRINTER_STATE_LEVEL_INFO = 1, -+ GTK_PRINTER_STATE_LEVEL_WARNING = 2, -+ GTK_PRINTER_STATE_LEVEL_ERROR = 3 -+ } PrinterStateLevel; - static void - cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - GtkCupsResult *result, --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0003-quartz-NULL-check-on-default-keymap.patch b/modulesets/patches/0003-quartz-NULL-check-on-default-keymap.patch deleted file mode 100644 index cff1aa9..0000000 --- a/modulesets/patches/0003-quartz-NULL-check-on-default-keymap.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 041605bc50c7f06cb4aab5c3fd7c1189854c810c Mon Sep 17 00:00:00 2001 -From: Philip Chimento -Date: Tue, 27 Aug 2013 23:46:22 -0700 -Subject: [PATCH 3/5] [quartz] NULL check on default keymap - -Ensure that Quartz's default keymap is not accessed before it is -created. ---- - gdk/quartz/gdkkeys-quartz.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gdk/quartz/gdkkeys-quartz.c b/gdk/quartz/gdkkeys-quartz.c -index 8ecf79e..d2b5110 100644 ---- a/gdk/quartz/gdkkeys-quartz.c -+++ b/gdk/quartz/gdkkeys-quartz.c -@@ -492,7 +492,8 @@ update_keymap (void) - p[0] = known_numeric_keys[i].keypad_keyval; - } - -- g_signal_emit_by_name (default_keymap, "keys-changed"); -+ if (default_keymap != NULL) -+ g_signal_emit_by_name (default_keymap, "keys-changed"); - } - - static PangoDirection --- -1.7.12.4 (Apple Git-37) - diff --git a/modulesets/patches/0004-Bug-571582-GtkSelection-implementation-for-quartz.patch b/modulesets/patches/0004-Bug-571582-GtkSelection-implementation-for-quartz.patch deleted file mode 100644 index 0d8dbe9..0000000 --- a/modulesets/patches/0004-Bug-571582-GtkSelection-implementation-for-quartz.patch +++ /dev/null @@ -1,923 +0,0 @@ -From 6118cdb88497c5531e64886d51a96fd24a895c61 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sun, 26 Dec 2010 13:48:47 -0800 -Subject: [PATCH 04/15] Bug 571582: GtkSelection implementation for quartz. - ---- - gdk/quartz/gdkselection-quartz.c | 36 ++- - gtk/Makefile.am | 10 +- - gtk/gtkquartz.c | 1 + - gtk/gtkselection-quartz.c | 670 ++++++++++++++++++++++++++++++++++++++ - gtk/gtkselection.c | 14 +- - 5 files changed, 711 insertions(+), 20 deletions(-) - create mode 100644 gtk/gtkselection-quartz.c - -diff --git a/gdk/quartz/gdkselection-quartz.c b/gdk/quartz/gdkselection-quartz.c -index c327eb9..a51f567 100644 ---- a/gdk/quartz/gdkselection-quartz.c -+++ b/gdk/quartz/gdkselection-quartz.c -@@ -32,7 +32,8 @@ gdk_selection_owner_set_for_display (GdkDisplay *display, - guint32 time, - gint send_event) - { -- /* FIXME: Implement */ -+ g_print ("Not a valid interface on Quartz. Use GtkSelection.\n"); -+ g_return_val_if_reached(TRUE); - return TRUE; - } - -@@ -40,7 +41,7 @@ GdkWindow* - gdk_selection_owner_get_for_display (GdkDisplay *display, - GdkAtom selection) - { -- /* FIXME: Implement */ -+ /* Quartz doesn't have an X-selection, so it doesn't have a gdk_selection. */ - return NULL; - } - -@@ -50,7 +51,9 @@ gdk_selection_convert (GdkWindow *requestor, - GdkAtom target, - guint32 time) - { -- /* FIXME: Implement */ -+ g_print ("Not a valid interface on Quartz. Use GtkSelection.\n"); -+ g_return_if_reached(); -+ - } - - gint -@@ -59,7 +62,8 @@ gdk_selection_property_get (GdkWindow *requestor, - GdkAtom *ret_type, - gint *ret_format) - { -- /* FIXME: Implement */ -+ g_print ("Quartz windows do not support properties.\n"); -+ g_return_val_if_reached(-1); - return 0; - } - -@@ -71,7 +75,8 @@ gdk_selection_send_notify_for_display (GdkDisplay *display, - GdkAtom property, - guint32 time) - { -- /* FIXME: Implement */ -+ g_print ("Not a valid interface on Quartz. Use GtkSelection.\n"); -+ g_return_if_reached(); - } - - gint -@@ -82,8 +87,9 @@ gdk_text_property_to_text_list_for_display (GdkDisplay *display, - gint length, - gchar ***list) - { -- /* FIXME: Implement */ -- return 0; -+ /* text and utf8 are equivalent on OSX */ -+ return gdk_text_property_to_utf8_list_for_display (display, encoding, format, -+ text, length, list); - } - - gint -@@ -94,20 +100,21 @@ gdk_string_to_compound_text_for_display (GdkDisplay *display, - guchar **ctext, - gint *length) - { -- /* FIXME: Implement */ -+ *ctext = (guchar*)g_strdup (str); -+ *length = strlen (str); - return 0; - } - - void gdk_free_compound_text (guchar *ctext) - { -- /* FIXME: Implement */ -+ g_free (ctext); - } - - gchar * - gdk_utf8_to_string_target (const gchar *str) - { -- /* FIXME: Implement */ -- return NULL; -+ /* UTF8 is the standard string on OSX */ -+ return g_strdup (str); - } - - gboolean -@@ -118,8 +125,11 @@ gdk_utf8_to_compound_text_for_display (GdkDisplay *display, - guchar **ctext, - gint *length) - { -- /* FIXME: Implement */ -- return 0; -+ /* We don't use compound text on OSX, just stuff a copy of the string*/ -+ -+ *ctext = (guchar*)g_strdup (str); -+ *length = strlen (str); -+ return TRUE; - } - - void -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 78f4684..4794835 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -560,7 +560,6 @@ gtk_base_c_sources = \ - gtkscalebutton.c \ - gtkscrollbar.c \ - gtkscrolledwindow.c \ -- gtkselection.c \ - gtkseparator.c \ - gtkseparatormenuitem.c \ - gtkseparatortoolitem.c \ -@@ -759,10 +758,15 @@ endif - endif - - if USE_QUARTZ --gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c -+gtk_clipboard_dnd_c_sources = \ -+ gtkselection.c \ -+ gtkselection-quartz.c \ -+ gtkclipboard-quartz.c \ -+ gtkdnd-quartz.c \ -+ gtkquartz.c - gtk_clipboard_dnd_h_sources = gtkquartz.h - else --gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c -+gtk_clipboard_dnd_c_sources = gtkselection.c gtkclipboard.c gtkdnd.c - endif - EXTRA_DIST += gtkquartz.h - -diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c -index 5b54104..8ffeb0b 100644 ---- a/gtk/gtkquartz.c -+++ b/gtk/gtkquartz.c -@@ -271,6 +271,7 @@ _gtk_quartz_set_selection_data_for_pasteboard (NSPasteboard *pasteboard, - - type = target_to_pasteboard_type (target); - g_free (target); -+ g_return_if_fail (data != NULL); - - if ([type isEqualTo:NSStringPboardType]) - [pasteboard setString:[NSString stringWithUTF8String:(const char *)data] -diff --git a/gtk/gtkselection-quartz.c b/gtk/gtkselection-quartz.c -new file mode 100644 -index 0000000..1ce7d55 ---- /dev/null -+++ b/gtk/gtkselection-quartz.c -@@ -0,0 +1,670 @@ -+/* GTK - The GIMP Toolkit -+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+/* This file implements most of the work of the ICCCM selection protocol. -+ * The code was written after an intensive study of the equivalent part -+ * of John Ousterhout's Tk toolkit, and does many things in much the -+ * same way. -+ * -+ * The one thing in the ICCCM that isn't fully supported here (or in Tk) -+ * is side effects targets. For these to be handled properly, MULTIPLE -+ * targets need to be done in the order specified. This cannot be -+ * guaranteed with the way we do things, since if we are doing INCR -+ * transfers, the order will depend on the timing of the requestor. -+ * -+ * By Owen Taylor 8/16/97 -+ */ -+ -+/* Terminology note: when not otherwise specified, the term "incr" below -+ * refers to the _sending_ part of the INCR protocol. The receiving -+ * portion is referred to just as "retrieval". (Terminology borrowed -+ * from Tk, because there is no good opposite to "retrieval" in English. -+ * "send" can't be made into a noun gracefully and we're already using -+ * "emission" for something else ....) -+ */ -+ -+/* The MOTIF entry widget seems to ask for the TARGETS target, then -+ (regardless of the reply) ask for the TEXT target. It's slightly -+ possible though that it somehow thinks we are responding negatively -+ to the TARGETS request, though I don't really think so ... */ -+ -+/* -+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS -+ * file for a list of people on the GTK+ Team. See the ChangeLog -+ * files for a list of changes. These files are distributed with -+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. -+ */ -+ -+#include "config.h" -+#include -+#include -+#include "gdk.h" -+ -+#include "gtkmain.h" -+#include "gtkselection.h" -+#include "gtktextbufferrichtext.h" -+#include "gtkintl.h" -+#include "gdk-pixbuf/gdk-pixbuf.h" -+#include "gtkclipboard.h" -+ -+#import -+#include "gtkalias.h" -+ -+#undef DEBUG_SELECTION -+/* -+ * DON'T USE THIS INTERFACE: USE GTKCLIPBOARD INSTEAD! -+ * -+ * This is the Quartz version of gtkselection. Unlike the other -+ * versions, it was written in 2010, after most code was rewritten to -+ * use GtkClipboard. Quartz, unlike X11, is not a remote-capable -+ * display system, so most of ICCCM is pointless. This implementation -+ * can therefore be much simpler than the X11 implementation. Text is -+ * a lot simpler, too. It's UTF8. No compound text, no legacy -+ * charsets. There's also only one display, so instead of passing it -+ * around, we'll generally just use gdk_display_get_default() when we -+ * need it. -+ * -+ * There are two constraints: The existing code in various GtkWidgets -+ * which uses GDK_SELECTION_CLIPBOARD (which gtkclipboard-quartz sets -+ * to generalPasteboard) for c copies and GDK_SELECTION_PRIMARY -+ * (for which gtkclipboard-quartz creates a separate pasteboard) for -+ * X-style selection transfers, and Apple's X11 Quartz implementation -+ * which by default puts both on the generalPasteboard. We need to -+ * operate with both. -+ * -+ * IMPORTANT: There is no X11 magic in quartz. If you insist on using -+ * this interface (and you really shouldn't), your MUST connect to -+ * selection-get, selection-received, and selection-clear-event for -+ * your widget. -+ */ -+ -+/* Maximum size of a sent chunk, in bytes. Also the default size of -+ our buffers */ -+ -+ -+#define IDLE_ABORT_TIME 30 -+ -+enum { -+ INCR, -+ MULTIPLE, -+ TARGETS, -+ TIMESTAMP, -+ SAVE_TARGETS, -+ LAST_ATOM -+}; -+ -+typedef struct _GtkSelectionInfo GtkSelectionInfo; -+ -+struct _GtkSelectionInfo -+{ -+ GdkAtom selection; -+ GtkWidget *owner; /* widget that owns selection */ -+ guint32 time; /* time used to acquire selection */ -+}; -+ -+ -+/* Local Functions */ -+static void gtk_selection_get_cb (GtkClipboard *clipboard, -+ GtkSelectionData *data, -+ guint info, -+ gpointer widget); -+static void gtk_selection_clear_cb (GtkClipboard *clipboard, -+ gpointer widget); -+static void gtk_selection_default_handler (GtkWidget *widget, -+ GtkSelectionData *data); -+static int gtk_selection_bytes_per_item (gint format); -+static GtkSelectionInfo *gtk_selection_info_get (GdkAtom selection); -+static void gtk_selection_info_remove (GdkAtom selection, -+ GtkWidget *owner); -+static void gtk_selection_info_append (GdkAtom selection, -+ GtkWidget *owner, -+ guint32 time); -+static void gtk_selection_info_clear (GtkWidget *owner); -+static GtkTargetList *gtk_selection_target_list_get (GtkWidget *widget, -+ GdkAtom selection); -+static void gtk_selection_target_list_remove (GtkWidget *widget); -+ -+/* Local Data */ -+static gint initialize = TRUE; -+static GList *current_selections = NULL; -+ -+static GdkAtom gtk_selection_atoms[LAST_ATOM]; -+static const char gtk_selection_handler_key[] = "gtk-selection-handlers"; -+ -+static GtkTargetEntry default_target = {"UTF8_STRING", 0, 1}; -+ -+/** -+ * gtk_selection_owner_set_for_display: -+ * @display: the #Gdkdisplay where the selection is set -+ * @widget: (allow-none): new selection owner (a #GdkWidget), or %NULL. -+ * @selection: an interned atom representing the selection to claim. -+ * @time_: timestamp with which to claim the selection -+ * -+ * Claim ownership of a given selection for a particular widget, or, -+ * if @widget is %NULL, release ownership of the selection. -+ * -+ * Return value: TRUE if the operation succeeded -+ * -+ * Since: 2.2 -+ */ -+gboolean -+gtk_selection_owner_set_for_display (GdkDisplay *display, -+ GtkWidget *widget, -+ GdkAtom selection, -+ guint32 time) -+{ -+ GObject *old_owner; -+ GtkClipboard *clip = gtk_clipboard_get (selection); -+ GtkTargetEntry *targets = &default_target; -+ gint num_targets = 1; -+ GtkTargetList *tlist; -+ -+ g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE); -+ g_return_val_if_fail (selection != GDK_NONE, FALSE); -+ -+ old_owner = gtk_clipboard_get_owner (clip); -+ if (old_owner) -+ gtk_selection_info_remove (selection, GTK_WIDGET(old_owner)); -+ -+ if (widget == NULL) -+ return TRUE; -+ -+ g_return_val_if_fail (gtk_widget_get_display (widget) == display, FALSE); -+ -+ if ((tlist = gtk_selection_target_list_get (widget, selection)) != NULL) -+ targets = gtk_target_table_new_from_list (tlist, &num_targets); -+ -+ if (gtk_clipboard_set_with_owner (clip, targets, num_targets, -+ gtk_selection_get_cb, -+ gtk_selection_clear_cb, -+ G_OBJECT (widget))) -+ { -+ gtk_selection_info_append (selection, widget, GDK_CURRENT_TIME); -+ return TRUE; -+ } -+ return FALSE; -+} -+ -+ -+typedef struct _GtkSelectionTargetList GtkSelectionTargetList; -+ -+struct _GtkSelectionTargetList { -+ GdkAtom selection; -+ GtkTargetList *list; -+}; -+ -+/** -+ * gtk_selection_remove_all: -+ * @widget: a #GtkWidget -+ * -+ * Removes all handlers and unsets ownership of all -+ * selections for a widget. Called when widget is being -+ * destroyed. This function will not generally be -+ * called by applications. -+ **/ -+void -+gtk_selection_remove_all (GtkWidget *widget) -+{ -+ g_return_if_fail(widget == NULL || GTK_IS_WIDGET(widget)); -+ gtk_selection_info_clear (widget); -+ /* Remove all selection lists */ -+ gtk_selection_target_list_remove (widget); -+} -+ -+ -+/** -+ * gtk_selection_convert: -+ * @widget: The widget which acts as requestor -+ * @selection: Which selection to get -+ * @target: Form of information desired (e.g., STRING) -+ * @time_: Time of request (usually of triggering event) -+ In emergency, you could use #GDK_CURRENT_TIME -+ * -+ * Requests the contents of a selection. When received, -+ * a "selection-received" signal will be generated. -+ * -+ * Return value: %TRUE if requested succeeded. %FALSE if we could not process -+ * request. (e.g., there was already a request in process for -+ * this widget). -+ **/ -+gboolean -+gtk_selection_convert (GtkWidget *widget, -+ GdkAtom selection, -+ GdkAtom target, -+ guint32 time_) -+{ -+ GtkClipboard *clip = gtk_clipboard_get (selection); -+ GtkSelectionData *data; -+ -+ g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); -+ g_return_val_if_fail (selection != GDK_NONE, FALSE); -+ -+ data = gtk_clipboard_wait_for_contents (clip, target); -+ if (data == NULL) -+ return FALSE; -+ -+ g_signal_emit_by_name (widget, "selection-received", data, time); -+ -+ return TRUE; -+} -+ -+ -+/** -+ * gtk_selection_clear: -+ * @widget: a #GtkWidget -+ * @event: the event -+ * -+ * The default handler for the #GtkWidget::selection-clear-event -+ * signal. -+ * -+ * Return value: %TRUE if the event was handled, otherwise false -+ **/ -+gboolean -+gtk_selection_clear (GtkWidget *widget, -+ GdkEventSelection *event) -+{ -+ gtk_selection_clear_targets (widget, event->selection); -+ return FALSE; -+} -+ -+ -+/************************************************************* -+ * _gtk_selection_request: -+ * Handler for "selection_request_event" -+ * arguments: -+ * widget: -+ * event: -+ * results: -+ *************************************************************/ -+ -+gboolean -+_gtk_selection_request (GtkWidget *widget, -+ GdkEventSelection *event) -+{ -+ g_print ("Selection Request Events should not occur in quartz\n"); -+ return TRUE; -+} -+ -+/************************************************************* -+ * _gtk_selection_incr_event: -+ * Called whenever an PropertyNotify event occurs for an -+ * GdkWindow with user_data == NULL. These will be notifications -+ * that a window we are sending the selection to via the -+ * INCR protocol has deleted a property and is ready for -+ * more data. -+ * -+ * arguments: -+ * window: the requestor window -+ * event: the property event structure -+ * -+ * results: -+ *************************************************************/ -+ -+gboolean -+_gtk_selection_incr_event (GdkWindow *window, -+ GdkEventProperty *event) -+{ -+ g_print ("Selection_INCR_Events should not occur in quartz\n"); -+ return TRUE; -+} -+ -+/************************************************************* -+ * _gtk_selection_notify: -+ * Handler for "selection-notify-event" signals on windows -+ * where a retrieval is currently in process. The selection -+ * owner has responded to our conversion request. -+ * arguments: -+ * widget: Widget getting signal -+ * event: Selection event structure -+ * info: Information about this retrieval -+ * results: -+ * was event handled? -+ *************************************************************/ -+ -+gboolean -+_gtk_selection_notify (GtkWidget *widget, -+ GdkEventSelection *event) -+{ -+ g_print ("Selection_Notifications should not occur in quartz\n"); -+ -+ return TRUE; -+} -+ -+/************************************************************* -+ * _gtk_selection_property_notify: -+ * Handler for "property-notify-event" signals on windows -+ * where a retrieval is currently in process. The selection -+ * owner has added more data. -+ * arguments: -+ * widget: Widget getting signal -+ * event: Property event structure -+ * info: Information about this retrieval -+ * results: -+ * was event handled? -+ *************************************************************/ -+ -+gboolean -+_gtk_selection_property_notify (GtkWidget *widget, -+ GdkEventProperty *event) -+{ -+ g_print ("Selection_Property_Notifications should not occur in quartz\n"); -+ return TRUE; -+} -+ -+ -+/************************************************************* -+ * gtk_selection_get_cb() -+ * @clipboard: The clipboard requesting the data -+ * @data: Pass to selection-get signal; handlers should put requested -+ * data in the structure pointed to. -+ * @info: DND uses this on Windows and X11. It can be ignored for -+ * normal selection use. -+ * @owner: The window to which the information request is sent; it's -+ * the owner set with gtk_selection_owner_set_for_display. -+ * -+ * Emits a signal to the owner window to fill in the provided data structure. -+ *************************************************************/ -+/* GtkClipboardGetFunc */ -+static void -+gtk_selection_get_cb (GtkClipboard* clipboard, -+ GtkSelectionData *data, -+ guint info, -+ gpointer owner) -+{ -+ GtkTargetList *target_list; -+ GtkWidget *widget = GTK_WIDGET (owner); -+ -+ -+ g_return_if_fail (widget != NULL); -+ -+ target_list = gtk_selection_target_list_get (widget, data->selection); -+ -+ if ( data->target == gtk_selection_atoms[TIMESTAMP] || -+ data->target == gtk_selection_atoms[TARGETS] || -+ data->target == gtk_selection_atoms[SAVE_TARGETS]) -+ { -+ gtk_selection_default_handler (widget, data); -+ return; -+ } -+ if (target_list && -+ gtk_target_list_find (target_list, data->target, &info)) -+ { -+ g_signal_emit_by_name (widget, -+ "selection-get", -+ data, -+ info, time); -+ } -+} -+ -+static void -+gtk_selection_clear_cb (GtkClipboard* clipboard, -+ gpointer owner) -+{ -+ GtkWidget *widget = GTK_WIDGET (owner); -+ GdkEventSelection event; -+ event.type = GDK_SELECTION_CLEAR; -+ event.selection = GDK_SELECTION_PRIMARY; -+ event.window = gtk_widget_get_window(widget); -+ g_signal_emit_by_name (widget, -+ "selection-clear-event", -+ &event, -+ NULL); -+} -+ -+/************************************************************* -+ * gtk_selection_default_handler: -+ * Handles some default targets that exist for any widget -+ * If it can't fit results into buffer, returns -1. This -+ * won't happen in any conceivable case, since it would -+ * require 1000 selection targets! -+ * -+ * arguments: -+ * widget: selection owner -+ * data: selection data [INOUT] -+ * -+ *************************************************************/ -+ -+static void -+gtk_selection_default_handler (GtkWidget *widget, -+ GtkSelectionData *data) -+{ -+ if (data->target == gtk_selection_atoms[TIMESTAMP]) -+ { -+ /* Time which was used to obtain selection */ -+ GList *tmp_list; -+ GtkSelectionInfo *selection_info; -+ -+ tmp_list = current_selections; -+ while (tmp_list) -+ { -+ selection_info = (GtkSelectionInfo *)tmp_list->data; -+ if ((selection_info->owner == widget) && -+ (selection_info->selection == data->selection)) -+ { -+ gulong time = selection_info->time; -+ -+ gtk_selection_data_set (data, -+ GDK_SELECTION_TYPE_INTEGER, -+ 32, -+ (guchar *)&time, -+ sizeof (time)); -+ return; -+ } -+ -+ tmp_list = tmp_list->next; -+ } -+ -+ data->length = -1; -+ } -+ else if (data->target == gtk_selection_atoms[TARGETS]) -+ { -+ /* List of all targets supported for this widget/selection pair */ -+ GdkAtom *p; -+ guint count; -+ GList *tmp_list; -+ GtkTargetList *target_list; -+ GtkTargetPair *pair; -+ -+ target_list = gtk_selection_target_list_get (widget, -+ data->selection); -+ count = g_list_length (target_list->list) + 3; -+ -+ data->type = GDK_SELECTION_TYPE_ATOM; -+ data->format = 32; -+ data->length = count * sizeof (GdkAtom); -+ -+ /* selection data is always terminated by a trailing \0 -+ */ -+ p = g_malloc (data->length + 1); -+ data->data = (guchar *)p; -+ data->data[data->length] = '\0'; -+ -+ *p++ = gtk_selection_atoms[TIMESTAMP]; -+ *p++ = gtk_selection_atoms[TARGETS]; -+ *p++ = gtk_selection_atoms[MULTIPLE]; -+ -+ tmp_list = target_list->list; -+ while (tmp_list) -+ { -+ pair = (GtkTargetPair *)tmp_list->data; -+ *p++ = pair->target; -+ -+ tmp_list = tmp_list->next; -+ } -+ } -+ else if (data->target == gtk_selection_atoms[SAVE_TARGETS]) -+ { -+ gtk_selection_data_set (data, -+ gdk_atom_intern_static_string ("NULL"), -+ 32, NULL, 0); -+ } -+ else -+ { -+ data->length = -1; -+ } -+} -+ -+static GtkSelectionInfo * -+gtk_selection_info_get (GdkAtom selection) -+{ -+ GList *tmp_list; -+ GList *next; -+ GtkSelectionInfo *selection_info; -+ -+ tmp_list = current_selections; -+ while (tmp_list) -+ { -+ next = tmp_list->next; -+ selection_info = (GtkSelectionInfo *)tmp_list->data; -+ -+ if (selection_info->selection == selection) -+ { -+ return selection_info; -+ } -+ -+ tmp_list = next; -+ } -+ return NULL; -+} -+ -+static void -+gtk_selection_info_remove (GdkAtom selection, GtkWidget *owner) -+{ -+ GList *tmp_list; -+ GList *next; -+ GtkSelectionInfo *selection_info; -+ -+ g_return_if_fail (GTK_IS_WIDGET (owner)); -+ -+ tmp_list = current_selections; -+ while (tmp_list) -+ { -+ next = tmp_list->next; -+ selection_info = (GtkSelectionInfo *)tmp_list->data; -+ -+ if (selection_info->selection == selection && -+ selection_info->owner == owner) -+ { -+ GtkClipboard *clip = gtk_clipboard_get(selection_info->selection); -+ gtk_clipboard_clear(clip); -+ current_selections = g_list_remove_link (current_selections, -+ tmp_list); -+ g_list_free (tmp_list); -+ g_slice_free (GtkSelectionInfo, selection_info); -+ return; -+ } -+ -+ tmp_list = next; -+ } -+} -+static void -+gtk_selection_info_append (GdkAtom selection, GtkWidget *owner, guint32 time) -+{ -+ GtkSelectionInfo *selection_info; -+ -+ g_return_if_fail (GTK_IS_WIDGET (owner)); -+ -+ selection_info = g_slice_new (GtkSelectionInfo); -+ selection_info->selection = selection; -+ selection_info->owner = owner; -+ selection_info->time = time; -+ current_selections = g_list_prepend (current_selections, -+ selection_info); -+} -+ -+static void -+gtk_selection_info_clear (GtkWidget *owner) -+{ -+ GList *tmp_list; -+ GList *next; -+ GtkSelectionInfo *selection_info; -+ -+ g_return_if_fail (GTK_IS_WIDGET (owner)); -+ -+ tmp_list = current_selections; -+ while (tmp_list) -+ { -+ next = tmp_list->next; -+ selection_info = (GtkSelectionInfo *)tmp_list->data; -+ -+ if (selection_info->owner == owner) -+ { -+ current_selections = g_list_remove_link (current_selections, -+ tmp_list); -+ g_list_free (tmp_list); -+ g_slice_free (GtkSelectionInfo, selection_info); -+ } -+ -+ tmp_list = next; -+ } -+} -+ -+static GtkTargetList * -+gtk_selection_target_list_get (GtkWidget *widget, -+ GdkAtom selection) -+{ -+ GtkSelectionTargetList *sellist; -+ GList *tmp_list; -+ GList *lists; -+ -+ lists = g_object_get_data (G_OBJECT (widget), gtk_selection_handler_key); -+ -+ tmp_list = lists; -+ while (tmp_list) -+ { -+ sellist = tmp_list->data; -+ if (sellist->selection == selection) -+ return sellist->list; -+ tmp_list = tmp_list->next; -+ } -+ -+ sellist = g_slice_new (GtkSelectionTargetList); -+ sellist->selection = selection; -+ sellist->list = gtk_target_list_new (NULL, 0); -+ -+ lists = g_list_prepend (lists, sellist); -+ g_object_set_data (G_OBJECT (widget), I_(gtk_selection_handler_key), lists); -+ -+ return sellist->list; -+} -+ -+static void -+gtk_selection_target_list_remove (GtkWidget *widget) -+{ -+ GtkSelectionTargetList *sellist; -+ GList *tmp_list; -+ GList *lists; -+ -+ lists = g_object_get_data (G_OBJECT (widget), gtk_selection_handler_key); -+ -+ tmp_list = lists; -+ while (tmp_list) -+ { -+ sellist = tmp_list->data; -+ -+ gtk_target_list_unref (sellist->list); -+ -+ g_slice_free (GtkSelectionTargetList, sellist); -+ tmp_list = tmp_list->next; -+ } -+ -+ g_list_free (lists); -+ g_object_set_data (G_OBJECT (widget), I_(gtk_selection_handler_key), NULL); -+} -+ -diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c -index c2c9d97..01774dc 100644 ---- a/gtk/gtkselection.c -+++ b/gtk/gtkselection.c -@@ -633,6 +633,7 @@ gtk_target_table_free (GtkTargetEntry *targets, - g_free (targets); - } - -+#ifndef GDK_WINDOWING_QUARTZ /* Quartz handled by gtkselection-quartz.c */ - /** - * gtk_selection_owner_set_for_display: - * @display: the #Gdkdisplay where the selection is set -@@ -735,7 +736,7 @@ gtk_selection_owner_set_for_display (GdkDisplay *display, - else - return FALSE; - } -- -+#endif /* GDK_WINDOWING_QUARTZ */ - /** - * gtk_selection_owner_set: - * @widget: (allow-none): a #GtkWidget, or %NULL. -@@ -937,7 +938,7 @@ gtk_selection_add_targets (GtkWidget *widget, - #endif - } - -- -+#ifndef GDK_WINDOWING_QUARTZ /* Quartz is handled in gtkselection-quartz.c */ - /** - * gtk_selection_remove_all: - * @widget: a #GtkWidget -@@ -998,8 +999,9 @@ gtk_selection_remove_all (GtkWidget *widget) - /* Remove all selection lists */ - gtk_selection_target_list_remove (widget); - } -+#endif /* GDK_WINDOWING_QUARTZ */ - -- -+#ifndef GDK_WINDOWING_QUARTZ /* Quartz is handled in gtkselection-quartz.c */ - /** - * gtk_selection_convert: - * @widget: The widget which acts as requestor -@@ -1111,7 +1113,7 @@ gtk_selection_convert (GtkWidget *widget, - - return TRUE; - } -- -+#endif /* GDK_WINDOWING_QUARTZ */ - /** - * gtk_selection_data_get_selection: - * @selection_data: a pointer to a #GtkSelectionData structure. -@@ -2184,6 +2186,7 @@ gtk_selection_init (void) - initialize = FALSE; - } - -+#ifndef GDK_WINDOWING_QUARTZ /* Quartz handled by gtkselection-quartz.c */ - /** - * gtk_selection_clear: - * @widget: a #GtkWidget -@@ -2622,6 +2625,7 @@ _gtk_selection_incr_event (GdkWindow *window, - - return TRUE; - } -+#endif /* GDK_WINDOWING_QUARTZ */ - - /************************************************************* - * gtk_selection_incr_timeout: -@@ -2676,6 +2680,7 @@ gtk_selection_incr_timeout (GtkIncrInfo *info) - return retval; - } - -+#ifndef GDK_WINDOWING_QUARTZ /* Quartz handled by gtkselection-quartz.c */ - /************************************************************* - * _gtk_selection_notify: - * Handler for "selection-notify-event" signals on windows -@@ -2869,6 +2874,7 @@ _gtk_selection_property_notify (GtkWidget *widget, - - return TRUE; - } -+#endif /* GDK_WINDOWING_QUARTZ */ - - /************************************************************* - * gtk_selection_retrieval_timeout: --- -1.7.6.3.dirty - diff --git a/modulesets/patches/0004-Ensure-src-and-dest-are-GdkWindows-in-_gdk_sythesize.patch b/modulesets/patches/0004-Ensure-src-and-dest-are-GdkWindows-in-_gdk_sythesize.patch deleted file mode 100644 index d6b2444..0000000 --- a/modulesets/patches/0004-Ensure-src-and-dest-are-GdkWindows-in-_gdk_sythesize.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3ca7cfe29b62883d7cfe736216deadfe35c9116c Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Fri, 11 Oct 2013 10:40:50 -0700 -Subject: [PATCH 4/4] Ensure src and dest are GdkWindows in - _gdk_sythesize_crossing_events - -Discovered via a crash because b's (dest's) toplevel was NULL; -ensuring that the dest is actually a GdkWindow or setting b to NULL -prevents that path from being taken. ---- - gdk/gdkwindow.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c -index 7437552..ee10901 100644 ---- a/gdk/gdkwindow.c -+++ b/gdk/gdkwindow.c -@@ -7570,8 +7570,9 @@ _gdk_synthesize_crossing_events (GdkDisplay *display, - - /* TODO: Don't send events to toplevel, as we get those from the windowing system */ - -- a = src; -- b = dest; -+ a = (src && GDK_IS_WINDOW (src)) ? src : NULL; -+ b = (dest && GDK_IS_WINDOW (dest)) ? dest : NULL; -+ - if (src == dest) - return; /* No crossings generated between src and dest */ - --- -1.8.3.rc0 - diff --git a/modulesets/patches/0004-gtk2-Extract-printer-setup-variables-into-a-struct.patch b/modulesets/patches/0004-gtk2-Extract-printer-setup-variables-into-a-struct.patch deleted file mode 100644 index b9ef8c8..0000000 --- a/modulesets/patches/0004-gtk2-Extract-printer-setup-variables-into-a-struct.patch +++ /dev/null @@ -1,256 +0,0 @@ -From d72449b440363b0d1d06823fbf704f5ef8cd1717 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 25 Feb 2012 17:47:19 -0800 -Subject: [PATCH 4/9] Extract printer setup variables into a struct - -So that it can be passed as a single parameter to functions as we -extract-function to make cups_request_printer_list_cb more manageable. - -Note that not all of the affected variables are changed in this -changeset. Those are in extracted functions and will be addressed in the -next two changes. ---- - modules/printbackends/cups/gtkprintbackendcups.c | 123 ++++++++++++---------- - 1 files changed, 67 insertions(+), 56 deletions(-) - -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index ed138fd..5ec918c 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -1723,6 +1723,28 @@ typedef enum - GTK_PRINTER_STATE_LEVEL_WARNING = 2, - GTK_PRINTER_STATE_LEVEL_ERROR = 3 - } PrinterStateLevel; -+ -+typedef struct -+{ -+ const gchar *printer_name; -+ const gchar *printer_uri; -+ const gchar *member_uris; -+ const gchar *location; -+ const gchar *description; -+ const gchar *state_msg; -+ const gchar *reason_msg; -+ PrinterStateLevel reason_level; -+ gint state; -+ gint job_count; -+ gboolean is_paused; -+ gboolean is_accepting_jobs; -+ const gchar *default_cover_before; -+ const gchar *default_cover_after; -+ gboolean default_printer; -+ gboolean got_printer_type; -+ gboolean remote_printer; -+ gchar **auth_info_required; -+} PrinterSetupInfo; - static void - cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - GtkCupsResult *result, -@@ -1775,32 +1797,14 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - for (attr = response->attrs; attr != NULL; attr = attr->next) - { - GtkPrinter *printer; -- const gchar *printer_name = NULL; -- const gchar *printer_uri = NULL; -- const gchar *member_uris = NULL; -- const gchar *location = NULL; -- const gchar *description = NULL; -- const gchar *state_msg = NULL; -- gint state = 0; -- gint job_count = 0; - gboolean status_changed = FALSE; - GList *node; - gint i,j; -- const gchar *reason_msg = NULL; - gchar *reason_msg_desc = NULL; - gchar *tmp_msg = NULL; - gchar *tmp_msg2 = NULL; -- gint printer_state_reason_level = 0; /* 0 - none, 1 - report, 2 - warning, 3 - error */ -- gboolean interested_in = FALSE; - gboolean found = FALSE; -- gboolean is_paused = FALSE; -- gboolean is_accepting_jobs = TRUE; -- gboolean default_printer = FALSE; -- gboolean got_printer_type = FALSE; -- const gchar *default_cover_before = NULL; -- const gchar *default_cover_after = NULL; -- gboolean remote_printer = FALSE; -- gchar **auth_info_required = NULL; -+ PrinterSetupInfo *info = g_slice_new0 (PrinterSetupInfo); - - /* Skip leading attributes until we hit a printer... - */ -@@ -1937,8 +1941,8 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - attr = attr->next; - } - -- if (printer_name == NULL || -- (printer_uri == NULL && member_uris == NULL)) -+ if (info->printer_name == NULL || -+ (info->printer_uri == NULL && info->member_uris == NULL)) - { - if (attr == NULL) - break; -@@ -1946,19 +1950,19 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - continue; - } - -- if (got_printer_type) -+ if (info->got_printer_type) - { -- if (default_printer && !cups_backend->got_default_printer) -+ if (info->default_printer && !cups_backend->got_default_printer) - { -- if (!remote_printer) -+ if (!info->remote_printer) - { - cups_backend->got_default_printer = TRUE; -- cups_backend->default_printer = g_strdup (printer_name); -+ cups_backend->default_printer = g_strdup (info->printer_name); - } - else - { - if (remote_default_printer == NULL) -- remote_default_printer = g_strdup (printer_name); -+ remote_default_printer = g_strdup (info->printer_name); - } - } - } -@@ -1969,10 +1973,13 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - } - - /* remove name from checklist if it was found */ -- node = g_list_find_custom (removed_printer_checklist, printer_name, (GCompareFunc) find_printer); -- removed_printer_checklist = g_list_delete_link (removed_printer_checklist, node); -+ node = g_list_find_custom (removed_printer_checklist, -+ info->printer_name, -+ (GCompareFunc) find_printer); -+ removed_printer_checklist = g_list_delete_link (removed_printer_checklist, -+ node); - -- printer = gtk_print_backend_find_printer (backend, printer_name); -+ printer = gtk_print_backend_find_printer (backend, info->printer_name); - if (!printer) - { - GtkPrinterCups *cups_printer; -@@ -2064,10 +2071,10 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - else - g_object_ref (printer); - -- GTK_PRINTER_CUPS (printer)->remote = remote_printer; -+ GTK_PRINTER_CUPS (printer)->remote = info->remote_printer; - -- gtk_printer_set_is_paused (printer, is_paused); -- gtk_printer_set_is_accepting_jobs (printer, is_accepting_jobs); -+ gtk_printer_set_is_paused (printer, info->is_paused); -+ gtk_printer_set_is_accepting_jobs (printer, info->is_accepting_jobs); - - if (!gtk_printer_is_active (printer)) - { -@@ -2090,57 +2097,60 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - cups_request_printer_info (cups_backend, gtk_printer_get_name (printer)); - #endif - -- GTK_PRINTER_CUPS (printer)->state = state; -- status_changed = gtk_printer_set_job_count (printer, job_count); -- status_changed |= gtk_printer_set_location (printer, location); -- status_changed |= gtk_printer_set_description (printer, description); -+ GTK_PRINTER_CUPS (printer)->state = info->state; -+ status_changed = gtk_printer_set_job_count (printer, info->job_count); -+ status_changed |= gtk_printer_set_location (printer, info->location); -+ status_changed |= gtk_printer_set_description (printer, -+ info->description); - -- if (state_msg != NULL && strlen (state_msg) == 0) -+ if (info->state_msg != NULL && strlen (info->state_msg) == 0) - { -- if (is_paused && !is_accepting_jobs) -+ if (info->is_paused && !info->is_accepting_jobs) - /* Translators: this is a printer status. */ - tmp_msg2 = g_strdup ( N_("Paused ; Rejecting Jobs")); -- if (is_paused && is_accepting_jobs) -+ if (info->is_paused && info->is_accepting_jobs) - /* Translators: this is a printer status. */ - tmp_msg2 = g_strdup ( N_("Paused")); -- if (!is_paused && !is_accepting_jobs) -+ if (!info->is_paused && !info->is_accepting_jobs) - /* Translators: this is a printer status. */ - tmp_msg2 = g_strdup ( N_("Rejecting Jobs")); - - if (tmp_msg2 != NULL) -- state_msg = tmp_msg2; -+ info->state_msg = tmp_msg2; - } - - /* Set description of the reason and combine it with printer-state-message. */ -- if ( (reason_msg != NULL)) -+ if ( (info->reason_msg != NULL)) - { -- for (i = 0; i < G_N_ELEMENTS (reasons); i++) -+ for (i = 0; i < G_N_ELEMENTS (printer_messages); i++) - { -- if (strncmp (reason_msg, reasons[i], strlen (reasons[i])) == 0) -+ if (strncmp (info->reason_msg, printer_messages[i], -+ strlen (printer_messages[i])) == 0) - { -- reason_msg_desc = g_strdup_printf (reasons_descs[i], printer_name); -+ reason_msg_desc = g_strdup_printf (printer_strings[i], -+ info->printer_name); - found = TRUE; - break; - } - } - - if (!found) -- printer_state_reason_level = 0; -+ info->reason_level = GTK_PRINTER_STATE_LEVEL_NONE; - -- if (printer_state_reason_level >= 2) -+ if (info->reason_level >= GTK_PRINTER_STATE_LEVEL_WARNING) - { -- if (strlen (state_msg) == 0) -- state_msg = reason_msg_desc; -+ if (strlen (info->state_msg) == 0) -+ info->state_msg = reason_msg_desc; - else - { -- tmp_msg = g_strjoin (" ; ", state_msg, reason_msg_desc, NULL); -- state_msg = tmp_msg; -+ tmp_msg = g_strjoin (" ; ", info->state_msg, reason_msg_desc, NULL); -+ info->state_msg = tmp_msg; - } - } - } - -- status_changed |= gtk_printer_set_state_message (printer, state_msg); -- status_changed |= gtk_printer_set_is_accepting_jobs (printer, is_accepting_jobs); -+ status_changed |= gtk_printer_set_state_message (printer, info->state_msg); -+ status_changed |= gtk_printer_set_is_accepting_jobs (printer, info->is_accepting_jobs); - - if (tmp_msg != NULL) - g_free (tmp_msg); -@@ -2153,9 +2163,9 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - - /* Set printer icon according to importance - (none, report, warning, error - report is omitted). */ -- if (printer_state_reason_level == 3) -+ if (info->reason_level == 3) - gtk_printer_set_icon_name (printer, "gtk-print-error"); -- else if (printer_state_reason_level == 2) -+ else if (info->reason_level == 2) - gtk_printer_set_icon_name (printer, "gtk-print-warning"); - else if (gtk_printer_is_paused (printer)) - gtk_printer_set_icon_name (printer, "gtk-print-paused"); -@@ -2168,7 +2178,8 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - - /* The ref is held by GtkPrintBackend, in add_printer() */ - g_object_unref (printer); -- -+ g_slice_free (PrinterSetupInfo, info); -+ - if (attr == NULL) - break; - } --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0004-gtk3-Extract-printer-setup-variables-into-a-struct.patch b/modulesets/patches/0004-gtk3-Extract-printer-setup-variables-into-a-struct.patch deleted file mode 100644 index df3b9fc..0000000 --- a/modulesets/patches/0004-gtk3-Extract-printer-setup-variables-into-a-struct.patch +++ /dev/null @@ -1,253 +0,0 @@ -From 766446e4948f7e764902b58f21e6a74c29f4348d Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sun, 19 Feb 2012 13:19:11 -0800 -Subject: [PATCH 4/9] Extract printer setup variables into a struct - -So that it can be passed as a single parameter to functions as we extract-function to make cups_request_printer_list_cb more manageable. - -Note that not all of the affected variables are changed in this changeset. Those are in extracted functions and will be addressed in the next two changes. ---- - modules/printbackends/cups/gtkprintbackendcups.c | 123 ++++++++++++---------- - 1 files changed, 67 insertions(+), 56 deletions(-) - -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index fab3f40..17f3ddc 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -1657,6 +1657,28 @@ typedef enum - GTK_PRINTER_STATE_LEVEL_WARNING = 2, - GTK_PRINTER_STATE_LEVEL_ERROR = 3 - } PrinterStateLevel; -+ -+typedef struct -+{ -+ const gchar *printer_name; -+ const gchar *printer_uri; -+ const gchar *member_uris; -+ const gchar *location; -+ const gchar *description; -+ const gchar *state_msg; -+ const gchar *reason_msg; -+ PrinterStateLevel reason_level; -+ gint state; -+ gint job_count; -+ gboolean is_paused; -+ gboolean is_accepting_jobs; -+ const gchar *default_cover_before; -+ const gchar *default_cover_after; -+ gboolean default_printer; -+ gboolean got_printer_type; -+ gboolean remote_printer; -+ gchar **auth_info_required; -+} PrinterSetupInfo; - static void - cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - GtkCupsResult *result, -@@ -1709,32 +1731,14 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - for (attr = response->attrs; attr != NULL; attr = attr->next) - { - GtkPrinter *printer; -- const gchar *printer_name = NULL; -- const gchar *printer_uri = NULL; -- const gchar *member_uris = NULL; -- const gchar *location = NULL; -- const gchar *description = NULL; -- const gchar *state_msg = NULL; -- gint state = 0; -- gint job_count = 0; - gboolean status_changed = FALSE; - GList *node; - gint i,j; -- const gchar *reason_msg = NULL; - gchar *reason_msg_desc = NULL; - gchar *tmp_msg = NULL; - gchar *tmp_msg2 = NULL; -- gint printer_state_reason_level = 0; /* 0 - none, 1 - report, 2 - warning, 3 - error */ -- gboolean interested_in = FALSE; - gboolean found = FALSE; -- gboolean is_paused = FALSE; -- gboolean is_accepting_jobs = TRUE; -- gboolean default_printer = FALSE; -- gboolean got_printer_type = FALSE; -- gchar *default_cover_before = NULL; -- gchar *default_cover_after = NULL; -- gboolean remote_printer = FALSE; -- gchar **auth_info_required = NULL; -+ PrinterSetupInfo *info = g_slice_new0 (PrinterSetupInfo); - - /* Skip leading attributes until we hit a printer... - */ -@@ -1871,8 +1875,8 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - attr = attr->next; - } - -- if (printer_name == NULL || -- (printer_uri == NULL && member_uris == NULL)) -+ if (info->printer_name == NULL || -+ (info->printer_uri == NULL && info->member_uris == NULL)) - { - if (attr == NULL) - break; -@@ -1880,19 +1884,19 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - continue; - } - -- if (got_printer_type) -+ if (info->got_printer_type) - { -- if (default_printer && !cups_backend->got_default_printer) -+ if (info->default_printer && !cups_backend->got_default_printer) - { -- if (!remote_printer) -+ if (!info->remote_printer) - { - cups_backend->got_default_printer = TRUE; -- cups_backend->default_printer = g_strdup (printer_name); -+ cups_backend->default_printer = g_strdup (info->printer_name); - } - else - { - if (remote_default_printer == NULL) -- remote_default_printer = g_strdup (printer_name); -+ remote_default_printer = g_strdup (info->printer_name); - } - } - } -@@ -1903,10 +1907,13 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - } - - /* remove name from checklist if it was found */ -- node = g_list_find_custom (removed_printer_checklist, printer_name, (GCompareFunc) find_printer); -- removed_printer_checklist = g_list_delete_link (removed_printer_checklist, node); -+ node = g_list_find_custom (removed_printer_checklist, -+ info->printer_name, -+ (GCompareFunc) find_printer); -+ removed_printer_checklist = g_list_delete_link (removed_printer_checklist, -+ node); - -- printer = gtk_print_backend_find_printer (backend, printer_name); -+ printer = gtk_print_backend_find_printer (backend, info->printer_name); - if (!printer) - { - GtkPrinterCups *cups_printer; -@@ -2003,10 +2007,10 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - else - g_object_ref (printer); - -- GTK_PRINTER_CUPS (printer)->remote = remote_printer; -+ GTK_PRINTER_CUPS (printer)->remote = info->remote_printer; - -- gtk_printer_set_is_paused (printer, is_paused); -- gtk_printer_set_is_accepting_jobs (printer, is_accepting_jobs); -+ gtk_printer_set_is_paused (printer, info->is_paused); -+ gtk_printer_set_is_accepting_jobs (printer, info->is_accepting_jobs); - - if (!gtk_printer_is_active (printer)) - { -@@ -2031,57 +2035,60 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - cups_request_printer_info (cups_backend, gtk_printer_get_name (printer)); - #endif - -- GTK_PRINTER_CUPS (printer)->state = state; -- status_changed = gtk_printer_set_job_count (printer, job_count); -- status_changed |= gtk_printer_set_location (printer, location); -- status_changed |= gtk_printer_set_description (printer, description); -+ GTK_PRINTER_CUPS (printer)->state = info->state; -+ status_changed = gtk_printer_set_job_count (printer, info->job_count); -+ status_changed |= gtk_printer_set_location (printer, info->location); -+ status_changed |= gtk_printer_set_description (printer, -+ info->description); - -- if (state_msg != NULL && strlen (state_msg) == 0) -+ if (info->state_msg != NULL && strlen (info->state_msg) == 0) - { -- if (is_paused && !is_accepting_jobs) -+ if (info->is_paused && !info->is_accepting_jobs) - /* Translators: this is a printer status. */ - tmp_msg2 = g_strdup ( N_("Paused ; Rejecting Jobs")); -- if (is_paused && is_accepting_jobs) -+ if (info->is_paused && info->is_accepting_jobs) - /* Translators: this is a printer status. */ - tmp_msg2 = g_strdup ( N_("Paused")); -- if (!is_paused && !is_accepting_jobs) -+ if (!info->is_paused && !info->is_accepting_jobs) - /* Translators: this is a printer status. */ - tmp_msg2 = g_strdup ( N_("Rejecting Jobs")); - - if (tmp_msg2 != NULL) -- state_msg = tmp_msg2; -+ info->state_msg = tmp_msg2; - } - - /* Set description of the reason and combine it with printer-state-message. */ -- if ( (reason_msg != NULL)) -+ if ( (info->reason_msg != NULL)) - { -- for (i = 0; i < G_N_ELEMENTS (reasons); i++) -+ for (i = 0; i < G_N_ELEMENTS (printer_messages); i++) - { -- if (strncmp (reason_msg, reasons[i], strlen (reasons[i])) == 0) -+ if (strncmp (info->reason_msg, printer_messages[i], -+ strlen (printer_messages[i])) == 0) - { -- reason_msg_desc = g_strdup_printf (reasons_descs[i], printer_name); -+ reason_msg_desc = g_strdup_printf (printer_strings[i], -+ info->printer_name); - found = TRUE; - break; - } - } - - if (!found) -- printer_state_reason_level = 0; -+ info->reason_level = GTK_PRINTER_STATE_LEVEL_NONE; - -- if (printer_state_reason_level >= 2) -+ if (info->reason_level >= GTK_PRINTER_STATE_LEVEL_WARNING) - { -- if (strlen (state_msg) == 0) -- state_msg = reason_msg_desc; -+ if (strlen (info->state_msg) == 0) -+ info->state_msg = reason_msg_desc; - else - { -- tmp_msg = g_strjoin (" ; ", state_msg, reason_msg_desc, NULL); -- state_msg = tmp_msg; -+ tmp_msg = g_strjoin (" ; ", info->state_msg, reason_msg_desc, NULL); -+ info->state_msg = tmp_msg; - } - } - } - -- status_changed |= gtk_printer_set_state_message (printer, state_msg); -- status_changed |= gtk_printer_set_is_accepting_jobs (printer, is_accepting_jobs); -+ status_changed |= gtk_printer_set_state_message (printer, info->state_msg); -+ status_changed |= gtk_printer_set_is_accepting_jobs (printer, info->is_accepting_jobs); - - if (tmp_msg != NULL) - g_free (tmp_msg); -@@ -2093,9 +2103,9 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - - /* Set printer icon according to importance - (none, report, warning, error - report is omitted). */ -- if (printer_state_reason_level == 3) -+ if (info->reason_level == GTK_PRINTER_STATE_LEVEL_ERROR) - gtk_printer_set_icon_name (printer, "printer-error"); -- else if (printer_state_reason_level == 2) -+ else if (info->reason_level == GTK_PRINTER_STATE_LEVEL_WARNING) - gtk_printer_set_icon_name (printer, "printer-warning"); - else if (gtk_printer_is_paused (printer)) - gtk_printer_set_icon_name (printer, "printer-paused"); -@@ -2108,7 +2118,8 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - - /* The ref is held by GtkPrintBackend, in add_printer() */ - g_object_unref (printer); -- -+ g_slice_free (PrinterSetupInfo, info); -+ - if (attr == NULL) - break; - } --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0005-gtk2-Extract-function-cups_printer_handle_attribute.patch b/modulesets/patches/0005-gtk2-Extract-function-cups_printer_handle_attribute.patch deleted file mode 100644 index 4410729..0000000 --- a/modulesets/patches/0005-gtk2-Extract-function-cups_printer_handle_attribute.patch +++ /dev/null @@ -1,282 +0,0 @@ -From ce133d00fdb641ea53edb385567d863730b10813 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 25 Feb 2012 17:48:06 -0800 -Subject: [PATCH 5/9] Extract function cups_printer_handle_attribute - ---- - modules/printbackends/cups/gtkprintbackendcups.c | 252 +++++++++++----------- - 1 files changed, 130 insertions(+), 122 deletions(-) - -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index 5ec918c..8bd68bc 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -1745,6 +1745,135 @@ typedef struct - gboolean remote_printer; - gchar **auth_info_required; - } PrinterSetupInfo; -+ -+static void -+cups_printer_handle_attribute (GtkPrintBackendCups *cups_backend, -+ ipp_attribute_t *attr, -+ PrinterSetupInfo *info) -+{ -+ gint i,j; -+ -+ if (strcmp (ippGetName (attr), "printer-name") == 0 && -+ ippGetValueTag (attr) == IPP_TAG_NAME) -+ info->printer_name = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-uri-supported") == 0 && -+ ippGetValueTag (attr) == IPP_TAG_URI) -+ info->printer_uri = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "member-uris") == 0 && -+ ippGetValueTag (attr) == IPP_TAG_URI) -+ info->member_uris = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-location") == 0) -+ info->location = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-info") == 0) -+ info->description = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-state-message") == 0) -+ info->state_msg = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-state-reasons") == 0) -+ /* Store most important reason to reason_msg and set -+ its importance at printer_state_reason_level */ -+ { -+ for (i = 0; i < ippGetCount (attr); i++) -+ { -+ gboolean interested_in = FALSE; -+ if (strcmp (ippGetString (attr, i, NULL), "none") == 0) -+ continue; -+ /* Sets is_paused flag for paused printer. */ -+ if (strcmp (ippGetString (attr, i, NULL), "paused") == 0) -+ { -+ info->is_paused = TRUE; -+ } -+ -+ for (j = 0; j < G_N_ELEMENTS (printer_messages); j++) -+ if (strncmp (ippGetString (attr, i, NULL), printer_messages[j], strlen (printer_messages[j])) == 0) -+ { -+ interested_in = TRUE; -+ break; -+ } -+ -+ if (!interested_in) -+ continue; -+ if (g_str_has_suffix (ippGetString (attr, i, NULL), "-report")) -+ { -+ if (info->reason_level <= GTK_PRINTER_STATE_LEVEL_INFO) -+ { -+ info->reason_msg = ippGetString (attr, i, NULL); -+ info->reason_level = GTK_PRINTER_STATE_LEVEL_INFO; -+ } -+ } -+ else if (g_str_has_suffix (ippGetString (attr, i, NULL), "-warning")) -+ { -+ if (info->reason_level <= GTK_PRINTER_STATE_LEVEL_WARNING) -+ { -+ info->reason_msg = ippGetString (attr, i, NULL); -+ info->reason_level = GTK_PRINTER_STATE_LEVEL_WARNING; -+ } -+ } -+ else /* It is error in the case of no suffix. */ -+ { -+ info->reason_msg = ippGetString (attr, i, NULL); -+ info->reason_level = GTK_PRINTER_STATE_LEVEL_ERROR; -+ } -+ } -+ } -+ else if (strcmp (ippGetName (attr), "printer-state") == 0) -+ info->state = ippGetInteger (attr, 0); -+ else if (strcmp (ippGetName (attr), "queued-job-count") == 0) -+ info->job_count = ippGetInteger (attr, 0); -+ else if (strcmp (ippGetName (attr), "printer-is-accepting-jobs") == 0) -+ { -+ if (ippGetBoolean (attr, 0) == 1) -+ info->is_accepting_jobs = TRUE; -+ else -+ info->is_accepting_jobs = FALSE; -+ } -+ else if (strcmp (ippGetName (attr), "job-sheets-supported") == 0) -+ { -+ if (cups_backend->covers == NULL) -+ { -+ cups_backend->number_of_covers = ippGetCount (attr); -+ cups_backend->covers = g_new (char *, cups_backend->number_of_covers + 1); -+ for (i = 0; i < cups_backend->number_of_covers; i++) -+ cups_backend->covers[i] = g_strdup (ippGetString (attr, i, NULL)); -+ cups_backend->covers[cups_backend->number_of_covers] = NULL; -+ } -+ } -+ else if (strcmp (ippGetName (attr), "job-sheets-default") == 0) -+ { -+ if (ippGetCount (attr) == 2) -+ { -+ info->default_cover_before = ippGetString (attr, 0, NULL); -+ info->default_cover_after = ippGetString (attr, 1, NULL); -+ } -+ } -+ else if (strcmp (ippGetName (attr), "printer-type") == 0) -+ { -+ info->got_printer_type = TRUE; -+ if (ippGetInteger (attr, 0) & 0x00020000) -+ info->default_printer = TRUE; -+ else -+ info->default_printer = FALSE; -+ -+ if (ippGetInteger (attr, 0) & 0x00000002) -+ info->remote_printer = TRUE; -+ else -+ info->remote_printer = FALSE; -+ } -+ else if (strcmp (ippGetName (attr), "auth-info-required") == 0) -+ { -+ if (strcmp (ippGetString (attr, 0, NULL), "none") != 0) -+ { -+ info->auth_info_required = g_new0 (gchar *, ippGetCount (attr) + 1); -+ for (i = 0; i < ippGetCount (attr); i++) -+ info->auth_info_required[i] = g_strdup (ippGetString (attr, i, NULL)); -+ } -+ } -+ else -+ { -+ GTK_NOTE (PRINTING, -+ g_print ("CUPS Backend: Attribute %s ignored", ippGetName (attr))); -+ } -+ -+} - static void - cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - GtkCupsResult *result, -@@ -1816,128 +1945,7 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - - while (attr != NULL && ippGetGroupTag (attr) == IPP_TAG_PRINTER) - { -- if (strcmp (ippGetName (attr), "printer-name") == 0 && -- ippGetValueTag (attr) == IPP_TAG_NAME) -- printer_name = ippGetString (attr, 0, NULL); -- else if (strcmp (ippGetName (attr), "printer-uri-supported") == 0 && -- ippGetValueTag (attr) == IPP_TAG_URI) -- printer_uri = ippGetString (attr, 0, NULL); -- else if (strcmp (ippGetName (attr), "member-uris") == 0 && -- ippGetValueTag (attr) == IPP_TAG_URI) -- member_uris = ippGetString (attr, 0, NULL); -- else if (strcmp (ippGetName (attr), "printer-location") == 0) -- location = ippGetString (attr, 0, NULL); -- else if (strcmp (ippGetName (attr), "printer-info") == 0) -- description = ippGetString (attr, 0, NULL); -- else if (strcmp (ippGetName (attr), "printer-state-message") == 0) -- state_msg = ippGetString (attr, 0, NULL); -- else if (strcmp (ippGetName (attr), "printer-state-reasons") == 0) -- /* Store most important reason to reason_msg and set -- its importance at printer_state_reason_level */ -- { -- for (i = 0; i < ippGetCount (attr); i++) -- { -- if (strcmp (ippGetString (attr, i, NULL), "none") != 0) -- { -- /* Sets is_paused flag for paused printer. */ -- if (strcmp (ippGetString (attr, i, NULL), "paused") == 0) -- { -- is_paused = TRUE; -- } -- -- interested_in = FALSE; -- for (j = 0; j < G_N_ELEMENTS (reasons); j++) -- if (strncmp (ippGetString (attr, i, NULL), reasons[j], strlen (reasons[j])) == 0) -- { -- interested_in = TRUE; -- break; -- } -- -- if (interested_in) -- { -- if (g_str_has_suffix (ippGetString (attr, i, NULL), "-report")) -- { -- if (printer_state_reason_level <= 1) -- { -- reason_msg = ippGetString (attr, i, NULL); -- printer_state_reason_level = 1; -- } -- } -- else if (g_str_has_suffix (ippGetString (attr, i, NULL), "-warning")) -- { -- if (printer_state_reason_level <= 2) -- { -- reason_msg = ippGetString (attr, i, NULL); -- printer_state_reason_level = 2; -- } -- } -- else /* It is error in the case of no suffix. */ -- { -- reason_msg = ippGetString (attr, i, NULL); -- printer_state_reason_level = 3; -- } -- } -- } -- } -- } -- else if (strcmp (ippGetName (attr), "printer-state") == 0) -- state = ippGetInteger (attr, 0); -- else if (strcmp (ippGetName (attr), "queued-job-count") == 0) -- job_count = ippGetInteger (attr, 0); -- else if (strcmp (ippGetName (attr), "printer-is-accepting-jobs") == 0) -- { -- if (ippGetBoolean (attr, 0) == 1) -- is_accepting_jobs = TRUE; -- else -- is_accepting_jobs = FALSE; -- } -- else if (strcmp (ippGetName (attr), "job-sheets-supported") == 0) -- { -- if (cups_backend->covers == NULL) -- { -- cups_backend->number_of_covers = ippGetCount (attr); -- cups_backend->covers = g_new (char *, cups_backend->number_of_covers + 1); -- for (i = 0; i < cups_backend->number_of_covers; i++) -- cups_backend->covers[i] = g_strdup (ippGetString (attr, i, NULL)); -- cups_backend->covers[cups_backend->number_of_covers] = NULL; -- } -- } -- else if (strcmp (ippGetName (attr), "job-sheets-default") == 0) -- { -- if (ippGetCount (attr) == 2) -- { -- default_cover_before = ippGetString (attr, 0, NULL); -- default_cover_after = ippGetString (attr, 1, NULL); -- } -- } -- else if (strcmp (ippGetName (attr), "printer-type") == 0) -- { -- got_printer_type = TRUE; -- if (ippGetInteger (attr, 0) & 0x00020000) -- default_printer = TRUE; -- else -- default_printer = FALSE; -- -- if (ippGetInteger (attr, 0) & 0x00000002) -- remote_printer = TRUE; -- else -- remote_printer = FALSE; -- } -- else if (strcmp (ippGetName (attr), "auth-info-required") == 0) -- { -- if (strcmp (ippGetString (attr, 0, NULL), "none") != 0) -- { -- auth_info_required = g_new0 (gchar *, ippGetCount (attr) + 1); -- for (i = 0; i < ippGetCount (attr); i++) -- auth_info_required[i] = g_strdup (ippGetString (attr, i, NULL)); -- } -- } -- else -- { -- GTK_NOTE (PRINTING, -- g_print ("CUPS Backend: Attribute %s ignored", ippGetName (attr))); -- } -- -+ cups_printer_handle_attribute (cups_backend, attr, info); - attr = attr->next; - } - --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0005-gtk3-Extract-function-cups_printer_handle_attribute.patch b/modulesets/patches/0005-gtk3-Extract-function-cups_printer_handle_attribute.patch deleted file mode 100644 index 3584f5c..0000000 --- a/modulesets/patches/0005-gtk3-Extract-function-cups_printer_handle_attribute.patch +++ /dev/null @@ -1,268 +0,0 @@ ---- a/modules/printbackends/cups/gtkprintbackendcups.c 2012-04-20 14:44:01.000000000 -0700 -+++ b/modules/printbackends/cups/gtkprintbackendcups.c 2012-04-20 15:07:10.000000000 -0700 -@@ -1679,6 +1679,135 @@ - gboolean remote_printer; - gchar **auth_info_required; - } PrinterSetupInfo; -+ -+static void -+cups_printer_handle_attribute (GtkPrintBackendCups *cups_backend, -+ ipp_attribute_t *attr, -+ PrinterSetupInfo *info) -+{ -+ gint i,j; -+ -+ if (strcmp (ippGetName (attr), "printer-name") == 0 && -+ ippGetValueTag (attr) == IPP_TAG_NAME) -+ info->printer_name = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-uri-supported") == 0 && -+ ippGetValueTag (attr) == IPP_TAG_URI) -+ info->printer_uri = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "member-uris") == 0 && -+ ippGetValueTag (attr) == IPP_TAG_URI) -+ info->member_uris = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-location") == 0) -+ info->location = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-info") == 0) -+ info->description = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-state-message") == 0) -+ info->state_msg = ippGetString (attr, 0, NULL); -+ else if (strcmp (ippGetName (attr), "printer-state-reasons") == 0) -+ /* Store most important reason to reason_msg and set -+ its importance at printer_state_reason_level */ -+ { -+ for (i = 0; i < ippGetCount (attr); i++) -+ { -+ gboolean interested_in = FALSE; -+ if (strcmp (ippGetString (attr, i, NULL), "none") == 0) -+ continue; -+ /* Sets is_paused flag for paused printer. */ -+ if (strcmp (ippGetString (attr, i, NULL), "paused") == 0) -+ { -+ info->is_paused = TRUE; -+ } -+ -+ for (j = 0; j < G_N_ELEMENTS (printer_messages); j++) -+ if (strncmp (ippGetString (attr, i, NULL), printer_messages[j], strlen (printer_messages[j])) == 0) -+ { -+ interested_in = TRUE; -+ break; -+ } -+ -+ if (!interested_in) -+ continue; -+ if (g_str_has_suffix (ippGetString (attr, i, NULL), "-report")) -+ { -+ if (info->reason_level <= GTK_PRINTER_STATE_LEVEL_INFO) -+ { -+ info->reason_msg = ippGetString (attr, i, NULL); -+ info->reason_level = GTK_PRINTER_STATE_LEVEL_INFO; -+ } -+ } -+ else if (g_str_has_suffix (ippGetString (attr, i, NULL), "-warning")) -+ { -+ if (info->reason_level <= GTK_PRINTER_STATE_LEVEL_WARNING) -+ { -+ info->reason_msg = ippGetString (attr, i, NULL); -+ info->reason_level = GTK_PRINTER_STATE_LEVEL_WARNING; -+ } -+ } -+ else /* It is error in the case of no suffix. */ -+ { -+ info->reason_msg = ippGetString (attr, i, NULL); -+ info->reason_level = GTK_PRINTER_STATE_LEVEL_ERROR; -+ } -+ } -+ } -+ else if (strcmp (ippGetName (attr), "printer-state") == 0) -+ info->state = ippGetInteger (attr, 0); -+ else if (strcmp (ippGetName (attr), "queued-job-count") == 0) -+ info->job_count = ippGetInteger (attr, 0); -+ else if (strcmp (ippGetName (attr), "printer-is-accepting-jobs") == 0) -+ { -+ if (ippGetBoolean (attr, 0) == 1) -+ info->is_accepting_jobs = TRUE; -+ else -+ info->is_accepting_jobs = FALSE; -+ } -+ else if (strcmp (ippGetName (attr), "job-sheets-supported") == 0) -+ { -+ if (cups_backend->covers == NULL) -+ { -+ cups_backend->number_of_covers = ippGetCount (attr); -+ cups_backend->covers = g_new (char *, cups_backend->number_of_covers + 1); -+ for (i = 0; i < cups_backend->number_of_covers; i++) -+ cups_backend->covers[i] = g_strdup (ippGetString (attr, i, NULL)); -+ cups_backend->covers[cups_backend->number_of_covers] = NULL; -+ } -+ } -+ else if (strcmp (ippGetName (attr), "job-sheets-default") == 0) -+ { -+ if (ippGetCount (attr) == 2) -+ { -+ info->default_cover_before = ippGetString (attr, 0, NULL); -+ info->default_cover_after = ippGetString (attr, 1, NULL); -+ } -+ } -+ else if (strcmp (ippGetName (attr), "printer-type") == 0) -+ { -+ info->got_printer_type = TRUE; -+ if (ippGetInteger (attr, 0) & 0x00020000) -+ info->default_printer = TRUE; -+ else -+ info->default_printer = FALSE; -+ -+ if (ippGetInteger (attr, 0) & 0x00000002) -+ info->remote_printer = TRUE; -+ else -+ info->remote_printer = FALSE; -+ } -+ else if (strcmp (ippGetName (attr), "auth-info-required") == 0) -+ { -+ if (strcmp (ippGetString (attr, 0, NULL), "none") != 0) -+ { -+ info->auth_info_required = g_new0 (gchar *, ippGetCount (attr) + 1); -+ for (i = 0; i < ippGetCount (attr); i++) -+ info->auth_info_required[i] = g_strdup (ippGetString (attr, i, NULL)); -+ } -+ } -+ else -+ { -+ GTK_NOTE (PRINTING, -+ g_print ("CUPS Backend: Attribute %s ignored", ippGetName (attr))); -+ } -+ -+} - static void - cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - GtkCupsResult *result, -@@ -1750,128 +1879,7 @@ - - while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER) - { -- if (strcmp (attr->name, "printer-name") == 0 && -- attr->value_tag == IPP_TAG_NAME) -- printer_name = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-uri-supported") == 0 && -- attr->value_tag == IPP_TAG_URI) -- printer_uri = attr->values[0].string.text; -- else if (strcmp (attr->name, "member-uris") == 0 && -- attr->value_tag == IPP_TAG_URI) -- member_uris = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-location") == 0) -- location = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-info") == 0) -- description = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-state-message") == 0) -- state_msg = attr->values[0].string.text; -- else if (strcmp (attr->name, "printer-state-reasons") == 0) -- /* Store most important reason to reason_msg and set -- its importance at printer_state_reason_level */ -- { -- for (i = 0; i < attr->num_values; i++) -- { -- if (strcmp (attr->values[i].string.text, "none") != 0) -- { -- /* Sets is_paused flag for paused printer. */ -- if (strcmp (attr->values[i].string.text, "paused") == 0) -- { -- is_paused = TRUE; -- } -- -- interested_in = FALSE; -- for (j = 0; j < G_N_ELEMENTS (reasons); j++) -- if (strncmp (attr->values[i].string.text, reasons[j], strlen (reasons[j])) == 0) -- { -- interested_in = TRUE; -- break; -- } -- -- if (interested_in) -- { -- if (g_str_has_suffix (attr->values[i].string.text, "-report")) -- { -- if (printer_state_reason_level <= 1) -- { -- reason_msg = attr->values[i].string.text; -- printer_state_reason_level = 1; -- } -- } -- else if (g_str_has_suffix (attr->values[i].string.text, "-warning")) -- { -- if (printer_state_reason_level <= 2) -- { -- reason_msg = attr->values[i].string.text; -- printer_state_reason_level = 2; -- } -- } -- else /* It is error in the case of no suffix. */ -- { -- reason_msg = attr->values[i].string.text; -- printer_state_reason_level = 3; -- } -- } -- } -- } -- } -- else if (strcmp (attr->name, "printer-state") == 0) -- state = attr->values[0].integer; -- else if (strcmp (attr->name, "queued-job-count") == 0) -- job_count = attr->values[0].integer; -- else if (strcmp (attr->name, "printer-is-accepting-jobs") == 0) -- { -- if (attr->values[0].boolean == 1) -- is_accepting_jobs = TRUE; -- else -- is_accepting_jobs = FALSE; -- } -- else if (strcmp (attr->name, "job-sheets-supported") == 0) -- { -- if (cups_backend->covers == NULL) -- { -- cups_backend->number_of_covers = attr->num_values; -- cups_backend->covers = g_new (char *, cups_backend->number_of_covers + 1); -- for (i = 0; i < cups_backend->number_of_covers; i++) -- cups_backend->covers[i] = g_strdup (attr->values[i].string.text); -- cups_backend->covers[cups_backend->number_of_covers] = NULL; -- } -- } -- else if (strcmp (attr->name, "job-sheets-default") == 0) -- { -- if (attr->num_values == 2) -- { -- default_cover_before = attr->values[0].string.text; -- default_cover_after = attr->values[1].string.text; -- } -- } -- else if (strcmp (attr->name, "printer-type") == 0) -- { -- got_printer_type = TRUE; -- if (attr->values[0].integer & 0x00020000) -- default_printer = TRUE; -- else -- default_printer = FALSE; -- -- if (attr->values[0].integer & 0x00000002) -- remote_printer = TRUE; -- else -- remote_printer = FALSE; -- } -- else if (strcmp (attr->name, "auth-info-required") == 0) -- { -- if (strcmp (attr->values[0].string.text, "none") != 0) -- { -- auth_info_required = g_new0 (gchar *, attr->num_values + 1); -- for (i = 0; i < attr->num_values; i++) -- auth_info_required[i] = g_strdup (attr->values[i].string.text); -- } -- } -- else -- { -- GTK_NOTE (PRINTING, -- g_print ("CUPS Backend: Attribute %s ignored", attr->name)); -- } -- -+ cups_printer_handle_attribute (cups_backend, attr, info); - attr = attr->next; - } - diff --git a/modulesets/patches/0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch b/modulesets/patches/0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch deleted file mode 100644 index fc27587..0000000 --- a/modulesets/patches/0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch +++ /dev/null @@ -1,209 +0,0 @@ -From 2bf33d856464d33ed1bd5ab787c9279e464f08df Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Thu, 11 Feb 2016 15:53:33 -0800 -Subject: [PATCH] Bug-658722-Drag-and-Drop-sometimes-stops-working - ---- - gdk/quartz/gdkdnd-quartz.c | 35 ++++- - gtk/gtkdnd-quartz.c | 321 +++++++++++++++++++++------------------------ - 2 files changed, 179 insertions(+), 177 deletions(-) - -diff --git a/gdk/quartz/gdkdnd-quartz.c b/gdk/quartz/gdkdnd-quartz.c -index ec89ad2..7a70415 100644 ---- a/gdk/quartz/gdkdnd-quartz.c -+++ b/gdk/quartz/gdkdnd-quartz.c -@@ -111,11 +111,20 @@ GdkDragContext * - gdk_drag_begin (GdkWindow *window, - GList *targets) - { -- g_assert (_gdk_quartz_drag_source_context == NULL); -+ if (_gdk_quartz_drag_source_context != NULL) -+ { -+ /* Something is amiss with the existing drag, so log a message -+ and abort it */ -+ g_warning ("Drag begun with existing context; aborting the preexisting drag"); -+ gdk_drag_abort (_gdk_quartz_drag_source_context, -+ (guint32)g_get_real_time ()); -+ } -+ - - /* Create fake context */ - _gdk_quartz_drag_source_context = gdk_drag_context_new (); - _gdk_quartz_drag_source_context->is_source = TRUE; -+ _gdk_quartz_drag_source_context->source_window = window; - - return _gdk_quartz_drag_source_context; - } -@@ -155,20 +164,36 @@ gdk_drag_find_window_for_screen (GdkDragContext *context, - /* FIXME: Implement */ - } - -+static void -+gdk_quartz_drag_end (GdkDragContext *context) -+{ -+ GdkEvent event; -+ -+ g_assert (context != NULL); -+ event.dnd.type = GDK_DROP_FINISHED; -+ event.dnd.window = g_object_ref (context->source_window); -+ event.dnd.send_event = FALSE; -+ event.dnd.context = context; -+ -+ (*_gdk_event_func) (&event, _gdk_event_data); -+ -+ g_object_run_dispose (_gdk_quartz_drag_source_context); -+ _gdk_quartz_drag_source_context = NULL; -+} -+ - void - gdk_drag_drop (GdkDragContext *context, - guint32 time) - { -- /* FIXME: Implement */ -+ gdk_quartz_drag_end (context); - } - - void - gdk_drag_abort (GdkDragContext *context, - guint32 time) - { -- g_return_if_fail (context != NULL); -- -- /* FIXME: Implement */ -+ g_warning ("Gdk-quartz-drag-drop, aborting\n"); -+ gdk_quartz_drag_end (context); - } - - void -diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c -index 62b8570..483525d 100644 ---- a/gtk/gtkdnd-quartz.c -+++ b/gtk/gtkdnd-quartz.c -@@ -270,6 +270,39 @@ gtk_drag_dest_info_destroy (gpointer data) - g_free (info); - } - -+static void -+gtk_drag_source_info_destroy (GtkDragSourceInfo *info) -+{ -+ NSPasteboard *pasteboard; -+ NSAutoreleasePool *pool; -+ -+ if (info->icon_pixbuf) -+ g_object_unref (info->icon_pixbuf); -+ -+ g_signal_emit_by_name (info->widget, "drag-end", -+ info->context); -+ -+ if (info->source_widget) -+ g_object_unref (info->source_widget); -+ -+ if (info->widget) -+ g_object_unref (info->widget); -+ -+ gtk_target_list_unref (info->target_list); -+ -+ pool = [[NSAutoreleasePool alloc] init]; -+ -+ /* Empty the pasteboard, so that it will not accidentally access -+ * info->context after it has been destroyed. -+ */ -+ pasteboard = [NSPasteboard pasteboardWithName: NSDragPboard]; -+ [pasteboard declareTypes: nil owner: nil]; -+ -+ [pool release]; -+ -+ g_free (info); -+} -+ - static GtkDragDestInfo * - gtk_drag_get_dest_info (GdkDragContext *context, - gboolean create) -@@ -303,18 +336,14 @@ gtk_drag_get_source_info (GdkDragContext *context, - { - info = g_new0 (GtkDragSourceInfo, 1); - info->context = context; -- g_object_set_qdata (G_OBJECT (context), dest_info_quark, info); -+ g_object_ref (info->context); -+ g_object_set_qdata_full (G_OBJECT (context), dest_info_quark, -+ info, gtk_drag_source_info_destroy); - } - - return info; - } - --static void --gtk_drag_clear_source_info (GdkDragContext *context) --{ -- g_object_set_qdata (G_OBJECT (context), dest_info_quark, NULL); --} -- - GtkWidget * - gtk_drag_get_source_widget (GdkDragContext *context) - { -@@ -1888,53 +1917,6 @@ gtk_drag_set_default_icon (GdkColormap *colormap, - g_warning ("gtk_drag_set_default_icon is not supported on Mac OS X."); - } - --static void --gtk_drag_source_info_destroy (GtkDragSourceInfo *info) --{ -- NSPasteboard *pasteboard; -- NSAutoreleasePool *pool; -- -- if (info->icon_pixbuf) -- g_object_unref (info->icon_pixbuf); -- -- g_signal_emit_by_name (info->widget, "drag-end", -- info->context); -- -- if (info->source_widget) -- g_object_unref (info->source_widget); -- -- if (info->widget) -- g_object_unref (info->widget); -- -- gtk_target_list_unref (info->target_list); -- -- pool = [[NSAutoreleasePool alloc] init]; -- -- /* Empty the pasteboard, so that it will not accidentally access -- * info->context after it has been destroyed. -- */ -- pasteboard = [NSPasteboard pasteboardWithName: NSDragPboard]; -- [pasteboard declareTypes: nil owner: nil]; -- -- [pool release]; -- -- gtk_drag_clear_source_info (info->context); -- g_object_unref (info->context); -- -- g_free (info); -- info = NULL; --} -- --static gboolean --drag_drop_finished_idle_cb (gpointer data) --{ -- GtkDragSourceInfo* info = (GtkDragSourceInfo*) data; -- -- if (info->success) -- gtk_drag_source_info_destroy (data); -- -- return FALSE; --} - - static void - gtk_drag_drop_finished (GtkDragSourceInfo *info, -@@ -1950,11 +1932,6 @@ gtk_drag_drop_finished (GtkDragSourceInfo *info, - g_signal_emit_by_name (info->source_widget, "drag-data-delete", - info->context); - -- /* Workaround for the fact that the NS API blocks until the drag is -- * over. This way the context is still valid when returning from -- * drag_begin, even if it will still be quite useless. See bug #501588. -- */ -- g_idle_add (drag_drop_finished_idle_cb, info); - } - - /************************************************************* diff --git a/modulesets/patches/0006-gtk2-Extract-Function-cups_create_printer.patch b/modulesets/patches/0006-gtk2-Extract-Function-cups_create_printer.patch deleted file mode 100644 index 0f6f931..0000000 --- a/modulesets/patches/0006-gtk2-Extract-Function-cups_create_printer.patch +++ /dev/null @@ -1,222 +0,0 @@ -From 814c0944a953371708ec9ffa32c8d261245409d2 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 25 Feb 2012 17:52:02 -0800 -Subject: [PATCH 6/9] Extract Function cups_create_printer - ---- - modules/printbackends/cups/gtkprintbackendcups.c | 185 ++++++++++++---------- - 1 files changed, 99 insertions(+), 86 deletions(-) - -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index 8bd68bc..e2d9192 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -1874,6 +1874,102 @@ cups_printer_handle_attribute (GtkPrintBackendCups *cups_backend, - } - - } -+ -+static GtkPrinter* -+cups_create_printer (GtkPrintBackendCups *cups_backend, -+ PrinterSetupInfo *info) -+{ -+ GtkPrinterCups *cups_printer; -+ GtkPrinter *printer; -+ char uri[HTTP_MAX_URI]; /* Printer URI */ -+ char method[HTTP_MAX_URI]; /* Method/scheme name */ -+ char username[HTTP_MAX_URI]; /* Username:password */ -+ char hostname[HTTP_MAX_URI]; /* Hostname */ -+ char resource[HTTP_MAX_URI]; /* Resource name */ -+ int port; /* Port number */ -+ char *cups_server; /* CUPS server */ -+ GtkPrintBackend *backend = GTK_PRINT_BACKEND (cups_backend); -+ -+ cups_printer = gtk_printer_cups_new (info->printer_name, backend); -+ -+ cups_printer->device_uri = g_strdup_printf ("/printers/%s", -+ info->printer_name); -+ -+ /* Check to see if we are looking at a class */ -+ if (info->member_uris) -+ { -+ cups_printer->printer_uri = g_strdup (info->member_uris); -+ /* TODO if member_uris is a class we need to recursivly find a printer */ -+ GTK_NOTE (PRINTING, -+ g_print ("CUPS Backend: Found class with printer %s\n", -+ info->member_uris)); -+ } -+ else -+ { -+ cups_printer->printer_uri = g_strdup (info->printer_uri); -+ GTK_NOTE (PRINTING, -+ g_print ("CUPS Backend: Found printer %s\n", info->printer_uri)); -+ } -+ -+#ifdef HAVE_CUPS_API_1_2 -+ httpSeparateURI (HTTP_URI_CODING_ALL, cups_printer->printer_uri, -+ method, sizeof (method), -+ username, sizeof (username), -+ hostname, sizeof (hostname), -+ &port, -+ resource, sizeof (resource)); -+ -+#else -+ httpSeparate (cups_printer->printer_uri, -+ method, -+ username, -+ hostname, -+ &port, -+ resource); -+#endif -+ -+ if (strncmp (resource, "/printers/", 10) == 0) -+ { -+ cups_printer->ppd_name = g_strdup (resource + 10); -+ GTK_NOTE (PRINTING, -+ g_print ("CUPS Backend: Setting ppd name '%s' for printer/class '%s'\n", cups_printer->ppd_name, info->printer_name)); -+ } -+ -+ gethostname (uri, sizeof (uri)); -+ cups_server = g_strdup (cupsServer()); -+ -+ if (strcasecmp (uri, hostname) == 0) -+ strcpy (hostname, "localhost"); -+ -+ /* if the cups server is local and listening at a unix domain socket -+ * then use the socket connection -+ */ -+ if ((strstr (hostname, "localhost") != NULL) && -+ (cups_server[0] == '/')) -+ strcpy (hostname, cups_server); -+ -+ g_free (cups_server); -+ -+ cups_printer->default_cover_before = g_strdup (info->default_cover_before); -+ cups_printer->default_cover_after = g_strdup (info->default_cover_after); -+ -+ cups_printer->hostname = g_strdup (hostname); -+ cups_printer->port = port; -+ -+ cups_printer->auth_info_required = g_strdupv (info->auth_info_required); -+ g_strfreev (info->auth_info_required); -+ -+ printer = GTK_PRINTER (cups_printer); -+ -+ if (cups_backend->default_printer != NULL && -+ strcmp (cups_backend->default_printer, gtk_printer_get_name (printer)) == 0) -+ gtk_printer_set_is_default (printer, TRUE); -+ -+ -+ gtk_print_backend_add_printer (backend, printer); -+ return printer; -+} -+ - static void - cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - GtkCupsResult *result, -@@ -1928,7 +2024,7 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - GtkPrinter *printer; - gboolean status_changed = FALSE; - GList *node; -- gint i,j; -+ gint i; - gchar *reason_msg_desc = NULL; - gchar *tmp_msg = NULL; - gchar *tmp_msg2 = NULL; -@@ -1990,91 +2086,8 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - printer = gtk_print_backend_find_printer (backend, info->printer_name); - if (!printer) - { -- GtkPrinterCups *cups_printer; -- char uri[HTTP_MAX_URI]; /* Printer URI */ -- char method[HTTP_MAX_URI]; /* Method/scheme name */ -- char username[HTTP_MAX_URI]; /* Username:password */ -- char hostname[HTTP_MAX_URI]; /* Hostname */ -- char resource[HTTP_MAX_URI]; /* Resource name */ -- int port; /* Port number */ -- char *cups_server; /* CUPS server */ -- -- list_has_changed = TRUE; -- cups_printer = gtk_printer_cups_new (printer_name, backend); -- -- cups_printer->device_uri = g_strdup_printf ("/printers/%s", printer_name); -- -- /* Check to see if we are looking at a class */ -- if (member_uris) -- { -- cups_printer->printer_uri = g_strdup (member_uris); -- /* TODO if member_uris is a class we need to recursivly find a printer */ -- GTK_NOTE (PRINTING, -- g_print ("CUPS Backend: Found class with printer %s\n", member_uris)); -- } -- else -- { -- cups_printer->printer_uri = g_strdup (printer_uri); -- GTK_NOTE (PRINTING, -- g_print ("CUPS Backend: Found printer %s\n", printer_uri)); -- } -- --#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) || CUPS_VERSION_MAJOR > 1 -- httpSeparateURI (HTTP_URI_CODING_ALL, cups_printer->printer_uri, -- method, sizeof (method), -- username, sizeof (username), -- hostname, sizeof (hostname), -- &port, -- resource, sizeof (resource)); -- --#else -- httpSeparate (cups_printer->printer_uri, -- method, -- username, -- hostname, -- &port, -- resource); --#endif -- -- if (strncmp (resource, "/printers/", 10) == 0) -- { -- cups_printer->ppd_name = g_strdup (resource + 10); -- GTK_NOTE (PRINTING, -- g_print ("CUPS Backend: Setting ppd name '%s' for printer/class '%s'\n", cups_printer->ppd_name, printer_name)); -- } -- -- gethostname (uri, sizeof (uri)); -- cups_server = g_strdup (cupsServer()); -- -- if (strcasecmp (uri, hostname) == 0) -- strcpy (hostname, "localhost"); -- -- /* if the cups server is local and listening at a unix domain socket -- * then use the socket connection -- */ -- if ((strstr (hostname, "localhost") != NULL) && -- (cups_server[0] == '/')) -- strcpy (hostname, cups_server); -- -- g_free (cups_server); -- -- cups_printer->default_cover_before = g_strdup (default_cover_before); -- cups_printer->default_cover_after = g_strdup (default_cover_after); -- -- cups_printer->hostname = g_strdup (hostname); -- cups_printer->port = port; -- -- cups_printer->auth_info_required = g_strdupv (auth_info_required); -- g_strfreev (auth_info_required); -- -- printer = GTK_PRINTER (cups_printer); -- -- if (cups_backend->default_printer != NULL && -- strcmp (cups_backend->default_printer, gtk_printer_get_name (printer)) == 0) -- gtk_printer_set_is_default (printer, TRUE); -- -- -- gtk_print_backend_add_printer (backend, printer); -+ printer = cups_create_printer (cups_backend, info); -+ list_has_changed = TRUE; - } - else - g_object_ref (printer); --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0006-gtk3-Extract-Function-cups_create_printer.patch b/modulesets/patches/0006-gtk3-Extract-Function-cups_create_printer.patch deleted file mode 100644 index 7c47bb2..0000000 --- a/modulesets/patches/0006-gtk3-Extract-Function-cups_create_printer.patch +++ /dev/null @@ -1,238 +0,0 @@ -From 722dbc499b97f4df9fabcee1b5e652b89e1af676 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sun, 19 Feb 2012 13:29:11 -0800 -Subject: [PATCH 6/9] Extract Function cups_create_printer - ---- - modules/printbackends/cups/gtkprintbackendcups.c | 201 ++++++++++++---------- - 1 files changed, 107 insertions(+), 94 deletions(-) - -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index d57974e..6055b36 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -1808,6 +1808,108 @@ cups_printer_handle_attribute (GtkPrintBackendCups *cups_backend, - } - - } -+ -+static GtkPrinter* -+cups_create_printer (GtkPrintBackendCups *cups_backend, -+ PrinterSetupInfo *info) -+{ -+ GtkPrinterCups *cups_printer; -+ GtkPrinter *printer; -+ char uri[HTTP_MAX_URI]; /* Printer URI */ -+ char method[HTTP_MAX_URI]; /* Method/scheme name */ -+ char username[HTTP_MAX_URI]; /* Username:password */ -+ char hostname[HTTP_MAX_URI]; /* Hostname */ -+ char resource[HTTP_MAX_URI]; /* Resource name */ -+ int port; /* Port number */ -+ char *cups_server; /* CUPS server */ -+ GtkPrintBackend *backend = GTK_PRINT_BACKEND (cups_backend); -+ -+#ifdef HAVE_COLORD -+ cups_printer = gtk_printer_cups_new (info->printer_name, -+ backend, -+ cups_backend->colord_client); -+#else -+ cups_printer = gtk_printer_cups_new (info->printer_name, backend, NULL); -+#endif -+ -+ cups_printer->device_uri = g_strdup_printf ("/printers/%s", -+ info->printer_name); -+ -+ /* Check to see if we are looking at a class */ -+ if (info->member_uris) -+ { -+ cups_printer->printer_uri = g_strdup (info->member_uris); -+ /* TODO if member_uris is a class we need to recursivly find a printer */ -+ GTK_NOTE (PRINTING, -+ g_print ("CUPS Backend: Found class with printer %s\n", -+ info->member_uris)); -+ } -+ else -+ { -+ cups_printer->printer_uri = g_strdup (info->printer_uri); -+ GTK_NOTE (PRINTING, -+ g_print ("CUPS Backend: Found printer %s\n", info->printer_uri)); -+ } -+ -+#ifdef HAVE_CUPS_API_1_2 -+ httpSeparateURI (HTTP_URI_CODING_ALL, cups_printer->printer_uri, -+ method, sizeof (method), -+ username, sizeof (username), -+ hostname, sizeof (hostname), -+ &port, -+ resource, sizeof (resource)); -+ -+#else -+ httpSeparate (cups_printer->printer_uri, -+ method, -+ username, -+ hostname, -+ &port, -+ resource); -+#endif -+ -+ if (strncmp (resource, "/printers/", 10) == 0) -+ { -+ cups_printer->ppd_name = g_strdup (resource + 10); -+ GTK_NOTE (PRINTING, -+ g_print ("CUPS Backend: Setting ppd name '%s' for printer/class '%s'\n", cups_printer->ppd_name, info->printer_name)); -+ } -+ -+ gethostname (uri, sizeof (uri)); -+ cups_server = g_strdup (cupsServer()); -+ -+ if (strcasecmp (uri, hostname) == 0) -+ strcpy (hostname, "localhost"); -+ -+ /* if the cups server is local and listening at a unix domain socket -+ * then use the socket connection -+ */ -+ if ((strstr (hostname, "localhost") != NULL) && -+ (cups_server[0] == '/')) -+ strcpy (hostname, cups_server); -+ -+ g_free (cups_server); -+ -+ cups_printer->default_cover_before = g_strdup (info->default_cover_before); -+ cups_printer->default_cover_after = g_strdup (info->default_cover_after); -+ -+ cups_printer->hostname = g_strdup (hostname); -+ cups_printer->port = port; -+ -+ cups_printer->auth_info_required = g_strdupv (info->auth_info_required); -+ g_strfreev (info->auth_info_required); -+ -+ printer = GTK_PRINTER (cups_printer); -+ -+ if (cups_backend->default_printer != NULL && -+ strcmp (cups_backend->default_printer, gtk_printer_get_name (printer)) == 0) -+ gtk_printer_set_is_default (printer, TRUE); -+ -+ -+ gtk_print_backend_add_printer (backend, printer); -+ return printer; -+} -+ - static void - cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - GtkCupsResult *result, -@@ -1872,7 +1964,7 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - GtkPrinter *printer; - gboolean status_changed = FALSE; - GList *node; -- gint i,j; -+ gint i; - gchar *reason_msg_desc = NULL; - gchar *tmp_msg = NULL; - gchar *tmp_msg2 = NULL; -@@ -1923,99 +2025,10 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - - printer = gtk_print_backend_find_printer (backend, info->printer_name); - if (!printer) -- { -- GtkPrinterCups *cups_printer; -- char uri[HTTP_MAX_URI]; /* Printer URI */ -- char method[HTTP_MAX_URI]; /* Method/scheme name */ -- char username[HTTP_MAX_URI]; /* Username:password */ -- char hostname[HTTP_MAX_URI]; /* Hostname */ -- char resource[HTTP_MAX_URI]; /* Resource name */ -- int port; /* Port number */ -- char *cups_server; /* CUPS server */ -- -- list_has_changed = TRUE; --#ifdef HAVE_COLORD -- cups_printer = gtk_printer_cups_new (printer_name, -- backend, -- cups_backend->colord_client); --#else -- cups_printer = gtk_printer_cups_new (printer_name, backend, NULL); --#endif -- -- cups_printer->device_uri = g_strdup_printf ("/printers/%s", printer_name); -- -- /* Check to see if we are looking at a class */ -- if (member_uris) -- { -- cups_printer->printer_uri = g_strdup (member_uris); -- /* TODO if member_uris is a class we need to recursivly find a printer */ -- GTK_NOTE (PRINTING, -- g_print ("CUPS Backend: Found class with printer %s\n", member_uris)); -- } -- else -- { -- cups_printer->printer_uri = g_strdup (printer_uri); -- GTK_NOTE (PRINTING, -- g_print ("CUPS Backend: Found printer %s\n", printer_uri)); -- } -- --#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) || CUPS_VERSION_MAJOR > 1 -- httpSeparateURI (HTTP_URI_CODING_ALL, cups_printer->printer_uri, -- method, sizeof (method), -- username, sizeof (username), -- hostname, sizeof (hostname), -- &port, -- resource, sizeof (resource)); -- --#else -- httpSeparate (cups_printer->printer_uri, -- method, -- username, -- hostname, -- &port, -- resource); --#endif -- -- if (strncmp (resource, "/printers/", 10) == 0) -- { -- cups_printer->ppd_name = g_strdup (resource + 10); -- GTK_NOTE (PRINTING, -- g_print ("CUPS Backend: Setting ppd name '%s' for printer/class '%s'\n", cups_printer->ppd_name, printer_name)); -- } -- -- gethostname (uri, sizeof (uri)); -- cups_server = g_strdup (cupsServer()); -- -- if (strcasecmp (uri, hostname) == 0) -- strcpy (hostname, "localhost"); -- -- /* if the cups server is local and listening at a unix domain socket -- * then use the socket connection -- */ -- if ((strstr (hostname, "localhost") != NULL) && -- (cups_server[0] == '/')) -- strcpy (hostname, cups_server); -- -- g_free (cups_server); -- -- cups_printer->default_cover_before = g_strdup (default_cover_before); -- cups_printer->default_cover_after = g_strdup (default_cover_after); -- -- cups_printer->hostname = g_strdup (hostname); -- cups_printer->port = port; -- -- cups_printer->auth_info_required = g_strdupv (auth_info_required); -- g_strfreev (auth_info_required); -- -- printer = GTK_PRINTER (cups_printer); -- -- if (cups_backend->default_printer != NULL && -- strcmp (cups_backend->default_printer, gtk_printer_get_name (printer)) == 0) -- gtk_printer_set_is_default (printer, TRUE); -- -- -- gtk_print_backend_add_printer (backend, printer); -- } -+ { -+ printer = cups_create_printer (cups_backend, info); -+ list_has_changed = TRUE; -+ } - else - g_object_ref (printer); - --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0007-gtk2-Move-some-variable-declarations-into-the-scopes-in-w.patch b/modulesets/patches/0007-gtk2-Move-some-variable-declarations-into-the-scopes-in-w.patch deleted file mode 100644 index 73423a3..0000000 --- a/modulesets/patches/0007-gtk2-Move-some-variable-declarations-into-the-scopes-in-w.patch +++ /dev/null @@ -1,98 +0,0 @@ -From a9b8fbefb1a2285d30752ffa5bd481f9a175f16c Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 25 Feb 2012 17:52:46 -0800 -Subject: [PATCH 7/9] Move some variable declarations into the scopes in which - they're used. - ---- - modules/printbackends/cups/gtkprintbackendcups.c | 39 +++++++++++---------- - 1 files changed, 20 insertions(+), 19 deletions(-) - -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index e2d9192..a51f681 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -2025,12 +2025,8 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - gboolean status_changed = FALSE; - GList *node; - gint i; -- gchar *reason_msg_desc = NULL; -- gchar *tmp_msg = NULL; -- gchar *tmp_msg2 = NULL; -- gboolean found = FALSE; - PrinterSetupInfo *info = g_slice_new0 (PrinterSetupInfo); -- -+ - /* Skip leading attributes until we hit a printer... - */ - while (attr != NULL && ippGetGroupTag (attr) != IPP_TAG_PRINTER) -@@ -2126,23 +2122,30 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - - if (info->state_msg != NULL && strlen (info->state_msg) == 0) - { -- if (info->is_paused && !info->is_accepting_jobs) -- /* Translators: this is a printer status. */ -+ gchar *tmp_msg2 = NULL; -+ if (info->is_paused && !info->is_accepting_jobs) -+ /* Translators: this is a printer status. */ - tmp_msg2 = g_strdup ( N_("Paused ; Rejecting Jobs")); - if (info->is_paused && info->is_accepting_jobs) -- /* Translators: this is a printer status. */ -+ /* Translators: this is a printer status. */ - tmp_msg2 = g_strdup ( N_("Paused")); - if (!info->is_paused && !info->is_accepting_jobs) -- /* Translators: this is a printer status. */ -+ /* Translators: this is a printer status. */ - tmp_msg2 = g_strdup ( N_("Rejecting Jobs")); - - if (tmp_msg2 != NULL) -- info->state_msg = tmp_msg2; -- } -+ { -+ info->state_msg = tmp_msg2; -+ g_free (tmp_msg2); -+ } -+ } - - /* Set description of the reason and combine it with printer-state-message. */ - if ( (info->reason_msg != NULL)) - { -+ gchar *reason_msg_desc = NULL; -+ gboolean found = FALSE; -+ - for (i = 0; i < G_N_ELEMENTS (printer_messages); i++) - { - if (strncmp (info->reason_msg, printer_messages[i], -@@ -2164,23 +2167,21 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - info->state_msg = reason_msg_desc; - else - { -- tmp_msg = g_strjoin (" ; ", info->state_msg, reason_msg_desc, NULL); -+ gchar *tmp_msg = NULL; -+ tmp_msg = g_strjoin (" ; ", info->state_msg, -+ reason_msg_desc, NULL); - info->state_msg = tmp_msg; -+ g_free (tmp_msg); - } - } -+ if (reason_msg_desc != NULL) -+ g_free (reason_msg_desc); - } - - status_changed |= gtk_printer_set_state_message (printer, info->state_msg); - status_changed |= gtk_printer_set_is_accepting_jobs (printer, info->is_accepting_jobs); - -- if (tmp_msg != NULL) -- g_free (tmp_msg); -- -- if (tmp_msg2 != NULL) -- g_free (tmp_msg2); - -- if (reason_msg_desc != NULL) -- g_free (reason_msg_desc); - - /* Set printer icon according to importance - (none, report, warning, error - report is omitted). */ --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0007-gtk3-Move-some-variable-declarations-into-the-scopes-in-w.patch b/modulesets/patches/0007-gtk3-Move-some-variable-declarations-into-the-scopes-in-w.patch deleted file mode 100644 index 8ad799c..0000000 --- a/modulesets/patches/0007-gtk3-Move-some-variable-declarations-into-the-scopes-in-w.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 3c9483f6ef5ac72e25f1520231116f500fba035d Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sun, 19 Feb 2012 13:45:17 -0800 -Subject: [PATCH 7/9] Move some variable declarations into the scopes in which - they're used. - ---- - modules/printbackends/cups/gtkprintbackendcups.c | 39 +++++++++++---------- - 1 files changed, 20 insertions(+), 19 deletions(-) - -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index 6055b36..5d99dc0 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -1965,12 +1965,8 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - gboolean status_changed = FALSE; - GList *node; - gint i; -- gchar *reason_msg_desc = NULL; -- gchar *tmp_msg = NULL; -- gchar *tmp_msg2 = NULL; -- gboolean found = FALSE; - PrinterSetupInfo *info = g_slice_new0 (PrinterSetupInfo); -- -+ - /* Skip leading attributes until we hit a printer... - */ - while (attr != NULL && ippGetGroupTag (attr) != IPP_TAG_PRINTER) -@@ -2065,23 +2062,30 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - - if (info->state_msg != NULL && strlen (info->state_msg) == 0) - { -- if (info->is_paused && !info->is_accepting_jobs) -- /* Translators: this is a printer status. */ -+ gchar *tmp_msg2 = NULL; -+ if (info->is_paused && !info->is_accepting_jobs) -+ /* Translators: this is a printer status. */ - tmp_msg2 = g_strdup ( N_("Paused ; Rejecting Jobs")); - if (info->is_paused && info->is_accepting_jobs) -- /* Translators: this is a printer status. */ -+ /* Translators: this is a printer status. */ - tmp_msg2 = g_strdup ( N_("Paused")); - if (!info->is_paused && !info->is_accepting_jobs) -- /* Translators: this is a printer status. */ -+ /* Translators: this is a printer status. */ - tmp_msg2 = g_strdup ( N_("Rejecting Jobs")); - - if (tmp_msg2 != NULL) -- info->state_msg = tmp_msg2; -- } -+ { -+ info->state_msg = tmp_msg2; -+ g_free (tmp_msg2); -+ } -+ } - - /* Set description of the reason and combine it with printer-state-message. */ - if ( (info->reason_msg != NULL)) - { -+ gchar *reason_msg_desc = NULL; -+ gboolean found = FALSE; -+ - for (i = 0; i < G_N_ELEMENTS (printer_messages); i++) - { - if (strncmp (info->reason_msg, printer_messages[i], -@@ -2104,23 +2107,21 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - info->state_msg = reason_msg_desc; - else - { -- tmp_msg = g_strjoin (" ; ", info->state_msg, reason_msg_desc, NULL); -+ gchar *tmp_msg = NULL; -+ tmp_msg = g_strjoin (" ; ", info->state_msg, -+ reason_msg_desc, NULL); - info->state_msg = tmp_msg; -+ g_free (tmp_msg); - } - } -+ if (reason_msg_desc != NULL) -+ g_free (reason_msg_desc); - } - - status_changed |= gtk_printer_set_state_message (printer, info->state_msg); - status_changed |= gtk_printer_set_is_accepting_jobs (printer, info->is_accepting_jobs); - -- if (tmp_msg != NULL) -- g_free (tmp_msg); -- -- if (tmp_msg2 != NULL) -- g_free (tmp_msg2); - -- if (reason_msg_desc != NULL) -- g_free (reason_msg_desc); - - /* Set printer icon according to importance - (none, report, warning, error - report is omitted). */ --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0008-Bug-670373-gtk2-modules-printing-cups-gtkprintbackendcups.patch b/modulesets/patches/0008-Bug-670373-gtk2-modules-printing-cups-gtkprintbackendcups.patch deleted file mode 100644 index b7990c4..0000000 --- a/modulesets/patches/0008-Bug-670373-gtk2-modules-printing-cups-gtkprintbackendcups.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 97cacfeb64cb4f36e3465cd8dcfc91afafd0b97c Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 25 Feb 2012 17:53:32 -0800 -Subject: [PATCH 8/9] [Bug 670373] modules/printing/cups/gtkprintbackendcups.c - won't build with CUPS 1.6 - - Having refactored cups_request_printer_list_cb so that the cups - version-dependent block size is small enough to be handled in a single - ifdef, make the ifdef HAVE_CUPS_API_1_6 block ---- - modules/printbackends/cups/gtkprintbackendcups.c | 24 +++++++++++++++++++++- - 1 files changed, 23 insertions(+), 1 deletions(-) - -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index a51f681..c7ee014 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -2018,7 +2018,29 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - removed_printer_checklist = gtk_print_backend_get_printer_list (backend); - - response = gtk_cups_result_get_response (result); -+#ifdef HAVE_CUPS_API_1_6 -+ for (attr = ippFirstAttribute (response); attr != NULL; -+ attr = ippNextAttribute (response)) -+ { -+ GtkPrinter *printer; -+ gboolean status_changed = FALSE; -+ GList *node; -+ gint i; -+ PrinterSetupInfo *info = g_slice_new0 (PrinterSetupInfo); -+ -+ /* Skip leading attributes until we hit a printer... -+ */ -+ while (attr != NULL && ippGetGroupTag (attr) != IPP_TAG_PRINTER) -+ attr = ippNextAttribute (response); - -+ if (attr == NULL) -+ break; -+ while (attr != NULL && ippGetGroupTag (attr) == IPP_TAG_PRINTER) -+ { -+ cups_printer_handle_attribute (cups_backend, attr, info); -+ attr = ippNextAttribute (response); -+ } -+#else - for (attr = response->attrs; attr != NULL; attr = attr->next) - { - GtkPrinter *printer; -@@ -2034,12 +2056,12 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, - - if (attr == NULL) - break; -- - while (attr != NULL && ippGetGroupTag (attr) == IPP_TAG_PRINTER) - { - cups_printer_handle_attribute (cups_backend, attr, info); - attr = attr->next; - } -+#endif - - if (info->printer_name == NULL || - (info->printer_uri == NULL && info->member_uris == NULL)) --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0008-Bug-670373-gtk3-modules-printing-cups-gtkprintbackendcups.patch b/modulesets/patches/0008-Bug-670373-gtk3-modules-printing-cups-gtkprintbackendcups.patch deleted file mode 100644 index 71d9937..0000000 --- a/modulesets/patches/0008-Bug-670373-gtk3-modules-printing-cups-gtkprintbackendcups.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/modules/printbackends/cups/gtkprintbackendcups.c 2012-04-20 15:18:59.000000000 -0700 -+++ b/modules/printbackends/cups/gtkprintbackendcups.c 2012-04-20 15:20:00.000000000 -0700 -@@ -1958,7 +1958,29 @@ - removed_printer_checklist = gtk_print_backend_get_printer_list (backend); - - response = gtk_cups_result_get_response (result); -+#ifdef HAVE_CUPS_API_1_6 -+ for (attr = ippFirstAttribute (response); attr != NULL; -+ attr = ippNextAttribute (response)) -+ { -+ GtkPrinter *printer; -+ gboolean status_changed = FALSE; -+ GList *node; -+ gint i; -+ PrinterSetupInfo *info = g_slice_new0 (PrinterSetupInfo); -+ -+ /* Skip leading attributes until we hit a printer... -+ */ -+ while (attr != NULL && ippGetGroupTag (attr) != IPP_TAG_PRINTER) -+ attr = ippNextAttribute (response); - -+ if (attr == NULL) -+ break; -+ while (attr != NULL && ippGetGroupTag (attr) == IPP_TAG_PRINTER) -+ { -+ cups_printer_handle_attribute (cups_backend, attr, info); -+ attr = ippNextAttribute (response); -+ } -+#else - for (attr = response->attrs; attr != NULL; attr = attr->next) - { - GtkPrinter *printer; -@@ -1971,7 +1993,6 @@ - */ - while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER) - attr = attr->next; -- - if (attr == NULL) - break; - -@@ -1980,6 +2001,7 @@ - cups_printer_handle_attribute (cups_backend, attr, info); - attr = attr->next; - } -+#endif - - if (info->printer_name == NULL || - (info->printer_uri == NULL && info->member_uris == NULL)) diff --git a/modulesets/patches/0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch b/modulesets/patches/0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch deleted file mode 100644 index 5b9153c..0000000 --- a/modulesets/patches/0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 259563958047ccbf6f61578f2d724fc731218304 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sun, 25 Sep 2011 12:03:54 -0700 -Subject: [PATCH 08/15] Implement GtkDragSourceOwner pasteboardChangedOwner: - ---- - gtk/gtkdnd-quartz.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c -index 084aada..21ce11a 100644 ---- a/gtk/gtkdnd-quartz.c -+++ b/gtk/gtkdnd-quartz.c -@@ -149,6 +149,8 @@ struct _GtkDragFindData - guint target_info; - GtkSelectionData selection_data; - -+ g_return_if_fail(info->source_widget != NULL); -+ g_return_if_fail(info->target_list != NULL); - selection_data.selection = GDK_NONE; - selection_data.data = NULL; - selection_data.length = -1; -@@ -171,6 +173,15 @@ struct _GtkDragFindData - } - } - -+- (void)pasteboardChangedOwner: (NSPasteboard*)sender -+{ -+ if (!info) return; -+ -+ info->target_list = NULL; -+ info->widget = NULL; -+ info->source_widget = NULL; -+} -+ - - (id)initWithInfo:(GtkDragSourceInfo *)anInfo - { - self = [super init]; - diff --git a/modulesets/patches/0009-Bug-670373-gtk2-modules-printing-cups-gtkprintbackendcups.patch b/modulesets/patches/0009-Bug-670373-gtk2-modules-printing-cups-gtkprintbackendcups.patch deleted file mode 100644 index c0d9d03..0000000 --- a/modulesets/patches/0009-Bug-670373-gtk2-modules-printing-cups-gtkprintbackendcups.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 2d59385649cf916594fd802a4445525a3c6656b1 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 25 Feb 2012 17:54:10 -0800 -Subject: [PATCH 9/9] [Bug 670373] modules/printing/cups/gtkprintbackendcups.c - won't build with CUPS 1.6 - - Fix up accesses of ipp structures in gtkcupsutils.c ---- - modules/printbackends/cups/gtkcupsutils.c | 20 ++++++++++++++------ - 1 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/modules/printbackends/cups/gtkcupsutils.c b/modules/printbackends/cups/gtkcupsutils.c -index a1eb1a1..9fe79d1 100644 ---- a/modules/printbackends/cups/gtkcupsutils.c -+++ b/modules/printbackends/cups/gtkcupsutils.c -@@ -83,6 +83,14 @@ static GtkCupsRequestStateFunc get_states[] = { - _get_read_data - }; - -+#ifndef HAVE_CUPS_API_1_6 -+#define ippSetOperation(ipp_request, ipp_op_id) ipp_request->request.op.operation_id = ipp_op_id -+#define ippSetRequestId(ipp_request, ipp_rq_id) ipp_request->request.op.request_id = ipp_rq_id -+#define ippSetState(ipp_request, ipp_state) ipp_request->state = ipp_state -+#define ippGetString(attr, index, foo) attr->values[index].string.text -+#define ippGetCount(attr) attr->num_values -+#endif -+ - static void - gtk_cups_result_set_error (GtkCupsResult *result, - GtkCupsErrorType error_type, -@@ -165,8 +173,8 @@ gtk_cups_request_new_with_username (http_t *connection, - request->data_io = data_io; - - request->ipp_request = ippNew (); -- request->ipp_request->request.op.operation_id = operation_id; -- request->ipp_request->request.op.request_id = 1; -+ ippSetOperation (request->ipp_request, operation_id); -+ ippSetRequestId (request->ipp_request, 1); - - language = cupsLangDefault (); - -@@ -352,8 +360,8 @@ gtk_cups_request_ipp_get_string (GtkCupsRequest *request, - name, - tag); - -- if (attribute != NULL && attribute->values != NULL) -- return attribute->values[0].string.text; -+ if (attribute != NULL && ippGetCount (attribute) > 0) -+ return ippGetString (attribute, 0, NULL); - else - return NULL; - } -@@ -731,7 +739,7 @@ _post_send (GtkCupsRequest *request) - request->attempts = 0; - - request->state = GTK_CUPS_POST_WRITE_REQUEST; -- request->ipp_request->state = IPP_IDLE; -+ ippSetState (request->ipp_request, IPP_IDLE); - } - - static void -@@ -1223,7 +1231,7 @@ _get_send (GtkCupsRequest *request) - request->state = GTK_CUPS_GET_CHECK; - request->poll_state = GTK_CUPS_HTTP_READ; - -- request->ipp_request->state = IPP_IDLE; -+ ippSetState (request->ipp_request, IPP_IDLE); - } - - static void --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/0009-Bug-670373-gtk3-modules-printing-cups-gtkprintbackendcups.patch b/modulesets/patches/0009-Bug-670373-gtk3-modules-printing-cups-gtkprintbackendcups.patch deleted file mode 100644 index e54899f..0000000 --- a/modulesets/patches/0009-Bug-670373-gtk3-modules-printing-cups-gtkprintbackendcups.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 2478a24b02db310c2db3e5abd3f48dc5ed21b1f1 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sun, 19 Feb 2012 15:11:24 -0800 -Subject: [PATCH 9/9] [Bug 670373] modules/printing/cups/gtkprintbackendcups.c - won't build with CUPS 1.6 - -Fix up accesses of ipp structures in gtkcupsutils.c ---- - modules/printbackends/cups/gtkcupsutils.c | 20 ++++++++++++++------ - 1 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/modules/printbackends/cups/gtkcupsutils.c b/modules/printbackends/cups/gtkcupsutils.c -index 39a743f..48b2a27 100644 ---- a/modules/printbackends/cups/gtkcupsutils.c -+++ b/modules/printbackends/cups/gtkcupsutils.c -@@ -83,6 +83,14 @@ static GtkCupsRequestStateFunc get_states[] = { - _get_read_data - }; - -+#ifndef HAVE_CUPS_API_1_6 -+#define ippSetOperation(ipp_request, ipp_op_id) ipp_request->request.op.operation_id = ipp_op_id -+#define ippSetRequestId(ipp_request, ipp_rq_id) ipp_request->request.op.request_id = ipp_rq_id -+#define ippSetState(ipp_request, ipp_state) ipp_request->state = ipp_state -+#define ippGetString(attr, index, foo) attr->values[index].string.text -+#define ippGetCount(attr) attr->num_values -+#endif -+ - static void - gtk_cups_result_set_error (GtkCupsResult *result, - GtkCupsErrorType error_type, -@@ -165,8 +173,8 @@ gtk_cups_request_new_with_username (http_t *connection, - request->data_io = data_io; - - request->ipp_request = ippNew (); -- request->ipp_request->request.op.operation_id = operation_id; -- request->ipp_request->request.op.request_id = 1; -+ ippSetOperation (request->ipp_request, operation_id); -+ ippSetRequestId (request->ipp_request, 1); - - language = cupsLangDefault (); - -@@ -355,8 +363,8 @@ gtk_cups_request_ipp_get_string (GtkCupsRequest *request, - name, - tag); - -- if (attribute != NULL && attribute->values != NULL) -- return attribute->values[0].string.text; -+ if (attribute != NULL && ippGetCount (attribute) > 0) -+ return ippGetString (attribute, 0, NULL); - else - return NULL; - } -@@ -734,7 +742,7 @@ _post_send (GtkCupsRequest *request) - request->attempts = 0; - - request->state = GTK_CUPS_POST_WRITE_REQUEST; -- request->ipp_request->state = IPP_IDLE; -+ ippSetState (request->ipp_request, IPP_IDLE); - } - - static void -@@ -1227,7 +1235,7 @@ _get_send (GtkCupsRequest *request) - request->state = GTK_CUPS_GET_CHECK; - request->poll_state = GTK_CUPS_HTTP_READ; - -- request->ipp_request->state = IPP_IDLE; -+ ippSetState (request->ipp_request, IPP_IDLE); - } - - static void --- -1.7.7.5 (Apple Git-28) - diff --git a/modulesets/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch b/modulesets/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch deleted file mode 100644 index 5d54118..0000000 --- a/modulesets/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 1b8aa4be14d80f53c85552adc7cb2192afde3217 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Mon, 23 Feb 2015 15:12:33 -0800 -Subject: [PATCH] Fix clang complaining about missing void in function - prototypes. - ---- - plug-ins/twain/tw_local.h | 6 +++--- - plug-ins/twain/tw_mac.c | 6 ++++-- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/plug-ins/twain/tw_local.h b/plug-ins/twain/tw_local.h -index e76cf87..45b2fca 100644 ---- a/plug-ins/twain/tw_local.h -+++ b/plug-ins/twain/tw_local.h -@@ -34,7 +34,7 @@ TW_UINT16 callDSM(pTW_IDENTITY, pTW_IDENTITY, - TW_UINT16, TW_MEMREF); - - int twainIsAvailable(void); --void twainQuitApplication (); -+void twainQuitApplication (void); - gboolean twainSetupCallback (pTW_SESSION twSession); - - TW_HANDLE twainAllocHandle(size_t size); -@@ -42,7 +42,7 @@ TW_MEMREF twainLockHandle (TW_HANDLE handle); - void twainUnlockHandle (TW_HANDLE handle); - void twainFreeHandle (TW_HANDLE handle); - --int twainMain (); --int scanImage (); -+int twainMain (void); -+int scanImage (void); - - #endif -diff --git a/plug-ins/twain/tw_mac.c b/plug-ins/twain/tw_mac.c -index 796d28e..48cc0d9 100644 ---- a/plug-ins/twain/tw_mac.c -+++ b/plug-ins/twain/tw_mac.c -@@ -146,7 +146,7 @@ TW_UINT16 twainCallback(pTW_IDENTITY pOrigin, - return TWRC_SUCCESS; - } - --void twainQuitApplication () -+void twainQuitApplication (void) - { - QuitApplicationEventLoop(); - } -@@ -192,14 +192,16 @@ static void twainSetupMacUI() - - /* Voodoo magic fix inspired by java_swt launcher */ - /* Without this the icon setting doesn't work about half the time. */ -+#ifdef __LP_64__ - CGrafPtr p = BeginQDContextForApplicationDockTile(); - EndQDContextForApplicationDockTile(p); - - SetApplicationDockTileImage (icon); -+#endif - } - - int --twainMain() -+twainMain(void) - { - EventLoopTimerRef timer; - OSStatus err; --- -2.2.2 - diff --git a/modulesets/patches/Bug-673403-replace-values_h.patch b/modulesets/patches/Bug-673403-replace-values_h.patch deleted file mode 100644 index 8cd1f7f..0000000 --- a/modulesets/patches/Bug-673403-replace-values_h.patch +++ /dev/null @@ -1,14 +0,0 @@ - ---- a/babl/babl-palette.c~ Thu Mar 29 16:10:26 2012 -+++ b/babl/babl-palette.c Sat Oct 27 16:04:12 2012 -@@ -19,7 +19,7 @@ - #include - #include - #include --#include -+#include - #include - #include "config.h" - #include "babl-internal.h" - -Diff finished. Sat Oct 27 16:11:32 2012 diff --git a/modulesets/patches/Cairo-44584-llvm-no-flto.patch b/modulesets/patches/Cairo-44584-llvm-no-flto.patch deleted file mode 100644 index e756840..0000000 --- a/modulesets/patches/Cairo-44584-llvm-no-flto.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -c /Users/john/Documents/Lion/Gnucash-Build/Gnucash-svn/src/cairo-1.10.2/configure\~ /Users/john/Documents/Lion/Gnucash-Build/Gnucash-svn/src/cairo-1.10.2/configure -*** a/configure Sat Dec 25 06:22:57 2010 ---- b/configure Sun Jan 8 11:11:05 2012 -*************** -*** 17236,17242 **** - MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \ - -erroff=E_ENUM_TYPE_MISMATCH_OP" - -! MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto" - - MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2" - ---- 17236,17245 ---- - MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \ - -erroff=E_ENUM_TYPE_MISMATCH_OP" - -! MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" -! if [ $CC != "llvm-gcc-4.2"]; then -! MAYBE_WARN="$MAYBE_WARN -flto" -! fi - - MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2" - - -Diff finished. Sun Jan 8 11:12:32 2012 diff --git a/modulesets/patches/GConf-characters.patch b/modulesets/patches/GConf-characters.patch deleted file mode 100644 index 57214d5..0000000 --- a/modulesets/patches/GConf-characters.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -c /Volumes/RAID1/Gnucash-Build/Gnucash-svn/src/GConf-2.28.0/gconf/gconf-backend.c /var/folders/8Z/8ZMrxptP2RW3\+U\+8ZNMZY\+\+\+\+TI/-Tmp-/buffer-content-344872Ae ---- a/gconf/gconf-backend.c Wed Aug 19 08:35:32 2009 -+++ b/gconf/gconf-backend.c Wed Aug 19 08:35:32 2009 -@@ -31,11 +31,7 @@ - * The important one here is not to allow ';' because we use that - * internally as a list delimiter. See GCONF_DATABASE_LIST_DELIM - */ --static const char invalid_chars[] = --#ifndef G_OS_WIN32 -- /* Space is common in user names (and thus home directories) on Windows */ -- " " --#endif -+static const char invalid_chars[] = - "\t\r\n\"$&<>,+=#!()'|{}[]?~`;%\\"; - - static gboolean - -Diff finished. Thu Aug 25 16:05:55 2011 diff --git a/modulesets/patches/Glade-3-8-Bug-663492-Update-Mac-integration-bindings-to-.patch b/modulesets/patches/Glade-3-8-Bug-663492-Update-Mac-integration-bindings-to-.patch deleted file mode 100644 index 261e8ff..0000000 --- a/modulesets/patches/Glade-3-8-Bug-663492-Update-Mac-integration-bindings-to-.patch +++ /dev/null @@ -1,408 +0,0 @@ -From 5284fe2e57aa004139b38ca13972e50652cffa29 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Tue, 8 Nov 2011 16:10:10 -0800 -Subject: [PATCH 1/2] [Glade Bug 663492] Update Mac integration bindings to - GtkOSXApplication - ---- - configure.ac | 12 ++++++------ - gladeui/Makefile.am | 6 +++--- - gladeui/glade-app.c | 8 +++----- - src/Makefile.am | 4 ++-- - src/glade-window.c | 35 ++++++++++++++++++++++++++++++----- - 5 files changed, 44 insertions(+), 21 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d398e2a..8f40b99 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -230,9 +230,9 @@ dnl ================================================================ - _gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0` - AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz]) - if test "x$_gdk_tgt" = xquartz; then -- PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration) -+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration) - -- IGE_MAC_BUNDLE_FLAG= -+ GTK_MAC_BUNDLE_FLAG= - - AC_ARG_ENABLE(mac-bundle, - AS_HELP_STRING([--enable-mac-bundle], [enable mac bundling]), -@@ -241,12 +241,12 @@ if test "x$_gdk_tgt" = xquartz; then - if test "x$build_bundle" = xyes; then - AC_MSG_NOTICE([enableing mac bundle..]) - -- IGE_MAC_BUNDLE_FLAG=-DMAC_BUNDLE -+ GTK_MAC_BUNDLE_FLAG=-DMAC_BUNDLE - fi - -- AC_SUBST(IGE_MAC_BUNDLE_FLAG) -- AC_SUBST(IGE_MAC_LIBS) -- AC_SUBST(IGE_MAC_CFLAGS) -+ AC_SUBST(GTK_MAC_BUNDLE_FLAG) -+ AC_SUBST(GTK_MAC_LIBS) -+ AC_SUBST(GTK_MAC_CFLAGS) - fi - - AC_SUBST([AM_CPPFLAGS]) -diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am -index c2ef6e4..b4741b2 100644 ---- a/gladeui/Makefile.am -+++ b/gladeui/Makefile.am -@@ -67,8 +67,8 @@ libgladeui_1_la_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(GTK_CFLAGS) \ -- $(IGE_MAC_BUNDLE_FLAG) \ -- $(IGE_MAC_CFLAGS) \ -+ $(GTK_MAC_BUNDLE_FLAG) \ -+ $(GTK_MAC_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CPPFLAGS) - -@@ -76,7 +76,7 @@ libgladeui_1_la_CFLAGS = \ - $(AM_CFLAGS) - - libgladeui_1_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS) --libgladeui_1_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS) -+libgladeui_1_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS) - - - libgladeuiincludedir=$(includedir)/libgladeui-1.0/gladeui -diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c -index 88cdd48..8af1f08 100644 ---- a/gladeui/glade-app.c -+++ b/gladeui/glade-app.c -@@ -49,7 +49,7 @@ - #include - - #ifdef MAC_INTEGRATION --# include -+# include - #endif - - #define GLADE_CONFIG_FILENAME "glade-3.conf" -@@ -380,10 +380,8 @@ build_package_paths (void) - prefix = g_win32_get_package_installation_directory_of_module (NULL); - - # else // defined (MAC_INTEGRATION) && defined (MAC_BUNDLE) -- IgeMacBundle *bundle = ige_mac_bundle_get_default (); -- -- prefix = g_build_filename (ige_mac_bundle_get_path (bundle), "Contents", "Resources", NULL); --# endif -+ prefix = quartz_application_get_bundle_path (); -+# endif - - pixmaps_dir = g_build_filename (prefix, "share", PACKAGE, "pixmaps", NULL); - catalogs_dir = g_build_filename (prefix, "share", PACKAGE, "catalogs", NULL); -diff --git a/src/Makefile.am b/src/Makefile.am -index 4ec720a..00b4150 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -7,7 +7,7 @@ glade_3_CPPFLAGS = \ - -I$(top_builddir) \ - -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \ - $(GTK_CFLAGS) \ -- $(IGE_MAC_CFLAGS) \ -+ $(GTK_MAC_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CPPFLAGS) - -@@ -16,7 +16,7 @@ glade_3_CFLAGS = \ - - glade_3_LDFLAGS = $(AM_LDFLAGS) - --glade_3_LDADD = $(top_builddir)/gladeui/libgladeui-1.la $(IGE_MAC_LIBS) -+glade_3_LDADD = $(top_builddir)/gladeui/libgladeui-1.la $(GTK_MAC_LIBS) - - glade_3_SOURCES = \ - glade-window.c \ -diff --git a/src/glade-window.c b/src/glade-window.c -index b21dba7..f9f971b 100644 ---- a/src/glade-window.c -+++ b/src/glade-window.c -@@ -42,7 +42,7 @@ - #include - - #ifdef MAC_INTEGRATION --# include -+# include - #endif - - -@@ -3369,10 +3369,35 @@ glade_window_init (GladeWindow *window) - #ifdef MAC_INTEGRATION - { - /* Fix up the menubar for MacOSX Quartz builds */ -+ GtkWidget *sep; -+ GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL); - gtk_widget_hide (menubar); -- ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menubar)); -- -- widget = gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/Quit"); -- ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (widget)); -+ gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar)); -+ widget = -+ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/Quit"); -+ gtk_widget_hide (widget); -+ widget = -+ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu/About"); -+ gtk_osxapplication_insert_app_menu_item (theApp, widget, 0); -+ sep = gtk_separator_menu_item_new(); -+ g_object_ref(sep); -+ gtk_osxapplication_insert_app_menu_item (theApp, sep, 1); -+ -+ widget = -+ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/EditMenu/Preferences"); -+ gtk_osxapplication_insert_app_menu_item (theApp, widget, 2); -+ sep = gtk_separator_menu_item_new(); -+ g_object_ref(sep); -+ gtk_osxapplication_insert_app_menu_item (theApp, sep, 3); -+ -+ widget = -+ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu"); -+ gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(widget)); -+ -+ g_signal_connect(theApp, "NSApplicationWillTerminate", -+ G_CALLBACK(quit_cb), window); -+ -+ gtk_osxapplication_ready(theApp); -+ - } - #endif - ---- a/configure Mon Apr 4 05:29:57 2011 -+++ b/configure Tue Nov 8 17:02:02 2011 -@@ -752,9 +752,9 @@ - AM_CXXFLAGS - AM_CFLAGS - AM_CPPFLAGS --IGE_MAC_BUNDLE_FLAG --IGE_MAC_LIBS --IGE_MAC_CFLAGS -+GTK_MAC_BUNDLE_FLAG -+GTK_MAC_LIBS -+GTK_MAC_CFLAGS - GDK_TARGET_QUARTZ_FALSE - GDK_TARGET_QUARTZ_TRUE - WINDRES -@@ -1026,8 +1026,8 @@ - GNOME_LIBS - PYGTK_CFLAGS - PYGTK_LIBS --IGE_MAC_CFLAGS --IGE_MAC_LIBS' -+GTK_MAC_CFLAGS -+GTK_MAC_LIBS' - - - # Initialize some variables set by options. -@@ -1702,10 +1702,10 @@ - PYGTK_CFLAGS - C compiler flags for PYGTK, overriding pkg-config - PYGTK_LIBS linker flags for PYGTK, overriding pkg-config -- IGE_MAC_CFLAGS -- C compiler flags for IGE_MAC, overriding pkg-config -- IGE_MAC_LIBS -- linker flags for IGE_MAC, overriding pkg-config -+ GTK_MAC_CFLAGS -+ C compiler flags for GTK_MAC, overriding pkg-config -+ GTK_MAC_LIBS -+ linker flags for GTK_MAC, overriding pkg-config - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. -@@ -14485,35 +14485,35 @@ - if test "x$_gdk_tgt" = xquartz; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IGE_MAC" >&5 --$as_echo_n "checking for IGE_MAC... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_MAC" >&5 -+$as_echo_n "checking for GTK_MAC... " >&6; } - --if test -n "$IGE_MAC_CFLAGS"; then -- pkg_cv_IGE_MAC_CFLAGS="$IGE_MAC_CFLAGS" -+if test -n "$GTK_MAC_CFLAGS"; then -+ pkg_cv_GTK_MAC_CFLAGS="$GTK_MAC_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_IGE_MAC_CFLAGS=`$PKG_CONFIG --cflags "ige-mac-integration" 2>/dev/null` -+ pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration" 2>/dev/null` - else - pkg_failed=yes - fi - else - pkg_failed=untried - fi --if test -n "$IGE_MAC_LIBS"; then -- pkg_cv_IGE_MAC_LIBS="$IGE_MAC_LIBS" -+if test -n "$GTK_MAC_LIBS"; then -+ pkg_cv_GTK_MAC_LIBS="$GTK_MAC_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_IGE_MAC_LIBS=`$PKG_CONFIG --libs "ige-mac-integration" 2>/dev/null` -+ pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -14531,22 +14531,22 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ige-mac-integration" 2>&1` -+ GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk-mac-integration" 2>&1` - else -- IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ige-mac-integration" 2>&1` -+ GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk-mac-integration" 2>&1` - fi - # Put the nasty error message in config.log where it belongs -- echo "$IGE_MAC_PKG_ERRORS" >&5 -+ echo "$GTK_MAC_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements (ige-mac-integration) were not met: -+ as_fn_error "Package requirements (gtk-mac-integration) were not met: - --$IGE_MAC_PKG_ERRORS -+$GTK_MAC_PKG_ERRORS - - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --Alternatively, you may set the environment variables IGE_MAC_CFLAGS --and IGE_MAC_LIBS to avoid the need to call pkg-config. -+Alternatively, you may set the environment variables GTK_MAC_CFLAGS -+and GTK_MAC_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " "$LINENO" 5 - elif test $pkg_failed = untried; then -@@ -14556,21 +14556,21 @@ - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - --Alternatively, you may set the environment variables IGE_MAC_CFLAGS --and IGE_MAC_LIBS to avoid the need to call pkg-config. -+Alternatively, you may set the environment variables GTK_MAC_CFLAGS -+and GTK_MAC_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - - To get pkg-config, see . - See \`config.log' for more details." "$LINENO" 5; } - else -- IGE_MAC_CFLAGS=$pkg_cv_IGE_MAC_CFLAGS -- IGE_MAC_LIBS=$pkg_cv_IGE_MAC_LIBS -+ GTK_MAC_CFLAGS=$pkg_cv_GTK_MAC_CFLAGS -+ GTK_MAC_LIBS=$pkg_cv_GTK_MAC_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi - -- IGE_MAC_BUNDLE_FLAG= -+ GTK_MAC_BUNDLE_FLAG= - - # Check whether --enable-mac-bundle was given. - if test "${enable_mac_bundle+set}" = set; then : -@@ -14584,7 +14584,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: enableing mac bundle.." >&5 - $as_echo "$as_me: enableing mac bundle.." >&6;} - -- IGE_MAC_BUNDLE_FLAG=-DMAC_BUNDLE -+ GTK_MAC_BUNDLE_FLAG=-DMAC_BUNDLE - fi - - - -Diff finished. Tue Nov 8 17:02:24 2011 -diff -c /Volumes/RAID1/local/gtk-stable/src/glade3-3.8.0/src/Makefile.in\~ /Volumes/RAID1/local/gtk-stable/src/glade3-3.8.0/src/Makefile.in ---- a/src/Makefile.in Mon Apr 4 05:29:56 2011 -+++ b/src/Makefile.in Tue Nov 8 17:04:37 2011 -@@ -159,9 +159,9 @@ - GTK_LIBS = @GTK_LIBS@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ --IGE_MAC_BUNDLE_FLAG = @IGE_MAC_BUNDLE_FLAG@ --IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@ --IGE_MAC_LIBS = @IGE_MAC_LIBS@ -+GTK_MAC_BUNDLE_FLAG = @GTK_MAC_BUNDLE_FLAG@ -+GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@ -+GTK_MAC_LIBS = @GTK_MAC_LIBS@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -294,7 +294,7 @@ - -I$(top_builddir) \ - -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \ - $(GTK_CFLAGS) \ -- $(IGE_MAC_CFLAGS) \ -+ $(GTK_MAC_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CPPFLAGS) - -@@ -303,7 +303,7 @@ - - glade_3_LDFLAGS = $(AM_LDFLAGS) $(am__append_2) - glade_3_LDADD = $(top_builddir)/gladeui/libgladeui-1.la \ -- $(IGE_MAC_LIBS) $(am__append_1) -+ $(GTK_MAC_LIBS) $(am__append_1) - glade_3_SOURCES = \ - glade-window.c \ - glade-window.h \ - -Diff finished. Tue Nov 8 17:04:45 2011 -diff -c /Volumes/RAID1/local/gtk-stable/src/glade3-3.8.0/gladeui/Makefile.in\~ /Volumes/RAID1/local/gtk-stable/src/glade3-3.8.0/gladeui/Makefile.in ---- a/gladeui/Makefile.in Mon Apr 4 05:29:54 2011 -+++ b/gladeui/Makefile.in Tue Nov 8 17:06:44 2011 -@@ -217,9 +217,9 @@ - GTK_LIBS = @GTK_LIBS@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ --IGE_MAC_BUNDLE_FLAG = @IGE_MAC_BUNDLE_FLAG@ --IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@ --IGE_MAC_LIBS = @IGE_MAC_LIBS@ -+GTK_MAC_BUNDLE_FLAG = @GTK_MAC_BUNDLE_FLAG@ -+GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@ -+GTK_MAC_LIBS = @GTK_MAC_LIBS@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -413,8 +413,8 @@ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(GTK_CFLAGS) \ -- $(IGE_MAC_BUNDLE_FLAG) \ -- $(IGE_MAC_CFLAGS) \ -+ $(GTK_MAC_BUNDLE_FLAG) \ -+ $(GTK_MAC_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CPPFLAGS) - -@@ -424,7 +424,7 @@ - libgladeui_1_la_LDFLAGS = -version-info \ - $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS) \ - $(am__append_1) $(am__append_2) --libgladeui_1_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS) -+libgladeui_1_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS) - libgladeuiincludedir = $(includedir)/libgladeui-1.0/gladeui - libgladeuiinclude_HEADERS = \ - glade.h \ - -Diff finished. Tue Nov 8 17:06:50 2011 - --- -1.7.6.3.dirty - diff --git a/modulesets/patches/Glade-3-8-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch b/modulesets/patches/Glade-3-8-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch deleted file mode 100644 index d22ca84..0000000 --- a/modulesets/patches/Glade-3-8-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 5b5a2009d1a3cf6ffe6e579981d54e1cc11dcf78 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Tue, 8 Nov 2011 16:14:28 -0800 -Subject: [PATCH 2/2] [Mac Integration] Fix up menu accelerators for Mac - -Makes use of a new feature in Gtk+-2.24.7 & Gtk+-3.2.1 which provides a -new modifier symbol, , which uses "command" as the accelerator -modifier on Quartz and "control" everywhere else. - -Special cases the project accelerators, since disappears on -Quartz-integrated menus, leaving just the number as an accelerator and -preventing its use in text. ---- - src/glade-window.c | 28 ++++++++++++++++++---------- - 1 files changed, 18 insertions(+), 10 deletions(-) - -diff --git a/src/glade-window.c b/src/glade-window.c -index f9f971b..6b7934c 100644 ---- a/src/glade-window.c -+++ b/src/glade-window.c -@@ -931,7 +931,11 @@ refresh_projects_list_menu (GladeWindow *window) - gchar action_name[32]; - gchar *project_name; - gchar *tooltip; -+#ifdef MAC_INTEGRATION -+ gchar accel[11]; -+#else - gchar accel[7]; -+#endif - - view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (p->notebook), i); - project = glade_design_view_get_project (GLADE_DESIGN_VIEW (view)); -@@ -953,7 +957,11 @@ refresh_projects_list_menu (GladeWindow *window) - - /* alt + 1, 2, 3... 0 to switch to the first ten tabs */ - if (i < 10) -+#ifdef MAC_INTEGRATION -+ g_snprintf (accel, sizeof (accel), "%d", (i + 1) % 10); -+#else - g_snprintf (accel, sizeof (accel), "%d", (i + 1) % 10); -+#endif - else - accel[0] = '\0'; - -@@ -2032,15 +2040,15 @@ static GtkActionEntry static_entries[] = { - { "RedoMenu", NULL, NULL }, - - /* FileMenu */ -- { "New", GTK_STOCK_NEW, NULL, "N", -+ { "New", GTK_STOCK_NEW, NULL, "N", - N_("Create a new project"), G_CALLBACK (new_cb) }, - -- { "Open", GTK_STOCK_OPEN, N_("_Open\342\200\246") ,"O", -+ { "Open", GTK_STOCK_OPEN, N_("_Open\342\200\246") ,"O", - N_("Open a project"), G_CALLBACK (open_cb) }, - - { "OpenRecent", NULL, N_("Open _Recent") }, - -- { "Quit", GTK_STOCK_QUIT, NULL, "Q", -+ { "Quit", GTK_STOCK_QUIT, NULL, "Q", - N_("Quit the program"), G_CALLBACK (quit_cb) }, - - /* ViewMenu */ -@@ -2059,20 +2067,20 @@ static guint n_static_entries = G_N_ELEMENTS (static_entries); - static GtkActionEntry project_entries[] = { - - /* FileMenu */ -- { "Save", GTK_STOCK_SAVE, NULL, "S", -+ { "Save", GTK_STOCK_SAVE, NULL, "S", - N_("Save the current project"), G_CALLBACK (save_cb) }, - - { "SaveAs", GTK_STOCK_SAVE_AS, N_("Save _As\342\200\246"), NULL, - N_("Save the current project with a different name"), G_CALLBACK (save_as_cb) }, - -- { "Close", GTK_STOCK_CLOSE, NULL, "W", -+ { "Close", GTK_STOCK_CLOSE, NULL, "W", - N_("Close the current project"), G_CALLBACK (close_cb) }, - - /* EditMenu */ -- { "Undo", GTK_STOCK_UNDO, NULL, "Z", -+ { "Undo", GTK_STOCK_UNDO, NULL, "Z", - N_("Undo the last action"), G_CALLBACK (undo_cb) }, - -- { "Redo", GTK_STOCK_REDO, NULL, "Z", -+ { "Redo", GTK_STOCK_REDO, NULL, "Z", - N_("Redo the last action"), G_CALLBACK (redo_cb) }, - - { "Cut", GTK_STOCK_CUT, NULL, NULL, -@@ -2087,14 +2095,14 @@ static GtkActionEntry project_entries[] = { - { "Delete", GTK_STOCK_DELETE, NULL, "Delete", - N_("Delete the selection"), G_CALLBACK (delete_cb) }, - -- { "Preferences", GTK_STOCK_PREFERENCES, NULL, "P", -+ { "Preferences", GTK_STOCK_PREFERENCES, NULL, "P", - N_("Modify project preferences"), G_CALLBACK (preferences_cb) }, - - /* ProjectsMenu */ -- { "PreviousProject", NULL, N_("_Previous Project"), "Page_Up", -+ { "PreviousProject", NULL, N_("_Previous Project"), "Page_Up", - N_("Activate previous project"), G_CALLBACK (previous_project_cb) }, - -- { "NextProject", NULL, N_("_Next Project"), "Page_Down", -+ { "NextProject", NULL, N_("_Next Project"), "Page_Down", - N_("Activate next project"), G_CALLBACK (next_project_cb) } - - --- -1.7.6.3.dirty - diff --git a/modulesets/patches/Glade-master-Bug-663492-Update-Mac-integration-bindings-to-.patch b/modulesets/patches/Glade-master-Bug-663492-Update-Mac-integration-bindings-to-.patch deleted file mode 100644 index 7e21f44..0000000 --- a/modulesets/patches/Glade-master-Bug-663492-Update-Mac-integration-bindings-to-.patch +++ /dev/null @@ -1,446 +0,0 @@ -From e90717a501d3e99509c0e6ade83e3876d4a84f68 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Tue, 8 Nov 2011 13:26:24 -0800 -Subject: [PATCH 1/2] [Glade Bug 663492] Update Mac integration bindings to - GtkOSXApplication - ---- - configure.ac | 14 +++++++------- - gladeui/Makefile.am | 10 +++++----- - gladeui/glade-app.c | 7 ++----- - src/Makefile.am | 4 ++-- - src/glade-window.c | 33 ++++++++++++++++++++++++++++----- - 5 files changed, 44 insertions(+), 24 deletions(-) - -diff --git a/configure.ac b/configure.ac -index faa003d..9652f71 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -222,12 +222,12 @@ - dnl ================================================================ - dnl Check for GDK Quartz and MacOSX integration package - dnl ================================================================ --_gdk_tgt=`$PKG_CONFIG --variable=target gdk-3.0` -+_gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0` - AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz]) - if test "x$_gdk_tgt" = xquartz; then -- PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration) -+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration) - -- IGE_MAC_BUNDLE_FLAG= -+ GTK_MAC_BUNDLE_FLAG= - - AC_ARG_ENABLE(mac-bundle, - AS_HELP_STRING([--enable-mac-bundle], [enable mac bundling]), -@@ -236,12 +236,12 @@ - if test "x$build_bundle" = xyes; then - AC_MSG_NOTICE([enableing mac bundle..]) - -- IGE_MAC_BUNDLE_FLAG=-DMAC_BUNDLE -+ GTK_MAC_BUNDLE_FLAG=-DMAC_BUNDLE - fi - -- AC_SUBST(IGE_MAC_BUNDLE_FLAG) -- AC_SUBST(IGE_MAC_LIBS) -- AC_SUBST(IGE_MAC_CFLAGS) -+ AC_SUBST(GTK_MAC_BUNDLE_FLAG) -+ AC_SUBST(GTK_MAC_LIBS) -+ AC_SUBST(GTK_MAC_CFLAGS) - fi - - -diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am -index 76fef97..7563f99 100644 ---- a/gladeui/Makefile.am -+++ b/gladeui/Makefile.am -@@ -8,7 +8,7 @@ - -I$(top_builddir) \ - -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \ - $(GTK_CFLAGS) \ -- $(IGE_MAC_CFLAGS) \ -+ $(GTK_MAC_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CPPFLAGS) - -@@ -17,7 +17,7 @@ - - glade_previewer_LDFLAGS = $(AM_LDFLAGS) - --glade_previewer_LDADD = libgladeui-2.la $(IGE_MAC_LIBS) -+glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS) - - glade_previewer_SOURCES = \ - glade-previewer.c -@@ -95,8 +95,8 @@ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(GTK_CFLAGS) \ -- $(IGE_MAC_BUNDLE_FLAG) \ -- $(IGE_MAC_CFLAGS) \ -+ $(GTK_MAC_BUNDLE_FLAG) \ -+ $(GTK_MAC_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CPPFLAGS) - -@@ -104,7 +104,7 @@ - $(AM_CFLAGS) - - libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS) --libgladeui_2_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS) -+libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS) - - - libgladeuiincludedir=$(includedir)/libgladeui-2.0/gladeui -diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c -index c7ca694..3f906fb 100644 ---- a/gladeui/glade-app.c -+++ b/gladeui/glade-app.c -@@ -48,7 +48,7 @@ - #include - - #ifdef MAC_INTEGRATION --# include -+# include - #endif - - #define GLADE_CONFIG_FILENAME "glade.conf" -@@ -225,11 +225,8 @@ - prefix = g_win32_get_package_installation_directory_of_module (NULL); - - # else // defined (MAC_INTEGRATION) && defined (MAC_BUNDLE) -- IgeMacBundle *bundle = ige_mac_bundle_get_default (); -+ prefix = quartz_application_get_resource_path (); - -- prefix = -- g_build_filename (ige_mac_bundle_get_path (bundle), "Contents", -- "Resources", NULL); - # endif - - pixmaps_dir = g_build_filename (prefix, "share", PACKAGE, "pixmaps", NULL); -diff --git a/src/Makefile.am b/src/Makefile.am -index 52db167..cddaeec 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -7,7 +7,7 @@ - -I$(top_builddir) \ - -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \ - $(GTK_CFLAGS) \ -- $(IGE_MAC_CFLAGS) \ -+ $(GTK_MAC_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CPPFLAGS) - -@@ -16,7 +16,7 @@ - - glade_LDFLAGS = $(AM_LDFLAGS) - --glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(IGE_MAC_LIBS) -+glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS) - - glade_SOURCES = \ - glade-window.c \ -diff --git a/src/glade-window.c b/src/glade-window.c -index eb564c0..368c007 100644 ---- a/src/glade-window.c -+++ b/src/glade-window.c -@@ -41,7 +41,7 @@ - #include - - #ifdef MAC_INTEGRATION --# include -+# include - #endif - - -@@ -3519,12 +3519,35 @@ - #ifdef MAC_INTEGRATION - { - /* Fix up the menubar for MacOSX Quartz builds */ -+ GtkWidget *sep; -+ GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL); - gtk_widget_hide (menubar); -- ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menubar)); -- -+ gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar)); - widget = - gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/Quit"); -- ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (widget)); -+ gtk_widget_hide (widget); -+ widget = -+ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu/About"); -+ gtk_osxapplication_insert_app_menu_item (theApp, widget, 0); -+ sep = gtk_separator_menu_item_new(); -+ g_object_ref(sep); -+ gtk_osxapplication_insert_app_menu_item (theApp, sep, 1); -+ -+ widget = -+ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/Properties"); -+ gtk_osxapplication_insert_app_menu_item (theApp, widget, 2); -+ sep = gtk_separator_menu_item_new(); -+ g_object_ref(sep); -+ gtk_osxapplication_insert_app_menu_item (theApp, sep, 3); -+ -+ widget = -+ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu"); -+ gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(widget)); -+ -+ g_signal_connect(theApp, "NSApplicationWillTerminate", -+ G_CALLBACK(quit_cb), window); -+ -+ gtk_osxapplication_ready(theApp); - } - #endif - -diff -c /Volumes/RAID1/local/gtk-stable-3/src/glade-3.10.0/gladeui/Makefile.in\~ /Volumes/RAID1/local/gtk-stable-3/src/glade-3.10.0/gladeui/Makefile.in ---- a/gladeui/Makefile.in Mon Apr 4 20:26:34 2011 -+++ b/gladeui/Makefile.in Tue Nov 8 17:16:37 2011 -@@ -240,9 +240,9 @@ - GTK_LIBS = @GTK_LIBS@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ --IGE_MAC_BUNDLE_FLAG = @IGE_MAC_BUNDLE_FLAG@ --IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@ --IGE_MAC_LIBS = @IGE_MAC_LIBS@ -+GTK_MAC_BUNDLE_FLAG = @GTK_MAC_BUNDLE_FLAG@ -+GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@ -+GTK_MAC_LIBS = @GTK_MAC_LIBS@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -386,7 +386,7 @@ - -I$(top_builddir) \ - -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \ - $(GTK_CFLAGS) \ -- $(IGE_MAC_CFLAGS) \ -+ $(GTK_MAC_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CPPFLAGS) - -@@ -394,7 +394,7 @@ - $(AM_CFLAGS) - - glade_previewer_LDFLAGS = $(AM_LDFLAGS) $(am__append_2) --glade_previewer_LDADD = libgladeui-2.la $(IGE_MAC_LIBS) \ -+glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS) \ - $(am__append_1) - glade_previewer_SOURCES = \ - glade-previewer.c -@@ -458,8 +458,8 @@ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(GTK_CFLAGS) \ -- $(IGE_MAC_BUNDLE_FLAG) \ -- $(IGE_MAC_CFLAGS) \ -+ $(GTK_MAC_BUNDLE_FLAG) \ -+ $(GTK_MAC_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CPPFLAGS) - -@@ -469,7 +469,7 @@ - libgladeui_2_la_LDFLAGS = -version-info \ - $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS) \ - $(am__append_3) $(am__append_4) --libgladeui_2_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS) -+libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS) - libgladeuiincludedir = $(includedir)/libgladeui-2.0/gladeui - libgladeuiinclude_HEADERS = \ - glade.h \ - -Diff finished. Tue Nov 8 17:16:42 2011 -diff -c /Volumes/RAID1/local/gtk-stable-3/src/glade-3.10.0/src/Makefile.in\~ /Volumes/RAID1/local/gtk-stable-3/src/glade-3.10.0/src/Makefile.in ---- a/src/Makefile.in Mon Apr 4 20:26:35 2011 -+++ b/src/Makefile.in Tue Nov 8 17:18:08 2011 -@@ -161,9 +161,9 @@ - GTK_LIBS = @GTK_LIBS@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ --IGE_MAC_BUNDLE_FLAG = @IGE_MAC_BUNDLE_FLAG@ --IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@ --IGE_MAC_LIBS = @IGE_MAC_LIBS@ -+GTK_MAC_BUNDLE_FLAG = @GTK_MAC_BUNDLE_FLAG@ -+GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@ -+GTK_MAC_LIBS = @GTK_MAC_LIBS@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -306,7 +306,7 @@ - -I$(top_builddir) \ - -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \ - $(GTK_CFLAGS) \ -- $(IGE_MAC_CFLAGS) \ -+ $(GTK_MAC_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CPPFLAGS) - -@@ -314,7 +314,7 @@ - $(AM_CFLAGS) - - glade_LDFLAGS = $(AM_LDFLAGS) $(am__append_2) --glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(IGE_MAC_LIBS) \ -+glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS) \ - $(am__append_1) - glade_SOURCES = \ - glade-window.c \ - -Diff finished. Tue Nov 8 17:18:17 2011 -diff -c /Volumes/RAID1/local/gtk-stable-3/src/glade-3.10.0/configure\~ /Volumes/RAID1/local/gtk-stable-3/src/glade-3.10.0/configure ---- a/configure Mon Apr 4 20:26:36 2011 -+++ b/configure Tue Nov 8 17:19:30 2011 -@@ -754,9 +754,9 @@ - AM_CFLAGS - AM_CPPFLAGS - GLADE_PREFIX --IGE_MAC_BUNDLE_FLAG --IGE_MAC_LIBS --IGE_MAC_CFLAGS -+GTK_MAC_BUNDLE_FLAG -+GTK_MAC_LIBS -+GTK_MAC_CFLAGS - GDK_TARGET_QUARTZ_FALSE - GDK_TARGET_QUARTZ_TRUE - WINDRES -@@ -1035,8 +1035,8 @@ - GTK_LIBS - PYGOBJECT_CFLAGS - PYGOBJECT_LIBS --IGE_MAC_CFLAGS --IGE_MAC_LIBS' -+GTK_MAC_CFLAGS -+GTK_MAC_LIBS' - - - # Initialize some variables set by options. -@@ -1716,10 +1716,10 @@ - C compiler flags for PYGOBJECT, overriding pkg-config - PYGOBJECT_LIBS - linker flags for PYGOBJECT, overriding pkg-config -- IGE_MAC_CFLAGS -- C compiler flags for IGE_MAC, overriding pkg-config -- IGE_MAC_LIBS -- linker flags for IGE_MAC, overriding pkg-config -+ GTK_MAC_CFLAGS -+ C compiler flags for GTK_MAC, overriding pkg-config -+ GTK_MAC_LIBS -+ linker flags for GTK_MAC, overriding pkg-config - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. -@@ -14889,35 +14889,35 @@ - if test "x$_gdk_tgt" = xquartz; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IGE_MAC" >&5 --$as_echo_n "checking for IGE_MAC... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_MAC" >&5 -+$as_echo_n "checking for GTK_MAC... " >&6; } - --if test -n "$IGE_MAC_CFLAGS"; then -- pkg_cv_IGE_MAC_CFLAGS="$IGE_MAC_CFLAGS" -+if test -n "$GTK_MAC_CFLAGS"; then -+ pkg_cv_GTK_MAC_CFLAGS="$GTK_MAC_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_IGE_MAC_CFLAGS=`$PKG_CONFIG --cflags "ige-mac-integration" 2>/dev/null` -+ pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration" 2>/dev/null` - else - pkg_failed=yes - fi - else - pkg_failed=untried - fi --if test -n "$IGE_MAC_LIBS"; then -- pkg_cv_IGE_MAC_LIBS="$IGE_MAC_LIBS" -+if test -n "$GTK_MAC_LIBS"; then -+ pkg_cv_GTK_MAC_LIBS="$GTK_MAC_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_IGE_MAC_LIBS=`$PKG_CONFIG --libs "ige-mac-integration" 2>/dev/null` -+ pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -14935,22 +14935,22 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ige-mac-integration" 2>&1` -+ GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk-mac-integration" 2>&1` - else -- IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ige-mac-integration" 2>&1` -+ GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk-mac-integration" 2>&1` - fi - # Put the nasty error message in config.log where it belongs -- echo "$IGE_MAC_PKG_ERRORS" >&5 -+ echo "$GTK_MAC_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements (ige-mac-integration) were not met: -+ as_fn_error "Package requirements (gtk-mac-integration) were not met: - --$IGE_MAC_PKG_ERRORS -+$GTK_MAC_PKG_ERRORS - - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --Alternatively, you may set the environment variables IGE_MAC_CFLAGS --and IGE_MAC_LIBS to avoid the need to call pkg-config. -+Alternatively, you may set the environment variables GTK_MAC_CFLAGS -+and GTK_MAC_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " "$LINENO" 5 - elif test $pkg_failed = untried; then -@@ -14960,21 +14960,21 @@ - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - --Alternatively, you may set the environment variables IGE_MAC_CFLAGS --and IGE_MAC_LIBS to avoid the need to call pkg-config. -+Alternatively, you may set the environment variables GTK_MAC_CFLAGS -+and GTK_MAC_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - - To get pkg-config, see . - See \`config.log' for more details." "$LINENO" 5; } - else -- IGE_MAC_CFLAGS=$pkg_cv_IGE_MAC_CFLAGS -- IGE_MAC_LIBS=$pkg_cv_IGE_MAC_LIBS -+ GTK_MAC_CFLAGS=$pkg_cv_GTK_MAC_CFLAGS -+ GTK_MAC_LIBS=$pkg_cv_GTK_MAC_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi - -- IGE_MAC_BUNDLE_FLAG= -+ GTK_MAC_BUNDLE_FLAG= - - # Check whether --enable-mac-bundle was given. - if test "${enable_mac_bundle+set}" = set; then : -@@ -14988,7 +14988,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: enableing mac bundle.." >&5 - $as_echo "$as_me: enableing mac bundle.." >&6;} - -- IGE_MAC_BUNDLE_FLAG=-DMAC_BUNDLE -+ GTK_MAC_BUNDLE_FLAG=-DMAC_BUNDLE - fi - - - -Diff finished. Tue Nov 8 17:19:36 2011 --- -1.7.6.3.dirty - diff --git a/modulesets/patches/Glade-master-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch b/modulesets/patches/Glade-master-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch deleted file mode 100644 index d75c61f..0000000 --- a/modulesets/patches/Glade-master-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch +++ /dev/null @@ -1,111 +0,0 @@ -From b53a3b26248f93a74bf30a087ca31226b014ca32 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Tue, 8 Nov 2011 14:55:31 -0800 -Subject: [PATCH 2/2] [Mac Integration] Fix up menu accelerators for Mac - -Makes use of a new feature in Gtk+-2.24.7 & Gtk+-3.2.1 which provides a -new modifier symbol, , which uses "command" as the accelerator -modifier on Quartz and "control" everywhere else. - -Special cases the project accelerators, since disappears on -Quartz-integrated menus, leaving just the number as an accelerator and -preventing its use in text. ---- - src/glade-window.c | 29 ++++++++++++++++++----------- - 1 files changed, 18 insertions(+), 11 deletions(-) - -diff --git a/src/glade-window.c b/src/glade-window.c -index 368c007..203a518 100644 ---- a/src/glade-window.c -+++ b/src/glade-window.c -@@ -973,8 +973,11 @@ refresh_projects_list_menu (GladeWindow * window) - gchar action_name[32]; - gchar *project_name; - gchar *tooltip; -+#ifdef MAC_INTEGRATION -+ gchar accel[11]; -+#else - gchar accel[7]; -- -+#endif - view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (p->notebook), i); - project = glade_design_view_get_project (GLADE_DESIGN_VIEW (view)); - -@@ -997,7 +1000,11 @@ refresh_projects_list_menu (GladeWindow * window) - - /* alt + 1, 2, 3... 0 to switch to the first ten tabs */ - if (i < 10) -+#ifdef MAC_INTEGRATION -+ g_snprintf (accel, sizeof (accel), "%d", (i + 1) % 10); -+#else - g_snprintf (accel, sizeof (accel), "%d", (i + 1) % 10); -+#endif - else - accel[0] = '\0'; - -@@ -2178,15 +2185,15 @@ static GtkActionEntry static_entries[] = { - {"RedoMenu", NULL, NULL}, - - /* FileMenu */ -- {"New", GTK_STOCK_NEW, NULL, "N", -+ {"New", GTK_STOCK_NEW, NULL, "N", - N_("Create a new project"), G_CALLBACK (new_cb)}, - -- {"Open", GTK_STOCK_OPEN, N_("_Open\342\200\246"), "O", -+ {"Open", GTK_STOCK_OPEN, N_("_Open\342\200\246"), "O", - N_("Open a project"), G_CALLBACK (open_cb)}, - - {"OpenRecent", NULL, N_("Open _Recent")}, - -- {"Quit", GTK_STOCK_QUIT, NULL, "Q", -+ {"Quit", GTK_STOCK_QUIT, NULL, "Q", - N_("Quit the program"), G_CALLBACK (quit_cb)}, - - /* ViewMenu */ -@@ -2206,21 +2213,21 @@ static guint n_static_entries = G_N_ELEMENTS (static_entries); - static GtkActionEntry project_entries[] = { - - /* FileMenu */ -- {"Save", GTK_STOCK_SAVE, NULL, "S", -+ {"Save", GTK_STOCK_SAVE, NULL, "S", - N_("Save the current project"), G_CALLBACK (save_cb)}, - - {"SaveAs", GTK_STOCK_SAVE_AS, N_("Save _As\342\200\246"), NULL, - N_("Save the current project with a different name"), - G_CALLBACK (save_as_cb)}, - -- {"Close", GTK_STOCK_CLOSE, NULL, "W", -+ {"Close", GTK_STOCK_CLOSE, NULL, "W", - N_("Close the current project"), G_CALLBACK (close_cb)}, - - /* EditMenu */ -- {"Undo", GTK_STOCK_UNDO, NULL, "Z", -+ {"Undo", GTK_STOCK_UNDO, NULL, "Z", - N_("Undo the last action"), G_CALLBACK (undo_cb)}, - -- {"Redo", GTK_STOCK_REDO, NULL, "Z", -+ {"Redo", GTK_STOCK_REDO, NULL, "Z", - N_("Redo the last action"), G_CALLBACK (redo_cb)}, - - {"Cut", GTK_STOCK_CUT, NULL, NULL, -@@ -2235,14 +2242,14 @@ static GtkActionEntry project_entries[] = { - {"Delete", GTK_STOCK_DELETE, NULL, "Delete", - N_("Delete the selection"), G_CALLBACK (delete_cb)}, - -- {"Properties", GTK_STOCK_PROPERTIES, NULL, "P", -+ {"Properties", GTK_STOCK_PROPERTIES, NULL, "P", - N_("Edit project properties"), G_CALLBACK (properties_cb)}, - - /* ProjectsMenu */ -- {"PreviousProject", NULL, N_("_Previous Project"), "Page_Up", -+ {"PreviousProject", NULL, N_("_Previous Project"), "Page_Up", - N_("Activate previous project"), G_CALLBACK (previous_project_cb)}, - -- {"NextProject", NULL, N_("_Next Project"), "Page_Down", -+ {"NextProject", NULL, N_("_Next Project"), "Page_Down", - N_("Activate next project"), G_CALLBACK (next_project_cb)} - - --- -1.7.6.3.dirty - diff --git a/modulesets/patches/Gtk3-24-1-Handle-NULL-NSGraphicsContext-currentContext.patch b/modulesets/patches/Gtk3-24-1-Handle-NULL-NSGraphicsContext-currentContext.patch deleted file mode 100644 index cb238ff..0000000 --- a/modulesets/patches/Gtk3-24-1-Handle-NULL-NSGraphicsContext-currentContext.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 4ae16f5a4f9d5e84ddae21401d79e4d58ea5cbdd Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Mon, 15 Oct 2018 10:50:49 -0700 -Subject: [PATCH 3/3] Handle NULL NSGraphicsContext currentContext. - -Return NULL from gdk_window_impl_quartz_get_context immediately to avoid -quartz errors and don't try to call cairo functions with the NULL in -upstream functions. - -Closes: https://gitlab.gnome.org/GNOME/gtk/issues/1411 ---- - gdk/gdkcairo.c | 3 ++- - gdk/gdkwindow.c | 20 ++++++++++++-------- - gdk/quartz/gdkwindow-quartz.c | 6 ++++-- - 3 files changed, 18 insertions(+), 11 deletions(-) - -diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c -index 633b391..a8df0d0 100644 ---- a/gdk/gdkcairo.c -+++ b/gdk/gdkcairo.c -@@ -303,7 +303,8 @@ gdk_cairo_surface_create_from_pixbuf (const GdkPixbuf *pixbuf, - gdk_pixbuf_get_height (pixbuf), - scale); - -- gdk_cairo_surface_paint_pixbuf (surface, pixbuf); -+ if (surface) -+ gdk_cairo_surface_paint_pixbuf (surface, pixbuf); - - return surface; - } -diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c -index 6b231f0..1244f87 100644 ---- a/gdk/gdkwindow.c -+++ b/gdk/gdkwindow.c -@@ -10234,7 +10234,7 @@ gdk_window_create_similar_image_surface (GdkWindow * window, - int scale) - { - GdkWindowImplClass *impl_class; -- cairo_surface_t *window_surface, *surface; -+ cairo_surface_t *window_surface, *surface = NULL; - GdkDisplay *display; - GdkScreen *screen; - -@@ -10254,18 +10254,22 @@ gdk_window_create_similar_image_surface (GdkWindow * window, - else - { - window_surface = gdk_window_ref_impl_surface (window); -- surface = -- cairo_surface_create_similar_image (window_surface, -- format, -- width, -- height); -- cairo_surface_destroy (window_surface); -+ if (window_surface) -+ { -+ surface = -+ cairo_surface_create_similar_image (window_surface, -+ format, -+ width, -+ height); -+ cairo_surface_destroy (window_surface); -+ } - } - - if (scale == 0) - scale = gdk_window_get_scale_factor (window); - -- cairo_surface_set_device_scale (surface, scale, scale); -+ if (surface) -+ cairo_surface_set_device_scale (surface, scale, scale); - - return surface; - } -diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c -index c7fe688..2e7edd1 100644 ---- a/gdk/quartz/gdkwindow-quartz.c -+++ b/gdk/quartz/gdkwindow-quartz.c -@@ -141,6 +141,8 @@ gdk_window_impl_quartz_get_context (GdkWindowImplQuartz *window_impl, - cg_context = [[NSGraphicsContext currentContext] graphicsPort]; - else - cg_context = [[NSGraphicsContext currentContext] CGContext]; -+ if (!cg_context) -+ return NULL; - CGContextSaveGState (cg_context); - CGContextSetAllowsAntialiasing (cg_context, antialias); - -@@ -332,8 +334,8 @@ gdk_quartz_ref_cairo_surface (GdkWindow *window) - gdk_quartz_create_cairo_surface (impl, - gdk_window_get_width (impl->wrapper) * scale, - gdk_window_get_height (impl->wrapper) * scale); -- -- cairo_surface_set_device_scale (impl->cairo_surface, scale, scale); -+ if (impl->cairo_surface) -+ cairo_surface_set_device_scale (impl->cairo_surface, scale, scale); - } - else - cairo_surface_reference (impl->cairo_surface); --- -2.2.2 - diff --git a/modulesets/patches/Gtk3-24-1-Update-GDK_OSX-versions-to-current-MacOS-release.patch b/modulesets/patches/Gtk3-24-1-Update-GDK_OSX-versions-to-current-MacOS-release.patch deleted file mode 100644 index f7c323b..0000000 --- a/modulesets/patches/Gtk3-24-1-Update-GDK_OSX-versions-to-current-MacOS-release.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1a7cfec5c3cc9330e155639b37617eac20ec5081 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Mon, 15 Oct 2018 10:41:15 -0700 -Subject: [PATCH 1/3] Update GDK_OSX versions to current MacOS release. - ---- - gdk/quartz/gdkquartz.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h -index 24555d4..ed8e4cb 100644 ---- a/gdk/quartz/gdkquartz.h -+++ b/gdk/quartz/gdkquartz.h -@@ -53,7 +53,9 @@ typedef enum - GDK_OSX_YOSEMITE = 10, - GDK_OSX_EL_CAPITAN = 11, - GDK_OSX_SIERRA = 12, -- GDK_OSX_CURRENT = 12, -+ GDK_OSX_HIGH_SIERRA = 13, -+ GDK_OSX_MOJAVE = 14, -+ GDK_OSX_CURRENT = 14, - GDK_OSX_NEW = 99 - } GdkOSXVersion; - --- -2.2.2 - diff --git a/modulesets/patches/Gtk3-24-1-Use-NSGraphicsContext-CGContext-instead-of-graphicsP.patch b/modulesets/patches/Gtk3-24-1-Use-NSGraphicsContext-CGContext-instead-of-graphicsP.patch deleted file mode 100644 index 6d37112..0000000 --- a/modulesets/patches/Gtk3-24-1-Use-NSGraphicsContext-CGContext-instead-of-graphicsP.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a929a826ee91329312484f8ad6eb6f1bd322462b Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Mon, 15 Oct 2018 10:45:57 -0700 -Subject: [PATCH 2/3] Use [NSGraphicsContext CGContext] instead of graphicsPort - after Yosemite. - ---- - gdk/quartz/gdkwindow-quartz.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c -index 4ffbae0..c7fe688 100644 ---- a/gdk/quartz/gdkwindow-quartz.c -+++ b/gdk/quartz/gdkwindow-quartz.c -@@ -137,8 +137,10 @@ gdk_window_impl_quartz_get_context (GdkWindowImplQuartz *window_impl, - if (![window_impl->view lockFocusIfCanDraw]) - return NULL; - } -- -- cg_context = [[NSGraphicsContext currentContext] graphicsPort]; -+ if (gdk_quartz_osx_version () < GDK_OSX_YOSEMITE) -+ cg_context = [[NSGraphicsContext currentContext] graphicsPort]; -+ else -+ cg_context = [[NSGraphicsContext currentContext] CGContext]; - CGContextSaveGState (cg_context); - CGContextSetAllowsAntialiasing (cg_context, antialias); - --- -2.2.2 - diff --git a/modulesets/patches/Gtk3-24-1-quartz-do-not-cache-the-screen-in-the-gdkmonitor.patch b/modulesets/patches/Gtk3-24-1-quartz-do-not-cache-the-screen-in-the-gdkmonitor.patch deleted file mode 100644 index 082d0d1..0000000 --- a/modulesets/patches/Gtk3-24-1-quartz-do-not-cache-the-screen-in-the-gdkmonitor.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 2a392c220d992ba21b1e250be2497248658cfcdb Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Sun, 7 Oct 2018 21:51:35 +0200 -Subject: [PATCH] quartz: do not cache the screen in the gdkmonitor - -Instead we just cache the monitor number and get -out of it the nsscreen when it is needed. This is -a requirement since it nsscreen it is not supposed -to be cached. - -Fixes: https://gitlab.gnome.org/GNOME/gtk/issues/1312 ---- - gdk/quartz/gdkmonitor-quartz.c | 17 ++++++++++++----- - gdk/quartz/gdkmonitor-quartz.h | 2 +- - gdk/quartz/gdkscreen-quartz.c | 2 +- - 3 files changed, 14 insertions(+), 7 deletions(-) - -diff --git a/gdk/quartz/gdkmonitor-quartz.c b/gdk/quartz/gdkmonitor-quartz.c -index ec36b23..b3e0343 100644 ---- a/gdk/quartz/gdkmonitor-quartz.c -+++ b/gdk/quartz/gdkmonitor-quartz.c -@@ -35,12 +35,19 @@ gdk_quartz_monitor_get_workarea (GdkMonitor *monitor, - - GDK_QUARTZ_ALLOC_POOL; - -- NSRect rect = [quartz_monitor->nsscreen visibleFrame]; -+ NSArray *array = [NSScreen screens]; -+ if (quartz_monitor->monitor_num < [array count]) -+ { -+ NSScreen *screen = [array objectAtIndex:quartz_monitor->monitor_num]; -+ NSRect rect = [screen visibleFrame]; - -- dest->x = rect.origin.x - quartz_screen->min_x; -- dest->y = quartz_screen->height - (rect.origin.y + rect.size.height) + quartz_screen->min_y; -- dest->width = rect.size.width; -- dest->height = rect.size.height; -+ dest->x = rect.origin.x - quartz_screen->min_x; -+ dest->y = quartz_screen->height - (rect.origin.y + rect.size.height) + quartz_screen->min_y; -+ dest->width = rect.size.width; -+ dest->height = rect.size.height; -+ } -+ else -+ *dest = monitor->geometry; - - GDK_QUARTZ_RELEASE_POOL; - } -diff --git a/gdk/quartz/gdkmonitor-quartz.h b/gdk/quartz/gdkmonitor-quartz.h -index 448c483..468a1d8 100644 ---- a/gdk/quartz/gdkmonitor-quartz.h -+++ b/gdk/quartz/gdkmonitor-quartz.h -@@ -30,7 +30,7 @@ struct _GdkQuartzMonitor - { - GdkMonitor parent; - -- NSScreen *nsscreen; -+ gint monitor_num; - }; - - struct _GdkQuartzMonitorClass { -diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c -index 2193388..f1feaed 100644 ---- a/gdk/quartz/gdkscreen-quartz.c -+++ b/gdk/quartz/gdkscreen-quartz.c -@@ -156,7 +156,7 @@ gdk_quartz_screen_calculate_layout (GdkQuartzScreen *screen) - "display", display, - NULL); - g_ptr_array_add (display_quartz->monitors, monitor); -- monitor->nsscreen = [array objectAtIndex:i]; -+ monitor->monitor_num = i; - - NSRect rect = [[array objectAtIndex:i] frame]; - --- -2.2.2 - diff --git a/modulesets/patches/Python3.6-stack-size-flag.patch b/modulesets/patches/Python3.6-stack-size-flag.patch deleted file mode 100644 index 0afe3ea..0000000 --- a/modulesets/patches/Python3.6-stack-size-flag.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/configure.ac 2018-12-23 13:37:14.000000000 -0800 -+++ b/configure.ac 2019-05-19 07:26:48.000000000 -0700 -@@ -1874,6 +1874,11 @@ - then - CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}" - LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}" -+ # Issue #18075: the default maximum stack size (8MBytes) is too -+ # small for the default recursion limit. Increase the stack size -+ # to ensure that tests don't crash -+ LDFLAGS="-Wl,-stack_size,1000000 $(LDFLAGS)" -+ - CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}" - else - CFLAGS="${UNIVERSAL_ARCH_FLAGS} ${CFLAGS}" -@@ -2698,11 +2703,6 @@ - Darwin/*) - LINKFORSHARED="$extra_undefs -framework CoreFoundation" - -- # Issue #18075: the default maximum stack size (8MBytes) is too -- # small for the default recursion limit. Increase the stack size -- # to ensure that tests don't crash -- LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED" -- - if test "$enable_framework" - then - LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' diff --git a/modulesets/patches/WebKit-2.16.1-Bug-167343-wtf-unicode-UTF8.h.patch b/modulesets/patches/WebKit-2.16.1-Bug-167343-wtf-unicode-UTF8.h.patch deleted file mode 100644 index b068676..0000000 --- a/modulesets/patches/WebKit-2.16.1-Bug-167343-wtf-unicode-UTF8.h.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 63c9bea0142a6452769a3ea11505d491afafca2b Mon Sep 17 00:00:00 2001 -From: "annulen@yandex.ru" - -Date: Fri, 21 Apr 2017 17:26:07 +0000 -Subject: [PATCH 1/3] [cmake] WTF target should not have wtf and subdirectries - in public interface https://bugs.webkit.org/show_bug.cgi?id=171115 - -Reviewed by Michael Catanzaro. - -In r209665 WEBCORE_FRAMEWORK macro started to export INCLUDE_DIRECTORIES of -targets as their public interface, so that linked targets can use them -implicitly without copying directory lists around. This matches existing -practice for all targets except WTF, headers from which are always included -with full path starting from " -+#include - - namespace WebCore { - -diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake -index 6e9afe0..9558d43 100644 ---- a/Source/cmake/WebKitMacros.cmake -+++ b/Source/cmake/WebKitMacros.cmake -@@ -283,6 +283,7 @@ macro(WEBKIT_FRAMEWORK _target) - ${${_target}_SOURCES} - ) - target_include_directories(${_target} PUBLIC "$") -+ target_include_directories(${_target} PRIVATE "$") - target_link_libraries(${_target} ${${_target}_LIBRARIES}) - set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}") - --- -2.2.2 - diff --git a/modulesets/patches/WebKit-2.4.11-fixups.patch b/modulesets/patches/WebKit-2.4.11-fixups.patch deleted file mode 100644 index 0804ebd..0000000 --- a/modulesets/patches/WebKit-2.4.11-fixups.patch +++ /dev/null @@ -1,59 +0,0 @@ - ---- a/Source/JavaScriptCore/API/JSBase.h Sat Apr 9 23:48:36 2016 -+++ b/Source/JavaScriptCore/API/JSBase.h Thu Apr 27 13:48:12 2017 -@@ -142,9 +142,9 @@ - /* Enable the Objective-C API for platforms with a modern runtime. */ - #if !defined(JSC_OBJC_API_ENABLED) - #ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080 --#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE))) -+#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__)) && !PLATFORM(GTK) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE))) - #else --#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE))) -+#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !defined(__i386__)) && !PLATFORM(GTK) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE))) - #endif - #endif - ---- a/Source/JavaScriptCore/API/ObjCCallbackFunction.h Sat Apr 9 23:48:36 2016 -+++ b/Source/JavaScriptCore/API/ObjCCallbackFunction.h Tue Apr 25 15:31:47 2017 -@@ -29,7 +29,7 @@ - - #if JSC_OBJC_API_ENABLED - --#import -+#import "JSCallbackFunction.h" - - #if defined(__OBJC__) - JSObjectRef objCCallbackFunctionForMethod(JSContext *, Class, Protocol *, BOOL isInstanceMethod, SEL, const char* types); - ---- a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp Sat Apr 9 23:48:37 2016 -+++ b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp Thu Apr 27 10:01:54 2017 -@@ -40,6 +40,7 @@ - #include "PaintInfo.h" - #include "PlatformContextCairo.h" - #include "RenderElement.h" -+#include "RenderBox.h" - #include "TextDirection.h" - #include "UserAgentStyleSheets.h" - #include "WidgetRenderingContext.h" ---- a/Source/JavaScriptCore/assembler/MacroAssembler.h~ -+++ b/Source/JavaScriptCore/assembler/MacroAssembler.h -@@ -986,7 +986,7 @@ public: - if (bitwise_cast(value * 1.0) != bitwise_cast(value)) - return shouldConsiderBlinding(); - -- value = abs(value); -+ value = std::abs(value); - // Only allow a limited set of fractional components - double scaledValue = value * 8; - if (scaledValue / 8 != value) ---- a/Source/autotools/FindDependencies.m4~ -+++ b/Source/autotools/FindDependencies.m4 -@@ -104,7 +104,7 @@ GLIB_GSETTINGS - - # TODO: use pkg-config (after CFLAGS in their .pc files are cleaned up). - case "$host" in -- *-*-darwin*) -+ *-*-foo*) - UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu" - UNICODE_LIBS="-licucore" - ;; diff --git a/modulesets/patches/WebKit2Gtk3-2.30.0-cumulative.patch b/modulesets/patches/WebKit2Gtk3-2.30.0-cumulative.patch deleted file mode 100644 index 7f81025..0000000 --- a/modulesets/patches/WebKit2Gtk3-2.30.0-cumulative.patch +++ /dev/null @@ -1,439 +0,0 @@ -diff --git a/Source/JavaScriptCore/shell/PlatformGTK.cmake b/Source/JavaScriptCore/shell/PlatformGTK.cmake -index c4ac7c9a..cf2fc2d6 100644 ---- a/Source/JavaScriptCore/shell/PlatformGTK.cmake -+++ b/Source/JavaScriptCore/shell/PlatformGTK.cmake -@@ -1,3 +1,7 @@ - list(APPEND jsc_LIBRARIES - ${GLIB_LIBRARIES} - ) -+ -+list(APPEND jsc_PRIVATE_INCLUDE_DIRECTORIES -+ ${WTF_DIR} -+) -diff --git a/Source/ThirdParty/ANGLE/src/common/debug.cpp b/Source/ThirdParty/ANGLE/src/common/debug.cpp -index 2935093b..d251be59 100644 ---- a/Source/ThirdParty/ANGLE/src/common/debug.cpp -+++ b/Source/ThirdParty/ANGLE/src/common/debug.cpp -@@ -21,7 +21,7 @@ - # include - #endif - --#if defined(ANGLE_PLATFORM_APPLE) -+#if defined(ANGLE_PLATFORM_APPLE) && MAC_OS_X_VERSION_MAX_ALLOWED > 101200 - # include - #endif - -@@ -232,7 +232,7 @@ void Trace(LogSeverity severity, const char *message) - } - __android_log_print(android_priority, "ANGLE", "%s: %s\n", LogSeverityName(severity), - str.c_str()); --#elif defined(ANGLE_PLATFORM_APPLE) -+#elif defined(ANGLE_PLATFORM_APPLE) && MAC_OS_X_VERSION_MAX_ALLOWED > 101200 - if (__builtin_available(macOS 10.12, iOS 10.0, *)) - { - os_log_type_t apple_log_type = OS_LOG_TYPE_DEFAULT; -diff --git a/Source/WTF/CMakeLists.txt b/Source/WTF/CMakeLists.txt -index 7c615c55..dd221b1a 100644 ---- a/Source/WTF/CMakeLists.txt -+++ b/Source/WTF/CMakeLists.txt -@@ -6,6 +6,6 @@ add_subdirectory(wtf) - - # Apple builds have the ICU headers checked into ${WTF_DIR}/icu - # Copy them into ${ICU_INCLUDE_DIRS} so the build behaves like find_package was used --if (APPLE) -+if (DISABLEAPPLE) - file(COPY ${WTF_DIR}/icu/unicode DESTINATION ${ICU_INCLUDE_DIRS}) - endif () -diff --git a/Source/WTF/wtf/glib/GLibUtilities.cpp b/Source/WTF/wtf/glib/GLibUtilities.cpp -index c93a7824..bb59c35e 100644 ---- a/Source/WTF/wtf/glib/GLibUtilities.cpp -+++ b/Source/WTF/wtf/glib/GLibUtilities.cpp -@@ -31,6 +31,36 @@ - #include - #endif - -+#if OS(MAC_OS_X) -+#include -+ -+static CString getBundlePath(bool executable) -+{ -+ char bundle_path[PATH_MAX]{}; -+ auto bundle{CFBundleGetMainBundle()}; -+ CFURLRef url; -+ -+ if (executable) -+ url = CFBundleCopyExecutableURL(bundle); -+ else -+ url = CFBundleCopyResourcesDirectoryURL(bundle); -+ auto abs_url{CFURLCopyAbsoluteURL(url)}; -+ CFRelease(url); -+ auto string{CFURLCopyFileSystemPath(abs_url, kCFURLPOSIXPathStyle)}; -+ auto len{CFStringGetMaximumSizeForEncoding (CFStringGetLength (string), -+ kCFStringEncodingUTF8) + 1}; -+ if (!len) -+ return CString(); -+ -+ if (len > PATH_MAX) -+ len = PATH_MAX; -+ -+ CFStringGetCString(string, bundle_path, len, kCFStringEncodingUTF8); -+ CFRelease(abs_url); -+ CFRelease(string); -+ return CString(bundle_path, len); -+} -+#endif - #if OS(LINUX) - CString getCurrentExecutablePath() - { -@@ -40,6 +70,11 @@ CString getCurrentExecutablePath() - return CString(); - return CString(readLinkBuffer, result); - } -+#elif OS(MAC_OS_X) -+CString getCurrentExecutablePath() -+{ -+ return getBundlePath(true); -+} - #elif OS(HURD) - CString getCurrentExecutablePath() - { -@@ -77,7 +112,17 @@ CString getCurrentExecutableName() - - return g_get_prgname(); - } -+#if OS(MAC_OS_X) -+char* getSharedLibraryPath() -+{ -+ auto bundle_path{getBundlePath(false)}; -+ if (bundle_path.isNull()) -+ return nullptr; - -+ auto path{g_build_filename(bundle_path.data(), "lib", nullptr)}; -+ return path; -+} -+#endif - CString enumToString(GType type, guint value) - { - #if GLIB_CHECK_VERSION(2, 54, 0) -diff --git a/Source/WTF/wtf/glib/GLibUtilities.h b/Source/WTF/wtf/glib/GLibUtilities.h -index 3a5fad54..da77f682 100644 ---- a/Source/WTF/wtf/glib/GLibUtilities.h -+++ b/Source/WTF/wtf/glib/GLibUtilities.h -@@ -26,6 +26,9 @@ - - WTF_EXPORT_PRIVATE CString getCurrentExecutablePath(); - WTF_EXPORT_PRIVATE CString getCurrentExecutableName(); -+#if OS(MAC_OS_X) -+WTF_EXPORT_PRIVATE char* getSharedLibraryPath(); -+#endif - WTF_EXPORT_PRIVATE CString enumToString(GType, guint value); - - // These might be added to glib in the future, but in the meantime they're defined here. -diff --git a/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp -index ad632205..29a9eace 100644 ---- a/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp -+++ b/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp -@@ -23,7 +23,7 @@ - #if USE(GSTREAMER) - #include - --#if USE(GSTREAMER_GL) -+#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF) - #include - #endif - -@@ -508,6 +508,7 @@ template<> void derefGPtr(GstGLContext* ptr) - gst_object_unref(GST_OBJECT(ptr)); - } - -+#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF) - template <> GRefPtr adoptGRef(GstEGLImage* ptr) - { - return GRefPtr(ptr, GRefPtrAdopt); -@@ -525,6 +526,7 @@ template <> void derefGPtr(GstEGLImage* ptr) - if (ptr) - gst_egl_image_unref(ptr); - } -+#endif //USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF) - - #endif // USE(GSTREAMER_GL) - -diff --git a/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h -index 19509fe1..c7044e54 100644 ---- a/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h -+++ b/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h -@@ -30,9 +30,13 @@ struct WebKitWebSrc; - #if USE(GSTREAMER_GL) - typedef struct _GstGLDisplay GstGLDisplay; - typedef struct _GstGLContext GstGLContext; -+ -+#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF) - typedef struct _GstEGLImage GstEGLImage; - #endif - -+#endif -+ - namespace WTF { - - template<> GRefPtr adoptGRef(GstPlugin* ptr); -@@ -133,9 +137,12 @@ template<> GRefPtr adoptGRef(GstGLContext* ptr); - template<> GstGLContext* refGPtr(GstGLContext* ptr); - template<> void derefGPtr(GstGLContext* ptr); - -+#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF) - template<> GRefPtr adoptGRef(GstEGLImage* ptr); - template<> GstEGLImage* refGPtr(GstEGLImage* ptr); - template<> void derefGPtr(GstEGLImage* ptr); -+#endif // USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF) -+ - #endif - - } // namespace WTF -diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp -index 7c90534a..de555227 100644 ---- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp -+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp -@@ -1259,7 +1259,7 @@ MediaTime MediaPlayerPrivateGStreamer::platformDuration() const - if (GST_STATE(m_pipeline.get()) < GST_STATE_PAUSED) - return MediaTime::invalidTime(); - -- int64_t duration = 0; -+ gint64 duration = 0; - if (!gst_element_query_duration(m_pipeline.get(), GST_FORMAT_TIME, &duration) || !GST_CLOCK_TIME_IS_VALID(duration)) { - GST_DEBUG_OBJECT(pipeline(), "Time duration query failed for %s", m_url.string().utf8().data()); - return MediaTime::positiveInfiniteTime(); -@@ -2018,7 +2018,7 @@ void MediaPlayerPrivateGStreamer::handleMessage(GstMessage* message) - GUniqueOutPtr responseHeaders; - if (gst_structure_get(structure, "response-headers", GST_TYPE_STRUCTURE, &responseHeaders.outPtr(), nullptr)) { - CString contentLengthHeaderName = httpHeaderNameString(HTTPHeaderName::ContentLength).utf8(); -- uint64_t contentLength = 0; -+ guint64 contentLength = 0; - if (!gst_structure_get_uint64(responseHeaders.get(), contentLengthHeaderName.data(), &contentLength)) { - // souphttpsrc sets a string for Content-Length, so - // handle it here, until we remove the webkit+ protocol -@@ -3437,8 +3437,8 @@ Optional MediaPlayerPrivateGStreamer::videoPlayback - if (!webkitGstCheckVersion(1, 17, 0) && !m_fpsSink) - return WTF::nullopt; - -- uint64_t totalVideoFrames = 0; -- uint64_t droppedVideoFrames = 0; -+ guint64 totalVideoFrames = 0; -+ guint64 droppedVideoFrames = 0; - if (webkitGstCheckVersion(1, 17, 0)) { - GUniqueOutPtr stats; - g_object_get(m_videoSink.get(), "stats", &stats.outPtr(), nullptr); -diff --git a/Source/WebKit/NetworkProcess/NetworkLoadParameters.h b/Source/WebKit/NetworkProcess/NetworkLoadParameters.h -index 8cfeb68e..76089e95 100644 ---- a/Source/WebKit/NetworkProcess/NetworkLoadParameters.h -+++ b/Source/WebKit/NetworkProcess/NetworkLoadParameters.h -@@ -38,6 +38,9 @@ - #include - #include - -+/* audit_token_t */ -+#include -+ - namespace WebKit { - - enum class PreconnectOnly : bool { No, Yes }; -diff --git a/Source/WebKit/Platform/IPC/ArgumentCoders.h b/Source/WebKit/Platform/IPC/ArgumentCoders.h -index e00a0ccd..4039ced7 100644 ---- a/Source/WebKit/Platform/IPC/ArgumentCoders.h -+++ b/Source/WebKit/Platform/IPC/ArgumentCoders.h -@@ -38,6 +38,9 @@ - #include - #include - -+/* audit_token_t */ -+#include -+ - namespace IPC { - - // An argument coder works on POD types -diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index 1e3035b0..31b522a4 100644 ---- a/Source/WebKit/PlatformGTK.cmake -+++ b/Source/WebKit/PlatformGTK.cmake -@@ -34,6 +34,10 @@ list(APPEND WebKit_UNIFIED_SOURCE_LIST_FILES - "SourcesGTK.txt" - ) - -+find_library(APPKIT_FRAMEWORK NAMES AppKit) -+target_link_libraries(WebKit PRIVATE ${APPKIT_FRAMEWORK}) -+list(APPEND WebKit_SOURCES WebProcess/gtk/NSApplicationActivationPolicy.mm) -+ - if (NOT USE_GTK4) - list(APPEND WebKit_SOURCES - UIProcess/ViewGestureController.cpp -diff --git a/Source/WebKit/Shared/SandboxExtension.h b/Source/WebKit/Shared/SandboxExtension.h -index c6516658..b7d0bb04 100644 ---- a/Source/WebKit/Shared/SandboxExtension.h -+++ b/Source/WebKit/Shared/SandboxExtension.h -@@ -34,6 +34,9 @@ - #include - #include - -+/* audit_token_t */ -+#include -+ - namespace IPC { - class Encoder; - class Decoder; -diff --git a/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp b/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp -index a1e05f52..b2253c27 100644 ---- a/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp -+++ b/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp -@@ -33,7 +33,6 @@ - - namespace WebKit { - --#if ENABLE(DEVELOPER_MODE) - static String getExecutablePath() - { - CString executablePath = getCurrentExecutablePath(); -@@ -41,7 +40,6 @@ static String getExecutablePath() - return FileSystem::directoryName(FileSystem::stringFromFileSystemRepresentation(executablePath.data())); - return { }; - } --#endif - - static String findWebKitProcess(const char* processName) - { -@@ -59,6 +57,11 @@ static String findWebKitProcess(const char* processName) - if (FileSystem::fileExists(processPath)) - return processPath; - } -+#elif OS(MAC_OS_X) -+ auto path{getExecutablePath()}; -+ auto processPath{FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(path.utf8().data()), processName)}; -+ if (FileSystem::fileExists(processPath)) -+ return processPath; - #endif - - return FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(PKGLIBEXECDIR), processName); -diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -index 3515be45..f10a1d5c 100644 ---- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -@@ -354,9 +354,10 @@ void WebKitProtocolHandler::handleGPU(WebKitURISchemeRequest* request) - " ", - webGLEnabled(request) ? "Yes" : "No"); - -+#if USE(GLX) - auto glContext = GLContext::createOffscreenContext(); - glContext->makeContextCurrent(); -- -+#endif - g_string_append_printf(html, - " " - "
API
" -@@ -370,7 +371,7 @@ void WebKitProtocolHandler::handleGPU(WebKitURISchemeRequest* request) - " %s" - " ", - nativeInterface()); -- -+#if USE(GLX) - g_string_append_printf(html, - " " - "
GL_RENDERER
" -@@ -398,7 +399,6 @@ void WebKitProtocolHandler::handleGPU(WebKitURISchemeRequest* request) - " %s" - " ", - reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION))); -- - #if USE(OPENGL_ES) - g_string_append_printf(html, - " " -@@ -422,6 +422,7 @@ void WebKitProtocolHandler::handleGPU(WebKitURISchemeRequest* request) - " ", - extensions->str); - g_string_free(extensions, TRUE); -+#endif - #endif - - bool isGLX = false; -diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -index f44e5177..ecbf1b95 100644 ---- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -@@ -75,7 +75,7 @@ - #include - #include - #include -- -+#include - #if PLATFORM(GTK) - #include "WebKitRemoteInspectorProtocolHandler.h" - #endif -@@ -312,6 +312,12 @@ static const char* injectedBundleDirectory() - const char* bundleDirectory = g_getenv("WEBKIT_INJECTED_BUNDLE_PATH"); - if (bundleDirectory && g_file_test(bundleDirectory, G_FILE_TEST_IS_DIR)) - return bundleDirectory; -+#elif OS(MAC_OS_X) && PLATFORM(GTK) -+ auto libdir{getSharedLibraryPath()}; -+ auto bundledir{g_build_filename(libdir, "webkit2gtk-4.0", -+ "injected-bundle", nullptr)}; -+ g_free(libdir); -+ return bundledir; - #endif - - #if PLATFORM(GTK) -diff --git a/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp b/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp -index 130fac3d..99ebaed5 100644 ---- a/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp -+++ b/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp -@@ -34,7 +34,7 @@ - #include - #include - #include --#include -+#include - - namespace WebKit { - -diff --git a/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h b/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h -new file mode 100644 -index 00000000..72859428 ---- /dev/null -+++ b/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h -@@ -0,0 +1,4 @@ -+ -+// This is the C "trampoline" function that will be used -+// to invoke a specific Objective-C method FROM C++ -+void SetActivationPolicyProhibited (); -diff --git a/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm b/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm -new file mode 100644 -index 00000000..ce1d75c1 ---- /dev/null -+++ b/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm -@@ -0,0 +1,10 @@ -+#include "config.h" -+#import "NSApplicationActivationPolicy.h" -+#import -+ -+// C "trampoline" function to invoke Objective-C method -+void SetActivationPolicyProhibited () -+{ -+ [NSApp setActivationPolicy: NSApplicationActivationPolicyProhibited]; -+ return; -+} -diff --git a/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp b/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp -index 6444ad4b..6c785748 100644 ---- a/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp -+++ b/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp -@@ -31,6 +31,7 @@ - #include "WebProcess.h" - #include - #include -+#include "NSApplicationActivationPolicy.h" - - #if PLATFORM(X11) - #include -@@ -56,6 +57,7 @@ public: - - bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); -+ SetActivationPolicyProhibited (); - - return true; - } diff --git a/modulesets/patches/WebKit2Gtk3-2.30.1-Disable-WebKitGenericCueAPIEnabled.patch b/modulesets/patches/WebKit2Gtk3-2.30.1-Disable-WebKitGenericCueAPIEnabled.patch deleted file mode 100644 index 4e16605..0000000 --- a/modulesets/patches/WebKit2Gtk3-2.30.1-Disable-WebKitGenericCueAPIEnabled.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7b21876d03f66bfb273508b45e97192170ff927b Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Mon, 9 Nov 2020 09:41:08 -0800 -Subject: [PATCH 6/7] Disable WebKitGenericCueAPIEnabled. - -Not defined in Gtk builds. ---- - Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp -index 61326f2..daa478d 100644 ---- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp -+++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp -@@ -236,12 +236,14 @@ void InjectedBundle::overrideBoolPreferenceForTestRunner(WebPageGroupProxy* page - RuntimeEnabledFeatures::sharedFeatures().setWebRTCMDNSICECandidatesEnabled(enabled); - #endif - -+#if ENABLE(TEXT_TRACK_CUE) - if (preference == "WebKitGenericCueAPIEnabled") { - WebPreferencesStore::overrideBoolValueForKey(WebPreferencesKey::genericCueAPIEnabledKey(), enabled); - for (auto* page : pages) - page->settings().setGenericCueAPIEnabled(enabled); - return; - } -+#endif - - #if ENABLE(GPU_PROCESS) - if (preference == "WebKitUseGPUProcessForMedia" || preference == "WebKitCaptureAudioInGPUProcessEnabledKey") { --- -2.2.2 - diff --git a/modulesets/patches/WebKit2Gtk3-2.30.1-Extend-UNIX_DOMAIN_SOCKETS-precedence-over-Mac-and-Win.patch b/modulesets/patches/WebKit2Gtk3-2.30.1-Extend-UNIX_DOMAIN_SOCKETS-precedence-over-Mac-and-Win.patch deleted file mode 100644 index 5da454a..0000000 --- a/modulesets/patches/WebKit2Gtk3-2.30.1-Extend-UNIX_DOMAIN_SOCKETS-precedence-over-Mac-and-Win.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c53d0d90151eee296aa636d05b7ac2d27283155b Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Mon, 9 Nov 2020 09:39:19 -0800 -Subject: [PATCH 5/7] Extend UNIX_DOMAIN_SOCKETS precence over Mac and Windows - IPC to Shared Memory. - ---- - Source/WebKit/Platform/SharedMemory.h | 2 +- - Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WebKit/Platform/SharedMemory.h b/Source/WebKit/Platform/SharedMemory.h -index 7cd44db..cae19ac 100644 ---- a/Source/WebKit/Platform/SharedMemory.h -+++ b/Source/WebKit/Platform/SharedMemory.h -@@ -73,7 +73,7 @@ public: - - bool isNull() const; - --#if OS(DARWIN) || OS(WINDOWS) -+#if !USE(UNIX_DOMAIN_SOCKETS) && (OS(DARWIN) || OS(WINDOWS)) - size_t size() const { return m_size; } - #endif - -diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp -index 528fa47..4268457 100644 ---- a/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp -+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp -@@ -409,7 +409,7 @@ RefPtr WebPlatformStrategies::readBufferFromPasteboard(si - WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadBufferFromPasteboard(index, pasteboardType, pasteboardName), Messages::WebPasteboardProxy::ReadBufferFromPasteboard::Reply(handle, size), 0); - if (handle.isNull()) - return nullptr; --#if OS(DARWIN) || OS(WINDOWS) -+#if !USE(UNIX_DOMAIN_SOCKETS) && (OS(DARWIN) || OS(WINDOWS)) - // SharedMemory::Handle::size() is rounded up to the nearest page. - if (!size || size > handle.size()) - return nullptr; --- -2.2.2 - diff --git a/modulesets/patches/WebKit2Gtk3-2.30.1-Force-FindICU-instead-of-inserting-heade.patch b/modulesets/patches/WebKit2Gtk3-2.30.1-Force-FindICU-instead-of-inserting-heade.patch deleted file mode 100644 index 02e1b6e..0000000 --- a/modulesets/patches/WebKit2Gtk3-2.30.1-Force-FindICU-instead-of-inserting-heade.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5bbb4c1d93218117e90997df8b770d2d1a493f10 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 31 Oct 2020 17:01:17 -0700 -Subject: [PATCH 2/7] WebKit2Gtk3 Force FindICU instead of inserting headers - and using the ICU Framework. - ---- - Source/cmake/WebKitFindPackage.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/cmake/WebKitFindPackage.cmake b/Source/cmake/WebKitFindPackage.cmake -index a35d15a..7e9552c 100644 ---- a/Source/cmake/WebKitFindPackage.cmake -+++ b/Source/cmake/WebKitFindPackage.cmake -@@ -86,7 +86,7 @@ macro(find_package package) - endif () - - # Apple builds have a unique location for ICU -- if (APPLE AND "${package}" STREQUAL "ICU") -+ if (APPLE AND "${package}" STREQUAL "ICU" AND NOT PORT STREQUAL "GTK") - set(_found_package ON) - - set(ICU_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ICU/Headers) --- -2.2.2 - diff --git a/modulesets/patches/WebKit2Gtk3-2.30.2-GUniquePtrGtk.patch b/modulesets/patches/WebKit2Gtk3-2.30.2-GUniquePtrGtk.patch deleted file mode 100644 index 4a45836..0000000 --- a/modulesets/patches/WebKit2Gtk3-2.30.2-GUniquePtrGtk.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp 2020-02-04 02:24:08.000000000 -0800 -+++ b/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp 2020-10-20 14:55:56.000000000 -0700 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - - namespace WebKit { - diff --git a/modulesets/patches/WebKit2Gtk3-2.30.2-Prevent-WebKitWebProcess-from-being-in-.patch b/modulesets/patches/WebKit2Gtk3-2.30.2-Prevent-WebKitWebProcess-from-being-in-.patch deleted file mode 100644 index c5317dd..0000000 --- a/modulesets/patches/WebKit2Gtk3-2.30.2-Prevent-WebKitWebProcess-from-being-in-.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 338ef8630d4aa8c15d33e66f438bc5862d4dc930 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Thu, 29 Oct 2020 18:30:08 -0700 -Subject: [PATCH] Prevent WebKitWebProcess from being in the dock or process - switcher. - -Thanks to the Nyxt browser project, https://nyxt.atlas.engineer/. ---- - Source/WebKit/PlatformGTK.cmake | 4 ++++ - Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h | 4 ++++ - Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm | 10 ++++++++++ - Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp | 2 ++ - 4 files changed, 20 insertions(+) - create mode 100644 Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h - create mode 100644 Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm - -diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index f6abc65..7214829 100644 ---- a/Source/WebKit/PlatformGTK.cmake -+++ b/Source/WebKit/PlatformGTK.cmake -@@ -34,6 +34,10 @@ list(APPEND WebKit_UNIFIED_SOURCE_LIST_FILES - "SourcesGTK.txt" - ) - -+find_library(APPKIT_FRAMEWORK NAMES AppKit) -+target_link_libraries(WebKit PRIVATE ${APPKIT_FRAMEWORK}) -+list(APPEND WebKit_SOURCES WebProcess/gtk/NSApplicationActivationPolicy.mm) -+ - if (NOT USE_GTK4) - list(APPEND WebKit_SOURCES - UIProcess/ViewGestureController.cpp -diff --git a/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h b/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h -new file mode 100644 -index 0000000..7285942 ---- /dev/null -+++ b/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h -@@ -0,0 +1,4 @@ -+ -+// This is the C "trampoline" function that will be used -+// to invoke a specific Objective-C method FROM C++ -+void SetActivationPolicyProhibited (); -diff --git a/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm b/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm -new file mode 100644 -index 0000000..ce1d75c ---- /dev/null -+++ b/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm -@@ -0,0 +1,10 @@ -+#include "config.h" -+#import "NSApplicationActivationPolicy.h" -+#import -+ -+// C "trampoline" function to invoke Objective-C method -+void SetActivationPolicyProhibited () -+{ -+ [NSApp setActivationPolicy: NSApplicationActivationPolicyProhibited]; -+ return; -+} -diff --git a/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp b/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp -index 6a4a822..5b4064f 100644 ---- a/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp -+++ b/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp -@@ -31,6 +31,7 @@ - #include "WebProcess.h" - #include - #include -+#include "NSApplicationActivationPolicy.h" - - #if PLATFORM(X11) - #include -@@ -56,6 +57,7 @@ public: - - bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); -+ SetActivationPolicyProhibited (); - - return true; - } --- -2.2.2 - diff --git a/modulesets/patches/WebKit2Gtk3-2.32.0-misc-fixes.patch b/modulesets/patches/WebKit2Gtk3-2.32.0-misc-fixes.patch new file mode 100644 index 0000000..ff03856 --- /dev/null +++ b/modulesets/patches/WebKit2Gtk3-2.32.0-misc-fixes.patch @@ -0,0 +1,47 @@ +--- a/Source/WTF/wtf/URLHelpers.cpp 2021-02-26 01:57:08 ++++ b/Source/WTF/wtf/URLHelpers.cpp 2024-07-13 13:14:05 +@@ -52,7 +52,7 @@ + // WebKit was compiled. + // This is only really important for platforms that load an external IDN allowed script list. + // Not important for the compiled-in one. +-constexpr auto scriptCodeLimit = static_cast(256); ++constexpr auto scriptCodeLimit = static_cast(255); + + static uint32_t allowedIDNScriptBits[(scriptCodeLimit + 31) / 32]; + + +--- a/Source/WTF/wtf/PlatformUse.h 2021-02-26 01:57:08 ++++ b/Source/WTF/wtf/PlatformUse.h 2024-07-14 09:27:02 +@@ -313,7 +313,7 @@ + #define USE_LEGACY_CFNETWORK_DOWNLOADS 1 + #endif + +-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \ ++#if (OS(MAC_OS_X) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \ + || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) + #if USE(APPLE_INTERNAL_SDK) + /* Always use the macro on internal builds */ + +--- b/Source/WTF/wtf/glib/GLibUtilities.cpp 2024-07-13 12:02:10 ++++ b/Source/WTF/wtf/glib/GLibUtilities.cpp 2024-07-15 17:19:10 +@@ -58,6 +58,19 @@ + CFStringGetCString(string, bundle_path, len, kCFStringEncodingUTF8); + CFRelease(abs_url); + CFRelease(string); ++ ++ auto basename{g_path_get_basename(bundle_path)}; ++ if (g_strcmp0("bin", basename) == 0) ++ { ++ auto parent_path{g_path_get_dirname(bundle_path)}; ++ if (parent_path && *parent_path) ++ { ++ strncpy(bundle_path, parent_path, len); ++ len = strlen(parent_path); ++ g_free(parent_path); ++ } ++ } ++ g_free(basename); + return CString(bundle_path, len); + } + #endif + diff --git a/modulesets/patches/Webkit-2.16-Fix-some-includes.patch b/modulesets/patches/Webkit-2.16-Fix-some-includes.patch deleted file mode 100644 index 5b75772..0000000 --- a/modulesets/patches/Webkit-2.16-Fix-some-includes.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ab145a5642e7725bd2e8313e96a8ff0fdc53a49c Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 22 Apr 2017 16:35:27 -0700 -Subject: [PATCH 3/3] [GTK] Fix some missing/misnamed includes. - ---- - .../platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h | 4 ++-- - .../platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h -index bf25111..06b0782 100644 ---- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h -+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h -@@ -30,8 +30,8 @@ - #include "GraphicsLayerTransform.h" - #include "Image.h" - #include "IntSize.h" --#include "TextureMapperAnimation.h" --#include "TextureMapperPlatformLayer.h" -+#include "../TextureMapperAnimation.h" -+#include "../TextureMapperPlatformLayer.h" - #include "TiledBackingStore.h" - #include "TiledBackingStoreClient.h" - #include "TransformationMatrix.h" -diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h -index c810530..3f09b58 100644 ---- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h -+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h -@@ -36,11 +36,11 @@ - #include "IntRect.h" - #include "IntSize.h" - #include "SurfaceUpdateInfo.h" --#include "TextureMapperAnimation.h" -+#include "../TextureMapperAnimation.h" - #include "TransformationMatrix.h" - - #if USE(COORDINATED_GRAPHICS_THREADED) --#include "TextureMapperPlatformLayerProxy.h" -+#include "../TextureMapperPlatformLayerProxy.h" - #endif - - namespace WebCore { --- -2.2.2 - diff --git a/modulesets/patches/Webkit-2.16-build-without-OpenGL.patch b/modulesets/patches/Webkit-2.16-build-without-OpenGL.patch deleted file mode 100644 index c098567..0000000 --- a/modulesets/patches/Webkit-2.16-build-without-OpenGL.patch +++ /dev/null @@ -1,375 +0,0 @@ -From 9e4d31faae8f3f23df718891b41dc4bd97eee0d6 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Thu, 20 Apr 2017 16:40:16 -0700 -Subject: [PATCH 2/3] [GTK] Building WebKit2Gtk without OpenGL Fails. - -Rearranged WebCore/PlatformGTK.cmake so that the OpenGL-dependent -targets are built only if OpenGL is enabled. Add -USE_COORDINATED_GRAPHICS to unconditionally TRUE options in -OptionsGTK.cmake. Adjusted two targets in TextureMapper.cmake to -build only if USE_TEXTURE_MAPPER_GL is true because they depend on -OpenGL contexts. Made some functions and includes conditional on -OpenGL or subsidiary items. ---- - Source/WebCore/PlatformGTK.cmake | 78 ++++++++++++++-------- - Source/WebCore/page/FrameView.cpp | 2 +- - .../page/scrolling/ScrollingCoordinator.cpp | 2 +- - Source/WebCore/platform/TextureMapper.cmake | 8 ++- - .../WebCore/platform/graphics/PlatformDisplay.cpp | 3 +- - .../texmap/coordinated/TiledBackingStore.cpp | 2 +- - Source/WebKit2/PlatformGTK.cmake | 13 ++++ - .../UIProcess/API/gtk/WebKitWebsiteData.cpp | 3 - - .../UIProcess/API/gtk/WebKitWebsiteDataManager.cpp | 2 - - .../WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp | 1 - - Source/cmake/OptionsGTK.cmake | 5 +- - 11 files changed, 76 insertions(+), 43 deletions(-) - -diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake -index 6981e37..417249e 100644 ---- a/Source/WebCore/PlatformGTK.cmake -+++ b/Source/WebCore/PlatformGTK.cmake -@@ -21,16 +21,11 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES - "${WEBCORE_DIR}/platform/geoclue" - "${WEBCORE_DIR}/platform/gtk" - "${WEBCORE_DIR}/platform/graphics/cairo" -- "${WEBCORE_DIR}/platform/graphics/egl" -- "${WEBCORE_DIR}/platform/graphics/glx" - "${WEBCORE_DIR}/platform/graphics/gtk" - "${WEBCORE_DIR}/platform/graphics/freetype" - "${WEBCORE_DIR}/platform/graphics/harfbuzz/" - "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng" -- "${WEBCORE_DIR}/platform/graphics/opengl" - "${WEBCORE_DIR}/platform/graphics/opentype" -- "${WEBCORE_DIR}/platform/graphics/wayland" -- "${WEBCORE_DIR}/platform/graphics/x11" - "${WEBCORE_DIR}/platform/mediastream/gtk" - "${WEBCORE_DIR}/platform/mock/mediasource" - "${WEBCORE_DIR}/platform/network/gtk" -@@ -83,11 +78,9 @@ list(APPEND WebCore_SOURCES - platform/glib/MainThreadSharedTimerGLib.cpp - platform/glib/SharedBufferGlib.cpp - -- platform/graphics/GLContext.cpp - platform/graphics/GraphicsContext3DPrivate.cpp - - platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp -- platform/graphics/cairo/BackingStoreBackendCairoX11.cpp - platform/graphics/cairo/CairoUtilities.cpp - platform/graphics/cairo/FloatRectCairo.cpp - platform/graphics/cairo/FontCairo.cpp -@@ -106,18 +99,11 @@ list(APPEND WebCore_SOURCES - platform/graphics/cairo/RefPtrCairo.cpp - platform/graphics/cairo/TransformationMatrixCairo.cpp - -- platform/graphics/egl/GLContextEGL.cpp -- platform/graphics/egl/GLContextEGLWayland.cpp -- platform/graphics/egl/GLContextEGLX11.cpp -- - platform/graphics/freetype/FontCacheFreeType.cpp - platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp - platform/graphics/freetype/FontPlatformDataFreeType.cpp - platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp - platform/graphics/freetype/SimpleFontDataFreeType.cpp -- -- platform/graphics/glx/GLContextGLX.cpp -- - platform/graphics/gstreamer/ImageGStreamerCairo.cpp - - platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp -@@ -125,18 +111,8 @@ list(APPEND WebCore_SOURCES - platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp - platform/graphics/harfbuzz/HarfBuzzShaper.cpp - -- platform/graphics/opengl/Extensions3DOpenGLCommon.cpp -- platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp -- platform/graphics/opengl/TemporaryOpenGLSetting.cpp -- - platform/graphics/opentype/OpenTypeVerticalData.cpp - -- platform/graphics/wayland/PlatformDisplayWayland.cpp -- -- platform/graphics/x11/PlatformDisplayX11.cpp -- platform/graphics/x11/XErrorTrapper.cpp -- platform/graphics/x11/XUniqueResource.cpp -- - platform/gtk/DragDataGtk.cpp - platform/gtk/ErrorsGtk.cpp - platform/gtk/MIMETypeRegistryGtk.cpp -@@ -258,11 +234,6 @@ list(APPEND WebCore_LIBRARIES - ${LIBXSLT_LIBRARIES} - ${HYPHEN_LIBRARIES} - ${SQLITE_LIBRARIES} -- ${X11_X11_LIB} -- ${X11_Xcomposite_LIB} -- ${X11_Xdamage_LIB} -- ${X11_Xrender_LIB} -- ${X11_Xt_LIB} - ${ZLIB_LIBRARIES} - WTF - ) -@@ -296,11 +267,24 @@ if (USE_OPENGL_ES_2) - endif () - - if (USE_OPENGL) -+ list(APPEND WebCore_INCLUDE_DIRECTORIES -+ "${WEBCORE_DIR}/platform/graphics/opengl" -+ "${WEBCORE_DIR}/platform/graphics/egl" -+ "${WEBCORE_DIR}/platform/graphics/glx" -+ ) - list(APPEND WebCore_SOURCES -+ platform/graphics/GLContext.cpp - platform/graphics/OpenGLShims.cpp - -+ platform/graphics/egl/GLContextEGL.cpp -+ -+ platform/graphics/glx/GLContextGLX.cpp -+ - platform/graphics/opengl/Extensions3DOpenGL.cpp - platform/graphics/opengl/GraphicsContext3DOpenGL.cpp -+ platform/graphics/opengl/Extensions3DOpenGLCommon.cpp -+ platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp -+ platform/graphics/opengl/TemporaryOpenGLSetting.cpp - ) - endif () - -@@ -330,13 +314,49 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) - ) - endif () - -+if (ENABLE_X11_TARGET) -+ list(APPEND WebCore_INCLUDE_DIRECTORIES -+ "${WEBCORE_DIR}/platform/graphics/x11" -+ ) -+ list(APPEND WebCore_SOURCES -+ platform/graphics/x11/PlatformDisplayX11.cpp -+ platform/graphics/x11/XErrorTrapper.cpp -+ platform/graphics/x11/XUniqueResource.cpp -+ platform/graphics/cairo/BackingStoreBackendCairoX11.cpp -+ ) -+ list(APPEND WebCore_LIBRARIES -+ ${X11_X11_LIB} -+ ${X11_Xcomposite_LIB} -+ ${X11_Xdamage_LIB} -+ ${X11_Xrender_LIB} -+ ${X11_Xt_LIB} -+ ) -+ if (USE_OPENGL) -+ list(APPEND WebCore_SOURCES -+ platform/graphics/egl/GLContextEGLX11.cpp -+ ) -+ endif () -+endif() -+ -+ - if (ENABLE_WAYLAND_TARGET) -+ list(APPEND WebCore_INCLUDE_DIRECTORIES -+ "${WEBCORE_DIR}/platform/graphics/wayland" -+ ) -+ list(APPEND WebCore_SOURCES -+ platform/graphics/wayland/PlatformDisplayWayland.cpp -+ ) - list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES - ${WAYLAND_INCLUDE_DIRS} - ) - list(APPEND WebCore_LIBRARIES - ${WAYLAND_LIBRARIES} - ) -+ if (USE_OPENGL) -+ list(APPEND WebCore_SOURCES -+ platform/graphics/egl/GLContextEGLWayland.cpp -+ ) -+ endif () - endif () - - add_library(WebCorePlatformGTK ${WebCore_LIBRARY_TYPE} ${WebCorePlatformGTK_SOURCES}) -diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp -index 597c666..8e2d43a 100644 ---- a/Source/WebCore/page/FrameView.cpp -+++ b/Source/WebCore/page/FrameView.cpp -@@ -103,7 +103,7 @@ - #include - - #if USE(COORDINATED_GRAPHICS) --#include "TiledBackingStore.h" -+#include - #endif - - #if ENABLE(CSS_SCROLL_SNAP) -diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp -index ff34266..9f7e93b 100644 ---- a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp -+++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp -@@ -46,7 +46,7 @@ - #include - - #if USE(COORDINATED_GRAPHICS) --#include "ScrollingCoordinatorCoordinatedGraphics.h" -+#include - #endif - - #if ENABLE(WEB_REPLAY) -diff --git a/Source/WebCore/platform/TextureMapper.cmake b/Source/WebCore/platform/TextureMapper.cmake -index 1091a46..4cfcf1e 100644 ---- a/Source/WebCore/platform/TextureMapper.cmake -+++ b/Source/WebCore/platform/TextureMapper.cmake -@@ -9,7 +9,6 @@ list(APPEND WebCore_SOURCES - platform/graphics/texmap/TextureMapperAnimation.cpp - platform/graphics/texmap/TextureMapperBackingStore.cpp - platform/graphics/texmap/TextureMapperFPSCounter.cpp -- platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp - platform/graphics/texmap/TextureMapperLayer.cpp - platform/graphics/texmap/TextureMapperTile.cpp - platform/graphics/texmap/TextureMapperTiledBackingStore.cpp -@@ -19,6 +18,7 @@ if (USE_TEXTURE_MAPPER_GL) - list(APPEND WebCore_SOURCES - platform/graphics/texmap/BitmapTextureGL.cpp - platform/graphics/texmap/ClipStack.cpp -+ platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp - platform/graphics/texmap/TextureMapperGL.cpp - platform/graphics/texmap/TextureMapperShaderProgram.cpp - ) -@@ -42,8 +42,12 @@ if (USE_COORDINATED_GRAPHICS) - endif () - - if (ENABLE_THREADED_COMPOSITOR) -+ if (USE_TEXTURE_MAPPER_GL) -+ list(APPEND WebCore_SOURCES -+ platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp -+ ) -+ endif() - list(APPEND WebCore_SOURCES -- platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp - platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp - ) - endif () -diff --git a/Source/WebCore/platform/graphics/PlatformDisplay.cpp b/Source/WebCore/platform/graphics/PlatformDisplay.cpp -index e387bf9..d4c1bd9 100644 ---- a/Source/WebCore/platform/graphics/PlatformDisplay.cpp -+++ b/Source/WebCore/platform/graphics/PlatformDisplay.cpp -@@ -25,8 +25,9 @@ - - #include "config.h" - #include "PlatformDisplay.h" -- -+#if ENABLE(OPENGL) - #include "GLContext.h" -+#endif - #include - #include - -diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.cpp -index ecb31b4..d88498c 100644 ---- a/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.cpp -+++ b/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.cpp -@@ -24,7 +24,7 @@ - #include "GraphicsContext.h" - #include "TiledBackingStoreClient.h" - #include --#include -+#include "MemoryPressureHandler.h" - - namespace WebCore { - -diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake -index 2c6bc5f..a73d5eb 100644 ---- a/Source/WebKit2/PlatformGTK.cmake -+++ b/Source/WebKit2/PlatformGTK.cmake -@@ -59,6 +59,12 @@ list(APPEND WebKit2_SOURCES - - Shared/Authentication/soup/AuthenticationManagerSoup.cpp - -+ Shared/CoordinatedGraphics/CoordinatedBackingStore.cpp -+ Shared/CoordinatedGraphics/SimpleViewportController.cpp -+ -+ Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp -+ Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp -+ - Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp - - Shared/Plugins/unix/PluginSearchPath.cpp -@@ -491,6 +497,13 @@ list(APPEND WebKit2_SOURCES - WebProcess/soup/WebProcessSoup.cpp - ) - -+if (ENABLE_OPENGL) -+ list(APPEND WebKit2_SOURCES -+ Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp -+ Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp -+ ) -+endif() -+ - list(APPEND WebKit2_DERIVED_SOURCES - ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c - ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c -diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteData.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteData.cpp -index 59dea58..6ffd597 100644 ---- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteData.cpp -+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteData.cpp -@@ -73,7 +73,6 @@ static bool recordContainsSupportedDataTypes(const WebsiteDataRecord& record) - WebsiteDataType::LocalStorage, - WebsiteDataType::WebSQLDatabases, - WebsiteDataType::IndexedDBDatabases, -- WebsiteDataType::PlugInData, - WebsiteDataType::Cookies - }; - return record.types.contains(typesSupported); -@@ -96,8 +95,6 @@ static WebKitWebsiteDataTypes toWebKitWebsiteDataTypes(OptionSet(returnValue); -diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp -index 5bc8775..510e30c 100644 ---- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp -+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp -@@ -641,8 +641,6 @@ static OptionSet toWebsiteDataTypes(WebKitWebsiteDataTypes type - returnValue |= WebsiteDataType::WebSQLDatabases; - if (types & WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES) - returnValue |= WebsiteDataType::IndexedDBDatabases; -- if (types & WEBKIT_WEBSITE_DATA_PLUGIN_DATA) -- returnValue |= WebsiteDataType::PlugInData; - if (types & WEBKIT_WEBSITE_DATA_COOKIES) - returnValue |= WebsiteDataType::Cookies; - return returnValue; -diff --git a/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp b/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp -index a2da574..5fb5648 100644 ---- a/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp -+++ b/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp -@@ -100,7 +100,6 @@ void DrawingAreaImpl::scroll(const IntRect& scrollRect, const IntSize& scrollDel - - if (m_previousLayerTreeHost) - m_previousLayerTreeHost->scrollNonCompositedContents(scrollRect); -- - if (!m_scrollRect.isEmpty() && scrollRect != m_scrollRect) { - unsigned scrollArea = scrollRect.width() * scrollRect.height(); - unsigned currentScrollArea = m_scrollRect.width() * m_scrollRect.height(); -diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 6efb76b..c0696b7 100644 ---- a/Source/cmake/OptionsGTK.cmake -+++ b/Source/cmake/OptionsGTK.cmake -@@ -280,6 +280,7 @@ if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC) - endif () - - SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE) -+SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE) - - if (ENABLE_OPENGL) - # ENABLE_OPENGL is true if either USE_OPENGL or ENABLE_GLES2 is true. -@@ -312,8 +313,8 @@ if (ENABLE_OPENGL) - SET_AND_EXPOSE_TO_BUILD(USE_GLX TRUE) - endif () - -- SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS ${ENABLE_THREADED_COMPOSITOR}) -- SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED ${ENABLE_THREADED_COMPOSITOR}) -+ SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED TRUE) -+ - endif () - - if (ENABLE_PLUGIN_PROCESS_GTK2) --- -2.2.2 - diff --git a/modulesets/patches/bug-92264-webkit-bison-2.6.patch b/modulesets/patches/bug-92264-webkit-bison-2.6.patch deleted file mode 100644 index 693e0bb..0000000 --- a/modulesets/patches/bug-92264-webkit-bison-2.6.patch +++ /dev/null @@ -1,554 +0,0 @@ -Subversion Revision: 123651 -diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog ---- a/Source/WebCore/css/CSSGrammar.y -+++ b/Source/WebCore/css/CSSGrammar.y -@@ -53,14 +53,13 @@ using namespace HTMLNames; - #define YYMAXDEPTH 10000 - #define YYDEBUG 0 - --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x --#define YYPARSE_PARAM parser --#define YYLEX_PARAM parser -- - %} - - %pure_parser - -+%parse-param { CSSParser* parser } -+%lex-param { CSSParser* parser } -+ - %union { - bool boolean; - char character; -@@ -89,7 +88,7 @@ using namespace HTMLNames; - - %{ - --static inline int cssyyerror(const char*) -+static inline int cssyyerror(void*, const char*) - { - return 1; - } -diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp -index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644 ---- a/Source/WebCore/css/CSSParser.cpp -+++ b/Source/WebCore/css/CSSParser.cpp -@@ -114,7 +114,7 @@ - extern int cssyydebug; - #endif - --extern int cssyyparse(void* parser); -+extern int cssyyparse(WebCore::CSSParser*); - - using namespace std; - using namespace WTF; -diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y -index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644 ---- a/Source/WebCore/xml/XPathGrammar.y -+++ b/Source/WebCore/xml/XPathGrammar.y -@@ -34,6 +34,7 @@ - #include "XPathParser.h" - #include "XPathPath.h" - #include "XPathPredicate.h" -+#include "XPathStep.h" - #include "XPathVariableReference.h" - #include - -@@ -44,8 +45,6 @@ - #define YYLTYPE_IS_TRIVIAL 1 - #define YYDEBUG 0 - #define YYMAXDEPTH 10000 --#define YYPARSE_PARAM parserParameter --#define PARSER static_cast(parserParameter) - - using namespace WebCore; - using namespace XPath; -@@ -53,6 +52,7 @@ using namespace XPath; - %} - - %pure_parser -+%parse-param { WebCore::XPath::Parser* parser } - - %union - { -@@ -71,7 +71,7 @@ using namespace XPath; - %{ - - static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } --static void xpathyyerror(const char*) { } -+static void xpathyyerror(void*, const char*) { } - - %} - -@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { } - Expr: - OrExpr - { -- PARSER->m_topExpr = $1; -+ parser->m_topExpr = $1; - } - ; - -@@ -138,7 +138,7 @@ AbsoluteLocationPath: - '/' - { - $$ = new LocationPath; -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - | - '/' RelativeLocationPath -@@ -150,7 +150,7 @@ AbsoluteLocationPath: - { - $$ = $2; - $$->insertFirstStep($1); -- PARSER->unregisterParseNode($1); -+ parser->unregisterParseNode($1); - } - ; - -@@ -159,22 +159,22 @@ RelativeLocationPath: - { - $$ = new LocationPath; - $$->appendStep($1); -- PARSER->unregisterParseNode($1); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->registerParseNode($$); - } - | - RelativeLocationPath '/' Step - { - $$->appendStep($3); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($3); - } - | - RelativeLocationPath DescendantOrSelf Step - { - $$->appendStep($2); - $$->appendStep($3); -- PARSER->unregisterParseNode($2); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($2); -+ parser->unregisterParseNode($3); - } - ; - -@@ -183,58 +183,58 @@ Step: - { - if ($2) { - $$ = new Step(Step::ChildAxis, *$1, *$2); -- PARSER->deletePredicateVector($2); -+ parser->deletePredicateVector($2); - } else - $$ = new Step(Step::ChildAxis, *$1); -- PARSER->deleteNodeTest($1); -- PARSER->registerParseNode($$); -+ parser->deleteNodeTest($1); -+ parser->registerParseNode($$); - } - | - NAMETEST OptionalPredicateList - { - String localName; - String namespaceURI; -- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { -- PARSER->m_gotNamespaceError = true; -+ if (!parser->expandQName(*$1, localName, namespaceURI)) { -+ parser->m_gotNamespaceError = true; - YYABORT; - } - - if ($2) { - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); -- PARSER->deletePredicateVector($2); -+ parser->deletePredicateVector($2); - } else - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - AxisSpecifier NodeTest OptionalPredicateList - { - if ($3) { - $$ = new Step($1, *$2, *$3); -- PARSER->deletePredicateVector($3); -+ parser->deletePredicateVector($3); - } else - $$ = new Step($1, *$2); -- PARSER->deleteNodeTest($2); -- PARSER->registerParseNode($$); -+ parser->deleteNodeTest($2); -+ parser->registerParseNode($$); - } - | - AxisSpecifier NAMETEST OptionalPredicateList - { - String localName; - String namespaceURI; -- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { -- PARSER->m_gotNamespaceError = true; -+ if (!parser->expandQName(*$2, localName, namespaceURI)) { -+ parser->m_gotNamespaceError = true; - YYABORT; - } - - if ($3) { - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); -- PARSER->deletePredicateVector($3); -+ parser->deletePredicateVector($3); - } else - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); -- PARSER->deleteString($2); -- PARSER->registerParseNode($$); -+ parser->deleteString($2); -+ parser->registerParseNode($$); - } - | - AbbreviatedStep -@@ -259,23 +259,23 @@ NodeTest: - else if (*$1 == "comment") - $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); - -- PARSER->deleteString($1); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->registerNodeTest($$); - } - | - PI '(' ')' - { - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); -- PARSER->deleteString($1); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->registerNodeTest($$); - } - | - PI '(' LITERAL ')' - { - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); -- PARSER->deleteString($1); -- PARSER->deleteString($3); -- PARSER->registerNodeTest($$); -+ parser->deleteString($1); -+ parser->deleteString($3); -+ parser->registerNodeTest($$); - } - ; - -@@ -293,14 +293,14 @@ PredicateList: - { - $$ = new Vector; - $$->append(new Predicate($1)); -- PARSER->unregisterParseNode($1); -- PARSER->registerPredicateVector($$); -+ parser->unregisterParseNode($1); -+ parser->registerPredicateVector($$); - } - | - PredicateList Predicate - { - $$->append(new Predicate($2)); -- PARSER->unregisterParseNode($2); -+ parser->unregisterParseNode($2); - } - ; - -@@ -315,7 +315,7 @@ DescendantOrSelf: - SLASHSLASH - { - $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - ; - -@@ -323,13 +323,13 @@ AbbreviatedStep: - '.' - { - $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - | - DOTDOT - { - $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); -- PARSER->registerParseNode($$); -+ parser->registerParseNode($$); - } - ; - -@@ -337,8 +337,8 @@ PrimaryExpr: - VARIABLEREFERENCE - { - $$ = new VariableReference(*$1); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - '(' Expr ')' -@@ -349,15 +349,15 @@ PrimaryExpr: - LITERAL - { - $$ = new StringExpression(*$1); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - NUMBER - { - $$ = new Number($1->toDouble()); -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - FunctionCall -@@ -369,8 +369,8 @@ FunctionCall: - $$ = createFunction(*$1); - if (!$$) - YYABORT; -- PARSER->deleteString($1); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->registerParseNode($$); - } - | - FUNCTIONNAME '(' ArgumentList ')' -@@ -378,9 +378,9 @@ FunctionCall: - $$ = createFunction(*$1, *$3); - if (!$$) - YYABORT; -- PARSER->deleteString($1); -- PARSER->deleteExpressionVector($3); -- PARSER->registerParseNode($$); -+ parser->deleteString($1); -+ parser->deleteExpressionVector($3); -+ parser->registerParseNode($$); - } - ; - -@@ -389,14 +389,14 @@ ArgumentList: - { - $$ = new Vector; - $$->append($1); -- PARSER->unregisterParseNode($1); -- PARSER->registerExpressionVector($$); -+ parser->unregisterParseNode($1); -+ parser->registerExpressionVector($$); - } - | - ArgumentList ',' Argument - { - $$->append($3); -- PARSER->unregisterParseNode($3); -+ parser->unregisterParseNode($3); - } - ; - -@@ -412,9 +412,9 @@ UnionExpr: - $$ = new Union; - $$->addSubExpression($1); - $$->addSubExpression($3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -430,9 +430,9 @@ PathExpr: - { - $3->setAbsolute(true); - $$ = new Path(static_cast($1), $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - | - FilterExpr DescendantOrSelf RelativeLocationPath -@@ -440,10 +440,10 @@ PathExpr: - $3->insertFirstStep($2); - $3->setAbsolute(true); - $$ = new Path(static_cast($1), $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($2); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($2); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -453,9 +453,9 @@ FilterExpr: - PrimaryExpr PredicateList - { - $$ = new Filter($1, *$2); -- PARSER->unregisterParseNode($1); -- PARSER->deletePredicateVector($2); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->deletePredicateVector($2); -+ parser->registerParseNode($$); - } - ; - -@@ -465,9 +465,9 @@ OrExpr: - OrExpr OR AndExpr - { - $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -477,9 +477,9 @@ AndExpr: - AndExpr AND EqualityExpr - { - $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -489,9 +489,9 @@ EqualityExpr: - EqualityExpr EQOP RelationalExpr - { - $$ = new EqTestOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -501,9 +501,9 @@ RelationalExpr: - RelationalExpr RELOP AdditiveExpr - { - $$ = new EqTestOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -513,17 +513,17 @@ AdditiveExpr: - AdditiveExpr PLUS MultiplicativeExpr - { - $$ = new NumericOp(NumericOp::OP_Add, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - | - AdditiveExpr MINUS MultiplicativeExpr - { - $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -533,9 +533,9 @@ MultiplicativeExpr: - MultiplicativeExpr MULOP UnaryExpr - { - $$ = new NumericOp($2, $1, $3); -- PARSER->unregisterParseNode($1); -- PARSER->unregisterParseNode($3); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($1); -+ parser->unregisterParseNode($3); -+ parser->registerParseNode($$); - } - ; - -@@ -546,8 +546,8 @@ UnaryExpr: - { - $$ = new Negative; - $$->addSubExpression($2); -- PARSER->unregisterParseNode($2); -- PARSER->registerParseNode($$); -+ parser->unregisterParseNode($2); -+ parser->registerParseNode($$); - } - ; - -diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp -index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644 ---- a/Source/WebCore/xml/XPathParser.cpp -+++ b/Source/WebCore/xml/XPathParser.cpp -@@ -32,24 +32,21 @@ - #include "XPathEvaluator.h" - #include "XPathException.h" - #include "XPathNSResolver.h" -+#include "XPathPath.h" - #include "XPathStep.h" - #include - #include - --int xpathyyparse(void*); -- -+using namespace WebCore; - using namespace WTF; - using namespace Unicode; -+using namespace XPath; - --namespace WebCore { --namespace XPath { -- --class LocationPath; -- --#include "XPathGrammar.h" -+extern int xpathyyparse(WebCore::XPath::Parser*); -+#include "XPathGrammar.h" - - Parser* Parser::currentParser = 0; -- -+ - enum XMLCat { NameStart, NameCont, NotPartOfName }; - - typedef HashMap AxisNamesMap; -@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t) - delete t; - } - --} --} diff --git a/modulesets/patches/cairomm-Bug-100894-Cairomm-compile-failure-if-no-cairo-ft.patch b/modulesets/patches/cairomm-Bug-100894-Cairomm-compile-failure-if-no-cairo-ft.patch deleted file mode 100644 index 564f845..0000000 --- a/modulesets/patches/cairomm-Bug-100894-Cairomm-compile-failure-if-no-cairo-ft.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -u /Users/john/Development/gtk-build/gtk-stable-10.9-x86_64/src/cairomm-1.12.2/cairomm/enums.h\~ /Users/john/Development/gtk-build/gtk-stable-10.9-x86_64/src/cairomm-1.12.2/cairomm/enums.h ---- a/cairomm/enums.h 2015-08-12 02:27:20.000000000 -0700 -+++ b/cairomm/enums.h 2017-04-30 14:08:29.000000000 -0700 -@@ -20,7 +20,9 @@ - #define __CAIROMM_ENUMS_H - - #include -+#ifdef CAIRO_HAS_FT_FONT - #include -+#endif //CAIRO_HAS_FT_FONT - - namespace Cairo - { -@@ -828,6 +830,7 @@ - * - * @since 1.12 - */ -+#ifdef CAIRO_HAS_FT_FONT - enum FtSynthesize { - - /// Embolden the glyphs (redraw with a pixel offset) -@@ -846,7 +849,7 @@ - { - return static_cast(static_cast(a) & static_cast(b)); - } -- -+#endif //CAIRO_HAS_FT_FONT - } // namespace Cairo - - #endif //__CAIROMM_ENUMS_H - -Diff finished. Sun Apr 30 15:22:11 2017 diff --git a/modulesets/patches/cmake-libnetwork.patch b/modulesets/patches/cmake-libnetwork.patch deleted file mode 100644 index f4cb715..0000000 --- a/modulesets/patches/cmake-libnetwork.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt -index d12c73f..39b70c0 100644 (file) ---- a/Utilities/cmcurl/CMakeLists.txt -+++ b/Utilities/cmcurl/CMakeLists.txt -@@ -43,6 +43,14 @@ if(WIN32) - set(HAVE_INET_PTON 0 CACHE INTERNAL "Do not use inet_pton") - endif() - -+# Starting with OSX 10.11 there is an unrelated libnetwork library which will -+# be picked up during curl configuration. Linking against this library is -+# unnecessary and breaks backward compatibility of the resulting binaries -+# because libnetwork is unavailable on older OSX versions. -+if(APPLE) -+ set(HAVE_LIBNETWORK 0 CACHE INTERNAL "Do not use libnetwork") -+endif(APPLE) -+ - # Disable warnings to avoid changing 3rd party code. - if(CMAKE_C_COMPILER_ID MATCHES - "^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$") diff --git a/modulesets/patches/delete-gnetworking.h.patch b/modulesets/patches/delete-gnetworking.h.patch deleted file mode 100644 index c4695d4..0000000 --- a/modulesets/patches/delete-gnetworking.h.patch +++ /dev/null @@ -1,1116 +0,0 @@ -diff -Nu glib-2.38.0/gio/Makefile.am glib-2.38.0-A/gio/Makefile.am ---- glib-2.38.0/gio/Makefile.am 2013-09-23 07:02:04.000000000 -0700 -+++ glib-2.38.0-A/gio/Makefile.am 2013-09-28 14:34:00.000000000 -0700 -@@ -560,7 +560,6 @@ - gmountoperation.h \ - gnativevolumemonitor.h \ - gnetworkaddress.h \ -- gnetworking.h \ - gnetworkmonitor.h \ - gnetworkservice.h \ - goutputstream.h \ -@@ -617,6 +616,10 @@ - $(gio_headers) \ - gioenumtypes.h - -+nodist_gioinclude_HEADERS = \ -+ gnetworking.h \ -+ $(NULL) -+ - # these sources (also mentioned above) are generated. - BUILT_SOURCES += \ - gconstructor_as_data.h \ -diff -Nu glib-2.38.0/gio/Makefile.in glib-2.38.0-A/gio/Makefile.in ---- glib-2.38.0/gio/Makefile.in 2013-09-23 14:07:45.000000000 -0700 -+++ glib-2.38.0-A/gio/Makefile.in 2013-09-28 15:00:32.000000000 -0700 -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.13.4 from Makefile.am. -+# Makefile.in generated by automake 1.12.2 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2012 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -21,51 +21,23 @@ - - - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' --am__make_running_with_option = \ -- case $${target_option-} in \ -- ?) ;; \ -- *) echo "am__make_running_with_option: internal error: invalid" \ -- "target option '$${target_option-}' specified" >&2; \ -- exit 1;; \ -- esac; \ -- has_opt=no; \ -- sane_makeflags=$$MAKEFLAGS; \ -- if $(am__is_gnu_make); then \ -- sane_makeflags=$$MFLAGS; \ -- else \ -+am__make_dryrun = \ -+ { \ -+ am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ -- bs=\\; \ -- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -- esac; \ -- fi; \ -- skip_next=no; \ -- strip_trailopt () \ -- { \ -- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -- }; \ -- for flg in $$sane_makeflags; do \ -- test $$skip_next = yes && { skip_next=no; continue; }; \ -- case $$flg in \ -- *=*|--*) continue;; \ -- -*I) strip_trailopt 'I'; skip_next=yes;; \ -- -*I?*) strip_trailopt 'I';; \ -- -*O) strip_trailopt 'O'; skip_next=yes;; \ -- -*O?*) strip_trailopt 'O';; \ -- -*l) strip_trailopt 'l'; skip_next=yes;; \ -- -*l?*) strip_trailopt 'l';; \ -- -[dEDm]) skip_next=yes;; \ -- -[JT]) skip_next=yes;; \ -+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -+ *) \ -+ for am__flg in $$MAKEFLAGS; do \ -+ case $$am__flg in \ -+ *=*|--*) ;; \ -+ *n*) am__dry=yes; break;; \ -+ esac; \ -+ done;; \ - esac; \ -- case $$flg in \ -- *$$target_option*) has_opt=yes; break;; \ -- esac; \ -- done; \ -- test $$has_opt = yes --am__make_dryrun = (target_option=n; $(am__make_running_with_option)) --am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -+ test $$am__dry = yes; \ -+ } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -84,12 +56,12 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --DIST_COMMON = $(top_srcdir)/glib.mk $(srcdir)/Makefile.in \ -- $(srcdir)/Makefile.am $(srcdir)/gnetworking.h.in \ -- $(srcdir)/gio.rc.in $(top_srcdir)/depcomp $(dist_schema_DATA) \ -- $(gioinclude_HEADERS) $(am__giounixinclude_HEADERS_DIST) \ -- $(am__giowin32include_HEADERS_DIST) $(top_srcdir)/test-driver \ -- ChangeLog -+DIST_COMMON = $(am__giounixinclude_HEADERS_DIST) \ -+ $(am__giowin32include_HEADERS_DIST) $(dist_schema_DATA) \ -+ $(gioinclude_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \ -+ $(srcdir)/gnetworking.h.in $(top_srcdir)/depcomp \ -+ $(top_srcdir)/glib.mk ChangeLog - installed_test_PROGRAMS = $(am__EXEEXT_1) - noinst_PROGRAMS = $(am__EXEEXT_3) - check_PROGRAMS = $(am__EXEEXT_2) -@@ -217,7 +189,7 @@ - "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(installed_test_metadir)" \ - "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(gioincludedir)" \ - "$(DESTDIR)$(giounixincludedir)" \ -- "$(DESTDIR)$(giowin32includedir)" -+ "$(DESTDIR)$(giowin32includedir)" "$(DESTDIR)$(gioincludedir)" - LTLIBRARIES = $(installed_test_LTLIBRARIES) $(lib_LTLIBRARIES) \ - $(noinst_LTLIBRARIES) - @OS_UNIX_TRUE@am__DEPENDENCIES_1 = xdgmime/libxdgmime.la -@@ -573,14 +545,13 @@ - $(gio_querymodules_SOURCES) $(glib_compile_resources_SOURCES) \ - $(glib_compile_schemas_SOURCES) $(gresource_SOURCES) \ - $(gsettings_SOURCES) --RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -- ctags-recursive dvi-recursive html-recursive info-recursive \ -- install-data-recursive install-dvi-recursive \ -- install-exec-recursive install-html-recursive \ -- install-info-recursive install-pdf-recursive \ -- install-ps-recursive install-recursive installcheck-recursive \ -- installdirs-recursive pdf-recursive ps-recursive \ -- tags-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive - am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ -@@ -597,208 +568,18 @@ - am__giowin32include_HEADERS_DIST = gwin32inputstream.h \ - gwin32outputstream.h - HEADERS = $(gioinclude_HEADERS) $(giounixinclude_HEADERS) \ -- $(giowin32include_HEADERS) -+ $(giowin32include_HEADERS) $(nodist_gioinclude_HEADERS) - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --am__recursive_targets = \ -- $(RECURSIVE_TARGETS) \ -- $(RECURSIVE_CLEAN_TARGETS) \ -- $(am__extra_recursive_targets) --AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ -- check recheck distdir --am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) --# Read a list of newline-separated strings from the standard input, --# and print each of them once, without duplicates. Input order is --# *not* preserved. --am__uniquify_input = $(AWK) '\ -- BEGIN { nonempty = 0; } \ -- { items[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in items) print i; }; } \ --' --# Make sure the list of sources is unique. This is necessary because, --# e.g., the same source file might be shared among _SOURCES variables --# for different programs/libraries. --am__define_uniq_tagged_files = \ -- list='$(am__tagged_files)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | $(am__uniquify_input)` -+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+ distdir - ETAGS = etags - CTAGS = ctags - am__tty_colors_dummy = \ - mgn= red= grn= lgn= blu= brg= std=; \ - am__color_tests=no --am__tty_colors = { \ -- $(am__tty_colors_dummy); \ -- if test "X$(AM_COLOR_TESTS)" = Xno; then \ -- am__color_tests=no; \ -- elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ -- am__color_tests=yes; \ -- elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ -- am__color_tests=yes; \ -- fi; \ -- if test $$am__color_tests = yes; then \ -- red=''; \ -- grn=''; \ -- lgn=''; \ -- blu=''; \ -- mgn=''; \ -- brg=''; \ -- std=''; \ -- fi; \ --} --am__recheck_rx = ^[ ]*:recheck:[ ]* --am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* --am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* --# A command that, given a newline-separated list of test names on the --# standard input, print the name of the tests that are to be re-run --# upon "make recheck". --am__list_recheck_tests = $(AWK) '{ \ -- recheck = 1; \ -- while ((rc = (getline line < ($$0 ".trs"))) != 0) \ -- { \ -- if (rc < 0) \ -- { \ -- if ((getline line2 < ($$0 ".log")) < 0) \ -- recheck = 0; \ -- break; \ -- } \ -- else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ -- { \ -- recheck = 0; \ -- break; \ -- } \ -- else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ -- { \ -- break; \ -- } \ -- }; \ -- if (recheck) \ -- print $$0; \ -- close ($$0 ".trs"); \ -- close ($$0 ".log"); \ --}' --# A command that, given a newline-separated list of test names on the --# standard input, create the global log from their .trs and .log files. --am__create_global_log = $(AWK) ' \ --function fatal(msg) \ --{ \ -- print "fatal: making $@: " msg | "cat >&2"; \ -- exit 1; \ --} \ --function rst_section(header) \ --{ \ -- print header; \ -- len = length(header); \ -- for (i = 1; i <= len; i = i + 1) \ -- printf "="; \ -- printf "\n\n"; \ --} \ --{ \ -- copy_in_global_log = 1; \ -- global_test_result = "RUN"; \ -- while ((rc = (getline line < ($$0 ".trs"))) != 0) \ -- { \ -- if (rc < 0) \ -- fatal("failed to read from " $$0 ".trs"); \ -- if (line ~ /$(am__global_test_result_rx)/) \ -- { \ -- sub("$(am__global_test_result_rx)", "", line); \ -- sub("[ ]*$$", "", line); \ -- global_test_result = line; \ -- } \ -- else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ -- copy_in_global_log = 0; \ -- }; \ -- if (copy_in_global_log) \ -- { \ -- rst_section(global_test_result ": " $$0); \ -- while ((rc = (getline line < ($$0 ".log"))) != 0) \ -- { \ -- if (rc < 0) \ -- fatal("failed to read from " $$0 ".log"); \ -- print line; \ -- }; \ -- printf "\n"; \ -- }; \ -- close ($$0 ".trs"); \ -- close ($$0 ".log"); \ --}' --# Restructured Text title. --am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } --# Solaris 10 'make', and several other traditional 'make' implementations, --# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it --# by disabling -e (using the XSI extension "set +e") if it's set. --am__sh_e_setup = case $$- in *e*) set +e;; esac --# Default flags passed to test drivers. --am__common_driver_flags = \ -- --color-tests "$$am__color_tests" \ -- --enable-hard-errors "$$am__enable_hard_errors" \ -- --expect-failure "$$am__expect_failure" --# To be inserted before the command running the test. Creates the --# directory for the log if needed. Stores in $dir the directory --# containing $f, in $tst the test, in $log the log. Executes the --# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and --# passes TESTS_ENVIRONMENT. Set up options for the wrapper that --# will run the test scripts (or their associated LOG_COMPILER, if --# thy have one). --am__check_pre = \ --$(am__sh_e_setup); \ --$(am__vpath_adj_setup) $(am__vpath_adj) \ --$(am__tty_colors); \ --srcdir=$(srcdir); export srcdir; \ --case "$@" in \ -- */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ -- *) am__odir=.;; \ --esac; \ --test "x$$am__odir" = x"." || test -d "$$am__odir" \ -- || $(MKDIR_P) "$$am__odir" || exit $$?; \ --if test -f "./$$f"; then dir=./; \ --elif test -f "$$f"; then dir=; \ --else dir="$(srcdir)/"; fi; \ --tst=$$dir$$f; log='$@'; \ --if test -n '$(DISABLE_HARD_ERRORS)'; then \ -- am__enable_hard_errors=no; \ --else \ -- am__enable_hard_errors=yes; \ --fi; \ --case " $(XFAIL_TESTS) " in \ -- *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ -- am__expect_failure=yes;; \ -- *) \ -- am__expect_failure=no;; \ --esac; \ --$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) --# A shell command to get the names of the tests scripts with any registered --# extension removed (i.e., equivalently, the names of the test logs, with --# the '.log' extension removed). The result is saved in the shell variable --# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, --# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", --# since that might cause problem with VPATH rewrites for suffix-less tests. --# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. --am__set_TESTS_bases = \ -- bases='$(TEST_LOGS)'; \ -- bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ -- bases=`echo $$bases` --RECHECK_LOGS = $(TEST_LOGS) --TEST_SUITE_LOG = test-suite.log --TEST_EXTENSIONS = @EXEEXT@ .test --am__test_logs1 = $(TESTS:=.log) --am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) --TEST_LOGS = $(am__test_logs2:.test.log=.log) --TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver --TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ -- $(TEST_LOG_FLAGS) --am__set_b = \ -- case '$@' in \ -- */*) \ -- case '$*' in \ -- */*) b='$*';; \ -- *) b=`echo '$@' | sed 's/\.log$$//'`; \ -- esac;; \ -- *) \ -- b='$*';; \ -- esac -+am__tty_colors = $(am__tty_colors_dummy) - DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue fen win32 . \ - tests fam - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -1590,7 +1371,6 @@ - gmountoperation.h \ - gnativevolumemonitor.h \ - gnetworkaddress.h \ -- gnetworking.h \ - gnetworkmonitor.h \ - gnetworkservice.h \ - goutputstream.h \ -@@ -1647,6 +1427,10 @@ - $(gio_headers) \ - gioenumtypes.h - -+nodist_gioinclude_HEADERS = \ -+ gnetworking.h \ -+ $(NULL) -+ - glib_compile_resources_LDADD = \ - $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la \ -@@ -1704,7 +1488,7 @@ - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: --.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs -+.SUFFIXES: .c .lo .o .obj - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/glib.mk $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ -@@ -1751,7 +1535,6 @@ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } -- - install-installed_testLTLIBRARIES: $(installed_test_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(installed_test_LTLIBRARIES)'; test -n "$(installed_testdir)" || list=; \ -@@ -1786,7 +1569,6 @@ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } -- - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ -@@ -1832,7 +1614,6 @@ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } -- - libgio-2.0.la: $(libgio_2_0_la_OBJECTS) $(libgio_2_0_la_DEPENDENCIES) $(EXTRA_libgio_2_0_la_DEPENDENCIES) - $(AM_V_CCLD)$(libgio_2_0_la_LINK) -rpath $(libdir) $(libgio_2_0_la_OBJECTS) $(libgio_2_0_la_LIBADD) $(LIBS) - install-binPROGRAMS: $(bin_PROGRAMS) -@@ -1844,12 +1625,10 @@ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ -- while read p p1; do if test -f $$p \ -- || test -f $$p1 \ -- ; then echo "$$p"; echo "$$p"; else :; fi; \ -+ while read p p1; do if test -f $$p || test -f $$p1; \ -+ then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ -- sed -e 'p;s,.*/,,;n;h' \ -- -e 's|.*|.|' \ -+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ -@@ -1870,8 +1649,7 @@ - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -- -e 's/$$/$(EXEEXT)/' \ -- `; \ -+ -e 's/$$/$(EXEEXT)/' `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files -@@ -1902,12 +1680,10 @@ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ -- while read p p1; do if test -f $$p \ -- || test -f $$p1 \ -- ; then echo "$$p"; echo "$$p"; else :; fi; \ -+ while read p p1; do if test -f $$p || test -f $$p1; \ -+ then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ -- sed -e 'p;s,.*/,,;n;h' \ -- -e 's|.*|.|' \ -+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ -@@ -1928,8 +1704,7 @@ - @list='$(installed_test_PROGRAMS)'; test -n "$(installed_testdir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -- -e 's/$$/$(EXEEXT)/' \ -- `; \ -+ -e 's/$$/$(EXEEXT)/' `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(installed_testdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(installed_testdir)" && rm -f $$files -@@ -1951,27 +1726,21 @@ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -- - gdbus$(EXEEXT): $(gdbus_OBJECTS) $(gdbus_DEPENDENCIES) $(EXTRA_gdbus_DEPENDENCIES) - @rm -f gdbus$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gdbus_OBJECTS) $(gdbus_LDADD) $(LIBS) -- - gio-querymodules$(EXEEXT): $(gio_querymodules_OBJECTS) $(gio_querymodules_DEPENDENCIES) $(EXTRA_gio_querymodules_DEPENDENCIES) - @rm -f gio-querymodules$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gio_querymodules_OBJECTS) $(gio_querymodules_LDADD) $(LIBS) -- - glib-compile-resources$(EXEEXT): $(glib_compile_resources_OBJECTS) $(glib_compile_resources_DEPENDENCIES) $(EXTRA_glib_compile_resources_DEPENDENCIES) - @rm -f glib-compile-resources$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(glib_compile_resources_OBJECTS) $(glib_compile_resources_LDADD) $(LIBS) -- - glib-compile-schemas$(EXEEXT): $(glib_compile_schemas_OBJECTS) $(glib_compile_schemas_DEPENDENCIES) $(EXTRA_glib_compile_schemas_DEPENDENCIES) - @rm -f glib-compile-schemas$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(glib_compile_schemas_OBJECTS) $(glib_compile_schemas_LDADD) $(LIBS) -- - gresource$(EXEEXT): $(gresource_OBJECTS) $(gresource_DEPENDENCIES) $(EXTRA_gresource_DEPENDENCIES) - @rm -f gresource$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gresource_OBJECTS) $(gresource_LDADD) $(LIBS) -- - gsettings$(EXEEXT): $(gsettings_OBJECTS) $(gsettings_DEPENDENCIES) $(EXTRA_gsettings_DEPENDENCIES) - @rm -f gsettings$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gsettings_OBJECTS) $(gsettings_LDADD) $(LIBS) -@@ -3781,6 +3550,27 @@ - @list='$(giowin32include_HEADERS)'; test -n "$(giowin32includedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(giowin32includedir)'; $(am__uninstall_files_from_dir) -+install-nodist_gioincludeHEADERS: $(nodist_gioinclude_HEADERS) -+ @$(NORMAL_INSTALL) -+ @list='$(nodist_gioinclude_HEADERS)'; test -n "$(gioincludedir)" || list=; \ -+ if test -n "$$list"; then \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(gioincludedir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(gioincludedir)" || exit 1; \ -+ fi; \ -+ for p in $$list; do \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ echo "$$d$$p"; \ -+ done | $(am__base_list) | \ -+ while read files; do \ -+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(gioincludedir)'"; \ -+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(gioincludedir)" || exit $$?; \ -+ done -+ -+uninstall-nodist_gioincludeHEADERS: -+ @$(NORMAL_UNINSTALL) -+ @list='$(nodist_gioinclude_HEADERS)'; test -n "$(gioincludedir)" || list=; \ -+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -+ dir='$(DESTDIR)$(gioincludedir)'; $(am__uninstall_files_from_dir) - - # This directory's subdirectories are mostly independent; you can cd - # into them and run 'make' without going through this Makefile. -@@ -3788,13 +3578,14 @@ - # (1) if the variable is set in 'config.status', edit 'config.status' - # (which will cause the Makefiles to be regenerated when you run 'make'); - # (2) otherwise, pass the desired values on the 'make' command line. --$(am__recursive_targets): -- @fail=; \ -- if $(am__make_keepgoing); then \ -- failcom='fail=yes'; \ -- else \ -- failcom='exit 1'; \ -- fi; \ -+$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): -+ @fail= failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ -@@ -3815,13 +3606,31 @@ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" -+tags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -+ done -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -+ done -+cscopelist-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ -+ done - --ID: $(am__tagged_files) -- $(am__define_uniq_tagged_files); mkid -fID $$unique --tags: tags-recursive --TAGS: tags -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ mkid -fID $$unique -+tags: TAGS - --tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -3837,7 +3646,12 @@ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- $(am__define_uniq_tagged_files); \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -3849,11 +3663,15 @@ - $$unique; \ - fi; \ - fi --ctags: ctags-recursive -- --CTAGS: ctags --ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -- $(am__define_uniq_tagged_files); \ -+ctags: CTAGS -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -3862,10 +3680,9 @@ - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" --cscopelist: cscopelist-recursive - --cscopelist-am: $(am__tagged_files) -- list='$(am__tagged_files)'; \ -+cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) -+ list='$(SOURCES) $(HEADERS) $(LISP)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ -@@ -3881,161 +3698,98 @@ - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - --# Recover from deleted '.trs' file; this should ensure that --# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create --# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells --# to avoid problems with "make -n". --.log.trs: -- rm -f $< $@ -- $(MAKE) $(AM_MAKEFLAGS) $< -- --# Leading 'am--fnord' is there to ensure the list of targets does not --# expand to empty, as could happen e.g. with make check TESTS=''. --am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) --am--force-recheck: -- @: -- --$(TEST_SUITE_LOG): $(TEST_LOGS) -- @$(am__set_TESTS_bases); \ -- am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ -- redo_bases=`for i in $$bases; do \ -- am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ -- done`; \ -- if test -n "$$redo_bases"; then \ -- redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ -- redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ -- if $(am__make_dryrun); then :; else \ -- rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ -- fi; \ -- fi; \ -- if test -n "$$am__remaking_logs"; then \ -- echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ -- "recursion detected" >&2; \ -- else \ -- am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ -- fi; \ -- if $(am__make_dryrun); then :; else \ -- st=0; \ -- errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ -- for i in $$redo_bases; do \ -- test -f $$i.trs && test -r $$i.trs \ -- || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ -- test -f $$i.log && test -r $$i.log \ -- || { echo "$$errmsg $$i.log" >&2; st=1; }; \ -+check-TESTS: $(TESTS) -+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ -+ srcdir=$(srcdir); export srcdir; \ -+ list=' $(TESTS) '; \ -+ $(am__tty_colors); \ -+ if test -n "$$list"; then \ -+ for tst in $$list; do \ -+ if test -f ./$$tst; then dir=./; \ -+ elif test -f $$tst; then dir=; \ -+ else dir="$(srcdir)/"; fi; \ -+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ -+ all=`expr $$all + 1`; \ -+ case " $(XFAIL_TESTS) " in \ -+ *[\ \ ]$$tst[\ \ ]*) \ -+ xpass=`expr $$xpass + 1`; \ -+ failed=`expr $$failed + 1`; \ -+ col=$$red; res=XPASS; \ -+ ;; \ -+ *) \ -+ col=$$grn; res=PASS; \ -+ ;; \ -+ esac; \ -+ elif test $$? -ne 77; then \ -+ all=`expr $$all + 1`; \ -+ case " $(XFAIL_TESTS) " in \ -+ *[\ \ ]$$tst[\ \ ]*) \ -+ xfail=`expr $$xfail + 1`; \ -+ col=$$lgn; res=XFAIL; \ -+ ;; \ -+ *) \ -+ failed=`expr $$failed + 1`; \ -+ col=$$red; res=FAIL; \ -+ ;; \ -+ esac; \ -+ else \ -+ skip=`expr $$skip + 1`; \ -+ col=$$blu; res=SKIP; \ -+ fi; \ -+ echo "$${col}$$res$${std}: $$tst"; \ - done; \ -- test $$st -eq 0 || exit 1; \ -- fi -- @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ -- ws='[ ]'; \ -- results=`for b in $$bases; do echo $$b.trs; done`; \ -- test -n "$$results" || results=/dev/null; \ -- all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ -- pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ -- fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ -- skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ -- xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ -- xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ -- error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ -- if test `expr $$fail + $$xpass + $$error` -eq 0; then \ -- success=true; \ -- else \ -- success=false; \ -- fi; \ -- br='==================='; br=$$br$$br$$br$$br; \ -- result_count () \ -- { \ -- if test x"$$1" = x"--maybe-color"; then \ -- maybe_colorize=yes; \ -- elif test x"$$1" = x"--no-color"; then \ -- maybe_colorize=no; \ -+ if test "$$all" -eq 1; then \ -+ tests="test"; \ -+ All=""; \ -+ else \ -+ tests="tests"; \ -+ All="All "; \ -+ fi; \ -+ if test "$$failed" -eq 0; then \ -+ if test "$$xfail" -eq 0; then \ -+ banner="$$All$$all $$tests passed"; \ - else \ -- echo "$@: invalid 'result_count' usage" >&2; exit 4; \ -+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ -+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ -- shift; \ -- desc=$$1 count=$$2; \ -- if test $$maybe_colorize = yes && test $$count -gt 0; then \ -- color_start=$$3 color_end=$$std; \ -+ else \ -+ if test "$$xpass" -eq 0; then \ -+ banner="$$failed of $$all $$tests failed"; \ - else \ -- color_start= color_end=; \ -+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ -+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ - fi; \ -- echo "$${color_start}# $$desc $$count$${color_end}"; \ -- }; \ -- create_testsuite_report () \ -- { \ -- result_count $$1 "TOTAL:" $$all "$$brg"; \ -- result_count $$1 "PASS: " $$pass "$$grn"; \ -- result_count $$1 "SKIP: " $$skip "$$blu"; \ -- result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ -- result_count $$1 "FAIL: " $$fail "$$red"; \ -- result_count $$1 "XPASS:" $$xpass "$$red"; \ -- result_count $$1 "ERROR:" $$error "$$mgn"; \ -- }; \ -- { \ -- echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ -- $(am__rst_title); \ -- create_testsuite_report --no-color; \ -- echo; \ -- echo ".. contents:: :depth: 2"; \ -- echo; \ -- for b in $$bases; do echo $$b; done \ -- | $(am__create_global_log); \ -- } >$(TEST_SUITE_LOG).tmp || exit 1; \ -- mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ -- if $$success; then \ -- col="$$grn"; \ -- else \ -- col="$$red"; \ -- test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ -- fi; \ -- echo "$${col}$$br$${std}"; \ -- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ -- echo "$${col}$$br$${std}"; \ -- create_testsuite_report --maybe-color; \ -- echo "$$col$$br$$std"; \ -- if $$success; then :; else \ -- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ -- if test -n "$(PACKAGE_BUGREPORT)"; then \ -- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ -- fi; \ -- echo "$$col$$br$$std"; \ -- fi; \ -- $$success || exit 1 -- --check-TESTS: -- @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list -- @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list -- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) -- @set +e; $(am__set_TESTS_bases); \ -- log_list=`for i in $$bases; do echo $$i.log; done`; \ -- trs_list=`for i in $$bases; do echo $$i.trs; done`; \ -- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ -- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ -- exit $$?; --recheck: all $(check_LTLIBRARIES) $(check_PROGRAMS) $(check_SCRIPTS) $(check_DATA) -- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) -- @set +e; $(am__set_TESTS_bases); \ -- bases=`for i in $$bases; do echo $$i; done \ -- | $(am__list_recheck_tests)` || exit 1; \ -- log_list=`for i in $$bases; do echo $$i.log; done`; \ -- log_list=`echo $$log_list`; \ -- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ -- am__force_recheck=am--force-recheck \ -- TEST_LOGS="$$log_list"; \ -- exit $$? --.test.log: -- @p='$<'; \ -- $(am__set_b); \ -- $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) --@am__EXEEXT_TRUE@.test$(EXEEXT).log: --@am__EXEEXT_TRUE@ @p='$<'; \ --@am__EXEEXT_TRUE@ $(am__set_b); \ --@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ --@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ --@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ --@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) -+ fi; \ -+ dashes="$$banner"; \ -+ skipped=""; \ -+ if test "$$skip" -ne 0; then \ -+ if test "$$skip" -eq 1; then \ -+ skipped="($$skip test was not run)"; \ -+ else \ -+ skipped="($$skip tests were not run)"; \ -+ fi; \ -+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ -+ dashes="$$skipped"; \ -+ fi; \ -+ report=""; \ -+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ -+ report="Please report to $(PACKAGE_BUGREPORT)"; \ -+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ -+ dashes="$$report"; \ -+ fi; \ -+ dashes=`echo "$$dashes" | sed s/./=/g`; \ -+ if test "$$failed" -eq 0; then \ -+ col="$$grn"; \ -+ else \ -+ col="$$red"; \ -+ fi; \ -+ echo "$${col}$$dashes$${std}"; \ -+ echo "$${col}$$banner$${std}"; \ -+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ -+ test -z "$$report" || echo "$${col}$$report$${std}"; \ -+ echo "$${col}$$dashes$${std}"; \ -+ test "$$failed" -eq 0; \ -+ else :; fi - - distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -@@ -4107,7 +3861,7 @@ - - installdirs: installdirs-recursive - installdirs-am: -- for dir in "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(completiondir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(installed_test_metadir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(gioincludedir)" "$(DESTDIR)$(giounixincludedir)" "$(DESTDIR)$(giowin32includedir)"; do \ -+ for dir in "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(completiondir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(installed_test_metadir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(gioincludedir)" "$(DESTDIR)$(giounixincludedir)" "$(DESTDIR)$(giowin32includedir)" "$(DESTDIR)$(gioincludedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: $(BUILT_SOURCES) -@@ -4131,9 +3885,6 @@ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi - mostlyclean-generic: -- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) -- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) -- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - - clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) -@@ -4181,7 +3932,8 @@ - install-installed_testLTLIBRARIES \ - install-installed_testPROGRAMS install-installed_testSCRIPTS \ - install-installed_test_metaDATA \ -- install-nobase_installed_testDATA -+ install-nobase_installed_testDATA \ -+ install-nodist_gioincludeHEADERS - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - install-dvi: install-dvi-recursive -@@ -4236,35 +3988,40 @@ - uninstall-installed_testPROGRAMS \ - uninstall-installed_testSCRIPTS \ - uninstall-installed_test_metaDATA uninstall-libLTLIBRARIES \ -- uninstall-local uninstall-nobase_installed_testDATA -- --.MAKE: $(am__recursive_targets) all check check-am install install-am \ -- install-data-am install-strip -+ uninstall-local uninstall-nobase_installed_testDATA \ -+ uninstall-nodist_gioincludeHEADERS - --.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ -- check check-TESTS check-am check-local clean clean-binPROGRAMS \ -- clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \ -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ -+ check-am cscopelist-recursive ctags-recursive install \ -+ install-am install-data-am install-strip tags-recursive -+ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am all-local check check-TESTS check-am check-local \ -+ clean clean-binPROGRAMS clean-checkLTLIBRARIES \ -+ clean-checkPROGRAMS clean-generic \ - clean-installed_testLTLIBRARIES clean-installed_testPROGRAMS \ - clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ -- clean-noinstPROGRAMS cscopelist-am ctags ctags-am dist-hook \ -- distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-binPROGRAMS \ -- install-completionDATA install-data install-data-am \ -- install-data-hook install-data-local install-dist_schemaDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-gioincludeHEADERS install-giounixincludeHEADERS \ -- install-giowin32includeHEADERS install-html install-html-am \ -- install-info install-info-am install-installed_testLTLIBRARIES \ -+ clean-noinstPROGRAMS cscopelist cscopelist-recursive ctags \ -+ ctags-recursive dist-hook distclean distclean-compile \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-binPROGRAMS install-completionDATA install-data \ -+ install-data-am install-data-hook install-data-local \ -+ install-dist_schemaDATA install-dvi install-dvi-am \ -+ install-exec install-exec-am install-gioincludeHEADERS \ -+ install-giounixincludeHEADERS install-giowin32includeHEADERS \ -+ install-html install-html-am install-info install-info-am \ -+ install-installed_testLTLIBRARIES \ - install-installed_testPROGRAMS install-installed_testSCRIPTS \ - install-installed_test_metaDATA install-libLTLIBRARIES \ -- install-man install-nobase_installed_testDATA install-pdf \ -- install-pdf-am install-ps install-ps-am install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- pdf pdf-am ps ps-am recheck tags tags-am uninstall \ -- uninstall-am uninstall-binPROGRAMS uninstall-completionDATA \ -+ install-man install-nobase_installed_testDATA \ -+ install-nodist_gioincludeHEADERS install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am \ -+ uninstall-binPROGRAMS uninstall-completionDATA \ - uninstall-dist_schemaDATA uninstall-gioincludeHEADERS \ - uninstall-giounixincludeHEADERS \ - uninstall-giowin32includeHEADERS \ -@@ -4272,7 +4029,8 @@ - uninstall-installed_testPROGRAMS \ - uninstall-installed_testSCRIPTS \ - uninstall-installed_test_metaDATA uninstall-libLTLIBRARIES \ -- uninstall-local uninstall-nobase_installed_testDATA -+ uninstall-local uninstall-nobase_installed_testDATA \ -+ uninstall-nodist_gioincludeHEADERS - - - ### testing rules -Common subdirectories: glib-2.38.0/gio/completion and glib-2.38.0-A/gio/completion -Common subdirectories: glib-2.38.0/gio/fam and glib-2.38.0-A/gio/fam -Common subdirectories: glib-2.38.0/gio/fen and glib-2.38.0-A/gio/fen -Common subdirectories: glib-2.38.0/gio/gdbus-2.0 and glib-2.38.0-A/gio/gdbus-2.0 -diff -Nu glib-2.38.0/gio/gdbusobjectmanagerclient.c glib-2.38.0-A/gio/gdbusobjectmanagerclient.c ---- glib-2.38.0/gio/gdbusobjectmanagerclient.c 2013-08-08 03:00:40.000000000 -0700 -+++ glib-2.38.0-A/gio/gdbusobjectmanagerclient.c 2013-09-28 14:34:00.000000000 -0700 -@@ -1113,7 +1113,7 @@ - - ret = g_dbus_connection_call_sync (manager->priv->connection, - "org.freedesktop.DBus", -- "/org/freedeskop/DBus", -+ "/org/freedesktop/DBus", - "org.freedesktop.DBus", - "AddMatch", - g_variant_new ("(s)", -@@ -1198,7 +1198,7 @@ - */ - g_dbus_connection_call (manager->priv->connection, - "org.freedesktop.DBus", -- "/org/freedeskop/DBus", -+ "/org/freedesktop/DBus", - "org.freedesktop.DBus", - "RemoveMatch", - g_variant_new ("(s)", -diff -Nu glib-2.38.0/gio/gnetworking.h glib-2.38.0-A/gio/gnetworking.h ---- glib-2.38.0/gio/gnetworking.h 2013-09-23 14:07:56.000000000 -0700 -+++ glib-2.38.0-A/gio/gnetworking.h 1969-12-31 16:00:00.000000000 -0800 -@@ -1,84 +0,0 @@ --/* GIO - GLib Input, Output and Streaming Library -- * -- * Copyright (C) 2008-2011 Red Hat, Inc. -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General -- * Public License along with this library; if not, write to the -- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, -- * Boston, MA 02111-1307, USA. -- */ -- --#ifndef __G_NETWORKING_H__ --#define __G_NETWORKING_H__ -- --#include -- --#ifdef G_OS_WIN32 -- --#ifndef _WIN32_WINNT --#define _WIN32_WINNT 0x0501 --#endif --#include --#undef interface --#include --#include --#include -- --#include -- --#else /* !G_OS_WIN32 */ -- --#include -- --#include --#include --#include --#include --#include --#include --#include -- --#include --#include -- -- --#ifndef T_SRV --#define T_SRV 33 --#endif -- --#ifndef _PATH_RESCONF --#define _PATH_RESCONF "/etc/resolv.conf" --#endif -- --#ifndef CMSG_LEN --/* CMSG_LEN and CMSG_SPACE are defined by RFC 2292, but missing on -- * some older platforms. -- */ --#define CMSG_LEN(len) ((size_t)CMSG_DATA((struct cmsghdr *)NULL) + (len)) -- --/* CMSG_SPACE must add at least as much padding as CMSG_NXTHDR() -- * adds. We overestimate here. -- */ --#define GLIB_ALIGN_TO_SIZEOF(len, obj) (((len) + sizeof (obj) - 1) & ~(sizeof (obj) - 1)) --#define CMSG_SPACE(len) GLIB_ALIGN_TO_SIZEOF (CMSG_LEN (len), struct cmsghdr) --#endif --#endif -- --G_BEGIN_DECLS -- --GLIB_AVAILABLE_IN_2_36 --void g_networking_init (void); -- --G_END_DECLS -- --#endif /* __G_NETWORKING_H__ */ -diff -Nu glib-2.38.0/gio/gsocket.c glib-2.38.0-A/gio/gsocket.c ---- glib-2.38.0/gio/gsocket.c 2013-09-17 11:47:14.000000000 -0700 -+++ glib-2.38.0-A/gio/gsocket.c 2013-09-28 14:34:00.000000000 -0700 -@@ -499,7 +499,7 @@ - return fd; - - /* It's possible that libc has SOCK_CLOEXEC but the kernel does not */ -- if (fd < 0 && errno == EINVAL) -+ if (fd < 0 && (errno == EINVAL || errno == EPROTOTYPE)) - #endif - fd = socket (domain, type, protocol); - -Common subdirectories: glib-2.38.0/gio/gvdb and glib-2.38.0-A/gio/gvdb -Common subdirectories: glib-2.38.0/gio/inotify and glib-2.38.0-A/gio/inotify -Common subdirectories: glib-2.38.0/gio/kqueue and glib-2.38.0-A/gio/kqueue -Common subdirectories: glib-2.38.0/gio/tests and glib-2.38.0-A/gio/tests -Common subdirectories: glib-2.38.0/gio/win32 and glib-2.38.0-A/gio/win32 -Common subdirectories: glib-2.38.0/gio/xdgmime and glib-2.38.0-A/gio/xdgmime diff --git a/modulesets/patches/devhelp-646962-variable-name.patch b/modulesets/patches/devhelp-646962-variable-name.patch deleted file mode 100644 index df3b486..0000000 --- a/modulesets/patches/devhelp-646962-variable-name.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f52897a18a73ab6ff406016ada80932511ec5e25 Mon Sep 17 00:00:00 2001 -From: P. F. Chimento -Date: Wed, 6 Apr 2011 23:28:22 +0200 -Subject: [PATCH] Fix variable name for OS X build - -There was a syntax error in book_manager_add_from_xcode_docset, -which broke the build on OS X. ---- - src/dh-book-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/dh-book-manager.c b/src/dh-book-manager.c -index 4416d7f..aa1d605 100644 ---- a/src/dh-book-manager.c -+++ b/src/dh-book-manager.c -@@ -563,7 +563,7 @@ book_manager_add_from_xcode_docset (DhBookManager *book_manager, - ".devhelp2") == 0) { - gchar *book_path; - -- book_path = g_build_filename (path, name, NULL); -+ book_path = g_build_filename (dir_path, name, NULL); - /* Add book from filepath */ - book_manager_add_from_filepath (book_manager, - book_path); --- -1.7.3.2 - diff --git a/modulesets/patches/devhelp-663789-gtkosxapplication.patch b/modulesets/patches/devhelp-663789-gtkosxapplication.patch deleted file mode 100644 index db93a55..0000000 --- a/modulesets/patches/devhelp-663789-gtkosxapplication.patch +++ /dev/null @@ -1,196 +0,0 @@ -From 8ab0bd8207146f231b20c1bf66e9e806a05ebb97 Mon Sep 17 00:00:00 2001 -From: Philip Chimento -Date: Thu, 10 Nov 2011 17:47:22 +0100 -Subject: [PATCH] Convert IgeMacIntegration to GtkOSXApplication - -IgeMacIntegration is deprecated and only works on 32-bit Macs; -this change is necessary for Devhelp to build on 64-bit Macs. ---- - configure.ac | 6 +++--- - src/dh-util.c | 51 ++++++++------------------------------------------- - src/dh-window.c | 38 +++++++++++++++++++++++--------------- - 3 files changed, 34 insertions(+), 61 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7b6ee60..94742a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -42,14 +42,14 @@ IGE_PLATFORM_CHECK - if test "x$IGE_PLATFORM" = xx11; then - gconf_pkgconfig="gconf-2.0 >= 2.6.0" - libwnck_pkgconfig="libwnck-1.0 >= 2.10.0" -- igemacintegration_pkgconfig= -+ gtkmacintegration_pkgconfig= - REQUIRES_LIBWNCK=libwnck-1.0 - PLATFORM_CFLAGS= - PLATFORM_LDFLAGS= - else - gconf_pkgconfig= - libwnck_pkgconfig= -- igemacintegration_pkgconfig="ige-mac-integration >= 0.8.2" -+ gtkmacintegration_pkgconfig="gtk-mac-integration >= 1.0.0" - REQUIRES_LIBWNCK= - PLATFORM_CFLAGS= - PLATFORM_LDFLAGS= -@@ -70,7 +70,7 @@ PKG_CHECK_MODULES(LIBDEVHELP, [ - gtk+-2.0 >= 2.10.0 - $gconf_pkgconfig - $libwnck_pkgconfig -- $igemacintegration_pkgconfig -+ $gtkmacintegration_pkgconfig - webkit-1.0 >= 1.1.13 - ]) - -diff --git a/src/dh-util.c b/src/dh-util.c -index 2453c9b..9c1bc51 100644 ---- a/src/dh-util.c -+++ b/src/dh-util.c -@@ -24,7 +24,7 @@ - #include - #include - #ifdef GDK_WINDOWING_QUARTZ --#include -+#include - #endif - #include "ige-conf.h" - #include "dh-util.h" -@@ -120,34 +120,10 @@ dh_util_builder_connect (GtkBuilder *builder, - - #ifdef GDK_WINDOWING_QUARTZ - static gchar * --cf_string_to_utf8 (CFStringRef str) --{ -- CFIndex len; -- gchar *ret; -- -- len = CFStringGetMaximumSizeForEncoding (CFStringGetLength (str), -- kCFStringEncodingUTF8) + 1; -- -- ret = g_malloc (len); -- ret[len] = '\0'; -- -- if (CFStringGetCString (str, ret, len, kCFStringEncodingUTF8)) -- return ret; -- -- g_free (ret); -- return NULL; --} -- --static gchar * - util_get_mac_data_dir (void) - { -- const gchar *env; -- CFBundleRef cf_bundle; -- UInt32 type; -- UInt32 creator; -- CFURLRef cf_url; -- CFStringRef cf_string; -- gchar *ret, *tmp; -+ const gchar *env, *ret; -+ gchar *tmp; - - /* The environment variable overrides all. */ - env = g_getenv ("DEVHELP_DATADIR"); -@@ -155,25 +131,14 @@ util_get_mac_data_dir (void) - return g_strdup (env); - } - -- cf_bundle = CFBundleGetMainBundle (); -- if (!cf_bundle) { -- return NULL; -- } -- -- /* Only point into the bundle if it's an application. */ -- CFBundleGetPackageInfo (cf_bundle, &type, &creator); -- if (type != 'APPL') { -+ /* If we are not in a bundle, then follow the normal rules. */ -+ if (quartz_application_get_bundle_id () == NULL) { - return NULL; - } - -- cf_url = CFBundleCopyBundleURL (cf_bundle); -- cf_string = CFURLCopyFileSystemPath (cf_url, kCFURLPOSIXPathStyle); -- ret = cf_string_to_utf8 (cf_string); -- CFRelease (cf_string); -- CFRelease (cf_url); -- -- tmp = g_build_filename (ret, "Contents", "Resources", NULL); -- g_free (ret); -+ ret = quartz_application_get_resource_path (); -+ tmp = g_strdup (ret); -+ g_printerr("ret: %s\n", tmp); - - return tmp; - } -diff --git a/src/dh-window.c b/src/dh-window.c -index 2fcec5f..d5036d5 100644 ---- a/src/dh-window.c -+++ b/src/dh-window.c -@@ -33,7 +33,7 @@ - #include - - #ifdef GDK_WINDOWING_QUARTZ --#include -+#include - #endif - - #include "dh-book-tree.h" -@@ -1086,33 +1086,41 @@ window_populate (DhWindow *window) - - #ifdef GDK_WINDOWING_QUARTZ - { -- GtkWidget *widget; -- IgeMacMenuGroup *group; -+ GtkWidget *widget, *sep; -+ GtkOSXApplication *theApp; - - /* Hide toolbar labels. */ - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS); - - /* Setup menubar. */ -- ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menubar)); -+ theApp = g_object_new (GTK_TYPE_OSX_APPLICATION, NULL); -+ gtk_osxapplication_set_menu_bar (theApp, GTK_MENU_SHELL (menubar)); - gtk_widget_hide (menubar); - - widget = gtk_ui_manager_get_widget (priv->manager, "/MenuBar/FileMenu/Quit"); -- ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (widget)); -+ gtk_widget_hide (widget); - -- group = ige_mac_menu_add_app_menu_group (); - widget = gtk_ui_manager_get_widget (priv->manager, "/MenuBar/HelpMenu/About"); -- ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (widget), -- /* i18n: please don't translate -- * "Devhelp", it's a name, not a -- * generic word. */ -- _("About Devhelp")); -+ gtk_osxapplication_insert_app_menu_item (theApp, widget, 0); -+ sep = gtk_separator_menu_item_new (); -+ g_object_ref (sep); -+ gtk_osxapplication_insert_app_menu_item (theApp, sep, 1); - -- group = ige_mac_menu_add_app_menu_group (); - widget = gtk_ui_manager_get_widget (priv->manager, "/MenuBar/EditMenu/Preferences"); -- ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (widget), -- _("Preferences…")); -+ gtk_osxapplication_insert_app_menu_item (theApp, widget, 2); -+ sep = gtk_separator_menu_item_new (); -+ g_object_ref (sep); -+ gtk_osxapplication_insert_app_menu_item (theApp, sep, 3); - -- ige_mac_menu_set_global_key_handler_enabled (TRUE); -+ widget = gtk_ui_manager_get_widget (priv->manager, "/MenuBar/HelpMenu"); -+ gtk_osxapplication_set_help_menu (theApp, GTK_MENU_ITEM (widget)); -+ -+ g_signal_connect (theApp, -+ "NSApplicationWillTerminate", -+ G_CALLBACK (window_activate_quit), -+ window); -+ -+ gtk_osxapplication_ready (theApp); - } - #endif - --- -1.7.3.2 - diff --git a/modulesets/patches/enchant-env.patch b/modulesets/patches/enchant-env.patch deleted file mode 100644 index 9ee6bbe..0000000 --- a/modulesets/patches/enchant-env.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/src/enchant.c b/src/enchant.c -index 79fb21c..6f57fff 100644 ---- a/src/enchant.c -+++ b/src/enchant.c -@@ -250,6 +250,11 @@ enchant_get_module_dirs (void) - module_dirs = enchant_slist_append_unique_path (module_dirs, module_dir); - } - #endif -+ module_dir = g_getenv("ENCHANT_MODULE_PATH"); -+ if (module_dir) -+ { -+ module_dirs = enchant_slist_append_unique_path (module_dirs, g_strdup(module_dir)); -+ } - - return module_dirs; - } -@@ -259,6 +264,7 @@ enchant_get_conf_dirs (void) - { - GSList *conf_dirs = NULL, *user_conf_dirs, *iter; - char * ordering_dir = NULL, * prefix = NULL; -+ char *xdg_data_dir; - - user_conf_dirs = enchant_get_user_config_dirs(); - -@@ -291,6 +297,19 @@ enchant_get_conf_dirs (void) - conf_dirs = enchant_slist_append_unique_path (conf_dirs, g_strdup (ENCHANT_GLOBAL_ORDERING)); - #endif - -+ xdg_data_dir = g_getenv ("XDG_DATA_DIRS"); -+ if (xdg_data_dir) -+ { -+ char **xdg_ddirs = g_strsplit (xdg_data_dir, ":", 0); -+ char **xdg_iter; -+ -+ for (xdg_iter = xdg_ddirs; *xdg_iter != NULL; xdg_iter++) -+ { -+ conf_dirs = enchant_slist_append_unique_path (conf_dirs, g_strdup(*xdg_iter)); -+ } -+ g_strfreev (xdg_ddirs); -+ } -+ - return conf_dirs; - } - diff --git a/modulesets/patches/enchant-gsize.patch b/modulesets/patches/enchant-gsize.patch deleted file mode 100644 index 5bfba14..0000000 --- a/modulesets/patches/enchant-gsize.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- a/src/ispell/ispell_checker.cpp Thu Apr 1 13:53:37 2010 -+++ b/src/ispell/ispell_checker.cpp Mon Feb 24 15:35:49 2014 -@@ -162,7 +162,7 @@ - else - { - /* convert to 8bit string and null terminate */ -- size_t len_in, len_out, result; -+ gsize len_in, len_out, result; - // the 8bit encodings use precomposed forms - char *normalizedWord = g_utf8_normalize (utf8Word, length, G_NORMALIZE_NFC); - char *In = normalizedWord; -@@ -172,7 +172,7 @@ - len_out = sizeof( szWord ) - 1; - result = g_iconv(m_translate_in, &In, &len_in, &Out, &len_out); - g_free(normalizedWord); -- if ((size_t)-1 == result) -+ if ((gsize)-1 == result) - return false; - *Out = '\0'; - } -@@ -210,7 +210,7 @@ - { - /* convert to 8bit string and null terminate */ - -- size_t len_in, len_out, result; -+ gsize len_in, len_out, result; - // the 8bit encodings use precomposed forms - char *normalizedWord = g_utf8_normalize (utf8Word, length, G_NORMALIZE_NFC); - char *In = normalizedWord; -@@ -219,7 +219,7 @@ - len_out = sizeof( word8 ) - 1; - result = g_iconv(m_translate_in, &In, &len_in, &Out, &len_out); - g_free(normalizedWord); -- if ((size_t)-1 == result) -+ if ((gsize)-1 == result) - return NULL; - *Out = '\0'; - } -@@ -252,13 +252,13 @@ - { - /* convert to 32bit string and null terminate */ - -- size_t len_in, len_out; -+ gsize len_in, len_out; - char *In = m_possibilities[c]; - char *Out = reinterpret_cast(utf8Sugg); - - len_in = l; - len_out = INPUTWORDLEN + MAXAFFIXLEN; -- if ((size_t)-1 == g_iconv(m_translate_out, &In, &len_in, &Out, &len_out)) { -+ if ((gsize)-1 == g_iconv(m_translate_out, &In, &len_in, &Out, &len_out)) { - *out_n_suggestions = c; - return sugg_arr; - } ---- a/src/myspell/myspell_checker.cpp Thu Apr 1 13:53:37 2010 -+++ b/src/myspell/myspell_checker.cpp Mon Feb 24 15:37:56 2014 -@@ -159,11 +159,11 @@ - char *in = normalizedWord; - char word8[MAXWORDLEN + 1]; - char *out = word8; -- size_t len_in = strlen(in); -- size_t len_out = sizeof( word8 ) - 1; -- size_t result = g_iconv(m_translate_in, &in, &len_in, &out, &len_out); -+ gsize len_in = strlen(in); -+ gsize len_out = sizeof( word8 ) - 1; -+ gsize result = g_iconv(m_translate_in, &in, &len_in, &out, &len_out); - g_free(normalizedWord); -- if ((size_t)-1 == result) -+ if ((gsize)-1 == result) - return false; - *out = '\0'; - if (myspell->spell(word8)) -@@ -185,11 +185,11 @@ - char *in = normalizedWord; - char word8[MAXWORDLEN + 1]; - char *out = word8; -- size_t len_in = strlen(in); -- size_t len_out = sizeof(word8) - 1; -- size_t result = g_iconv(m_translate_in, &in, &len_in, &out, &len_out); -+ gsize len_in = strlen(in); -+ gsize len_out = sizeof(word8) - 1; -+ gsize result = g_iconv(m_translate_in, &in, &len_in, &out, &len_out); - g_free(normalizedWord); -- if ((size_t)-1 == result) -+ if ((gsize)-1 == result) - return NULL; - - *out = '\0'; -@@ -203,7 +203,7 @@ - len_out = MAXWORDLEN; - char *word = g_new0(char, len_out + 1); - out = reinterpret_cast(word); -- if ((size_t)-1 == g_iconv(m_translate_out, &in, &len_in, &out, &len_out)) { -+ if ((gsize)-1 == g_iconv(m_translate_out, &in, &len_in, &out, &len_out)) { - for (size_t j = i; j < *nsug; j++) - free(sugMS[j]); - free(sugMS); diff --git a/modulesets/patches/faad2-2.7-ac-config-headers.patch b/modulesets/patches/faad2-2.7-ac-config-headers.patch deleted file mode 100644 index 4d2b3e5..0000000 --- a/modulesets/patches/faad2-2.7-ac-config-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur faad2-2.7-orig/configure.in faad2-2.7/configure.in ---- faad2-2.7-orig/configure.in 2014-03-11 23:26:03.000000000 -0700 -+++ faad2-2.7/configure.in 2014-03-11 23:26:59.000000000 -0700 -@@ -25,7 +25,7 @@ - AC_PROG_MAKE_SET - AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS([config.h]) - - AC_ARG_WITH(xmms,[ --with-xmms compile XMMS-1 plugin], - WITHXMMS=$withval, WITHXMMS=no) diff --git a/modulesets/patches/freetype-2.5.3-ccexe_cflags.patch b/modulesets/patches/freetype-2.5.3-ccexe_cflags.patch deleted file mode 100644 index 5923772..0000000 --- a/modulesets/patches/freetype-2.5.3-ccexe_cflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -c /Users/john/Development/Gramps-Build/gramps-41-git-Leopard/src/freetype-2.5.3/builds/unix/unix-cc.in\~ /Users/john/Development/Gramps-Build/gramps-41-git-Leopard/src/freetype-2.5.3/builds/unix/unix-cc.in ---- a/builds/unix/unix-cc.in Tue Aug 31 04:04:28 2010 -+++ b/builds/unix/unix-cc.in Sun Feb 22 14:14:44 2015 -@@ -80,6 +80,7 @@ - # - CPPFLAGS := @CPPFLAGS@ - CFLAGS := -c @XX_CFLAGS@ @CFLAGS@ -DFT_CONFIG_CONFIG_H="" -+CCexe_CFLAGS := @XX_CFLAGS@ @CFLAGS@ -DFT_CONFIG_CONFIG_H="" - - # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. - # -@@ -94,6 +95,7 @@ - # Linker flags. - # - LDFLAGS := @LDFLAGS@ -+CCexe_LDFLAGS := @LDFLAGS@ - - - # export symbols - -Diff finished. Sun Feb 22 14:18:35 2015 diff --git a/modulesets/patches/freetype-install-name.patch b/modulesets/patches/freetype-install-name.patch deleted file mode 100644 index e68e904..0000000 --- a/modulesets/patches/freetype-install-name.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 8e9574627ae0636706185607150197397e02fad6 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Fri, 14 Aug 2020 14:16:52 -0700 -Subject: [PATCH] Set libfreetype's install name so that meson can link it - correctly. - ---- - CMakeLists.txt | 27 +++++++++++++++------------ - 1 file changed, 15 insertions(+), 12 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c9befb4..5395a46 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -426,17 +426,21 @@ target_include_directories( - ) - - --if (BUILD_FRAMEWORK) -- set_property(SOURCE ${PUBLIC_CONFIG_HEADERS} -- PROPERTY MACOSX_PACKAGE_LOCATION Headers/config -- ) -- set_target_properties(freetype PROPERTIES -- FRAMEWORK TRUE -- MACOSX_FRAMEWORK_INFO_PLIST builds/mac/freetype-Info.plist -- PUBLIC_HEADER "${PUBLIC_HEADERS}" -- XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" -- ) --endif () -+if (APPLE) -+ if (BUILD_FRAMEWORK) -+ set_property(SOURCE ${PUBLIC_CONFIG_HEADERS} -+ PROPERTY MACOSX_PACKAGE_LOCATION Headers/config -+ ) -+ set_target_properties(freetype PROPERTIES -+ FRAMEWORK TRUE -+ MACOSX_FRAMEWORK_INFO_PLIST builds/mac/freetype-Info.plist -+ PUBLIC_HEADER "${PUBLIC_HEADERS}" -+ XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" -+ ) -+ else () -+ set_target_properties (freetype PROPERTIES MACOSX_RPATH FALSE INSTALL_NAME_DIR "$/lib") -+ endif () -+endif() - - - set(PKG_CONFIG_REQUIRED_PRIVATE "") -@@ -469,7 +473,6 @@ if (BROTLIDEC_FOUND) - list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "libbrotlidec") - endif () - -- - # Installation - include(GNUInstallDirs) - --- -2.2.2 - diff --git a/modulesets/patches/getopt-autotools.patch b/modulesets/patches/getopt-autotools.patch deleted file mode 100644 index dd374a2..0000000 --- a/modulesets/patches/getopt-autotools.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/Makefile 2014-11-24 04:33:39.000000000 -0800 -+++ b/Makefile 2021-04-09 15:26:46.000000000 -0700 -@@ -1,7 +1,7 @@ - .SUFFIXES: - - DESTDIR= --prefix=/usr/local -+prefix=${PREFIX} - bindir=$(prefix)/bin - mandir=$(prefix)/man - man1dir=$(mandir)/man1 -@@ -43,7 +43,7 @@ - -Wnested-externs -Winline - OPTIMIZE=-O3 -fno-strength-reduce - CFLAGS=$(WARNINGS) $(OPTIMIZE) --LDFLAGS= -+LDFLAGS=-L ${PREFIX}/lib -lintl - - sources=getopt.c - ifeq ($(LIBCGETOPT),0) - -Diff finished. Fri Apr 9 15:28:12 2021 -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e69de29..b53cf7a 100644 ---- a/configure -+++ b/configure -@@ -0,0 +1,1 @@ -+ #Do Nothing diff --git a/modulesets/patches/gi_cairo_library_path.patch b/modulesets/patches/gi_cairo_library_path.patch deleted file mode 100644 index 01c39b0..0000000 --- a/modulesets/patches/gi_cairo_library_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure 2014-09-23 04:36:17.000000000 -0700 -+++ b/configure 2016-09-09 14:58:04.000000000 -0700 -@@ -13174,7 +13174,7 @@ - - case "$host" in - *-*-darwin*) -- CAIRO_SHARED_LIBRARY="libcairo-gobject.2.dylib" -+ CAIRO_SHARED_LIBRARY="${prefix}/lib/libcairo-gobject.2.dylib" - ;; - *-*-mingw*) - CAIRO_SHARED_LIBRARY="libcairo-gobject-2.dll" diff --git a/modulesets/patches/glade-1-18.patch b/modulesets/patches/glade-1-18.patch deleted file mode 100644 index 640f05f..0000000 --- a/modulesets/patches/glade-1-18.patch +++ /dev/null @@ -1,204 +0,0 @@ -From e36e1ae6882d6e5345bcbf6f029f8239c4afd76f Mon Sep 17 00:00:00 2001 -From: Philip Chimento -Date: Fri, 10 Oct 2014 22:32:06 -0700 -Subject: [PATCH] style: Fix indentation of #ifdef block for OS X - -There are no tabs in the rest of the file, so this matches the -surrounding indentation. - -https://bugzilla.gnome.org/show_bug.cgi?id=738339 ---- - src/glade-window.c | 60 +++++++++++++++++++++++++++--------------------------- - 1 file changed, 30 insertions(+), 30 deletions(-) - -diff --git a/src/glade-window.c b/src/glade-window.c -index 7349f3b..2fae4f6 100644 ---- a/src/glade-window.c -+++ b/src/glade-window.c -@@ -3270,36 +3270,36 @@ glade_window_constructed (GObject *object) - G_CALLBACK (clipboard_notify_handler_cb), window); - - #ifdef MAC_INTEGRATION -- { -- /* Fix up the menubar for MacOSX Quartz builds */ -- GtkWidget *menubar = GET_OBJECT (builder, GTK_WIDGET, "menubar"); -- GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL); -- GtkWidget *sep, *widget; -- -- gtk_widget_hide (menubar); -- gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar)); -- widget = GET_OBJECT (builder, GTK_WIDGET, "quit_menuitem"); -- gtk_widget_hide (widget); -- widget = GET_OBJECT (builder, GTK_WIDGET, "about_menuitem"); -- gtk_osxapplication_insert_app_menu_item (theApp, widget, 0); -- sep = gtk_separator_menu_item_new(); -- g_object_ref(sep); -- gtk_osxapplication_insert_app_menu_item (theApp, sep, 1); -- -- widget = GET_OBJECT (builder, GTK_WIDGET, "properties_menuitem"); -- gtk_osxapplication_insert_app_menu_item (theApp, widget, 2); -- sep = gtk_separator_menu_item_new(); -- g_object_ref(sep); -- gtk_osxapplication_insert_app_menu_item (theApp, sep, 3); -- -- widget = GET_OBJECT (builder, GTK_WIDGET, "help_menuitem"); -- gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(widget)); -- -- g_signal_connect(theApp, "NSApplicationWillTerminate", -- G_CALLBACK(on_quit_action_activate), window); -- -- gtk_osxapplication_ready(theApp); -- } -+ { -+ /* Fix up the menubar for MacOSX Quartz builds */ -+ GtkWidget *menubar = GET_OBJECT (builder, GTK_WIDGET, "menubar"); -+ GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL); -+ GtkWidget *sep, *widget; -+ -+ gtk_widget_hide (menubar); -+ gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar)); -+ widget = GET_OBJECT (builder, GTK_WIDGET, "quit_menuitem"); -+ gtk_widget_hide (widget); -+ widget = GET_OBJECT (builder, GTK_WIDGET, "about_menuitem"); -+ gtk_osxapplication_insert_app_menu_item (theApp, widget, 0); -+ sep = gtk_separator_menu_item_new(); -+ g_object_ref(sep); -+ gtk_osxapplication_insert_app_menu_item (theApp, sep, 1); -+ -+ widget = GET_OBJECT (builder, GTK_WIDGET, "properties_menuitem"); -+ gtk_osxapplication_insert_app_menu_item (theApp, widget, 2); -+ sep = gtk_separator_menu_item_new(); -+ g_object_ref(sep); -+ gtk_osxapplication_insert_app_menu_item (theApp, sep, 3); -+ -+ widget = GET_OBJECT (builder, GTK_WIDGET, "help_menuitem"); -+ gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(widget)); -+ -+ g_signal_connect(theApp, "NSApplicationWillTerminate", -+ G_CALLBACK(on_quit_action_activate), window); -+ -+ gtk_osxapplication_ready(theApp); -+ } - #endif - - show_dock_first_time (window, DOCK_PALETTE, priv->dock_palette_action); --- -2.2.2 - -From fc24963f93ea227ae6c627402166fa8184d6a51c Mon Sep 17 00:00:00 2001 -From: Philip Chimento -Date: Fri, 10 Oct 2014 22:35:24 -0700 -Subject: [PATCH] osx: Use current gtk-mac-integration API - -The #ifdef'd block did not compile at all because it used the old API -from gtk-mac-integration, and because it used GtkBuilder when the -surrounding code had been ported to use widget templates. - -This fixes up the use of the API and adds a few widget variables to -GladeWindowPrivate which have to be bound to the template. - -https://bugzilla.gnome.org/show_bug.cgi?id=738339 ---- - configure.ac | 2 +- - src/glade-window.c | 43 +++++++++++++++++++++++++------------------ - 2 files changed, 26 insertions(+), 19 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c86e947..9792a54 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -263,7 +263,7 @@ dnl ================================================================ - _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0` - AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz]) - if test "x$_gdk_tgt" = xquartz; then -- PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration) -+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3) - - GTK_MAC_BUNDLE_FLAG= - -diff --git a/src/glade-window.c b/src/glade-window.c -index 2fae4f6..6dbfe62 100644 ---- a/src/glade-window.c -+++ b/src/glade-window.c -@@ -136,11 +136,17 @@ struct _GladeWindowPrivate - GtkActionGroup *static_actiongroup; - GtkActionGroup *view_actiongroup; - -+ GtkMenuShell *menubar; - GtkMenuShell *project_menu; - - GtkRecentManager *recent_manager; - GtkWidget *recent_menu; - -+ GtkWidget *quit_menuitem; -+ GtkWidget *about_menuitem; -+ GtkWidget *properties_menuitem; -+ GtkMenuItem *help_menuitem; -+ - gchar *default_path; /* the default path for open/save operations */ - - GtkToolItem *undo_toolbutton; /* customized buttons for undo/redo with history */ -@@ -3272,33 +3278,29 @@ glade_window_constructed (GObject *object) - #ifdef MAC_INTEGRATION - { - /* Fix up the menubar for MacOSX Quartz builds */ -- GtkWidget *menubar = GET_OBJECT (builder, GTK_WIDGET, "menubar"); -- GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL); -- GtkWidget *sep, *widget; -- -- gtk_widget_hide (menubar); -- gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar)); -- widget = GET_OBJECT (builder, GTK_WIDGET, "quit_menuitem"); -- gtk_widget_hide (widget); -- widget = GET_OBJECT (builder, GTK_WIDGET, "about_menuitem"); -- gtk_osxapplication_insert_app_menu_item (theApp, widget, 0); -+ GtkosxApplication *theApp = gtkosx_application_get (); -+ GtkWidget *sep; -+ -+ gtk_widget_hide (priv->menubar); -+ gtkosx_application_set_menu_bar (theApp, priv->menubar); -+ gtk_widget_hide (priv->quit_menuitem); -+ gtkosx_application_insert_app_menu_item (theApp, priv->about_menuitem, 0); - sep = gtk_separator_menu_item_new(); - g_object_ref(sep); -- gtk_osxapplication_insert_app_menu_item (theApp, sep, 1); -+ gtkosx_application_insert_app_menu_item (theApp, sep, 1); - -- widget = GET_OBJECT (builder, GTK_WIDGET, "properties_menuitem"); -- gtk_osxapplication_insert_app_menu_item (theApp, widget, 2); -+ gtkosx_application_insert_app_menu_item (theApp, priv->properties_menuitem, -+ 2); - sep = gtk_separator_menu_item_new(); - g_object_ref(sep); -- gtk_osxapplication_insert_app_menu_item (theApp, sep, 3); -+ gtkosx_application_insert_app_menu_item (theApp, sep, 3); - -- widget = GET_OBJECT (builder, GTK_WIDGET, "help_menuitem"); -- gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(widget)); -+ gtkosx_application_set_help_menu (theApp, priv->help_menuitem); - - g_signal_connect(theApp, "NSApplicationWillTerminate", - G_CALLBACK(on_quit_action_activate), window); - -- gtk_osxapplication_ready(theApp); -+ gtkosx_application_ready (theApp); - } - #endif - -@@ -3391,7 +3393,12 @@ glade_window_class_init (GladeWindowClass *klass) - gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, pointer_mode_actiongroup); - gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, static_actiongroup); - gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, view_actiongroup); -- -+ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, menubar); -+ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, quit_menuitem); -+ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, properties_menuitem); -+ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, about_menuitem); -+ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, help_menuitem); -+ - /* Actions */ - gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, save_action); - gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, quit_action); --- -2.2.2 - diff --git a/modulesets/patches/glade-3.22.1-xslproc.patch b/modulesets/patches/glade-3.22.1-xslproc.patch deleted file mode 100644 index 610e7dd..0000000 --- a/modulesets/patches/glade-3.22.1-xslproc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/man/Makefile.in 2019-11-07 15:14:16.000000000 -0800 -+++ b/man/Makefile.in 2019-11-07 15:21:01.000000000 -0800 -@@ -364,8 +364,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - XSLTPROC_FLAGS = \ -- --nonet \ - --stringparam man.output.quietly 1 \ - --stringparam funcsynopsis.style ansi \ - --stringparam man.th.extra1.suppress 1 \ - diff --git a/modulesets/patches/glib-2.52-Fallback-to-CFStringGetCSTring-if-CFStringGetC.patch b/modulesets/patches/glib-2.52-Fallback-to-CFStringGetCSTring-if-CFStringGetC.patch deleted file mode 100644 index 6ef1cf5..0000000 --- a/modulesets/patches/glib-2.52-Fallback-to-CFStringGetCSTring-if-CFStringGetC.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 45bf1f765705ad9ab119d2e9c75e1e4d07cf5736 Mon Sep 17 00:00:00 2001 -From: Friedrich Beckmann -Date: Sun, 15 Oct 2017 13:16:44 +0200 -Subject: [PATCH] MacOS: create_cstr_from_cfstring uses safe conversion - use - CFStringGetCString - -During testing with gdk-pixbuf I noticed failures during content type -to mime conversion. The root reason was the unsafe conversion used -in create_cstr_from_cfstring. The problem was addressed in commit -c60226e0a1cae40a96 but that was reverted. I noticed the commit only -when I had fixed the problem. In addition I added a test to check -the content type to mime conversion on MacOS. This problem is -discussed in Bug #788936. - -See: https://bugzilla.gnome.org/show_bug.cgi?id=788936 ---- - gio/gosxappinfo.c | 23 +++++++++++++++-------- - gio/gosxcontenttype.c | 20 +++++++++++++------- - gio/tests/contenttype.c | 28 ++++++++++++++++++++++++++++ - 3 files changed, 56 insertions(+), 15 deletions(-) - -diff --git a/gio/gosxappinfo.c b/gio/gosxappinfo.c -index b24b6ff..50c1ec3 100644 ---- a/gio/gosxappinfo.c -+++ b/gio/gosxappinfo.c -@@ -171,19 +171,26 @@ create_cfstring_from_cstr (const gchar *cstr) - return CFStringCreateWithCString (NULL, cstr, kCFStringEncodingUTF8); - } - -+#ifdef G_ENABLE_DEBUG - static gchar * - create_cstr_from_cfstring (CFStringRef str) - { -- const gchar *cstr; -+ g_return_val_if_fail (str != NULL, NULL); - -- if (str == NULL) -- return NULL; -- -- cstr = CFStringGetCStringPtr (str, kCFStringEncodingUTF8); -- CFRelease (str); -- -- return g_strdup (cstr); -+ CFIndex length = CFStringGetLength (str); -+ CFIndex maxlen = CFStringGetMaximumSizeForEncoding (length, kCFStringEncodingUTF8); -+ gchar *buffer = g_malloc (maxlen + 1); -+ Boolean success = CFStringGetCString (str, (char *) buffer, maxlen, -+ kCFStringEncodingUTF8); -+ if (success) -+ return buffer; -+ else -+ { -+ g_free (buffer); -+ return NULL; -+ } - } -+#endif - - static char * - url_escape_hostname (const char *url) -diff --git a/gio/gosxcontenttype.c b/gio/gosxcontenttype.c -index 89245d1..604a1ed 100644 ---- a/gio/gosxcontenttype.c -+++ b/gio/gosxcontenttype.c -@@ -58,15 +58,21 @@ create_cfstring_from_cstr (const gchar *cstr) - static gchar * - create_cstr_from_cfstring (CFStringRef str) - { -- const gchar *cstr; -+ g_return_val_if_fail (str != NULL, NULL); - -- if (str == NULL) -- return NULL; -- -- cstr = CFStringGetCStringPtr (str, kCFStringEncodingUTF8); -+ CFIndex length = CFStringGetLength (str); -+ CFIndex maxlen = CFStringGetMaximumSizeForEncoding (length, kCFStringEncodingUTF8); -+ gchar *buffer = g_malloc (maxlen + 1); -+ Boolean success = CFStringGetCString (str, (char *) buffer, maxlen, -+ kCFStringEncodingUTF8); - CFRelease (str); -- -- return g_strdup (cstr); -+ if (success) -+ return buffer; -+ else -+ { -+ g_free (buffer); -+ return NULL; -+ } - } - - /*< internal > -diff --git a/gio/tests/contenttype.c b/gio/tests/contenttype.c -index 3589b12..a0da5f6 100644 ---- a/gio/tests/contenttype.c -+++ b/gio/tests/contenttype.c -@@ -361,6 +361,33 @@ test_guess_svg_from_data (void) - g_free (res); - } - -+static void -+test_mime_from_content (void) -+{ -+#ifdef __APPLE__ -+ gchar *mime_type; -+ mime_type = g_content_type_get_mime_type ("com.microsoft.bmp"); -+ g_assert_cmpstr (mime_type, ==, "image/bmp"); -+ g_free (mime_type); -+ mime_type = g_content_type_get_mime_type ("com.compuserve.gif"); -+ g_assert_cmpstr (mime_type, ==, "image/gif"); -+ g_free (mime_type); -+ mime_type = g_content_type_get_mime_type ("public.png"); -+ g_assert_cmpstr (mime_type, ==, "image/png"); -+ g_free (mime_type); -+ mime_type = g_content_type_get_mime_type ("public.text"); -+ g_assert_cmpstr (mime_type, ==, "text/*"); -+ g_free (mime_type); -+ mime_type = g_content_type_get_mime_type ("public.svg-image"); -+ g_assert_cmpstr (mime_type, ==, "image/svg+xml"); -+ g_free (mime_type); -+#elif defined(G_OS_WIN32) -+ g_test_skip ("mime from content type test not implemented on WIN32"); -+#else -+ g_test_skip ("mime from content type test not implemented on UNIX"); -+#endif -+} -+ - int - main (int argc, char *argv[]) - { -@@ -370,6 +397,7 @@ main (int argc, char *argv[]) - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/contenttype/guess", test_guess); -+ g_test_add_func ("/contenttype/mime_from_content", test_mime_from_content); - g_test_add_func ("/contenttype/unknown", test_unknown); - g_test_add_func ("/contenttype/subtype", test_subtype); - g_test_add_func ("/contenttype/list", test_list); --- -2.6.4 (Apple Git-63) - diff --git a/modulesets/patches/glib-2.76.3-libintl.patch b/modulesets/patches/glib-2.76.3-libintl.patch deleted file mode 100644 index 6c4416d..0000000 --- a/modulesets/patches/glib-2.76.3-libintl.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 32249a22fc39319651e7c23442d37ec837f05764 Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan -Date: Thu, 8 Sep 2022 02:36:33 +0530 -Subject: [PATCH] meson: Fix detection of a system-provided proxy-libintl - -proxy-libintl defines ngettext() as a define in the header that points -to the actual symbol in the library which is g_libintl_ngettext(). -Same with bind_textdomain_codeset(). ---- - meson.build | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 0cbc9689f..de0bee5a3 100644 ---- a/meson.build -+++ b/meson.build -@@ -2089,6 +2089,7 @@ libz_dep = dependency('zlib') - # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible - # implementations. This could be extended if issues are found in some platforms. - libintl_deps = [] -+libintl_prefix = '#include ' - libintl = dependency('intl', required: false, allow_fallback: false) - if libintl.found() - # libintl supports different threading APIs, which may not -@@ -2100,11 +2101,11 @@ if libintl.found() - # - # Meson's builtin dependency lookup as of 0.60.0 doesn't check for - # pthread, so we do this manually here. -- if cc.has_function('ngettext', dependencies : libintl) -+ if cc.has_function('ngettext', dependencies : libintl, prefix: libintl_prefix) - libintl_deps += [libintl] - else - libintl_pthread = cc.find_library('pthread', required : false) -- if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread]) -+ if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix) - libintl_deps += [libintl, libintl_pthread] - else - libintl = disabler() -@@ -2113,7 +2114,7 @@ if libintl.found() - endif - - if libintl.found() -- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps) -+ have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps, prefix: libintl_prefix) - else - libintl = dependency('intl', allow_fallback: true) - assert(libintl.type_name() == 'internal') --- -2.37.1 (Apple Git-137.1) - diff --git a/modulesets/patches/glib-gint64-long-long.patch b/modulesets/patches/glib-gint64-long-long.patch deleted file mode 100644 index 2443e58..0000000 --- a/modulesets/patches/glib-gint64-long-long.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/configure.ac~ b/configure.ac -index 05057e9..6ae550b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2954,13 +2954,26 @@ $ac_cv_sizeof_int) - guint64_constant='(val)' - ;; - $ac_cv_sizeof_long) -- gint64=long -- gint64_modifier='"l"' -- gint64_format='"li"' -- guint64_format='"lu"' -- glib_extension= -- gint64_constant='(val##L)' -- guint64_constant='(val##UL)' -+ case $host in -+ *-*-darwin*) -+ gint64='long long' -+ gint64_modifier='"ll"' -+ gint64_format='"lli"' -+ guint64_format='"llu"' -+ glib_extension= -+ gint64_constant='(val##LL)' -+ guint64_constant='(val##ULL)' -+ ;; -+ *) -+ gint64=long -+ gint64_modifier='"l"' -+ gint64_format='"li"' -+ guint64_format='"lu"' -+ glib_extension= -+ gint64_constant='(val##L)' -+ guint64_constant='(val##UL)' -+ ;; -+ esac - ;; - $ac_cv_sizeof_long_long) - gint64='long long' -@@ -3053,12 +3066,23 @@ $ac_cv_sizeof_int) - glib_gpui_cast='(guint)' - ;; - $ac_cv_sizeof_long) -- glib_intptr_type_define=long -- gintptr_modifier='"l"' -- gintptr_format='"li"' -- guintptr_format='"lu"' -- glib_gpi_cast='(glong)' -- glib_gpui_cast='(gulong)' -+ case $host in *-*-darwin*) -+ glib_intptr_type_define='long long' -+ gintptr_modifier='"I64"' -+ gintptr_format='"I64i"' -+ guintptr_format='"I64u"' -+ glib_gpi_cast='(gint64)' -+ glib_gpui_cast='(guint64)' -+ ;; -+ *) -+ glib_intptr_type_define=long -+ gintptr_modifier='"l"' -+ gintptr_format='"li"' -+ guintptr_format='"lu"' -+ glib_gpi_cast='(glong)' -+ glib_gpui_cast='(gulong)' -+ ;; -+ esac - ;; - $ac_cv_sizeof_long_long) - glib_intptr_type_define='long long' -@@ -3193,7 +3217,14 @@ $ac_cv_sizeof_int) - gint64=int - ;; - $ac_cv_sizeof_long) -- gint64=long -+ case $host in -+ *-*-darwin*) -+ gint64='long long' -+ ;; -+ *) -+ gint64=long -+ ;; -+ esac - ;; - $ac_cv_sizeof_long_long) - gint64='long long' diff --git a/modulesets/patches/glib-iconv.patch b/modulesets/patches/glib-iconv.patch deleted file mode 100644 index 945bc42..0000000 --- a/modulesets/patches/glib-iconv.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/glib/gconvert.c b/glib/gconvert.c -index b363bca..5d13465 100644 ---- a/glib/gconvert.c -+++ b/glib/gconvert.c -@@ -61,7 +61,7 @@ - #if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H) - #error GNU libiconv in use but included iconv.h not from libiconv - #endif --#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) -+#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !defined (__APPLE_CC__) && !defined (__LP_64__) - #error GNU libiconv not in use but included iconv.h is from libiconv - #endif - diff --git a/modulesets/patches/glibmm-Bug-781947-Build-fails-on-MacOS-because-glib-doesn-t.patch b/modulesets/patches/glibmm-Bug-781947-Build-fails-on-MacOS-because-glib-doesn-t.patch deleted file mode 100644 index 32ee881..0000000 --- a/modulesets/patches/glibmm-Bug-781947-Build-fails-on-MacOS-because-glib-doesn-t.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 2298406004115614c30554cb189f5e9ce2919326 Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Sat, 29 Apr 2017 10:37:46 -0700 -Subject: [PATCH] Bug 781947 - Build fails on MacOS because glib doesn't have - gdesktopinfo. - -Disable building desktopapinfo.cpp with the same test used in glib. ---- - configure.ac | 12 ++++++++++++ - gio/src/filelist.am | 8 +++++++- - 2 files changed, 19 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 02352bd..e19f212 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,6 +55,22 @@ AS_CASE([$host_os], [mingw*], [glibmm_host_windows=yes], [glibmm_host_windows=no - AC_MSG_RESULT([$glibmm_host_windows]) - AM_CONDITIONAL([HOST_WINDOWS_NATIVE], [test "x$glibmm_host_windows" = xyes]) - -+glib_have_cocoa=no -+AC_MSG_CHECKING([for Mac OS X Cocoa support]) -+AC_TRY_CPP([ -+#include -+#ifdef GNUSTEP_BASE_VERSION -+#error "Detected GNUstep, not Cocoa" -+#endif -+], glib_have_cocoa=yes) -+ -+AC_MSG_RESULT([$glib_have_cocoa]) -+AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"]) -+AS_IF([test "x$glib_have_cocoa" = "xyes"], -+[ -+AC_DEFINE([GLIBMM_OS_COCOA], [1], [Define if building with Cocoa, to disable building DestopAppInfo]) -+]) -+ - # TODO: This makes no sense. --danielk - AS_IF([test "x$enable_static" = xyes], - [ ---- a/glib/glibmmconfig.h.in 2017-04-04 09:37:56.000000000 -0700 -+++ b/glib/glibmmconfig.h.in 2017-04-30 10:18:29.000000000 -0700 -@@ -95,6 +95,8 @@ - /* Define if glibmm is built as a static library */ - #undef GLIBMM_STATIC_LIB - -+/* Define if building with Cocoa, to disable building DestopAppInfo. */ -+#undef GLIBMM_OS_COCOA - - #endif /* GLIBMM_CONFIGURE */ - -diff --git a/gio/src/filelist.am b/gio/src/filelist.am -index 0095128..31339d3 100644 ---- a/gio/src/filelist.am -+++ b/gio/src/filelist.am -@@ -136,7 +136,6 @@ giomm_files_any_hg = \ - zlibcompressor.hg - - giomm_files_posix_hg = \ -- desktopappinfo.hg \ - unixconnection.hg \ - unixcredentialsmessage.hg \ - unixfdlist.hg \ -@@ -145,11 +144,18 @@ giomm_files_posix_hg = \ - unixoutputstream.hg \ - unixsocketaddress.hg - -+giomm_files_not_mac = \ -+ desktopappinfo.hg -+ - if HOST_WINDOWS_NATIVE - giomm_files_arch_hg = - else -+if OS_COCOA - giomm_files_arch_hg = $(giomm_files_posix_hg) -+else -+giomm_files_arch_hg = $(giomm_files_not_mac) $(giomm_files_posix_hg) -+endif - endif - giomm_files_used_hg = $(giomm_files_any_hg) $(giomm_files_arch_hg) - ---- a/gio/giomm/wrap_init.cc 2017-04-04 11:00:01.000000000 -0700 -+++ b/gio/giomm/wrap_init.cc 2017-04-30 10:18:58.000000000 -0700 -@@ -52,7 +52,7 @@ - #include "dbussubtreevtable.h" - #include "dbusutils.h" - #include "dbuswatchname.h" --#ifndef G_OS_WIN32 -+#if !(defined(G_OS_WIN32) || defined(GLIBMM_OS_COCOA)) - #include "desktopappinfo.h" - #endif // ifndef G_OS_WIN32 - #include "drive.h" -@@ -186,7 +186,7 @@ - GType g_dbus_method_invocation_get_type(void); - GType g_dbus_proxy_get_type(void); - GType g_dbus_server_get_type(void); --#ifndef G_OS_WIN32 -+#if !(defined(G_OS_WIN32) || defined(GLIBMM_OS_COCOA)) - GType g_desktop_app_info_get_type(void); - #endif // ifndef G_OS_WIN32 - GType g_emblem_get_type(void); -@@ -302,7 +302,7 @@ - namespace DBus { class MethodInvocation_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; } - namespace DBus { class Proxy_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; } - namespace DBus { class Server_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; } --#ifndef G_OS_WIN32 -+#if !(defined(G_OS_WIN32) || defined(GLIBMM_OS_COCOA)) - class DesktopAppInfo_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; - #endif // ifndef G_OS_WIN32 - class Emblem_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; -@@ -429,7 +429,7 @@ - Glib::wrap_register(g_dbus_method_invocation_get_type(), &DBus::MethodInvocation_Class::wrap_new); - Glib::wrap_register(g_dbus_proxy_get_type(), &DBus::Proxy_Class::wrap_new); - Glib::wrap_register(g_dbus_server_get_type(), &DBus::Server_Class::wrap_new); --#ifndef G_OS_WIN32 -+#if !(defined(G_OS_WIN32) || defined(GLIBMM_OS_COCOA)) - Glib::wrap_register(g_desktop_app_info_get_type(), &DesktopAppInfo_Class::wrap_new); - #endif // ifndef G_OS_WIN32 - Glib::wrap_register(g_emblem_get_type(), &Emblem_Class::wrap_new); -@@ -533,7 +533,7 @@ - DBus::MethodInvocation::get_type(); - DBus::Proxy::get_type(); - DBus::Server::get_type(); --#ifndef G_OS_WIN32 -+#if !(defined(G_OS_WIN32) || defined(GLIBMM_OS_COCOA)) - DesktopAppInfo::get_type(); - #endif // ifndef G_OS_WIN32 - Emblem::get_type(); - - -2.2.2 - diff --git a/modulesets/patches/gmp-6.2.1-avoid-x18-register-apple-silicon.patch b/modulesets/patches/gmp-6.2.1-avoid-x18-register-apple-silicon.patch deleted file mode 100644 index de930e2..0000000 --- a/modulesets/patches/gmp-6.2.1-avoid-x18-register-apple-silicon.patch +++ /dev/null @@ -1,501 +0,0 @@ ---- a/mpn/arm64/aors_n.asm Sat Nov 28 23:38:32 2020 +0100 -+++ b/mpn/arm64/aors_n.asm Sun Nov 29 22:31:40 2020 +0100 -@@ -68,7 +68,7 @@ - EPILOGUE() - PROLOGUE(func_n) - CLRCY --L(ent): lsr x18, n, #2 -+L(ent): lsr x17, n, #2 - tbz n, #0, L(bx0) - - L(bx1): ldr x7, [up] -@@ -77,7 +77,7 @@ - str x13, [rp],#8 - tbnz n, #1, L(b11) - --L(b01): cbz x18, L(ret) -+L(b01): cbz x17, L(ret) - ldp x4, x5, [up,#8] - ldp x8, x9, [vp,#8] - sub up, up, #8 -@@ -88,7 +88,7 @@ - ldp x10, x11, [vp,#8] - add up, up, #8 - add vp, vp, #8 -- cbz x18, L(end) -+ cbz x17, L(end) - b L(top) - - L(bx0): tbnz n, #1, L(b10) -@@ -101,7 +101,7 @@ - - L(b10): ldp x6, x7, [up] - ldp x10, x11, [vp] -- cbz x18, L(end) -+ cbz x17, L(end) - - ALIGN(16) - L(top): ldp x4, x5, [up,#16] -@@ -114,8 +114,8 @@ - ADDSUBC x12, x4, x8 - ADDSUBC x13, x5, x9 - stp x12, x13, [rp],#16 -- sub x18, x18, #1 -- cbnz x18, L(top) -+ sub x17, x17, #1 -+ cbnz x17, L(top) - - L(end): ADDSUBC x12, x6, x10 - ADDSUBC x13, x7, x11 ---- a/mpn/arm64/aorsmul_1.asm Sat Nov 28 23:38:32 2020 +0100 -+++ b/mpn/arm64/aorsmul_1.asm Sun Nov 29 22:31:40 2020 +0100 -@@ -32,10 +32,15 @@ - - include(`../config.m4') - --C cycles/limb --C Cortex-A53 9.3-9.8 --C Cortex-A57 7.0 --C X-Gene 5.0 -+C addmul_1 submul_1 -+C cycles/limb cycles/limb -+C Cortex-A53 9.3-9.8 9.3-9.8 -+C Cortex-A55 9.0-9.5 9.3-9.8 -+C Cortex-A57 7 7 -+C Cortex-A72 -+C Cortex-A73 6 6 -+C X-Gene 5 5 -+C Apple M1 1.75 1.75 - - C NOTES - C * It is possible to keep the carry chain alive between the addition blocks ---- a/mpn/arm64/aorsorrlshC_n.asm Sat Nov 28 23:38:32 2020 +0100 -+++ b/mpn/arm64/aorsorrlshC_n.asm Sun Nov 29 22:31:40 2020 +0100 -@@ -65,14 +65,14 @@ - - ASM_START() - PROLOGUE(func_n) -- lsr x18, n, #2 -+ lsr x6, n, #2 - tbz n, #0, L(bx0) - - L(bx1): ldr x5, [up] - tbnz n, #1, L(b11) - - L(b01): ldr x11, [vp] -- cbz x18, L(1) -+ cbz x6, L(1) - ldp x8, x9, [vp,#8] - lsl x13, x11, #LSH - ADDSUB( x15, x13, x5) -@@ -94,7 +94,7 @@ - ADDSUB( x17, x13, x5) - str x17, [rp],#8 - sub up, up, #8 -- cbz x18, L(end) -+ cbz x6, L(end) - b L(top) - - L(bx0): tbnz n, #1, L(b10) -@@ -107,7 +107,7 @@ - L(b10): CLRRCY( x9) - ldp x10, x11, [vp] - sub up, up, #16 -- cbz x18, L(end) -+ cbz x6, L(end) - - ALIGN(16) - L(top): ldp x4, x5, [up,#16] -@@ -124,8 +124,8 @@ - ADDSUBC(x16, x12, x4) - ADDSUBC(x17, x13, x5) - stp x16, x17, [rp],#16 -- sub x18, x18, #1 -- cbnz x18, L(top) -+ sub x6, x6, #1 -+ cbnz x6, L(top) - - L(end): ldp x4, x5, [up,#16] - extr x12, x10, x9, #RSH ---- a/mpn/arm64/cnd_aors_n.asm Sat Nov 28 23:38:32 2020 +0100 -+++ b/mpn/arm64/cnd_aors_n.asm Sun Nov 29 22:31:40 2020 +0100 -@@ -65,7 +65,7 @@ - - CLRCY - -- lsr x18, n, #2 -+ lsr x17, n, #2 - tbz n, #0, L(bx0) - - L(bx1): ldr x13, [vp] -@@ -75,7 +75,7 @@ - str x9, [rp] - tbnz n, #1, L(b11) - --L(b01): cbz x18, L(rt) -+L(b01): cbz x17, L(rt) - ldp x12, x13, [vp,#8] - ldp x10, x11, [up,#8] - sub up, up, #8 -@@ -86,7 +86,7 @@ - L(b11): ldp x12, x13, [vp,#8]! - ldp x10, x11, [up,#8]! - sub rp, rp, #8 -- cbz x18, L(end) -+ cbz x17, L(end) - b L(top) - - L(bx0): ldp x12, x13, [vp] -@@ -99,7 +99,7 @@ - b L(mid) - - L(b10): sub rp, rp, #16 -- cbz x18, L(end) -+ cbz x17, L(end) - - ALIGN(16) - L(top): bic x6, x12, cnd -@@ -116,8 +116,8 @@ - ADDSUBC x9, x11, x7 - ldp x10, x11, [up,#32]! - stp x8, x9, [rp,#32]! -- sub x18, x18, #1 -- cbnz x18, L(top) -+ sub x17, x17, #1 -+ cbnz x17, L(top) - - L(end): bic x6, x12, cnd - bic x7, x13, cnd ---- a/mpn/arm64/logops_n.asm Sat Nov 28 23:38:32 2020 +0100 -+++ b/mpn/arm64/logops_n.asm Sun Nov 29 22:31:40 2020 +0100 -@@ -78,7 +78,7 @@ - - ASM_START() - PROLOGUE(func) -- lsr x18, n, #2 -+ lsr x17, n, #2 - tbz n, #0, L(bx0) - - L(bx1): ldr x7, [up] -@@ -88,7 +88,7 @@ - str x15, [rp],#8 - tbnz n, #1, L(b11) - --L(b01): cbz x18, L(ret) -+L(b01): cbz x17, L(ret) - ldp x4, x5, [up,#8] - ldp x8, x9, [vp,#8] - sub up, up, #8 -@@ -99,7 +99,7 @@ - ldp x10, x11, [vp,#8] - add up, up, #8 - add vp, vp, #8 -- cbz x18, L(end) -+ cbz x17, L(end) - b L(top) - - L(bx0): tbnz n, #1, L(b10) -@@ -110,7 +110,7 @@ - - L(b10): ldp x6, x7, [up] - ldp x10, x11, [vp] -- cbz x18, L(end) -+ cbz x17, L(end) - - ALIGN(16) - L(top): ldp x4, x5, [up,#16] -@@ -127,8 +127,8 @@ - POSTOP( x12) - POSTOP( x13) - stp x12, x13, [rp],#16 -- sub x18, x18, #1 -- cbnz x18, L(top) -+ sub x17, x17, #1 -+ cbnz x17, L(top) - - L(end): LOGOP( x12, x6, x10) - LOGOP( x13, x7, x11) ---- a/mpn/arm64/lshift.asm Sat Nov 28 23:38:32 2020 +0100 -+++ b/mpn/arm64/lshift.asm Sun Nov 29 22:31:40 2020 +0100 -@@ -61,7 +61,7 @@ - add rp, rp_arg, n, lsl #3 - add up, up, n, lsl #3 - sub tnc, xzr, cnt -- lsr x18, n, #2 -+ lsr x17, n, #2 - tbz n, #0, L(bx0) - - L(bx1): ldr x4, [up,#-8] -@@ -69,7 +69,7 @@ - - L(b01): NSHIFT x0, x4, tnc - PSHIFT x2, x4, cnt -- cbnz x18, L(gt1) -+ cbnz x17, L(gt1) - str x2, [rp,#-8] - ret - L(gt1): ldp x4, x5, [up,#-24] -@@ -89,7 +89,7 @@ - PSHIFT x13, x5, cnt - NSHIFT x10, x4, tnc - PSHIFT x2, x4, cnt -- cbnz x18, L(gt2) -+ cbnz x17, L(gt2) - orr x10, x10, x13 - stp x2, x10, [rp,#-16] - ret -@@ -123,11 +123,11 @@ - orr x11, x12, x2 - stp x10, x11, [rp,#-32]! - PSHIFT x2, x4, cnt --L(lo0): sub x18, x18, #1 -+L(lo0): sub x17, x17, #1 - L(lo3): NSHIFT x10, x6, tnc - PSHIFT x13, x7, cnt - NSHIFT x12, x7, tnc -- cbnz x18, L(top) -+ cbnz x17, L(top) - - L(end): orr x10, x10, x13 - orr x11, x12, x2 ---- a/mpn/arm64/lshiftc.asm Sat Nov 28 23:38:32 2020 +0100 -+++ b/mpn/arm64/lshiftc.asm Sun Nov 29 22:31:40 2020 +0100 -@@ -61,7 +61,7 @@ - add rp, rp_arg, n, lsl #3 - add up, up, n, lsl #3 - sub tnc, xzr, cnt -- lsr x18, n, #2 -+ lsr x17, n, #2 - tbz n, #0, L(bx0) - - L(bx1): ldr x4, [up,#-8] -@@ -69,7 +69,7 @@ - - L(b01): NSHIFT x0, x4, tnc - PSHIFT x2, x4, cnt -- cbnz x18, L(gt1) -+ cbnz x17, L(gt1) - mvn x2, x2 - str x2, [rp,#-8] - ret -@@ -90,7 +90,7 @@ - PSHIFT x13, x5, cnt - NSHIFT x10, x4, tnc - PSHIFT x2, x4, cnt -- cbnz x18, L(gt2) -+ cbnz x17, L(gt2) - eon x10, x10, x13 - mvn x2, x2 - stp x2, x10, [rp,#-16] -@@ -125,11 +125,11 @@ - eon x11, x12, x2 - stp x10, x11, [rp,#-32]! - PSHIFT x2, x4, cnt --L(lo0): sub x18, x18, #1 -+L(lo0): sub x17, x17, #1 - L(lo3): NSHIFT x10, x6, tnc - PSHIFT x13, x7, cnt - NSHIFT x12, x7, tnc -- cbnz x18, L(top) -+ cbnz x17, L(top) - - L(end): eon x10, x10, x13 - eon x11, x12, x2 ---- a/mpn/arm64/mul_1.asm Sat Nov 28 23:38:32 2020 +0100 -+++ b/mpn/arm64/mul_1.asm Sun Nov 29 22:31:40 2020 +0100 -@@ -56,7 +56,7 @@ - - PROLOGUE(mpn_mul_1) - adds x4, xzr, xzr C clear register and cy flag --L(com): lsr x18, n, #2 -+L(com): lsr x17, n, #2 - tbnz n, #0, L(bx1) - - L(bx0): mov x11, x4 -@@ -65,7 +65,7 @@ - L(b10): ldp x4, x5, [up] - mul x8, x4, v0 - umulh x10, x4, v0 -- cbz x18, L(2) -+ cbz x17, L(2) - ldp x6, x7, [up,#16]! - mul x9, x5, v0 - b L(mid)-8 -@@ -80,7 +80,7 @@ - str x9, [rp],#8 - tbnz n, #1, L(b10) - --L(b01): cbz x18, L(1) -+L(b01): cbz x17, L(1) - - L(b00): ldp x6, x7, [up] - mul x8, x6, v0 -@@ -90,8 +90,8 @@ - adcs x12, x8, x11 - umulh x11, x7, v0 - add rp, rp, #16 -- sub x18, x18, #1 -- cbz x18, L(end) -+ sub x17, x17, #1 -+ cbz x17, L(end) - - ALIGN(16) - L(top): mul x8, x4, v0 -@@ -110,8 +110,8 @@ - stp x12, x13, [rp],#32 - adcs x12, x8, x11 - umulh x11, x7, v0 -- sub x18, x18, #1 -- cbnz x18, L(top) -+ sub x17, x17, #1 -+ cbnz x17, L(top) - - L(end): mul x8, x4, v0 - adcs x13, x9, x10 ---- a/mpn/arm64/rsh1aors_n.asm Sat Nov 28 23:38:32 2020 +0100 -+++ b/mpn/arm64/rsh1aors_n.asm Sun Nov 29 22:31:40 2020 +0100 -@@ -59,7 +59,7 @@ - - ASM_START() - PROLOGUE(func_n) -- lsr x18, n, #2 -+ lsr x6, n, #2 - - tbz n, #0, L(bx0) - -@@ -69,7 +69,7 @@ - - L(b01): ADDSUB x13, x5, x9 - and x10, x13, #1 -- cbz x18, L(1) -+ cbz x6, L(1) - ldp x4, x5, [up],#48 - ldp x8, x9, [vp],#48 - ADDSUBC x14, x4, x8 -@@ -80,8 +80,8 @@ - ADDSUBC x12, x4, x8 - ADDSUBC x13, x5, x9 - str x17, [rp], #24 -- sub x18, x18, #1 -- cbz x18, L(end) -+ sub x6, x6, #1 -+ cbz x6, L(end) - b L(top) - - L(1): cset x14, COND -@@ -97,7 +97,7 @@ - ldp x8, x9, [vp],#32 - ADDSUBC x12, x4, x8 - ADDSUBC x13, x5, x9 -- cbz x18, L(3) -+ cbz x6, L(3) - ldp x4, x5, [up,#-16] - ldp x8, x9, [vp,#-16] - extr x17, x12, x15, #1 -@@ -117,7 +117,7 @@ - ADDSUB x12, x4, x8 - ADDSUBC x13, x5, x9 - and x10, x12, #1 -- cbz x18, L(2) -+ cbz x6, L(2) - ldp x4, x5, [up,#-16] - ldp x8, x9, [vp,#-16] - ADDSUBC x14, x4, x8 -@@ -134,8 +134,8 @@ - ADDSUBC x12, x4, x8 - ADDSUBC x13, x5, x9 - add rp, rp, #16 -- sub x18, x18, #1 -- cbz x18, L(end) -+ sub x6, x6, #1 -+ cbz x6, L(end) - - ALIGN(16) - L(top): ldp x4, x5, [up,#-16] -@@ -152,8 +152,8 @@ - ADDSUBC x12, x4, x8 - ADDSUBC x13, x5, x9 - stp x16, x17, [rp],#32 -- sub x18, x18, #1 -- cbnz x18, L(top) -+ sub x6, x6, #1 -+ cbnz x6, L(top) - - L(end): extr x16, x15, x14, #1 - extr x17, x12, x15, #1 ---- a/mpn/arm64/rshift.asm Sat Nov 28 23:38:32 2020 +0100 -+++ b/mpn/arm64/rshift.asm Sun Nov 29 22:31:40 2020 +0100 -@@ -60,7 +60,7 @@ - PROLOGUE(mpn_rshift) - mov rp, rp_arg - sub tnc, xzr, cnt -- lsr x18, n, #2 -+ lsr x17, n, #2 - tbz n, #0, L(bx0) - - L(bx1): ldr x5, [up] -@@ -68,7 +68,7 @@ - - L(b01): NSHIFT x0, x5, tnc - PSHIFT x2, x5, cnt -- cbnz x18, L(gt1) -+ cbnz x17, L(gt1) - str x2, [rp] - ret - L(gt1): ldp x4, x5, [up,#8] -@@ -89,7 +89,7 @@ - PSHIFT x13, x4, cnt - NSHIFT x10, x5, tnc - PSHIFT x2, x5, cnt -- cbnz x18, L(gt2) -+ cbnz x17, L(gt2) - orr x10, x10, x13 - stp x10, x2, [rp] - ret -@@ -121,11 +121,11 @@ - orr x11, x12, x2 - stp x11, x10, [rp,#32]! - PSHIFT x2, x5, cnt --L(lo0): sub x18, x18, #1 -+L(lo0): sub x17, x17, #1 - L(lo3): NSHIFT x10, x7, tnc - NSHIFT x12, x6, tnc - PSHIFT x13, x6, cnt -- cbnz x18, L(top) -+ cbnz x17, L(top) - - L(end): orr x10, x10, x13 - orr x11, x12, x2 ---- a/mpn/arm64/sqr_diag_addlsh1.asm Sat Nov 28 23:38:32 2020 +0100 -+++ b/mpn/arm64/sqr_diag_addlsh1.asm Sun Nov 29 22:31:40 2020 +0100 -@@ -47,7 +47,7 @@ - ASM_START() - PROLOGUE(mpn_sqr_diag_addlsh1) - ldr x15, [up],#8 -- lsr x18, n, #1 -+ lsr x14, n, #1 - tbz n, #0, L(bx0) - - L(bx1): adds x7, xzr, xzr -@@ -62,8 +62,8 @@ - ldr x17, [up],#16 - ldp x6, x7, [tp],#32 - umulh x11, x15, x15 -- sub x18, x18, #1 -- cbz x18, L(end) -+ sub x14, x14, #1 -+ cbz x14, L(end) - - ALIGN(16) - L(top): extr x9, x6, x5, #63 -@@ -84,7 +84,7 @@ - extr x8, x5, x4, #63 - stp x12, x13, [rp],#16 - adcs x12, x8, x10 -- sub x18, x18, #1 -- cbnz x18, L(top) -+ sub x14, x14, #1 -+ cbnz x14, L(top) - - L(end): extr x9, x6, x5, #63 - mul x10, x17, x17 \ No newline at end of file diff --git a/modulesets/patches/gnutls-yes-weak-imports.patch b/modulesets/patches/gnutls-yes-weak-imports.patch deleted file mode 100644 index 65b1614..0000000 --- a/modulesets/patches/gnutls-yes-weak-imports.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -u /Users/john/Development/gtk-build/gtk-stable-10.15-x86_64/src/gnutls-3.6.12/configure.ac\~ /Users/john/Development/gtk-build/gtk-stable-10.15-x86_64/src/gnutls-3.6.12/configure.ac ---- a/configure.ac 2020-01-31 15:14:22.000000000 -0800 -+++ b/configure.ac 2020-04-14 09:36:10.000000000 -0700 -@@ -122,14 +122,6 @@ - ;; - *darwin*) - have_macosx=yes -- save_LDFLAGS="$LDFLAGS" -- dnl Try to use -no_weak_imports if available. This makes sure we -- dnl error out when linking to a function that doesn't exist in the -- dnl intended minimum runtime version. -- LDFLAGS="$LDFLAGS -Wl,-no_weak_imports" -- AC_MSG_CHECKING([whether the linker supports -Wl,-no_weak_imports]) -- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], -- [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); LDFLAGS="$save_LDFLAGS"]) - ;; - *solaris*) - have_elf=yes - -Diff finished. Tue Apr 14 09:48:42 2020 diff --git a/modulesets/patches/gobject-introspection-625195-Fix-non-libtool-linker-flags-on-Darwin.patch b/modulesets/patches/gobject-introspection-625195-Fix-non-libtool-linker-flags-on-Darwin.patch deleted file mode 100644 index 68305a6..0000000 --- a/modulesets/patches/gobject-introspection-625195-Fix-non-libtool-linker-flags-on-Darwin.patch +++ /dev/null @@ -1,42 +0,0 @@ -From dde05e26be153002c7e52cc8f410e2e7be123707 Mon Sep 17 00:00:00 2001 -From: Philip Chimento -Date: Wed, 29 Apr 2015 22:20:47 -0700 -Subject: [PATCH] Fix non-libtool linker flags on Darwin - -Darwin's linker doesn't like "-rpath=path"; instead pass "-rpath path". -Additionally, there is no equivalent for "--no-as-needed" (it seems to do -the right thing by default?) ---- - giscanner/ccompiler.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py -index 1c66aac..25ef55c 100644 ---- a/giscanner/ccompiler.py -+++ b/giscanner/ccompiler.py -@@ -69,11 +69,11 @@ class CCompiler(object): - else: - args.append(str.lower(ns) + '.lib') - else: -- args.append('-Wl,-rpath=.') -+ args.append('-Wl,-rpath,.') - - # Ensure libraries are always linked as we are going to use ldd to work - # out their names later -- if not libtool and pkgconfig_msvc_flags == '': -+ if not libtool and pkgconfig_msvc_flags == '' and not sys.platform == 'darwin': - args.append('-Wl,--no-as-needed') - - for library in libraries: -@@ -96,7 +96,7 @@ class CCompiler(object): - args.append('-rpath') - args.append(library_path) - else: -- args.append('-Wl,-rpath=' + library_path) -+ args.append('-Wl,-rpath,' + library_path) - - def get_external_link_flags(self, args, libraries, pkgconfig_msvc_flags): - # An "external" link is where the library to be introspected --- -2.3.2 (Apple Git-55) - diff --git a/modulesets/patches/graphviz-11-fix-python-config.patch b/modulesets/patches/graphviz-11-fix-python-config.patch new file mode 100644 index 0000000..2ef1d37 --- /dev/null +++ b/modulesets/patches/graphviz-11-fix-python-config.patch @@ -0,0 +1,11 @@ +--- a/configure.ac 2024-04-28 08:25:15 ++++ b/configure.ac 2024-06-06 16:34:35 +@@ -995,7 +995,7 @@ + pkgconfig_python3_found=`$PKG_CONFIG --exists python-$PYTHON3_VERSION 2>/dev/null` + if test "$?" = "0" ; then + PYTHON3_INCLUDES="$PYTHON3_CFLAGS "`$PKG_CONFIG --cflags python-$PYTHON3_VERSION` +- PYTHON3_LIBS="$PYTHON3_LFLAGS "`$PKG_CONFIG --libs python-$PYTHON3_VERSION` ++ PYTHON3_LIBS="$PYTHON3_LFLAGS "`$PKG_CONFIG --libs python-$PYTHON3_VERSION-embed` + else + use_python3="No (python-$PYTHON3_VERSION.pc not found)" + fi diff --git a/modulesets/patches/graphviz-remove-rpath.patch b/modulesets/patches/graphviz-remove-rpath.patch deleted file mode 100644 index d735086..0000000 --- a/modulesets/patches/graphviz-remove-rpath.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/CMakeLists.txt 2021-03-15 17:04:01.000000000 -0700 -+++ b/CMakeLists.txt 2021-07-29 13:42:38.000000000 -0700 -@@ -94,6 +94,8 @@ - # Name of the config file used by Graphviz - set(GVPLUGIN_CONFIG_FILE config${GRAPHVIZ_PLUGIN_VERSION}) - -+set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIBRARY_INSTALL_DIR}") -+ - # ============================ Library dependencies ============================ - if (WIN32) - list(APPEND CMAKE_PREFIX_PATH ${WINDOWS_DEPENDENCY_DIR}) ---- a/plugin/core/CMakeLists.txt 2021-03-15 17:04:01.000000000 -0700 -+++ b/plugin/core/CMakeLists.txt 2021-07-29 13:42:09.000000000 -0700 -@@ -44,6 +44,8 @@ - ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR} - ) - -+set_target_properties(gvplugin_core PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}") -+ - # Specify library version and soversion - set_target_properties(gvplugin_core PROPERTIES - VERSION ${GRAPHVIZ_PLUGIN_VERSION}.0.0 ---- a/plugin/pango/CMakeLists.txt 2021-03-15 17:04:01.000000000 -0700 -+++ b/plugin/pango/CMakeLists.txt 2021-07-29 13:43:13.000000000 -0700 -@@ -36,6 +36,8 @@ - ${PANGOCAIRO_LINK_LIBRARIES} - ) - -+ set_target_properties(gvplugin_pango PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}") -+ - # Installation location of library files - install( - TARGETS gvplugin_pango ---- a/plugin/neato_layout/CMakeLists.txt 2021-03-15 17:04:01.000000000 -0700 -+++ b/plugin/neato_layout/CMakeLists.txt 2021-07-29 13:42:57.000000000 -0700 -@@ -42,6 +42,8 @@ - ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR} - ) - -+set_target_properties(gvplugin_neato_layout PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}") -+ - # Specify library version and soversion - set_target_properties(gvplugin_neato_layout PROPERTIES - VERSION ${GRAPHVIZ_PLUGIN_VERSION}.0.0 ---- a/plugin/dot_layout/CMakeLists.txt 2021-03-15 17:04:01.000000000 -0700 -+++ b/plugin/dot_layout/CMakeLists.txt 2021-07-29 13:42:28.000000000 -0700 -@@ -27,6 +27,8 @@ - ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR} - ) - -+set_target_properties(gvplugin_dot_layout PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}") -+ - # Specify library version and soversion - set_target_properties(gvplugin_dot_layout PROPERTIES - VERSION ${GRAPHVIZ_PLUGIN_VERSION}.0.0 diff --git a/modulesets/patches/gtksourceview-664511-gtkosxapplication.patch b/modulesets/patches/gtksourceview-664511-gtkosxapplication.patch deleted file mode 100644 index 2b2e3e9..0000000 --- a/modulesets/patches/gtksourceview-664511-gtkosxapplication.patch +++ /dev/null @@ -1,234 +0,0 @@ -diff -Naur gtksourceview-2.10.5/configure gtksourceview-2.10.5-patched/configure ---- gtksourceview-2.10.5/configure 2010-09-28 11:43:55.000000000 +0200 -+++ gtksourceview-2.10.5-patched/configure 2011-11-17 08:55:22.000000000 +0100 -@@ -669,8 +677,8 @@ - GLADE_CATALOGDIR - GLADE_CATALOG_FALSE - GLADE_CATALOG_TRUE --IGE_MAC_LIBS --IGE_MAC_CFLAGS -+GTK_MAC_LIBS -+GTK_MAC_CFLAGS - OS_OSX_FALSE - OS_OSX_TRUE - ENABLE_PROVIDERS_FALSE -@@ -830,8 +838,8 @@ - PKG_CONFIG_LIBDIR - DEP_CFLAGS - DEP_LIBS --IGE_MAC_CFLAGS --IGE_MAC_LIBS' -+GTK_MAC_CFLAGS -+GTK_MAC_LIBS' - - - # Initialize some variables set by options. -@@ -1497,10 +1506,10 @@ - path overriding pkg-config's built-in search path - DEP_CFLAGS C compiler flags for DEP, overriding pkg-config - DEP_LIBS linker flags for DEP, overriding pkg-config -- IGE_MAC_CFLAGS -- C compiler flags for IGE_MAC, overriding pkg-config -- IGE_MAC_LIBS -- linker flags for IGE_MAC, overriding pkg-config -+ GTK_MAC_CFLAGS -+ C compiler flags for GTK_MAC, overriding pkg-config -+ GTK_MAC_LIBS -+ linker flags for GTK_MAC, overriding pkg-config - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. -@@ -11213,35 +11220,35 @@ - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IGE_MAC" >&5 --$as_echo_n "checking for IGE_MAC... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_MAC" >&5 -+$as_echo_n "checking for GTK_MAC... " >&6; } - --if test -n "$IGE_MAC_CFLAGS"; then -- pkg_cv_IGE_MAC_CFLAGS="$IGE_MAC_CFLAGS" -+if test -n "$GTK_MAC_CFLAGS"; then -+ pkg_cv_GTK_MAC_CFLAGS="$GTK_MAC_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_IGE_MAC_CFLAGS=`$PKG_CONFIG --cflags "ige-mac-integration" 2>/dev/null` -+ pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration" 2>/dev/null` - else - pkg_failed=yes - fi - else - pkg_failed=untried - fi --if test -n "$IGE_MAC_LIBS"; then -- pkg_cv_IGE_MAC_LIBS="$IGE_MAC_LIBS" -+if test -n "$GTK_MAC_LIBS"; then -+ pkg_cv_GTK_MAC_LIBS="$GTK_MAC_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_IGE_MAC_LIBS=`$PKG_CONFIG --libs "ige-mac-integration" 2>/dev/null` -+ pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -11261,24 +11268,23 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ige-mac-integration" 2>&1` -+ GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk-mac-integration" 2>&1` - else -- IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ige-mac-integration" 2>&1` -+ GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk-mac-integration" 2>&1` - fi - # Put the nasty error message in config.log where it belongs -- echo "$IGE_MAC_PKG_ERRORS" >&5 -+ echo "$GTK_MAC_PKG_ERRORS" >&5 - -- as_fn_error $? "Package requirements (ige-mac-integration) were not met: -+ as_fn_error $? "Package requirements (gtk-mac-integration) were not met: - --$IGE_MAC_PKG_ERRORS -+$GTK_MAC_PKG_ERRORS - - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --Alternatively, you may set the environment variables IGE_MAC_CFLAGS --and IGE_MAC_LIBS to avoid the need to call pkg-config. -+Alternatively, you may set the environment variables GTK_MAC_CFLAGS -+and GTK_MAC_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details." "$LINENO" 5 -- - elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -@@ -11288,16 +11294,15 @@ - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - --Alternatively, you may set the environment variables IGE_MAC_CFLAGS --and IGE_MAC_LIBS to avoid the need to call pkg-config. -+Alternatively, you may set the environment variables GTK_MAC_CFLAGS -+and GTK_MAC_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - - To get pkg-config, see . - See \`config.log' for more details" "$LINENO" 5; } -- - else -- IGE_MAC_CFLAGS=$pkg_cv_IGE_MAC_CFLAGS -- IGE_MAC_LIBS=$pkg_cv_IGE_MAC_LIBS -+ GTK_MAC_CFLAGS=$pkg_cv_GTK_MAC_CFLAGS -+ GTK_MAC_LIBS=$pkg_cv_GTK_MAC_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - -diff -Naur gtksourceview-2.10.5/configure.ac gtksourceview-2.10.5-patched/configure.ac ---- gtksourceview-2.10.5/configure.ac 2010-09-28 11:35:40.000000000 +0200 -+++ gtksourceview-2.10.5-patched/configure.ac 2011-11-17 08:51:09.000000000 +0100 -@@ -76,7 +76,7 @@ - if test "$os_osx" = "yes"; then - AC_DEFINE([OS_OSX],[1],[Defined if os is Mac OSX]) - -- PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration) -+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration) - fi - - # Check for Glade3 -diff -Naur gtksourceview-2.10.5/gtksourceview/Makefile.am gtksourceview-2.10.5-patched/gtksourceview/Makefile.am ---- gtksourceview-2.10.5/gtksourceview/Makefile.am 2010-08-22 13:45:04.000000000 +0200 -+++ gtksourceview-2.10.5-patched/gtksourceview/Makefile.am 2011-11-19 10:33:20.000000000 +0100 -@@ -10,7 +10,7 @@ - -I$(top_srcdir) -I$(srcdir) \ - $(DISABLE_DEPRECATED) \ - $(WARN_CFLAGS) \ -- $(IGE_MAC_CFLAGS) \ -+ $(GTK_MAC_CFLAGS) \ - $(DEP_CFLAGS) - - BUILT_SOURCES = \ -@@ -96,7 +96,7 @@ - completion_providers = \ - completion-providers/words/libgtksourcecompletionwords.la - --libgtksourceview_2_0_la_LIBADD = $(DEP_LIBS) $(IGE_MAC_LIBS) $(completion_providers) -+libgtksourceview_2_0_la_LIBADD = $(DEP_LIBS) $(GTK_MAC_LIBS) $(completion_providers) - libgtksourceview_2_0_la_LDFLAGS = -no-undefined -export-symbols-regex "^gtk_source_.*" - libgtksourceview_2_0_includedir = $(includedir)/gtksourceview-2.0/gtksourceview - -diff -Naur gtksourceview-2.10.5/gtksourceview/Makefile.in gtksourceview-2.10.5-patched/gtksourceview/Makefile.in ---- gtksourceview-2.10.5/gtksourceview/Makefile.in 2010-09-28 11:43:57.000000000 +0200 -+++ gtksourceview-2.10.5-patched/gtksourceview/Makefile.in 2011-11-19 10:33:40.000000000 +0100 -@@ -217,10 +217,10 @@ - GTKDOC_CHECK = @GTKDOC_CHECK@ - GTKDOC_MKPDF = @GTKDOC_MKPDF@ - GTKDOC_REBASE = @GTKDOC_REBASE@ -+GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@ -+GTK_MAC_LIBS = @GTK_MAC_LIBS@ - GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ - HTML_DIR = @HTML_DIR@ --IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@ --IGE_MAC_LIBS = @IGE_MAC_LIBS@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -336,7 +336,7 @@ - -I$(top_srcdir) -I$(srcdir) \ - $(DISABLE_DEPRECATED) \ - $(WARN_CFLAGS) \ -- $(IGE_MAC_CFLAGS) \ -+ $(GTK_MAC_CFLAGS) \ - $(DEP_CFLAGS) - - BUILT_SOURCES = \ -@@ -423,7 +423,7 @@ - completion_providers = \ - completion-providers/words/libgtksourcecompletionwords.la - --libgtksourceview_2_0_la_LIBADD = $(DEP_LIBS) $(IGE_MAC_LIBS) $(completion_providers) -+libgtksourceview_2_0_la_LIBADD = $(DEP_LIBS) $(GTK_MAC_LIBS) $(completion_providers) - libgtksourceview_2_0_la_LDFLAGS = -no-undefined -export-symbols-regex "^gtk_source_.*" - libgtksourceview_2_0_includedir = $(includedir)/gtksourceview-2.0/gtksourceview - libgtksourceview_2_0_include_HEADERS = \ -diff -Naur gtksourceview-2.10.5/gtksourceview/gtksourceview-i18n.c gtksourceview-2.10.5-patched/gtksourceview/gtksourceview-i18n.c ---- gtksourceview-2.10.5/gtksourceview/gtksourceview-i18n.c 2010-08-22 13:45:05.000000000 +0200 -+++ gtksourceview-2.10.5-patched/gtksourceview/gtksourceview-i18n.c 2011-11-19 17:39:33.000000000 +0100 -@@ -24,7 +24,7 @@ - #endif - - #ifdef OS_OSX --#include -+#include - #endif - - #include -@@ -45,11 +45,9 @@ - - g_free (win32_dir); - #elif defined (OS_OSX) -- IgeMacBundle *bundle = ige_mac_bundle_get_default (); -- -- if (ige_mac_bundle_get_is_app_bundle (bundle)) -+ if (quartz_application_get_bundle_id () != NULL) - { -- locale_dir = g_strdup (ige_mac_bundle_get_localedir (bundle)); -+ locale_dir = g_build_filename (quartz_application_get_resource_path (), "share", "locale", NULL); - } - else - { diff --git a/modulesets/patches/gtksourceview3-664511-gtkosxapplication.patch b/modulesets/patches/gtksourceview3-664511-gtkosxapplication.patch deleted file mode 100644 index 63e32c8..0000000 --- a/modulesets/patches/gtksourceview3-664511-gtkosxapplication.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 43cdc6b7fe7470c7dc4a2482569eb4ffdff41ace Mon Sep 17 00:00:00 2001 -From: Philip Chimento -Date: Mon, 21 Nov 2011 22:23:00 +0100 -Subject: [PATCH] Change IgeMacIntegration to GtkOSXApplication - -Rename ige-mac-integration to gtk-mac-integration and replace the deprecate -ige_mac_bundle_get_localedir with the newer - quartz_application_get_resource_path(). ---- - configure.ac | 2 +- - gtksourceview/Makefile.am | 4 ++-- - gtksourceview/gtksourceview-i18n.c | 8 +++----- - 3 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7d2f39b..7d4a17f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -98,7 +98,7 @@ AM_CONDITIONAL([OS_OSX], [ test "$os_osx" = "yes" ]) - if test "$os_osx" = "yes"; then - AC_DEFINE([OS_OSX], [1], [Defined if os is Mac OSX]) - -- PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration) -+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration) - fi - - # Check for Glade3 -diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am -index e4adeaa..e2cb296 100644 ---- a/gtksourceview/Makefile.am -+++ b/gtksourceview/Makefile.am -@@ -8,7 +8,7 @@ INCLUDES = \ - -I$(top_srcdir) -I$(srcdir) \ - $(DISABLE_DEPRECATED_CFLAGS) \ - $(WARN_CFLAGS) \ -- $(IGE_MAC_CFLAGS) \ -+ $(GTK_MAC_CFLAGS) \ - $(DEP_CFLAGS) - - BUILT_SOURCES = \ -@@ -111,7 +111,7 @@ nodist_libgtksourceview_3_0_la_SOURCES =\ - completion_providers = \ - completion-providers/words/libgtksourcecompletionwords.la - --libgtksourceview_3_0_la_LIBADD = $(DEP_LIBS) $(IGE_MAC_LIBS) $(completion_providers) -+libgtksourceview_3_0_la_LIBADD = $(DEP_LIBS) $(GTK_MAC_LIBS) $(completion_providers) - libgtksourceview_3_0_la_LDFLAGS = -no-undefined -export-symbols-regex "^gtk_source_.*" - libgtksourceview_3_0_includedir = $(includedir)/gtksourceview-3.0/gtksourceview - -diff --git a/gtksourceview/gtksourceview-i18n.c b/gtksourceview/gtksourceview-i18n.c -index 997d283..64e392a 100644 ---- a/gtksourceview/gtksourceview-i18n.c -+++ b/gtksourceview/gtksourceview-i18n.c -@@ -24,7 +24,7 @@ - #endif - - #ifdef OS_OSX --#include -+#include - #endif - - #include -@@ -45,11 +45,9 @@ get_locale_dir (void) - - g_free (win32_dir); - #elif defined (OS_OSX) -- IgeMacBundle *bundle = ige_mac_bundle_get_default (); -- -- if (ige_mac_bundle_get_is_app_bundle (bundle)) -+ if (quartz_application_get_bundle_id () != NULL) - { -- locale_dir = g_strdup (ige_mac_bundle_get_localedir (bundle)); -+ locale_dir = g_build_filename (quartz_application_get_resource_path (), "share", "locale", NULL); - } - else - { --- -1.7.3.2 - diff --git a/modulesets/patches/gtksourceview3-664679-backends.patch b/modulesets/patches/gtksourceview3-664679-backends.patch deleted file mode 100644 index a62fa57..0000000 --- a/modulesets/patches/gtksourceview3-664679-backends.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 194d40ed2e6e27889b201b4c84997b1e7075a3a5 Mon Sep 17 00:00:00 2001 -From: Philip Chimento -Date: Tue, 22 Nov 2011 13:05:08 +0100 -Subject: [PATCH] Allow for multiple GDK backends - -In GDK > 3.0, multiple backends can be built. The pkg-config -variable that tells the backend is now called 'targets' instead of -'target'. To determine whether to build for OS X, configure now -needs to use the GTK_CHECK_BACKENDS macro supplied with GTK, as -described in the migration guide: -http://developer.gnome.org/gtk3/3.3/ch25s02.html ---- - configure.ac | 9 +-------- - 1 files changed, 1 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7d4a17f..3d88fe5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -84,14 +84,7 @@ AM_CONDITIONAL([ENABLE_PROVIDERS], [ test "$enable_providers" = "yes" ]) - - dnl check for native osx - AC_MSG_CHECKING([for native Mac OS X]) -- --gdk_windowing=`$PKG_CONFIG --variable=target gdk-3.0` -- --if test "$gdk_windowing" = "quartz"; then -- os_osx=yes --else -- os_osx=no --fi -+GTK_CHECK_BACKEND([quartz], [3.0.0], [os_osx=yes], [os_osx=no]) - AC_MSG_RESULT([$os_osx]) - AM_CONDITIONAL([OS_OSX], [ test "$os_osx" = "yes" ]) - --- -1.7.3.2 - diff --git a/modulesets/patches/guild-shell.patch b/modulesets/patches/guild-shell.patch deleted file mode 100644 index 6873579..0000000 --- a/modulesets/patches/guild-shell.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/meta/guild.in Fri Feb 1 09:19:34 2013 -+++ b/meta/guild.in Mon Dec 14 12:03:44 2015 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!@SHELL@ - # -*- scheme -*- - prefix="@prefix@" - exec_prefix="@exec_prefix@" ---- a/meta/Makefile.in -+++ b/meta/Makefile.in -@@ -1586,7 +1586,8 @@ substitute = \ - -e "s|[@]sitedir[@]|$(sitedir)|g" \ - -e "s|[@]guile[@]|$$guile|g" \ - -e "s|[@]guild[@]|$$guild|g" \ -- -e "s|[@]installed_guile[@]|$$installed_guile|g" -+ -e "s|[@]installed_guile[@]|$$installed_guile|g" \ -+ -e "s|[@]SHELL[@]|$$CONFIG_SHELL|g" - - - # Substitutions for dependencies that appear in 'guile-2.0.pc'. diff --git a/modulesets/patches/guile-clocktime.patch b/modulesets/patches/guile-clocktime.patch deleted file mode 100644 index f86b590..0000000 --- a/modulesets/patches/guile-clocktime.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -c /Users/john/Development/Gnucash-Build/Gnucash-master-git/src/guile-2.0.12/libguile/stime.c\~ /Users/john/Development/Gnucash-Build/Gnucash-master-git/src/guile-2.0.12/libguile/stime.c ---- a/libguile/stime.c Mon Jul 11 09:19:59 2016 -+++ b/libguile/stime.c Mon Mar 13 14:02:59 2017 -@@ -828,7 +828,7 @@ - if (clock_gettime (CLOCK_REALTIME, &posix_real_time_base) == 0) - get_internal_real_time = get_internal_real_time_posix_timer; - --#ifdef HAVE_POSIX_CPUTIME -+#if defined(HAVE_POSIX_CPUTIME) && defined(HAVE_CPU_CLOCKID) - { - clockid_t dummy; - - -Diff finished. Mon Mar 13 14:04:07 2017 diff --git a/modulesets/patches/guile20-align-fix.patch b/modulesets/patches/guile20-align-fix.patch deleted file mode 100644 index 6cc1e17..0000000 --- a/modulesets/patches/guile20-align-fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/libguile/foreign.c b/libguile/foreign.c -index 01af900..59f5e72 100644 ---- a/libguile/foreign.c -+++ b/libguile/foreign.c -@@ -814,7 +814,7 @@ SCM_DEFINE (scm_pointer_to_procedure, "pointer->procedure", 3, 0, 0, - - static const struct - { -- scm_t_uint64 dummy; /* ensure 8-byte alignment; perhaps there's a better way */ -+ SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */ - const scm_t_uint8 bytes[10 * (sizeof (struct scm_objcode) + 8 - + sizeof (struct scm_objcode) + 32)]; - } raw_bytecode = { -@@ -867,7 +867,7 @@ make_objcode_trampoline (unsigned int nargs) - - static const struct - { -- scm_t_uint64 dummy; /* alignment */ -+ SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */ - scm_t_cell cells[10 * 2]; /* 10 double cells */ - } objcode_cells = { - 0, -diff --git a/libguile/gsubr.c b/libguile/gsubr.c -index b6f261f..38b7ce1 100644 ---- a/libguile/gsubr.c -+++ b/libguile/gsubr.c -@@ -213,7 +213,7 @@ - */ - static const struct - { -- scm_t_uint64 dummy; /* ensure 8-byte alignment; perhaps there's a better way */ -+ SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */ - const scm_t_uint8 bytes[121 * (sizeof (struct scm_objcode) + 16 - + sizeof (struct scm_objcode) + 32)]; - } raw_bytecode = { -@@ -317,7 +317,7 @@ static const struct - - static const struct - { -- scm_t_uint64 dummy; /* alignment */ -+ SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */ - scm_t_cell cells[121 * 2]; /* 11*11 double cells */ - } objcode_cells = { - 0, diff --git a/modulesets/patches/harfbuzz-kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch b/modulesets/patches/harfbuzz-kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch deleted file mode 100644 index d462307..0000000 --- a/modulesets/patches/harfbuzz-kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/hb-coretext.cc Wed Aug 13 09:43:34 2014 -+++ b/src/hb-coretext.cc Tue Dec 9 15:10:26 2014 -@@ -749,6 +749,8 @@ - - int level = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1; - CFNumberRef level_number = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &level); -+/* Marked as available in version 10.5 and later, but not in the header until SDK 10.6 */ -+ extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel; - CFDictionaryRef options = CFDictionaryCreate (kCFAllocatorDefault, - (const void **) &kCTTypesetterOptionForcedEmbeddingLevel, - (const void **) &level_number, - -Diff finished. Mon Dec 15 16:56:50 2014 diff --git a/modulesets/patches/itstool-config-python.patch b/modulesets/patches/itstool-config-python.patch deleted file mode 100644 index 592c37a..0000000 --- a/modulesets/patches/itstool-config-python.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -c /Users/john/configure\~ /Users/john/configure ---- a/configure Wed Jul 31 13:57:01 2019 -+++ b/configure Wed Jul 31 13:57:39 2019 -@@ -2377,7 +2377,7 @@ - $as_echo_n "(cached) " >&6 - else - -- for am_cv_pathless_PYTHON in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do -+ for am_cv_pathless_PYTHON in python3 python2 python python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do - test "$am_cv_pathless_PYTHON" = none && break - prog="import sys - # split strings by '.' and convert to numeric. Append some zeros - -Diff finished. Wed Jul 31 13:57:51 2019 diff --git a/modulesets/patches/itstool-memory-management.patch b/modulesets/patches/itstool-memory-management.patch deleted file mode 100644 index 1e4a219..0000000 --- a/modulesets/patches/itstool-memory-management.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 9b84c007a73e8275ca45762f1bfa3ab7c3a852e2 -Author: Shaun McCance -Date: Wed Oct 25 12:10:03 2017 -0400 - - Be more careful about libxml2 memory management - - I think this fixes https://github.com/itstool/itstool/issues/17 - -diff --git a/itstool.in b/itstool.in -index c1d0585..a16eba9 100755 ---- a/itstool.in -+++ b/itstool.in -@@ -477,6 +477,7 @@ class Document (object): - if load_dtd: - ctxt.loadSubset(1) - if keep_entities: -+ ctxt.loadSubset(1) - ctxt.ctxtUseOptions(libxml2.XML_PARSE_DTDLOAD) - ctxt.replaceEntities(0) - else: -@@ -1043,6 +1044,7 @@ class Document (object): - if self._load_dtd: - ctxt.loadSubset(1) - if self._keep_entities: -+ ctxt.loadSubset(1) - ctxt.ctxtUseOptions(libxml2.XML_PARSE_DTDLOAD) - ctxt.replaceEntities(0) - else: -@@ -1069,7 +1071,9 @@ class Document (object): - ph_node = msg.get_placeholder(child.name).node - if self.has_child_elements(ph_node): - self.merge_translations(translations, None, ph_node, strict=strict) -- child.replaceNode(ph_node) -+ newnode = ph_node.copyNode(1) -+ newnode.setTreeDoc(self._doc) -+ child.replaceNode(newnode) - else: - repl = self.get_translated(ph_node, translations, strict=strict, lang=lang) - child.replaceNode(repl) -@@ -1084,10 +1088,15 @@ class Document (object): - (lang + ' ') if lang is not None else '', - msgstr.encode('utf-8'))) - self._xml_err = '' -+ ctxt.doc().freeDoc() - return node - retnode = node.copyNode(2) -+ retnode.setTreeDoc(self._doc) - for child in xml_child_iter(trnode): -- retnode.addChild(child.copyNode(1)) -+ newnode = child.copyNode(1) -+ newnode.setTreeDoc(self._doc) -+ retnode.addChild(newnode) -+ - ctxt.doc().freeDoc() - return retnode - diff --git a/modulesets/patches/libgcrypt-1.10.2-no-getrandom.patch b/modulesets/patches/libgcrypt-1.10.2-no-getrandom.patch deleted file mode 100644 index a5cb48d..0000000 --- a/modulesets/patches/libgcrypt-1.10.2-no-getrandom.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/random/rndgetentropy.c 2023-04-03 01:22:26.000000000 -0700 -+++ b/random/rndgetentropy.c 2023-06-27 12:39:09.000000000 -0700 -@@ -81,6 +81,7 @@ - do - { - _gcry_pre_syscall (); -+#if HAVE_SYS_RANDOM - if (fips_mode ()) - { - /* DRBG chaining defined in SP 800-90A (rev 1) specify -@@ -98,6 +99,7 @@ - ret = getrandom (buffer, nbytes, GRND_RANDOM); - } - else -+#endif - { - nbytes = length < sizeof (buffer) ? length : sizeof (buffer); - ret = getentropy (buffer, nbytes); - -Diff finished. Tue Jun 27 16:00:41 2023 diff --git a/modulesets/patches/libgcrypt-cflags-for-cc-for-build.patch b/modulesets/patches/libgcrypt-cflags-for-cc-for-build.patch deleted file mode 100644 index 5931516..0000000 --- a/modulesets/patches/libgcrypt-cflags-for-cc-for-build.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/doc/Makefile.am Mon Feb 23 02:55:58 2015 -+++ b/doc/Makefile.am Fri Nov 13 15:59:27 2015 -@@ -42,7 +42,7 @@ - man_MANS = $(myman_pages) - - yat2m: yat2m.c -- $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c -+ $(CC_FOR_BUILD) $(CFLAGS) -o $@ $(srcdir)/yat2m.c - - .fig.png: - fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@ - -Diff finished. Fri Nov 13 16:00:03 2015 diff --git a/modulesets/patches/libglade-gmodule.patch b/modulesets/patches/libglade-gmodule.patch deleted file mode 100644 index 2bf5e37..0000000 --- a/modulesets/patches/libglade-gmodule.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/configure.in 2009-03-17 07:19:01.000000000 -0700 -+++ b/configure.in 2013-02-20 14:27:10.000000000 -0800 -@@ -46,7 +46,8 @@ - libxml-2.0 >= required_libxml_version dnl - atk >= required_atk_version dnl - gtk+-2.0 >= required_gtk_version dnl -- glib-2.0 >= required_glib_version]) -+ glib-2.0 >= required_glib_version dnl -+ gmodule-2.0]) - - AC_MSG_CHECKING([for native Win32]) - case "$host" in diff --git a/modulesets/patches/libgpg-error-cflags-for-cc-for-build.patch b/modulesets/patches/libgpg-error-cflags-for-cc-for-build.patch deleted file mode 100644 index 0c82d2c..0000000 --- a/modulesets/patches/libgpg-error-cflags-for-cc-for-build.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- b/src/Makefile.am Fri Nov 6 13:41:02 2015 -+++ b/src/Makefile.am Fri Nov 6 13:41:02 2015 -@@ -232,13 +232,13 @@ - # It is correct to use $(CC_FOR_BUILD) here. We want to run the - # program at build time. - mkerrcodes: mkerrcodes.c mkerrcodes.h Makefile -- $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c -+ $(CC_FOR_BUILD) -I. -I$(srcdir) $(CFLAGS) -o $@ $(srcdir)/mkerrcodes.c - - if HAVE_W32CE_SYSTEM - # It is correct to use $(CC_FOR_BUILD) here. We want to run the - # program at build time. - mkw32errmap: mkw32errmap.c mkw32errmap.tab.h Makefile -- $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c -+ $(CC_FOR_BUILD) -I. -I$(srcdir) $(CFLAGS) -o $@ $(srcdir)/mkw32errmap.c - endif - - code-from-errno.h: mkerrcodes Makefile -@@ -251,7 +251,7 @@ - - - mkheader: mkheader.c Makefile -- $(CC_FOR_BUILD) -g -O0 -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c -+ $(CC_FOR_BUILD) -g -O0 -I. -I$(srcdir) $(CFLAGS) -o $@ $(srcdir)/mkheader.c - - parts_of_gpg_error_h = \ - gpg-error.h.in \ ---- b/doc/Makefile.am Fri Nov 6 13:41:02 2015 -+++ b/doc/Makefile.am Fri Nov 6 13:41:02 2015 -@@ -35,7 +35,7 @@ - man_MANS = $(myman_pages) - - yat2m: yat2m.c -- $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c -+ $(CC_FOR_BUILD) $(CFLAGS) -o $@ $(srcdir)/yat2m.c - - - yat2m-stamp: $(myman_sources) - -Diff finished. Fri Nov 6 13:41:58 2015 diff --git a/modulesets/patches/libnettle-cc-for-build-needs-cflags.patch b/modulesets/patches/libnettle-cc-for-build-needs-cflags.patch deleted file mode 100644 index cf4a5ae..0000000 --- a/modulesets/patches/libnettle-cc-for-build-needs-cflags.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -c /Users/john/Development/Gramps-Build/gramps-41-git-Leopard/src/nettle-2.7.1/Makefile.in\~ /Users/john/Development/Gramps-Build/gramps-41-git-Leopard/src/nettle-2.7.1/Makefile.in ---- a/Makefile.in Tue May 28 07:21:53 2013 -+++ b/Makefile.in Sun Feb 22 15:31:18 2015 -@@ -229,27 +229,27 @@ - # executable. Avoid object file targets to make it easy to run the - # right compiler. - aesdata$(EXEEXT_FOR_BUILD): aesdata.c -- $(CC_FOR_BUILD) `test -f aesdata.c || echo '$(srcdir)/'`aesdata.c \ -+ $(CC_FOR_BUILD) $(CFLAGS) `test -f aesdata.c || echo '$(srcdir)/'`aesdata.c \ - -o aesdata$(EXEEXT_FOR_BUILD) - - desdata$(EXEEXT_FOR_BUILD): desdata.c -- $(CC_FOR_BUILD) `test -f desdata.c || echo '$(srcdir)/'`desdata.c \ -+ $(CC_FOR_BUILD) $(CFLAGS) `test -f desdata.c || echo '$(srcdir)/'`desdata.c \ - -o desdata$(EXEEXT_FOR_BUILD) - - twofishdata$(EXEEXT_FOR_BUILD): twofishdata.c -- $(CC_FOR_BUILD) `test -f twofishdata.c || echo '$(srcdir)/'`twofishdata.c \ -+ $(CC_FOR_BUILD) $(CFLAGS) `test -f twofishdata.c || echo '$(srcdir)/'`twofishdata.c \ - -o twofishdata$(EXEEXT_FOR_BUILD) - - shadata$(EXEEXT_FOR_BUILD): shadata.c -- $(CC_FOR_BUILD) `test -f shadata.c || echo '$(srcdir)/'`shadata.c -lm \ -+ $(CC_FOR_BUILD) $(CFLAGS) `test -f shadata.c || echo '$(srcdir)/'`shadata.c -lm \ - -o shadata$(EXEEXT_FOR_BUILD) - - gcmdata$(EXEEXT_FOR_BUILD): gcmdata.c -- $(CC_FOR_BUILD) `test -f gcmdata.c || echo '$(srcdir)/'`gcmdata.c \ -+ $(CC_FOR_BUILD) $(CFLAGS) `test -f gcmdata.c || echo '$(srcdir)/'`gcmdata.c \ - -o gcmdata$(EXEEXT_FOR_BUILD) - - eccdata$(EXEEXT_FOR_BUILD): eccdata.c mini-gmp.c mini-gmp.h -- $(CC_FOR_BUILD) `test -f eccdata.c || echo '$(srcdir)/'`eccdata.c \ -+ $(CC_FOR_BUILD) $(CFLAGS) `test -f eccdata.c || echo '$(srcdir)/'`eccdata.c \ - -o eccdata$(EXEEXT_FOR_BUILD) - - # desCore rules - -Diff finished. Sun Feb 22 15:31:34 2015 diff --git a/modulesets/patches/libnettle-cc-for-build-return.patch b/modulesets/patches/libnettle-cc-for-build-return.patch deleted file mode 100644 index b4d1baf..0000000 --- a/modulesets/patches/libnettle-cc-for-build-return.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure 2019-06-26 22:35:06.000000000 -0700 -+++ b/configure 2020-09-28 09:14:49.000000000 -0700 -@@ -4638,7 +4638,7 @@ - int - main () - { -- exit(0); -+ return(0); - } - EOF - gmp_compile="$CC_FOR_BUILD conftest.c" diff --git a/modulesets/patches/liboil-use-ac-config-headers-macro.patch b/modulesets/patches/liboil-use-ac-config-headers-macro.patch deleted file mode 100644 index 2eaceac..0000000 --- a/modulesets/patches/liboil-use-ac-config-headers-macro.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- liboil-0.3.17/configure.ac 2014-05-30 22:45:18.000000000 +0100 -+++ liboil-0.3.17/configure.ac 2014-05-30 22:45:33.000000000 +0100 -@@ -11,7 +11,7 @@ - #LIBOIL_MAJORMINOR=0.3 - #AC_SUBST(LIBOIL_MAJORMINOR) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS([config.h]) - - dnl CURRENT, REVISION, AGE - dnl - library source changed -> increment REVISION diff --git a/modulesets/patches/libsoup-python.patch b/modulesets/patches/libsoup-python.patch deleted file mode 100644 index c4d77bf..0000000 --- a/modulesets/patches/libsoup-python.patch +++ /dev/null @@ -1,9 +0,0 @@ -Remove build dependency on Python3 ---- libsoup/tld-parser.py.orig 2018-06-23 14:15:29.000000000 +0200 -+++ libsoup/tld-parser.py 2018-06-23 14:15:43.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#!/usr/bin/env python - - # Generate tld rules - # Copyright (C) 2012 Red Hat, Inc. diff --git a/modulesets/patches/libunique-663913-sockaddr-un.patch b/modulesets/patches/libunique-663913-sockaddr-un.patch deleted file mode 100644 index a46c118..0000000 --- a/modulesets/patches/libunique-663913-sockaddr-un.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 82526c33fac5e6d9ebf64b741f804fb3c604e691 Mon Sep 17 00:00:00 2001 -From: Philip Chimento -Date: Thu, 10 Nov 2011 23:20:08 +0100 -Subject: [PATCH] Don't use UNIX_PATH_MAX in struct sockaddr_un - -Use sizeof (uaddr.sun_path) in uniquebackend-bacon.c, since the -fixed value of UNIX_PATH_MAX is not portable and caused crashes on -OSX, for example. ---- - unique/bacon/uniquebackend-bacon.c | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/unique/bacon/uniquebackend-bacon.c b/unique/bacon/uniquebackend-bacon.c -index bf5e297..c762df5 100644 ---- a/unique/bacon/uniquebackend-bacon.c -+++ b/unique/bacon/uniquebackend-bacon.c -@@ -45,10 +45,6 @@ - #include "uniquemessage-bacon.h" - #include "uniquebackend-bacon.h" - --#ifndef UNIX_PATH_MAX --#define UNIX_PATH_MAX 108 --#endif -- - struct _UniqueBackendBacon - { - UniqueBackend parent_instance; -@@ -258,7 +254,7 @@ try_client (UniqueBackendBacon *backend) - - g_assert (backend->socket_path != NULL); - -- path_len = MIN (strlen (backend->socket_path) + 1, UNIX_PATH_MAX); -+ path_len = MIN (strlen (backend->socket_path) + 1, sizeof (uaddr.sun_path)); - - uaddr.sun_family = AF_UNIX; - strncpy (uaddr.sun_path, backend->socket_path, path_len); -@@ -289,7 +285,7 @@ create_server (UniqueBackendBacon *backend) - - g_assert (backend->socket_path != NULL); - -- path_len = MIN (strlen (backend->socket_path) + 1, UNIX_PATH_MAX); -+ path_len = MIN (strlen (backend->socket_path) + 1, sizeof (uaddr.sun_path)); - - uaddr.sun_family = AF_UNIX; - strncpy (uaddr.sun_path, backend->socket_path, path_len); --- -1.7.3.2 - diff --git a/modulesets/patches/nasm-2.16.01-warnings.c-needs-srcdir.patch b/modulesets/patches/nasm-2.16.01-warnings.c-needs-srcdir.patch deleted file mode 100644 index d34a0cb..0000000 --- a/modulesets/patches/nasm-2.16.01-warnings.c-needs-srcdir.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.in 2022-12-21 18:44:37.000000000 -0800 -+++ b/Makefile.in 2023-06-27 16:14:13.000000000 -0700 -@@ -697,7 +697,7 @@ - include/nasmint.h include/nasmlib.h include/nctype.h include/opflags.h \ - include/perfhash.h include/strlist.h include/tables.h include/warnings.h \ - x86/iflaggen.h x86/insnsi.h x86/regs.h --asm/warnings.$(O): asm/warnings.c config/config.h config/msvc.h \ -+asm/warnings.$(O): $(top_srcdir)asm/warnings.c config/config.h config/msvc.h \ - config/unconfig.h config/unknown.h config/watcom.h include/compiler.h \ - include/error.h include/nasmint.h include/warnings.h - common/common.$(O): common/common.c asm/directiv.h asm/pptok.h asm/preproc.h \ - -Diff finished. Tue Jun 27 16:14:20 2023 diff --git a/modulesets/patches/p11-kit-dirfd.patch b/modulesets/patches/p11-kit-dirfd.patch deleted file mode 100644 index fd7a13f..0000000 --- a/modulesets/patches/p11-kit-dirfd.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -c /Users/john/Development/gtk-sources/p11-kit-0.22.1/common/compat.c\~ /Users/john/Development/gtk-sources/p11-kit-0.22.1/common/compat.c ---- a/common/compat.c~ Sun Oct 5 22:29:32 2014 -+++ b/common/compat.c Fri Feb 20 12:48:53 2015 -@@ -918,7 +918,11 @@ - - /* didn't parse or is the opendir() fd */ - if (!end || *end != '\0' || -+#if defined(__APPLE__) -+ (int)num == dir->__dd_fd) -+#else - (int)num == dirfd (dir)) -+#endif - continue; - - fd = num; - -Diff finished. Sun Feb 22 13:37:16 2015 diff --git a/modulesets/patches/pango-ct-font-fallback.patch b/modulesets/patches/pango-ct-font-fallback.patch new file mode 100644 index 0000000..f0a872c --- /dev/null +++ b/modulesets/patches/pango-ct-font-fallback.patch @@ -0,0 +1,44 @@ +diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c +index 7eb00113..983e6fcb 100644 +--- a/pango/pangocoretext-fontmap.c ++++ b/pango/pangocoretext-fontmap.c +@@ -1538,6 +1538,15 @@ pango_core_text_font_map_init (PangoCoreTextFontMap *ctfontmap) + g_hash_table_insert (ctfontmap->families, + g_utf8_casefold (family->family_name, -1), family); + } ++ /* Insert .AppleSystemUIFont because it isn't included in the result ++ * set from CTFontCollectionCreateFromAvailableFonts. If it's not ++ * included in the families fontset it can't be used to render text. ++ */ ++ family = g_object_new (PANGO_TYPE_CORE_TEXT_FAMILY, NULL); ++ family->family_name = g_strdup (".AppleSystemUIFont"); ++ g_hash_table_insert (ctfontmap->families, ++ g_utf8_casefold (family->family_name, -1), family); ++ + } + + static PangoFontFace * +--- a/pango/pangocoretext.c ++++ b/pango/pangocoretext.c +@@ -82,6 +82,7 @@ ct_font_descriptor_get_coverage (CTFontDescriptorRef desc) + const UInt8 *ptr, *plane_ptr; + const UInt32 plane_size = 8192; + PangoCoverage *coverage; ++ CFStringRef font_name; + + coverage = pango_coverage_new (); + +@@ -89,6 +90,13 @@ ct_font_descriptor_get_coverage (CTFontDescriptorRef desc) + if (!charset) + /* Return an empty coverage */ + return coverage; ++ /* .AppleSymbols Fallback's CTFontDescriptor has a host of members ++ * but the font appears to have no glyphs so return an empty ++ * coverage. ++ */ ++ font_name = (CFStringRef)CTFontDescriptorCopyAttribute(desc, kCTFontNameAttribute); ++ if (CFStringCompare(font_name, CFSTR(".AppleSymbolsFB"), 0) == kCFCompareEqualTo) ++ return coverage; + + bitmap = CFCharacterSetCreateBitmapRepresentation (kCFAllocatorDefault, + charset); diff --git a/modulesets/patches/pangomm3-missing-include.patch b/modulesets/patches/pangomm3-missing-include.patch new file mode 100644 index 0000000..cae8551 --- /dev/null +++ b/modulesets/patches/pangomm3-missing-include.patch @@ -0,0 +1,12 @@ +--- a/untracked/pango/pangomm/attrlist.cc 2020-12-13 06:11:13 ++++ b/untracked/pango/pangomm/attrlist.cc 2024-06-01 15:38:43 +@@ -30,6 +30,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#include + namespace Pango + { + + + diff --git a/modulesets/patches/pkgconf-link-pkg-config.patch b/modulesets/patches/pkgconf-link-pkg-config.patch new file mode 100644 index 0000000..0885842 --- /dev/null +++ b/modulesets/patches/pkgconf-link-pkg-config.patch @@ -0,0 +1,10 @@ +--- a/meson.build 2024-03-27 11:39:43 ++++ b/meson.build 2024-05-15 20:48:07 +@@ -131,6 +131,7 @@ + c_args: build_static, + install : true) + ++install_symlink('pkg-config', install_dir : 'bin', pointing_to : pkgconf_exe.full_path()) + with_tests = get_option('tests') + kyua_exe = find_program('kyua', required : with_tests, disabler : true) + atf_sh_exe = find_program('atf-sh', required : with_tests, disabler : true) diff --git a/modulesets/patches/py2cairo-python2.6-Dont-try-to-guess-arch.patch b/modulesets/patches/py2cairo-python2.6-Dont-try-to-guess-arch.patch deleted file mode 100644 index e885f3f..0000000 --- a/modulesets/patches/py2cairo-python2.6-Dont-try-to-guess-arch.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/wscript 2015-04-12 20:24:07.000000000 -0700 -+++ b/src/wscript 2015-04-12 20:37:47.000000000 -0700 -@@ -18,7 +18,7 @@ - ) - - # C extension module -- ctx( -+ shlibctx = ctx( - features = 'c cshlib pyext', - source = ['cairomodule.c', - 'context.c', -@@ -34,6 +34,16 @@ - install_path = pycairoLibDir, - ) - -+ # Remove all -arch flags; apparently we know better than waf what architecture -+ # we should be building for -+ for var in ['CFLAGS_PYEMBED', 'CFLAGS_PYEXT', 'CXXFLAGS_PYEMBED', -+ 'CXXFLAGS_PYEXT', 'LINKFLAGS_PYEMBED', 'LINKFLAGS_PYEXT']: -+ newvar = [] -+ for ix, arg in enumerate(shlibctx.env[var]): -+ if '-arch' not in (arg, shlibctx.env[var][ix - 1]): -+ newvar.append(arg) -+ shlibctx.env[var] = newvar -+ - # C API - ctx.install_files(os.path.join(ctx.env['PREFIX'], 'include', 'pycairo'), - 'pycairo.h') diff --git a/modulesets/patches/pygobject-gdesktopappinfo-missing.patch b/modulesets/patches/pygobject-gdesktopappinfo-missing.patch deleted file mode 100644 index 6d7e6a2..0000000 --- a/modulesets/patches/pygobject-gdesktopappinfo-missing.patch +++ /dev/null @@ -1,348 +0,0 @@ -diff --git a/gio/Makefile.am b/gio/Makefile.am -index 6b3eb57a..b7380c04 100644 ---- a/gio/Makefile.am -+++ b/gio/Makefile.am -@@ -36,8 +36,6 @@ EXTRA_DIST = - # gio module - GIO_OVERRIDES = \ - gio.override \ -- gappinfo.override \ -- gapplaunchcontext.override \ - gbufferedinputstream.override \ - gcancellable.override \ - gdatainputstream.override \ -diff --git a/gio/gio.defs b/gio/gio.defs -index f5a28b6d..694b63cb 100644 ---- a/gio/gio.defs -+++ b/gio/gio.defs -@@ -2,194 +2,6 @@ - - (include "gio-types.defs") - --;; From gappinfo.h -- --(define-function app_info_get_type -- (c-name "g_app_info_get_type") -- (return-type "GType") --) -- --(define-function app_launch_context_get_type -- (c-name "g_app_launch_context_get_type") -- (return-type "GType") --) -- --(define-function app_info_create_from_commandline -- (c-name "g_app_info_create_from_commandline") -- (is-constructor-of "GAppInfo") -- (return-type "GAppInfo*") -- (parameters -- '("const-char*" "commandline") -- '("const-char*" "application_name" (null-ok) (default "NULL")) -- '("GAppInfoCreateFlags" "flags" (default "G_APP_INFO_CREATE_NONE")) -- '("GError**" "error") -- ) --) -- --(define-method dup -- (of-object "GAppInfo") -- (c-name "g_app_info_dup") -- (return-type "GAppInfo*") -- (caller-owns-return #t) --) -- --(define-method equal -- (of-object "GAppInfo") -- (c-name "g_app_info_equal") -- (return-type "gboolean") -- (parameters -- '("GAppInfo*" "appinfo2") -- ) --) -- --(define-method get_id -- (of-object "GAppInfo") -- (c-name "g_app_info_get_id") -- (return-type "const-char*") --) -- --(define-method get_name -- (of-object "GAppInfo") -- (c-name "g_app_info_get_name") -- (return-type "const-char*") --) -- --(define-method get_description -- (of-object "GAppInfo") -- (c-name "g_app_info_get_description") -- (return-type "const-char*") --) -- --(define-method get_executable -- (of-object "GAppInfo") -- (c-name "g_app_info_get_executable") -- (return-type "const-char*") --) -- --(define-method get_icon -- (of-object "GAppInfo") -- (c-name "g_app_info_get_icon") -- (return-type "GIcon*") --) -- --;; --;; wrapped in gappinfo.override --;; --(define-method launch -- (docstring -- "launch (files=None, launch_context=None) -> gboolean\n" -- "\n" -- "Launches the application. Passes files to the launched application\n" -- "as arguments, using the optional launch_context to get information\n" -- "about the details of the launcher (like what screen it is on).\n" -- "On error, error will be set accordingly.\n\n" -- "Note that even if the launch is successful the application launched\n" -- "can fail to start if it runs into problems during startup.\n" -- "There is no way to detect this.\n\n" -- "Some URIs can be changed when passed through a gio.File\n" -- "(for instance unsupported uris with strange formats like mailto:),\n" -- "so if you have a textual uri you want to pass in as argument,\n" -- "consider using gio.AppInfo.launch_uris() instead." -- ) -- (of-object "GAppInfo") -- (c-name "g_app_info_launch") -- (return-type "gboolean") -- (parameters -- '("GList*" "files") -- '("GAppLaunchContext*" "launch_context") -- '("GError**" "error") -- ) --) -- --(define-method supports_uris -- (of-object "GAppInfo") -- (c-name "g_app_info_supports_uris") -- (return-type "gboolean") --) -- --(define-method supports_files -- (of-object "GAppInfo") -- (c-name "g_app_info_supports_files") -- (return-type "gboolean") --) -- --;; --;; wrapped in gappinfo.override --;; --(define-method launch_uris -- (docstring -- "launch_uris (files=None, launch_context=None) -> gboolean\n" -- "\n" -- "Launches the application. Passes files to the launched application\n" -- "as arguments, using the optional launch_context to get information\n" -- "about the details of the launcher (like what screen it is on).\n" -- "On error, error will be set accordingly.\n\n" -- "Note that even if the launch is successful the application launched\n" -- "can fail to start if it runs into problems during startup.\n" -- "There is no way to detect this.\n\n" -- ) -- (of-object "GAppInfo") -- (c-name "g_app_info_launch_uris") -- (return-type "gboolean") -- (parameters -- '("GList*" "uris") -- '("GAppLaunchContext*" "launch_context") -- '("GError**" "error") -- ) --) -- --(define-method should_show -- (of-object "GAppInfo") -- (c-name "g_app_info_should_show") -- (return-type "gboolean") --) -- --(define-method set_as_default_for_type -- (of-object "GAppInfo") -- (c-name "g_app_info_set_as_default_for_type") -- (return-type "gboolean") -- (parameters -- '("const-char*" "content_type") -- '("GError**" "error") -- ) --) -- --(define-method set_as_default_for_extension -- (of-object "GAppInfo") -- (c-name "g_app_info_set_as_default_for_extension") -- (return-type "gboolean") -- (parameters -- '("const-char*" "extension") -- '("GError**" "error") -- ) --) -- --(define-method add_supports_type -- (of-object "GAppInfo") -- (c-name "g_app_info_add_supports_type") -- (return-type "gboolean") -- (parameters -- '("const-char*" "content_type") -- '("GError**" "error") -- ) --) -- --(define-method can_remove_supports_type -- (of-object "GAppInfo") -- (c-name "g_app_info_can_remove_supports_type") -- (return-type "gboolean") --) -- --(define-method remove_supports_type -- (of-object "GAppInfo") -- (c-name "g_app_info_remove_supports_type") -- (return-type "gboolean") -- (parameters -- '("const-char*" "content_type") -- '("GError**" "error") -- ) --) -- - ;; - ;; wrapped in gio.override - ;; -@@ -209,55 +21,12 @@ - ) - ) - --(define-function app_info_get_default_for_type -- (c-name "g_app_info_get_default_for_type") -- (return-type "GAppInfo*") -- (parameters -- '("const-char*" "content_type") -- '("gboolean" "must_support_uris") -- ) --) -- --(define-function app_info_get_default_for_uri_scheme -- (c-name "g_app_info_get_default_for_uri_scheme") -- (return-type "GAppInfo*") -- (parameters -- '("const-char*" "uri_scheme") -- ) --) -- - (define-function app_launch_context_new - (c-name "g_app_launch_context_new") - (is-constructor-of "GAppLaunchContext") - (return-type "GAppLaunchContext*") - ) - --;; --;; wrapped in gapplaunchcontext.override --;; --(define-method get_display -- (of-object "GAppLaunchContext") -- (c-name "g_app_launch_context_get_display") -- (return-type "char*") -- (parameters -- '("GAppInfo*" "info") -- '("GList*" "files") -- ) --) -- --;; --;; wrapped in gapplaunchcontext.override --;; --(define-method get_startup_notify_id -- (of-object "GAppLaunchContext") -- (c-name "g_app_launch_context_get_startup_notify_id") -- (return-type "char*") -- (parameters -- '("GAppInfo*" "info") -- '("GList*" "files") -- ) --) -- - (define-method launch_failed - (of-object "GAppLaunchContext") - (c-name "g_app_launch_context_launch_failed") -@@ -275,25 +44,6 @@ - ) - ) - --(define-method can_delete -- (of-object "GAppInfo") -- (c-name "g_app_info_can_delete") -- (return-type "gboolean") --) -- --(define-method delete -- (of-object "GAppInfo") -- (c-name "g_app_info_delete") -- (return-type "gboolean") --) -- --(define-method get_commandline -- (of-object "GAppInfo") -- (c-name "g_app_info_get_commandline") -- (return-type "const-char*") --) -- -- - - ;; From gasyncinitable.h - -diff --git a/gio/unix-types.defs b/gio/unix-types.defs -index ed1ed9f1..3f51436c 100644 ---- a/gio/unix-types.defs -+++ b/gio/unix-types.defs -@@ -7,18 +7,6 @@ - (gtype-id "G_TYPE_UNIX_CONNECTION") - ) - --(define-object DesktopAppInfo -- (docstring -- "DesktopAppInfo(desktop_id) -> gio.unix.DesktopAppInfo\n\n" -- "gio.Unix.DesktopAppInfo is an implementation of gio.AppInfo\n" -- "based on desktop files." -- ) -- (in-module "giounix") -- (parent "GObject") -- (c-name "GDesktopAppInfo") -- (gtype-id "G_TYPE_DESKTOP_APP_INFO") --) -- - (define-object FDMessage - (in-module "giounix") - (parent "GSocketControlMessage") -diff --git a/gio/unix.override b/gio/unix.override -index aebc6fca..08e27e92 100644 ---- a/gio/unix.override -+++ b/gio/unix.override -@@ -24,7 +24,6 @@ headers - #define NO_IMPORT_PYGOBJECT - #include - #include --#include - #include - #include - #include ---- a/gio/unix.c 2021-04-01 18:13:18.000000000 -0700 -+++ b/gio/unix.c 2021-04-01 18:20:45.000000000 -0700 -@@ -648,6 +648,7 @@ - static PyObject * - _wrap_g_desktop_app_info_set_desktop_env(PyObject *self, PyObject *args, PyObject *kwargs) - { -+#ifndef __APPLE__ - static char *kwlist[] = { "desktop_env", NULL }; - char *desktop_env; - -@@ -655,7 +656,7 @@ - return NULL; - - g_desktop_app_info_set_desktop_env(desktop_env); -- -+#endif - Py_INCREF(Py_None); - return Py_None; - } diff --git a/modulesets/patches/pygtk-libtool.patch b/modulesets/patches/pygtk-libtool.patch deleted file mode 100644 index 31c03ad..0000000 --- a/modulesets/patches/pygtk-libtool.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/Makefile.in 2011-04-01 03:41:04.000000000 -0700 -+++ b/Makefile.in 2011-10-25 15:18:34.000000000 -0700 -@@ -414,7 +414,7 @@ - ATK_OVERRIDES = atk.override atkrectangle.override - atk_la_CFLAGS = $(ATK_CFLAGS) - atk_la_LIBADD = $(ATK_LIBS) --atk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initatk -+atk_la_LDFLAGS = $(common_ldflags) -export_symbol initatk - atk_la_SOURCES = atkmodule.c - nodist_atk_la_SOURCES = atk.c - -@@ -422,14 +422,14 @@ - PANGO_DEFS = pango.defs pango-types.defs - pango_la_CFLAGS = $(PANGO_CFLAGS) - pango_la_LIBADD = $(PANGO_LIBS) --pango_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initpango -+pango_la_LDFLAGS = $(common_ldflags) -export_symbol initpango - pango_la_SOURCES = pangomodule.c - nodist_pango_la_SOURCES = pango.c - - # pangocairo module - PANGOCAIRO_DEFS = pangocairo.defs pangocairo.override - pangocairo_la_CFLAGS = $(PYCAIRO_CFLAGS) $(PANGOCAIRO_CFLAGS) --pangocairo_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initpangocairo -+pangocairo_la_LDFLAGS = $(common_ldflags) -export_symbol initpangocairo - pangocairo_la_LIBADD = $(PANGOCAIRO_LIBS) - pangocairo_la_SOURCES = pangocairomodule.c - nodist_pangocairo_la_SOURCES = pangocairo.c ---- a/gtk/Makefile.in 2011-04-01 03:41:04.000000000 -0700 -+++ b/gtk/Makefile.in 2011-10-25 15:18:55.000000000 -0700 -@@ -443,7 +443,7 @@ - gtkwindow.override - - _gtk_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTK_CFLAGS) $(am__append_33) --_gtk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk -+_gtk_la_LDFLAGS = $(common_ldflags) -export_symbol init_gtk - _gtk_la_LIBADD = $(GTK_LIBS) - _gtk_la_SOURCES = \ - gtk-types.c \ -@@ -462,12 +462,12 @@ - LIBGLADE_DEFS = libglade.defs - glade_la_CFLAGS = $(LIBGLADE_CFLAGS) - glade_la_LIBADD = $(LIBGLADE_LIBS) --glade_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initglade -+glade_la_LDFLAGS = $(common_ldflags) -export_symbol initglade - glade_la_SOURCES = libglademodule.c - nodist_glade_la_SOURCES = libglade.c - gtkunixprint_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTKUNIXPRINT_CFLAGS) - gtkunixprint_la_LIBADD = $(GTKUNIXPRINT_LIBS) --gtkunixprint_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initgtkunixprint -+gtkunixprint_la_LDFLAGS = $(common_ldflags) -export_symbol initgtkunixprint - gtkunixprint_la_SOURCES = gtkunixprintmodule.c - nodist_gtkunixprint_la_SOURCES = gtkunixprint.c - @BUILD_GTKUNIXPRINT_TRUE@pkgpyexec_LTLIBRARIES = gtkunixprint.la diff --git a/modulesets/patches/pygtk-pango-decls.patch b/modulesets/patches/pygtk-pango-decls.patch deleted file mode 100644 index 4dcfdb2..0000000 --- a/modulesets/patches/pygtk-pango-decls.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/pango.override 2011-04-01 03:37:25.000000000 -0700 -+++ b/pango.override 2021-04-02 11:54:31.000000000 -0700 -@@ -31,6 +31,9 @@ - PyObject *func, *data; - } PyGtkCustomNotify; - -+extern PangoFontMetrics* pango_font_metrics_new(void); -+extern const char* pango_font_map_get_shape_engine_type(PangoFontMap*); -+ - #ifndef PANGO_TYPE_LAYOUT_LINE - # define PANGO_TYPE_LAYOUT_LINE pypango_layout_line_get_type() - diff --git a/modulesets/patches/pygtk-pango1.4x.patch b/modulesets/patches/pygtk-pango1.4x.patch deleted file mode 100644 index ba4141e..0000000 --- a/modulesets/patches/pygtk-pango1.4x.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 877164b6b70780468a31d8211f29421b6f34b0c8 Mon Sep 17 00:00:00 2001 -From: Mathieu Bridon -Date: Thu, 24 Oct 2019 22:58:36 +0200 -Subject: [PATCH] Drop the PangoFont find_shaper virtual method - -This API has been removed from Pango 1.44.6, because it was completely -unused by anything. - -However, PyGTK tries to bind everything, even unused API. - -Removing this from PyGTK means we can build it against the latest Pango -again. ---- - pango.defs | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/pango.defs b/pango.defs -index 2a79ecc..862667a 100644 ---- a/pango.defs -+++ b/pango.defs -@@ -1391,15 +1391,6 @@ - ) - ) - --(define-virtual find_shaper -- (of-object "PangoFont") -- (return-type "PangoEngineShape*") -- (parameters -- '("PangoLanguage*" "lang") -- '("guint32" "ch") -- ) --) -- - (define-virtual get_glyph_extents - (of-object "PangoFont") - (return-type "none") --- -2.21.0 - diff --git a/modulesets/patches/python-issue27806_v3.patch b/modulesets/patches/python-issue27806_v3.patch deleted file mode 100644 index 1416bc8..0000000 --- a/modulesets/patches/python-issue27806_v3.patch +++ /dev/null @@ -1,1187 +0,0 @@ -From d1edd74106eefb62361a9d8b0de353822284a074 Mon Sep 17 00:00:00 2001 -From: sashk -Date: Fri, 16 Sep 2016 09:08:45 -0400 -Subject: [PATCH] Fix 32-bit builds on macOS Sierra 10.12. - -Due to depricated QuickTime/QuickTime.h in macOS Sierra 10.12, 32-bit Python 2.7 builds were broken. - -Fixes issue27806. ---- - Include/pymactoolbox.h | 63 ++++++++++++++++++++------------ - Mac/Modules/ColorPickermodule.c | 9 ++--- - Mac/Modules/MacOS.c | 12 +++--- - Mac/Modules/OSATerminology.c | 8 ++-- - Mac/Modules/app/_Appmodule.c | 14 +++---- - Mac/Modules/carbonevt/_CarbonEvtmodule.c | 16 ++++---- - Mac/Modules/ctl/_Ctlmodule.c | 17 ++++----- - Mac/Modules/dlg/_Dlgmodule.c | 14 +++---- - Mac/Modules/drag/_Dragmodule.c | 14 +++---- - Mac/Modules/help/_Helpmodule.c | 21 +++++------ - Mac/Modules/ibcarbon/_IBCarbon.c | 18 ++++----- - Mac/Modules/icn/_Icnmodule.c | 18 ++++----- - Mac/Modules/list/_Listmodule.c | 23 ++++++------ - Mac/Modules/mlte/_Mltemodule.c | 19 +++++----- - Mac/Modules/qt/_Qtmodule.c | 18 ++++----- - Mac/Modules/te/_TEmodule.c | 18 ++++----- - Mac/Modules/win/_Winmodule.c | 22 +++++------ - Python/mactoolboxglue.c | 8 ++-- - 18 files changed, 167 insertions(+), 165 deletions(-) - -diff --git a/Include/pymactoolbox.h b/Include/pymactoolbox.h -index fd15975..e0a0316 100644 ---- a/Include/pymactoolbox.h -+++ b/Include/pymactoolbox.h -@@ -9,9 +9,24 @@ - - #include - --#ifndef __LP64__ -+/* -+** Workaround for gcc 4.2 on OS X 10.5 and 10.6, which don't have __has_include defined. -+*/ -+#ifndef __has_include -+#define __has_include(x) 0 -+#endif -+/* Workaround */ -+ -+#if __has_include() -+#include -+#define APPLE_SUPPORTS_QUICKTIME (__MAC_OS_X_VERSION_MAX_ALLOWED < 101200) && !__LP64__ -+#else -+#define APPLE_SUPPORTS_QUICKTIME !__LP64__ -+#endif -+ -+#if APPLE_SUPPORTS_QUICKTIME - #include --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* - ** Helper routines for error codes and such. -@@ -21,10 +36,10 @@ extern PyObject *PyMac_OSErrException; /* Exception for OSErr */ - PyObject *PyMac_GetOSErrException(void); /* Initialize & return it */ - PyObject *PyErr_Mac(PyObject *, int); /* Exception with a mac error */ - PyObject *PyMac_Error(OSErr); /* Uses PyMac_GetOSErrException */ --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert - fsspec->path */ --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* - ** These conversion routines are defined in mactoolboxglue.c itself. -@@ -109,54 +124,54 @@ extern PyObject *CmpInstObj_New(ComponentInstance); - extern int CmpInstObj_Convert(PyObject *, ComponentInstance *); - - /* Ctl exports */ --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - extern PyObject *CtlObj_New(ControlHandle); - extern int CtlObj_Convert(PyObject *, ControlHandle *); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* Dlg exports */ --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - extern PyObject *DlgObj_New(DialogPtr); - extern int DlgObj_Convert(PyObject *, DialogPtr *); - extern PyObject *DlgObj_WhichDialog(DialogPtr); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* Drag exports */ --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - extern PyObject *DragObj_New(DragReference); - extern int DragObj_Convert(PyObject *, DragReference *); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* List exports */ --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - extern PyObject *ListObj_New(ListHandle); - extern int ListObj_Convert(PyObject *, ListHandle *); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* Menu exports */ --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - extern PyObject *MenuObj_New(MenuHandle); - extern int MenuObj_Convert(PyObject *, MenuHandle *); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* Qd exports */ --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - extern PyObject *GrafObj_New(GrafPtr); - extern int GrafObj_Convert(PyObject *, GrafPtr *); - extern PyObject *BMObj_New(BitMapPtr); - extern int BMObj_Convert(PyObject *, BitMapPtr *); - extern PyObject *QdRGB_New(RGBColor *); - extern int QdRGB_Convert(PyObject *, RGBColor *); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* Qdoffs exports */ --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - extern PyObject *GWorldObj_New(GWorldPtr); - extern int GWorldObj_Convert(PyObject *, GWorldPtr *); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* Qt exports */ --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - extern PyObject *TrackObj_New(Track); - extern int TrackObj_Convert(PyObject *, Track *); - extern PyObject *MovieObj_New(Movie); -@@ -169,7 +184,7 @@ extern PyObject *UserDataObj_New(UserData); - extern int UserDataObj_Convert(PyObject *, UserData *); - extern PyObject *MediaObj_New(Media); - extern int MediaObj_Convert(PyObject *, Media *); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* Res exports */ - extern PyObject *ResObj_New(Handle); -@@ -178,17 +193,17 @@ extern PyObject *OptResObj_New(Handle); - extern int OptResObj_Convert(PyObject *, Handle *); - - /* TE exports */ --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - extern PyObject *TEObj_New(TEHandle); - extern int TEObj_Convert(PyObject *, TEHandle *); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* Win exports */ --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - extern PyObject *WinObj_New(WindowPtr); - extern int WinObj_Convert(PyObject *, WindowPtr *); - extern PyObject *WinObj_WhichWindow(WindowPtr); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* CF exports */ - extern PyObject *CFObj_New(CFTypeRef); -diff --git a/Mac/Modules/ColorPickermodule.c b/Mac/Modules/ColorPickermodule.c -index 688c468..060ce24 100644 ---- a/Mac/Modules/ColorPickermodule.c -+++ b/Mac/Modules/ColorPickermodule.c -@@ -28,7 +28,7 @@ PERFORMANCE OF THIS SOFTWARE. - /* ----------------------------------------------------- */ - - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - - static char cp_GetColor__doc__[] = - "GetColor(prompt, (r, g, b)) -> (r, g, b), ok" -@@ -49,14 +49,14 @@ cp_GetColor(PyObject *self, PyObject *args) - - return Py_BuildValue("O&h", QdRGB_New, &outColor, ok); - } --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* List of methods defined in the module */ - - static struct PyMethodDef cp_methods[] = { --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - {"GetColor", (PyCFunction)cp_GetColor, METH_VARARGS, cp_GetColor__doc__}, --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - {NULL, (PyCFunction)NULL, 0, NULL} /* sentinel */ - }; - -@@ -87,4 +87,3 @@ void initColorPicker(void) - if (PyErr_Occurred()) - Py_FatalError("can't initialize module ColorPicker"); - } -- -diff --git a/Mac/Modules/MacOS.c b/Mac/Modules/MacOS.c -index 28de4f5..83c203d 100644 ---- a/Mac/Modules/MacOS.c -+++ b/Mac/Modules/MacOS.c -@@ -299,7 +299,7 @@ MacOS_GetCreatorAndType(PyObject *self, PyObject *args) - FileInfo* finfo; - - if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSRef, &ref)) { --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - /* This function is documented to take an FSSpec as well, - * which only works in 32-bit mode. - */ -@@ -324,9 +324,9 @@ MacOS_GetCreatorAndType(PyObject *self, PyObject *args) - Py_DECREF(creator); - Py_DECREF(type); - return res; --#else /* __LP64__ */ -+#else /* APPLE_SUPPORTS_QUICKTIME */ - return NULL; --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - err = FSGetCatalogInfo(&ref, -@@ -372,7 +372,7 @@ MacOS_SetCreatorAndType(PyObject *self, PyObject *args) - - if (!PyArg_ParseTuple(args, "O&O&O&", - PyMac_GetFSRef, &ref, PyMac_GetOSType, &creator, PyMac_GetOSType, &type)) { --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - /* Try to handle FSSpec arguments, for backward compatibility */ - FSSpec fss; - FInfo info; -@@ -391,9 +391,9 @@ MacOS_SetCreatorAndType(PyObject *self, PyObject *args) - return PyErr_Mac(MacOS_Error, err); - Py_INCREF(Py_None); - return Py_None; --#else /* __LP64__ */ -+#else /* APPLE_SUPPORTS_QUICKTIME */ - return NULL; --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - err = FSGetCatalogInfo(&ref, -diff --git a/Mac/Modules/OSATerminology.c b/Mac/Modules/OSATerminology.c -index 2114d07..ce924a4 100644 ---- a/Mac/Modules/OSATerminology.c -+++ b/Mac/Modules/OSATerminology.c -@@ -14,7 +14,7 @@ - - #include - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - static PyObject * - PyOSA_GetAppTerminology(PyObject* self, PyObject* args) - { -@@ -73,14 +73,14 @@ PyOSA_GetSysTerminology(PyObject* self, PyObject* args) - if (err) return PyMac_Error(err); - return Py_BuildValue("O&", AEDesc_New, &theDesc); - } --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* - * List of methods defined in the module - */ - static struct PyMethodDef OSATerminology_methods[] = - { --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - {"GetAppTerminology", - (PyCFunction) PyOSA_GetAppTerminology, - METH_VARARGS, -@@ -89,7 +89,7 @@ static struct PyMethodDef OSATerminology_methods[] = - (PyCFunction) PyOSA_GetSysTerminology, - METH_VARARGS, - "Get the AppleScript language's terminology. GetSysTerminology() --> AEDesc"}, --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - {NULL, (PyCFunction) NULL, 0, NULL} - }; - -diff --git a/Mac/Modules/app/_Appmodule.c b/Mac/Modules/app/_Appmodule.c -index c791807..a175fae 100644 ---- a/Mac/Modules/app/_Appmodule.c -+++ b/Mac/Modules/app/_Appmodule.c -@@ -2,13 +2,11 @@ - /* ========================== Module _App =========================== */ - - #include "Python.h" -+#include "pymactoolbox.h" - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - /* Carbon GUI stuff, not available in 64-bit mode */ - -- --#include "pymactoolbox.h" -- - /* Macro to test whether a weak-loaded CFM function exists */ - #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ - PyErr_SetString(PyExc_NotImplementedError, \ -@@ -1806,13 +1804,13 @@ static PyMethodDef App_methods[] = { - void init_App(void) - { - PyObject *m; --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - PyObject *d; --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - - m = Py_InitModule("_App", App_methods); --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - d = PyModule_GetDict(m); - App_Error = PyMac_GetOSErrException(); - if (App_Error == NULL || -@@ -1825,7 +1823,7 @@ void init_App(void) - /* Backward-compatible name */ - Py_INCREF(&ThemeDrawingState_Type); - PyModule_AddObject(m, "ThemeDrawingStateType", (PyObject *)&ThemeDrawingState_Type); --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - /* ======================== End module _App ========================= */ -diff --git a/Mac/Modules/carbonevt/_CarbonEvtmodule.c b/Mac/Modules/carbonevt/_CarbonEvtmodule.c -index 30d40c9..2323a14 100644 ---- a/Mac/Modules/carbonevt/_CarbonEvtmodule.c -+++ b/Mac/Modules/carbonevt/_CarbonEvtmodule.c -@@ -2,10 +2,10 @@ - /* ======================= Module _CarbonEvt ======================== */ - - #include "Python.h" -+#include "pymactoolbox.h" - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - --#include "pymactoolbox.h" - - /* Macro to test whether a weak-loaded CFM function exists */ - #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ -@@ -2128,27 +2128,27 @@ static PyMethodDef CarbonEvents_methods[] = { - {NULL, NULL, 0} - }; - --#else /* __LP64__ */ -+#else /* APPLE_SUPPORTS_QUICKTIME */ - - static PyMethodDef CarbonEvents_methods[] = { - {NULL, NULL, 0} - }; - --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - - - void init_CarbonEvt(void) - { - PyObject *m; --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - PyObject *d; --#endif /* !__LP64__ */ -+#endif /* !APPLE_SUPPORTS_QUICKTIME */ - - - m = Py_InitModule("_CarbonEvt", CarbonEvents_methods); - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - myEventHandlerUPP = NewEventHandlerUPP(myEventHandler); - d = PyModule_GetDict(m); - CarbonEvents_Error = PyMac_GetOSErrException(); -@@ -2211,7 +2211,7 @@ void init_CarbonEvt(void) - /* Backward-compatible name */ - Py_INCREF(&EventHotKeyRef_Type); - PyModule_AddObject(m, "EventHotKeyRefType", (PyObject *)&EventHotKeyRef_Type); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - /* ===================== End module _CarbonEvt ====================== */ -diff --git a/Mac/Modules/ctl/_Ctlmodule.c b/Mac/Modules/ctl/_Ctlmodule.c -index a959eb4..e06a25f 100644 ---- a/Mac/Modules/ctl/_Ctlmodule.c -+++ b/Mac/Modules/ctl/_Ctlmodule.c -@@ -2,11 +2,11 @@ - /* ========================== Module _Ctl =========================== */ - - #include "Python.h" -+#include "pymactoolbox.h" - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - - --#include "pymactoolbox.h" - - /* Macro to test whether a weak-loaded CFM function exists */ - #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ -@@ -5766,19 +5766,19 @@ mytrackingproc(ControlHandle control, Point startPt, ControlActionUPP actionProc - return (ControlPartCode)c_rv; - } - --#else /* __LP64__ */ -+#else /* APPLE_SUPPORTS_QUICKTIME */ - - static PyMethodDef Ctl_methods[] = { - {NULL, NULL, 0} - }; - --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - void init_Ctl(void) - { - PyObject *m; - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - PyObject *d; - - mytracker_upp = NewControlActionUPP(mytracker); -@@ -5791,11 +5791,11 @@ void init_Ctl(void) - mytrackingproc_upp = NewControlUserPaneTrackingUPP(mytrackingproc); - PyMac_INIT_TOOLBOX_OBJECT_NEW(ControlHandle, CtlObj_New); - PyMac_INIT_TOOLBOX_OBJECT_CONVERT(ControlHandle, CtlObj_Convert); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - m = Py_InitModule("_Ctl", Ctl_methods); - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - d = PyModule_GetDict(m); - Ctl_Error = PyMac_GetOSErrException(); - if (Ctl_Error == NULL || -@@ -5808,8 +5808,7 @@ void init_Ctl(void) - /* Backward-compatible name */ - Py_INCREF(&Control_Type); - PyModule_AddObject(m, "ControlType", (PyObject *)&Control_Type); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - /* ======================== End module _Ctl ========================= */ -- -diff --git a/Mac/Modules/dlg/_Dlgmodule.c b/Mac/Modules/dlg/_Dlgmodule.c -index c4d66a9..14d1cea 100644 ---- a/Mac/Modules/dlg/_Dlgmodule.c -+++ b/Mac/Modules/dlg/_Dlgmodule.c -@@ -2,12 +2,10 @@ - /* ========================== Module _Dlg =========================== */ - - #include "Python.h" -- --#ifndef __LP64__ -- -- - #include "pymactoolbox.h" - -+#if APPLE_SUPPORTS_QUICKTIME -+ - /* Macro to test whether a weak-loaded CFM function exists */ - #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ - PyErr_SetString(PyExc_NotImplementedError, \ -@@ -1577,7 +1575,7 @@ static PyMethodDef Dlg_methods[] = { - void init_Dlg(void) - { - PyObject *m; --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - PyObject *d; - - -@@ -1585,11 +1583,11 @@ void init_Dlg(void) - PyMac_INIT_TOOLBOX_OBJECT_NEW(DialogPtr, DlgObj_New); - PyMac_INIT_TOOLBOX_OBJECT_NEW(DialogPtr, DlgObj_WhichDialog); - PyMac_INIT_TOOLBOX_OBJECT_CONVERT(DialogPtr, DlgObj_Convert); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - m = Py_InitModule("_Dlg", Dlg_methods); - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - d = PyModule_GetDict(m); - Dlg_Error = PyMac_GetOSErrException(); - if (Dlg_Error == NULL || -@@ -1602,7 +1600,7 @@ void init_Dlg(void) - /* Backward-compatible name */ - Py_INCREF(&Dialog_Type); - PyModule_AddObject(m, "DialogType", (PyObject *)&Dialog_Type); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - /* ======================== End module _Dlg ========================= */ -diff --git a/Mac/Modules/drag/_Dragmodule.c b/Mac/Modules/drag/_Dragmodule.c -index aa87690..855ff54 100644 ---- a/Mac/Modules/drag/_Dragmodule.c -+++ b/Mac/Modules/drag/_Dragmodule.c -@@ -2,12 +2,10 @@ - /* ========================== Module _Drag ========================== */ - - #include "Python.h" -- --#ifndef __LP64__ -- -- - #include "pymactoolbox.h" - -+#if APPLE_SUPPORTS_QUICKTIME -+ - /* Macro to test whether a weak-loaded CFM function exists */ - #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ - PyErr_SetString(PyExc_NotImplementedError, \ -@@ -1117,18 +1115,18 @@ static PyMethodDef Drag_methods[] = { - void init_Drag(void) - { - PyObject *m; --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - PyObject *d; - - - - PyMac_INIT_TOOLBOX_OBJECT_NEW(DragRef, DragObj_New); - PyMac_INIT_TOOLBOX_OBJECT_CONVERT(DragRef, DragObj_Convert); --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - - m = Py_InitModule("_Drag", Drag_methods); --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - d = PyModule_GetDict(m); - Drag_Error = PyMac_GetOSErrException(); - if (Drag_Error == NULL || -@@ -1150,7 +1148,7 @@ void init_Drag(void) - dragglue_DrawingUPP = NewDragDrawingUPP(dragglue_Drawing); - #endif - --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - } - -diff --git a/Mac/Modules/help/_Helpmodule.c b/Mac/Modules/help/_Helpmodule.c -index eaa2e8a..4d25c9e 100644 ---- a/Mac/Modules/help/_Helpmodule.c -+++ b/Mac/Modules/help/_Helpmodule.c -@@ -2,12 +2,10 @@ - /* ========================== Module _Help ========================== */ - - #include "Python.h" -- --#ifndef __LP64__ -- -- - #include "pymactoolbox.h" - -+#if APPLE_SUPPORTS_QUICKTIME -+ - /* Macro to test whether a weak-loaded CFM function exists */ - #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ - PyErr_SetString(PyExc_NotImplementedError, \ -@@ -145,10 +143,10 @@ static PyObject *Help_HMHideTag(PyObject *_self, PyObject *_args) - return _res; - } - --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - static PyMethodDef Help_methods[] = { --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - {"HMGetHelpMenu", (PyCFunction)Help_HMGetHelpMenu, 1, - PyDoc_STR("() -> (MenuRef outHelpMenu, MenuItemIndex outFirstCustomItemIndex)")}, - {"HMAreHelpTagsDisplayed", (PyCFunction)Help_HMAreHelpTagsDisplayed, 1, -@@ -165,31 +163,30 @@ static PyMethodDef Help_methods[] = { - PyDoc_STR("(DialogPtr inDialog, SInt16 inHdlgRsrcID, SInt16 inItemStart) -> None")}, - {"HMHideTag", (PyCFunction)Help_HMHideTag, 1, - PyDoc_STR("() -> None")}, --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - {NULL, NULL, 0} - }; - - - -- - void init_Help(void) - { - PyObject *m; --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - PyObject *d; --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - - - - m = Py_InitModule("_Help", Help_methods); --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - d = PyModule_GetDict(m); - Help_Error = PyMac_GetOSErrException(); - if (Help_Error == NULL || - PyDict_SetItemString(d, "Error", Help_Error) != 0) - return; --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - /* ======================== End module _Help ======================== */ -diff --git a/Mac/Modules/ibcarbon/_IBCarbon.c b/Mac/Modules/ibcarbon/_IBCarbon.c -index 2a65f42..a947572 100644 ---- a/Mac/Modules/ibcarbon/_IBCarbon.c -+++ b/Mac/Modules/ibcarbon/_IBCarbon.c -@@ -2,12 +2,12 @@ - /* ======================== Module _IBCarbon ======================== */ - - #include "Python.h" -+#include "pymactoolbox.h" - - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - - #include --#include "pymactoolbox.h" - - #ifdef USE_TOOLBOX_OBJECT_GLUE - extern int _CFStringRefObj_Convert(PyObject *, CFStringRef *); -@@ -225,13 +225,13 @@ static PyObject *IBCarbon_CreateNibReference(PyObject *_self, PyObject *_args) - IBNibRefObj_New, outNibRef); - return _res; - } --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - static PyMethodDef IBCarbon_methods[] = { --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - {"CreateNibReference", (PyCFunction)IBCarbon_CreateNibReference, 1, - PyDoc_STR("(CFStringRef inNibName) -> (IBNibRef outNibRef)")}, --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - {NULL, NULL, 0} - }; - -@@ -241,16 +241,16 @@ static PyMethodDef IBCarbon_methods[] = { - void init_IBCarbon(void) - { - PyObject *m; --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - PyObject *d; --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - - - - - m = Py_InitModule("_IBCarbon", IBCarbon_methods); --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - d = PyModule_GetDict(m); - IBCarbon_Error = PyMac_GetOSErrException(); - if (IBCarbon_Error == NULL || -@@ -263,7 +263,7 @@ void init_IBCarbon(void) - /* Backward-compatible name */ - Py_INCREF(&IBNibRef_Type); - PyModule_AddObject(m, "IBNibRefType", (PyObject *)&IBNibRef_Type); --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - /* ====================== End module _IBCarbon ====================== */ -diff --git a/Mac/Modules/icn/_Icnmodule.c b/Mac/Modules/icn/_Icnmodule.c -index 6967ae4..88e2064 100644 ---- a/Mac/Modules/icn/_Icnmodule.c -+++ b/Mac/Modules/icn/_Icnmodule.c -@@ -2,11 +2,11 @@ - /* ========================== Module _Icn =========================== */ - - #include "Python.h" -+#include "pymactoolbox.h" - - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - --#include "pymactoolbox.h" - - /* Macro to test whether a weak-loaded CFM function exists */ - #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ -@@ -1448,10 +1448,10 @@ static PyObject *Icn_WriteIconFile(PyObject *_self, PyObject *_args) - _res = Py_None; - return _res; - } --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - static PyMethodDef Icn_methods[] = { --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - {"GetCIcon", (PyCFunction)Icn_GetCIcon, 1, - PyDoc_STR("(SInt16 iconID) -> (CIconHandle _rv)")}, - {"PlotCIcon", (PyCFunction)Icn_PlotCIcon, 1, -@@ -1576,7 +1576,7 @@ static PyMethodDef Icn_methods[] = { - PyDoc_STR("(FSRef ref) -> (IconFamilyHandle iconFamily)")}, - {"WriteIconFile", (PyCFunction)Icn_WriteIconFile, 1, - PyDoc_STR("(IconFamilyHandle iconFamily, FSSpec iconFile) -> None")}, --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - {NULL, NULL, 0} - }; - -@@ -1586,21 +1586,21 @@ static PyMethodDef Icn_methods[] = { - void init_Icn(void) - { - PyObject *m; --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - PyObject *d; --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - - - - m = Py_InitModule("_Icn", Icn_methods); --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - d = PyModule_GetDict(m); - Icn_Error = PyMac_GetOSErrException(); - if (Icn_Error == NULL || - PyDict_SetItemString(d, "Error", Icn_Error) != 0) - return; --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - /* ======================== End module _Icn ========================= */ -diff --git a/Mac/Modules/list/_Listmodule.c b/Mac/Modules/list/_Listmodule.c -index 9e63686..811045e 100644 ---- a/Mac/Modules/list/_Listmodule.c -+++ b/Mac/Modules/list/_Listmodule.c -@@ -2,11 +2,10 @@ - /* ========================== Module _List ========================== */ - - #include "Python.h" -+#include "pymactoolbox.h" - --#ifndef __LP64__ -- -+#if APPLE_SUPPORTS_QUICKTIME - --#include "pymactoolbox.h" - - /* Macro to test whether a weak-loaded CFM function exists */ - #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ -@@ -1032,10 +1031,10 @@ static PyObject *List_as_List(PyObject *_self, PyObject *_args) - return _res; - - } --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - static PyMethodDef List_methods[] = { --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - {"CreateCustomList", (PyCFunction)List_CreateCustomList, 1, - PyDoc_STR("(Rect rView, Rect dataBounds, Point cellSize, ListDefSpec theSpec, WindowPtr theWindow, Boolean drawIt, Boolean hasGrow, Boolean scrollHoriz, Boolean scrollVert) -> (ListHandle outList)")}, - {"LNew", (PyCFunction)List_LNew, 1, -@@ -1058,11 +1057,11 @@ static PyMethodDef List_methods[] = { - PyDoc_STR("(ListHandle list, OptionBits selectionFlags) -> None")}, - {"as_List", (PyCFunction)List_as_List, 1, - PyDoc_STR("(Resource)->List.\nReturns List object (which is not auto-freed!)")}, --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - {NULL, NULL, 0} - }; - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - - - static void myListDefFunction(SInt16 message, -@@ -1100,13 +1099,13 @@ static void myListDefFunction(SInt16 message, - Py_DECREF(rv); - } - } --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - - void init_List(void) - { - PyObject *m; --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - PyObject *d; - - -@@ -1115,11 +1114,11 @@ void init_List(void) - - PyMac_INIT_TOOLBOX_OBJECT_NEW(ListHandle, ListObj_New); - PyMac_INIT_TOOLBOX_OBJECT_CONVERT(ListHandle, ListObj_Convert); --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - - m = Py_InitModule("_List", List_methods); --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - d = PyModule_GetDict(m); - List_Error = PyMac_GetOSErrException(); - if (List_Error == NULL || -@@ -1132,7 +1131,7 @@ void init_List(void) - /* Backward-compatible name */ - Py_INCREF(&List_Type); - PyModule_AddObject(m, "ListType", (PyObject *)&List_Type); --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - /* ======================== End module _List ======================== */ -diff --git a/Mac/Modules/mlte/_Mltemodule.c b/Mac/Modules/mlte/_Mltemodule.c -index cd698f4..759d1bc 100644 ---- a/Mac/Modules/mlte/_Mltemodule.c -+++ b/Mac/Modules/mlte/_Mltemodule.c -@@ -2,11 +2,10 @@ - /* ========================== Module _Mlte ========================== */ - - #include "Python.h" -+#include "pymactoolbox.h" - --#ifndef __LP64__ -- -+#if APPLE_SUPPORTS_QUICKTIME - --#include "pymactoolbox.h" - - /* Macro to test whether a weak-loaded CFM function exists */ - #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ -@@ -1623,10 +1622,10 @@ static PyObject *Mlte_TXNInitTextension(PyObject *_self, PyObject *_args) - - } - --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - static PyMethodDef Mlte_methods[] = { --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - {"TXNNewObject", (PyCFunction)Mlte_TXNNewObject, 1, - PyDoc_STR("(FSSpec * iFileSpec, WindowPtr iWindow, Rect iFrame, TXNFrameOptions iFrameOptions, TXNFrameType iFrameType, TXNFileType iFileType, TXNPermanentTextEncodingType iPermanentEncoding) -> (TXNObject oTXNObject, TXNFrameID oTXNFrameID)")}, - {"TXNTerminateTextension", (PyCFunction)Mlte_TXNTerminateTextension, 1, -@@ -1643,7 +1642,7 @@ static PyMethodDef Mlte_methods[] = { - PyDoc_STR("() -> (TXNVersionValue _rv, TXNFeatureBits oFeatureFlags)")}, - {"TXNInitTextension", (PyCFunction)Mlte_TXNInitTextension, 1, - PyDoc_STR("(TXNInitOptions) -> None")}, --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - {NULL, NULL, 0} - }; - -@@ -1653,17 +1652,17 @@ static PyMethodDef Mlte_methods[] = { - void init_Mlte(void) - { - PyObject *m; --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - PyObject *d; - - - - // PyMac_INIT_TOOLBOX_OBJECT_NEW(xxxx); - --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - m = Py_InitModule("_Mlte", Mlte_methods); --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - d = PyModule_GetDict(m); - Mlte_Error = PyMac_GetOSErrException(); - if (Mlte_Error == NULL || -@@ -1683,7 +1682,7 @@ void init_Mlte(void) - /* Backward-compatible name */ - Py_INCREF(&TXNFontMenuObject_Type); - PyModule_AddObject(m, "TXNFontMenuObjectType", (PyObject *)&TXNFontMenuObject_Type); --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - /* ======================== End module _Mlte ======================== */ -diff --git a/Mac/Modules/qt/_Qtmodule.c b/Mac/Modules/qt/_Qtmodule.c -index bf67cda..393b025 100644 ---- a/Mac/Modules/qt/_Qtmodule.c -+++ b/Mac/Modules/qt/_Qtmodule.c -@@ -2,11 +2,11 @@ - /* =========================== Module _Qt =========================== */ - - #include "Python.h" -+#include "pymactoolbox.h" - - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - --#include "pymactoolbox.h" - - /* Macro to test whether a weak-loaded CFM function exists */ - #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ -@@ -26295,10 +26295,10 @@ static PyObject *Qt_MoviesTask(PyObject *_self, PyObject *_args) - _res = Py_None; - return _res; - } --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - static PyMethodDef Qt_methods[] = { --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - {"EnterMovies", (PyCFunction)Qt_EnterMovies, 1, - PyDoc_STR("() -> None")}, - {"ExitMovies", (PyCFunction)Qt_ExitMovies, 1, -@@ -27991,7 +27991,7 @@ static PyMethodDef Qt_methods[] = { - PyDoc_STR("(WindowPtr wp, Point startPt, Rect boundsRect) -> None")}, - {"MoviesTask", (PyCFunction)Qt_MoviesTask, 1, - PyDoc_STR("(long maxMilliSecToUse) -> None")}, --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - {NULL, NULL, 0} - }; - -@@ -28001,7 +28001,7 @@ static PyMethodDef Qt_methods[] = { - void init_Qt(void) - { - PyObject *m; --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - PyObject *d; - - -@@ -28018,11 +28018,11 @@ void init_Qt(void) - PyMac_INIT_TOOLBOX_OBJECT_CONVERT(UserData, UserDataObj_Convert); - PyMac_INIT_TOOLBOX_OBJECT_NEW(Media, MediaObj_New); - PyMac_INIT_TOOLBOX_OBJECT_CONVERT(Media, MediaObj_Convert); --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - - m = Py_InitModule("_Qt", Qt_methods); --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - d = PyModule_GetDict(m); - Qt_Error = PyMac_GetOSErrException(); - if (Qt_Error == NULL || -@@ -28084,7 +28084,7 @@ void init_Qt(void) - /* Backward-compatible name */ - Py_INCREF(&SGOutput_Type); - PyModule_AddObject(m, "SGOutputType", (PyObject *)&SGOutput_Type); --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - /* ========================= End module _Qt ========================= */ -diff --git a/Mac/Modules/te/_TEmodule.c b/Mac/Modules/te/_TEmodule.c -index a998fc8..c3018e8 100644 ---- a/Mac/Modules/te/_TEmodule.c -+++ b/Mac/Modules/te/_TEmodule.c -@@ -2,11 +2,11 @@ - /* =========================== Module _TE =========================== */ - - #include "Python.h" -+#include "pymactoolbox.h" - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - - --#include "pymactoolbox.h" - - /* Macro to test whether a weak-loaded CFM function exists */ - #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ -@@ -1268,10 +1268,10 @@ static PyObject *TE_as_TE(PyObject *_self, PyObject *_args) - TEObj_New, _rv); - return _res; - } --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - static PyMethodDef TE_methods[] = { --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - {"TEScrapHandle", (PyCFunction)TE_TEScrapHandle, 1, - PyDoc_STR("() -> (Handle _rv)")}, - {"TEGetScrapLength", (PyCFunction)TE_TEGetScrapLength, 1, -@@ -1298,7 +1298,7 @@ static PyMethodDef TE_methods[] = { - PyDoc_STR("(UInt8 value) -> None")}, - {"as_TE", (PyCFunction)TE_as_TE, 1, - PyDoc_STR("(Handle h) -> (TEHandle _rv)")}, --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - {NULL, NULL, 0} - }; - -@@ -1308,7 +1308,7 @@ static PyMethodDef TE_methods[] = { - void init_TE(void) - { - PyObject *m; --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - PyObject *d; - - -@@ -1316,10 +1316,10 @@ void init_TE(void) - PyMac_INIT_TOOLBOX_OBJECT_NEW(TEHandle, TEObj_New); - PyMac_INIT_TOOLBOX_OBJECT_CONVERT(TEHandle, TEObj_Convert); - --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - m = Py_InitModule("_TE", TE_methods); --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - d = PyModule_GetDict(m); - TE_Error = PyMac_GetOSErrException(); - if (TE_Error == NULL || -@@ -1332,7 +1332,7 @@ void init_TE(void) - /* Backward-compatible name */ - Py_INCREF(&TE_Type); - PyModule_AddObject(m, "TEType", (PyObject *)&TE_Type); --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - /* ========================= End module _TE ========================= */ -diff --git a/Mac/Modules/win/_Winmodule.c b/Mac/Modules/win/_Winmodule.c -index 89233ed..6eca86e 100644 ---- a/Mac/Modules/win/_Winmodule.c -+++ b/Mac/Modules/win/_Winmodule.c -@@ -2,10 +2,10 @@ - /* ========================== Module _Win =========================== */ - - #include "Python.h" -+#include "pymactoolbox.h" - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - --#include "pymactoolbox.h" - - /* Macro to test whether a weak-loaded CFM function exists */ - #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ -@@ -3147,10 +3147,10 @@ static PyObject *Win_FindWindow(PyObject *_self, PyObject *_args) - WinObj_WhichWindow, theWindow); - return _res; - } --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - static PyMethodDef Win_methods[] = { --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - {"GetNewCWindow", (PyCFunction)Win_GetNewCWindow, 1, - PyDoc_STR("(short windowID, WindowPtr behind) -> (WindowPtr _rv)")}, - {"NewWindow", (PyCFunction)Win_NewWindow, 1, -@@ -3202,12 +3202,12 @@ static PyMethodDef Win_methods[] = { - {"FindWindow", (PyCFunction)Win_FindWindow, 1, - PyDoc_STR("(Point thePoint) -> (short _rv, WindowPtr theWindow)")}, - {NULL, NULL, 0} --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - }; - - - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - /* Return the object corresponding to the window, or NULL */ - - PyObject * -@@ -3230,22 +3230,22 @@ WinObj_WhichWindow(WindowPtr w) - return it; - } - --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - void init_Win(void) - { - PyObject *m; --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - PyObject *d; - - PyMac_INIT_TOOLBOX_OBJECT_NEW(WindowPtr, WinObj_New); - PyMac_INIT_TOOLBOX_OBJECT_NEW(WindowPtr, WinObj_WhichWindow); - PyMac_INIT_TOOLBOX_OBJECT_CONVERT(WindowPtr, WinObj_Convert); - --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - m = Py_InitModule("_Win", Win_methods); --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - d = PyModule_GetDict(m); - Win_Error = PyMac_GetOSErrException(); - if (Win_Error == NULL || -@@ -3258,7 +3258,7 @@ void init_Win(void) - /* Backward-compatible name */ - Py_INCREF(&Window_Type); - PyModule_AddObject(m, "WindowType", (PyObject *)&Window_Type); --#endif /* __LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - } - - /* ======================== End module _Win ========================= */ -diff --git a/Python/mactoolboxglue.c b/Python/mactoolboxglue.c -index 92bf3e8..a38c09a 100644 ---- a/Python/mactoolboxglue.c -+++ b/Python/mactoolboxglue.c -@@ -106,7 +106,7 @@ PyMac_Error(OSErr err) - } - - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - OSErr - PyMac_GetFullPathname(FSSpec *fss, char *path, int len) - { -@@ -154,7 +154,7 @@ PyMac_GetFullPathname(FSSpec *fss, char *path, int len) - Py_XDECREF(fs); - return err; - } --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - /* Convert a 4-char string object argument to an OSType value */ - int -@@ -419,7 +419,7 @@ GLUE_CONVERT(RGBColor, QdRGB_Convert, "Carbon.Qd") - GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs") - GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs") - --#ifndef __LP64__ -+#if APPLE_SUPPORTS_QUICKTIME - GLUE_NEW(Track, TrackObj_New, "Carbon.Qt") - GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt") - GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt") -@@ -432,7 +432,7 @@ GLUE_NEW(UserData, UserDataObj_New, "Carbon.Qt") - GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt") - GLUE_NEW(Media, MediaObj_New, "Carbon.Qt") - GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt") --#endif /* !__LP64__ */ -+#endif /* APPLE_SUPPORTS_QUICKTIME */ - - GLUE_NEW(Handle, ResObj_New, "Carbon.Res") - GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res") --- -2.8.4 (Apple Git-73) - diff --git a/modulesets/patches/python-ldflags.patch b/modulesets/patches/python-ldflags.patch deleted file mode 100644 index 922e8a3..0000000 --- a/modulesets/patches/python-ldflags.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -505,9 +505,9 @@ - - # Build the interpreter - $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) -- $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ -+ $(LINKCC) $(LINKFORSHARED) -o $@ \ - Modules/python.o \ -- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -+ $(BLDLIBRARY) $(LDFLAGS) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) - - platform: $(BUILDPYTHON) pybuilddir.txt - $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1170,6 +1170,8 @@ - AC_MSG_RESULT($CC) - fi - -+ LDFLAGS="${LDFLAGS} -Wl,-search_paths_first" -+ - if test "${enable_universalsdk}" - then - case "$UNIVERSAL_ARCHS" in diff --git a/modulesets/patches/python2-linkflags.patch b/modulesets/patches/python2-linkflags.patch deleted file mode 100644 index fca0126..0000000 --- a/modulesets/patches/python2-linkflags.patch +++ /dev/null @@ -1,31 +0,0 @@ -Patch from https://bugs.python.org/issue11445 (minus whitespace changes) -Fixes python.exe linking against the system libpython instead of the -just built one (https://mail.gnome.org/archives/gtk-osx-devel-list/2014-December/msg00016.html) - -diff --git a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -505,9 +505,9 @@ - - # Build the interpreter - $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) -- $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ -+ $(LINKCC) $(LINKFORSHARED) -o $@ \ - Modules/python.o \ -- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -+ $(BLDLIBRARY) $(LDFLAGS) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) - - platform: $(BUILDPYTHON) pybuilddir.txt - $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1216,6 +1216,8 @@ - export MACOSX_DEPLOYMENT_TARGET - EXPORT_MACOSX_DEPLOYMENT_TARGET='' - -+ LDFLAGS="${LDFLAGS} -Wl,-search_paths_first" -+ - if test "${enable_universalsdk}"; then - UNIVERSAL_ARCH_FLAGS="" - if test "$UNIVERSAL_ARCHS" = "32-bit" ; then diff --git a/modulesets/patches/python2-test_grammar.py-typo.patch b/modulesets/patches/python2-test_grammar.py-typo.patch deleted file mode 100644 index aa5fc88..0000000 --- a/modulesets/patches/python2-test_grammar.py-typo.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py ---- a/Lib/test/test_grammar.py -+++ b/Lib/test/test_grammar.py -@@ -77,8 +77,8 @@ - - def test_float_exponent_tokenization(self): - # See issue 21642. -- self.assertEqual(1 if 1else 0, 1) -- self.assertEqual(1 if 0else 0, 0) -+ self.assertEqual(1 if 1 else 0, 1) -+ self.assertEqual(1 if 0 else 0, 0) - self.assertRaises(SyntaxError, eval, "0 if 1Else 0") - - def testStringLiterals(self): diff --git a/modulesets/patches/python2-xcode-stubs.patch b/modulesets/patches/python2-xcode-stubs.patch deleted file mode 100644 index b3fa90d..0000000 --- a/modulesets/patches/python2-xcode-stubs.patch +++ /dev/null @@ -1,79 +0,0 @@ -Patch from https://bugs.python.org/issue25136. Fixes Python not finding -zlib/bz2 on OS X 10.11 and Xcode 7 - -From 613d602c7966d68947458e07e05728b5372c76b9 Mon Sep 17 00:00:00 2001 -From: "Tim D. Smith" -Date: Tue, 15 Sep 2015 20:48:29 -0700 -Subject: [PATCH] add distutils support for Xcode 7 .tbd library stubs - ---- - Lib/distutils/ccompiler.py | 5 +++-- - Lib/distutils/unixccompiler.py | 7 +++++++ - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py -index c0c446f..62506a6 100644 ---- a/Lib/distutils/ccompiler.py -+++ b/Lib/distutils/ccompiler.py -@@ -842,8 +842,9 @@ main (int argc, char **argv) { - def library_filename(self, libname, lib_type='static', # or 'shared' - strip_dir=0, output_dir=''): - assert output_dir is not None -- if lib_type not in ("static", "shared", "dylib"): -- raise ValueError, "'lib_type' must be \"static\", \"shared\" or \"dylib\"" -+ if lib_type not in ("static", "shared", "dylib", "xcode_stub"): -+ raise ValueError, ("""'lib_type' must be "static", "shared", """ -+ """"dylib", or "xcode_stub".""") - fmt = getattr(self, lib_type + "_lib_format") - ext = getattr(self, lib_type + "_lib_extension") - -diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py -index 2aa1cb1..83ec109 100644 ---- a/Lib/distutils/unixccompiler.py -+++ b/Lib/distutils/unixccompiler.py -@@ -79,7 +79,9 @@ class UnixCCompiler(CCompiler): - static_lib_extension = ".a" - shared_lib_extension = ".so" - dylib_lib_extension = ".dylib" -+ xcode_stub_lib_extension = ".tbd" - static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s" -+ xcode_stub_lib_format = dylib_lib_format - if sys.platform == "cygwin": - exe_extension = ".exe" - -@@ -245,6 +247,7 @@ class UnixCCompiler(CCompiler): - def find_library_file(self, dirs, lib, debug=0): - shared_f = self.library_filename(lib, lib_type='shared') - dylib_f = self.library_filename(lib, lib_type='dylib') -+ xcode_stub_f = self.library_filename(lib, lib_type='xcode_stub') - static_f = self.library_filename(lib, lib_type='static') - - if sys.platform == 'darwin': -@@ -264,6 +267,7 @@ class UnixCCompiler(CCompiler): - shared = os.path.join(dir, shared_f) - dylib = os.path.join(dir, dylib_f) - static = os.path.join(dir, static_f) -+ xcode_stub = os.path.join(dir, xcode_stub_f) - - if sys.platform == 'darwin' and ( - dir.startswith('/System/') or ( -@@ -272,6 +276,7 @@ class UnixCCompiler(CCompiler): - shared = os.path.join(sysroot, dir[1:], shared_f) - dylib = os.path.join(sysroot, dir[1:], dylib_f) - static = os.path.join(sysroot, dir[1:], static_f) -+ xcode_stub = os.path.join(sysroot, dir[1:], xcode_stub_f) - - # We're second-guessing the linker here, with not much hard - # data to go on: GCC seems to prefer the shared library, so I'm -@@ -279,6 +284,8 @@ class UnixCCompiler(CCompiler): - # ignoring even GCC's "-static" option. So sue me. - if os.path.exists(dylib): - return dylib -+ elif os.path.exists(xcode_stub): -+ return xcode_stub - elif os.path.exists(shared): - return shared - elif os.path.exists(static): --- -2.5.2 - diff --git a/modulesets/patches/ragel-6.9-setiosflags.patch b/modulesets/patches/ragel-6.9-setiosflags.patch deleted file mode 100644 index cc478b4..0000000 --- a/modulesets/patches/ragel-6.9-setiosflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ragel/javacodegen.cpp 2013-02-10 17:57:45.000000000 -0800 -+++ b/ragel/javacodegen.cpp 2014-02-16 12:09:23.000000000 -0800 -@@ -1184,7 +1184,7 @@ - { - item_count++; - -- out << setw(5) << setiosflags(ios::right) << item; -+ out << setw(5) << std::setiosflags(ios::right) << item; - - if ( !last ) { - if ( item_count % SAIIC == 0 ) { diff --git a/modulesets/patches/ragel-configure.in.patch b/modulesets/patches/ragel-configure.in.patch deleted file mode 100644 index 090a6a6..0000000 --- a/modulesets/patches/ragel-configure.in.patch +++ /dev/null @@ -1,14 +0,0 @@ - ---- a/configure.in Sun May 22 12:27:26 2011 -+++ b/configure.in Sun Aug 19 12:09:05 2012 -@@ -61,7 +61,7 @@ - AC_PROG_RANLIB - - # Default flags. --CXXFLAGS="-g" -+#CXXFLAGS="-g" - - dnl Set test on c++ compiler. - AC_LANG_CPLUSPLUS - -Diff finished. Sun Aug 19 15:21:04 2012 diff --git a/modulesets/patches/webkit-133293-cfi-clang-failure.patch b/modulesets/patches/webkit-133293-cfi-clang-failure.patch deleted file mode 100644 index 649f276..0000000 --- a/modulesets/patches/webkit-133293-cfi-clang-failure.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ---- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (revision 174258) -+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (working copy) -@@ -522,7 +522,7 @@ - // - - // These are for building an interpreter from generated assembly code: --#if CPU(X86_64) && COMPILER(CLANG) -+#if 0 - #define OFFLINE_ASM_BEGIN asm ( \ - ".cfi_startproc\n" - -@@ -545,7 +545,7 @@ - ".thumb\n" \ - ".thumb_func " THUMB_FUNC_PARAM(label) "\n" \ - SYMBOL_STRING(label) ":\n" --#elif CPU(X86_64) && COMPILER(CLANG) -+#elif 0 - #define OFFLINE_ASM_GLOBAL_LABEL(label) \ - ".text\n" \ - ".globl " SYMBOL_STRING(label) "\n" \ diff --git a/modulesets/patches/webkit-140167-disable-netscape-api.patch b/modulesets/patches/webkit-140167-disable-netscape-api.patch deleted file mode 100644 index 080b05e..0000000 --- a/modulesets/patches/webkit-140167-disable-netscape-api.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Source/autotools/SetupWebKitFeatures.m4 b/Source/autotools/SetupWebKitFeatures.m4 ---- a/Source/autotools/SetupWebKitFeatures.m4 (revision 174258) -+++ b/Source/autotools/SetupWebKitFeatures.m4 (working copy) -@@ -146,7 +146,7 @@ - ENABLE_MHTML=1 \ - ENABLE_MOUSE_CURSOR_SCALE=0 \ - ENABLE_NAVIGATOR_CONTENT_UTILS=0 \ -- ENABLE_NETSCAPE_PLUGIN_API=1 \ -+ ENABLE_NETSCAPE_PLUGIN_API=0 \ - ENABLE_NETWORK_INFO=0 \ - ENABLE_NOTIFICATIONS=0 \ - ENABLE_ORIENTATION_EVENTS=0 \ diff --git a/modulesets/patches/webkit-2.16-No-stringview-lifetime.patch b/modulesets/patches/webkit-2.16-No-stringview-lifetime.patch deleted file mode 100644 index 793b1e5..0000000 --- a/modulesets/patches/webkit-2.16-No-stringview-lifetime.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/WTF/wtf/text/StringView.h~ b/Source/WTF/wtf/text/StringView.h -index ef209f9..42ecca8 100644 ---- a/Source/WTF/wtf/text/StringView.h~ -+++ b/Source/WTF/wtf/text/StringView.h -@@ -37,7 +37,7 @@ - #include - - // FIXME: Enabling the StringView lifetime checking causes the MSVC build to fail. Figure out why. --#if defined(NDEBUG) || COMPILER(MSVC) -+#if defined(NDEBUG) || COMPILER(MSVC) || __APPLE__ - #define CHECK_STRINGVIEW_LIFETIME 0 - #else - #define CHECK_STRINGVIEW_LIFETIME 1 diff --git a/modulesets/patches/webkit-2.16-main-thread.patch b/modulesets/patches/webkit-2.16-main-thread.patch deleted file mode 100644 index cd64436..0000000 --- a/modulesets/patches/webkit-2.16-main-thread.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp~ b/Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp -index 480f9d0..26e351b 100644 ---- a/Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp~ -+++ b/Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp -@@ -23,6 +23,8 @@ - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include -+#include - #include "WebProcessMainUnix.h" - - #include -@@ -40,6 +42,6 @@ int main(int argc, char** argv) - // https://bugzilla.gnome.org/show_bug.cgi?id=738633 - // WARNING: This needs to be KEPT IN SYNC with WebProcessMain.cpp. - setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0); -- -+ WTF::initializeMainThread(); - return WebProcessMainUnix(argc, argv); - } diff --git a/modulesets/patches/webkit-clang-fixes.patch b/modulesets/patches/webkit-clang-fixes.patch deleted file mode 100644 index c6206a1..0000000 --- a/modulesets/patches/webkit-clang-fixes.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- Source/WTF/wtf/PointerPreparations.h~ 2020-02-04 02:24:07.000000000 -0800 -+++ Source/WTF/wtf/PointerPreparations.h 2020-10-20 12:36:53.000000000 -0700 -@@ -34,7 +34,7 @@ - #if COMPILER_HAS_CLANG_BUILTIN(__builtin_get_vtable_pointer) - - template --ALWAYS_INLINE void* getVTablePointer(T* o) { return __builtin_get_vtable_pointer(o); } -+ALWAYS_INLINE const void* getVTablePointer(T* o) { return __builtin_get_vtable_pointer(o); } - - #else // not COMPILER_HAS_CLANG_BUILTIN(__builtin_get_vtable_pointer) - ---- Source/WebCore/bindings/scripts/CodeGeneratorJS.pm~ 2020-02-04 02:24:07.000000000 -0800 -+++ Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2020-10-20 14:09:05.000000000 -0700 -@@ -4881,7 +4881,7 @@ - push(@implContent, < - #include - #include --#include -+#include - - namespace WebKit { - diff --git a/modulesets/patches/webkit-disable-apple-icu.patch b/modulesets/patches/webkit-disable-apple-icu.patch deleted file mode 100644 index d8c301f..0000000 --- a/modulesets/patches/webkit-disable-apple-icu.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- Source/cmake/WebKitFindPackage.cmake~ 2020-08-12 02:17:57.000000000 -0700 -+++ Source/cmake/WebKitFindPackage.cmake 2020-10-20 11:26:45.000000000 -0700 -@@ -86,7 +86,8 @@ - endif () - - # Apple builds have a unique location for ICU -- if (APPLE AND "${package}" STREQUAL "ICU") -+ if (NOT "${PORT}" STREQUAL "GTK" AND APPLE AND "${package}" STREQUAL "ICU") -+ message(FATAL_ERROR "Attempting to use Apple ICU with Port=${PORT}") - set(_found_package ON) - - set(ICU_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ICU/Headers) diff --git a/modulesets/patches/xmlto-allow-net-access.patch b/modulesets/patches/xmlto-allow-net-access.patch deleted file mode 100644 index a4f1280..0000000 --- a/modulesets/patches/xmlto-allow-net-access.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -u /Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/xmlto-0.0.28/xmlto.in\~ /Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/xmlto-0.0.28/xmlto.in ---- a/xmlto.in 2015-11-16 06:07:10.000000000 -0800 -+++ b/xmlto.in 2021-04-10 13:33:24.000000000 -0700 -@@ -225,7 +225,7 @@ - export VERBOSE - - # Disable network entities --XSLTOPTS="$XSLTOPTS --nonet" -+XSLTOPTS="$XSLTOPTS" - - # The names parameter for the XSLT stylesheet - XSLTPARAMS="" -@@ -542,10 +542,10 @@ - - [ "$VERBOSE" -ge 1 ] && \ - echo >&2 \ -- "\"${XMLLINT_PATH}\" --noout --nonet --xinclude --postvalid --noent ${SEARCHPATH_FORMATTED} \"${INPUT_FILE}\"" -+ "\"${XMLLINT_PATH}\" --noout --xinclude --postvalid --noent ${SEARCHPATH_FORMATTED} \"${INPUT_FILE}\"" - # eval is for SEARCHPATH_FORMATTED's proper expansion - # make sure expansions are protected from eval -- eval "\"${XMLLINT_PATH}\" --noout --nonet --xinclude --postvalid --noent ${SEARCHPATH_FORMATTED} \"${INPUT_FILE}\"" 2>"${VALIDATION}" -+ eval "\"${XMLLINT_PATH}\" --noout --xinclude --postvalid --noent ${SEARCHPATH_FORMATTED} \"${INPUT_FILE}\"" 2>"${VALIDATION}" - xmllint_status=$? - - if [ $xmllint_status -ne 0 ] - -Diff finished. Sat Apr 10 13:33:31 2021 diff --git a/modulesets/upstream-ref b/modulesets/upstream-ref index 1ea5a13..492aea1 100644 --- a/modulesets/upstream-ref +++ b/modulesets/upstream-ref @@ -1,5 +1,5 @@ -commit a27e8ff6ac5f98b2fc2743fd64fde05775d46293 -Author: John Ralls -Date: Sun Aug 20 11:01:48 2023 -0700 +commit b0864c09e715b4964b6fb1f8228e9c939f3545d0 +Author: Fabian Wüthrich +Date: Fri Jul 19 23:27:52 2024 +0000 - Only set neon enabled when building on ARM. + Add install instructions to README diff --git a/pins.sh b/pins.sh index 586be86..706dec9 100644 --- a/pins.sh +++ b/pins.sh @@ -1,7 +1,7 @@ # https://gitlab.gnome.org/GNOME/gtk-osx/-/commits/master -# use latest commit (2023-08-20) -PIN_GTK_OSX_COMMIT='a27e8ff6' +# use latest commit (2024-07-24) +PIN_GTK_OSX_COMMIT='b0864c09' # https://gitlab.gnome.org/GNOME/gtk-mac-bundler/-/commits/master -# use latest commit (2023-08-17) -PIN_GTK_MAC_BUNDLER_COMMIT='0a95b2d5' +# use latest commit (2024-05-19) +PIN_GTK_MAC_BUNDLER_COMMIT='90443a1d'