Update libxml2 and libxslt (SynoCommunity#6329)

* libxml2: Update libxml2 from 2.9.14 to 2.12.9 using cmake & github * libxml2: Update from 2.12.9 to 2.13.5 and disable readline * libxslt: Update from 1.1.39 to 1.1.42 and use cmake + github * download.mk: Remove download.gnome.org redirect * libxml2: Remove xmlcatalog and xmllint * libxslt: Remove xsltproc * icecast: Mark as BROKEN
urosch · Dec 9, 2024 · fa27024 · fa27024
1 parent de62414
commit fa27024
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 28 deletions.
diff --git a/cross/libxml2/Makefile b/cross/libxml2/Makefile
@@ -1,8 +1,9 @@
 PKG_NAME = libxml2
-PKG_VERS = 2.9.14
-PKG_EXT = tar.xz
-PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://download.gnome.org/sources/libxml2/$(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
+PKG_VERS = 2.13.5
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/GNOME/libxml2/archive/refs/tags
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/zlib
@@ -11,14 +12,15 @@ HOMEPAGE = https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home
 COMMENT  = Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).
 LICENSE  = MIT
 
-GNU_CONFIGURE = 1
-CONFIGURE_ARGS  = --disable-static
-CONFIGURE_ARGS += --without-python
+CMAKE_ARGS  = -DLIBXML2_WITH_PYTHON=OFF
+CMAKE_ARGS += -DLIBXML2_WITH_LZMA=OFF
+CMAKE_ARGS += -DLIBXML2_WITH_TESTS=OFF
+CMAKE_ARGS += -DHAVE_LIBREADLINE=0
 ADDITIONAL_CFLAGS = -O3
 
 POST_INSTALL_TARGET = libxml2_post_install
 
-include ../../mk/spksrc.cross-cc.mk
+include ../../mk/spksrc.cross-cmake.mk
 
 .PHONY: libxml2_post_install
 libxml2_post_install:

diff --git a/cross/libxml2/PLIST b/cross/libxml2/PLIST
@@ -1,5 +1,3 @@
-bin:bin/xmlcatalog
-bin:bin/xmllint
 lnk:lib/libxml2.so
 lnk:lib/libxml2.so.2
-lib:lib/libxml2.so.2.9.14
+lib:lib/libxml2.so.2.13.5
diff --git a/cross/libxml2/digests b/cross/libxml2/digests
@@ -1,3 +1,3 @@
-libxml2-2.9.14.tar.xz SHA1 4a46f37be1aaa33daac49b4dfb51eebe85d805a8
-libxml2-2.9.14.tar.xz SHA256 60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee
-libxml2-2.9.14.tar.xz MD5 b7b3029ac6beb32a7925225515f83ca3
+libxml2-2.13.5.tar.gz SHA1 afc899c38c29cd14db468044f0693c29326957ee
+libxml2-2.13.5.tar.gz SHA256 87d681718760ba42e749a61482d71b34d1d566843e9ade39a73fea92caf8293b
+libxml2-2.13.5.tar.gz MD5 b6ead19aff44b49f2641cb26be5e0b4e
diff --git a/cross/libxslt/Makefile b/cross/libxslt/Makefile
@@ -1,8 +1,9 @@
 PKG_NAME = libxslt
-PKG_VERS = 1.1.39
-PKG_EXT = tar.xz
-PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://download.gnome.org/sources/libxslt/$(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
+PKG_VERS = 1.1.42
+PKG_EXT = tar.gz
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/GNOME/libxslt/archive/refs/tags
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/libxml2 cross/libgcrypt
@@ -11,13 +12,13 @@ HOMEPAGE = https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home
 COMMENT  = Libxslt is the XSLT C library developed for the GNOME project.
 LICENSE  = MIT
 
-GNU_CONFIGURE = 1
-CONFIGURE_ARGS = --without-python
+CMAKE_ARGS  = -DLIBXSLT_WITH_PYTHON=OFF
+CMAKE_ARGS += -DLIBXSLT_WITH_TESTS=OFF
 
 # if for libgcrypt, replace the -config path with abspath
 POST_INSTALL_TARGET = libxslt_post_install
 
-include ../../mk/spksrc.cross-cc.mk
+include ../../mk/spksrc.cross-cmake.mk
 
 .PHONY: libxslt_post_install
 libxslt_post_install:

diff --git a/cross/libxslt/PLIST b/cross/libxslt/PLIST
@@ -1,7 +1,6 @@
-bin:bin/xsltproc
 lnk:lib/libexslt.so
 lnk:lib/libexslt.so.0
-lib:lib/libexslt.so.0.8.21
+lib:lib/libexslt.so.0.8.23
 lnk:lib/libxslt.so
 lnk:lib/libxslt.so.1
-lib:lib/libxslt.so.1.1.39
+lib:lib/libxslt.so.1.1.42
diff --git a/cross/libxslt/digests b/cross/libxslt/digests
@@ -1,3 +1,3 @@
-libxslt-1.1.39.tar.xz SHA1 9ee1055b999b3ae27cadc43428932e74e2c8cb6c
-libxslt-1.1.39.tar.xz SHA256 2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0
-libxslt-1.1.39.tar.xz MD5 22e9eb7c23825124e786611b3760a3c7
+libxslt-1.1.42.tar.gz SHA1 a34d003f1cbcf12b102a0ced9a15b860ef968e48
+libxslt-1.1.42.tar.gz SHA256 a86658443be115694a78c7d1d760334aa590280a13a5de3024115b63bb61744c
+libxslt-1.1.42.tar.gz MD5 21317abc3fee7ec6999ae51c71fc5592
diff --git a/mk/spksrc.download.mk b/mk/spksrc.download.mk
@@ -153,7 +153,6 @@ download_target: $(PRE_DOWNLOAD_TARGET)
 	        localFile=$$(basename $${url}) ; \
 	      fi ; \
 	      url=$$(echo $${url} | sed -e '#^\(http://sourceforge\.net/.*\)$#\1?use_mirror=autoselect#') ; \
-	      url=$$(echo $${url} | sed -e 's#https://download\.gnome\.org/sources#https://cdimage.debian.org/mirror/gnome.org/sources#') ; \
 	      exec 9> /tmp/wget.$${localFile}.lock ; \
 	      flock --timeout $(FLOCK_TIMEOUT) --exclusive 9 || exit 1 ; \
 	      pid=$$$$ ; \

diff --git a/spk/icecast/BROKEN b/spk/icecast/BROKEN
@@ -0,0 +1,2 @@
+Fails to build, noticed since
+https://github.com/SynoCommunity/spksrc/pull/6329
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Fails to build, noticed since
		https://github.com/SynoCommunity/spksrc/pull/6329