From 77e4be3ed6002e0c9e36d9d32aa26261b52d6c40 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 3 Oct 2026 10:43:16 +0200 Subject: [PATCH] package/dbus-python: bump to version 1.5.0 https://gitlab.freedesktop.org/dbus/dbus-python/-/blob/dbus-python-1.5.0/NEWS Migrate from autotools to meson build system. Update the license file list for upstream's REUSE conversion. Keep the full set of split license texts in DBUS_PYTHON_LICENSE_FILES so legal-info can hash them, but leave DBUS_PYTHON_LICENSE unchanged: the GPL-3.0+ with exception text applies to the unused Autoconf macro, and the extra dbus-gmain MIT files are not installed. COPYING hash changed due to REUSE formatting: https://gitlab.freedesktop.org/dbus/dbus-python/-/commit/f83a62c27203553c04c375ff663d9d99273670c9 subprojects/dbus-gmain/COPYING hash changed due to REUSE formatting: https://gitlab.freedesktop.org/dbus/dbus-python/-/commit/ab33ebefc5ca34486509e3a87591ad2e883b9549 Removed autoconf-related license files due to upstream commit https://gitlab.freedesktop.org/dbus/dbus-python/-/commit/b286e65d1e4c88db16876e31e6b1b63eaefab2f8 Switched back to gz tarball as provided by upstream. Signed-off-by: James Hilliard [Bernd: - bumped to 1.5.0 - updated license files and tarball URL] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dbus-python/dbus-python.hash | 10 +++++++--- package/dbus-python/dbus-python.mk | 29 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/package/dbus-python/dbus-python.hash b/package/dbus-python/dbus-python.hash index 8d1609dec7..ce04474291 100644 --- a/package/dbus-python/dbus-python.hash +++ b/package/dbus-python/dbus-python.hash @@ -1,6 +1,10 @@ # Locally calculated after checking pgp signature -sha256 92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260 dbus-python-1.2.18.tar.gz +sha256 ac94ce330879108e5d37105164cc14b595bdf9326d2ce4a5acad6c1ab2bf6476 dbus_python-1.5.0.tar.gz # Locally calculated -sha256 1e4562245383fdb5203b1769789e5b28bba21af4923aea7e8b2614f7f93623c0 COPYING -sha256 064523e3ab64d6f03904132b2cc4a1bd8500586edb4cd050c2ff2b96aed4c33b dbus-gmain/COPYING +sha256 c5324f0629698cbe01dde8e3b802c3331601ebf98c3c65918520ba5eca66c930 COPYING +sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt +sha256 118fdd408a78866c5b776864650f4a6006616b5bd0793a63924c91febba0b2b8 subprojects/dbus-gmain/COPYING +sha256 93bb4f7417aa775bab9026cc3d0af28aeb64451fc5a8ec651876785edd8eaf9b subprojects/dbus-gmain/LICENSES/AFL-2.1.txt +sha256 aaf135472f81c5b4a0dca9367e5bb5e9750032b5bebe5442b36e4c0a47430df3 subprojects/dbus-gmain/LICENSES/GPL-2.0-or-later.txt +sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 subprojects/dbus-gmain/LICENSES/MIT.txt diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk index 16b22d4821..1a69de0215 100644 --- a/package/dbus-python/dbus-python.mk +++ b/package/dbus-python/dbus-python.mk @@ -4,25 +4,24 @@ # ################################################################################ -DBUS_PYTHON_VERSION = 1.2.18 -DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python +DBUS_PYTHON_VERSION = 1.5.0 +DBUS_PYTHON_SOURCE = dbus_python-$(DBUS_PYTHON_VERSION).tar.gz +DBUS_PYTHON_SITE = https://dbus.freedesktop.org/releases/dbus-python DBUS_PYTHON_INSTALL_STAGING = YES DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain) -DBUS_PYTHON_LICENSE_FILES = COPYING dbus-gmain/COPYING +DBUS_PYTHON_LICENSE_FILES = \ + COPYING \ + LICENSES/MIT.txt \ + subprojects/dbus-gmain/COPYING \ + subprojects/dbus-gmain/LICENSES/AFL-2.1.txt \ + subprojects/dbus-gmain/LICENSES/GPL-2.0-or-later.txt \ + subprojects/dbus-gmain/LICENSES/MIT.txt DBUS_PYTHON_DEPENDENCIES = dbus libglib2 python3 host-python3 HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 host-python3 DBUS_PYTHON_CONF_ENV = \ - PYTHON=$(HOST_DIR)/bin/python3 \ - PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ - PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \ - PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" + _PYTHON_SYSCONFIGDATA_NAME=$(PKG_PYTHON_SYSCONFIGDATA_NAME) \ + PYTHONPATH=$(PYTHON3_PATH) -HOST_DBUS_PYTHON_CONF_ENV = \ - PYTHON=$(HOST_DIR)/bin/python3 \ - PYTHON_INCLUDES="`$(HOST_DIR)/bin/python3-config --includes`" \ - PYTHON_LIBS="`$(HOST_DIR)/bin/python3-config --ldflags`" \ - PYTHON_EXTRA_LIBS="`$(HOST_DIR)/bin/python3-config --libs --embed`" - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package))