revbump({x11,root}): for boost 1.89.0

root-packages/thin-provisioning-tools/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A suite of tools for manipulating the metadata of the dm
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="0.9.0"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/jthornber/thin-provisioning-tools/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=a2508d9933ed8a3f6c8d302280d838d416668a1d914a83c4bd0fb01eaf0676e8
 TERMUX_PKG_DEPENDS="libexpat, libaio, boost"

x11-packages/abiword/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A free word processing program"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="3.0.7"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://gitlab.gnome.org/World/AbiWord/-/archive/release-${TERMUX_PKG_VERSION}/AbiWord-release-${TERMUX_PKG_VERSION}.tar.gz
 #TERMUX_PKG_SRCURL=https://dev.alpinelinux.org/archive/abiword/abiword-${TERMUX_PKG_VERSION}.tar.gz
 #TERMUX_PKG_SRCURL=https://ftp-osl.osuosl.org/pub/gentoo/distfiles/abiword-${TERMUX_PKG_VERSION}.tar.gz

x11-packages/abiword/ndk-r28c.patch

@@ -0,0 +1,79 @@
+This is https://github.com/freebsd/freebsd-ports/commit/e6daa211c609bde6ed3fe00fd5ce675714371805
+
+--- a/plugins/kword/xp/ie_imp_KWord_1.cpp
++++ b/plugins/kword/xp/ie_imp_KWord_1.cpp
+@@ -180,7 +180,7 @@ void IE_Imp_KWord_1::charData(const gchar *s, int len)
+ 	  m_charDataSeen[m_lenCharDataSeen++] = currentChar;
+ 	  if (m_lenCharDataSeen == m_lenCharDataExpected)
+ 	    {
+-	      buf += g_utf8_get_char(m_charDataSeen);
++	      buf += static_cast<UT_UCS4Char>(g_utf8_get_char(m_charDataSeen));
+ 	      m_lenCharDataSeen = 0;
+ 	    }
+ 	}
+--- a/src/af/ev/gtk/ev_UnixKeyboard.cpp
++++ b/src/af/ev/gtk/ev_UnixKeyboard.cpp
+@@ -130,7 +130,7 @@ bool ev_UnixKeyboard::keyPressEvent(AV_View* pView, GdkEventKey* e)
+ 	  {
+ 	    // TODO: is this necessary?
+ 	    charData = gdk_keyval_to_unicode (charData);
+-	    UT_UTF8String utf8 (static_cast<const UT_UCS4Char *>(&charData), 1);
++	    UT_UTF8String utf8 (reinterpret_cast<const UT_UCS4Char *>(&charData), 1);
+ 	    return charDataEvent (pView, state, utf8.utf8_str(), utf8.byteLength());
+ 	  }
+
+--- a/src/af/gr/xp/gr_CairoGraphics.cpp
++++ b/src/af/gr/xp/gr_CairoGraphics.cpp
+@@ -535,7 +535,7 @@ bool GR_CairoGraphics::endPrint(void)
+
+ void GR_CairoGraphics::drawGlyph(UT_uint32 Char, UT_sint32 xoff, UT_sint32 yoff)
+ {
+-	drawChars(&Char, 0, 1, xoff, yoff, NULL);
++	drawChars(reinterpret_cast<const UT_UCSChar*>(&Char), 0, 1, xoff, yoff, NULL);
+ }
+
+ void GR_CairoGraphics::setColorSpace(GR_Graphics::ColorSpace /* c */)
+--- a/src/af/util/xp/ut_types.h
++++ b/src/af/util/xp/ut_types.h
+@@ -40,7 +40,7 @@
+
+ typedef guint8		UT_Byte;
+
+-typedef gunichar        UT_UCS4Char;
++typedef char32_t        UT_UCS4Char;
+ typedef guint16      UT_UCS2Char;
+ typedef gint32          UT_GrowBufElement;
+
+--- a/src/text/fmt/xp/fv_View_protected.cpp
++++ b/src/text/fmt/xp/fv_View_protected.cpp
+@@ -5752,7 +5752,7 @@ UT_UCSChar * FV_View::_lookupSuggestion(fl_BlockLayout* pBL,
+ 		UT_uint32 len = iLength;
+ 		for (UT_uint32 ldex=0; ldex < len && ldex < INPUTWORDLEN; ldex++)
+ 		{
+-			stMisspelledWord += *pWord == UCS_RQUOTE ? '\'' : *pWord;
++			stMisspelledWord += *pWord == UCS_RQUOTE ? U'\'' : *pWord;
+ 			++pWord;
+ 		}
+
+--- a/src/wp/ap/gtk/ap_UnixDialog_Options.cpp
++++ b/src/wp/ap/gtk/ap_UnixDialog_Options.cpp
+@@ -959,7 +959,7 @@ void AP_UnixDialog_Options::_setupSmartQuotesCombos(  GtkWidget *optionmenu  )
+ 		wszDisplayString[1] = (gunichar)'O';
+ 		wszDisplayString[2] = XAP_EncodingManager::smartQuoteStyles[i].rightQuote;
+ 		wszDisplayString[3] = (gunichar)0;
+-        gchar* szDisplayStringUTF8 = g_ucs4_to_utf8 ( wszDisplayString, -1, NULL, NULL, NULL );
++        gchar* szDisplayStringUTF8 = g_ucs4_to_utf8 ( reinterpret_cast<const gunichar*>(wszDisplayString), -1, NULL, NULL, NULL );
+ 		XAP_appendComboBoxTextAndInt(combo, szDisplayStringUTF8, i);
+         g_free ( szDisplayStringUTF8 );
+ 	}
+--- a/src/wp/ap/xp/ap_Menu_Functions.cpp
++++ b/src/wp/ap/xp/ap_Menu_Functions.cpp
+@@ -744,7 +744,7 @@ Defun_EV_GetMenuItemComputedLabel_Fn(ap_GetLabel_Suggest)
+ 	UT_UCSChar *p = pView->getContextSuggest(ndx);
+ 	gchar * c = NULL;
+ 	if (p && *p) {
+-		c = g_ucs4_to_utf8(p, -1, NULL, NULL, NULL);
++		c = g_ucs4_to_utf8(reinterpret_cast<const gunichar *>(p), -1, NULL, NULL, NULL);
+ 	}
+ 	else if (ndx == 1)
+ 	{

x11-packages/ardour/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A professional digital workstation for working with audi
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="8.12"
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=git+https://github.com/Ardour/ardour
 TERMUX_PKG_GIT_BRANCH=$TERMUX_PKG_VERSION
 TERMUX_PKG_DEPENDS="aubio, fftw, fontconfig, gdk-pixbuf, glib, gtk2, gtkmm2, libandroid-execinfo, libarchive, libatkmm-1.6, libc++, libcairo, libcairomm-1.0, libcurl, libglibmm-2.4, liblo, liblrdf, libpangomm-1.4, libsamplerate, libsigc++-2.0, libsndfile, libusb, libwebsockets, libx11, libxml2, lilv, pango, pulseaudio, rubberband, suil, taglib, vamp-plugin-sdk"

x11-packages/fcitx5-chinese-addons/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Addons related to Chinese, including IME previous bundle
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="5.1.9"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://github.com/fcitx/fcitx5-chinese-addons/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=2b2b5418c4a670be1b824c0ee6e5cae48e5115402fe3b2a407aceb19f122339b
 TERMUX_PKG_DEPENDS="boost, fcitx5, fcitx5-qt, libc++, libcurl, libime, libopencc, qt6-qtbase"

x11-packages/fritzing/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="An Electronic Design Automation software"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.9.6
-TERMUX_PKG_REVISION=7
+TERMUX_PKG_REVISION=8
 TERMUX_PKG_SRCURL=https://github.com/fritzing/fritzing-app/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=eb4ebe461c5d42edb4b10f1f824e7c855ad54555e222c5999061dead09834491
 TERMUX_PKG_AUTO_UPDATE=true

x11-packages/hugin/boost-1.89.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 44efd6f..9c1c29a 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -373,7 +373,7 @@ IF(WIN32)
+   ENDIF()
+ ENDIF(WIN32)
+
+-FIND_PACKAGE(Boost 1.47 COMPONENTS filesystem system)
++FIND_PACKAGE(Boost 1.47 COMPONENTS filesystem)
+
+ IF (NOT Boost_FOUND)
+   IF(WIN32)

x11-packages/hugin/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Toolchain to create panoramic images for every occasion"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2024.0.1"
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/hugin/hugin-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=13ec0cdeeb4eb63149c833768d3e374e7cf5a6a8d8d02d50885ce496f05ba7e4
 TERMUX_PKG_DEPENDS="boost, enblend, exiftool, exiv2, fftw, glew, glu, imath, libc++, libflann, liblz4, libpano13, libsqlite, libtiff, libvigra, libx11, littlecms, openexr, opengl, wxwidgets"

x11-packages/inkscape/build.sh

@@ -15,6 +15,7 @@ LICENSES/OFL-1.1.txt
 "
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.4.2"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://media.inkscape.org/dl/resources/file/inkscape-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=2000530c7917e5260c9e8575a7154ff6926643d2006487d714e304a963f0c782
 TERMUX_PKG_AUTO_UPDATE=true

x11-packages/libime/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A library to support generic input method implementation
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.1.11"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=git+https://github.com/fcitx/libime
 TERMUX_PKG_GIT_BRANCH="${TERMUX_PKG_VERSION}"
 TERMUX_PKG_DEPENDS="boost, fcitx5, libc++, libime-data, zstd"

x11-packages/lyx/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="WYSIWYM (What You See Is What You Mean) Document Process
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.4.4"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://ftp.lip6.fr/pub/lyx/stable/${TERMUX_PKG_VERSION:0:3}.x/lyx-${TERMUX_PKG_VERSION/p/-}.tar.xz"
 TERMUX_PKG_SHA256=ffacd37480f320f3f3f8f30445fe40897e9df44c94ee87ba0413e364086f4b90
 TERMUX_PKG_AUTO_UPDATE=true
@@ -21,5 +22,7 @@ termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-execinfo"
 
 	# This is to allow the build script find the `moc` on cross-build host
-	export PATH="${TERMUX_PREFIX}/opt/qt/cross/bin:${PATH}"
+	if [[ "$TERMUX_ON_DEVICE_BUILD" == "false" ]]; then
+		export PATH="${TERMUX_PREFIX}/opt/qt/cross/bin:${PATH}"
+	fi
 }

x11-packages/mkvtoolnix/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Set of tools to create, edit and inspect Matroska files"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="94.0"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=git+https://codeberg.org/mbunkus/mkvtoolnix
 TERMUX_PKG_GIT_BRANCH=release-$TERMUX_PKG_VERSION
 TERMUX_PKG_AUTO_UPDATE=true
@@ -15,14 +16,27 @@ ac_cv_fmt=no
 enable_gui=no
 --disable-static
 --with-boost-filesystem=boost_filesystem
---with-boost-system=boost_system
 --with-boost-date-time=boost_date_time
 --with-qmake6=${TERMUX_PREFIX}/lib/qt6/bin/host-qmake6
 "
 
 termux_step_pre_configure() {
 	export PKG_CONFIG_LIBDIR="$TERMUX_PKG_CONFIG_LIBDIR"
 	./autogen.sh
+
+	# make sure that when this file no longer exists, this block is removed.
+	# (context: the Ubuntu 24.04 builder image has autoconf-archive 20220903-3,
+	# and this conflicts with the use of 'autoreconf -fi'
+	# in packages which are being built against boost 1.89)
+	if [[ "$TERMUX_ON_DEVICE_BUILD" == "false" ]]; then
+		local file=/usr/share/aclocal/ax_boost_system.m4
+		if [[ ! -f "$file" ]]; then
+			termux_error_exit "$file no longer exists. Please edit $TERMUX_PKG_NAME's build.sh to remove this block."
+		fi
+		# remove this line too after the above check fails
+		# (it willl no longer be necessary when the above check fails):
+		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ax_cv_boost_system=yes --without-boost-system"
+	fi
 }
 
 termux_step_make() {

x11-packages/mumble-server/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Server module for Mumble, an open source voice-chat soft
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.5.517
-TERMUX_PKG_REVISION=12
+TERMUX_PKG_REVISION=13
 TERMUX_PKG_SRCURL=git+https://github.com/mumble-voip/mumble
 TERMUX_PKG_DEPENDS="libc++, libcap, libprotobuf, openssl, qt5-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers, qt5-qtbase-cross-tools"

x11-packages/openimageio/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A library for reading and writing images, including clas
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="3.0.10.0"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=c424637af66fc6d04f202156c3f7cf4a5484ccbe07966d3d8a1fde27c7472721
 # configure-time error if ptex and ptex-static are not both installed

x11-packages/openvdb/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Sparse volume data structure and tools"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="12.1.0"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL="https://github.com/AcademySoftwareFoundation/openvdb/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=ebb9652ad1d67274e2c85e6736cced5f04e313c5671ae1ae548f174cc76e9e64
 TERMUX_PKG_DEPENDS="boost, imath, libblosc, libtbb, zlib"

x11-packages/poppler-qt/build.sh

@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 # Please align the version with `poppler` package.
 TERMUX_PKG_VERSION="24.05.0"
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 # Do not forget to bump revision of reverse dependencies and rebuild them
 # when SOVERSION is changed.
 _POPPLER_SOVERSION=137

x11-packages/qbittorrent/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A Qt6 based BitTorrent client"
 TERMUX_PKG_LICENSE="GPL-2.0, GPL-3.0"
 TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000"
 TERMUX_PKG_VERSION="5.1.2"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/qbittorrent/qBittorrent/archive/refs/tags/release-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=a35448f3c8cb57d033bd3c4bd66c63417b0ca793ae7e9c5c5053960e2229ad9e
 TERMUX_PKG_BUILD_DEPENDS="qt6-qtsvg, qt6-qttools, boost"

x11-packages/quassel/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Quassel IRC is a modern, cross-platform, distributed IRC
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.14.0
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://github.com/quassel/quassel/releases/download/$TERMUX_PKG_VERSION/quassel-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=090777f37a6ae1057a046d5c2896ce5e4bef2382377e3ba52c63efe6b5fe4e10
 TERMUX_PKG_DEPENDS="boost, dbus, qt5-qtbase, qt5-qtsvg, qt5-qtx11extras, qt5-qtmultimedia, qt5-qtwebengine, libdbusmenu-qt, libnotify, sqlite, zlib"

x11-packages/telegram-desktop/build.sh

@@ -5,9 +5,10 @@ TERMUX_PKG_LICENSE="custom"
 TERMUX_PKG_LICENSE_FILE="LICENSE, LEGAL"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=5.15.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/telegramdesktop/tdesktop/releases/download/v$TERMUX_PKG_VERSION/tdesktop-$TERMUX_PKG_VERSION-full.tar.gz
 TERMUX_PKG_SHA256=3705dc2ecf51e9290a565b7a06dcdfc5ecbac13ec536afe582f3411653ad50d9
-TERMUX_PKG_DEPENDS="abseil-cpp, boost, ffmpeg, glib, hicolor-icon-theme, hunspell, kf6-kcoreaddons, libandroid-shmem, libc++, libdispatch, libdrm, liblz4, libminizip, protobuf, librnnoise, libsigc++-3.0, libx11, libxcomposite, libxdamage, libxrandr, libxtst, openal-soft, opengl, openh264, openssl, pipewire, pulseaudio, qt6-qtbase, qt6-qtimageformats, qt6-qtsvg, xxhash, zlib"
+TERMUX_PKG_DEPENDS="abseil-cpp, boost, ffmpeg, glib, hicolor-icon-theme, hunspell, kf6-kcoreaddons, libandroid-shmem, libc++, libdispatch, libdrm, libjxl, liblz4, libminizip, protobuf, librnnoise, libsigc++-3.0, libx11, libxcomposite, libxdamage, libxrandr, libxtst, openal-soft, opengl, openh264, openssl, pipewire, pulseaudio, qt6-qtbase, qt6-qtimageformats, qt6-qtsvg, xxhash, zlib"
 TERMUX_PKG_BUILD_DEPENDS="ada, aosp-libs, boost-headers, glib-cross, qt6-qtbase-cross-tools"
 TERMUX_PKG_VERSIONED_GIR=false
 TERMUX_PKG_AUTO_UPDATE=true