duplicate file fixes from python-glibc (#228)

termux-pacman · Apr 13, 2024 · 52db6a6 · 52db6a6
1 parent fd5dbbe
commit 52db6a6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/gpkg/glib/build.sh b/gpkg/glib/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux-pacman"
 TERMUX_PKG_VERSION="2.80.0"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${TERMUX_PKG_VERSION%.*}/glib-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d
 TERMUX_PKG_DEPENDS="libffi-glibc, pcre2-glibc, util-linux-glibc, zlib-glibc, openssl-glibc, libunwind-glibc"

diff --git a/gpkg/gobject-introspection/build.sh b/gpkg/gobject-introspection/build.sh
@@ -3,18 +3,19 @@ TERMUX_PKG_DESCRIPTION="Uniform machine readable API"
 TERMUX_PKG_LICENSE="LGPL-2.0, GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux-pacman"
 TERMUX_PKG_VERSION="1.80.1"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gobject-introspection/${TERMUX_PKG_VERSION%.*}/gobject-introspection-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
 TERMUX_PKG_DEPENDS="libgirepository-glibc, python-glibc"
 TERMUX_PKG_BUILD_DEPENDS="coreutils-glibc"
 TERMUX_PKG_MESON_NATIVE=true
-TERMUX_PKG_RM_AFTER_INSTALL="glibc/lib/python*"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dpython=$TERMUX_PREFIX/bin/python3
 "
 
 termux_step_pre_configure() {
 	CPPFLAGS+="-I$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION} -I$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION}/cpython"
+	LDFLAGS+=" -lmount"
 }
 
 termux_step_post_make_install() {

diff --git a/gpkg/harfbuzz/build.sh b/gpkg/harfbuzz/build.sh
@@ -3,12 +3,11 @@ TERMUX_PKG_DESCRIPTION="OpenType text shaping engine"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux-pacman"
 TERMUX_PKG_VERSION=8.4.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/harfbuzz/harfbuzz/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=9f1ca089813b05944ad1ce8c7e018213026d35dc9bab480a21eb876838396556
 TERMUX_PKG_DEPENDS="freetype-glibc, glib-glibc, libcairo-glibc, libgraphite-glibc, libicu-glibc"
 TERMUX_PKG_BUILD_DEPENDS="gobject-introspection-glibc"
-TERMUX_PKG_RM_AFTER_INSTALL="glibc/lib/python3.11"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Ddocs=disabled
 -Dgraphite2=enabled

diff --git a/gpkg/libxcb/build.sh b/gpkg/libxcb/build.sh
@@ -3,11 +3,11 @@ TERMUX_PKG_DESCRIPTION="X11 client-side library"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux-pacman"
 TERMUX_PKG_VERSION="1.16.1"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/archive/individual/lib/libxcb-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=f24d187154c8e027b358fc7cb6588e35e33e6a92f11c668fe77396a7ae66e311
 TERMUX_PKG_DEPENDS="libxau-glibc, libxdmcp-glibc, xcb-proto-glibc"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros-glibc, libxslt-glibc, xorgproto-glibc"
-TERMUX_PKG_RM_AFTER_INSTALL="glibc/lib/python*"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-xinput
 --enable-xkb