try to fake sip version numbber

qgis · Apr 3, 2018 · c6f9af0 · c6f9af0
1 parent 0603305
commit c6f9af0
Showing 1 changed file with 26 additions and 15 deletions.
diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
@@ -51,6 +51,9 @@ RUN  apt-get update \
     pkg-config \
     poppler-utils \
     postgresql-client \
+    pyqt5-dev \
+    pyqt5-dev-tools \
+    pyqt5.qsci-dev \
     python3-all-dev \
     python3-dev \
     python3-future \
@@ -59,6 +62,10 @@ RUN  apt-get update \
     python3-nose2 \
     python3-pip \
     python3-psycopg2 \
+    python3-pyqt5 \
+    python3-pyqt5.qsci \
+    python3-pyqt5.qtsql \
+    python3-pyqt5.qtsvg \
     python3-termcolor \
     python3-yaml \
     qt3d5-dev \
@@ -96,23 +103,27 @@ RUN curl -s -S -O https://www.riverbankcomputing.com/hg/sip/archive/tip.tar.gz \
  && mkdir /root/sip419 \
  && mv  $(find -type d -iname 'sip-*')/* sip419
 WORKDIR /root/sip419
-RUN python3 build.py prepare && python3 configure.py && make && make install
-
-WORKDIR /root
-RUN curl -s -S -O https://svwh.dl.sourceforge.net/project/pyqt/PyQt5/PyQt-5.9.2/PyQt5_gpl-5.9.2.tar.gz \
- && tar xzf PyQt5_gpl-5.9.2.tar.gz
-WORKDIR /root/PyQt5_gpl-5.9.2
-RUN apt-get install -y qt5-qmake \
- && python3 configure.py --confirm-license --qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake --qsci-api --enable QtSql --enable QtSvg && make && make install
-
-WORKDIR /root
-RUN curl -s -S -O https://cfhcable.dl.sourceforge.net/project/pyqt/QScintilla2/QScintilla-2.10.3/QScintilla_gpl-2.10.3.tar.gz
- && tar xzf QScintilla_gpl-2.10.3.tar.gz
-WORKDIR /root/QScintilla_gpl-2.10.3/Python
-RUN python3 configure.py --pyqt=PyQt5
- && make
+RUN sed -i -r "s/RM_HEXVERSION = '04ffff'/RM_HEXVERSION = '041308'/; s/RM_RELEASE = '4.255.255'/RM_RELEASE = '4.19.8'/" build.py \
+ && python3 build.py prepare \
+ && python3 configure.py \
+ && make \
  && make install
 
+# WORKDIR /root
+# RUN curl -s -S -O https://svwh.dl.sourceforge.net/project/pyqt/PyQt5/PyQt-5.9.2/PyQt5_gpl-5.9.2.tar.gz \
+#  && tar xzf PyQt5_gpl-5.9.2.tar.gz
+# WORKDIR /root/PyQt5_gpl-5.9.2
+# RUN apt-get install -y qt5-qmake \
+#  && python3 configure.py --confirm-license --qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake --qsci-api --enable QtSql --enable QtSvg && make && make install
+#
+# WORKDIR /root
+# RUN curl -s -S -O https://cfhcable.dl.sourceforge.net/project/pyqt/QScintilla2/QScintilla-2.10.3/QScintilla_gpl-2.10.3.tar.gz
+#  && tar xzf QScintilla_gpl-2.10.3.tar.gz
+# WORKDIR /root/QScintilla_gpl-2.10.3/Python
+# RUN python3 configure.py --pyqt=PyQt5
+#  && make
+#  && make install
+
 WORKDIR /root
 
 RUN echo "alias python=python3" >> ~/.bash_aliases