Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] python-pyQt5 fixes
@ 2020-05-19  3:21 fosslinux
  2020-05-19  9:56 ` fosslinux
                   ` (26 more replies)
  0 siblings, 27 replies; 28+ messages in thread
From: fosslinux @ 2020-05-19  3:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 687 bytes --]

There is a new pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages python-pyQt5-makedepends
https://github.com/void-linux/void-packages/pull/22109

python-pyQt5 fixes
1. It didn't build for me natively on x86_64 because `qmake` couldnt find `qt5` on the host. Hence, I added it to `hostmakedepends`. LMK if this is the wrong way to do it and it should be patched out instead.

2. There is a `mv` recursive move warning in pre_build that I silenced.

3. I made xlint happy.

Letting travis run, I only tested x86_64 natively.

A patch file from https://github.com/void-linux/void-packages/pull/22109.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-pyQt5-makedepends-22109.patch --]
[-- Type: text/x-diff, Size: 3340 bytes --]

From 80d9f01c80d9f9901d3ec34c815487a5c117ec10 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Tue, 19 May 2020 13:15:20 +1000
Subject: [PATCH 1/3] python-pyQt5: require qt5 in hostmakedepends

Otherwise it errors out with an ugly qmake cannot find qt5 error.
---
 srcpkgs/python-PyQt5/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template
index a39f7d5f160..b6d55dd90b3 100644
--- a/srcpkgs/python-PyQt5/template
+++ b/srcpkgs/python-PyQt5/template
@@ -7,10 +7,10 @@ lib32disabled=yes
 wrksrc="PyQt5-${version}"
 pycompile_module="PyQt5"
 hostmakedepends="pkg-config
- python-devel python3-devel python-sip-devel python3-sip-devel python-dbus-devel
- qt5-tools-devel qt5-connectivity-devel qt5-declarative-devel qt5-location-devel
- qt5-multimedia-devel qt5-sensors-devel qt5-serialport-devel qt5-svg-devel
- qt5-webchannel-devel qt5-webkit-devel qt5-websockets-devel
+ python-devel python3-devel python-sip-devel python3-sip-devel python-dbus-devel qt5
+ qt5-devel qt5-tools-devel qt5-connectivity-devel qt5-declarative-devel qt5-location-devel
+ qt5-multimedia-devel qt5-qmake qt5-sensors-devel qt5-serialport-devel
+ qt5-svg-devel qt5-webchannel-devel qt5-webkit-devel qt5-websockets-devel
  qt5-x11extras-devel qt5-xmlpatterns-devel qt5-networkauth-devel pulseaudio-devel
  python-enum34"
 makedepends="${hostmakedepends/pkg-config/}"

From f54ec206f43d216bdbad01e15ecb4ba9949e196e Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Tue, 19 May 2020 13:16:49 +1000
Subject: [PATCH 2/3] python-PyQt5: hide 'error' message

It isn't really an error but looks ominous.
---
 srcpkgs/python-PyQt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template
index b6d55dd90b3..10a67618d68 100644
--- a/srcpkgs/python-PyQt5/template
+++ b/srcpkgs/python-PyQt5/template
@@ -24,7 +24,7 @@ checksum=adc17c077bf233987b8e43ada87d1e0deca9bd71a13e5fd5fc377482ed69c827
 
 pre_build() {
 	mkdir -p pyqt5-${py2_ver}
-	mv * pyqt5-${py2_ver} || true
+	mv * pyqt5-${py2_ver} 2>/dev/null || true
 	cp -a pyqt5-${py2_ver} pyqt5-${py3_ver}
 	rm -rf pyqt5-${py2_ver}/pyuic/uic/port_v3
 	rm -rf pyqt5-${py3_ver}/pyuic/uic/port_v2

From cc92022b696a4bb4693d6ec357f12437a5131f9f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Tue, 19 May 2020 13:18:24 +1000
Subject: [PATCH 3/3] python-PyQt5: make xlint happy

---
 srcpkgs/python-PyQt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template
index 10a67618d68..977e6362f9d 100644
--- a/srcpkgs/python-PyQt5/template
+++ b/srcpkgs/python-PyQt5/template
@@ -3,7 +3,6 @@ pkgname=python-PyQt5
 version=5.13.2
 revision=2
 _sipver=4.19.19
-lib32disabled=yes
 wrksrc="PyQt5-${version}"
 pycompile_module="PyQt5"
 hostmakedepends="pkg-config
@@ -21,6 +20,7 @@ homepage="https://riverbankcomputing.com/software/pyqt/intro"
 license="GPL-3.0-only"
 distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQt5/${version}/PyQt5-${version}.tar.gz"
 checksum=adc17c077bf233987b8e43ada87d1e0deca9bd71a13e5fd5fc377482ed69c827
+lib32disabled=yes
 
 pre_build() {
 	mkdir -p pyqt5-${py2_ver}

^ permalink raw reply	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2020-08-11  6:10 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-19  3:21 [PR PATCH] python-pyQt5 fixes fosslinux
2020-05-19  9:56 ` fosslinux
2020-05-19  9:57 ` fosslinux
2020-05-21 11:49 ` sgn
2020-05-21 22:37 ` [PR PATCH] [Updated] " fosslinux
2020-05-21 22:39 ` fosslinux
2020-05-21 23:11 ` sgn
2020-05-22  0:30 ` [PR PATCH] [Updated] " fosslinux
2020-05-22  0:30 ` fosslinux
2020-05-25  1:09 ` fosslinux
2020-05-27 14:37 ` sgn
2020-05-27 20:50 ` fosslinux
2020-07-21  7:25 ` [PR PATCH] [Updated] " fosslinux
2020-07-21  7:25 ` fosslinux
2020-07-30  9:28 ` fosslinux
2020-08-03  9:20 ` Piraty
2020-08-03 10:05 ` Piraty
2020-08-03 10:26 ` fosslinux
2020-08-05  8:16 ` [PR PATCH] [Updated] " fosslinux
2020-08-05  8:17 ` fosslinux
2020-08-11  0:06 ` [PR REVIEW] " Piraty
2020-08-11  0:31 ` fosslinux
2020-08-11  0:34 ` ericonr
2020-08-11  0:41 ` sgn
2020-08-11  6:09 ` fosslinux
2020-08-11  6:10 ` fosslinux
2020-08-11  6:10 ` fosslinux
2020-08-11  6:10 ` [PR PATCH] [Closed]: " fosslinux

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).