temp/qt5-qtbase: fork from Alpine to build with OpenGLES

Our change upstream to build Qt5 with OpenGLES on ARM got reverted. I have an MR open to fix it, but we need to fix it quicker locally as the Librem 5 is broken with Plasma Mobile currently because of it.

CC @bshah @Minecrell

added ui-plasma-mobile + 1 deleted label

changed the description

By Bart Ribbers on 2020-03-26T15:54:04

added 3 commits

• 06d436e3 - temp/qt5-qtbase: fork from Alpine to build with OpenGLES
• 8d3f1261 - temp/qt5-qtdeclarative: fork from Alpine to build with OpenGLES
• ca724644 - temp/py3-qt5: fork from Alpine to build with OpenGLES

Compare with previous version

By Bart Ribbers on 2020-03-26T16:35:03

added 1 commit

• a3c0219a - temp/py3-qt5: fork from Alpine to build with OpenGLES

Compare with previous version

By Bart Ribbers on 2020-03-26T19:01:12

resolved all threads

By Bart Ribbers on 2020-03-26T19:03:06

added 1 commit

• ca724644 - temp/py3-qt5: fork from Alpine to build with OpenGLES

Compare with previous version

By Bart Ribbers on 2020-03-27T08:28:14

resolved all threads

By Bart Ribbers on 2020-03-27T08:28:22

added 3 commits

• 7ec1fd72 - temp/qt5-qtbase: fork from Alpine to build with OpenGLES
• 81f4d91c - temp/qt5-qtdeclarative: fork from Alpine to build with OpenGLES
• b9763e63 - temp/py3-qt5: fork from Alpine to build with OpenGLES

Compare with previous version

By Bart Ribbers on 2020-03-27T08:30:47

Alrighty, looks good to me, tested on L5, and fixes PlaMo for me.

By Bhushan Shah on 2020-03-27T08:32:08

approved this merge request

By Bhushan Shah on 2020-03-27T08:32:11

py3-qt5 build fails (I tried only aarch64 so far):

(020168) [13:34:35] (buildroot_aarch64) % cd /home/pmos/build;
    busybox su pmos -c CARCH=aarch64 SUDO_APK='abuild-apk --no-progress'
    PATH=/native/usr/lib/crossdirect/aarch64:/usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
    HOME=/home/pmos abuild -D postmarketOS -r -f
>>> py3-qt5: Building pmos/py3-qt5 9999-r0 (using abuild 3.5.0-r0) started Fri, 27 Mar 2020 10:34:35 +0000
>>> py3-qt5: Checking sanity of /home/pmos/build/APKBUILD...
>>> WARNING: py3-qt5: No maintainer
>>> ERROR: py3-qt5: provides must not contain py3-qt5

By Alexey Min on 2020-03-27T10:50:02

Can confirm that py3-qt5 rebuild is needed as well:

Traceback (most recent call last):
  File "./shutdownmenu.py", line 6, in <module>
    from PyQt5.QtWidgets import *
ImportError: Error relocating /usr/lib/python3.8/site-packages/PyQt5/QtGui.so: _ZNK17QOpenGLTimerQuery16waitForTimestampEv: symbol not found

And I needed this patch to build py3-qt5:

diff --git a/temp/py3-qt5/APKBUILD b/temp/py3-qt5/APKBUILD
index 1e4684a21b..e34797fd24 100644
--- a/temp/py3-qt5/APKBUILD
+++ b/temp/py3-qt5/APKBUILD
@@ -15,7 +15,6 @@ makedepends="python3-dev py3-dbus-dev py-sip-dev
 	qt5-qtwebchannel-dev
 	"
 source="https://pypi.python.org/packages/source/P/PyQt5/PyQt5-$_pkgver.tar.gz"
-provides="py3-qt5"
 provider_priority=1
 builddir="$srcdir/PyQt5-$_pkgver"
 

Upgraded on my pinephone and everything seems to work well.

With that fixed, it has my approval

By Luca Weiss on 2020-03-28T12:22:01

mentioned in merge request !1104 (merged)

By Luca Weiss on 2020-03-27T16:21:26

added 1 commit

• 9f6c6ce6 - temp/py3-qt5: fork from Alpine to build with OpenGLES

Compare with previous version

By Bart Ribbers on 2020-03-28T08:34:01

resolved all threads

By Bart Ribbers on 2020-03-28T12:22:03

approved this merge request

By Luca Weiss on 2020-03-28T19:20:27

approved this merge request

By Alexey Min on 2020-03-28T23:44:48

mentioned in commit 4a8fa71d

By Bart Ribbers on 2020-03-28T23:46:13

mentioned in commit b30356da

By Bart Ribbers on 2020-03-28T23:46:13

mentioned in commit 740b3693

By Bart Ribbers on 2020-03-28T23:46:13

added 15 commits

• 9f6c6ce6...d2484443 - 12 commits from branch master
• 740b3693 - temp/qt5-qtbase: fork from Alpine to build with OpenGLES (!1107 (merged))
• 4a8fa71d - temp/qt5-qtdeclarative: fork from Alpine to build with OpenGLES (!1107 (merged))
• b30356da - temp/py3-qt5: fork from Alpine to build with OpenGLES (!1107 (merged))

Compare with previous version

By Alexey Min on 2020-03-28T23:46:17

Now all 3 packages build fine for me for armv7, aarch64

By Alexey Min on 2020-03-29T07:57:17

enabled an automatic merge when the pipeline for b30356da succeeds

By Alexey Min on 2020-03-29T01:37:19

aborted the automatic merge because target branch was updated

By Oliver Smith on 2020-03-29T12:00:59

mentioned in commit 0b993603

By Bart Ribbers on 2020-03-29T12:49:22

mentioned in commit d33cb3de

By Bart Ribbers on 2020-03-29T12:49:22

mentioned in commit ab5e0528

By Bart Ribbers on 2020-03-29T12:49:22

added 4 commits

• 87ea0c55 - 1 commit from branch master
• ab5e0528 - temp/qt5-qtbase: fork from Alpine to build with OpenGLES (!1107 (merged))
• d33cb3de - temp/qt5-qtdeclarative: fork from Alpine to build with OpenGLES (!1107 (merged))
• 0b993603 - temp/py3-qt5: fork from Alpine to build with OpenGLES (!1107 (merged))

Compare with previous version

By Alexey Min on 2020-03-29T12:49:24

mentioned in commit 9434ea1b

By Bart Ribbers on 2020-03-29T12:50:00

added 1 commit

• 9434ea1b - temp/py3-qt5: fork from Alpine to build with OpenGLES (!1107 (merged))

Compare with previous version

By Alexey Min on 2020-03-29T12:50:02

resolved all threads

By Minecrell on 2020-03-29T12:50:41

merged

By Alexey Min on 2020-03-29T12:54:12