* Re: [PR PATCH] [Updated] python-PyQt5: update to 1.15.0
2020-08-05 15:25 [PR PATCH] python-PyQt5: update to 1.15.0 PaperMountainStudio
@ 2020-08-05 15:56 ` PaperMountainStudio
2020-08-06 0:11 ` daniel-eys
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: PaperMountainStudio @ 2020-08-05 15:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated pull request by PaperMountainStudio against master on the void-packages repository
https://github.com/PaperMountainStudio/void-packages python-pyqt-1.15.0
https://github.com/void-linux/void-packages/pull/24076
python-PyQt5: update to 1.15.0
requires: #23666
also rebuild qutebrowser against python3-PyQt5 1.15.0
xlint will fail on python-PyQt5, because of indenting, but that's a false alarm
A patch file from https://github.com/void-linux/void-packages/pull/24076.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-pyqt-1.15.0-24076.patch --]
[-- Type: text/x-diff, Size: 5489 bytes --]
From 44d265d07063e37a4ff6d9aa70a98765d16e869b Mon Sep 17 00:00:00 2001
From: yoctocell <attocell.name@protonmail.com>
Date: Mon, 20 Jul 2020 10:28:50 +0200
Subject: [PATCH 1/3] sip: update to 4.19.23
---
srcpkgs/sip/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 96a8f1f5dc6..9104b29fced 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,7 +1,7 @@
# Template file for 'sip'
pkgname=sip
-version=4.19.19
-revision=2
+version=4.19.23
+revision=1
hostmakedepends="python-devel python3-devel"
makedepends="${hostmakedepends}"
short_desc="Python extension module generator for C/C++ libraries"
@@ -9,7 +9,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
homepage="https://riverbankcomputing.com/software/sip/intro"
distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"
-checksum=5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44
+checksum=22ca9bcec5388114e40d4aafd7ccd0c4fe072297b628d0c5cdfa2f010c0bc7e7
pre_build() {
mkdir -p sip-${py2_ver}
@@ -66,7 +66,6 @@ do_install() {
python-sip_package() {
lib32disabled=yes
depends="${sourcepkg}-${version}_${revision} python"
- pycompile_module="sipconfig.py"
short_desc="Python2 SIP bindings"
pkg_install() {
vmove ${py2_sitelib}/sip.so
@@ -76,7 +75,6 @@ python-sip_package() {
}
python-sip-devel_package() {
depends="python-sip-${version}_${revision}"
- pycompile_module="sipdistutils.py"
short_desc="Python2 SIP bindings - development files"
pkg_install() {
vmove ${py2_inc}
@@ -86,7 +84,6 @@ python-sip-devel_package() {
python3-sip_package() {
lib32disabled=yes
depends="${sourcepkg}-${version}_${revision} python3"
- pycompile_module="sipconfig.py"
short_desc="Python3 SIP bindings"
pkg_install() {
vmove ${py3_sitelib}/sip.so
@@ -96,7 +93,6 @@ python3-sip_package() {
}
python3-sip-devel_package() {
depends="python3-sip-${version}_${revision}"
- pycompile_module="sipdistutils.py"
short_desc="Python3 SIP bindings - development files"
pkg_install() {
vmove ${py3_inc}
From 1d2592b76f9e16fab48ae4f2ef141fa64dc2a2a8 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 5 Aug 2020 17:55:13 +0200
Subject: [PATCH 2/3] python-PyQt5: update to 5.15.0
---
srcpkgs/python-PyQt5/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template
index a39f7d5f160..90763b5b576 100644
--- a/srcpkgs/python-PyQt5/template
+++ b/srcpkgs/python-PyQt5/template
@@ -1,11 +1,9 @@
# Template file for 'python-PyQt5'
pkgname=python-PyQt5
-version=5.13.2
-revision=2
-_sipver=4.19.19
-lib32disabled=yes
+version=5.15.0
+revision=1
+_sipver=4.19.23
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
@@ -17,10 +15,11 @@ makedepends="${hostmakedepends/pkg-config/}"
depends="python-sip-PyQt5>=${_sipver} python-enum34"
short_desc="Python2 bindings for the Qt5 toolkit"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-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
+homepage="https://riverbankcomputing.com/software/pyqt/intro"
+distfiles="${PYPI_SITE}/P/PyQt5/PyQt5-${version}.tar.gz"
+checksum=c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9
+lib32disabled=yes
pre_build() {
mkdir -p pyqt5-${py2_ver}
@@ -97,7 +96,6 @@ python-PyQt5-devel-tools_package() {
pyqt5:pylupdate5:/usr/bin/python2-pylupdate5
pyqt5:pyrcc5:/usr/bin/python2-pyrcc5
pyqt5:pyuic5:/usr/bin/python2-pyuic5"
- pycompile_module="PyQt5"
pkg_install() {
vmove usr/bin/python2-*
vmove ${py2_sitelib}/PyQt5/pylupdate.so
@@ -114,7 +112,6 @@ python3-PyQt5-devel-tools_package() {
pyqt5:pylupdate5:/usr/bin/python3-pylupdate5
pyqt5:pyrcc5:/usr/bin/python3-pyrcc5
pyqt5:pyuic5:/usr/bin/python3-pyuic5"
- pycompile_module="PyQt5"
pkg_install() {
vmove usr/bin/python3-*
vmove ${py3_sitelib}/PyQt5/pylupdate.so
@@ -280,7 +277,6 @@ python-PyQt5-xmlpatterns_package() {
}
python3-PyQt5_package() {
lib32disabled=yes
- pycompile_module="PyQt5"
depends="python3-sip-PyQt5>=${_sipver}"
short_desc="${short_desc/Python2/Python3}"
pkg_install() {
From 6cc5ed941ff5e1ed522340a32326cd69c092424a Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 5 Aug 2020 17:01:45 +0200
Subject: [PATCH 3/3] qutebrowser: revbump for python-PyQt5
---
srcpkgs/qutebrowser/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 14204d37ae9..92c9bd266a6 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -2,7 +2,7 @@
# not noarch as the package might be built with different backend for each arch
pkgname=qutebrowser
version=1.13.1
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools asciidoc"
depends="python3-PyQt5-quick python3-Jinja2 python3-Pygments python3-pyPEG2
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: python-PyQt5: update to 1.15.0
2020-08-05 15:25 [PR PATCH] python-PyQt5: update to 1.15.0 PaperMountainStudio
2020-08-05 15:56 ` [PR PATCH] [Updated] " PaperMountainStudio
@ 2020-08-06 0:11 ` daniel-eys
2020-08-06 8:25 ` [PR PATCH] [Updated] " PaperMountainStudio
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: daniel-eys @ 2020-08-06 0:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
New comment by daniel-eys on void-packages repository
https://github.com/void-linux/void-packages/pull/24076#issuecomment-669608927
Comment:
* `python-PyQt5-webengine` should be updated as well.
* The `update` file needs to be adjusted: `pkgname="PyQt5"`
* I'm pretty sure revbumping qutebrowser (as a python package) isn't really necessary here.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] python-PyQt5: update to 1.15.0
2020-08-05 15:25 [PR PATCH] python-PyQt5: update to 1.15.0 PaperMountainStudio
2020-08-05 15:56 ` [PR PATCH] [Updated] " PaperMountainStudio
2020-08-06 0:11 ` daniel-eys
@ 2020-08-06 8:25 ` PaperMountainStudio
2020-08-06 8:27 ` PaperMountainStudio
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: PaperMountainStudio @ 2020-08-06 8:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated pull request by PaperMountainStudio against master on the void-packages repository
https://github.com/PaperMountainStudio/void-packages python-pyqt-1.15.0
https://github.com/void-linux/void-packages/pull/24076
python-PyQt5: update to 1.15.0
requires: #23666
also rebuild qutebrowser against python3-PyQt5 1.15.0
xlint will fail on python-PyQt5, because of indenting, but that's a false alarm
A patch file from https://github.com/void-linux/void-packages/pull/24076.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-pyqt-1.15.0-24076.patch --]
[-- Type: text/x-diff, Size: 6835 bytes --]
From 6f97093327880b16bd944c73246d8dfe0b72a47d Mon Sep 17 00:00:00 2001
From: yoctocell <attocell.name@protonmail.com>
Date: Mon, 20 Jul 2020 10:28:50 +0200
Subject: [PATCH 1/3] sip: update to 4.19.23
---
srcpkgs/sip/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 96a8f1f5dc6..9104b29fced 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,7 +1,7 @@
# Template file for 'sip'
pkgname=sip
-version=4.19.19
-revision=2
+version=4.19.23
+revision=1
hostmakedepends="python-devel python3-devel"
makedepends="${hostmakedepends}"
short_desc="Python extension module generator for C/C++ libraries"
@@ -9,7 +9,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
homepage="https://riverbankcomputing.com/software/sip/intro"
distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"
-checksum=5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44
+checksum=22ca9bcec5388114e40d4aafd7ccd0c4fe072297b628d0c5cdfa2f010c0bc7e7
pre_build() {
mkdir -p sip-${py2_ver}
@@ -66,7 +66,6 @@ do_install() {
python-sip_package() {
lib32disabled=yes
depends="${sourcepkg}-${version}_${revision} python"
- pycompile_module="sipconfig.py"
short_desc="Python2 SIP bindings"
pkg_install() {
vmove ${py2_sitelib}/sip.so
@@ -76,7 +75,6 @@ python-sip_package() {
}
python-sip-devel_package() {
depends="python-sip-${version}_${revision}"
- pycompile_module="sipdistutils.py"
short_desc="Python2 SIP bindings - development files"
pkg_install() {
vmove ${py2_inc}
@@ -86,7 +84,6 @@ python-sip-devel_package() {
python3-sip_package() {
lib32disabled=yes
depends="${sourcepkg}-${version}_${revision} python3"
- pycompile_module="sipconfig.py"
short_desc="Python3 SIP bindings"
pkg_install() {
vmove ${py3_sitelib}/sip.so
@@ -96,7 +93,6 @@ python3-sip_package() {
}
python3-sip-devel_package() {
depends="python3-sip-${version}_${revision}"
- pycompile_module="sipdistutils.py"
short_desc="Python3 SIP bindings - development files"
pkg_install() {
vmove ${py3_inc}
From 8c57da46317891af8342bf3f7ced63bda799992b Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 5 Aug 2020 17:55:13 +0200
Subject: [PATCH 2/3] python-PyQt5: update to 5.15.0
---
srcpkgs/python-PyQt5/template | 18 +++++++-----------
srcpkgs/python-PyQt5/update | 2 +-
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template
index a39f7d5f160..90763b5b576 100644
--- a/srcpkgs/python-PyQt5/template
+++ b/srcpkgs/python-PyQt5/template
@@ -1,11 +1,9 @@
# Template file for 'python-PyQt5'
pkgname=python-PyQt5
-version=5.13.2
-revision=2
-_sipver=4.19.19
-lib32disabled=yes
+version=5.15.0
+revision=1
+_sipver=4.19.23
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
@@ -17,10 +15,11 @@ makedepends="${hostmakedepends/pkg-config/}"
depends="python-sip-PyQt5>=${_sipver} python-enum34"
short_desc="Python2 bindings for the Qt5 toolkit"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-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
+homepage="https://riverbankcomputing.com/software/pyqt/intro"
+distfiles="${PYPI_SITE}/P/PyQt5/PyQt5-${version}.tar.gz"
+checksum=c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9
+lib32disabled=yes
pre_build() {
mkdir -p pyqt5-${py2_ver}
@@ -97,7 +96,6 @@ python-PyQt5-devel-tools_package() {
pyqt5:pylupdate5:/usr/bin/python2-pylupdate5
pyqt5:pyrcc5:/usr/bin/python2-pyrcc5
pyqt5:pyuic5:/usr/bin/python2-pyuic5"
- pycompile_module="PyQt5"
pkg_install() {
vmove usr/bin/python2-*
vmove ${py2_sitelib}/PyQt5/pylupdate.so
@@ -114,7 +112,6 @@ python3-PyQt5-devel-tools_package() {
pyqt5:pylupdate5:/usr/bin/python3-pylupdate5
pyqt5:pyrcc5:/usr/bin/python3-pyrcc5
pyqt5:pyuic5:/usr/bin/python3-pyuic5"
- pycompile_module="PyQt5"
pkg_install() {
vmove usr/bin/python3-*
vmove ${py3_sitelib}/PyQt5/pylupdate.so
@@ -280,7 +277,6 @@ python-PyQt5-xmlpatterns_package() {
}
python3-PyQt5_package() {
lib32disabled=yes
- pycompile_module="PyQt5"
depends="python3-sip-PyQt5>=${_sipver}"
short_desc="${short_desc/Python2/Python3}"
pkg_install() {
diff --git a/srcpkgs/python-PyQt5/update b/srcpkgs/python-PyQt5/update
index a0fae38330c..0a0526fd4a8 100644
--- a/srcpkgs/python-PyQt5/update
+++ b/srcpkgs/python-PyQt5/update
@@ -1 +1 @@
-pkgname="PyQt5_gpl"
+pkgname="PyQt5"
From 87c994e68e05aa848201e9c726217f585da92bea Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 6 Aug 2020 10:24:55 +0200
Subject: [PATCH 3/3] python-PyQt5-webengine: update to 1.15.0
---
srcpkgs/python-PyQt5-webengine/template | 8 ++++----
srcpkgs/python-PyQt5-webengine/update | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python-PyQt5-webengine/template b/srcpkgs/python-PyQt5-webengine/template
index a60800b52d7..e98a06979b9 100644
--- a/srcpkgs/python-PyQt5-webengine/template
+++ b/srcpkgs/python-PyQt5-webengine/template
@@ -1,7 +1,7 @@
# Template file for 'python-PyQt5-webengine'
pkgname=python-PyQt5-webengine
-version=5.13.2
-revision=5
+version=5.15.0
+revision=1
wrksrc="PyQtWebEngine-${version}"
hostmakedepends="pkg-config qt5-qmake python python-PyQt5 python3-PyQt5"
makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
@@ -11,8 +11,8 @@ short_desc="Python2 bindings for the Qt5 toolkit - webengine module"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="GPL-3.0-only"
homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${version}/PyQtWebEngine-${version}.tar.gz"
-checksum=4264911b5847c75721d8c9c30af92e58a216bd25ceef37f7abf921005c1d45a9
+distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz"
+checksum=670812688e40bf75f70ddf01eadd897d231300318d3856b275bf8e7e0085bf75
lib32disabled=yes
nocross="configure script is broken for cross builds"
diff --git a/srcpkgs/python-PyQt5-webengine/update b/srcpkgs/python-PyQt5-webengine/update
index 4e03873e2a7..07d64e6f49d 100644
--- a/srcpkgs/python-PyQt5-webengine/update
+++ b/srcpkgs/python-PyQt5-webengine/update
@@ -1 +1 @@
-pkgname="PyQtWebEngine_gpl"
+pkgname="PyQtWebEngine"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: python-PyQt5: update to 1.15.0
2020-08-05 15:25 [PR PATCH] python-PyQt5: update to 1.15.0 PaperMountainStudio
` (2 preceding siblings ...)
2020-08-06 8:25 ` [PR PATCH] [Updated] " PaperMountainStudio
@ 2020-08-06 8:27 ` PaperMountainStudio
2020-08-06 8:28 ` PaperMountainStudio
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: PaperMountainStudio @ 2020-08-06 8:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 404 bytes --]
New comment by PaperMountainStudio on void-packages repository
https://github.com/void-linux/void-packages/pull/24076#issuecomment-669789605
Comment:
> * `python-PyQt5-webengine` should be updated as well.
should I add a notice that these packages should be synchronized?
> * I'm pretty sure revbumping qutebrowser (as a python package) isn't really necessary here.
correct, I deleted that commit
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: python-PyQt5: update to 1.15.0
2020-08-05 15:25 [PR PATCH] python-PyQt5: update to 1.15.0 PaperMountainStudio
` (3 preceding siblings ...)
2020-08-06 8:27 ` PaperMountainStudio
@ 2020-08-06 8:28 ` PaperMountainStudio
2020-08-06 9:58 ` Johnnynator
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: PaperMountainStudio @ 2020-08-06 8:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
New comment by PaperMountainStudio on void-packages repository
https://github.com/void-linux/void-packages/pull/24076#issuecomment-669789605
Comment:
> * `python-PyQt5-webengine` should be updated as well.
should I add a notice that these packages should be synchronized?
> * I'm pretty sure revbumping qutebrowser (as a python package) isn't really necessary here.
correct, I deleted that commit
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: python-PyQt5: update to 1.15.0
2020-08-05 15:25 [PR PATCH] python-PyQt5: update to 1.15.0 PaperMountainStudio
` (4 preceding siblings ...)
2020-08-06 8:28 ` PaperMountainStudio
@ 2020-08-06 9:58 ` Johnnynator
2020-08-06 10:23 ` [PR PATCH] [Updated] " PaperMountainStudio
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Johnnynator @ 2020-08-06 9:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/24076#issuecomment-669834665
Comment:
You should fix your PR and commit messages to list the correct version (you accidentally have 1.15.0)
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] python-PyQt5: update to 1.15.0
2020-08-05 15:25 [PR PATCH] python-PyQt5: update to 1.15.0 PaperMountainStudio
` (5 preceding siblings ...)
2020-08-06 9:58 ` Johnnynator
@ 2020-08-06 10:23 ` PaperMountainStudio
2020-08-06 10:23 ` python-PyQt5: update to 5.15.0 PaperMountainStudio
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: PaperMountainStudio @ 2020-08-06 10:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated pull request by PaperMountainStudio against master on the void-packages repository
https://github.com/PaperMountainStudio/void-packages python-pyqt-1.15.0
https://github.com/void-linux/void-packages/pull/24076
python-PyQt5: update to 1.15.0
requires: #23666
also rebuild qutebrowser against python3-PyQt5 1.15.0
xlint will fail on python-PyQt5, because of indenting, but that's a false alarm
A patch file from https://github.com/void-linux/void-packages/pull/24076.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-pyqt-1.15.0-24076.patch --]
[-- Type: text/x-diff, Size: 6835 bytes --]
From 6f97093327880b16bd944c73246d8dfe0b72a47d Mon Sep 17 00:00:00 2001
From: yoctocell <attocell.name@protonmail.com>
Date: Mon, 20 Jul 2020 10:28:50 +0200
Subject: [PATCH 1/3] sip: update to 4.19.23
---
srcpkgs/sip/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 96a8f1f5dc6..9104b29fced 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,7 +1,7 @@
# Template file for 'sip'
pkgname=sip
-version=4.19.19
-revision=2
+version=4.19.23
+revision=1
hostmakedepends="python-devel python3-devel"
makedepends="${hostmakedepends}"
short_desc="Python extension module generator for C/C++ libraries"
@@ -9,7 +9,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
homepage="https://riverbankcomputing.com/software/sip/intro"
distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"
-checksum=5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44
+checksum=22ca9bcec5388114e40d4aafd7ccd0c4fe072297b628d0c5cdfa2f010c0bc7e7
pre_build() {
mkdir -p sip-${py2_ver}
@@ -66,7 +66,6 @@ do_install() {
python-sip_package() {
lib32disabled=yes
depends="${sourcepkg}-${version}_${revision} python"
- pycompile_module="sipconfig.py"
short_desc="Python2 SIP bindings"
pkg_install() {
vmove ${py2_sitelib}/sip.so
@@ -76,7 +75,6 @@ python-sip_package() {
}
python-sip-devel_package() {
depends="python-sip-${version}_${revision}"
- pycompile_module="sipdistutils.py"
short_desc="Python2 SIP bindings - development files"
pkg_install() {
vmove ${py2_inc}
@@ -86,7 +84,6 @@ python-sip-devel_package() {
python3-sip_package() {
lib32disabled=yes
depends="${sourcepkg}-${version}_${revision} python3"
- pycompile_module="sipconfig.py"
short_desc="Python3 SIP bindings"
pkg_install() {
vmove ${py3_sitelib}/sip.so
@@ -96,7 +93,6 @@ python3-sip_package() {
}
python3-sip-devel_package() {
depends="python3-sip-${version}_${revision}"
- pycompile_module="sipdistutils.py"
short_desc="Python3 SIP bindings - development files"
pkg_install() {
vmove ${py3_inc}
From 8c57da46317891af8342bf3f7ced63bda799992b Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 5 Aug 2020 17:55:13 +0200
Subject: [PATCH 2/3] python-PyQt5: update to 5.15.0
---
srcpkgs/python-PyQt5/template | 18 +++++++-----------
srcpkgs/python-PyQt5/update | 2 +-
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template
index a39f7d5f160..90763b5b576 100644
--- a/srcpkgs/python-PyQt5/template
+++ b/srcpkgs/python-PyQt5/template
@@ -1,11 +1,9 @@
# Template file for 'python-PyQt5'
pkgname=python-PyQt5
-version=5.13.2
-revision=2
-_sipver=4.19.19
-lib32disabled=yes
+version=5.15.0
+revision=1
+_sipver=4.19.23
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
@@ -17,10 +15,11 @@ makedepends="${hostmakedepends/pkg-config/}"
depends="python-sip-PyQt5>=${_sipver} python-enum34"
short_desc="Python2 bindings for the Qt5 toolkit"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-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
+homepage="https://riverbankcomputing.com/software/pyqt/intro"
+distfiles="${PYPI_SITE}/P/PyQt5/PyQt5-${version}.tar.gz"
+checksum=c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9
+lib32disabled=yes
pre_build() {
mkdir -p pyqt5-${py2_ver}
@@ -97,7 +96,6 @@ python-PyQt5-devel-tools_package() {
pyqt5:pylupdate5:/usr/bin/python2-pylupdate5
pyqt5:pyrcc5:/usr/bin/python2-pyrcc5
pyqt5:pyuic5:/usr/bin/python2-pyuic5"
- pycompile_module="PyQt5"
pkg_install() {
vmove usr/bin/python2-*
vmove ${py2_sitelib}/PyQt5/pylupdate.so
@@ -114,7 +112,6 @@ python3-PyQt5-devel-tools_package() {
pyqt5:pylupdate5:/usr/bin/python3-pylupdate5
pyqt5:pyrcc5:/usr/bin/python3-pyrcc5
pyqt5:pyuic5:/usr/bin/python3-pyuic5"
- pycompile_module="PyQt5"
pkg_install() {
vmove usr/bin/python3-*
vmove ${py3_sitelib}/PyQt5/pylupdate.so
@@ -280,7 +277,6 @@ python-PyQt5-xmlpatterns_package() {
}
python3-PyQt5_package() {
lib32disabled=yes
- pycompile_module="PyQt5"
depends="python3-sip-PyQt5>=${_sipver}"
short_desc="${short_desc/Python2/Python3}"
pkg_install() {
diff --git a/srcpkgs/python-PyQt5/update b/srcpkgs/python-PyQt5/update
index a0fae38330c..0a0526fd4a8 100644
--- a/srcpkgs/python-PyQt5/update
+++ b/srcpkgs/python-PyQt5/update
@@ -1 +1 @@
-pkgname="PyQt5_gpl"
+pkgname="PyQt5"
From 4b2320d2deecff5188958fb53f014522ea1c216b Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 6 Aug 2020 10:24:55 +0200
Subject: [PATCH 3/3] python-PyQt5-webengine: update to 5.15.0
---
srcpkgs/python-PyQt5-webengine/template | 8 ++++----
srcpkgs/python-PyQt5-webengine/update | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python-PyQt5-webengine/template b/srcpkgs/python-PyQt5-webengine/template
index a60800b52d7..e98a06979b9 100644
--- a/srcpkgs/python-PyQt5-webengine/template
+++ b/srcpkgs/python-PyQt5-webengine/template
@@ -1,7 +1,7 @@
# Template file for 'python-PyQt5-webengine'
pkgname=python-PyQt5-webengine
-version=5.13.2
-revision=5
+version=5.15.0
+revision=1
wrksrc="PyQtWebEngine-${version}"
hostmakedepends="pkg-config qt5-qmake python python-PyQt5 python3-PyQt5"
makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
@@ -11,8 +11,8 @@ short_desc="Python2 bindings for the Qt5 toolkit - webengine module"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="GPL-3.0-only"
homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-distfiles="https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${version}/PyQtWebEngine-${version}.tar.gz"
-checksum=4264911b5847c75721d8c9c30af92e58a216bd25ceef37f7abf921005c1d45a9
+distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz"
+checksum=670812688e40bf75f70ddf01eadd897d231300318d3856b275bf8e7e0085bf75
lib32disabled=yes
nocross="configure script is broken for cross builds"
diff --git a/srcpkgs/python-PyQt5-webengine/update b/srcpkgs/python-PyQt5-webengine/update
index 4e03873e2a7..07d64e6f49d 100644
--- a/srcpkgs/python-PyQt5-webengine/update
+++ b/srcpkgs/python-PyQt5-webengine/update
@@ -1 +1 @@
-pkgname="PyQtWebEngine_gpl"
+pkgname="PyQtWebEngine"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: python-PyQt5: update to 5.15.0
2020-08-05 15:25 [PR PATCH] python-PyQt5: update to 1.15.0 PaperMountainStudio
` (6 preceding siblings ...)
2020-08-06 10:23 ` [PR PATCH] [Updated] " PaperMountainStudio
@ 2020-08-06 10:23 ` PaperMountainStudio
2020-08-09 9:48 ` sgn
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: PaperMountainStudio @ 2020-08-06 10:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New comment by PaperMountainStudio on void-packages repository
https://github.com/void-linux/void-packages/pull/24076#issuecomment-669845625
Comment:
oops, fixed
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: python-PyQt5: update to 5.15.0
2020-08-05 15:25 [PR PATCH] python-PyQt5: update to 1.15.0 PaperMountainStudio
` (7 preceding siblings ...)
2020-08-06 10:23 ` python-PyQt5: update to 5.15.0 PaperMountainStudio
@ 2020-08-09 9:48 ` sgn
2020-08-10 11:52 ` PaperMountainStudio
2020-08-10 11:52 ` [PR PATCH] [Closed]: " PaperMountainStudio
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2020-08-09 9:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/24076#issuecomment-671031220
Comment:
This is not a simple version bump, PyQt5 5.15.0 doesn't support python 2, there're conflicts that needs to be solved.
I'll take over.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: python-PyQt5: update to 5.15.0
2020-08-05 15:25 [PR PATCH] python-PyQt5: update to 1.15.0 PaperMountainStudio
` (8 preceding siblings ...)
2020-08-09 9:48 ` sgn
@ 2020-08-10 11:52 ` PaperMountainStudio
2020-08-10 11:52 ` [PR PATCH] [Closed]: " PaperMountainStudio
10 siblings, 0 replies; 12+ messages in thread
From: PaperMountainStudio @ 2020-08-10 11:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New comment by PaperMountainStudio on void-packages repository
https://github.com/void-linux/void-packages/pull/24076#issuecomment-671310450
Comment:
closing in favour of #24182
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Closed]: python-PyQt5: update to 5.15.0
2020-08-05 15:25 [PR PATCH] python-PyQt5: update to 1.15.0 PaperMountainStudio
` (9 preceding siblings ...)
2020-08-10 11:52 ` PaperMountainStudio
@ 2020-08-10 11:52 ` PaperMountainStudio
10 siblings, 0 replies; 12+ messages in thread
From: PaperMountainStudio @ 2020-08-10 11:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
There's a closed pull request on the void-packages repository
python-PyQt5: update to 5.15.0
https://github.com/void-linux/void-packages/pull/24076
Description:
requires: #23666
also rebuild qutebrowser against python3-PyQt5 1.15.0
xlint will fail on python-PyQt5, because of indenting, but that's a false alarm
^ permalink raw reply [flat|nested] 12+ messages in thread