From 538217171df5f2cca62d856413702994072fecac Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 10 Nov 2022 09:13:29 +0900 Subject: [PATCH] libxaw: Remove orphaned symlinks `lib/libXaw.so.6` and `lib/libXaw.so.7`. --- x11-packages/libxaw/build.sh | 10 ++++++---- x11-packages/libxaw/src-Makefile.in.patch | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 x11-packages/libxaw/src-Makefile.in.patch diff --git a/x11-packages/libxaw/build.sh b/x11-packages/libxaw/build.sh index 095264b865..dc50777d2a 100644 --- a/x11-packages/libxaw/build.sh +++ b/x11-packages/libxaw/build.sh @@ -1,10 +1,12 @@ TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/ TERMUX_PKG_DESCRIPTION="X11 Athena Widget library" -TERMUX_PKG_LICENSE="MIT" +# Licenses: MIT, HPND +TERMUX_PKG_LICENSE="custom" +TERMUX_PKG_LICENSE_FILE="COPYING" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.0.14 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXaw-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e -TERMUX_PKG_DEPENDS="libice, libsm, libuuid, libx11, libxau, libxcb, libxdmcp, libxext, libxmu, libxpm, libxt" -TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros" +TERMUX_PKG_DEPENDS="libx11, libxext, libxmu, libxpm, libxt" +TERMUX_PKG_BUILD_DEPENDS="xorgproto" diff --git a/x11-packages/libxaw/src-Makefile.in.patch b/x11-packages/libxaw/src-Makefile.in.patch new file mode 100644 index 0000000000..77c57ea21a --- /dev/null +++ b/x11-packages/libxaw/src-Makefile.in.patch @@ -0,0 +1,18 @@ +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -1800,7 +1800,6 @@ + @BUILD_XAW6_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@ + @BUILD_XAW6_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw6.6.@LIBEXT@ libXaw.6.@LIBEXT@) + @BUILD_XAW6_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.6 +-@BUILD_XAW6_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw6.@LIBEXT@.6 libXaw.@LIBEXT@.6) + + @BUILD_XAW6_TRUE@@PLATFORM_WIN32_FALSE@uninstall-local:: + @BUILD_XAW6_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@ +@@ -1810,7 +1809,6 @@ + @BUILD_XAW7_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@ + @BUILD_XAW7_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw7.7.@LIBEXT@ libXaw.7.@LIBEXT@) + @BUILD_XAW7_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.7 +-@BUILD_XAW7_TRUE@@PLATFORM_DARWIN_FALSE@@PLATFORM_WIN32_FALSE@ $(AM_V_GEN)(cd $(DESTDIR)$(libdir) && $(LN_S) libXaw7.@LIBEXT@.7 libXaw.@LIBEXT@.7) + + @BUILD_XAW7_TRUE@@PLATFORM_WIN32_FALSE@uninstall-local:: + @BUILD_XAW7_TRUE@@PLATFORM_DARWIN_TRUE@@PLATFORM_WIN32_FALSE@ $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@