From ec4eb507e152aeaee742ecbf5c31617ed2061dd8 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Fri, 16 Dec 2022 11:27:04 +0900
Subject: [PATCH] libtiff: Revbump revdeps to rebuild

---
 packages/chafa/build.sh                       |  1 +
 packages/dcmtk/build.sh                       |  5 +++--
 packages/djvulibre/build.sh                   |  2 +-
 packages/enblend/build.sh                     |  2 +-
 packages/gdk-pixbuf/build.sh                  |  1 +
 packages/gegl/build.sh                        |  1 +
 packages/ghostscript/build.sh                 |  1 +
 packages/gmic/build.sh                        |  2 +-
 packages/go-findimagedupes/build.sh           |  1 +
 packages/graphicsmagick/build.sh              |  4 ++--
 packages/imagemagick/build.sh                 |  3 ++-
 packages/imlib2/build.sh                      |  4 ++--
 packages/jbig2enc/build.sh                    |  4 +++-
 packages/leptonica/build.sh                   |  2 +-
 packages/libdevil/build.sh                    |  2 +-
 packages/libgd/build.sh                       |  6 +++--
 packages/libgeotiff/build.sh                  |  1 +
 packages/libgxps/build.sh                     |  1 +
 packages/libpano13/build.sh                   |  1 +
 packages/libvigra/build.sh                    |  2 +-
 packages/libvips/build.sh                     |  3 ++-
 packages/libwebp/build.sh                     |  1 +
 packages/links/build.sh                       |  3 ++-
 packages/littlecms/build.sh                   |  1 +
 packages/netpbm/build.sh                      |  6 +++--
 .../netpbm/buildtools-installnetpbm.pl.patch  | 22 +++++++++++++++++++
 packages/netpbm/config.mk.in.patch            | 11 ++++++++++
 packages/opencv/build.sh                      |  4 ++--
 packages/opencv/opencv-python.subpackage.sh   |  2 +-
 packages/openjpeg/build.sh                    |  1 +
 packages/poppler/build.sh                     |  1 +
 packages/povray/build.sh                      |  2 +-
 packages/proj/build.sh                        |  1 +
 packages/python-pillow/build.sh               |  1 +
 x11-packages/azpainter/build.sh               |  8 ++++++-
 x11-packages/emacs-x/build.sh                 |  1 +
 x11-packages/evince/build.sh                  |  1 +
 x11-packages/fontforge-gtk/build.sh           |  2 +-
 x11-packages/gimp/build.sh                    |  4 ++--
 x11-packages/gtk4/build.sh                    |  1 +
 x11-packages/hugin/build.sh                   |  2 +-
 x11-packages/mtpaint/build.sh                 |  6 ++---
 x11-packages/sdl-image/build.sh               |  3 ++-
 x11-packages/sdl2-image/build.sh              |  3 ++-
 x11-packages/wmaker/build.sh                  |  8 +++----
 x11-packages/wxwidgets/build.sh               |  1 +
 46 files changed, 106 insertions(+), 39 deletions(-)
 create mode 100644 packages/netpbm/config.mk.in.patch

diff --git a/packages/chafa/build.sh b/packages/chafa/build.sh
index f81ac8827e..24da4e13cc 100644
--- a/packages/chafa/build.sh
+++ b/packages/chafa/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Image-to-text converter supporting a wide range of symbo
 TERMUX_PKG_LICENSE="LGPL-3.0"
 TERMUX_PKG_MAINTAINER="Yonle <yonle@protonmail.com>"
 TERMUX_PKG_VERSION=1.12.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://github.com/hpjansson/chafa/releases/download/${TERMUX_PKG_VERSION}/chafa-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=9774bd1a7076ea3124f7fea811e371d0e1da2e76b7ac06260d63a86c7b1a573f
 TERMUX_PKG_DEPENDS="freetype, glib, imagemagick, libcairo, libjpeg-turbo, librsvg, libtiff, libwebp"
diff --git a/packages/dcmtk/build.sh b/packages/dcmtk/build.sh
index ce453f6820..365a370a10 100644
--- a/packages/dcmtk/build.sh
+++ b/packages/dcmtk/build.sh
@@ -5,10 +5,11 @@ TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_LICENSE_FILE="COPYRIGHT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="3.6.7"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL="https://github.com/DCMTK/dcmtk/archive/refs/tags/DCMTK-$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=17705dcdb2047d1266bb4e92dbf4aa6d4967819e8e3e94f39b7df697661b4860
-TERMUX_PKG_DEPENDS="libc++, zlib, libpng, libtiff, libxml2, openssl, libiconv, libjpeg-turbo, libsndfile"
+TERMUX_PKG_DEPENDS="libc++, libiconv, libjpeg-turbo, libpng, libtiff, libxml2, openssl, zlib"
+TERMUX_PKG_BUILD_DEPENDS="libsndfile"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DDCMTK_NO_TRY_RUN=ON
diff --git a/packages/djvulibre/build.sh b/packages/djvulibre/build.sh
index 0d6688887e..ae353d815c 100644
--- a/packages/djvulibre/build.sh
+++ b/packages/djvulibre/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Suite to create, manipulate and view DjVu ('déjà vu')
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=3.5.28
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/djvu/djvulibre-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=fcd009ea7654fde5a83600eb80757bd3a76998e47d13c66b54c8db849f8f2edc
 TERMUX_PKG_DEPENDS="libc++, libtiff"
diff --git a/packages/enblend/build.sh b/packages/enblend/build.sh
index 384eed42f5..653b659ecd 100644
--- a/packages/enblend/build.sh
+++ b/packages/enblend/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 _VERSION=4.2.0_p20161007
 TERMUX_PKG_VERSION=${_VERSION//_/}
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://dev.gentoo.org/~soap/distfiles/enblend-${_VERSION}.tar.xz
 TERMUX_PKG_SHA256=4fe05af3d697bd6b2797facc8ba5aeabdc91e233156552301f1c7686232ff4c3
 TERMUX_PKG_DEPENDS="gsl, libandroid-glob, libc++, libtiff, libvigra, littlecms"
diff --git a/packages/gdk-pixbuf/build.sh b/packages/gdk-pixbuf/build.sh
index 70a9d70f26..cb32699c98 100644
--- a/packages/gdk-pixbuf/build.sh
+++ b/packages/gdk-pixbuf/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 _MAJOR_VERSION=2.42
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.10
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/${_MAJOR_VERSION}/gdk-pixbuf-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b
 TERMUX_PKG_DEPENDS="glib, libpng, libtiff, libjpeg-turbo, zstd"
diff --git a/packages/gegl/build.sh b/packages/gegl/build.sh
index 5d709645b3..f3a069ca72 100644
--- a/packages/gegl/build.sh
+++ b/packages/gegl/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 _MAJOR_VERSION=0.4
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.40
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://download.gimp.org/pub/gegl/${_MAJOR_VERSION}/gegl-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=cdde80d15a49dab9a614ef98f804c8ce6e4cfe1339a3c240c34f3fb45436b85d
 TERMUX_PKG_DEPENDS="babl, ffmpeg, gdk-pixbuf, glib, json-glib, libandroid-support, libc++, libcairo, libjasper, libjpeg-turbo, libpng, librsvg, libtiff, libwebp, littlecms, openexr, pango, poppler"
diff --git a/packages/ghostscript/build.sh b/packages/ghostscript/build.sh
index 20fd790c9d..943ea86372 100644
--- a/packages/ghostscript/build.sh
+++ b/packages/ghostscript/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Interpreter for the PostScript language and for PDF"
 TERMUX_PKG_LICENSE="AGPL-V3"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=10.0.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${TERMUX_PKG_VERSION//.}/ghostpdl-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=f30283f01a6966009a2e7b7553decdb5ec805501f3e24e5d86b0017fe16fbdba
 TERMUX_PKG_DEPENDS="fontconfig, freetype, jbig2dec, libandroid-support, libc++, libiconv, libidn, libjpeg-turbo, libpng, libtiff, littlecms, openjpeg, zlib"
diff --git a/packages/gmic/build.sh b/packages/gmic/build.sh
index 29141b1d48..c81a397e68 100644
--- a/packages/gmic/build.sh
+++ b/packages/gmic/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Full-featured framework for image processing"
 TERMUX_PKG_LICENSE="CeCILL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.9.9
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
 TERMUX_PKG_DEPENDS="libc++, libcurl, fftw, libpng, libjpeg-turbo, libtiff, zlib"
diff --git a/packages/go-findimagedupes/build.sh b/packages/go-findimagedupes/build.sh
index 0f2b6b02e5..482fba6347 100644
--- a/packages/go-findimagedupes/build.sh
+++ b/packages/go-findimagedupes/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 _COMMIT=47ca1d51be2bc1d437261d82157b84fe977ec934
 TERMUX_PKG_VERSION=2022.07.22
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://gitlab.com/opennota/findimagedupes.git
 TERMUX_PKG_GIT_BRANCH=master
 TERMUX_PKG_DEPENDS="file, libc++, libheif, libjpeg-turbo, libpng, libtiff"
diff --git a/packages/graphicsmagick/build.sh b/packages/graphicsmagick/build.sh
index b18a81b1c1..ac1abb0997 100644
--- a/packages/graphicsmagick/build.sh
+++ b/packages/graphicsmagick/build.sh
@@ -3,11 +3,11 @@ TERMUX_PKG_DESCRIPTION="Collection of image processing tools"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.3.38
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 # Bandwith limited on main ftp site, so it's asked to use sourceforge instead:
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${TERMUX_PKG_VERSION}/GraphicsMagick-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=d60cd9db59351d2b9cb19beb443170acaa28f073d13d258f67b3627635e32675
-TERMUX_PKG_DEPENDS="freetype, libbz2, libc++, libjasper, libjpeg-turbo, liblzma, libpng, libtiff, libwebp, libxml2, littlecms, zlib, zstd"
+TERMUX_PKG_DEPENDS="freetype, libbz2, libc++, libde265, libheif, libjasper, libjpeg-turbo, liblzma, libpng, libtiff, libwebp, libxml2, littlecms, zlib, zstd"
 TERMUX_PKG_BREAKS="graphicsmagick-dev"
 TERMUX_PKG_REPLACES="graphicsmagick++, graphicsmagick-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh
index ceee33a101..1904ec076c 100644
--- a/packages/imagemagick/build.sh
+++ b/packages/imagemagick/build.sh
@@ -4,10 +4,11 @@ TERMUX_PKG_LICENSE="ImageMagick"
 TERMUX_PKG_MAINTAINER="@termux"
 _VERSION=7.1.0-54
 TERMUX_PKG_VERSION=${_VERSION//-/.}
+TERMUX_PKG_REVISION=1
 #TERMUX_PKG_SRCURL=https://github.com/ImageMagick/ImageMagick/archive/refs/tags/${_VERSION}.tar.gz
 TERMUX_PKG_SRCURL=https://imagemagick.org/archive/releases/ImageMagick-${_VERSION}.tar.xz
 TERMUX_PKG_SHA256=6d0d952000217b677276a342a4c609776386d0daf2ccf354b6ed8dbc07d22ef7
-TERMUX_PKG_DEPENDS="fftw, fontconfig, freetype, gdk-pixbuf, glib, harfbuzz, libandroid-support, libbz2, libc++, libcairo, libheif, libjpeg-turbo, libjxl, liblzma, libpng, librsvg, libtiff, libwebp, libx11, libxext, libxml2, littlecms, openexr, openjpeg, pango, zlib"
+TERMUX_PKG_DEPENDS="fftw, fontconfig, freetype, gdk-pixbuf, glib, harfbuzz, libandroid-support, libbz2, libc++, libcairo, libheif, libjpeg-turbo, libjxl, liblzma, libpng, librsvg, libtiff, libwebp, libx11, libxext, libxml2, littlecms, openexr, openjpeg, pango, zlib, zstd"
 TERMUX_PKG_BREAKS="imagemagick-dev, imagemagick-x"
 TERMUX_PKG_REPLACES="imagemagick-dev, imagemagick-x"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/imlib2/build.sh b/packages/imlib2/build.sh
index b04d2847cf..fc0ece5157 100644
--- a/packages/imlib2/build.sh
+++ b/packages/imlib2/build.sh
@@ -4,8 +4,8 @@ TERMUX_PKG_LICENSE="custom"
 TERMUX_PKG_LICENSE_FILE="COPYING, COPYING-PLAIN"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.9.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/enlightenment/imlib2-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=4a224038bfffbe5d4d250c44e05f4ee5ae24dcfef8395b1677c715c58f764d43
-TERMUX_PKG_DEPENDS="freetype, gdk-pixbuf, giflib, glib, libandroid-shmem, libbz2, libcairo, libheif, libid3tag, libjpeg-turbo, libjxl, liblzma, libpng, librsvg, libtiff, libwebp, libx11, libxcb, libxext, openjpeg, zlib"
+TERMUX_PKG_DEPENDS="freetype, gdk-pixbuf, giflib, glib, libandroid-shmem, libbz2, libcairo, libheif, libid3tag, libjpeg-turbo, libjxl, liblzma, libpng, librsvg, libtiff, libwebp, libx11, libxcb, libxext, openjpeg, zlib, zstd"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="LIBS=-landroid-shmem"
diff --git a/packages/jbig2enc/build.sh b/packages/jbig2enc/build.sh
index b375c28cde..55b4c3c72b 100644
--- a/packages/jbig2enc/build.sh
+++ b/packages/jbig2enc/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 _COMMIT=ea6a40a2cbf05efb00f3418f2d0ad71232565beb
 TERMUX_PKG_VERSION=2019.09.08
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/agl/jbig2enc.git
 TERMUX_PKG_GIT_BRANCH=master
 TERMUX_PKG_DEPENDS="giflib, leptonica, libc++, libjpeg-turbo, libpng, libtiff, libwebp, python, zlib"
@@ -23,4 +23,6 @@ termux_step_post_get_source() {
 
 termux_step_pre_configure() {
 	sh autogen.sh
+
+	LDFLAGS+=" $($CC -print-libgcc-file-name)"
 }
diff --git a/packages/leptonica/build.sh b/packages/leptonica/build.sh
index 2ad2004b07..25fa10d400 100644
--- a/packages/leptonica/build.sh
+++ b/packages/leptonica/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_LICENSE_FILE="leptonica-license.txt"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.82.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/DanBloomberg/leptonica/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=40fa9ac1e815b91e0fa73f0737e60c9eec433a95fa123f95f2573dd3127dd669
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/libdevil/build.sh b/packages/libdevil/build.sh
index c3c857d411..ce8e7f5137 100644
--- a/packages/libdevil/build.sh
+++ b/packages/libdevil/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A cross-platform image library utilizing a simple syntax
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.8.0
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://github.com/DentonW/DevIL/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=52129f247b26fcb5554643c9e6bbee75c4b9717735fdbf3c6ebff08cee38ad37
 TERMUX_PKG_DEPENDS="libc++, libjasper, libjpeg-turbo, libpng, libtiff, littlecms"
diff --git a/packages/libgd/build.sh b/packages/libgd/build.sh
index 0ba9d1d5c0..842bd528b5 100644
--- a/packages/libgd/build.sh
+++ b/packages/libgd/build.sh
@@ -1,11 +1,13 @@
 TERMUX_PKG_HOMEPAGE=https://libgd.github.io/
 TERMUX_PKG_DESCRIPTION="GD is an open source code library for the dynamic creation of images by programmers"
-TERMUX_PKG_LICENSE="BSD"
+TERMUX_PKG_LICENSE="custom"
+TERMUX_PKG_LICENSE_FILE="COPYING"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1:2.3.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/libgd/libgd/releases/download/gd-${TERMUX_PKG_VERSION:2}/libgd-${TERMUX_PKG_VERSION:2}.tar.gz
 TERMUX_PKG_SHA256=dd3f1f0bb016edcc0b2d082e8229c822ad1d02223511997c80461481759b1ed2
-TERMUX_PKG_DEPENDS="freetype, fontconfig, libiconv, libjpeg-turbo, libpng, libtiff, libwebp, zlib"
+TERMUX_PKG_DEPENDS="fontconfig, freetype, libheif, libiconv, libjpeg-turbo, libpng, libtiff, libwebp, zlib"
 TERMUX_PKG_BREAKS="libgd-dev"
 TERMUX_PKG_REPLACES="libgd-dev"
 
diff --git a/packages/libgeotiff/build.sh b/packages/libgeotiff/build.sh
index 7fceeb985f..36454f3a46 100644
--- a/packages/libgeotiff/build.sh
+++ b/packages/libgeotiff/build.sh
@@ -5,6 +5,7 @@ TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_LICENSE_FILE="LICENSE"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.7.1"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://github.com/OSGeo/libgeotiff/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=09a0cae5352030011b994a60237743a1327ab95ce482318d45bf9fcb5e5f76b5
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/libgxps/build.sh b/packages/libgxps/build.sh
index 3c19ee500b..6a0a744978 100644
--- a/packages/libgxps/build.sh
+++ b/packages/libgxps/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 _MAJOR_VERSION=0.3
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/libgxps/${_MAJOR_VERSION}/libgxps-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 TERMUX_PKG_DEPENDS="freetype, glib, libarchive, libcairo, libgxps, libjpeg-turbo, libpng, libtiff, littlecms"
diff --git a/packages/libpano13/build.sh b/packages/libpano13/build.sh
index 8809e1d318..f808e672b6 100644
--- a/packages/libpano13/build.sh
+++ b/packages/libpano13/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Part of the Panorama Tools by Helmut Dersch"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.9.21
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/panotools/libpano13-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=79e5a1452199305e2961462720ef5941152779c127c5b96fc340d2492e633590
 TERMUX_PKG_DEPENDS="libjpeg-turbo, libpng, libtiff, zlib"
diff --git a/packages/libvigra/build.sh b/packages/libvigra/build.sh
index bb2e55a43d..d86b3c1c32 100644
--- a/packages/libvigra/build.sh
+++ b/packages/libvigra/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Computer vision library"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.11.1
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://github.com/ukoethe/vigra/releases/download/Version-${TERMUX_PKG_VERSION//./-}/vigra-${TERMUX_PKG_VERSION}-src.tar.gz
 TERMUX_PKG_SHA256=a5564e1083f6af6a885431c1ee718bad77d11f117198b277557f8558fa461aaf
 TERMUX_PKG_DEPENDS="libc++, libhdf5, libjpeg-turbo, libpng, libtiff, openexr, zlib"
diff --git a/packages/libvips/build.sh b/packages/libvips/build.sh
index 1b46058bf0..a112a205d8 100644
--- a/packages/libvips/build.sh
+++ b/packages/libvips/build.sh
@@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="A fast image processing library with low memory needs"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="Thibault Meyer <meyer.thibault@gmail.com>"
 TERMUX_PKG_VERSION="8.13.3"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/libvips/libvips/releases/download/v${TERMUX_PKG_VERSION}/vips-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=4eff5cdc8dbe1a05a926290a99014e20ba386f5dcca38d9774bef61413435d4c
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_DEPENDS="fftw, fontconfig, freetype, giflib, glib, harfbuzz, imagemagick, libc++, libcairo, libexif, libexpat, libheif, libjpeg-turbo, libjxl, libpng, librsvg, libtiff, libwebp, littlecms, openjpeg, pango"
+TERMUX_PKG_DEPENDS="fftw, fontconfig, freetype, giflib, glib, harfbuzz, imagemagick, libc++, libcairo, libexif, libexpat, libheif, libjpeg-turbo, libjxl, libpng, librsvg, libtiff, libwebp, littlecms, openexr, openjpeg, pango, poppler"
 TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner"
 TERMUX_PKG_DISABLE_GIR=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/libwebp/build.sh b/packages/libwebp/build.sh
index ec5a331186..b1432ad85e 100644
--- a/packages/libwebp/build.sh
+++ b/packages/libwebp/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library to encode and decode images in WebP format"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.2.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/webmproject/libwebp/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=dfe7bff3390cd4958da11e760b65318f0a48c32913e4d5bc5e8d55abaaa2d32e
 TERMUX_PKG_DEPENDS="giflib, libjpeg-turbo, libpng, libtiff"
diff --git a/packages/links/build.sh b/packages/links/build.sh
index 61fb990017..eb645ca6f4 100644
--- a/packages/links/build.sh
+++ b/packages/links/build.sh
@@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Links is a text and graphics mode WWW browser"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.28
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://links.twibright.com/download/links-$TERMUX_PKG_VERSION.tar.bz2
 TERMUX_PKG_SHA256=2fd5499b13dee59457c132c167b8495c40deda75389489c6cccb683193f454b4
-TERMUX_PKG_DEPENDS="brotli, fontconfig, freetype, glib, libbz2, libcairo, libevent, libjpeg-turbo, liblzma, libpng, librsvg, libtiff, libx11, openssl, zlib, zstd"
+TERMUX_PKG_DEPENDS="brotli, fontconfig, freetype, glib, libbz2, libcairo, libevent, libjpeg-turbo, liblzma, libpng, librsvg, libtiff, libwebp, libx11, openssl, zlib, zstd"
 TERMUX_PKG_BUILD_DEPENDS="libxt"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/littlecms/build.sh b/packages/littlecms/build.sh
index b1a682dd3d..b74cca9f4e 100644
--- a/packages/littlecms/build.sh
+++ b/packages/littlecms/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Color management library"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.14
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/mm2/Little-CMS/archive/refs/tags/lcms${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=05869269f14e589b0b6d05a76f510c68c67fabb304904d16c6bd818abec80a83
 TERMUX_PKG_BREAKS="littlecms-dev"
diff --git a/packages/netpbm/build.sh b/packages/netpbm/build.sh
index cd2c90596b..5e02bbef7e 100644
--- a/packages/netpbm/build.sh
+++ b/packages/netpbm/build.sh
@@ -1,11 +1,13 @@
 TERMUX_PKG_HOMEPAGE=http://netpbm.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Toolkit for manipulation of graphic images of different formats"
-TERMUX_PKG_LICENSE="LGPL-2.0"
+TERMUX_PKG_LICENSE="non-free"
+TERMUX_PKG_LICENSE_FILE="doc/copyright_summary"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1:10.73.41
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/netpbm/super_stable/${TERMUX_PKG_VERSION:2}/netpbm-${TERMUX_PKG_VERSION:2}.tgz
 TERMUX_PKG_SHA256=f572625514b52dde4e2b6e567b8e2738b133e50ee3c5b31d80016117440311fe
-TERMUX_PKG_DEPENDS="libpng, libxml2, libjpeg-turbo, libtiff, zlib"
+TERMUX_PKG_DEPENDS="libjpeg-turbo, libpng, libtiff, libx11, libxml2"
 TERMUX_PKG_BREAKS="netpbm-dev"
 TERMUX_PKG_REPLACES="netpbm-dev"
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/packages/netpbm/buildtools-installnetpbm.pl.patch b/packages/netpbm/buildtools-installnetpbm.pl.patch
index 7e0c97e425..d679f662d2 100644
--- a/packages/netpbm/buildtools-installnetpbm.pl.patch
+++ b/packages/netpbm/buildtools-installnetpbm.pl.patch
@@ -38,6 +38,28 @@ diff -uNr netpbm-10.73.31/buildtools/installnetpbm.pl netpbm-10.73.31.mod/buildt
  
              if (uc($response) eq "Y") {
                  execLdconfig();
+@@ -766,7 +756,7 @@
+     my $manDir;
+ 
+     while (!$manDir) {
+-        my $default = "$prefix/man";
++        my $default = "$prefix/share/man";
+ 
+         my $response = prompt("man page directory", $default);
+ 
+@@ -954,10 +944,10 @@
+ 
+     print("Installing man pages...\n");
+ 
+-    my $rc = system("$cpCommand $pkgdir/man/* $manDir/");
++    my $rc = system("$cpCommand $pkgdir/share/man/* $manDir/");
+ 
+     if ($rc != 0) {
+-        print("copy of man pages from $pkgdir/man to $manDir failed.\n");
++        print("copy of man pages from $pkgdir/share/man to $manDir failed.\n");
+         print("cp exit code is $rc\n");
+     } else {
+         print("done.\n");
 @@ -967,8 +957,6 @@
  
      removeObsoleteManPage($manDir);
diff --git a/packages/netpbm/config.mk.in.patch b/packages/netpbm/config.mk.in.patch
new file mode 100644
index 0000000000..57e218ee5c
--- /dev/null
+++ b/packages/netpbm/config.mk.in.patch
@@ -0,0 +1,11 @@
+--- a/config.mk.in
++++ b/config.mk.in
+@@ -552,7 +552,7 @@
+ 
+ # Subdirectory of the package directory ($(pkgdir)) in which man pages
+ # go.
+-PKGMANDIR = man
++PKGMANDIR = share/man
+ 
+ # File permissions for installed files.
+ # Note that on some systems (e.g. Solaris), 'install' can't use the 
diff --git a/packages/opencv/build.sh b/packages/opencv/build.sh
index 3bc8e170d6..0fe4db228a 100644
--- a/packages/opencv/build.sh
+++ b/packages/opencv/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Open Source Computer Vision Library"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=4.6.0
-TERMUX_PKG_REVISION=9
+TERMUX_PKG_REVISION=10
 TERMUX_PKG_SRCURL=https://github.com/opencv/opencv/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
-TERMUX_PKG_DEPENDS="libc++, libjpeg-turbo, libopenblas, libpng, libprotobuf, libtiff, libwebp, openjpeg, openjpeg-tools, zlib, python-numpy"
+TERMUX_PKG_DEPENDS="ffmpeg, libc++, libjpeg-turbo, libopenblas, libpng, libprotobuf, libtiff, libwebp, openjpeg, openjpeg-tools, zlib"
 TERMUX_PKG_BUILD_DEPENDS="python-numpy-static"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DANDROID_NO_TERMUX=OFF
diff --git a/packages/opencv/opencv-python.subpackage.sh b/packages/opencv/opencv-python.subpackage.sh
index ecb0b2d941..cac2ede865 100644
--- a/packages/opencv/opencv-python.subpackage.sh
+++ b/packages/opencv/opencv-python.subpackage.sh
@@ -1,6 +1,6 @@
 TERMUX_SUBPKG_INCLUDE="lib/python*"
 TERMUX_SUBPKG_DESCRIPTION="Python bindings for OpenCV"
-TERMUX_SUBPKG_DEPENDS="python"
+TERMUX_SUBPKG_DEPENDS="python, python-numpy"
 
 termux_step_create_subpkg_debscripts() {
 	_NUMPY_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python-numpy/build.sh; echo $TERMUX_PKG_VERSION)
diff --git a/packages/openjpeg/build.sh b/packages/openjpeg/build.sh
index 4c65f0aef1..8f8056caa9 100644
--- a/packages/openjpeg/build.sh
+++ b/packages/openjpeg/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="JPEG 2000 image compression library"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.5.0"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/uclouvain/openjpeg/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/poppler/build.sh b/packages/poppler/build.sh
index 8a0c9c6c08..a1ed9cd9f4 100644
--- a/packages/poppler/build.sh
+++ b/packages/poppler/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 # Please align the version with `poppler-qt` package.
 TERMUX_PKG_VERSION=22.11.0
+TERMUX_PKG_REVISION=1
 # Do not forget to bump revision of reverse dependencies and rebuild them
 # when SOVERSION is changed.
 _POPPLER_SOVERSION=125
diff --git a/packages/povray/build.sh b/packages/povray/build.sh
index 73d8b25e8d..5c83a19cdb 100644
--- a/packages/povray/build.sh
+++ b/packages/povray/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="AGPL-V3"
 TERMUX_PKG_MAINTAINER="@termux"
 _POVRAY_VERSION_BASE=3.8
 TERMUX_PKG_VERSION=${_POVRAY_VERSION_BASE}.0-beta.2
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://github.com/POV-Ray/povray/releases/download/v${TERMUX_PKG_VERSION}/povunix-v${TERMUX_PKG_VERSION}-src.tar.gz
 TERMUX_PKG_SHA256=4717c9bed114deec47cf04a8175cc4060dafc159f26e7896480a60f4411ca5ad
 TERMUX_PKG_DEPENDS="boost, libc++, libjpeg-turbo, libpng, libtiff, openexr, povray-data, zlib"
diff --git a/packages/proj/build.sh b/packages/proj/build.sh
index 92fb943289..99ec4ec9ab 100644
--- a/packages/proj/build.sh
+++ b/packages/proj/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Generic coordinate transformation software"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 TERMUX_PKG_VERSION="9.1.1"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/OSGeo/proj.4/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=31d7d953837b3bc57fa83df057affa17a3ff7d488ce83784eb53cffbe734463a
 TERMUX_PKG_DEPENDS="libc++, libsqlite, sqlite, libtiff, libcurl"
diff --git a/packages/python-pillow/build.sh b/packages/python-pillow/build.sh
index ce0dfbc0ba..a75e366cac 100644
--- a/packages/python-pillow/build.sh
+++ b/packages/python-pillow/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Python Imaging Library"
 TERMUX_PKG_LICENSE="custom"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=9.3.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=188b2a5fd445b2afa05bc0c1318ce49d4335ebbb69417fbb79acaf0a0784709e
 TERMUX_PKG_SRCURL=https://github.com/python-pillow/Pillow/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="freetype, libimagequant, libjpeg-turbo, libraqm, libtiff, libwebp, libxcb, littlecms, openjpeg, python, zlib"
diff --git a/x11-packages/azpainter/build.sh b/x11-packages/azpainter/build.sh
index 79658b6252..3e8109db4e 100644
--- a/x11-packages/azpainter/build.sh
+++ b/x11-packages/azpainter/build.sh
@@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="Full color painting software for Unix-like systems for i
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1:3.0.6
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_SRCURL=https://gitlab.com/azelpg/azpainter/-/archive/v${TERMUX_PKG_VERSION:2}/azpainter-${TERMUX_PKG_VERSION:2}.tar.bz2
 TERMUX_PKG_SHA256=fdc79466a5232a5c7152e506d1141f24dafe015945ac9420e407c458c661571b
-TERMUX_PKG_DEPENDS="libandroid-shmem, iconv, fontconfig, freetype, hicolor-icon-theme, libxfixes, libxi, libxcursor, libpng, libjpeg-turbo, libtiff, libwebp, zlib"
+TERMUX_PKG_DEPENDS="fontconfig, freetype, libandroid-shmem, libiconv, libjpeg-turbo, libpng, libtiff, libwebp, libx11, libxcursor, libxext, libxi, zlib"
+TERMUX_PKG_RECOMMENDS="hicolor-icon-theme"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_RM_AFTER_INSTALL="
 share/icons/hicolor/icon-theme.cache
@@ -24,6 +26,10 @@ share/mime/types
 share/mime/version
 "
 
+termux_step_pre_configure() {
+	CPPFLAGS="-I$TERMUX_PKG_SRCDIR/src/include $CPPFLAGS"
+}
+
 termux_step_configure() {
 	termux_setup_ninja
 	./configure --prefix="$TERMUX_PREFIX" \
diff --git a/x11-packages/emacs-x/build.sh b/x11-packages/emacs-x/build.sh
index f0fdf28a0d..e9e6103a7a 100644
--- a/x11-packages/emacs-x/build.sh
+++ b/x11-packages/emacs-x/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=28.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=ee21182233ef3232dc97b486af2d86e14042dbb65bbc535df562c3a858232488
 TERMUX_PKG_DEPENDS="fontconfig, freetype, gdk-pixbuf, giflib, glib, harfbuzz, libgmp, libgnutls, libice, libjansson, libjpeg-turbo, libpng, librsvg, libsm, libtiff, libx11, libxaw, libxcb, libxext, libxfixes, libxft, libxinerama, libxml2, libxmu, libxpm, libxrandr, libxrender, libxt, littlecms, ncurses, zlib"
diff --git a/x11-packages/evince/build.sh b/x11-packages/evince/build.sh
index e5015f4a29..43042c814e 100644
--- a/x11-packages/evince/build.sh
+++ b/x11-packages/evince/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 _MAJOR_VERSION=43
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/evince/${_MAJOR_VERSION}/evince-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=6d75ca62b73bfbb600f718a098103dc6b813f9050b9594be929e29b4589d2335
 TERMUX_PKG_DEPENDS="atk, djvulibre, gdk-pixbuf, glib, gnome-desktop3, gst-plugins-base, gst-plugins-good, gstreamer, gtk3, libarchive, libcairo, libgxps, libhandy, libsecret, libspectre, libtiff, libxml2, pango, poppler, poppler-data, texlive-bin"
diff --git a/x11-packages/fontforge-gtk/build.sh b/x11-packages/fontforge-gtk/build.sh
index f1553724ec..b31448f445 100644
--- a/x11-packages/fontforge-gtk/build.sh
+++ b/x11-packages/fontforge-gtk/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-3.0, BSD 3-Clause"
 TERMUX_PKG_LICENSE_FILE="COPYING.gplv3, LICENSE"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=20220308
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/fontforge/fontforge/releases/download/${TERMUX_PKG_VERSION}/fontforge-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=01e4017f7a0ccecf436c74b8e1f6b374fc04a5283c1d68967996782e15618e59
 TERMUX_PKG_DEPENDS="freetype, giflib, glib, gtk3, libc++, libcairo, libiconv, libjpeg-turbo, libpng, libtiff, libxml2, pango, readline, woff2, zlib"
diff --git a/x11-packages/gimp/build.sh b/x11-packages/gimp/build.sh
index 906bd47c55..beedeb3e93 100644
--- a/x11-packages/gimp/build.sh
+++ b/x11-packages/gimp/build.sh
@@ -4,10 +4,10 @@ TERMUX_PKG_LICENSE="GPL-3.0, LGPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 _MAJOR_VERSION=2.10
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.32
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://download.gimp.org/mirror/pub/gimp/v${_MAJOR_VERSION}/gimp-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=3f15c70554af5dcc1b46e6dc68f3d8f0a6cc9fe56b6d78ac08c0fd859ab89a25
-TERMUX_PKG_DEPENDS="aalib, atk, babl, fontconfig, freetype, gdk-pixbuf, gegl, gexiv2, ghostscript, gimp-data, glib, glib-networking, gtk2, harfbuzz, hicolor-icon-theme, json-glib, libandroid-shmem, libc++, libcairo, libheif, libjpeg-turbo, libjxl, libmypaint, libpng, librsvg, libtiff, libwebp, libxcursor, libxml2, libxpm, libxslt, littlecms, mypaint-brushes, openexr, openjpeg, pango, poppler, poppler-data, zlib"
+TERMUX_PKG_DEPENDS="aalib, atk, babl, fontconfig, freetype, gdk-pixbuf, gegl, gexiv2, ghostscript, gimp-data, glib, glib-networking, gtk2, harfbuzz, hicolor-icon-theme, json-glib, libandroid-execinfo, libandroid-shmem, libc++, libcairo, libheif, libjpeg-turbo, libjxl, libmypaint, libpng, librsvg, libtiff, libwebp, libxcursor, libxml2, libxmu, libxpm, libxslt, littlecms, mypaint-brushes, openexr, openjpeg, pango, poppler, poppler-data, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-python
 --disable-vector-icons
diff --git a/x11-packages/gtk4/build.sh b/x11-packages/gtk4/build.sh
index 21bdaafba0..8b3c79d9bb 100644
--- a/x11-packages/gtk4/build.sh
+++ b/x11-packages/gtk4/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 _MAJOR_VERSION=4.8
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gtk/${_MAJOR_VERSION}/gtk-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=85b7a160b6e02eafa4e7d38f046f8720fab537d3fe73c01c864333a983a692a9
 TERMUX_PKG_DEPENDS="adwaita-icon-theme, fontconfig, fribidi, gdk-pixbuf, glib, glib-bin, graphene, gtk-update-icon-cache, harfbuzz, libcairo, libepoxy, libjpeg-turbo, libpng, libtiff, libx11, libxcursor, libxdamage, libxext, libxfixes, libxi, libxinerama, libxrandr, pango, shared-mime-info"
diff --git a/x11-packages/hugin/build.sh b/x11-packages/hugin/build.sh
index ade8605316..aba936137c 100644
--- a/x11-packages/hugin/build.sh
+++ b/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=2021.0.0
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/hugin/hugin-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=047aea8a7fa47844b34ef27c19d3b697e84939dcb1fdbbeb2c204621b66eead9
 TERMUX_PKG_DEPENDS="boost, enblend, exiftool, exiv2, fftw, glew, glu, libc++, libflann, libjpeg-turbo, liblz4, libpano13, libpng, libsqlite, libtiff, libvigra, libx11, littlecms, mesa, openexr, wxwidgets, zlib"
diff --git a/x11-packages/mtpaint/build.sh b/x11-packages/mtpaint/build.sh
index 9c1ab93239..efc115b01b 100644
--- a/x11-packages/mtpaint/build.sh
+++ b/x11-packages/mtpaint/build.sh
@@ -3,15 +3,15 @@ TERMUX_PKG_DESCRIPTION="Simple paint program for creating icons and pixel based
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=3.50.09
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 _COMMIT=5272e2b1e773c8e02ac3506b2d3bde82ad946b21
 TERMUX_PKG_SRCURL=https://github.com/wjaguar/mtPaint/archive/${_COMMIT}.zip
 TERMUX_PKG_SHA256=6ed73fc7ac18499c7e83c8077c85dfc0bf778f0663c051515da408e2fcfea512
-TERMUX_PKG_DEPENDS="atk, fontconfig, freetype, gdk-pixbuf, giflib, glib, gtk2, libandroid-glob, libandroid-shmem, libcairo, libjpeg-turbo, littlecms, pango, libpng, libtiff, libwebp, libx11, zlib"
+TERMUX_PKG_DEPENDS="atk, fontconfig, freetype, gdk-pixbuf, giflib, glib, gtk2, harfbuzz, libandroid-glob, libcairo, libiconv, libjpeg-turbo, libpng, libtiff, libwebp, libx11, libxcomposite, libxcursor, libxdamage, libxext, libxfixes, libxinerama, libxrandr, libxrender, littlecms, openjpeg, pango, zlib"
 TERMUX_PKG_RECOMMENDS="gifsicle"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=${TERMUX_PREFIX}/share/man man GIF jpeg tiff cflags lcms2"
 
 termux_step_pre_configure() {
-	export LDFLAGS="${LDFLAGS} -Wl,--no-as-needed -landroid-glob -landroid-shmem"
+	LDFLAGS+=" -landroid-glob"
 }
diff --git a/x11-packages/sdl-image/build.sh b/x11-packages/sdl-image/build.sh
index 5656d14afc..3e70c8664b 100644
--- a/x11-packages/sdl-image/build.sh
+++ b/x11-packages/sdl-image/build.sh
@@ -5,9 +5,10 @@ TERMUX_PKG_MAINTAINER="@termux"
 _COMMIT=633dc522f5114f6d473c910dace62e8ca27a1f7d
 _COMMIT_DATE=20220527
 TERMUX_PKG_VERSION=1.2.12-p${_COMMIT_DATE}
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/libsdl-org/SDL_image.git
 TERMUX_PKG_GIT_BRANCH=SDL-1.2
-TERMUX_PKG_DEPENDS="libjpeg-turbo, libpng, libtiff, sdl"
+TERMUX_PKG_DEPENDS="libjpeg-turbo, liblzma, libpng, libtiff, libwebp, sdl, zlib, zstd"
 
 termux_step_post_get_source() {
 	git fetch --unshallow
diff --git a/x11-packages/sdl2-image/build.sh b/x11-packages/sdl2-image/build.sh
index a9f8d1b9d7..1bc08b2330 100644
--- a/x11-packages/sdl2-image/build.sh
+++ b/x11-packages/sdl2-image/build.sh
@@ -4,9 +4,10 @@ TERMUX_PKG_LICENSE="ZLIB"
 TERMUX_PKG_LICENSE_FILE="LICENSE.txt"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.6.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/libsdl-org/SDL_image/releases/download/release-${TERMUX_PKG_VERSION}/SDL2_image-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=48355fb4d8d00bac639cd1c4f4a7661c4afef2c212af60b340e06b7059814777
-TERMUX_PKG_DEPENDS="libjpeg-turbo, libjxl, libpng, libtiff, libwebp, sdl2"
+TERMUX_PKG_DEPENDS="libjpeg-turbo, libjxl, liblzma, libpng, libtiff, libwebp, sdl2, zlib, zstd"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-stb-image
 --disable-jpg-shared
diff --git a/x11-packages/wmaker/build.sh b/x11-packages/wmaker/build.sh
index b1276609b4..92ffe3a6a3 100644
--- a/x11-packages/wmaker/build.sh
+++ b/x11-packages/wmaker/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="An X11 window manager that reproduces the look and feel
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.95.9
-TERMUX_PKG_REVISION=11
+TERMUX_PKG_REVISION=12
 TERMUX_PKG_SRCURL=https://github.com/window-maker/wmaker/releases/download/wmaker-${TERMUX_PKG_VERSION}/WindowMaker-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=f22358ff60301670e1e2b502faad0f2da7ff8976632d538f95fe4638e9c6b714
-TERMUX_PKG_DEPENDS="libandroid-shmem, libxmu, libxft, pango, libtiff, giflib, libxpm, libexif, libwebp, imagemagick"
+TERMUX_PKG_DEPENDS="fontconfig, freetype, giflib, glib, harfbuzz, imagemagick, libandroid-shmem, libexif, libjpeg-turbo, libpng, libtiff, libwebp, libx11, libxext, libxft, libxinerama, libxmu, libxpm, pango"
 TERMUX_PKG_BUILD_DEPENDS="xorgproto"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-pango
@@ -14,8 +14,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --x-libraries=${TERMUX_PREFIX}/lib"
 
 termux_step_pre_configure() {
-	# `-Wl,--no-as-needed` may not be needed after fix in libandroid-shmem
-	# by commit 92668b208de7802da97221ace1107c4b5ae6cfc4.
-	export LIBS="-Wl,--no-as-needed -landroid-shmem"
+	export LIBS="-landroid-shmem"
 	export LDFLAGS="$LDFLAGS -XCClinker -static-openmp"
 }
diff --git a/x11-packages/wxwidgets/build.sh b/x11-packages/wxwidgets/build.sh
index f86abc22a3..cc06afe81b 100644
--- a/x11-packages/wxwidgets/build.sh
+++ b/x11-packages/wxwidgets/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="custom"
 TERMUX_PKG_LICENSE_FILE="docs/gpl.txt, docs/lgpl.txt, docs/licence.txt, docs/licendoc.txt, docs/preamble.txt"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=3.2.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/wxWidgets/wxWidgets/releases/download/v${TERMUX_PKG_VERSION}/wxWidgets-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=c229976bb413eb88e45cb5dfb68b27890d450149c09b331abd751e7ae0f5fa66
 TERMUX_PKG_DEPENDS="fontconfig, gdk-pixbuf, glib, glu, gtk3, libandroid-execinfo, libc++, libcairo, libcurl, libexpat, libiconv, libjpeg-turbo, libnotify, libpng, libsecret, libsm, libtiff, libx11, libxtst, libxxf86vm, mesa, pango, pcre2, sdl2, zlib"