dbus-python3: added a patch and include egg info

This commit is contained in:
Tim Biermann 2022-03-13 09:29:36 +01:00
parent ba4a85d2d4
commit 5512751934
4 changed files with 82 additions and 50 deletions

View File

@ -1,46 +1,17 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/dbus-1.0/
drwxr-xr-x root/root usr/include/dbus-1.0/dbus/
-rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus-python.h
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/dbus-python3.pc
-rw-r--r-- root/root usr/lib/pkgconfig/dbus-python.pc
drwxr-xr-x root/root usr/lib/python3.9/
drwxr-xr-x root/root usr/lib/python3.9/site-packages/
-rwxr-xr-x root/root usr/lib/python3.9/site-packages/_dbus_bindings.la
-rwxr-xr-x root/root usr/lib/python3.9/site-packages/_dbus_bindings.so
-rwxr-xr-x root/root usr/lib/python3.9/site-packages/_dbus_glib_bindings.la
-rwxr-xr-x root/root usr/lib/python3.9/site-packages/_dbus_glib_bindings.so
drwxr-xr-x root/root usr/lib/python3.9/site-packages/dbus/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__init__.py
drwxr-xr-x root/root usr/lib/python3.9/site-packages/dbus/__pycache__/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/__init__.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/__init__.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/_compat.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/_compat.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/_dbus.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/_dbus.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/_expat_introspect_parser.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/_expat_introspect_parser.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/bus.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/bus.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/connection.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/connection.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/decorators.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/decorators.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/exceptions.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/exceptions.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/gi_service.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/gi_service.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/glib.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/glib.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/lowlevel.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/lowlevel.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/proxies.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/proxies.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/server.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/server.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/service.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/service.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/types.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/__pycache__/types.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/_compat.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/_dbus.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/_expat_introspect_parser.py
@ -53,13 +24,13 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/dbus/__pycache__/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/lowlevel.py
drwxr-xr-x root/root usr/lib/python3.9/site-packages/dbus/mainloop/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/mainloop/__init__.py
drwxr-xr-x root/root usr/lib/python3.9/site-packages/dbus/mainloop/__pycache__/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/mainloop/__pycache__/__init__.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/mainloop/__pycache__/__init__.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/mainloop/__pycache__/glib.cpython-39.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/mainloop/__pycache__/glib.cpython-39.pyc
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/mainloop/glib.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/proxies.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/server.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/service.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus/types.py
drwxr-xr-x root/root usr/lib/python3.9/site-packages/dbus_python-1.2.18-py3.9.egg-info/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus_python-1.2.18-py3.9.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus_python-1.2.18-py3.9.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus_python-1.2.18-py3.9.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python3.9/site-packages/dbus_python-1.2.18-py3.9.egg-info/top_level.txt

View File

@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3xwktBPfFdSfGVrgjLMHdmC2Qtg/m0o7aP/E/17nksutsiXxbjhV7xXRQkt2jl+W6Hi+j0ls5w/ATdmixzwozAU=
SHA256 (Pkgfile) = a0c52e5343a748c36180d6042ccfcb64182a58cd0cea1841b837aa0268af18c8
SHA256 (.footprint) = 73ca67c631ea188c6eaae5cc54d82a828e0ed2878c99ad73037ce1ae2c3f7c58
RWSagIOpLGJF30enAWlrDpMaxBMjj98rMYHaQrDnib1tBGu5gQU3iWu9B3cacpCHcR5OfozsUe2Kl03C0vOmN2tIVX98vlK1Jgw=
SHA256 (Pkgfile) = 85e7e54880ec18b3828234c8428d94e341e1a70a51881ad079c0c293ca9d75e0
SHA256 (.footprint) = 1111dc89c021dbb1592e9226ea3ff150787553be3e92400cf01b4f980e66e336
SHA256 (dbus-python-1.2.18.tar.gz) = 92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260
SHA256 (0001-Move-python-modules-to-architecture-specific-directo.patch) = 12cbc097cbcc1fbf5e5449226c88c6011a3e11f84260b9372a25d35f083270cb

View File

@ -0,0 +1,52 @@
From 380ae714f641a73a30f86ae8f5a2e05ac063b37f Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Tue, 23 Feb 2016 07:32:08 +0000
Subject: [PATCH] Move python modules to architecture-specific directory
This is because dbus-python gets dragged in as a dependency of other
things people want to be multilib-compatible. As is the Python
modules conflict.
---
Makefile.am | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index fd480d4..0859994 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,7 +155,8 @@ test_dbus_py_test_la_SOURCES = \
# === dbus package ===
-nobase_python_PYTHON = \
+dbuspydir = $(pyexecdir)
+nobase_dbuspy_DATA = \
dbus/bus.py \
dbus/connection.py \
dbus/_compat.py \
@@ -175,12 +176,12 @@ nobase_python_PYTHON = \
dbus/types.py
if !HAVE_PYTHON_3
-nobase_python_PYTHON += \
+nobase_dbuspy_DATA += \
dbus/gobject_service.py \
$(NULL)
endif
-check_py_sources = $(nobase_python_PYTHON)
+check_py_sources = $(nobase_dbuspy_DATA)
include $(top_srcdir)/tools/check-coding-style.mk
# === Devel stuff ===
@@ -416,7 +417,7 @@ uninstall-local: uninstall-local-sphinx
if ENABLE_DOCUMENTATION
all: doc/_build/.stamp
-doc/_build/.stamp: $(nobase_python_PYTHON) \
+doc/_build/.stamp: $(nobase_dbuspy_DATA) \
_dbus_bindings.la \
_dbus_glib_bindings.la \
$(sphinx_sources) \
--
2.17.0

View File

@ -5,17 +5,25 @@
name=dbus-python3
version=1.2.18
release=1
source=(https://dbus.freedesktop.org/releases/dbus-python/dbus-python-$version.tar.gz)
release=2
source=(https://dbus.freedesktop.org/releases/dbus-python/dbus-python-$version.tar.gz
0001-Move-python-modules-to-architecture-specific-directo.patch)
build() {
cd dbus-python-$version
mkdir build && cd build
PYTHON=/usr/bin/python3 \
../configure --prefix=/usr
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
patch -Np1 -i $SRC/0001-Move-python-modules-to-architecture-specific-directo.patch
autoreconf -vfi
./configure --prefix=/usr \
PYTHON=/usr/bin/python3 \
PYTHON_EXTRA_LIBS=' '
make
make DESTDIR=$PKG install
rm -fr $PKG/usr/{share,include}
mv $PKG/usr/lib/pkgconfig/dbus-python.pc $PKG/usr/lib/pkgconfig/dbus-python3.pc
/usr/bin/python3 setup.py install --root=$PKG \
--optimize=1 \
--skip-build
find $PKG -name '*.la' -type f -delete
}