diff options
Diffstat (limited to 'src/glib-1-fixes.patch')
| -rw-r--r-- | src/glib-1-fixes.patch | 62 |
1 files changed, 54 insertions, 8 deletions
diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch index 076689b..021a5ca 100644 --- a/src/glib-1-fixes.patch +++ b/src/glib-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 23 Sep 2010 21:42:46 +0200 -Subject: [PATCH 1/8] fix tool paths +Subject: [PATCH 1/9] fix tool paths diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in @@ -29,7 +29,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson <hpj@cl.no> Date: Fri, 15 Jun 2012 15:25:01 +0200 -Subject: [PATCH 2/8] Avoid DllMain symbol conflict when linking statically +Subject: [PATCH 2/9] Avoid DllMain symbol conflict when linking statically Adjusted by Boris Nagaev on 29-Jan-2017 to fix https://gist.github.com/starius/f4fc85939352cb50122ba29e0f5b140d @@ -103,7 +103,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson <hpj@cl.no> Date: Fri, 15 Jun 2012 15:27:22 +0200 -Subject: [PATCH 3/8] Allow building without inotify support +Subject: [PATCH 3/9] Allow building without inotify support diff --git a/configure.ac b/configure.ac @@ -131,7 +131,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson <hpj@cl.no> Date: Fri, 15 Jun 2012 15:28:14 +0200 -Subject: [PATCH 4/8] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF. +Subject: [PATCH 4/9] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF. Backported from upstream @@ -152,7 +152,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson <hpj@cl.no> Date: Fri, 15 Jun 2012 15:29:06 +0200 -Subject: [PATCH 5/8] Link with dnsapi +Subject: [PATCH 5/9] Link with dnsapi diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in @@ -171,7 +171,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson <hpj@cl.no> Date: Fri, 15 Jun 2012 15:29:38 +0200 -Subject: [PATCH 6/8] Ensure globals are initialized even when DllMain is not +Subject: [PATCH 6/9] Ensure globals are initialized even when DllMain is not being run @@ -548,7 +548,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Gerardo Ballabio <gerardo.ballabio@gmail.com> Date: Sun, 16 Aug 2015 13:18:24 +0200 -Subject: [PATCH 7/8] Remove an annoying runtime warning +Subject: [PATCH 7/9] Remove an annoying runtime warning that pops up when using GtkApplication in Gtk+ 3 programs. @@ -576,7 +576,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: aquiles2k <aj@elane2k.com> Date: Wed, 6 Apr 2016 22:39:53 +0300 -Subject: [PATCH 8/8] fix error "won't overwrite defined macro" on OSX +Subject: [PATCH 8/9] fix error "won't overwrite defined macro" on OSX See https://github.com/mxe/mxe/issues/1281 @@ -595,3 +595,49 @@ index 1111111..2222222 100644 dnl dnl At the end, if we're not within glib, we'll define the public dnl definitions in terms of our private definitions. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Mon, 26 Feb 2018 16:09:53 +1100 +Subject: [PATCH 9/9] darwin: disable g_cocoa_notification_backend + + +diff --git a/gio/Makefile.am b/gio/Makefile.am +index 1111111..2222222 100644 +--- a/gio/Makefile.am ++++ b/gio/Makefile.am +@@ -279,10 +279,6 @@ unix_sources = \ + + appinfo_sources += $(unix_appinfo_sources) + +-if OS_COCOA +-unix_sources += gcocoanotificationbackend.c +-endif +- + giounixincludedir=$(includedir)/gio-unix-2.0/gio + giounixinclude_HEADERS = \ + gdesktopappinfo.h \ +diff --git a/gio/giomodule.c b/gio/giomodule.c +index 1111111..2222222 100644 +--- a/gio/giomodule.c ++++ b/gio/giomodule.c +@@ -918,9 +918,6 @@ extern GType g_proxy_resolver_portal_get_type (void); + extern GType g_network_monitor_portal_get_type (void); + #endif + +-#ifdef HAVE_COCOA +-extern GType g_cocoa_notification_backend_get_type (void); +-#endif + + #ifdef G_PLATFORM_WIN32 + +@@ -1117,9 +1114,6 @@ _g_io_modules_ensure_loaded (void) + g_type_ensure (g_network_monitor_portal_get_type ()); + g_type_ensure (g_proxy_resolver_portal_get_type ()); + #endif +-#ifdef HAVE_COCOA +- g_type_ensure (g_cocoa_notification_backend_get_type ()); +-#endif + #ifdef G_OS_WIN32 + g_type_ensure (_g_winhttp_vfs_get_type ()); + #endif |