diff options
| author | Matthieu Gallien <matthieu.gallien@nextcloud.com> | 2022-08-31 17:28:33 +0300 |
|---|---|---|
| committer | Matthieu Gallien <matthieu.gallien@nextcloud.com> | 2022-08-31 17:28:33 +0300 |
| commit | a715c0aea7808b870dc11c133164455b3e0ff36f (patch) | |
| tree | 77303a1e9f5298eaa75b0278ba19e958a7e00f3f | |
| parent | af5c0c914bbe1e8771241c5b0b08be6c3f8df472 (diff) | |
fix build failure with ubuntu 22.04switchAppImageKdeQtPatch5.15
thanks Debian for the nice patch
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
| -rw-r--r-- | client/Dockerfile | 9 | ||||
| -rw-r--r-- | client/python2.patch | 25 |
2 files changed, 33 insertions, 1 deletions
diff --git a/client/Dockerfile b/client/Dockerfile index 732dc64..399ec92 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -133,7 +133,14 @@ RUN if [ "$BUILD_QT" = "1" ] ; then echo Build Qt from source. && \ git clone https://invent.kde.org/qt/qt/qt5.git && \ cd qt5 && \ git checkout kde/5.15 && \ - ./init-repository --module-subset=default,-qt3d \ + ./init-repository --module-subset=default,-qt3d,-qtlocation \ + ; fi + +COPY python2.patch /tmp/python2.patch +RUN if [ "$BUILD_QT" = "1" ] ; then \ + cd /qt5/qtwebengine && \ + patch -p 1 < /tmp/python2.patch && \ + cd / \ ; fi # Build Qt diff --git a/client/python2.patch b/client/python2.patch new file mode 100644 index 0000000..aeaa42f --- /dev/null +++ b/client/python2.patch @@ -0,0 +1,25 @@ +Description: use python2 instead of unversioned python +Author: Dmitry Shachnev <mitya57@debian.org> +Forwarded: no +Last-Update: 2021-03-11 + +--- a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py ++++ b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py +@@ -83,7 +83,7 @@ def _MinifyJS(input_js): + + with tempfile.NamedTemporaryFile() as _: + args = [ +- 'python', ++ 'python2', + rjsmin_path + ] + p = subprocess.Popen(args, +@@ -203,7 +203,7 @@ def _MinifyCSS(css_text): + os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py')) + + with tempfile.NamedTemporaryFile() as _: +- rcssmin_args = ['python', rcssmin_path] ++ rcssmin_args = ['python2', rcssmin_path] + p = subprocess.Popen(rcssmin_args, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, |