pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
litehtml: add update to 0.8 that breaks qt6-qttools
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By: wiz
Date: Mon May 22 11:34:53 2023 +0200
Changeset: 769bf7aa1aeb2b88b4626ed3bf6d4f2e66086d38
Modified Files:
Makefile
Added Files:
litehtml/DESCR
litehtml/Makefile
litehtml/PLIST
litehtml/TODO
litehtml/buildlink3.mk
litehtml/distinfo
litehtml/log
litehtml/patches/patch-CMakeLists.txt
litehtml/patches/patch-cmake_litehtmlConfig.cmake
Log Message:
litehtml: add update to 0.8 that breaks qt6-qttools
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=769bf7aa1aeb2b88b4626ed3bf6d4f2e66086d38
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 +
litehtml/DESCR | 6 +++
litehtml/Makefile | 32 ++++++++++++
litehtml/PLIST | 61 +++++++++++++++++++++++
litehtml/TODO | 3 ++
litehtml/buildlink3.mk | 12 +++++
litehtml/distinfo | 7 +++
litehtml/log | 12 +++++
litehtml/patches/patch-CMakeLists.txt | 27 ++++++++++
litehtml/patches/patch-cmake_litehtmlConfig.cmake | 13 +++++
10 files changed, 174 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index 9ecfa8ca15..3183652510 100644
--- a/Makefile
+++ b/Makefile
@@ -2222,6 +2222,7 @@ SUBDIR+= linuxtv-dvb-apps
SUBDIR+= lire
SUBDIR+= lissac
SUBDIR+= litecoin
+SUBDIR+= litehtml
SUBDIR+= lives
SUBDIR+= lizardfs
SUBDIR+= lld
diff --git a/litehtml/DESCR b/litehtml/DESCR
new file mode 100644
index 0000000000..c47912e069
--- /dev/null
+++ b/litehtml/DESCR
@@ -0,0 +1,6 @@
+litehtml is a lightweight HTML rendering engine with CSS2/CSS3
+support. litehtml does not depend on any image/drawing/font
+library as it does not draw any text, pictures or other
+graphics itself. The consumer of the library can use any
+library to draw images, fonts and any other graphics. HTML
+elements are just placed into the right position by litehtml.
diff --git a/litehtml/Makefile b/litehtml/Makefile
new file mode 100644
index 0000000000..14b08192e9
--- /dev/null
+++ b/litehtml/Makefile
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.3 2023/05/17 08:31:30 wiz Exp $
+
+DISTNAME= litehtml-0.8
+CATEGORIES= www
+MASTER_SITES= ${MASTER_SITE_GITHUB:=litehtml/}
+GITHUB_TAG= v${PKGVERSION_NOREV}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://www.litehtml.com/
+COMMENT= Fast and lightweight HTML/CSS rendering engine
+LICENSE= modified-bsd
+
+USE_CMAKE= yes
+USE_LANGUAGES= c c++
+
+CMAKE_ARGS+= -DEXTERNAL_GUMBO=ON
+# Turn off testing since it installs gtest
+CMAKE_ARGS+= -DBUILD_TESTING:BOOL=OFF
+
+CMAKE_USE_GNU_INSTALL_DIRS= no
+
+INSTALLATION_DIRS+= share/doc/${PKGBASE}
+
+# conform with the BSD license when distributing
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/LICENSE \
+ ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+ ${INSTALL_DATA} ${WRKSRC}/README.md \
+ ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+
+.include "../../www/gumbo-parser/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/litehtml/PLIST b/litehtml/PLIST
new file mode 100644
index 0000000000..173b463c9c
--- /dev/null
+++ b/litehtml/PLIST
@@ -0,0 +1,61 @@
+@comment $NetBSD$
+include/litehtml/background.h
+include/litehtml/borders.h
+include/litehtml/codepoint.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
+include/litehtml/el_body.h
+include/litehtml/el_break.h
+include/litehtml/el_cdata.h
+include/litehtml/el_comment.h
+include/litehtml/el_div.h
+include/litehtml/el_font.h
+include/litehtml/el_image.h
+include/litehtml/el_link.h
+include/litehtml/el_para.h
+include/litehtml/el_script.h
+include/litehtml/el_space.h
+include/litehtml/el_style.h
+include/litehtml/el_table.h
+include/litehtml/el_td.h
+include/litehtml/el_text.h
+include/litehtml/el_title.h
+include/litehtml/el_tr.h
+include/litehtml/element.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_item.h
+include/litehtml/string_id.h
+include/litehtml/style.h
+include/litehtml/stylesheet.h
+include/litehtml/table.h
+include/litehtml/tstring_view.h
+include/litehtml/types.h
+include/litehtml/url.h
+include/litehtml/url_path.h
+include/litehtml/utf8_strings.h
+include/litehtml/web_color.h
+lib/cmake/litehtml/litehtmlConfig.cmake
+lib/cmake/litehtml/litehtmlTargets-noconfig.cmake
+lib/cmake/litehtml/litehtmlTargets.cmake
+lib/liblitehtml.so
+lib/liblitehtml.so.0
+lib/liblitehtml.so.0.0.0
+share/doc/litehtml/LICENSE
+share/doc/litehtml/README.md
diff --git a/litehtml/TODO b/litehtml/TODO
new file mode 100644
index 0000000000..74ff8834d7
--- /dev/null
+++ b/litehtml/TODO
@@ -0,0 +1,3 @@
+This update breaks qt6-qttools:
+https://bugreports.qt.io/browse/QTCREATORBUG-29169
+https://github.com/litehtml/litehtml/issues/266
diff --git a/litehtml/buildlink3.mk b/litehtml/buildlink3.mk
new file mode 100644
index 0000000000..87ba32099c
--- /dev/null
+++ b/litehtml/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2022/11/30 10:24:35 nros Exp $
+
+BUILDLINK_TREE+= litehtml
+
+.if !defined(LITEHTML_BUILDLINK3_MK)
+LITEHTML_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.litehtml+= litehtml>=0.6
+BUILDLINK_PKGSRCDIR.litehtml?= ../../wip/litehtml
+.endif # LITEHTML_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -litehtml
diff --git a/litehtml/distinfo b/litehtml/distinfo
new file mode 100644
index 0000000000..bf57852e77
--- /dev/null
+++ b/litehtml/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.3 2023/05/17 08:31:30 wiz Exp $
+
+BLAKE2s (litehtml-0.8.tar.gz) = 0d307e4a7235ec733f68679f5d56e5fc6a1943c49654276619c42e6621938999
+SHA512 (litehtml-0.8.tar.gz) = e2df205258c4e6f48cc0d8f900fb62c2da1b18c9ca007f1e222e51a59a632eb122eb2dc6136de6641ed96b3c6c823f7f90d098f2f40f9966b0cb831b180776a4
+Size (litehtml-0.8.tar.gz) = 538484 bytes
+SHA1 (patch-CMakeLists.txt) = 0c69bb659143842747ee79ee918924dada1b9dad
+SHA1 (patch-cmake_litehtmlConfig.cmake) = 0b84f06f87a0c386eefe01d98c8829a122152d98
diff --git a/litehtml/log b/litehtml/log
new file mode 100644
index 0000000000..2e30620d1a
--- /dev/null
+++ b/litehtml/log
@@ -0,0 +1,12 @@
+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
diff --git a/litehtml/patches/patch-CMakeLists.txt b/litehtml/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..0d97eadd71
--- /dev/null
+++ b/litehtml/patches/patch-CMakeLists.txt
@@ -0,0 +1,27 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2023/05/17 08:31:30 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 2023-05-18 23:55:10.000000000 +0000
++++ CMakeLists.txt
+@@ -143,7 +143,7 @@ set(TEST_LITEHTML
+ set(PROJECT_LIB_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.0)
+ set(PROJECT_SO_VERSION ${PROJECT_MAJOR})
+
+-add_library(${PROJECT_NAME} ${SOURCE_LITEHTML})
++add_library(${PROJECT_NAME} SHARED ${SOURCE_LITEHTML})
+ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_LIB_VERSION} SOVERSION ${PROJECT_SO_VERSION})
+
+ set_target_properties(${PROJECT_NAME} PROPERTIES
+@@ -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)
++target_link_libraries(${PROJECT_NAME} PRIVATE gumbo)
+
+ # install and export
+ install(TARGETS ${PROJECT_NAME}
diff --git a/litehtml/patches/patch-cmake_litehtmlConfig.cmake b/litehtml/patches/patch-cmake_litehtmlConfig.cmake
new file mode 100644
index 0000000000..84531f98c8
--- /dev/null
+++ b/litehtml/patches/patch-cmake_litehtmlConfig.cmake
@@ -0,0 +1,13 @@
+$NetBSD: patch-cmake_litehtmlConfig.cmake,v 1.1 2022/11/30 10:24:35 nros Exp $
+
+* The gumbo package does not install cmake packages so this line breaks
+ find_package(litehtml) . This line is not needed when litehtml is used
+ as a shared library.
+
+--- cmake/litehtmlConfig.cmake.orig 2021-09-03 06:59:31.000000000 +0000
++++ cmake/litehtmlConfig.cmake
+@@ -1,3 +1,3 @@
+ include(CMakeFindDependencyMacro)
+-find_dependency(gumbo)
++#find_dependency(gumbo)
+ include(${CMAKE_CURRENT_LIST_DIR}/litehtmlTargets.cmake)
Home |
Main Index |
Thread Index |
Old Index