diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-03-11 18:23:55 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-03-11 18:23:55 +0000 |
| commit | 44bb32822825933abfecac8aad940577dc53dcc3 (patch) | |
| tree | 232d90a72710adeb6833f2e7e8209915173aa46f /user | |
| parent | 6581dfb37295e085067520bc307b20d2357dd934 (diff) | |
| download | packages-44bb32822825933abfecac8aad940577dc53dcc3.tar.gz packages-44bb32822825933abfecac8aad940577dc53dcc3.tar.bz2 packages-44bb32822825933abfecac8aad940577dc53dcc3.tar.xz packages-44bb32822825933abfecac8aad940577dc53dcc3.zip | |
user/qt5-qtdeclarative: fix Python 3 support
Diffstat (limited to 'user')
| -rw-r--r-- | user/qt5-qtdeclarative/APKBUILD | 9 | ||||
| -rw-r--r-- | user/qt5-qtdeclarative/python3.patch | 31 |
2 files changed, 37 insertions, 3 deletions
diff --git a/user/qt5-qtdeclarative/APKBUILD b/user/qt5-qtdeclarative/APKBUILD index 2db5a1d17..6518c3716 100644 --- a/user/qt5-qtdeclarative/APKBUILD +++ b/user/qt5-qtdeclarative/APKBUILD @@ -7,10 +7,12 @@ pkgdesc="Qt 5 - Qt Declarative and Qt Quick 2" url="https://www.qt.io/" arch="all" license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions" -makedepends="qt5-qtbase-dev libexecinfo-dev python3" # python-compat +makedepends="qt5-qtbase-dev libexecinfo-dev python3" subpackages="$pkgname-dev" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz - add-execinfo.patch" + add-execinfo.patch + python3.patch + " _qt5_prefix=/usr/lib/qt5 builddir="$srcdir"/$_pkgname-$pkgver @@ -36,4 +38,5 @@ package() { } sha512sums="bccddeca26c317083fcebc182dd3221dcbe9af665c502bfb636907f2c17a6edd8874a964910423c9eaa6e5c68bf5a13520193ba77f915be08ba1982348d2a9ee qtdeclarative-opensource-src-5.9.7.tar.xz -065ab2440fd0a81e76fe8873b0991929fad3d4189c8938e0205e94478a6cdce81ef710e3bad19cd5ca0b5ea0f8b3cd1b366969ddede51070496d1d02ace59220 add-execinfo.patch" +065ab2440fd0a81e76fe8873b0991929fad3d4189c8938e0205e94478a6cdce81ef710e3bad19cd5ca0b5ea0f8b3cd1b366969ddede51070496d1d02ace59220 add-execinfo.patch +c434ec3b3eaa8859cc3a3ce48d0299533428d94c998876e5735c210b25f89bc8509980cee0d96f2e68331540f95b5f1ec5e9745949d26367bde1d15bc7ac9081 python3.patch" diff --git a/user/qt5-qtdeclarative/python3.patch b/user/qt5-qtdeclarative/python3.patch new file mode 100644 index 000000000..2d67290bb --- /dev/null +++ b/user/qt5-qtdeclarative/python3.patch @@ -0,0 +1,31 @@ +--- qtdeclarative-opensource-src-5.9.7/qtdeclarative.pro.old 2018-10-05 19:31:02.000000000 +0000 ++++ qtdeclarative-opensource-src-5.9.7/qtdeclarative.pro 2019-03-11 17:20:24.100000000 +0000 +@@ -2,7 +2,7 @@ + load(qt_parts) + + !python_available { +- py_out = $$system('python -c "print(1)"') ++ py_out = $$system('python3 -c "print(1)"') + !equals(py_out, 1): error("Building QtQml requires Python.") + tmp = python_available + CONFIG += $$tmp +--- qtdeclarative-opensource-src-5.9.7/src/3rdparty/masm/masm.pri.old 2018-10-05 19:31:02.000000000 +0000 ++++ qtdeclarative-opensource-src-5.9.7/src/3rdparty/masm/masm.pri 2019-03-11 17:20:02.330000000 +0000 +@@ -58,7 +58,7 @@ + udis86.output = udis86_itab.h + udis86.input = ITAB + udis86.CONFIG += no_link +- udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN} ++ udis86.commands = python3 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN} + QMAKE_EXTRA_COMPILERS += udis86 + + udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c +@@ -110,7 +110,7 @@ + retgen.script = $$PWD/create_regex_tables + retgen.input = retgen.script + retgen.CONFIG += no_link +-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} ++retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT} + QMAKE_EXTRA_COMPILERS += retgen + + # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf |