From dfb849e95c318f27cc82f5ed8623c2d75b187869 Mon Sep 17 00:00:00 2001 From: Symeon Huang Date: Fri, 21 May 2021 11:39:04 +0100 Subject: [PATCH] add private library path into RUNPATH --- x11-packages/lxqt-config/build.sh | 8 ++++++++ x11-packages/lxqt-panel/build.sh | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/x11-packages/lxqt-config/build.sh b/x11-packages/lxqt-config/build.sh index 3954fae3f..f23346372 100644 --- a/x11-packages/lxqt-config/build.sh +++ b/x11-packages/lxqt-config/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tools to configure LXQt and the underlying operating sys TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="Simeon Huang " TERMUX_PKG_VERSION=0.17.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/lxqt/lxqt-config/releases/download/${TERMUX_PKG_VERSION}/lxqt-config-${TERMUX_PKG_VERSION}.tar.xz" TERMUX_PKG_SHA256=23c1c9a3aa3bf3537b3433439501463ea3e29950ecf2381679bf30ef4c1b245b TERMUX_PKG_DEPENDS="qt5-qtbase, qt5-qtx11extras, liblxqt, libxcb, zlib" @@ -10,3 +11,10 @@ TERMUX_PKG_BUILD_DEPENDS="cmake, perl, lxqt-build-tools, qt5-qtbase-cross-tools, # libinput is required to switch on input configuration # libkscreen is required to switch on monitor configuration, which in turn requires wayland TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DWITH_INPUT=OFF -DWITH_MONITOR=OFF" + +termux_step_pre_configure() { + # This is required because of the private lib used by lxqt-config-appearance + LDFLAGS+=" -Wl,-rpath=${TERMUX_PREFIX}/lib/lxqt-config" + export LDFLAGS +} + diff --git a/x11-packages/lxqt-panel/build.sh b/x11-packages/lxqt-panel/build.sh index 589114b6a..cc03e4440 100644 --- a/x11-packages/lxqt-panel/build.sh +++ b/x11-packages/lxqt-panel/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="The LXQt desktop panel" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="Simeon Huang " TERMUX_PKG_VERSION=0.17.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/lxqt/lxqt-panel/releases/download/${TERMUX_PKG_VERSION}/lxqt-panel-${TERMUX_PKG_VERSION}.tar.xz" TERMUX_PKG_SHA256=1830fb5a595495176eed61cb0fc9d5535e3954ed6b8f04a741a4295883764ccc TERMUX_PKG_DEPENDS="qt5-qtbase, qt5-qtx11extras, kwindowsystem, liblxqt, libsysstat, lxqt-globalkeys, libdbusmenu-qt, libxcb, pulseaudio, lxmenu-data" @@ -18,3 +19,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DSENSORS_PLUGIN=OFF -DVOLUME_USE_ALSA=OFF " + +termux_step_pre_configure() { + # Add RUNPATH to the private libraries used by lxqt-panel's plugins + LDFLAGS+=" -Wl,-rpath=${TERMUX_PREFIX}/lib/lxqt-panel" + export LDFLAGS +}