Skip to content

Commit

Permalink
djview: remove rpath
Browse files Browse the repository at this point in the history
  • Loading branch information
sgn committed Feb 10, 2021
1 parent 647d17c commit 466153a
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 6 deletions.
26 changes: 26 additions & 0 deletions srcpkgs/djview/patches/sane-qmake-query.patch
Original file line number Diff line number Diff line change
@@ -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
8 changes: 2 additions & 6 deletions srcpkgs/djview/template
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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/' \
Expand Down

0 comments on commit 466153a

Please sign in to comment.