<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/af2f95f4fb785d8054e5056fb7cf93279d2c2615">https://github.com/macports/macports-ports/commit/af2f95f4fb785d8054e5056fb7cf93279d2c2615</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new af2f95f4fb7 glib2 Adapted patch to include gio-launch-desktop bin in build for generic (x11)
</span>af2f95f4fb7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit af2f95f4fb785d8054e5056fb7cf93279d2c2615
</span>Author: Christophe Van Reusel <christophe@macbookprocvr-2.local>
AuthorDate: Wed May 8 11:56:57 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> glib2 Adapted patch to include gio-launch-desktop bin in build for generic (x11)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> By patching the glib2 lib to work for quartz or x11,
</span><span style='display:block; white-space:pre;color:#404040;'> The add off gio-launch-desktop binary to libexec was forgotten.
</span><span style='display:block; white-space:pre;color:#404040;'> The patch self is now adapted to build this binary for the x11
</span><span style='display:block; white-space:pre;color:#404040;'> (generic backend) version only. This binary is needed for some
</span><span style='display:block; white-space:pre;color:#404040;'> functions in gnome x11 applications such as nautilus .
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> On branch master
</span><span style='display:block; white-space:pre;color:#404040;'> Changes to be committed:
</span><span style='display:block; white-space:pre;color:#404040;'> modified: devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#404040;'> modified: devel/glib2/files/patch-meson_build-meson_options-appinfo.diff
</span>---
devel/glib2/Portfile | 2 +-
.../patch-meson_build-meson_options-appinfo.diff | 19 ++++++++++++++-----
2 files changed, 15 insertions(+), 6 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 0f8fe4c0a7f..4813575d267 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;'>@@ -15,7 +15,7 @@ name glib2
</span> conflicts glib2-devel
set my_name glib
version 2.78.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> epoch 1
checksums rmd160 7941be85af18c428d86f4a00e52f41542b061aa9 \
<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 8a18482bb8e..8f0d1d83e63 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;'>@@ -50,9 +50,9 @@
</span> option('runtime_libdir',
type : 'string',
value : '',
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/meson.build.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/meson.build 2022-04-04 05:29:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -380,16 +380,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/meson.build.orig 2024-01-21 20:48:20.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/meson.build 2024-05-08 11:45:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -389,16 +389,32 @@
</span> 'gunixoutputstream.h',
)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,6 +69,15 @@
</span> + contenttype_sources += files('gcontenttype.c')
+ appinfo_sources += files('gdesktopappinfo.c')
+ gio_unix_include_headers += files('gdesktopappinfo.h')
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ launch_desktop_sources = files('gio-launch-desktop.c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gio_launch_desktop = executable('gio-launch-desktop', launch_desktop_sources,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include_directories : glibinc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install : true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install_dir : multiarch_libexecdir,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install_tag : 'bin',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ c_args : gio_c_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # intl.lib is not compatible with SAFESEH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link_args : noseh_link_args)
</span> + endif
framework_dep = dependency('appleframeworks', modules : ['Foundation', 'CoreFoundation', 'AppKit'])
platform_deps += [framework_dep]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,8 +88,8 @@
</span> else
contenttype_sources += files('gcontenttype.c')
appinfo_sources += files('gdesktopappinfo.c')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -784,6 +791,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install_dir: bash_comp_inst_dir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -828,6 +844,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span> endif
+appinfo_backend = get_option('appinfo_backend')
</pre><pre style='margin:0'>
</pre>