[PATCH 1/5] waffle: remove dependency on udev

[PATCH 1/5] waffle: remove dependency on udev

[Ross Burton]

Waffle 1.8.0 dropped the use of libudev and instead uses libdrm[1] in
the gbm code. Update the depends.

[1] https://gitlab.freedesktop.org/mesa/waffle/-/commit/6bf58d4bb9044a7c65818d5de5d4ca747766e77f

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-graphics/waffle/waffle_1.8.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/waffle/waffle_1.8.0.bb b/meta/recipes-graphics/waffle/waffle_1.8.0.bb
index 12b31dcff1c..ad8649b40ef 100644
--- a/meta/recipes-graphics/waffle/waffle_1.8.0.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.8.0.bb
@@ -37,7 +37,7 @@ PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/${MLPREFIX}libgl libx
 PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}egl wayland wayland-native wayland-protocols"
 
 # wants gbm.pc egl.pc
-PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}egl virtual/${MLPREFIX}libgbm udev"
+PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}egl virtual/${MLPREFIX}libgbm libdrm"
 
 # wants egl.pc
 PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFIX}egl libxcb"
-- 
2.34.1

[PATCH 2/5] ruby: remove obsolete build dependences

[Ross Burton]

Ruby 3.3.0 no longer bundles the readline module[1] so readline is no
longer a build dependency[2].

Ruby 3.2.0 no longer bundles the gdbm module[3] so gdbm is no longer a
build dependency.

[1] https://github.com/ruby/ruby/commit/59fd67fc3d405e529e038172e769ff20a8fb5535
[2] https://github.com/ruby/ruby/commit/172077232e7f40b4dfedf6a5434c252b3d326fab

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/ruby/ruby_3.3.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/ruby/ruby_3.3.0.bb b/meta/recipes-devtools/ruby/ruby_3.3.0.bb
index 17eb6d73c2b..657fc31b4df 100644
--- a/meta/recipes-devtools/ruby/ruby_3.3.0.bb
+++ b/meta/recipes-devtools/ruby/ruby_3.3.0.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \
                     file://LEGAL;md5=81e6a4d81533b9263da4c3485a0ad883 \
                     "
 
-DEPENDS = "zlib openssl libyaml gdbm readline libffi"
+DEPENDS = "zlib openssl libyaml libffi"
 DEPENDS:append:class-target = " ruby-native"
 DEPENDS:append:class-nativesdk = " ruby-native"
 
-- 
2.34.1

[PATCH 3/5] npth: update homepage

[Ross Burton]

Set the homepage to the actual homepage, not that of the older GNU Pth.

Also fix some whitespace in the license fields.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-support/npth/npth_1.7.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-support/npth/npth_1.7.bb b/meta/recipes-support/npth/npth_1.7.bb
index f02a731f850..45d4efb4a9c 100644
--- a/meta/recipes-support/npth/npth_1.7.bb
+++ b/meta/recipes-support/npth/npth_1.7.bb
@@ -1,12 +1,11 @@
 SUMMARY = "New GNU Portable Threads library"
 DESCRIPTION = "nPth is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. "
-HOMEPAGE = "https://www.gnu.org/software/pth/"
+HOMEPAGE = "https://gnupg.org/software/npth/"
 SECTION = "libs"
 LICENSE = "LGPL-2.0-or-later"
-LIC_FILES_CHKSUM = "\
-    file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de\
-    "
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de"
 UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
+
 SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \
            file://pkgconfig.patch \
            file://musl-fix.patch \
-- 
2.34.1

Patchtest results for [PATCH 3/5] npth: update homepage

[patchtest]

[-- Attachment #1: Type: text/plain, Size: 2972 bytes --]

Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch /home/patchtest/share/mboxes/3-5-npth-update-homepage.patch

FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)

PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)
SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!

[PATCH 4/5] npth: remove obsolete pkgconfig patch

[Ross Burton]

npth now provides a pkg-config itself[1] so we don't need to patch one
in anymore.

[1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=f3cbbc86cb49a1729d6df573bd76a5559e7f636b

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../recipes-support/npth/npth/pkgconfig.patch | 59 -------------------
 meta/recipes-support/npth/npth_1.7.bb         |  1 -
 2 files changed, 60 deletions(-)
 delete mode 100644 meta/recipes-support/npth/npth/pkgconfig.patch

diff --git a/meta/recipes-support/npth/npth/pkgconfig.patch b/meta/recipes-support/npth/npth/pkgconfig.patch
deleted file mode 100644
index e736921b43d..00000000000
--- a/meta/recipes-support/npth/npth/pkgconfig.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ff19a9648f1c7d93087e2c33ca64bb881d53ea5a Mon Sep 17 00:00:00 2001
-From: Saul Wold <sgw@linux.intel.com>
-Date: Mon, 10 Nov 2014 13:59:03 -0800
-Subject: [PATCH] Added npth pkgconfig file
-
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
----
- configure.ac    |  1 +
- src/Makefile.am |  4 +++-
- src/npth.pc.in  | 10 ++++++++++
- 3 files changed, 14 insertions(+), 1 deletion(-)
- create mode 100644 src/npth.pc.in
-
-diff --git a/configure.ac b/configure.ac
-index 10f3629..65b76a1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -476,6 +476,7 @@ src/Makefile
- w32/Makefile
- tests/Makefile])
- AC_CONFIG_FILES(npth-config, chmod +x npth-config)
-+AC_CONFIG_FILES([src/npth.pc])
- AC_OUTPUT
- 
- echo "
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7070118..6f01c64 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -17,8 +17,10 @@
- # License along with this program; if not, see <http://www.gnu.org/licenses/>.
- 
- ## Process this file with automake to produce Makefile.in
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = npth.pc
- 
--EXTRA_DIST = libnpth.vers
-+EXTRA_DIST = libnpth.vers npth.pc
- #	     versioninfo.rc.in
- nodist_include_HEADERS = npth.h
- 
-diff --git a/src/npth.pc.in b/src/npth.pc.in
-new file mode 100644
-index 0000000..db091e8
---- /dev/null
-+++ b/src/npth.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: npth
-+Description: a new portable posix threading library
-+Version: @VERSION@
-+Libs: -L${libdir} -lnpth -lpthread
-+Cflags: -I${includedir}
diff --git a/meta/recipes-support/npth/npth_1.7.bb b/meta/recipes-support/npth/npth_1.7.bb
index 45d4efb4a9c..038caebd3d6 100644
--- a/meta/recipes-support/npth/npth_1.7.bb
+++ b/meta/recipes-support/npth/npth_1.7.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de"
 UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 
 SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \
-           file://pkgconfig.patch \
            file://musl-fix.patch \
            "
 
-- 
2.34.1

[PATCH 5/5] npth: remove obsolete binconfig-disabled inherit

[Ross Burton]

npth no longer installs the npth-config script[1] that we disabled, so
there's no need to inherit the class.

[1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=2b6a8e5369ed37d64d1bafd3a546ec52e25acd26

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-support/npth/npth_1.7.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/npth/npth_1.7.bb b/meta/recipes-support/npth/npth_1.7.bb
index 038caebd3d6..861f0b92c80 100644
--- a/meta/recipes-support/npth/npth_1.7.bb
+++ b/meta/recipes-support/npth/npth_1.7.bb
@@ -12,7 +12,7 @@ SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \
 
 SRC_URI[sha256sum] = "8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05"
 
-inherit autotools binconfig-disabled multilib_header
+inherit autotools multilib_header
 
 FILES:${PN} = "${libdir}/libnpth.so.*"
 
-- 
2.34.1