<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5d409cf43a808bf658444959f11a150ad71a48b0">https://github.com/macports/macports-ports/commit/5d409cf43a808bf658444959f11a150ad71a48b0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5d409cf43a808bf658444959f11a150ad71a48b0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jun 3 14:13:40 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> litehtml: Update to 0.6
</span>---
devel/litehtml/Portfile | 40 +++++++++++++++++++-----------------
devel/litehtml/files/container.patch | 11 +++++-----
devel/litehtml/files/gumbo.patch | 33 -----------------------------
3 files changed, 27 insertions(+), 57 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/litehtml/Portfile b/devel/litehtml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf6b3b41942..a4f973a205f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/litehtml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/litehtml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,14 +4,13 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup litehtml litehtml 0.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup litehtml litehtml 0.6 v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 dfd908cb2e19f8a3f9646f8b5bdf0486c41de83a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ec340afac5238ab41ee0ec2544f55ae2fe1c6f5f16086464075f115dd51ae23b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 315927
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4d42b03dc217b506454b14b307117abe2ab9f8f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d8ef26218d5dd7c622d9d42cbc233c0e26baf56d069df2dbe65cc5c0a6d38861 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 347790
</span>
categories devel www
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {ryandesign @ryandesign} openmaintainer
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,30 +23,33 @@ github.tarball_from archive
</span>
depends_lib-append port:gumbo-parser
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles container.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gumbo.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles container.patch
</span>
compiler.c_standard 1999
compiler.cxx_standard \
2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -DBUILD_SHARED_LIBS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -DBUILD_SHARED_LIBS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXTERNAL_GUMBO=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# There is no `make install' so we guess what needs to be installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Building the tests causes gtest and gmock to also get installed when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this port is installed.
</span> # https://github.com/litehtml/litehtml/issues/152
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/include/${name}/containers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_TESTING=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${docdir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/include/${name}/containers \
</span> ${destroot}${prefix}/share/${name}/css
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} LICENSE ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> copy ${worksrcpath}/containers/linux \
${destroot}${prefix}/include/${name}/containers
xinstall -m 0644 {*}[glob ${worksrcpath}/include/*.css] \
${destroot}${prefix}/share/${name}/css
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # I'm not sure if all of the headers are needed. The next version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # has a restructured layout that might make this more clear.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/litehtml/litehtml/pull/103
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/include/litehtml.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob ${worksrcpath}/src/*.h] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/include/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${build.dir}/liblitehtml.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/litehtml/files/container.patch b/devel/litehtml/files/container.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index b5d371c416b..b8fe966b14b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/litehtml/files/container.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/litehtml/files/container.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,13 @@
</span> Fix include path in installed container file to find litehtml.h where it
will be installed.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- containers/linux/container_linux.h.orig 2018-09-16 14:14:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ containers/linux/container_linux.h 2021-04-14 23:32:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma once
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- containers/linux/container_linux.h.orig 2022-04-05 15:49:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ containers/linux/container_linux.h 2022-06-02 18:58:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef LH_CONTAINER_LINUX_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LH_CONTAINER_LINUX_H
</span>
-#include "../../include/litehtml.h"
+#include <litehtml/litehtml.h>
#include <cairo.h>
#include <gtkmm.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pango/pangocairo.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/litehtml/files/gumbo.patch b/devel/litehtml/files/gumbo.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d408f576d58..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/litehtml/files/gumbo.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Don't build bundled gumbo-parser. We'll use MacPorts gumbo-parser.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/litehtml/litehtml/issues/151
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2018-09-16 14:14:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2021-04-14 15:53:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- project(litehtml CXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_subdirectory(src/gumbo)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SOURCE_LITEHTML
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/background.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/document.cpp.orig 2018-09-16 14:14:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/document.cpp 2021-04-14 16:41:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <math.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "gumbo/gumbo.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "utf8_strings.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- litehtml::document::document(litehtml::document_container* objContainer, litehtml::context* ctx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/document.h.orig 2018-09-16 14:14:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/document.h 2021-04-14 16:41:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "style.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "types.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "context.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "gumbo/gumbo.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <gumbo.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace litehtml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span></pre><pre style='margin:0'>
</pre>