<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/6e6cda6d61f42b6fdd7b346101b7aac0ef83a38f">https://github.com/macports/macports-ports/commit/6e6cda6d61f42b6fdd7b346101b7aac0ef83a38f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6e6cda6d61f42b6fdd7b346101b7aac0ef83a38f
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Jul 31 15:14:32 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> appstream-glib: update to version 0.7.10, dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now builds using meson.
</span>---
devel/appstream-glib/Portfile | 46 +++++++++-------------
.../files/dont-use-version-script.patch | 22 +++++++++++
.../files/patch-data-tests-Makefile.am.diff | 24 -----------
devel/appstream-glib/files/use-system-uuid.patch | 12 ++++++
4 files changed, 53 insertions(+), 51 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/appstream-glib/Portfile b/devel/appstream-glib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ef918c..bd8f5c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/appstream-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/appstream-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,10 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span> PortGroup github 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:#ffe0e0;'>-github.setup hughsie appstream-glib 0_6_13 appstream_glib_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup hughsie appstream-glib 0_7_10 appstream_glib_
</span> version [string map {_ .} ${version}]
license LGPL-2+
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,42 +18,34 @@ description This library provides objects and helper methods to help \
</span>
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 578f438cafd1aaae94f0f5e965c642bb007a8869 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8bf5998c75e5d28d51728a2a78b164be2b315e4804868c3e7dc2acbd989b19fa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6329b453168b84e800bbeecec67005953b9f4cf3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 93da6a23da3660cb917b23a59c61e4cf4729ab63d3a7963c9a5263d01f558583 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2400507
</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: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:autoconf-archive \
</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:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gperf
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:libarchive \
port:libsoup \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libstemmer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxslt \
</span> port:libyaml \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gcab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:docbook-xml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:docbook-xsl-nons \
</span> port:gtk3 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gobject-introspection \
</span> port:gdk-pixbuf2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fontconfig \
</span> port:freetype \
port:json-glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-data-tests-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles use-system-uuid.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dont-use-version-script.patch
</span>
# attempt to fix build on 10.6 by blacklisting troublesome compilers
compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 300}
<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 to use system libuuid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UUID_CFLAGS='-iwithsysroot /usr/include/uuid' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UUID_LIBS=' '
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-xml-catalog=${prefix}/etc/xml/catalog \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-rpm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Drpm=false
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/appstream-glib/files/dont-use-version-script.patch b/devel/appstream-glib/files/dont-use-version-script.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bd4b5c2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/appstream-glib/files/dont-use-version-script.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libappstream-builder/meson.build.orig 2018-07-31 02:51:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libappstream-builder/meson.build 2018-07-31 02:53:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +55,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ top_build_incdir = include_directories('..')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mapfile = 'appstream-builder.map'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++vflag = '-export-symbols @0@/@1@'.format(meson.current_source_dir(), mapfile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ asbuilder = shared_library(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'appstream-builder', sources,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ soversion : lt_current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libappstream-glib/meson.build.orig 2018-07-31 02:55:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libappstream-glib/meson.build 2018-07-31 02:56:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,7 +124,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install_headers(headers, subdir : 'libappstream-glib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mapfile = 'appstream-glib.map'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++vflag = '-export-symbols @0@/@1@'.format(meson.current_source_dir(), mapfile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ asglib = shared_library(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'appstream-glib', sources,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ soversion : lt_current,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/appstream-glib/files/patch-data-tests-Makefile.am.diff b/devel/appstream-glib/files/patch-data-tests-Makefile.am.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7dc12aa..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/appstream-glib/files/patch-data-tests-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- data/tests/Makefile.am.orig 2016-01-22 06:02:41.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ data/tests/Makefile.am 2016-01-23 16:00:53.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,18 +55,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if HAVE_BUILDER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if HAVE_GCAB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- colorhug-als-2.0.0.cab: $(srcdir)/firmware/2_0_0/firmware.*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(AM_V_GEN) touch -c -m -d"2000-01-01T00:00:00" $?; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(AM_V_GEN) touch -c -m -t "200001010000.00" $?; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(GCAB) --create --nopath $@ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(srcdir)/firmware/2_0_0/firmware.bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(srcdir)/firmware/2_0_0/firmware.inf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- colorhug-als-2.0.1.cab: $(srcdir)/firmware/2_0_1/firmware.*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(AM_V_GEN) touch -c -m -d"2000-01-01T00:00:00" $?; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(AM_V_GEN) touch -c -m -t "200001010000.00" $?; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(GCAB) --create --nopath $@ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(srcdir)/firmware/2_0_1/firmware.bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(srcdir)/firmware/2_0_1/firmware.inf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(srcdir)/firmware/2_0_1/firmware.metainfo.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- colorhug-als-2.0.2.cab: $(srcdir)/firmware/2_0_2/firmware.*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(AM_V_GEN) touch -c -m -d"2000-01-01T00:00:00" $?; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(AM_V_GEN) touch -c -m -t "200001010000.00" $?; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(GCAB) --create --nopath $@ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(srcdir)/firmware/2_0_2/firmware.bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(srcdir)/firmware/2_0_2/firmware.inf \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/appstream-glib/files/use-system-uuid.patch b/devel/appstream-glib/files/use-system-uuid.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d4c18ab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/appstream-glib/files/use-system-uuid.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2018-07-30 16:53:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2018-07-30 16:57:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'asb-plugins-' + as_plugin_version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib_ver = '>= 2.45.8'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-uuid = dependency('uuid')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++uuid_inc = include_directories('/usr/include/uuid')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++uuid = declare_dependency(include_directories : uuid_inc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib = dependency('glib-2.0', version : glib_ver)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gmodule = dependency('gmodule-2.0', version : glib_ver)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ giounix = dependency('gio-unix-2.0', version : glib_ver)
</span></pre><pre style='margin:0'>
</pre>