Skip to contentSkip to conversation

glade: add autoconf-archive-native DEPENDS

PATCH New Armin Kuster 1 participant 6 messages Jun 17, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 glade: add autoconf-archive-native DEPENDS

From: Ross Burton <[email protected]>

This can be satisfied via transitive dependencies, but make it an explicit DEPENDS.

(cherry picked from commit dbbafeceb4f84625d6eab59c50500b6b8347c613)
---
 meta-oe/recipes-devtools/glade/glade_3.22.2.bb | 1 +
 1 file changed, 1 insertion(+)
meta-oe/recipes-devtools/glade/glade_3.22.2.bb +1 -0
index 6c1112038c..28b1279390 100644
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
                     file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475"
 DEPENDS = "gtk+3 glib-2.0 libxml2 intltool-native \
            gnome-common-native \
+           autoconf-archive-native \
 "
 
 inherit features_check autotools pkgconfig gnomebase gobject-introspection mime-xdg
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/6 libgxim: add autoconf-archive-native DEPENDS

From: Ross Burton <[email protected]>

This can be satisfied via transitive dependencies, but make it an explicit DEPENDS.

(cherry picked from commit 5fca30d672c291b1af8284d6d5cbfc520c95d4fc)
---
 meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb +1 -1
index 2d93936f37..3912e0a8d7 100644
@@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "\
 file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 EXTRA_OECONF = "--enable-debug --disable-static --disable-rebuilds --enable-compile-warnings=minimum"
-DEPENDS += "gtk+ glib-2.0 glib-2.0-native ruby-native intltool-native gnome-common-native"
+DEPENDS += "gtk+ glib-2.0 glib-2.0-native ruby-native intltool-native gnome-common-native autoconf-archive-native"
 
 inherit features_check autotools pkgconfig gettext
 
Signature · 1 line
2.34.1
#2 lore raw

PATCH 3/6 libblockdev: clean up DEPENDS

In reply to Armin Kuster

From: Ross Burton <[email protected]>

If you try to build libblockdev with an empty PACKAGECONFIG then the configure fails.

Add autoconf-archive, glib-2.0, and udev; these were implicitly pulled in via other dependencies. Move kmod to DEPENDS as it's a hard requirement.

(cherry picked from commit f14663746bd519650c8654bbf91971a0a96c109e)
---
 meta-oe/recipes-extended/libblockdev/libblockdev_2.28.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta-oe/recipes-extended/libblockdev/libblockdev_2.28.bb +4 -2
index 44b4e7daf9..22ccbf144e 100644
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c"
 
 inherit autotools gobject-introspection pkgconfig
 
+DEPENDS = "autoconf-archive-native glib-2.0 kmod udev"
+
 SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch;protocol=https \
 "
 SRCREV = "1412dc51c8f76bf8d9a6008228737db4a9a26d69"
@@ -24,12 +26,12 @@ PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2"
 PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2"
 PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2"
 PACKAGECONFIG[dmraid] = "--with-dmraid, --without-dmraid"
-PACKAGECONFIG[kmod] = "--with-kbd, --without-kbd, kmod"
+PACKAGECONFIG[kmod] = "--with-kbd, --without-kbd,libbytesize"
 PACKAGECONFIG[parted] = "--with-part, --without-part, parted"
 PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux"
 PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native"
 PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm, ndctl util-linux"
-PACKAGECONFIG[vdo] = "--with-vdo, --without-vdo"
+PACKAGECONFIG[vdo] = "--with-vdo, --without-vdo,libbytesize"
 PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key"
 PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools"
 PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key"
Signature · 1 line
2.34.1
#3 lore raw

PATCH 4/6 imsettings: add missing DEPENDS on autoconf-archive-native

In reply to Armin Kuster

From: Ross Burton <[email protected]>

This can be satisfied via transitive dependencies, but make it an explicit DEPENDS.

(cherry picked from commit 2697f5bcf4f2396efe93a3597d2f96290d9fd2a8)
---
 meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb +1 -1
index cdf4557cd3..21e9b3908f 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 inherit autotools gtk-doc gobject-introspection gettext features_check
 
-DEPENDS = "gtk+3 libnotify"
+DEPENDS = "autoconf-archive-native gtk+3 libnotify"
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
Signature · 1 line
2.34.1
#4 lore raw

PATCH 5/6 system-config-printer: clean up DEPENDS

In reply to Armin Kuster

From: Ross Burton <[email protected]>

Remove intltool-native as it is not used, and add autoconf-archive-native.

Also explicitly disable systemd when not selected to be sure it doesn't automatically enable.

(cherry picked from commit 0713297ae90cdf6fc7339ebdcaf5f6f839bcd028)
---
 .../system-config-printer/system-config-printer_1.5.18.bb     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb +2 -2
index e70edef271..883d582371 100644
@@ -11,10 +11,10 @@ inherit autotools gettext pkgconfig python3native features_check
 
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 
-DEPENDS = "cups glib-2.0 libusb xmlto-native intltool-native desktop-file-utils-native"
+DEPENDS = "cups glib-2.0 libusb xmlto-native desktop-file-utils-native autoconf-archive-native"
 
 PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-PACKAGECONFIG[systemd] = ",,systemd"
+PACKAGECONFIG[systemd] = ",--without-systemdsystemunitdir,systemd"
 
 do_configure:prepend() {
     # This file is not provided if fetching from git but required for configure
Signature · 1 line
2.34.1
#5 lore raw

PATCH 6/6 system-config-printer: Delete __pycache__ files

In reply to Armin Kuster

From: Khem Raj <[email protected]>

These pyc files include references to buildtime TMPDIR, therefore delete them and let them be regerated during runtime if needed.

(cherry picked from commit b1b7ee87ac55fced4bcf88b0e374025d7f908731)
---
 .../system-config-printer_1.5.18.bb                      | 9 +++++++++
 1 file changed, 9 insertions(+)
meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb +9 -0
index 883d582371..f0ff24f376 100644
@@ -21,6 +21,15 @@ do_configure:prepend() {
     touch ${S}/ChangeLog
 }
 
+do_install:append() {
+    for f in __init__.cpython-311.pyc cupshelpers.cpython-311.pyc \
+        config.cpython-311.pyc ppds.cpython-311.pyc \
+        installdriver.cpython-311.pyc openprinting.cpython-311.pyc \
+        xmldriverprefs.cpython-311.pyc; do
+        rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/cupshelpers/__pycache__/$f
+    done
+}
+
 FILES:${PN} += "${libdir} ${datadir}"
 
 RDEPENDS:${PN} = " \
Signature · 1 line
2.34.1