<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4031341f6db1763661b4e3380d3900947a701411">https://github.com/macports/macports-ports/commit/4031341f6db1763661b4e3380d3900947a701411</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 4031341f6db gucharmap: update to version 13.0.2
</span>4031341f6db is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4031341f6db1763661b4e3380d3900947a701411
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Jul 1 12:03:08 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gucharmap: update to version 13.0.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * switch to GNOME GitLab repository
</span><span style='display:block; white-space:pre;color:#404040;'> * additionally fetch Unicode 13.0.0 data files and extract
</span><span style='display:block; white-space:pre;color:#404040;'> * port build configuration from autotools to meson
</span><span style='display:block; white-space:pre;color:#404040;'> * update dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * add g-ir-scanner boilerplate
</span>---
gnome/gucharmap/Portfile | 92 +++++++++++++---------
gnome/gucharmap/files/patch-configure.ac.diff | 22 ------
.../files/patch-no-Bsymbolic-functions.diff | 27 +++++++
3 files changed, 82 insertions(+), 59 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gucharmap/Portfile b/gnome/gucharmap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3cbc22b9ccc..2dd03ba1c92 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gucharmap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gucharmap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup gobject_introspection 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
name gucharmap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 12.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 13.0.2
</span> description gucharmap is a featureful unicode character map.
long_description ${description}
maintainers {devans @dbevans} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,28 +12,51 @@ categories gnome
</span> license {GPL-3+ GFDL}
platforms darwin
homepage https://wiki.gnome.org/Apps/Gucharmap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites gnome:sources/${name}/${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://gitlab.gnome.org/GNOME/${name}/-/archive/${version}:source \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://www.unicode.org/Public/13.0.0/ucd:ucd
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7ec443c81c9193d24436fac3f9fc0460931680b7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 39de8aad9d7f0af33c29db1a89f645e76dad2fce00d1a0f7c8a689252a2c2155 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1678524
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set source_distfile ${distfiles}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ucd_distfile UCD.zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set unihan_distfile Unihan.zip
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${source_distfile}:source \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${ucd_distfile}:ucd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${unihan_distfile}:ucd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ${name}/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${source_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2815b69407f6a084f7fea772091b818f6ad7d325 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2632777799ab1cc2270b957160fbda6f78c01b4e7516398f0ecef3e7b20e0625 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1335093 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${ucd_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c35813a5f053d66416e19cbe04b942133d793be3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2f76973b4d36ae45584f5a45ec65b47138932d777dd23a5669c89535ef3da951 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7537310 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${unihan_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ae095d1b346358f391549a5d329d2a463bf212e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e380194c4835ad85aa50e8750a58c1f605dbfc4aba9e3e3b0ca25b9530c02f64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7044963
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_extract port:unzip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.only ${source_distfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${workpath} && ${prefix}/bin/unzip -q ${distpath}/${ucd_distfile} -d ./UCD"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${distpath}/${unihan_distfile} ${workpath}/UCD
</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;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:appstream-glib \
port:itstool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:yelp-tools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk-doc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:coreutils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:unzip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:wget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk-doc
</span>
depends_lib port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gobject-introspection \
</span> port:gtk3 \
port:freetype \
port:vala
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,30 +64,26 @@ depends_lib port:desktop-file-utils \
</span> depends_run port:adwaita-icon-theme \
port:yelp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-no-Bsymbolic-functions.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Ducd_path=${workpath}/UCD
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHA512SUM=${prefix}/bin/gsha512sum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-gtk=3.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-unicode-data=download \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-vala=yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-Bsymbolic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-schemas-compile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-maintainer-mode \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# uses g-ir-scanner, which uses $CC from env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type gnome
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://gitlab.gnome.org/GNOME/${name}/-/tags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex tags/(\\d+(?:\\.\\d+)*)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gucharmap/files/patch-configure.ac.diff b/gnome/gucharmap/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a89eb1e85f7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gucharmap/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2016-09-22 16:09:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2016-09-22 16:10:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -266,18 +266,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ***********
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC_CHECK_CFLAGS_APPEND([ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wall -Wextra \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wformat-nonliteral -Werror=format-security \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wsign-compare -Werror=implicit-function-declaration \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wpointer-arith -Wwrite-strings -Wstrict-prototypes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Waggregate-return -Wcast-align -Wimplicit -Wuninitialized \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wmissing-prototypes -Wmissing-declarations -Wnested-externs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wpacked -Wmissing-format-attribute -Wshadow \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wdeclaration-after-statement -Wold-style-definition \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wno-missing-field-initializers -Wno-unused-parameter \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wformat-signedness \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -fno-common -fno-strict-aliasing -Wno-switch-enum])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -Wall -fno-common -fno-strict-aliasing])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ********
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Bindings
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gucharmap/files/patch-no-Bsymbolic-functions.diff b/gnome/gucharmap/files/patch-no-Bsymbolic-functions.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0cc0e78e9ab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gucharmap/files/patch-no-Bsymbolic-functions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2020-07-01 16:57:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2020-07-01 16:59:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -220,15 +220,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_project_arguments(global_cflags, language: 'c',)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Linker flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-linker_flags = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '-Wl,-Bsymbolic-functions'
</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;'>+-foreach flag: linker_flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assert(cc.has_link_argument(flag), flag + ' is required but not supported')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_project_link_arguments(flag, language: 'c',)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endforeach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -Wl,-Bsymbolic-functions not supported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#linker_flags = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# '-Wl,-Bsymbolic-functions'
</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;'>++#foreach flag: linker_flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# assert(cc.has_link_argument(flag), flag + ' is required but not supported')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# add_project_link_arguments(flag, language: 'c',)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endforeach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>