diff options
Diffstat (limited to 'meta-openembedded/meta-python/recipes-extended')
9 files changed, 12 insertions, 137 deletions
diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch deleted file mode 100644 index 526a3b1fb2..0000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3bb8d08bdec2f79bb13c0a44b81718d26e5bdabc Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 8 May 2017 16:30:20 +0800 -Subject: [PATCH 04/11] fix new.roots object is not iterable - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - blivet/blivet.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/blivet.py b/blivet/blivet.py -index ea08837..91c92b2 100644 ---- a/blivet/blivet.py -+++ b/blivet/blivet.py -@@ -1206,7 +1206,7 @@ class Blivet(object): - p = partition.disk.format.parted_disk.getPartitionByPath(partition.path) - partition.parted_partition = p - -- for root in new.roots: -+ for root in new.roots or []: - root.swaps = [new.devicetree.get_device_by_id(d.id, hidden=True) for d in root.swaps] - root.swaps = [s for s in root.swaps if s] - --- -2.7.4 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.8.2.bb index bd57604f26..52b3aa7dc7 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.8.2.bb @@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI += "\ file://0002-run_program-support-timeout.patch \ file://0003-support-infinit-timeout.patch \ - file://0004-fix-new.roots-object-is-not-iterable.patch \ file://0005-fix-incorrect-timeout-while-system-time-changed.patch \ file://0006-tweak-btrfs-packages.patch \ file://0007-invoking-mount-with-infinite-timeout.patch \ @@ -17,16 +16,16 @@ SRC_URI += "\ file://0010-invoking-mkfs-with-infinite-timeout.patch \ file://0011-invoking-dd-with-infinite-timeout.patch \ " -SRC_URI[sha256sum] = "1b05b77f3ee35d82c7a577a168c9ba0204d3e9a87eb1975e5f9af47700eeff48" +SRC_URI[sha256sum] = "88d1500c76c4660aec7da9e9aa54f7f574546571b52c07a67e1417883c2cb25b" inherit pypi features_check systemd setuptools3_legacy REQUIRED_DISTRO_FEATURES = "systemd" RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \ - parted python3-pyparted multipath-tools \ - lsof cryptsetup libblockdev \ - libbytesize \ + parted python3-pyparted multipath-tools \ + lsof cryptsetup libblockdev \ + libbytesize \ " FILES:${PN} += " \ diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch deleted file mode 100644 index c88912bfa0..0000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 54014061be2fed20d6c35aba9719ea70a9fea9ea Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny <vtrefny@redhat.com> -Date: Wed, 1 Sep 2021 08:59:19 +0200 -Subject: [PATCH] Use setuptools instead of distutils in setup.py - -The distutils module is deprecated and will be removed in Python -3.12. - -Upstream-Status: Backport [https://github.com/kraj/blivet-gui/commit/54014061be2fed20d6c35aba9719ea70a9fea9ea] ---- - setup.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index aa8ef57..77849a1 100644 ---- a/setup.py -+++ b/setup.py -@@ -1,7 +1,7 @@ - from __future__ import print_function - --from distutils.core import setup --from distutils.command.sdist import sdist -+from setuptools import setup -+from setuptools.command.sdist import sdist - import glob - import sys - --- -2.35.1 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0002-Use-symbolic-list-add-and-edit-icons.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0002-Use-symbolic-list-add-and-edit-icons.patch deleted file mode 100644 index 3a95859ad7..0000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0002-Use-symbolic-list-add-and-edit-icons.patch +++ /dev/null @@ -1,56 +0,0 @@ -Upstream-Status: Backport [https://github.com/storaged-project/blivet-gui/commit/eb8ec968] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -From eb8ec968d1ee8b4b710568b1eb8536296f90751e Mon Sep 17 00:00:00 2001 -From: Adam Williamson <awilliam@redhat.com> -Date: Thu, 17 Feb 2022 11:16:22 -0800 -Subject: [PATCH] Use symbolic list-add and edit- icons (Adwaita dropped old - ones) - -adwaita-icon-theme 42 no longer includes the non-symbolic icons -for these names. The choices are to switch to symbolic ones or -carry the non-symbolic ones downstream. - -Signed-off-by: Adam Williamson <awilliam@redhat.com> ---- - blivetgui/list_actions.py | 8 ++++---- - blivetgui/processing_window.py | 6 +++--- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/blivetgui/list_actions.py b/blivetgui/list_actions.py -index b7c1f9c..5388feb 100644 ---- a/blivetgui/list_actions.py -+++ b/blivetgui/list_actions.py -@@ -48,10 +48,10 @@ def __init__(self, blivet_gui): - self.blivet_gui = blivet_gui - - icon_theme = Gtk.IconTheme.get_default() # pylint: disable=no-value-for-parameter -- icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add", 16, 0) -- icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete", 16, 0) -- icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all", 16, 0) -- icon_misc = Gtk.IconTheme.load_icon(icon_theme, "edit-paste", 16, 0) -+ icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add-symbolic", 16, 0) -+ icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete-symbolic", 16, 0) -+ icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all-symbolic", 16, 0) -+ icon_misc = Gtk.IconTheme.load_icon(icon_theme, "edit-paste-symbolic", 16, 0) - - self.action_icons = {"add": icon_add, "delete": icon_delete, "edit": icon_edit, - "misc": icon_misc} -diff --git a/blivetgui/processing_window.py b/blivetgui/processing_window.py -index c400f90..a020ae8 100644 ---- a/blivetgui/processing_window.py -+++ b/blivetgui/processing_window.py -@@ -93,9 +93,9 @@ def add_action_view(self): - """ - - icon_theme = Gtk.IconTheme.get_default() # pylint: disable=no-value-for-parameter -- icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add", 16, 0) -- icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete", 16, 0) -- icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all", 16, 0) -+ icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add-symbolic", 16, 0) -+ icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete-symbolic", 16, 0) -+ icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all-symbolic", 16, 0) - - actions_list = Gtk.ListStore(GdkPixbuf.Pixbuf, str, GdkPixbuf.Pixbuf) - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.4.2.bb index 42bcf4651c..b6e04e081e 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.4.2.bb @@ -5,20 +5,14 @@ SECTION = "devel/python" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -S = "${WORKDIR}/git" -B = "${S}" +SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=main;protocol=https" +SRCREV = "9b6a83a7aef546ddacafcc656984c9bbed67a8ec" -SRCREV = "42512ee48494cee71febf04078d9774f0146a085" -SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=main;protocol=https \ - file://0001-Use-setuptools-instead-of-distutils-in-setup.py.patch \ - file://0002-Use-symbolic-list-add-and-edit-icons.patch \ - " +S = "${WORKDIR}/git" -inherit features_check +inherit features_check setuptools3 REQUIRED_DISTRO_FEATURES = "x11 systemd gobject-introspection-data" -inherit setuptools3_legacy python3native - PIP_INSTALL_PACKAGE = "blivet_gui" RDEPENDS:${PN} = "python3-pygobject python3 \ @@ -26,6 +20,4 @@ RDEPENDS:${PN} = "python3-pygobject python3 \ python3-pid libreport \ " -FILES:${PN} += " \ - ${datadir}/* \ - " +FILES:${PN} += "${datadir}/*" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.4.bb b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.5.bb index 8850b79e8c..0478d0d5c2 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.4.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.5.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://rhodesmill.org/pyephem/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=9c930b395b435b00bb13ec83b0c99f40" -SRC_URI[sha256sum] = "73a59f0d2162d1624535c3c3b75f956556bdbb2055eaf554a7bef147d3f9c760" +SRC_URI[sha256sum] = "0c64a8aa401574c75942045b9af70d1656e14c5366151c0cbb400cbeedc2362a" PYPI_PACKAGE = "ephem" diff --git a/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.5.3.bb b/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.7.0.bb index 2c385fc66b..5a1d5ddb8f 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.5.3.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.7.0.bb @@ -8,7 +8,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303" -SRC_URI[sha256sum] = "87b43e0543149efa1253f485cd845bb7ee54df16c9617b8a893650ab84b4acb6" +SRC_URI[sha256sum] = "5cb5123b5cf9ee70584244246816e9114227e0b98ad9176eede6ad54bf5403fa" inherit pypi python_poetry_core diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.2.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.2.bb index 01e4719ba4..f607de7799 100644 --- a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.2.bb +++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.2.bb @@ -49,5 +49,3 @@ ALTERNATIVE:${PN} = "mof_compiler" ALTERNATIVE_TARGET[mof_compiler] = "${bindir}/mof_compiler" ALTERNATIVE_PRIORITY = "60" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-extended/tuna/tuna_git.bb b/meta-openembedded/meta-python/recipes-extended/tuna/tuna_0.19.bb index a493412403..ea0f157921 100644 --- a/meta-openembedded/meta-python/recipes-extended/tuna/tuna_git.bb +++ b/meta-openembedded/meta-python/recipes-extended/tuna/tuna_0.19.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171d SRC_URI = "git://git.kernel.org/pub/scm/utils/tuna/tuna.git;branch=main" -SRCREV = "0681906e75e1c8166126bbfc2f3055e7507bfcb5" +SRCREV = "b972b8ce386c29bcbcd45029a617db3db9e5b6ca" S = "${WORKDIR}/git" |