From 54599d616facaab0becbdc893673db797356ed83 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 10 Feb 2024 11:03:14 +0000 Subject: [PATCH] litehtml: update to 0.9. 0.9 Improved blocks rendering by @tordex in #268 Refactor render_item based classes by @tordex in #269 Discard invalid color declarations by @stasoid in #274 Add litehtml-specific testing option in cmake by @charliewolf in #282 Basic implementation for css counters by @MicCalo in #281 Media_query: Treat unknown media type as none by @imzyxwvu in #283 Flex layout by @tordex in #285 0.8 fix: render_test._/"acid1.htm" test fails on x86 architecture 0.7 Many changes to improve rendering of inline and block elements. Improved rendering performance litehtml now passes Acid1 test Removed some legacy code Refactoring to make code more clean Added additional rendering tests --- www/litehtml/Makefile | 7 +++---- www/litehtml/PLIST | 21 +++++++++++++++++---- www/litehtml/buildlink3.mk | 4 ++-- www/litehtml/distinfo | 10 +++++----- www/litehtml/patches/patch-CMakeLists.txt | 10 +++++----- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/www/litehtml/Makefile b/www/litehtml/Makefile index 70c5453266e4..5790e2b33bb4 100644 --- a/www/litehtml/Makefile +++ b/www/litehtml/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2024/01/17 23:57:51 gdt Exp $ +# $NetBSD: Makefile,v 1.6 2024/02/10 11:03:14 wiz Exp $ -DISTNAME= litehtml-0.6 -PKGREVISION= 1 +DISTNAME= litehtml-0.9 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_GITHUB:=litehtml/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -17,7 +16,7 @@ USE_CXX_FEATURES= c++11 CMAKE_CONFIGURE_ARGS+= -DEXTERNAL_GUMBO=ON # Turn off testing since it installs gtest -CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING:BOOL=OFF +CMAKE_CONFIGURE_ARGS+= -DLITEHTML_BUILD_TESTING:BOOL=OFF CMAKE_USE_GNU_INSTALL_DIRS= no diff --git a/www/litehtml/PLIST b/www/litehtml/PLIST index acddabab3085..9f79c15c930e 100644 --- a/www/litehtml/PLIST +++ b/www/litehtml/PLIST @@ -1,16 +1,15 @@ -@comment $NetBSD: PLIST,v 1.3 2023/05/17 08:31:30 wiz Exp $ -include/litehtml/attributes.h +@comment $NetBSD: PLIST,v 1.4 2024/02/10 11:03:14 wiz Exp $ include/litehtml/background.h include/litehtml/borders.h -include/litehtml/box.h include/litehtml/codepoint.h -include/litehtml/context.h include/litehtml/css_length.h include/litehtml/css_margins.h include/litehtml/css_offsets.h include/litehtml/css_position.h +include/litehtml/css_properties.h include/litehtml/css_selector.h include/litehtml/document.h +include/litehtml/document_container.h include/litehtml/el_anchor.h include/litehtml/el_base.h include/litehtml/el_before_after.h @@ -32,13 +31,27 @@ include/litehtml/el_text.h include/litehtml/el_title.h include/litehtml/el_tr.h include/litehtml/element.h +include/litehtml/flex_item.h +include/litehtml/flex_line.h +include/litehtml/formatting_context.h include/litehtml/html.h include/litehtml/html_tag.h include/litehtml/iterators.h +include/litehtml/line_box.h include/litehtml/litehtml.h +include/litehtml/master_css.h include/litehtml/media_query.h include/litehtml/num_cvt.h include/litehtml/os_types.h +include/litehtml/render_block.h +include/litehtml/render_block_context.h +include/litehtml/render_flex.h +include/litehtml/render_image.h +include/litehtml/render_inline.h +include/litehtml/render_inline_context.h +include/litehtml/render_item.h +include/litehtml/render_table.h +include/litehtml/string_id.h include/litehtml/style.h include/litehtml/stylesheet.h include/litehtml/table.h diff --git a/www/litehtml/buildlink3.mk b/www/litehtml/buildlink3.mk index 58fad99c2f0a..e2ad3c3aafa5 100644 --- a/www/litehtml/buildlink3.mk +++ b/www/litehtml/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.1 2022/11/30 10:24:35 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2024/02/10 11:03:14 wiz Exp $ BUILDLINK_TREE+= litehtml .if !defined(LITEHTML_BUILDLINK3_MK) LITEHTML_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.litehtml+= litehtml>=0.6 +BUILDLINK_API_DEPENDS.litehtml+= litehtml>=0.9 BUILDLINK_PKGSRCDIR.litehtml?= ../../www/litehtml .endif # LITEHTML_BUILDLINK3_MK diff --git a/www/litehtml/distinfo b/www/litehtml/distinfo index 3c703f39d045..0c02a23350f2 100644 --- a/www/litehtml/distinfo +++ b/www/litehtml/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2023/05/17 08:31:30 wiz Exp $ +$NetBSD: distinfo,v 1.4 2024/02/10 11:03:14 wiz Exp $ -BLAKE2s (litehtml-0.6.tar.gz) = 058e1f3d949d5d6969a09148303557e5823c0ee7fbdfb6f7bcce22db49165d50 -SHA512 (litehtml-0.6.tar.gz) = b774ed96e53780865e789875f571f96ebce1cd2ff0c05a06ae68a67aec44375cc282c07f77fc87131d422aceddba32bbf3e8e498c870883d8e042adb30834c39 -Size (litehtml-0.6.tar.gz) = 347790 bytes -SHA1 (patch-CMakeLists.txt) = a34e567186404f1d93d6ed9baffbc78eb270919f +BLAKE2s (litehtml-0.9.tar.gz) = bc6f6be278985dd3744990b78cc72f19a1d8db9cda18cfd16cc0fe8969dee908 +SHA512 (litehtml-0.9.tar.gz) = 2a156671b770a6a20ab00184d9869af779248dd1fb898930b3b479ee88d8b7d84f51fdbd689ae4124530ab70c8697b6641cf06b220631ce4fec4622e63845ea3 +Size (litehtml-0.9.tar.gz) = 813293 bytes +SHA1 (patch-CMakeLists.txt) = 0c69bb659143842747ee79ee918924dada1b9dad SHA1 (patch-cmake_litehtmlConfig.cmake) = 0b84f06f87a0c386eefe01d98c8829a122152d98 diff --git a/www/litehtml/patches/patch-CMakeLists.txt b/www/litehtml/patches/patch-CMakeLists.txt index 0ae0d062487d..7c685087e014 100644 --- a/www/litehtml/patches/patch-CMakeLists.txt +++ b/www/litehtml/patches/patch-CMakeLists.txt @@ -1,13 +1,13 @@ -$NetBSD: patch-CMakeLists.txt,v 1.3 2023/05/17 08:31:30 wiz Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.4 2024/02/10 11:03:14 wiz Exp $ * create shared library * Use PRIVATE instead of PUBLIC keyword since we use dynamic linking and don't want -lgumbo if requesting linkage to litehtml via cmake. ---- CMakeLists.txt.orig 2022-04-05 20:49:06.000000000 +0000 +--- CMakeLists.txt.orig 2023-05-18 23:55:10.000000000 +0000 +++ CMakeLists.txt -@@ -131,7 +131,7 @@ set(TEST_LITEHTML +@@ -143,7 +143,7 @@ set(TEST_LITEHTML set(PROJECT_LIB_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.0) set(PROJECT_SO_VERSION ${PROJECT_MAJOR}) @@ -16,8 +16,8 @@ $NetBSD: patch-CMakeLists.txt,v 1.3 2023/05/17 08:31:30 wiz Exp $ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_LIB_VERSION} SOVERSION ${PROJECT_SO_VERSION}) set_target_properties(${PROJECT_NAME} PROPERTIES -@@ -153,7 +153,7 @@ if (LITEHTML_UTF8) - endif() +@@ -160,7 +160,7 @@ target_include_directories(${PROJECT_NAM + target_include_directories(${PROJECT_NAME} PRIVATE include/${PROJECT_NAME}) # Gumbo -target_link_libraries(${PROJECT_NAME} PUBLIC gumbo)