From 4ca3b080a299e1641ffb99121ec7d058c4565709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 8 Feb 2021 18:56:29 +0700 Subject: [PATCH] djview: remove rpath --- srcpkgs/djview/patches/sane-qmake-query.patch | 26 +++++++++++++++++++ srcpkgs/djview/template | 8 ++---- 2 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/djview/patches/sane-qmake-query.patch diff --git a/srcpkgs/djview/patches/sane-qmake-query.patch b/srcpkgs/djview/patches/sane-qmake-query.patch new file mode 100644 index 00000000000000..09df531f62d419 --- /dev/null +++ b/srcpkgs/djview/patches/sane-qmake-query.patch @@ -0,0 +1,26 @@ +Index: config/acinclude.m4 +=================================================================== +--- config/acinclude.m4.orig ++++ config/acinclude.m4 +@@ -302,19 +302,8 @@ Please define variable QMAKE and possibl + Defining QTDIR can help although it is deprecated.]) + fi + mkdir conftest.d +- cat > conftest.d/conftest.pro <<\EOF +-changequote(<<, >>)dnl +-message(QMAKE_UIC="$$QMAKE_UIC")dnl qt4 only +-message(QMAKE_MOC="$$QMAKE_MOC")dnl qt4 only +-message(QT_VERSION="$$[QT_VERSION]") +-message(QT_INSTALL_PREFIX="$$[QT_INSTALL_PREFIX]") +-message(QT_INSTALL_DATA="$$[QT_INSTALL_DATA]") +-message(QT_INSTALL_HEADERS="$$[QT_INSTALL_HEADERS]") +-message(QT_INSTALL_BINS="$$[QT_INSTALL_BINS]") +-changequote([, ])dnl +-EOF +- if ( cd conftest.d && $QMAKE > conftest.out 2>&1 ) ; then +- sed -e 's/^.*: *//' < conftest.d/conftest.out > conftest.d/conftest.sh ++ if ( cd conftest.d && $QMAKE -query > conftest.out 2>/dev/null ) ; then ++ sed -e 's/:/=/' < conftest.d/conftest.out > conftest.d/conftest.sh + . conftest.d/conftest.sh + rm -rf conftest.d + else diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template index 136bcced9fbc0a..a6af3f0188d1bb 100644 --- a/srcpkgs/djview/template +++ b/srcpkgs/djview/template @@ -1,11 +1,11 @@ # Template file for 'djview' pkgname=djview version=4.12 -revision=1 +revision=2 wrksrc="djview4-${version}" build_style=gnu-configure build_helper=qmake -configure_args="QMAKE=qmake-qt5" +configure_args="QMAKE=qmake-qt5 ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5" hostmakedepends="automake pkg-config qt5-host-tools qt5-qmake libtool" makedepends="qt5-devel djvulibre-devel libxkbcommon-devel libSM-devel libXt-devel" short_desc="Portable DjVu viewer and browser plugin" @@ -15,10 +15,6 @@ homepage="http://djvu.sourceforge.net/djview4.html" distfiles="${SOURCEFORGE_SITE}/djvu/${pkgname}-${version}.tar.gz" checksum=5673c6a8b7e195b91a1720b24091915b8145de34879db1158bc936b100eaf3e3 -if [ "${CROSS_BUILD}" ]; then - configure_args+=" ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5" -fi - post_extract() { vsed -i -e '/Exec/s/djview4/djview/' \ -e '/StartupWMClass/s/Djview4/DjView/' \