[libxml2] Update to 2.13.5 #39478

jimwang118 · 2024-06-24T07:02:34Z

Fixes #39444
Update librsvg version to 2.40.21.
Update libxslt version to 1.1.41.

Changes comply with the maintainer guide.
SHA512s are updated for each updated download.
~~The "supports" clause reflects platforms that may be fixed by this new version.~~
~~Any fixed CI baseline entries are removed from that file.~~
~~Any patches that are no longer applied are deleted from the port's directory.~~
The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
Only one version is added to each modified port's versions file.

All features passed with following triplet:

x64-windows

ports/libxml2/fix_cmakelist.patch

dg0yt · 2024-06-25T20:03:52Z

Maybe you only update to 2.11.8 now.
The update to 2.13 could be used to trim patching.

ports/libxml2/fix_cmakelist.patch

ports/libxml2/portfile.cmake

ports/libxslt/vcpkg.json

ports/libxslt/portfile.cmake

Osyotr · 2024-11-29T16:31:12Z

Please also include this patch
https://gitlab.gnome.org/GNOME/libxslt/-/commit/7504032097712714aafe309d54f2ad57e3364bac

jimwang118 · 2024-12-02T06:19:02Z

Please also include this patch https://gitlab.gnome.org/GNOME/libxslt/-/commit/7504032097712714aafe309d54f2ad57e3364bac

This patch is already in fix_cmakelist.patch.

Osyotr · 2024-12-02T10:32:36Z

This patch is already in fix_cmakelist.patch.

This is a patch for libxslt, not libxml2. They both had the same issue.

donny-dont

Just making some suggestions based on my own experience doing #42528 to improve this.

donny-dont · 2024-12-05T21:31:17Z

ports/libxml2/fix_cmakelist.patch

+diff --git a/libxml2-config.cmake.cmake.in b/libxml2-config.cmake.cmake.in
+index aead949..20eb836 100644
+--- a/libxml2-config.cmake.cmake.in
+++ b/libxml2-config.cmake.cmake.in
+@@ -157,7 +157,7 @@ if(NOT LIBXML2_SHARED)
+   endif()
+
+   if(WIN32)
+-    list(APPEND LIBXML2_LIBRARIES ws2_32)
+    list(APPEND LIBXML2_LIBRARIES ws2_32 bcrypt)
+   endif()
+ endif()


A more robust version of this is on the 2.13 branch of the repository at GNOME/libxml2@fe1ee0f

donny-dont · 2024-12-05T21:31:55Z

ports/libxml2/fix_cmakelist.patch

+     ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake
+     VERSION ${PROJECT_VERSION}
+-    COMPATIBILITY ExactVersion
+    COMPATIBILITY SameMajorVersion


This is fixed in a commit to the 2.13 branch at GNOME/libxml2@b347a00

donny-dont · 2024-12-05T21:34:03Z

ports/libxml2/fix_cmakelist.patch

+     pkg_check_modules(ZLIB_PC IMPORTED_TARGET zlib)
+     if(ZLIB_PC_FOUND)
+@@ -438,23 +438,9 @@ set_target_properties(
+     SOVERSION ${LIBXML_MAJOR_VERSION}
 )

 +set(XML_LIB_NAME xml2)


A more appropriate place to put the library name for pkgconfig is at https://github.com/GNOME/libxml2/blob/fe1ee0f25f43e33a9981fd6fe7b0483a8c8b5e8d/CMakeLists.txt#L661

set(XML_LIBS "-lxml2")

This is passed to the pkgconfig setup.

donny-dont · 2024-12-05T21:35:43Z

ports/libxml2/fix_cmakelist.patch

+     pkg_check_modules(ZLIB_PC IMPORTED_TARGET zlib)
+     if(ZLIB_PC_FOUND)
+@@ -438,23 +438,9 @@ set_target_properties(
+     SOVERSION ${LIBXML_MAJOR_VERSION}
 )

 +set(XML_LIB_NAME xml2)
 if(MSVC)


By moving the above this can turn into an if(0) which would then prevent the postfix being applied.

donny-dont · 2024-12-05T21:42:57Z

ports/libxml2/fix_cmakelist.patch

+     target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc)
+     if(WIN32)
+-        set(ICU_LDFLAGS "-licudt -licuin -licuuc")
+        set(ICU_LIBS "icu-i18n")
+     else()
+-        set(ICU_LDFLAGS "-licudata -licui18n -licuuc")
+        set(ICU_LIBS "icu-i18n")


This change is no longer needed. If you look further in the file at https://github.com/GNOME/libxml2/blob/fe1ee0f25f43e33a9981fd6fe7b0483a8c8b5e8d/CMakeLists.txt#L383-L388 you can see pkg config handling was added.

pkg_check_modules(ICU_PC IMPORTED_TARGET icu-i18n) if(ICU_PC_FOUND) list(APPEND XML_PC_REQUIRES icu-i18n) else() list(APPEND XML_PC_LIBS "${ICU_LDFLAGS}") endif()

So it looks for the pkgconfig module and if it finds it it will end up in the Requires section of the generated .pc file.

The only gotcha is that you need to add this to the portfile so pkgconfig is detected. It is not detected on the x64-windows-static triplet which was a fun thing to figure out for me.

vcpkg_find_acquire_program(PKGCONFIG) set(ENV{PKG_CONFIG} "${PKGCONFIG}")

donny-dont · 2024-12-05T21:43:36Z

ports/libxml2/fix_cmakelist.patch

+     target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA)
+-    set(LibLZMA_LDFLAGS "-llzma")
+    set(LZMA_LIBS "liblzma")
+     list(APPEND XML_PRIVATE_LIBS "${LibLZMA_LDFLAGS}")
+     pkg_check_modules(LibLZMA_PC IMPORTED_TARGET liblzma)
+     if(LibLZMA_PC_FOUND)
+@@ -401,7 +401,7 @@ endif()


Not needed same as ☝️

donny-dont · 2024-12-05T21:43:49Z

ports/libxml2/fix_cmakelist.patch

+-    set(ZLIB_LDFLAGS "-lz")
+    set(Z_LIBS "zlib")
+     list(APPEND XML_PRIVATE_LIBS "${ZLIB_LDFLAGS}")
+     pkg_check_modules(ZLIB_PC IMPORTED_TARGET zlib)
+     if(ZLIB_PC_FOUND)
+@@ -438,23 +438,9 @@ set_target_properties(
+     SOVERSION ${LIBXML_MAJOR_VERSION}


Not needed same as ☝️

jimwang118 · 2024-12-06T03:08:00Z

Duplicate of #42528.

jimwang118 and others added 12 commits June 7, 2024 10:34

Create main.yml

201de68

Merge branch 'master' of https://github.com/Microsoft/vcpkg

6db5acf

Merge branch 'master' of https://github.com/jimwang118/vcpkg

7d0969f

Merge branch 'microsoft:master' into master

e7ce891

Merge branch 'master' of https://github.com/jimwang118/vcpkg

1ba08af

Merge branch 'master' of https://github.com/Microsoft/vcpkg

fc8692e

Merge branch 'master' of https://github.com/Microsoft/vcpkg

593b3d1

Delete .github/workflows/main.yml

7da651f

Merge branch 'master' of https://github.com/jimwang118/vcpkg

a67967b

Merge branch 'master' of https://github.com/Microsoft/vcpkg

d8089b0

update to 2.13.1

ba6a6b5

update version

c81a831

jimwang118 added info:internal This PR or Issue was filed by the vcpkg team. category:port-update The issue is with a library, which is requesting update new revision labels Jun 24, 2024

jimwang118 assigned JonLiu1993 Jun 24, 2024

dg0yt reviewed Jun 24, 2024

View reviewed changes

ports/libxml2/fix_cmakelist.patch Outdated Show resolved Hide resolved

jimwang118 added 2 commits June 25, 2024 14:43

add bcrypt

a3a350c

update version

0072f16

jimwang118 added the category:port-bug The issue is with a library, which is something the port should already support label Jun 25, 2024

jimwang118 added 10 commits June 26, 2024 10:51

update to 1.1.41

a4248b0

update libxstl

518d11d

update tmx

ccac9dc

update

f916525

update commsdsl to 6.3.3

19c8e1e

fix libsbml

e9a3063

update version

aac1163

update pdal

fd5029c

update version

81e3949

Merge branch 'master' of https://github.com/jimwang118/vcpkg

3670eb4

jimwang118 added 3 commits November 26, 2024 09:25

update verision

d20be91

remove patch

df8f13a

update verision

f4647c6

dg0yt reviewed Nov 28, 2024

View reviewed changes

ports/libxml2/fix_cmakelist.patch Outdated Show resolved Hide resolved

ports/libxml2/fix_cmakelist.patch Outdated Show resolved Hide resolved

ports/libxml2/fix_cmakelist.patch Outdated Show resolved Hide resolved

ports/libxml2/portfile.cmake Outdated Show resolved Hide resolved

jimwang118 added 2 commits November 29, 2024 06:34

modify patch

6a4881b

update version

21f7003

Osyotr reviewed Nov 29, 2024

View reviewed changes

ports/libxslt/vcpkg.json Outdated Show resolved Hide resolved

ports/libxslt/portfile.cmake Outdated Show resolved Hide resolved

jimwang118 added 3 commits December 2, 2024 06:53

udpate version

9a8f1fe

udpate version

b7198eb

reset version

ca062c4

jimwang118 added 3 commits December 3, 2024 06:43

fix ci error

a7fe200

update version

cc4adcd

update version

fef6f0b

jimwang118 marked this pull request as ready for review December 4, 2024 02:27

jimwang118 marked this pull request as draft December 4, 2024 02:28

jimwang118 added 6 commits December 4, 2024 02:37

merge master

7849267

fix version

519aecd

update version

d13ea00

remove patch

7640c66

up

f9a593a

reset

e4d71a4

jimwang118 marked this pull request as ready for review December 5, 2024 01:54

jimwang118 mentioned this pull request Dec 5, 2024

[libxml2] Update to v2.13.5 #42528

Merged

7 tasks

donny-dont reviewed Dec 5, 2024

View reviewed changes

jimwang118 closed this Dec 6, 2024

jimwang118 deleted the up-libxml2 branch December 6, 2024 03:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[libxml2] Update to 2.13.5 #39478

[libxml2] Update to 2.13.5 #39478

jimwang118 commented Jun 24, 2024 •

edited

Loading

dg0yt commented Jun 25, 2024

Osyotr commented Nov 29, 2024

jimwang118 commented Dec 2, 2024

Osyotr commented Dec 2, 2024

donny-dont left a comment

donny-dont Dec 5, 2024

donny-dont Dec 5, 2024

donny-dont Dec 5, 2024

donny-dont Dec 5, 2024

donny-dont Dec 5, 2024

donny-dont Dec 5, 2024

donny-dont Dec 5, 2024

jimwang118 commented Dec 6, 2024

[libxml2] Update to 2.13.5 #39478

[libxml2] Update to 2.13.5 #39478

Conversation

jimwang118 commented Jun 24, 2024 • edited Loading

dg0yt commented Jun 25, 2024

Osyotr commented Nov 29, 2024

jimwang118 commented Dec 2, 2024

Osyotr commented Dec 2, 2024

donny-dont left a comment

Choose a reason for hiding this comment

donny-dont Dec 5, 2024

Choose a reason for hiding this comment

donny-dont Dec 5, 2024

Choose a reason for hiding this comment

donny-dont Dec 5, 2024

Choose a reason for hiding this comment

donny-dont Dec 5, 2024

Choose a reason for hiding this comment

donny-dont Dec 5, 2024

Choose a reason for hiding this comment

donny-dont Dec 5, 2024

Choose a reason for hiding this comment

donny-dont Dec 5, 2024

Choose a reason for hiding this comment

jimwang118 commented Dec 6, 2024

jimwang118 commented Jun 24, 2024 •

edited

Loading