pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

update litehtml to version 0.5.0.20211003

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Tue Oct 5 15:13:48 2021 +0000
Changeset:	40cb7798b82a9e9bd9a97db95c9db00e3bf1c81d

Modified Files:
	litehtml/Makefile
	litehtml/PLIST
	litehtml/buildlink3.mk
	litehtml/distinfo
Added Files:
	litehtml/patches/patch-CMakeLists.txt
	litehtml/patches/patch-cmake_litehtmlConfig.cmake

Log Message:
update litehtml to version 0.5.0.20211003

update litehtml to version 0.5.0.20211003
so that it installs cmake package information.
set it to install shared lib instead of static.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=40cb7798b82a9e9bd9a97db95c9db00e3bf1c81d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 litehtml/Makefile                                 | 12 ++-
 litehtml/PLIST                                    | 96 ++++++++++++-----------
 litehtml/buildlink3.mk                            |  1 -
 litehtml/distinfo                                 | 10 ++-
 litehtml/patches/patch-CMakeLists.txt             | 45 +++++++++++
 litehtml/patches/patch-cmake_litehtmlConfig.cmake | 13 +++
 6 files changed, 120 insertions(+), 57 deletions(-)

diffs:
diff --git a/litehtml/Makefile b/litehtml/Makefile
index 0bc4be6059..8b8c27d19e 100644
--- a/litehtml/Makefile
+++ b/litehtml/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
-DISTNAME=	litehtml-0.4.0.20170407
+DISTNAME=	litehtml-0.5.0.20211003
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=litehtml/}
-GITHUB_TAG=	d7cc6abfe1141770718404aaf9b17db80ed3f196
+GITHUB_TAG=	294780d910607850e91f3a066561bbbce03d1aaf
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.litehtml.com/
@@ -13,11 +13,9 @@ LICENSE=	modified-bsd
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
-INSTALLATION_DIRS=	include/litehtml/litehtml include/litehtml/src lib
+CMAKE_ARGS+=	-DEXTERNAL_GUMBO=ON
 
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/include/litehtml.h ${DESTDIR}${PREFIX}/include/litehtml/litehtml
-	${INSTALL_DATA} ${WRKSRC}/src/*.h ${DESTDIR}${PREFIX}/include/litehtml/src
-	${INSTALL_LIB} ${WRKSRC}/liblitehtml.a ${DESTDIR}${PREFIX}/lib
+TOOL_DEPENDS+=	vim-share-[0-9]*:../../editors/vim-share
 
+.include "../../www/gumbo-parser/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/litehtml/PLIST b/litehtml/PLIST
index 682a5d0c08..fc80d41f5e 100644
--- a/litehtml/PLIST
+++ b/litehtml/PLIST
@@ -1,46 +1,52 @@
 @comment $NetBSD$
-include/litehtml/litehtml/litehtml.h
-include/litehtml/src/attributes.h
-include/litehtml/src/background.h
-include/litehtml/src/borders.h
-include/litehtml/src/box.h
-include/litehtml/src/context.h
-include/litehtml/src/css_length.h
-include/litehtml/src/css_margins.h
-include/litehtml/src/css_offsets.h
-include/litehtml/src/css_position.h
-include/litehtml/src/css_selector.h
-include/litehtml/src/document.h
-include/litehtml/src/el_anchor.h
-include/litehtml/src/el_base.h
-include/litehtml/src/el_before_after.h
-include/litehtml/src/el_body.h
-include/litehtml/src/el_break.h
-include/litehtml/src/el_cdata.h
-include/litehtml/src/el_comment.h
-include/litehtml/src/el_div.h
-include/litehtml/src/el_font.h
-include/litehtml/src/el_image.h
-include/litehtml/src/el_link.h
-include/litehtml/src/el_para.h
-include/litehtml/src/el_script.h
-include/litehtml/src/el_space.h
-include/litehtml/src/el_style.h
-include/litehtml/src/el_table.h
-include/litehtml/src/el_td.h
-include/litehtml/src/el_text.h
-include/litehtml/src/el_title.h
-include/litehtml/src/el_tr.h
-include/litehtml/src/element.h
-include/litehtml/src/html.h
-include/litehtml/src/html_tag.h
-include/litehtml/src/iterators.h
-include/litehtml/src/media_query.h
-include/litehtml/src/os_types.h
-include/litehtml/src/style.h
-include/litehtml/src/stylesheet.h
-include/litehtml/src/table.h
-include/litehtml/src/types.h
-include/litehtml/src/utf8_strings.h
-include/litehtml/src/web_color.h
-lib/liblitehtml.a
+include/litehtml/attributes.h
+include/litehtml/background.h
+include/litehtml/borders.h
+include/litehtml/box.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_selector.h
+include/litehtml/document.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/litehtml.h
+include/litehtml/media_query.h
+include/litehtml/num_cvt.h
+include/litehtml/os_types.h
+include/litehtml/style.h
+include/litehtml/stylesheet.h
+include/litehtml/table.h
+include/litehtml/types.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
diff --git a/litehtml/buildlink3.mk b/litehtml/buildlink3.mk
index b672431d92..878e487ec3 100644
--- a/litehtml/buildlink3.mk
+++ b/litehtml/buildlink3.mk
@@ -7,7 +7,6 @@ LITEHTML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.litehtml+=	litehtml>=0.4.0.20170407
 BUILDLINK_PKGSRCDIR.litehtml?=		../../wip/litehtml
-BUILDLINK_DEPMETHOD.litehtml?=		build
 .endif	# LITEHTML_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-litehtml
diff --git a/litehtml/distinfo b/litehtml/distinfo
index 84a78a3772..55326abb7a 100644
--- a/litehtml/distinfo
+++ b/litehtml/distinfo
@@ -1,6 +1,8 @@
 $NetBSD$
 
-SHA1 (litehtml-0.4.0.20170407-d7cc6abfe1141770718404aaf9b17db80ed3f196.tar.gz) = a26139518cee73b1556f1f2b7919f4706dd1bf1c
-RMD160 (litehtml-0.4.0.20170407-d7cc6abfe1141770718404aaf9b17db80ed3f196.tar.gz) = 5843dedcef53612ac85861deb1e3bda9ab179f29
-SHA512 (litehtml-0.4.0.20170407-d7cc6abfe1141770718404aaf9b17db80ed3f196.tar.gz) = f63b143e6304c2dfe1f1816478c18b6b648c85996a3374c127783cf8fb1620e55b79959a52858076fa55084948b9607114cecad6ed24adee63b10bb170832f8f
-Size (litehtml-0.4.0.20170407-d7cc6abfe1141770718404aaf9b17db80ed3f196.tar.gz) = 316230 bytes
+SHA1 (litehtml-0.5.0.20211003-294780d910607850e91f3a066561bbbce03d1aaf.tar.gz) = 504fc35d0fb369b83a27bf309d482cbaaf002b2e
+RMD160 (litehtml-0.5.0.20211003-294780d910607850e91f3a066561bbbce03d1aaf.tar.gz) = 666fd2d0b877c13ee2aa286282b235a54d8537f6
+SHA512 (litehtml-0.5.0.20211003-294780d910607850e91f3a066561bbbce03d1aaf.tar.gz) = 5cd447c5bb9beee2a0363dabd1a89dc0bfea8f60d01ea65f37efdf5f06dcb6a0d18de378aab44ff87042711a9cab3e1e76cb951ed075b91b944d2357a8f49ab7
+Size (litehtml-0.5.0.20211003-294780d910607850e91f3a066561bbbce03d1aaf.tar.gz) = 349241 bytes
+SHA1 (patch-CMakeLists.txt) = c8f6db4ef600a1b0ce132b12c4bf5f0f6fb00011
+SHA1 (patch-cmake_litehtmlConfig.cmake) = 0b84f06f87a0c386eefe01d98c8829a122152d98
diff --git a/litehtml/patches/patch-CMakeLists.txt b/litehtml/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..43c710634e
--- /dev/null
+++ b/litehtml/patches/patch-CMakeLists.txt
@@ -0,0 +1,45 @@
+$NetBSD$
+
+* 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.
+* Turn of the test section since it installs gtest
+
+--- CMakeLists.txt.orig	2021-09-03 06:59:31.000000000 +0000
++++ CMakeLists.txt
+@@ -123,7 +123,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
+@@ -145,7 +145,7 @@ if (LITEHTML_UTF8)
+ endif()
+ 
+ # Gumbo
+-target_link_libraries(${PROJECT_NAME} PUBLIC gumbo)
++target_link_libraries(${PROJECT_NAME} PRIVATE gumbo)
+ 
+ # install and export
+ install(TARGETS ${PROJECT_NAME}
+@@ -177,7 +177,7 @@ endif()
+ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE)
+ 
+ # Tests
+-
++if(OFF)
+ include(FetchContent)
+ FetchContent_Declare(
+   googletest
+@@ -222,6 +222,7 @@ if (BUILD_TESTING)
+     include(GoogleTest)
+     gtest_discover_tests(${TEST_NAME})
+ endif()
++endif()
+ 
+ #     set(TEST_NAME ${PROJECT_NAME}_tests)
+ #     add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc)
diff --git a/litehtml/patches/patch-cmake_litehtmlConfig.cmake b/litehtml/patches/patch-cmake_litehtmlConfig.cmake
new file mode 100644
index 0000000000..81412c9c85
--- /dev/null
+++ b/litehtml/patches/patch-cmake_litehtmlConfig.cmake
@@ -0,0 +1,13 @@
+$NetBSD$
+
+* 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