Skip to content

Commit

Permalink
sci-geosciences/qgis: Fix USE=python
Browse files Browse the repository at this point in the history
Package-Manager: Portage-2.3.3, Repoman-2.3.1
  • Loading branch information
a17r committed Apr 9, 2017
1 parent 100d6d6 commit 5b09b9c
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
25 changes: 25 additions & 0 deletions sci-geosciences/qgis/files/qgis-2.18.6-python.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
commit 13d8e30bbe0ee17fff32a3eba90cd217d277e5ac
Author: Marco Bernasocchi <[email protected]>
Date: Wed Dec 7 19:08:24 2016 +1300

fix 2.18 build with Qt5 by executing pyuic

diff --git a/scripts/pyuic-wrapper.sh b/scripts/pyuic-wrapper.sh
index d6fb497a84..aa146b31bb 100755
--- a/scripts/pyuic-wrapper.sh
+++ b/scripts/pyuic-wrapper.sh
@@ -15,12 +15,12 @@
###########################################################################


-PYUIC4=$1
+PYUIC=$1
LD_LIBRARY_PATH=$2:$LD_LIBRARY_PATH
PYTHONPATH=$3:$PYTHONPATH
PYTHON=$4
shift 4

export LD_LIBRARY_PATH PYTHONPATH
-
+$PYUIC $@
exec $PYTHON $(dirname $0)/pyuic-wrapper.py $@
5 changes: 4 additions & 1 deletion sci-geosciences/qgis/qgis-2.18.6.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ RDEPEND="${COMMON_DEPEND}
# Disabling test suite because upstream disallow running from install path
RESTRICT="test"

PATCHES=( "${FILESDIR}/${P}-featuresummary.patch" )
PATCHES=(
"${FILESDIR}/${P}-featuresummary.patch"
"${FILESDIR}/${P}-python.patch"
)

pkg_setup() {
use python && python-single-r1_pkg_setup
Expand Down

0 comments on commit 5b09b9c

Please sign in to comment.