<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/daf5f7b2b1dfca23a83ddebf7b8fdbeb8b07093d">https://github.com/macports/macports-ports/commit/daf5f7b2b1dfca23a83ddebf7b8fdbeb8b07093d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit daf5f7b2b1dfca23a83ddebf7b8fdbeb8b07093d
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Oct 8 09:28:19 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> shared-mime-info: update to 2.3; stub script: support -v
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/67881
</span>---
devel/shared-mime-info/Portfile | 32 ++++++++++++---
.../files/patch-fdatasync-to-fsync.diff | 46 ++++++++++++++++++++++
devel/shared-mime-info/files/update-mime-database | 32 ++++++++++++---
3 files changed, 99 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/shared-mime-info/Portfile b/devel/shared-mime-info/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1539ea1986b..0faff6477ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/shared-mime-info/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/shared-mime-info/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,12 @@ PortGroup gitlab 1.0
</span> PortGroup meson 1.0
gitlab.instance https://gitlab.freedesktop.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gitlab.setup xdg shared-mime-info 2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup xdg shared-mime-info 2.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c8efc1e91c23b82c37d9f78f6d9b1ffbf7be8a11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 418c480019d9865f67f922dfb88de00e9f38bf971205d55cdffab50432919e61 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6428871
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 13e0fef9299f820466ac83cbfb91814fb7b556ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 96ac085d82e2e654e40e34c13d97b74f6657357ee6b443d922695adcf548961c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6643480
</span>
categories devel
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,9 @@ post-extract {
</span> ${worksrcpath}/${startupitem_file}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Replace use of fdatasync(), with fsync()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fdatasync-to-fsync.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:gettext \
port:itstool \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +61,22 @@ if {${os.platform} eq "darwin"} {
</span> path:libexec/coreutils/libstdbuf.so:coreutils
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [string match *clang* ${configure.compiler}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-reserved-user-defined-literal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-error=unknown-warning-option \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-unknown-warning-option
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuild-tests=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuild-tools=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuild-translations=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dwarning_level=0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dupdate-mimedb=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # add an entry for Objective C++
# (https://bugs.freedesktop.org/show_bug.cgi?id=98823)
# upstream bug #98823 mentioned here is still not resolved
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,8 +98,11 @@ post-destroot {
</span> if {${os.platform} eq "darwin"} {
# Copy in stub script, which initiates update by touching mime area
copy ${filespath}/${script_orig} ${bin_dir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> reinplace "s|@PREFIX@|${prefix}|g" \
${bin_dir}/${script_orig}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@SCRIPT_REAL@|${script_real}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${bin_dir}/${script_orig}
</span> } else {
# For non-Darwin, symlink stub to real script
ln -s ${prefix}/bin/${script_real} ${destroot}${prefix}/bin/${script_orig}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/shared-mime-info/files/patch-fdatasync-to-fsync.diff b/devel/shared-mime-info/files/patch-fdatasync-to-fsync.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8e2d00eda07
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/shared-mime-info/files/patch-fdatasync-to-fsync.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch to replace use of fdatasync(), with fsync()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Author: Christopher Nielsen (GitHub: @mascguy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: 2023-10-08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_functions = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'fdatasync',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'fsync',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach function : check_functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.set('HAVE_'+function.to_upper(), cc.has_function(function))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/update-mime-database.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/update-mime-database.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -934,7 +934,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_strerror(errsv));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef HAVE_FDATASYNC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_FSYNC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sync_enabled(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -950,7 +950,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sync_file(const gchar *pathname, GError **error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef HAVE_FDATASYNC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_FSYNC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int fd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!sync_enabled())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -962,7 +962,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_error_from_errno(error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (fdatasync(fd) == -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (fsync(fd) == -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_error_from_errno(error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(fd);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/shared-mime-info/files/update-mime-database b/devel/shared-mime-info/files/update-mime-database
</span><span style='display:block; white-space:pre;color:#808080;'>index 695e319289b..d6b042f67c3 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/shared-mime-info/files/update-mime-database
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/shared-mime-info/files/update-mime-database
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +1,51 @@
</span> #!@PREFIX@/bin/bash
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# stub script, which initiates update via touch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# usage: update-mime-database mime_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==============================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Stub script, which initiates update via touch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Author: Christopher Nielsen (GitHub: @mascguy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Usage:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# update-mime-database <mime_path>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# update-mime-database -v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==============================================================================
</span>
dir_prefix="@PREFIX@"
dir_bin="${dir_prefix}/bin"
dir_mime="${dir_prefix}/share/mime"
dir_mime_pkgs="${dir_mime}/packages"
bin_grealpath="${dir_bin}/grealpath"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+bin_update_mime_db="${dir_bin}/@SCRIPT_REAL@"
</span>
arg_count=${#}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if [[ ${arg_count} -lt 1 ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [[ ${arg_count} < 1 ]]; then
</span> printf "Usage: ${0} mime_path\n"
exit 1
fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# If '-v' specified, version wanted; defer to real binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [[ (${arg_count} == 1) && ("${1}" == "-v") ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec "${bin_update_mime_db}" -v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # mime_path must be last argument; ignore previous args, if any, like -V
arg_path="${@: -1}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# If last arg starts with '-', it's invalid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [[ ${arg_path:0:1} == "-" ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "${0}: mime_path not valid: ${arg_path}\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> arg_path_full="$(${bin_grealpath} -q ${arg_path})"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if [[ $? -ne 0 ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [[ $? != 0 ]]; then
</span> printf "${0}: mime_path does not exist: ${arg_path}\n"
exit 1
fi
dir_mime_full="$(${bin_grealpath} -q ${dir_mime})"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if [[ $? -ne 0 ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [[ $? != 0 ]]; then
</span> printf "${0}: dir_mime does not exist: ${dir_mime}\n"
exit 1
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +53,7 @@ fi
</span> if [[ "${arg_path_full}" == "${dir_mime_full}"* ]]; then
touch "${dir_mime_pkgs}"
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "${0}: mime_path does not match ${dir_mime}; ignoring\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "${0}: mime_path does not match ${dir_mime}; ignoring: ${arg_path}\n"
</span> fi
exit 0
</pre><pre style='margin:0'>
</pre>