<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/2cf3cc714f5d66b3f32298b36895a057ff43c7ac">https://github.com/macports/macports-ports/commit/2cf3cc714f5d66b3f32298b36895a057ff43c7ac</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 2cf3cc7 libhttpseverywhere: fix typelib generation, update default rulesets
</span>2cf3cc7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2cf3cc714f5d66b3f32298b36895a057ff43c7ac
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Mar 11 17:27:11 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> libhttpseverywhere: fix typelib generation, update default rulesets
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Rulesets updated to 2019.1.7
</span>---
www/libhttpseverywhere/Portfile | 11 +++++++++--
www/libhttpseverywhere/files/default.rulesets | 1 +
.../files/patch-fix-typelib-generation.diff | 11 +++++++++++
3 files changed, 21 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/libhttpseverywhere/Portfile b/www/libhttpseverywhere/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index abe4830..e723f7e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/libhttpseverywhere/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/libhttpseverywhere/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup meson 1.0
</span>
name libhttpseverywhere
version 0.8.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> license LGPL-3+
set branch [join [lrange [split ${version} .] 0 1] .]
categories www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,14 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:libxml2 \
port:vala
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-vala-0.42.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-vala-0.42.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-typelib-generation.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # update rulesets to 2019.1.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${filespath}/default.rulesets ${worksrcpath}/data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@LIB_DIR@@|${prefix}/lib|" ${worksrcpath}/src/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
test.run yes
test.cmd test/httpseverywhere_test
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/libhttpseverywhere/files/default.rulesets b/www/libhttpseverywhere/files/default.rulesets
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..530bc99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/libhttpseverywhere/files/default.rulesets
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[{"name":"01.org","target":["01.org","www.01.org","download.01.org","lists.01.org","ml01.01.org"],"securecookie":[{"host":".+","name":".+"}],"rule":[{"from":"^http:","to":"https:"}]},{"name":"0bin.net","target":["0bin.net","www.0bin.net"],"securecookie":[{"host":"^0bin\\.net","name":".+"}],"rule":[{"from":"^http://www\\.0bin\\.net/","to":"https://0bin.net/"},{"from":"^http:","to":"https:"}]},{"name":"0nl1ne.at (partial)","target":["0nl1ne.at","www.0nl1ne.at"],"rule":[{"from":"^http://www [...]
</span>\ No newline at end of file
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/libhttpseverywhere/files/patch-fix-typelib-generation.diff b/www/libhttpseverywhere/files/patch-fix-typelib-generation.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0dabd3d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/libhttpseverywhere/files/patch-fix-typelib-generation.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;'>+--- src/meson.build.orig 2020-03-11 13:20:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/meson.build 2020-03-11 13:21:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_ir_compiler = find_program('g-ir-compiler')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ custom_target('httpseverywhere-typelib',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- command: [g_ir_compiler, '--output', '@OUTPUT@', 'src/'+valagir, '--shared-library', 'libhttpseverywhere-' + api + '.so'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ command: [g_ir_compiler, '--output', '@OUTPUT@', 'src/'+valagir, '--shared-library', '@@LIB_DIR@@/' + 'libhttpseverywhere-' + api + '.dylib'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output: 'HTTPSEverywhere-' + api + '.typelib',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends: httpseverywhere_lib,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true,
</span></pre><pre style='margin:0'>
</pre>