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 testsdiff -r1.5 -r1.6 pkgsrc/www/litehtml/Makefile
(wiz)
@@ -1,33 +1,32 @@ | @@ -1,33 +1,32 @@ | |||
1 | # $NetBSD: Makefile,v 1.5 2024/01/17 23:57:51 gdt Exp $ | 1 | # $NetBSD: Makefile,v 1.6 2024/02/10 11:03:14 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= litehtml-0.6 | 3 | DISTNAME= litehtml-0.9 | |
4 | PKGREVISION= 1 | |||
5 | CATEGORIES= www | 4 | CATEGORIES= www | |
6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=litehtml/} | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=litehtml/} | |
7 | GITHUB_TAG= v${PKGVERSION_NOREV} | 6 | GITHUB_TAG= v${PKGVERSION_NOREV} | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://www.litehtml.com/ | 9 | HOMEPAGE= http://www.litehtml.com/ | |
11 | COMMENT= Fast and lightweight HTML/CSS rendering engine | 10 | COMMENT= Fast and lightweight HTML/CSS rendering engine | |
12 | LICENSE= modified-bsd | 11 | LICENSE= modified-bsd | |
13 | 12 | |||
14 | USE_LANGUAGES= c c++ | 13 | USE_LANGUAGES= c c++ | |
15 | USE_CC_FEATURES= c99 | 14 | USE_CC_FEATURES= c99 | |
16 | USE_CXX_FEATURES= c++11 | 15 | USE_CXX_FEATURES= c++11 | |
17 | 16 | |||
18 | CMAKE_CONFIGURE_ARGS+= -DEXTERNAL_GUMBO=ON | 17 | CMAKE_CONFIGURE_ARGS+= -DEXTERNAL_GUMBO=ON | |
19 | # Turn off testing since it installs gtest | 18 | # Turn off testing since it installs gtest | |
20 | CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING:BOOL=OFF | 19 | CMAKE_CONFIGURE_ARGS+= -DLITEHTML_BUILD_TESTING:BOOL=OFF | |
21 | 20 | |||
22 | CMAKE_USE_GNU_INSTALL_DIRS= no | 21 | CMAKE_USE_GNU_INSTALL_DIRS= no | |
23 | 22 | |||
24 | INSTALLATION_DIRS+= share/doc/${PKGBASE} | 23 | INSTALLATION_DIRS+= share/doc/${PKGBASE} | |
25 | 24 | |||
26 | # conform with the BSD license when distributing | 25 | # conform with the BSD license when distributing | |
27 | post-install: | 26 | post-install: | |
28 | ${INSTALL_DATA} ${WRKSRC}/LICENSE \ | 27 | ${INSTALL_DATA} ${WRKSRC}/LICENSE \ | |
29 | ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} | 28 | ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} | |
30 | ${INSTALL_DATA} ${WRKSRC}/README.md \ | 29 | ${INSTALL_DATA} ${WRKSRC}/README.md \ | |
31 | ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} | 30 | ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} | |
32 | 31 | |||
33 | .include "../../devel/cmake/build.mk" | 32 | .include "../../devel/cmake/build.mk" |
@@ -1,54 +1,67 @@ | @@ -1,54 +1,67 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.3 2023/05/17 08:31:30 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.4 2024/02/10 11:03:14 wiz Exp $ | |
2 | include/litehtml/attributes.h | |||
3 | include/litehtml/background.h | 2 | include/litehtml/background.h | |
4 | include/litehtml/borders.h | 3 | include/litehtml/borders.h | |
5 | include/litehtml/box.h | |||
6 | include/litehtml/codepoint.h | 4 | include/litehtml/codepoint.h | |
7 | include/litehtml/context.h | |||
8 | include/litehtml/css_length.h | 5 | include/litehtml/css_length.h | |
9 | include/litehtml/css_margins.h | 6 | include/litehtml/css_margins.h | |
10 | include/litehtml/css_offsets.h | 7 | include/litehtml/css_offsets.h | |
11 | include/litehtml/css_position.h | 8 | include/litehtml/css_position.h | |
9 | include/litehtml/css_properties.h | |||
12 | include/litehtml/css_selector.h | 10 | include/litehtml/css_selector.h | |
13 | include/litehtml/document.h | 11 | include/litehtml/document.h | |
12 | include/litehtml/document_container.h | |||
14 | include/litehtml/el_anchor.h | 13 | include/litehtml/el_anchor.h | |
15 | include/litehtml/el_base.h | 14 | include/litehtml/el_base.h | |
16 | include/litehtml/el_before_after.h | 15 | include/litehtml/el_before_after.h | |
17 | include/litehtml/el_body.h | 16 | include/litehtml/el_body.h | |
18 | include/litehtml/el_break.h | 17 | include/litehtml/el_break.h | |
19 | include/litehtml/el_cdata.h | 18 | include/litehtml/el_cdata.h | |
20 | include/litehtml/el_comment.h | 19 | include/litehtml/el_comment.h | |
21 | include/litehtml/el_div.h | 20 | include/litehtml/el_div.h | |
22 | include/litehtml/el_font.h | 21 | include/litehtml/el_font.h | |
23 | include/litehtml/el_image.h | 22 | include/litehtml/el_image.h | |
24 | include/litehtml/el_link.h | 23 | include/litehtml/el_link.h | |
25 | include/litehtml/el_para.h | 24 | include/litehtml/el_para.h | |
26 | include/litehtml/el_script.h | 25 | include/litehtml/el_script.h | |
27 | include/litehtml/el_space.h | 26 | include/litehtml/el_space.h | |
28 | include/litehtml/el_style.h | 27 | include/litehtml/el_style.h | |
29 | include/litehtml/el_table.h | 28 | include/litehtml/el_table.h | |
30 | include/litehtml/el_td.h | 29 | include/litehtml/el_td.h | |
31 | include/litehtml/el_text.h | 30 | include/litehtml/el_text.h | |
32 | include/litehtml/el_title.h | 31 | include/litehtml/el_title.h | |
33 | include/litehtml/el_tr.h | 32 | include/litehtml/el_tr.h | |
34 | include/litehtml/element.h | 33 | include/litehtml/element.h | |
34 | include/litehtml/flex_item.h | |||
35 | include/litehtml/flex_line.h | |||
36 | include/litehtml/formatting_context.h | |||
35 | include/litehtml/html.h | 37 | include/litehtml/html.h | |
36 | include/litehtml/html_tag.h | 38 | include/litehtml/html_tag.h | |
37 | include/litehtml/iterators.h | 39 | include/litehtml/iterators.h | |
40 | include/litehtml/line_box.h | |||
38 | include/litehtml/litehtml.h | 41 | include/litehtml/litehtml.h | |
42 | include/litehtml/master_css.h | |||
39 | include/litehtml/media_query.h | 43 | include/litehtml/media_query.h | |
40 | include/litehtml/num_cvt.h | 44 | include/litehtml/num_cvt.h | |
41 | include/litehtml/os_types.h | 45 | include/litehtml/os_types.h | |
46 | include/litehtml/render_block.h | |||
47 | include/litehtml/render_block_context.h | |||
48 | include/litehtml/render_flex.h | |||
49 | include/litehtml/render_image.h | |||
50 | include/litehtml/render_inline.h | |||
51 | include/litehtml/render_inline_context.h | |||
52 | include/litehtml/render_item.h | |||
53 | include/litehtml/render_table.h | |||
54 | include/litehtml/string_id.h | |||
42 | include/litehtml/style.h | 55 | include/litehtml/style.h | |
43 | include/litehtml/stylesheet.h | 56 | include/litehtml/stylesheet.h | |
44 | include/litehtml/table.h | 57 | include/litehtml/table.h | |
45 | include/litehtml/tstring_view.h | 58 | include/litehtml/tstring_view.h | |
46 | include/litehtml/types.h | 59 | include/litehtml/types.h | |
47 | include/litehtml/url.h | 60 | include/litehtml/url.h | |
48 | include/litehtml/url_path.h | 61 | include/litehtml/url_path.h | |
49 | include/litehtml/utf8_strings.h | 62 | include/litehtml/utf8_strings.h | |
50 | include/litehtml/web_color.h | 63 | include/litehtml/web_color.h | |
51 | lib/cmake/litehtml/litehtmlConfig.cmake | 64 | lib/cmake/litehtml/litehtmlConfig.cmake | |
52 | lib/cmake/litehtml/litehtmlTargets-noconfig.cmake | 65 | lib/cmake/litehtml/litehtmlTargets-noconfig.cmake | |
53 | lib/cmake/litehtml/litehtmlTargets.cmake | 66 | lib/cmake/litehtml/litehtmlTargets.cmake | |
54 | lib/liblitehtml.so | 67 | lib/liblitehtml.so |
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.3 2023/05/17 08:31:30 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.4 2024/02/10 11:03:14 wiz Exp $ | |
2 | 2 | |||
3 | BLAKE2s (litehtml-0.6.tar.gz) = 058e1f3d949d5d6969a09148303557e5823c0ee7fbdfb6f7bcce22db49165d50 | 3 | BLAKE2s (litehtml-0.9.tar.gz) = bc6f6be278985dd3744990b78cc72f19a1d8db9cda18cfd16cc0fe8969dee908 | |
4 | SHA512 (litehtml-0.6.tar.gz) = b774ed96e53780865e789875f571f96ebce1cd2ff0c05a06ae68a67aec44375cc282c07f77fc87131d422aceddba32bbf3e8e498c870883d8e042adb30834c39 | 4 | SHA512 (litehtml-0.9.tar.gz) = 2a156671b770a6a20ab00184d9869af779248dd1fb898930b3b479ee88d8b7d84f51fdbd689ae4124530ab70c8697b6641cf06b220631ce4fec4622e63845ea3 | |
5 | Size (litehtml-0.6.tar.gz) = 347790 bytes | 5 | Size (litehtml-0.9.tar.gz) = 813293 bytes | |
6 | SHA1 (patch-CMakeLists.txt) = a34e567186404f1d93d6ed9baffbc78eb270919f | 6 | SHA1 (patch-CMakeLists.txt) = 0c69bb659143842747ee79ee918924dada1b9dad | |
7 | SHA1 (patch-cmake_litehtmlConfig.cmake) = 0b84f06f87a0c386eefe01d98c8829a122152d98 | 7 | SHA1 (patch-cmake_litehtmlConfig.cmake) = 0b84f06f87a0c386eefe01d98c8829a122152d98 |
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.1 2022/11/30 10:24:35 nros Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.2 2024/02/10 11:03:14 wiz Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= litehtml | 3 | BUILDLINK_TREE+= litehtml | |
4 | 4 | |||
5 | .if !defined(LITEHTML_BUILDLINK3_MK) | 5 | .if !defined(LITEHTML_BUILDLINK3_MK) | |
6 | LITEHTML_BUILDLINK3_MK:= | 6 | LITEHTML_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.litehtml+= litehtml>=0.6 | 8 | BUILDLINK_API_DEPENDS.litehtml+= litehtml>=0.9 | |
9 | BUILDLINK_PKGSRCDIR.litehtml?= ../../www/litehtml | 9 | BUILDLINK_PKGSRCDIR.litehtml?= ../../www/litehtml | |
10 | .endif # LITEHTML_BUILDLINK3_MK | 10 | .endif # LITEHTML_BUILDLINK3_MK | |
11 | 11 | |||
12 | BUILDLINK_TREE+= -litehtml | 12 | BUILDLINK_TREE+= -litehtml |
@@ -1,27 +1,27 @@ | @@ -1,27 +1,27 @@ | |||
1 | $NetBSD: patch-CMakeLists.txt,v 1.3 2023/05/17 08:31:30 wiz Exp $ | 1 | $NetBSD: patch-CMakeLists.txt,v 1.4 2024/02/10 11:03:14 wiz Exp $ | |
2 | 2 | |||
3 | * create shared library | 3 | * create shared library | |
4 | * Use PRIVATE instead of PUBLIC keyword since we use | 4 | * Use PRIVATE instead of PUBLIC keyword since we use | |
5 | dynamic linking and don't want -lgumbo if requesting | 5 | dynamic linking and don't want -lgumbo if requesting | |
6 | linkage to litehtml via cmake. | 6 | linkage to litehtml via cmake. | |
7 | 7 | |||
8 | --- CMakeLists.txt.orig 2022-04-05 20:49:06.000000000 +0000 | 8 | --- CMakeLists.txt.orig 2023-05-18 23:55:10.000000000 +0000 | |
9 | +++ CMakeLists.txt | 9 | +++ CMakeLists.txt | |
10 | @@ -131,7 +131,7 @@ set(TEST_LITEHTML | 10 | @@ -143,7 +143,7 @@ set(TEST_LITEHTML | |
11 | set(PROJECT_LIB_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.0) | 11 | set(PROJECT_LIB_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.0) | |
12 | set(PROJECT_SO_VERSION ${PROJECT_MAJOR}) | 12 | set(PROJECT_SO_VERSION ${PROJECT_MAJOR}) | |
13 | 13 | |||
14 | -add_library(${PROJECT_NAME} ${SOURCE_LITEHTML}) | 14 | -add_library(${PROJECT_NAME} ${SOURCE_LITEHTML}) | |
15 | +add_library(${PROJECT_NAME} SHARED ${SOURCE_LITEHTML}) | 15 | +add_library(${PROJECT_NAME} SHARED ${SOURCE_LITEHTML}) | |
16 | set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_LIB_VERSION} SOVERSION ${PROJECT_SO_VERSION}) | 16 | set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_LIB_VERSION} SOVERSION ${PROJECT_SO_VERSION}) | |
17 | 17 | |||
18 | set_target_properties(${PROJECT_NAME} PROPERTIES | 18 | set_target_properties(${PROJECT_NAME} PROPERTIES | |
19 | @@ -153,7 +153,7 @@ if (LITEHTML_UTF8) | 19 | @@ -160,7 +160,7 @@ target_include_directories(${PROJECT_NAM | |
20 | endif() | 20 | target_include_directories(${PROJECT_NAME} PRIVATE include/${PROJECT_NAME}) | |
21 | 21 | |||
22 | # Gumbo | 22 | # Gumbo | |
23 | -target_link_libraries(${PROJECT_NAME} PUBLIC gumbo) | 23 | -target_link_libraries(${PROJECT_NAME} PUBLIC gumbo) | |
24 | +target_link_libraries(${PROJECT_NAME} PRIVATE gumbo) | 24 | +target_link_libraries(${PROJECT_NAME} PRIVATE gumbo) | |
25 | 25 | |||
26 | # install and export | 26 | # install and export | |
27 | install(TARGETS ${PROJECT_NAME} | 27 | install(TARGETS ${PROJECT_NAME} |