From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] RFC: rename sip 4.x to sip4, sip5 to sip, update to 6.0.0
Date: Fri, 08 Jan 2021 03:13:30 +0100 [thread overview]
Message-ID: <20210108021330.FV1jdhFK0jB-Mk1mUWywT5W2Z9fDbd2zXlXeOWxFI9Q@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27753@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 530 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages sip-rename
https://github.com/void-linux/void-packages/pull/27753
RFC: rename sip 4.x to sip4, sip5 to sip, update to 6.0.0
- Most of our packages have the convention of using versioned-suffix for old packages
- Have `sip5` package with version 6 is weird to me
- I'm expecting sip 4.x will be phased out soon.
A patch file from https://github.com/void-linux/void-packages/pull/27753.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sip-rename-27753.patch --]
[-- Type: text/x-diff, Size: 12226 bytes --]
From 7d43aaf8a8aa859885091f6d8f5bfabe8c298cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 08:02:10 +0700
Subject: [PATCH 1/8] gns3-gui: not depends on python3-sip
Indirectly depends via PyQt5.
---
srcpkgs/gns3-gui/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index f7f51364548..1d7d84c4c65 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,11 +1,11 @@
# Template file for 'gns3-gui'
pkgname=gns3-gui
version=2.2.17
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-psutil python3-jsonschema python3-sentry
- python3-PyQt5-svg python3-PyQt5-websockets python3-sip xterm inetutils-telnet
+ python3-PyQt5-svg python3-PyQt5-websockets xterm inetutils-telnet
gns3-net-converter python3-distro"
checkdepends="${depends}"
short_desc="Graphical Network Simulator 3 - GUI"
From 659217d8d32292ea53ebd0f695fae9b683c524de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 08:05:44 +0700
Subject: [PATCH 2/8] sip: rename to sip4
---
srcpkgs/python3-orocos-kdl/template | 2 +-
srcpkgs/python3-sip | 2 +-
srcpkgs/python3-sip-devel | 2 +-
srcpkgs/{sip => sip4}/template | 13 ++++++++-----
srcpkgs/{sip => sip4}/update | 0
5 files changed, 11 insertions(+), 8 deletions(-)
rename srcpkgs/{sip => sip4}/template (82%)
rename srcpkgs/{sip => sip4}/update (100%)
diff --git a/srcpkgs/python3-orocos-kdl/template b/srcpkgs/python3-orocos-kdl/template
index 728ed73d780..281ea8978c5 100644
--- a/srcpkgs/python3-orocos-kdl/template
+++ b/srcpkgs/python3-orocos-kdl/template
@@ -6,7 +6,7 @@ wrksrc=orocos_kinematics_dynamics-${version}
build_wrksrc=python_orocos_kdl
build_style=cmake
configure_args="-DPYTHON_VERSION=3 -DSIP_EXECUTABLE=/usr/bin/sip"
-hostmakedepends="python3 python3-sip sip"
+hostmakedepends="python3 python3-sip sip4"
makedepends="python3-sip-devel python3-devel orocos-kdl-devel eigen3.2"
depends="python3 python3-sip"
short_desc="Python3 Bindings for Orocos Kinematics and Dynamics C++ library"
diff --git a/srcpkgs/python3-sip b/srcpkgs/python3-sip
index 633f7c0bcce..27dcc148ae7 120000
--- a/srcpkgs/python3-sip
+++ b/srcpkgs/python3-sip
@@ -1 +1 @@
-sip
\ No newline at end of file
+sip4
\ No newline at end of file
diff --git a/srcpkgs/python3-sip-devel b/srcpkgs/python3-sip-devel
index 633f7c0bcce..27dcc148ae7 120000
--- a/srcpkgs/python3-sip-devel
+++ b/srcpkgs/python3-sip-devel
@@ -1 +1 @@
-sip
\ No newline at end of file
+sip4
\ No newline at end of file
diff --git a/srcpkgs/sip/template b/srcpkgs/sip4/template
similarity index 82%
rename from srcpkgs/sip/template
rename to srcpkgs/sip4/template
index 87d0c5c6ed6..30de98f8320 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip4/template
@@ -1,7 +1,8 @@
-# Template file for 'sip'
-pkgname=sip
+# Template file for 'sip4'
+pkgname=sip4
version=4.19.24
-revision=3
+revision=4
+wrksrc="sip-$version"
hostmakedepends="python3-devel"
makedepends="${hostmakedepends}"
short_desc="Python extension module generator for C/C++ libraries"
@@ -10,12 +11,14 @@ 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=edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5
+replaces="sip<=${version}_${revision}"
+provides="sip-${version}_${revision}"
do_build() {
python3 configure.py \
CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
- INCDIR="${XBPS_CROSS_BASE}/${py3_inc}" ${pyqt5}
+ INCDIR="${XBPS_CROSS_BASE}/${py3_inc}"
make ${makejobs}
}
@@ -40,7 +43,7 @@ python3-sip_package() {
}
python3-sip-devel_package() {
- depends="python3-sip-${version}_${revision} sip-${version}_${revision}"
+ depends="python3-sip-${version}_${revision} sip4-${version}_${revision}"
short_desc="Python3 SIP bindings - development files"
pkg_install() {
vmove ${py3_inc}
diff --git a/srcpkgs/sip/update b/srcpkgs/sip4/update
similarity index 100%
rename from srcpkgs/sip/update
rename to srcpkgs/sip4/update
From d8aaa27f6e981010dfb961edc9539eb98e3f7724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 08:07:11 +0700
Subject: [PATCH 3/8] sip5: rename to sip
---
srcpkgs/{sip5 => sip}/template | 9 +++++----
srcpkgs/{sip5 => sip}/update | 0
2 files changed, 5 insertions(+), 4 deletions(-)
rename srcpkgs/{sip5 => sip}/template (77%)
rename srcpkgs/{sip5 => sip}/update (100%)
diff --git a/srcpkgs/sip5/template b/srcpkgs/sip/template
similarity index 77%
rename from srcpkgs/sip5/template
rename to srcpkgs/sip/template
index b8e3d0bf10d..4b2090ad89f 100644
--- a/srcpkgs/sip5/template
+++ b/srcpkgs/sip/template
@@ -1,19 +1,20 @@
-# Template file for 'sip5'
-pkgname=sip5
+# Template file for 'sip'
+pkgname=sip
version=5.5.0
revision=1
-wrksrc="sip-$version"
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
makedepends="python3-devel"
depends="python3-setuptools python3-packaging python3-toml"
-short_desc="SIP 5 - Python 3 bindings generator for C/C++ libraries"
+short_desc="SIP - Python 3 bindings generator for C/C++ libraries"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
homepage="https://riverbankcomputing.com/software/sip/intro"
distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
checksum=5d024c419b30fea8a6de8c71a560c7ab0bc3c221fbfb14d55a5b865bd58eaac5
lib32disabled=yes
+replaces="sip5<=${version}_${revision}"
+provides="sip5-${version}_${revision}"
post_install() {
sed -n '1,/SUCH DAMAGE/p' sipbuild/project.py >NOTICE
diff --git a/srcpkgs/sip5/update b/srcpkgs/sip/update
similarity index 100%
rename from srcpkgs/sip5/update
rename to srcpkgs/sip/update
From 909d574b337c2e2e4b8b615a08e997f832467621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 08:08:58 +0700
Subject: [PATCH 4/8] sip: update to 6.0.0.
---
srcpkgs/sip/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 4b2090ad89f..3cca9aa59d5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
# Template file for 'sip'
pkgname=sip
-version=5.5.0
+version=6.0.0
revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
homepage="https://riverbankcomputing.com/software/sip/intro"
distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=5d024c419b30fea8a6de8c71a560c7ab0bc3c221fbfb14d55a5b865bd58eaac5
+checksum=6185160e1aa8e167b5919c4761cbbf68cc7478d34fb655b3a28b3eb9acb5943a
lib32disabled=yes
replaces="sip5<=${version}_${revision}"
provides="sip5-${version}_${revision}"
From 14ef18a30d08920e9e1106171ed3f94a9ea8f516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 07:52:02 +0700
Subject: [PATCH 5/8] python3-PyQt-builder: update to 1.7.0.
---
srcpkgs/python3-PyQt-builder/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template
index 1d6c8fa73d4..956a6ab1cde 100644
--- a/srcpkgs/python3-PyQt-builder/template
+++ b/srcpkgs/python3-PyQt-builder/template
@@ -1,17 +1,17 @@
# Template file for 'python3-PyQt-builder'
pkgname=python3-PyQt-builder
-version=1.6.0
+version=1.7.0
revision=1
wrksrc=PyQt-builder-$version
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3 sip5>=5.5.0"
+hostmakedepends="python3-setuptools sip"
+depends="python3 sip>=6.0.0"
short_desc="PEP 517 compliant PyQt build system"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
homepage="https://www.riverbankcomputing.com/software/pyqt/"
distfiles="$PYPI_SITE/P/PyQt-builder/PyQt-builder-$version.tar.gz"
-checksum=fb80f01407718bfc68f78e276f2543fcfc5b5900b1187c1fd1f2ff51a6f2a13c
+checksum=b6e3c826f98ff4006ecb34df491ac6062a023b63a32e9f9f50904867aff72f2e
post_install() {
rm -rf $DESTDIR/$py3_sitelib/pyqtbuild/bundle
From d233a4582f32c4ca2ac8b0efd318312074b421b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 07:54:12 +0700
Subject: [PATCH 6/8] python3-PyQt5-webengine: sip5 has been renamed to sip
---
srcpkgs/python3-PyQt5-webengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 920cae92627..ae385283b7f 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -3,7 +3,7 @@ pkgname=python3-PyQt5-webengine
version=5.15.2
revision=1
wrksrc="PyQtWebEngine-${version}"
-hostmakedepends="pkg-config qt5-qmake python3-PyQt5 sip5 qt5-webengine-devel
+hostmakedepends="pkg-config qt5-qmake python3-PyQt5 sip qt5-webengine-devel
python3-PyQt-builder python3-PyQt5-devel
qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
From b7dd767d34759a6c45df5189859c7d8137900f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 07:55:20 +0700
Subject: [PATCH 7/8] python3-PyQt5: depends on new sip
---
srcpkgs/python3-PyQt5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index bac89e57965..2a2733b439c 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -1,7 +1,7 @@
# Template file for 'python3-PyQt5'
pkgname=python3-PyQt5
version=5.15.2
-revision=1
+revision=2
_sipver=12.8.0
wrksrc="PyQt5-${version}"
build_helper=qemu
@@ -193,7 +193,7 @@ python3-PyQt5-devel-tools_package() {
}
}
python3-PyQt5-devel_package() {
- depends="sip5 python3-PyQt5-${version}_${revision}"
+ depends="sip>=6.0.0 python3-PyQt5-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/bindings
From 0828f327385cfcdd880837db4a5bc636b2d3f76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 8 Jan 2021 07:56:13 +0700
Subject: [PATCH 8/8] python3-sip-PyQt5: build with new sip
---
srcpkgs/python3-sip-PyQt5/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-sip-PyQt5/template b/srcpkgs/python3-sip-PyQt5/template
index e1d1c45603d..8631cad90fb 100644
--- a/srcpkgs/python3-sip-PyQt5/template
+++ b/srcpkgs/python3-sip-PyQt5/template
@@ -4,7 +4,7 @@ version=12.8.1
revision=1
wrksrc="PyQt5_sip-$version"
build_style=python3-module
-hostmakedepends="python3-devel python3-setuptools sip5"
+hostmakedepends="python3-devel python3-setuptools sip"
makedepends="python3-devel"
short_desc="Python 3 PyQt5 SIP bindings with C and C++"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,6 +14,10 @@ distfiles="${PYPI_SITE}/P/PyQt5_sip/PyQt5_sip-${version}.tar.gz"
checksum=30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd
lib32disabled=yes
+post_extract() {
+ mkdir -p PyQt5
+}
+
post_install() {
- vlicense /usr/share/licenses/sip5/LICENSE
+ vlicense /usr/share/licenses/sip/LICENSE
}
next prev parent reply other threads:[~2021-01-08 2:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-08 1:14 [PR PATCH] " sgn
2021-01-08 1:20 ` [PR PATCH] [Updated] " sgn
2021-01-08 1:26 ` sgn
2021-01-08 2:11 ` sgn
2021-01-08 2:13 ` sgn [this message]
2021-01-08 5:13 ` ericonr
2021-01-08 14:11 ` sgn
2021-01-09 2:20 ` [PR PATCH] [Updated] " sgn
2021-01-13 0:38 ` sgn
2021-01-13 0:43 ` sgn
2021-01-13 11:55 ` sgn
2021-01-13 14:27 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210108021330.FV1jdhFK0jB-Mk1mUWywT5W2Z9fDbd2zXlXeOWxFI9Q@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).