<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/957a9d53610fb9b5ce845566e803f17fa371e134">https://github.com/macports/macports-ports/commit/957a9d53610fb9b5ce845566e803f17fa371e134</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 957a9d53610fb9b5ce845566e803f17fa371e134
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Apr 15 17:24:58 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2: update to 2.72.3
</span>---
devel/glib2/Portfile | 31 ++++++++++++-------
devel/glib2/files/patch-declarations.diff | 11 +++++++
devel/glib2/files/patch-gio-tests-meson.build.diff | 35 +++++-----------------
...ff => patch-glib2-findfolders-before-Lion.diff} | 32 ++++++++++----------
.../files/patch-glib2-findfolders-before-SL.diff | 28 ++++++++---------
.../glib2/files/patch-meson-build-broken_poll.diff | 13 --------
.../patch-meson_build-meson_options-appinfo.diff | 27 ++++++++---------
7 files changed, 80 insertions(+), 97 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f6cd7ecba1..39b7d8f04aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,16 +6,19 @@ PortGroup clang_dependency 1.0
</span> PortGroup meson 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# to get past the aligned memory access error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Please keep the glib2 and glib2-devel ports as similar as possible.
name glib2
conflicts glib2-devel glib2-upstream
set my_name glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.70.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e22c130e1179f7ac716cf818f88eb8f9e5aed671 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f70bf76ebcc84e0705722f038be8e2f9a58d17e1a700810c635fcc18b8974b7e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4822784
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.72.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a2432f98501fe132d14e5ae1c44367d4030529c4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4893484
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,23 +49,24 @@ patchfiles libintl.patch \
</span> patch-meson-build-python-path.diff \
patch-meson_build-atomic-test-older-clang-versions.diff \
universal.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-glib2-findfolders-before-SL.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-glib2-findfolders-before-SL.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-declarations.diff
</span>
# patch for old gccs not accepting pragmas inside functions
if {[string match *gcc* ${configure.compiler}]} {
patchfiles-append patch-glib2-pragmas-old-gcc.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch for broken poll() on macOS; fix included in glib2 v2.72.1 and later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://trac.macports.org/ticket/63650
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-meson-build-broken_poll.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin {
if {${os.major} < 11} {
patchfiles-append patch-gio_gcredentialsprivate.h.diff \
patch-gio_gcredentials.c.diff \
patch-gio_gsocket.h.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} == 10 && ${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-replace patch-glib2-findfolders-before-SL.diff patch-glib2-findfolders-before-Lion.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
depends_build-append port:gettext \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +96,7 @@ if {[vercmp ${macosx_deployment_target} 10.9] < 0} {
</span> }
# https://bugzilla.gnome.org/show_bug.cgi?id=697017
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append gcc-3.3 *gcc-4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append gcc-3.3 *gcc-4.0 *gcc-4.2
</span>
# -lresolv is needed at least on Tiger PPC.
configure.ldflags-append -lresolv \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,6 +168,11 @@ post-destroot {
</span>
platform darwin {
configure.args-append -Ddtrace=false
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # some tests fail to build on 10.6.8 Rosetta: https://trac.macports.org/ticket/65517
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} == 10 && ${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Dtests=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
platform darwin 8 {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-declarations.diff b/devel/glib2/files/patch-declarations.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f2f795f3083
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-declarations.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2022-04-04 05:56:47.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -475,7 +475,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Due to pervasive use of things like GPOINTER_TO_UINT(), we do not support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # building with -Wbad-function-cast.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Wno-bad-function-cast',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '-Werror=declaration-after-statement',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-Wno-declaration-after-statement',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Werror=implicit-function-declaration',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Werror=missing-prototypes',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gio-tests-meson.build.diff b/devel/glib2/files/patch-gio-tests-meson.build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 13e08678358..847db09d0a0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gio-tests-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-gio-tests-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,33 +3,14 @@ dependency on something only used to run optional tests and we do not
</span> want the test suite to find and use dbus opportunistically which could
fail if glib2 is being built universal and dbus is not installed
universal.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/tests/meson.build.orig 2020-10-01 07:43:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/tests/meson.build 2021-12-15 18:20:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,8 +99,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check for libdbus1 - Optional - is only used in the GDBus test cases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 1.2.14 required for dbus_message_set_serial
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dbus1_dep = dependency('dbus-1', required : false, version : '>= 1.2.14')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if not dbus1_dep.found()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MSVC: Search for the DBus library by the configuration, which corresponds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to the output of CMake builds of DBus. Note that debugoptimized
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,7 +111,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/tests/meson.build.orig 2022-04-21 01:45:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/tests/meson.build 2022-04-21 01:52:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -170,7 +170,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--if dbus1_dep.found()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glib_conf.set('HAVE_DBUS1', 1)
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-have_dbus_daemon = find_program('dbus-daemon', required : false).found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++have_dbus_daemon = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if have_dbus_daemon
</span> gio_tests += {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -202,7 +201,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Test programs that need to bring up a session bus (requires dbus-daemon)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- have_dbus_daemon = find_program('dbus-daemon', required : false).found()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ have_dbus_daemon = false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if have_dbus_daemon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- annotate_args = [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '--annotate', 'org.project.Bar', 'Key1', 'Value1',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'debugcontroller' : {},
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-glib2-findfolders-before-SL.diff b/devel/glib2/files/patch-glib2-findfolders-before-Lion.diff
</span>similarity index 84%
copy from devel/glib2/files/patch-glib2-findfolders-before-SL.diff
copy to devel/glib2/files/patch-glib2-findfolders-before-Lion.diff
<span style='display:block; white-space:pre;color:#808080;'>index 89f3885da1a..3f86346b938 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-glib2-findfolders-before-SL.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-glib2-findfolders-before-Lion.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git glib/gosxutils.m.orig glib/gosxutils.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7a0d84d..1ba86cb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gosxutils.m.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gosxutils.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,15 +25,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gosxutils.m.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gosxutils.m 2022-04-04 05:41:18.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,17 +21,31 @@
</span> #include "gutils.h"
#include "gstrfuncs.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,6 +12,8 @@ index 7a0d84d..1ba86cb 100644
</span> +#define POOLEND
+#endif
+
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ void load_user_special_dirs_macos (gchar **table);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> static gchar *
find_folder (NSSearchPathDirectory type)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,17 +24,15 @@ index 7a0d84d..1ba86cb 100644
</span> NSArray *paths;
paths = NSSearchPathForDirectoriesInDomains (type, NSUserDomainMask, YES);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span> path = [paths firstObject];
+#else
+ path = [paths count] ? [paths objectAtIndex:0] : NULL;
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> if (path == nil)
{
return NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,6 +57,8 @@ find_folder (NSSearchPathDirectory type)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,6 +53,8 @@
</span>
filename = g_strdup ([path UTF8String]);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,13 +41,13 @@ index 7a0d84d..1ba86cb 100644
</span> return filename;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,10 +67,37 @@ load_user_special_dirs_macos(gchar **table)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,10 +63,37 @@
</span> {
table[G_USER_DIRECTORY_DESKTOP] = find_folder (NSDesktopDirectory);
table[G_USER_DIRECTORY_DOCUMENTS] = find_folder (NSDocumentDirectory);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDownloadsDirectory);
table[G_USER_DIRECTORY_MUSIC] = find_folder (NSMusicDirectory);
table[G_USER_DIRECTORY_PICTURES] = find_folder (NSPicturesDirectory);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +55,6 @@ index 7a0d84d..1ba86cb 100644
</span> table[G_USER_DIRECTORY_TEMPLATES] = NULL;
table[G_USER_DIRECTORY_VIDEOS] = find_folder (NSMoviesDirectory);
-}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span> +
+#else
+POOLSTART
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,12 +63,12 @@ index 7a0d84d..1ba86cb 100644
</span> + even with different languages, these still have the same names to the system; they are just displayed differently
+ */
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span> + table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDownloadsDirectory);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span> + /* for Tiger there is no DownloadsDir, so we use Desktop as glib did previously */
+ table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDesktopDirectory);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span> +
+ table[G_USER_DIRECTORY_MUSIC] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Music"] UTF8String]);
+ table[G_USER_DIRECTORY_PICTURES] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Pictures"] UTF8String]);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,3 +80,4 @@ index 7a0d84d..1ba86cb 100644
</span> +
+#endif
+}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-glib2-findfolders-before-SL.diff b/devel/glib2/files/patch-glib2-findfolders-before-SL.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 89f3885da1a..94fd4ce6378 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-glib2-findfolders-before-SL.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-glib2-findfolders-before-SL.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git glib/gosxutils.m.orig glib/gosxutils.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7a0d84d..1ba86cb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gosxutils.m.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gosxutils.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,15 +25,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gosxutils.m.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gosxutils.m 2022-04-04 05:41:18.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,17 +21,31 @@
</span> #include "gutils.h"
#include "gstrfuncs.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,6 +12,8 @@ index 7a0d84d..1ba86cb 100644
</span> +#define POOLEND
+#endif
+
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ void load_user_special_dirs_macos (gchar **table);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> static gchar *
find_folder (NSSearchPathDirectory type)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,17 +24,15 @@ index 7a0d84d..1ba86cb 100644
</span> NSArray *paths;
paths = NSSearchPathForDirectoriesInDomains (type, NSUserDomainMask, YES);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
path = [paths firstObject];
+#else
+ path = [paths count] ? [paths objectAtIndex:0] : NULL;
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> if (path == nil)
{
return NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,6 +57,8 @@ find_folder (NSSearchPathDirectory type)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,6 +53,8 @@
</span>
filename = g_strdup ([path UTF8String]);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,13 +41,13 @@ index 7a0d84d..1ba86cb 100644
</span> return filename;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,10 +67,37 @@ load_user_special_dirs_macos(gchar **table)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,10 +63,37 @@
</span> {
table[G_USER_DIRECTORY_DESKTOP] = find_folder (NSDesktopDirectory);
table[G_USER_DIRECTORY_DOCUMENTS] = find_folder (NSDocumentDirectory);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDownloadsDirectory);
table[G_USER_DIRECTORY_MUSIC] = find_folder (NSMusicDirectory);
table[G_USER_DIRECTORY_PICTURES] = find_folder (NSPicturesDirectory);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +55,6 @@ index 7a0d84d..1ba86cb 100644
</span> table[G_USER_DIRECTORY_TEMPLATES] = NULL;
table[G_USER_DIRECTORY_VIDEOS] = find_folder (NSMoviesDirectory);
-}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span> +
+#else
+POOLSTART
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,12 +63,12 @@ index 7a0d84d..1ba86cb 100644
</span> + even with different languages, these still have the same names to the system; they are just displayed differently
+ */
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span> + table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDownloadsDirectory);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span> + /* for Tiger there is no DownloadsDir, so we use Desktop as glib did previously */
+ table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDesktopDirectory);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span> +
+ table[G_USER_DIRECTORY_MUSIC] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Music"] UTF8String]);
+ table[G_USER_DIRECTORY_PICTURES] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Pictures"] UTF8String]);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,3 +80,4 @@ index 7a0d84d..1ba86cb 100644
</span> +
+#endif
+}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-meson-build-broken_poll.diff b/devel/glib2/files/patch-meson-build-broken_poll.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 26ad5e0bd1d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-meson-build-broken_poll.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2022-08-06 17:35:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2022-08-06 17:35:44.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -133,8 +133,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glib_conf.set('_GNU_SOURCE', 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if host_system == 'windows'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Poll doesn't work on devices on Windows
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if host_system in ['windows', 'darwin']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Poll doesn't work on devices on Windows, and macOS's poll() implementation is known to be broken
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glib_conf.set('BROKEN_POLL', true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-meson_build-meson_options-appinfo.diff b/devel/glib2/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 31b0349a0d1..5eb70977384 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,18 +49,17 @@
</span> option('runtime_libdir',
type : 'string',
value : '',
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/meson.build.orig 2019-11-14 01:46:14.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/meson.build 2019-11-14 01:56:30.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -413,14 +413,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'gunixsocketaddress.h',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/meson.build.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/meson.build 2022-04-04 05:29:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -380,16 +380,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'gunixoutputstream.h',
</span> )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ appinfo_backend = get_option('appinfo_backend')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ appinfo_backend = get_option('appinfo_backend')
</span> if glib_have_cocoa
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- settings_sources += files('gnextstepsettingsbackend.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ settings_sources += files('gnextstepsettingsbackend.m')
</span> - contenttype_sources += files('gosxcontenttype.m')
- appinfo_sources += files('gosxappinfo.m')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ settings_sources += files('gnextstepsettingsbackend.m')
</span> + if appinfo_backend == 'native'
+ contenttype_sources += files('gosxcontenttype.m')
+ appinfo_sources += files('gosxappinfo.m')
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,6 +69,8 @@
</span> + appinfo_sources += files('gdesktopappinfo.c')
+ gio_unix_include_headers += files('gdesktopappinfo.h')
+ endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ framework_dep = dependency('appleframeworks', modules : ['Foundation', 'CoreFoundation', 'AppKit'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform_deps += [framework_dep]
</span> if glib_have_os_x_9_or_later
unix_sources += files('gcocoanotificationbackend.m')
endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,10 +78,8 @@
</span> else
contenttype_sources += files('gcontenttype.c')
appinfo_sources += files('gdesktopappinfo.c')
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2019-10-21 14:18:40.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2019-11-14 17:20:55.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2048,6 +2056,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- win32_ldflags = ['-luser32', '-lkernel32']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -784,6 +791,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install_dir: bash_comp_inst_dir)
</span> endif
+appinfo_backend = get_option('appinfo_backend')
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,6 +89,6 @@
</span> + glib_conf.set('USE_APPINFO_GENERIC', 1)
+endif
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Tracing: dtrace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- want_dtrace = get_option('dtrace')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enable_dtrace = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if enable_dtrace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gio_dtrace_obj = dtrace_obj_gen.process('gio_probes.d')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gio_dtrace_hdr = dtrace_hdr_gen.process('gio_probes.d')
</span></pre><pre style='margin:0'>
</pre>