这是indexloc提供的服务,不要输入任何密码
Skip to content

bump(main/libxml2): 2.14.1 #24059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2025
Merged

bump(main/libxml2): 2.14.1 #24059

merged 1 commit into from
Apr 13, 2025

Conversation

TomJo2000
Copy link
Member

Will follow up with rebuilds in separate PRs shortly.
Libxml 2.14.0 raised the SOVERSION from 2 to 16 (2 + 14)
Upstream commit: https://gitlab.gnome.org/GNOME/libxml2/-/commit/137466aeb7d51472f418ef61dd53a27e54a4a39b

I've adjusted the SOVERSION guard to make the mismatch clearer accordingly.

Here's the full revdep list for rebuilds.
I'll split these into ~5 to 7 batches.

packages/appstream
packages/aria2
packages/at-spi2-core
packages/cfengine
packages/clamav
packages/codon
packages/crystal
packages/ctags
packages/dcmtk
packages/dnsutils
packages/dvdauthor
packages/ebook-tools
packages/emacs
packages/ffmpeg
packages/finch
packages/gdal
packages/gettext
packages/gnucobol
packages/graphicsmagick
packages/gst-plugins-bad
packages/gst-plugins-good
packages/icecast
packages/imagemagick
packages/lastpass-cli
packages/libarchive
packages/libbluray
packages/libcroco
packages/libgnt
packages/libgnustep-base
packages/libgsf
packages/libraptor2
packages/librasqal
packages/librsvg
packages/libshout
packages/libsoup
packages/libspatialite
packages/libwayland
packages/libwv
packages/libxml2
packages/libxslt
packages/lv2
packages/mapserver
packages/monetdb
packages/netpbm
packages/newsboat
packages/nzbget
packages/oathtool
packages/openbabel
packages/openscad
packages/php
packages/postgis
packages/postgresql
packages/python-lxml
packages/qalc
packages/rdrview
packages/recoll
packages/sc-im
packages/spatialite-tools
packages/squid
packages/stoken
packages/swift
packages/texlive-bin
packages/totem-pl-parser
packages/uwsgi
packages/vlc
packages/xmlsec
packages/xmlstarlet
packages/yuma123
root-packages/nfs-utils
root-packages/tshark
x11-packages/abiword
x11-packages/ardour
x11-packages/atril
x11-packages/audacious-plugins
x11-packages/bluefish
x11-packages/cairo-dock-core
x11-packages/caja
x11-packages/cherrytree
x11-packages/emacs-x
x11-packages/epiphany
x11-packages/evince
x11-packages/far2l
x11-packages/florence
x11-packages/fontforge-gtk
x11-packages/glade
x11-packages/gnome-calculator
x11-packages/gnumeric
x11-packages/goffice
x11-packages/gtksourceview3
x11-packages/gtksourceview4
x11-packages/gtksourceview5
x11-packages/gvfs
x11-packages/handbrake
x11-packages/inkscape
x11-packages/labwc
x11-packages/libgedit-gtksourceview
x11-packages/libmateweather
x11-packages/libxkbcommon
x11-packages/libxklavier
x11-packages/libxml++-2.6
x11-packages/mlt
x11-packages/openbox
x11-packages/pidgin
x11-packages/rhythmbox
x11-packages/shared-mime-info
x11-packages/vlc-qt
x11-packages/webkit2gtk-4.1
x11-packages/webkitgtk-6.0
x11-packages/wireshark-qt
x11-packages/xournalpp

A handful of the "very large" packages on that list will probably need their own PRs.

@TomJo2000 TomJo2000 requested a review from Grimler91 as a code owner April 1, 2025 01:25
@TomJo2000 TomJo2000 requested review from licy183, twaik, Biswa96 and robertkirkman and removed request for Grimler91 April 1, 2025 01:26
@TomJo2000
Copy link
Member Author

TomJo2000 commented Apr 2, 2025

Rebuild progress:

  • Batch 1: Libxml2 rebuilds: Part 1 - Libraries #24060
  • main/libarchive
  • main/libbluray
  • main/libcroco
  • main/libgnt
  • main/libgnustep-base
  • main/libgsf
  • main/libraptor2
  • main/librasqal
  • main/librsvg
  • main/libshout
  • main/libsoup
  • main/libspatialite
Needed --with-http to be enabled in libxml2
  • main/libwayland
  • main/libwv
  • main/libxslt
  • x11/libgedit-gtksourceview
  • x11/libmateweather
  • x11/libxkbcommon
  • x11/libxklavier
  • x11/libxml++-2.6

  • Batch 2: Libxml2 rebuilds: Part 2 - Small packages #24062
  • main/appstream
  • main/aria2
  • main/at-spi2-core
  • main/cfengine
  • main/clamav
  • main/ctags
  • main/dcmtk
  • main/dnsutils
  • main/dvdauthor
  • main/ebook-tools
  • main/finch
  • main/gettext
  • main/icecast
  • main/imagemagick
  • main/lastpass-cli
  • main/lv2
  • main/mapserver
  • main/monetdb
  • main/netpbm
  • main/newsboat
  • main/nzbget
  • main/oathtool
  • main/openbabel
  • main/python-lxml
  • main/qalc
  • main/rdrview
calls the function xmlShellPrintNode() multiple times, which has been removed in libxml2 2.14. I added a basic reimplementation of it in a patch as a polyfill by copying and pasting some of its definition from libxml2 2.13, when I test it (at runtime) it seems to work. - @robertkirkman
  • main/recoll
  • main/sc-im
  • main/spatialite-tools
  • main/squid
  • main/stoken
  • main/totem-pl-parser
  • main/uwsgi
  • main/xmlsec
  • main/xmlstarlet
libxml2 now defines ATTRIBUTE_UNUSED in some sort of a different way, which conflicts with the definition xmlstarlet expects. Redefining ATTRIBUTE_UNUSED back to what it probably was before in xmlstarlet's header works to fix the build error. - @robertkirkman
  • main/yuma123
  • root/nfs-utils
  • root/tshark

@TomJo2000
Copy link
Member Author

TomJo2000 commented Apr 2, 2025

51 packages left.
Mostly X11 and "large" packages.

Pending shuffles:

Large packages build times:

"Large", as determined by my gut instinct

  • codon ~70 minutes
  • crystal ~11 minutes, probably fine to throw into a regular batch.
  • emacs/emacs-x ~10 minutes combined, thought they took like 30 each.
  • ffmpeg ~6 minutes, really?
  • gdal ~15 minutes, probably mistook it for another package.
  • gnucobol (last rebuild no longer archived, Gnucobol pushed to version 3.2 and implemented berkeley db support #20968 from last year says 3-4 minutes)
  • graphicsmagick ~21 minutes, probably fine to throw into a regular batch.
  • openscad ???
  • php ~10 minutes?!?
  • postgis ~70 minutes
  • postgresql ~20 minutes, probably fine to throw into a regular batch.
  • vlc/vlc-qt 15 minutes combined
  • handbrake 8 minutes???
  • webkit2gtk-4.1 200+ minutes
  • webkit2gtk-6.0 200+ minutes

@robertkirkman
Copy link
Contributor

robertkirkman commented Apr 2, 2025

51 packages left.

I seem to have counted this number at the same time as you, but the number I counted is 57.

I'll send the list of everything I counted in matrix in case you would like to compare, so as not to excessively clutter the thread.

@robertkirkman
Copy link
Contributor

robertkirkman commented Apr 3, 2025

I built all the packages locally with libxml2 2.14,

  • handbrake had an unrelated problem that is now fixed in af8f46a

  • postgis dependency gdal has an unrelated problem related to libsqlite and libspatialite that can be fixed by adding --enable-rtree to TERMUX_PKG_EXTRA_CONFIGURE_ARGS of libsqlite and revision-bumping gdal. Also gdal can sometimes be affected by prefix pollution that I have fixes prepared for in a separate branch, that is unrelated to this so it can be resolved later if it doesn't happen when it gets built here.

Resolved in 828ba1a

CMake Error at cmake/helpers/CheckDependentLibraries.cmake:276 (message):
  /data/data/com.termux/files/usr/lib/libsqlite3.so lacks the RTree
  extension! Spatialite will not behave properly.  Define the
  ACCEPT_MISSING_SQLITE3_RTREE:BOOL=ON CMake variable if you want to build
  despite this limitation.
Call Stack (most recent call first):
  ogr/ogrsf_frmts/sqlite/CMakeLists.txt:76 (check_sqlite3_rtree)
--- a/packages/libsqlite/build.sh
+++ b/packages/libsqlite/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library implementing a self-contained and transactional
 TERMUX_PKG_LICENSE="Public Domain"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="3.49.1"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 _SQLITE_YEAR=2025
 TERMUX_PKG_SRCURL=https://www.sqlite.org/${_SQLITE_YEAR}/sqlite-autoconf-$(sed 's/\./''/; s/\./0/' <<< "$TERMUX_PKG_VERSION")00.tar.gz
 TERMUX_PKG_SHA256=106642d8ccb36c5f7323b64e4152e9b719f7c0215acf5bfeac3d5e7f97b59254
@@ -18,6 +18,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-fts5
 --enable-readline
 --enable-session
+--enable-rtree
 "
 
 termux_step_pre_configure() {

  • gst-plugins-good can be affected by prefix pollution from Qt packages,

if this kind of message happens (in any package) it basically means there is Qt-related prefix pollution happening, to be honest I think for this kind, we just need to disable Qt checks in packages that this happens to.

Detecting Qt5 tools
Run-time dependency qt5 (modules: Core) found: YES 5.15.16 (pkg-config)
Program /data/data/com.termux/files/usr/opt/qt/cross/bin/moc found: YES 5.15.16 5.15.16 (/data/data/com.termux/files/usr/opt/qt/cross/bin/moc)
Program /data/data/com.termux/files/usr/opt/qt/cross/bin/uic found: YES 5.15.16 5.15.16 (/data/data/com.termux/files/usr/opt/qt/cross/bin/uic)
Program /data/data/com.termux/files/usr/opt/qt/cross/bin/rcc found: YES 5.15.16 5.15.16 (/data/data/com.termux/files/usr/opt/qt/cross/bin/rcc)
Program /data/data/com.termux/files/usr/opt/qt/cross/bin/lrelease found: NO
Program lrelease5 found: NO
Program lrelease-qt5 found: NO
Program lrelease found: NO
qmake5 found: NO need ['>= 5', '< 6']
Run-time dependency qt5 (modules: Core, Gui, Qml, Quick) found: NO (tried pkgconfig and config-tool)
Detecting Qt6 tools
Run-time dependency qt6 (modules: Core) found: YES 6.8.3 (pkg-config)
Program /data/data/com.termux/files/usr/lib/qt6/bin/moc found: NO

../src/ext/qt6/meson.build:75:23: ERROR: Failed running '/data/data/com.termux/files/usr/lib/qt6/moc', binary or interpreter not executable.
Possibly wrong architecture or the executable bit is not set.

A full log can be found at /home/builder/.termux-build/gst-plugins-good/build/meson-logs/meson-log.txt
--- a/packages/gst-plugins-good/build.sh
+++ b/packages/gst-plugins-good/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="GStreamer Good Plug-ins"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.26.0"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=9e18f139ef69ad0867c2dfbb8fe1d1736d76df11aac83f60e8d3adb1e2eaf03b
 TERMUX_PKG_AUTO_UPDATE=true
@@ -16,6 +17,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dtests=disabled
 -Dv4l2=disabled
 -Daalib=disabled
+-Dqt5=disabled
+-Dqt6=disabled
 "
 
 termux_step_pre_configure() {

Other than the above errors, I don't expect there to be any further errors during rebuilds for libxml2 2.14.

@TomJo2000
Copy link
Member Author

To the best of my knowledge that's all 110 of them.

@TomJo2000 TomJo2000 force-pushed the libxml2 branch 3 times, most recently from 484c3fe to bc004a8 Compare April 13, 2025 17:54
@TomJo2000 TomJo2000 changed the title bump(main/libxml2): 2.14.0 bump(main/libxml2): 2.14.1 Apr 13, 2025
`--with-http` is required by `libspatialite`
Upstream discussion: https://www.gaia-gis.it/fossil/libspatialite/tktview?name=2b1697e601

Co-authored-by: Robert Kirkman <rkirkman@termux.dev>
@TomJo2000
Copy link
Member Author

I'd like to start getting these merged since all remaining blockers are now cleared.

Will add a time estimate and order of operations shortly.

@TomJo2000 TomJo2000 mentioned this pull request Apr 13, 2025
@TomJo2000
Copy link
Member Author

TomJo2000 commented Apr 13, 2025

I'm making a list, I'm checking it twice,
assuming 3 simultaneous CI runs at any given time to not overwhelm the system
we're looking at about 5 hours for the full rebuilds.
I'll check off each box after that package is rebuilt and on the package mirror.

~ 280 Minutes, 1 package

  • main/libllvm

~ 3 Minutes, 1 package

  • main/xmlsec

~ 5 Minutes, 1 package

  • x11/epiphany

~ 18 Minutes, 21 packages

  • main/libarchive
  • main/libbluray
  • main/libcroco
  • main/libgnt
  • main/libgnustep-base
  • main/libgsf
  • main/libraptor2
  • main/librasqal
  • main/librsvg
  • main/libshout
  • main/libsoup
  • main/libspatialite
  • main/spatialite-tools
  • main/libwayland
  • main/libwv
  • main/libxslt
  • x11/libgedit-gtksourceview
  • x11/libmateweather
  • x11/libxkbcommon
  • x11/libxklavier
  • x11/libxml++-2.6

~ 50 Minutes, 11 packages

  • main/emacs
  • x11/emacs-x
  • main/crystal
  • main/ffmpeg
  • main/gnucobol
  • main/gst-plugins-bad
  • main/gst-plugins-good
  • main/graphicsmagick
  • main/openscad
  • main/php
  • main/texlive-bin

~ 60 Minutes, 36 packages

  • main/appstream
  • main/aria2
  • main/at-spi2-core
  • main/cfengine
  • main/clamav
  • main/ctags
  • main/dcmtk
  • main/dnsutils
  • main/dvdauthor
  • main/ebook-tools
  • main/finch
  • main/gettext
  • main/icecast
  • main/imagemagick
  • main/lastpass-cli
  • main/lv2
  • main/mapserver
  • main/monetdb
  • main/netpbm
  • main/newsboat
  • main/nzbget
  • main/oathtool
  • main/openbabel
  • main/python-lxml
  • main/qalc
  • main/rdrview
  • main/recoll
  • main/sc-im
  • main/squid
  • main/stoken
  • main/totem-pl-parser
  • main/uwsgi
  • main/xmlstarlet
  • main/yuma123
  • root/nfs-utils
  • root/tshark

~ 70 Minutes, 1 package

  • main/codon

~ 110 Minutes, 1 package

  • x11/webkit2gtk-4.1

~ 110 Minutes, 1 package

  • x11/webkitgtk-6.0

~ 140 Minutes, 35 packages

  • main/gdal
  • main/postgis
  • main/postgresql
  • main/vlc
  • x11/vlc-qt
  • x11/abiword
  • x11/ardour
  • x11/atril
  • x11/audacious-plugins
  • x11/bluefish
  • x11/cairo-dock-core
  • x11/caja
  • x11/cherrytree
  • x11/evince
  • x11/far2l
  • x11/florence
  • x11/fontforge-gtk
  • x11/glade
  • x11/gnome-calculator
  • x11/gnumeric
  • x11/goffice
  • x11/gtksourceview3
  • x11/gtksourceview4
  • x11/gtksourceview5
  • x11/gvfs
  • x11/handbrake
  • x11/inkscape
  • x11/labwc
  • x11/mlt
  • x11/openbox
  • x11/pidgin
  • x11/rhythmbox
  • x11/shared-mime-info
  • x11/wireshark-qt
  • x11/xournalpp

~ 200 Minutes, 1 package

  • main/swift

@TomJo2000 TomJo2000 merged commit b349789 into termux:master Apr 13, 2025
9 checks passed
@TomJo2000 TomJo2000 linked an issue Apr 14, 2025 that may be closed by this pull request
@TomJo2000
Copy link
Member Author

codon is flaking.
Specifically the AAarch64 build.

closing connection #0
--- LOG END ---
error: downloading 'https://www.sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz' failed
status_code: 28
status_string: "Timeout was reached"
log:
--- LOG BEGIN ---

https://github.com/termux/termux-packages/actions/runs/14434556731/job/40475839176#step:7:8911

I'm gonna assume this is a transient failure and I will be retrying that CI run again later, but it's pretty frustrating because it's right at the end of a 70 minute build.

@TomJo2000
Copy link
Member Author

@TomJo2000 TomJo2000 deleted the libxml2 branch June 8, 2025 02:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Auto update failing for libxml2
2 participants