From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] python-dbus: split python3-dbus to a new package
Date: Fri, 16 Jun 2023 23:37:51 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44486@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages py2split-dbus
https://github.com/void-linux/void-packages/pull/44486
python-dbus: split python3-dbus to a new package
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44486.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-py2split-dbus-44486.patch --]
[-- Type: text/x-diff, Size: 5749 bytes --]
From 3223a26f8f2658a0661092ff45897bd6d2740f47 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 16 Jun 2023 23:27:33 +0200
Subject: [PATCH] python-dbus: split python3-dbus to a new package
---
srcpkgs/python-dbus/template | 79 ++++---------------------
srcpkgs/python3-dbus | 1 -
srcpkgs/python3-dbus-devel | 2 +-
srcpkgs/python3-dbus/python3-dbus-devel | 1 +
srcpkgs/python3-dbus/template | 40 +++++++++++++
5 files changed, 53 insertions(+), 70 deletions(-)
delete mode 120000 srcpkgs/python3-dbus
create mode 120000 srcpkgs/python3-dbus/python3-dbus-devel
create mode 100644 srcpkgs/python3-dbus/template
diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template
index 2dd33f5437b2..c2466c1bd30c 100644
--- a/srcpkgs/python-dbus/template
+++ b/srcpkgs/python-dbus/template
@@ -3,8 +3,8 @@ pkgname=python-dbus
version=1.2.18
revision=3
build_style=gnu-configure
-hostmakedepends="pkg-config python python3"
-makedepends="libglib-devel python3-devel python-devel"
+hostmakedepends="pkg-config python"
+makedepends="libglib-devel python-devel"
depends="python dbus"
short_desc="D-Bus Python2 bindings"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,77 +14,20 @@ distfiles="https://dbus.freedesktop.org/releases/dbus-python/dbus-python-${versi
checksum=92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260
lib32disabled=yes
-pre_configure() {
- mkdir -p dbus-${py2_ver}
- mv * dbus-${py2_ver} || true
- cp -a dbus-${py2_ver} dbus-${py3_ver}
-}
-
do_configure() {
- local py_abiver py_inc pyver
- for pyver in $py2_ver $py3_ver; do
- case "${pyver}" in
- "${py2_ver}")
- py_inc="$py2_inc"
- ;;
- *)
- py_inc="$py3_inc"
- py_abiver="$py3_abiver"
- ;;
- esac
-
- export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py_inc}"
- export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${pyver}${py_abiver}"
- export PYTHON_VERSION="${pyver}"
+ export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py2_inc}"
+ export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py2_ver}${py2_abiver}"
+ export PYTHON_VERSION="${py2_ver}"
- ( cd dbus-${pyver} && ./configure ${configure_args} )
-
- done
+ ./configure ${configure_args}
unset PYTHON_CPPFLAGS PYTHON_EXTRA_LIBS PYTHON_VERSION
}
-do_build() {
- local pyver
- for pyver in $py2_ver $py3_ver; do
- ( cd dbus-${pyver} && make ${makejobs} )
- done
-}
-
-do_install() {
- local pyver pysite eggver
- for pyver in $py2_ver $py3_ver; do
- case "${pyver}" in
- "${py2_ver}") pysite="${py2_sitelib}" ;;
- *) pysite="${py3_sitelib}" ;;
- esac
-
- eggver="dbus_python-${version}-py${pyver}"
- (
- cd dbus-${pyver}
- make DESTDIR=${DESTDIR} install
- vcopy dbus_python.egg-info "${pysite}/${eggver}.egg-info"
- )
- done
-
- vlicense dbus-${py2_ver}/COPYING
-}
-
-python3-dbus_package() {
- lib32disabled=yes
- depends="python3 dbus"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense dbus-${py3_ver}/COPYING
- }
-}
+post_install() {
+ vcopy dbus_python.egg-info "${py2_sitelib}/dbus_python-${version}-py${py2_ver}.egg-info"
+ rm ${DESTDIR}/usr/include/dbus-1.0/dbus/dbus-python.h
+ rm ${DESTDIR}/usr/lib/pkgconfig/dbus-python.pc
-python3-dbus-devel_package() {
- depends="python3-devel python3-dbus>=${version}_${revision}"
- short_desc="${short_desc/Python2/Python3} - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- }
+ vlicense COPYING
}
diff --git a/srcpkgs/python3-dbus b/srcpkgs/python3-dbus
deleted file mode 120000
index 082b5c2fc193..000000000000
--- a/srcpkgs/python3-dbus
+++ /dev/null
@@ -1 +0,0 @@
-python-dbus
\ No newline at end of file
diff --git a/srcpkgs/python3-dbus-devel b/srcpkgs/python3-dbus-devel
index 082b5c2fc193..5fe29e0f2f2e 120000
--- a/srcpkgs/python3-dbus-devel
+++ b/srcpkgs/python3-dbus-devel
@@ -1 +1 @@
-python-dbus
\ No newline at end of file
+python3-dbus
\ No newline at end of file
diff --git a/srcpkgs/python3-dbus/python3-dbus-devel b/srcpkgs/python3-dbus/python3-dbus-devel
new file mode 120000
index 000000000000..3963f5091ad2
--- /dev/null
+++ b/srcpkgs/python3-dbus/python3-dbus-devel
@@ -0,0 +1 @@
+python3-dbus-devel
\ No newline at end of file
diff --git a/srcpkgs/python3-dbus/template b/srcpkgs/python3-dbus/template
new file mode 100644
index 000000000000..796365151488
--- /dev/null
+++ b/srcpkgs/python3-dbus/template
@@ -0,0 +1,40 @@
+# Template file for 'python3-dbus'
+pkgname=python3-dbus
+version=1.2.18
+revision=3
+build_style=gnu-configure
+hostmakedepends="pkg-config python3"
+makedepends="libglib-devel python3-devel"
+depends="python3 dbus"
+short_desc="D-Bus Python3 bindings"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://www.freedesktop.org/wiki/Software/DBusBindings"
+distfiles="https://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz"
+checksum=92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260
+lib32disabled=yes
+
+do_configure() {
+ export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+ export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}${py3_abiver}"
+ export PYTHON_VERSION="${py3_ver}"
+ #export PYTHON=/usr/bin/python3
+
+ ./configure ${configure_args}
+
+ unset PYTHON_CPPFLAGS PYTHON_EXTRA_LIBS PYTHON_VERSION
+}
+
+post_install() {
+ vcopy dbus_python.egg-info "${py3_sitelib}/dbus_python-${version}-py${py3_ver}.egg-info"
+ vlicense COPYING
+}
+
+python3-dbus-devel_package() {
+ depends="python3-devel python3-dbus>=${version}_${revision}"
+ short_desc=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ }
+}
next reply other threads:[~2023-06-16 21:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-16 21:37 paper42 [this message]
2023-06-17 13:04 ` mhmdanas
2023-06-17 17:03 ` [PR PATCH] [Closed]: " paper42
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44486@inbox.vuxu.org \
--to=paper42@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).