From patchwork Fri Jul 19 13:25:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 46656 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17B42C3DA59 for ; Fri, 19 Jul 2024 13:25:35 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.18504.1721395528397080528 for ; Fri, 19 Jul 2024 06:25:28 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5E4B51042 for ; Fri, 19 Jul 2024 06:25:53 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 91A743F762 for ; Fri, 19 Jul 2024 06:25:27 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/6] ell: upgrade 0.66 -> 0.67 Date: Fri, 19 Jul 2024 14:25:18 +0100 Message-Id: <20240719132523.976790-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 19 Jul 2024 13:25:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202259 * Add support for handling sysctl char settings. Signed-off-by: Ross Burton --- meta/recipes-core/ell/{ell_0.66.bb => ell_0.67.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/ell/{ell_0.66.bb => ell_0.67.bb} (88%) diff --git a/meta/recipes-core/ell/ell_0.66.bb b/meta/recipes-core/ell/ell_0.67.bb similarity index 88% rename from meta/recipes-core/ell/ell_0.66.bb rename to meta/recipes-core/ell/ell_0.67.bb index 899e2f68493..6b0ebbe6211 100644 --- a/meta/recipes-core/ell/ell_0.66.bb +++ b/meta/recipes-core/ell/ell_0.67.bb @@ -15,4 +15,4 @@ DEPENDS = "dbus" inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "7a78b757080ed6518c1c4fa26ad6a7a3d6e4e385386a20b6fb52379e7d1ffa36" +SRC_URI[sha256sum] = "97942e8cefb130b632496e5485242f3f374f3b8846800fb74fffd76dc2a0c726" From patchwork Fri Jul 19 13:25:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 46657 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FAF0C49EA1 for ; Fri, 19 Jul 2024 13:25:35 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.18556.1721395529016309297 for ; Fri, 19 Jul 2024 06:25:29 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 15D6B1042 for ; Fri, 19 Jul 2024 06:25:54 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 48C533F762 for ; Fri, 19 Jul 2024 06:25:28 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/6] ofono: upgrade 2.8 -> 2.9 Date: Fri, 19 Jul 2024 14:25:19 +0100 Message-Id: <20240719132523.976790-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240719132523.976790-1-ross.burton@arm.com> References: <20240719132523.976790-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 19 Jul 2024 13:25:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202260 * Add support for QRTR based devices (MHI bus and SoC). Signed-off-by: Ross Burton --- meta/recipes-connectivity/ofono/{ofono_2.8.bb => ofono_2.9.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-connectivity/ofono/{ofono_2.8.bb => ofono_2.9.bb} (95%) diff --git a/meta/recipes-connectivity/ofono/ofono_2.8.bb b/meta/recipes-connectivity/ofono/ofono_2.9.bb similarity index 95% rename from meta/recipes-connectivity/ofono/ofono_2.8.bb rename to meta/recipes-connectivity/ofono/ofono_2.9.bb index 809485d4217..26cb9bb7ffb 100644 --- a/meta/recipes-connectivity/ofono/ofono_2.8.bb +++ b/meta/recipes-connectivity/ofono/ofono_2.9.bb @@ -11,7 +11,7 @@ SRC_URI = "\ ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://ofono \ " -SRC_URI[sha256sum] = "b5aef455b3a374ce43bad43c2ade9d0430d9c0d28952385c44ac7d0dc933bbb8" +SRC_URI[sha256sum] = "9d2612925a23a7fb668f297a044b5ea136215cc399ecc3f127135c8f2a9845f9" inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data From patchwork Fri Jul 19 13:25:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 46659 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70F35C3DA7F for ; Fri, 19 Jul 2024 13:25:35 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.18506.1721395529692784072 for ; Fri, 19 Jul 2024 06:25:29 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B90AD1042 for ; Fri, 19 Jul 2024 06:25:54 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 00B583F762 for ; Fri, 19 Jul 2024 06:25:28 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/6] ruby: upgrade 3.3.0 -> 3.3.4 Date: Fri, 19 Jul 2024 14:25:20 +0100 Message-Id: <20240719132523.976790-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240719132523.976790-1-ross.burton@arm.com> References: <20240719132523.976790-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 19 Jul 2024 13:25:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202261 3.3.4: This release fixes a regression in Ruby 3.3.3 that dependencies are missing in the gemspec of some bundled gems: net-pop, net-ftp, net-imap, and prime [Bug like Heroku. If your bundle install runs correctly now, you may not have this issue. 3.3.3: This release includes: RubyGems 3.5.11 Bundler 2.5.11 REXML 3.2.8 strscan 3.0.9 --dump=prism_parsetree is replaced by --parser=prism --dump=parsetree Invalid encoding symbols raise SyntaxError instead of EncodingError Memory leak fix in Ripper parsing Bugfixes for YJIT, **{}, Ripper.tokenize, RubyVM::InstructionSequence#to_binary, --with-gmp, and some build environments 3.3.2: This release includes many bug-fixes. See the GitHub releases for further details. 3.3.1: This release includes security fixes. Please check the topics below for details. CVE-2024-27282: Arbitrary memory address read vulnerability with Regex search CVE-2024-27281: RCE vulnerability with .rdoc_options in RDoc CVE-2024-27280: Buffer overread vulnerability in StringIO Signed-off-by: Ross Burton --- ...01-extmk-fix-cross-compilation-of-external-gems.patch | 6 +++--- ..._dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch | 2 +- .../ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 2 +- .../0003-rdoc-build-reproducible-documentation.patch | 2 +- ...kmf.rb-sort-list-of-object-files-in-generated-M.patch | 2 +- ...k-Gemspec-reproducible-change-fixing-784225-too.patch | 9 +++------ .../ruby/ruby/0006-Make-gemspecs-reproducible.patch | 2 +- .../ruby/{ruby_3.3.0.bb => ruby_3.3.4.bb} | 2 +- 8 files changed, 12 insertions(+), 15 deletions(-) rename meta/recipes-devtools/ruby/{ruby_3.3.0.bb => ruby_3.3.4.bb} (98%) diff --git a/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch b/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch index 7402e763331..bd8f736247e 100644 --- a/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch +++ b/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch @@ -1,4 +1,4 @@ -From caa03f46a3204a7e0f0e5d9d9cc9113304dc0382 Mon Sep 17 00:00:00 2001 +From b74950d4f06bbfb91b2e68044147a226c15f4639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Mon, 30 Sep 2019 16:57:01 +0100 Subject: [PATCH] extmk: fix cross-compilation of external gems @@ -16,10 +16,10 @@ Signed-off-by: André Draszik 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/extmk.rb b/ext/extmk.rb -index 428ffc9..87eff71 100755 +index d9c2417..da14c49 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb -@@ -420,8 +420,8 @@ else +@@ -428,8 +428,8 @@ else end $ruby = [$ruby] $ruby << "-I'$(topdir)'" diff --git a/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch b/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch index 67054d65533..bc1744da82d 100644 --- a/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch +++ b/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch @@ -1,4 +1,4 @@ -From 980dcc5380db6f03451357140ae1487117300156 Mon Sep 17 00:00:00 2001 +From f4edf72c76bc06fa92c61f6cb9163cc777912a1f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 25 Jan 2022 20:29:14 -0800 Subject: [PATCH] vm_dump.c: Define REG_S1 and REG_S2 for musl/riscv diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index f3a65e785d6..6f95685917b 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -1,4 +1,4 @@ -From 7f7facb85bd65adec24230fe8ca7f6a9863a1fd0 Mon Sep 17 00:00:00 2001 +From e6267676addd27f3c02667116185211d711ef940 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Thu, 5 May 2016 10:59:07 -0700 Subject: [PATCH] Obey LDFLAGS for the link of libruby diff --git a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch index e2d5b57c25c..abbbd35702d 100644 --- a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch +++ b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch @@ -1,4 +1,4 @@ -From 5079e678ce2a81416088c04f9123cd8207d5def2 Mon Sep 17 00:00:00 2001 +From 09a6df0d32e2177406ed391e536c0c7c4b503c5d Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Tue, 10 Oct 2017 15:04:34 -0300 Subject: [PATCH] rdoc: build reproducible documentation diff --git a/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch b/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch index b14a731cfb6..f08aaf555f3 100644 --- a/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch +++ b/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch @@ -1,4 +1,4 @@ -From 99734381652602f76075017576a819c427ebb5f2 Mon Sep 17 00:00:00 2001 +From f491fff7d006954c1c51eb7a513a85bdbab0fe5a Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Tue, 10 Oct 2017 15:06:13 -0300 Subject: [PATCH] lib/mkmf.rb: sort list of object files in generated Makefile diff --git a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch index 24268625a28..5570cdfcaaf 100644 --- a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch +++ b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch @@ -1,4 +1,4 @@ -From 3bc324379aa3e322bad9353da8c0064cd671cc74 Mon Sep 17 00:00:00 2001 +From 91304f26dd4153ecae752ea875eec9ce2d5d3963 Mon Sep 17 00:00:00 2001 From: Lucas Kanashiro Date: Fri, 1 Nov 2019 15:25:17 -0300 Subject: [PATCH] Make gemspecs reproducible @@ -12,10 +12,10 @@ Upstream-Status: Backport [debian] 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb -index a0c7faa..f0722d9 100644 +index 05ce483..5f2dbd1 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb -@@ -1774,7 +1774,9 @@ class Gem::Specification < Gem::BasicSpecification +@@ -1698,7 +1698,9 @@ class Gem::Specification < Gem::BasicSpecification raise(Gem::InvalidSpecificationException, "invalid date format in specification: #{date.inspect}") end @@ -26,6 +26,3 @@ index a0c7faa..f0722d9 100644 Time.utc(date.year, date.month, date.day) else TODAY --- -2.39.2 - diff --git a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch index 21604dfc349..8a1daba7bdb 100644 --- a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch +++ b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch @@ -1,4 +1,4 @@ -From 1dc7ef09c3c567c4adb09ccfd97e0e59c58edb9f Mon Sep 17 00:00:00 2001 +From 42f8019e62f392f5bc09c25e90cc63123eb764fe Mon Sep 17 00:00:00 2001 From: Lucas Kanashiro Date: Fri, 1 Nov 2019 15:25:17 -0300 Subject: [PATCH] Make gemspecs reproducible diff --git a/meta/recipes-devtools/ruby/ruby_3.3.0.bb b/meta/recipes-devtools/ruby/ruby_3.3.4.bb similarity index 98% rename from meta/recipes-devtools/ruby/ruby_3.3.0.bb rename to meta/recipes-devtools/ruby/ruby_3.3.4.bb index 657fc31b4df..ebff4136c9c 100644 --- a/meta/recipes-devtools/ruby/ruby_3.3.0.bb +++ b/meta/recipes-devtools/ruby/ruby_3.3.4.bb @@ -47,7 +47,7 @@ do_configure:prepend() { DEPENDS:append:libc-musl = " libucontext" -SRC_URI[sha256sum] = "96518814d9832bece92a85415a819d4893b307db5921ae1f0f751a9a89a56b7d" +SRC_URI[sha256sum] = "fe6a30f97d54e029768f2ddf4923699c416cdbc3a6e96db3e2d5716c7db96a34" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" From patchwork Fri Jul 19 13:25:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 46660 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D8FAC3DA70 for ; Fri, 19 Jul 2024 13:25:35 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.18557.1721395530425841378 for ; Fri, 19 Jul 2024 06:25:30 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 67FD71042 for ; Fri, 19 Jul 2024 06:25:55 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A42873F762 for ; Fri, 19 Jul 2024 06:25:29 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/6] gtk+3: upgrade 3.24.42 -> 3.24.43 Date: Fri, 19 Jul 2024 14:25:21 +0100 Message-Id: <20240719132523.976790-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240719132523.976790-1-ross.burton@arm.com> References: <20240719132523.976790-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 19 Jul 2024 13:25:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202262 * Stop looking for modules in cwd (CVE-2024-6655) Signed-off-by: Ross Burton --- meta/recipes-gnome/gtk+/gtk+3/opengl.patch | 97 +++++++++---------- .../{gtk+3_3.24.42.bb => gtk+3_3.24.43.bb} | 2 +- 2 files changed, 48 insertions(+), 51 deletions(-) rename meta/recipes-gnome/gtk+/{gtk+3_3.24.42.bb => gtk+3_3.24.43.bb} (87%) diff --git a/meta/recipes-gnome/gtk+/gtk+3/opengl.patch b/meta/recipes-gnome/gtk+/gtk+3/opengl.patch index 8f2feb0ee75..d846045c248 100644 --- a/meta/recipes-gnome/gtk+/gtk+3/opengl.patch +++ b/meta/recipes-gnome/gtk+/gtk+3/opengl.patch @@ -1,4 +1,4 @@ -From 4a0716f04fb25b51b08e994bd5a900b2e7f7fed5 Mon Sep 17 00:00:00 2001 +From 24a0d767251b81810767e03aa1db8cc497408db3 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Fri, 16 Oct 2015 16:35:16 +0300 Subject: [PATCH] Do not try to initialize GL without libGL @@ -21,7 +21,7 @@ Signed-off-by: Jussi Kukkonen docs/tools/widgets.c | 6 +++++- gdk/gdkconfig.h.meson | 1 + gdk/gdkdisplay.c | 4 ++++ - gdk/gdkgl.c | 10 ++++++++++ + gdk/gdkgl.c | 11 ++++++++++- gdk/gdkglcontext.c | 6 ++++++ gdk/gdkwindow.c | 13 +++++++++++++ gdk/meson.build | 8 +++++++- @@ -37,10 +37,10 @@ Signed-off-by: Jussi Kukkonen meson_options.txt | 2 ++ tests/meson.build | 9 +++++++-- testsuite/gtk/objects-finalize.c | 2 ++ - 21 files changed, 128 insertions(+), 13 deletions(-) + 21 files changed, 128 insertions(+), 14 deletions(-) diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build -index 252da16d05..4b57cff6ac 100644 +index 252da16..4b57cff 100644 --- a/demos/gtk-demo/meson.build +++ b/demos/gtk-demo/meson.build @@ -28,7 +28,6 @@ demos = files([ @@ -63,7 +63,7 @@ index 252da16d05..4b57cff6ac 100644 demos += files('pagesetup.c') endif diff --git a/docs/tools/meson.build b/docs/tools/meson.build -index 05621ee7ed..3d0a333b32 100644 +index 05621ee..3d0a333 100644 --- a/docs/tools/meson.build +++ b/docs/tools/meson.build @@ -2,10 +2,13 @@ if x11_enabled @@ -83,7 +83,7 @@ index 05621ee7ed..3d0a333b32 100644 include_directories: [ confinc, gdkinc, gtkinc, testinc, ], dependencies: libgtk_dep) diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c -index 932daf1746..348807e133 100644 +index 932daf1..348807e 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -8,7 +8,9 @@ @@ -110,7 +110,7 @@ index 932daf1746..348807e133 100644 return info; diff --git a/gdk/gdkconfig.h.meson b/gdk/gdkconfig.h.meson -index 7db19e0470..088651bafa 100644 +index 7db19e0..088651b 100644 --- a/gdk/gdkconfig.h.meson +++ b/gdk/gdkconfig.h.meson @@ -15,6 +15,7 @@ G_BEGIN_DECLS @@ -122,7 +122,7 @@ index 7db19e0470..088651bafa 100644 G_END_DECLS diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c -index 748f54860c..04ef2c09d4 100644 +index fd5e9ea..87b45e7 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -2420,7 +2420,11 @@ gboolean @@ -138,7 +138,7 @@ index 748f54860c..04ef2c09d4 100644 GdkRenderingMode diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c -index 9690077cc2..55f85ef605 100644 +index 0940c06..4b56614 100644 --- a/gdk/gdkgl.c +++ b/gdk/gdkgl.c @@ -21,8 +21,9 @@ @@ -152,7 +152,7 @@ index 9690077cc2..55f85ef605 100644 #include #include -@@ -36,6 +37,7 @@ +@@ -36,6 +37,7 @@ gdk_cairo_surface_mark_as_direct (cairo_surface_t *surface, g_object_ref (window), g_object_unref); } @@ -160,7 +160,7 @@ index 9690077cc2..55f85ef605 100644 static const char * get_vertex_type_name (int type) { -@@ -208,6 +210,7 @@ +@@ -208,6 +210,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data) glUseProgram (paint_data->current_program->program); } } @@ -168,7 +168,7 @@ index 9690077cc2..55f85ef605 100644 void gdk_gl_texture_quads (GdkGLContext *paint_context, -@@ -216,6 +219,7 @@ +@@ -216,6 +219,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, GdkTexturedQuad *quads, gboolean flip_colors) { @@ -176,7 +176,7 @@ index 9690077cc2..55f85ef605 100644 GdkGLContextPaintData *paint_data = gdk_gl_context_get_paint_data (paint_context); GdkGLContextProgram *program; GdkWindow *window = gdk_gl_context_get_window (paint_context); -@@ -289,6 +293,7 @@ +@@ -289,6 +293,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, glDisableVertexAttribArray (program->position_location); glDisableVertexAttribArray (program->uv_location); @@ -184,7 +184,7 @@ index 9690077cc2..55f85ef605 100644 } /* x,y,width,height describes a rectangle in the gl render buffer -@@ -337,6 +342,7 @@ +@@ -337,6 +342,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, int width, int height) { @@ -192,7 +192,7 @@ index 9690077cc2..55f85ef605 100644 GdkGLContext *paint_context, *current_context; cairo_surface_t *image; cairo_matrix_t matrix; -@@ -703,6 +709,7 @@ +@@ -727,6 +733,7 @@ out: if (clip_region) cairo_region_destroy (clip_region); @@ -200,7 +200,7 @@ index 9690077cc2..55f85ef605 100644 } /* This is always called with the paint context current */ -@@ -710,6 +717,7 @@ +@@ -734,6 +741,7 @@ void gdk_gl_texture_from_surface (cairo_surface_t *surface, cairo_region_t *region) { @@ -208,14 +208,14 @@ index 9690077cc2..55f85ef605 100644 GdkGLContext *paint_context; cairo_surface_t *image; double device_x_offset, device_y_offset; -@@ -810,4 +818,5 @@ +@@ -834,4 +842,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, glDisable (GL_SCISSOR_TEST); glDeleteTextures (1, &texture_id); +#endif } diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c -index 3b23639e1c..1f04f8e0b2 100644 +index cb0ed90..7ed74f3 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -85,7 +85,9 @@ @@ -228,7 +228,7 @@ index 3b23639e1c..1f04f8e0b2 100644 typedef struct { GdkDisplay *display; -@@ -243,6 +245,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, +@@ -246,6 +248,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, int height, guint texture_target) { @@ -236,7 +236,7 @@ index 3b23639e1c..1f04f8e0b2 100644 GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); g_return_if_fail (GDK_IS_GL_CONTEXT (context)); -@@ -286,6 +289,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, +@@ -289,6 +292,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, glTexSubImage2D (texture_target, 0, 0, i, width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, (unsigned char*) data + (i * stride)); } } @@ -244,7 +244,7 @@ index 3b23639e1c..1f04f8e0b2 100644 } static gboolean -@@ -774,6 +778,7 @@ gdk_gl_context_realize (GdkGLContext *context, +@@ -801,6 +805,7 @@ gdk_gl_context_realize (GdkGLContext *context, static void gdk_gl_context_check_extensions (GdkGLContext *context) { @@ -252,7 +252,7 @@ index 3b23639e1c..1f04f8e0b2 100644 GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); gboolean has_npot, has_texture_rectangle; -@@ -853,6 +858,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context) +@@ -888,6 +893,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context) priv->use_texture_rectangle ? "yes" : "no")); priv->extensions_checked = TRUE; @@ -261,7 +261,7 @@ index 3b23639e1c..1f04f8e0b2 100644 /** diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c -index 727b0cf1f4..d4d91b0d16 100644 +index 62e0cf8..b8bda71 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -45,7 +45,9 @@ @@ -321,7 +321,7 @@ index 727b0cf1f4..d4d91b0d16 100644 cairo_region_destroy (opaque_region); diff --git a/gdk/meson.build b/gdk/meson.build -index 4bb1bf2b6c..64172b8d3e 100644 +index 297c38c..fc71f8f 100644 --- a/gdk/meson.build +++ b/gdk/meson.build @@ -56,7 +56,6 @@ gdk_gir_public_headers = files( @@ -354,7 +354,7 @@ index 4bb1bf2b6c..64172b8d3e 100644 gdkconfig = configure_file( input : 'gdkconfig.h.meson', diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c -index 7e08f472cc..30fd7b6089 100644 +index 7e08f47..30fd7b6 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -37,7 +37,9 @@ @@ -379,7 +379,7 @@ index 7e08f472cc..30fd7b6089 100644 display_class->get_default_seat = gdk_x11_display_get_default_seat; diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c -index 81479d81f4..3c8c5c02ff 100644 +index 81479d8..3c8c5c0 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c @@ -306,7 +306,12 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen) @@ -396,7 +396,7 @@ index 81479d81f4..3c8c5c02ff 100644 gint diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c -index 194bc82e29..0302bb68d4 100644 +index 89f0666..d3e1440 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -36,7 +36,9 @@ @@ -409,7 +409,7 @@ index 194bc82e29..0302bb68d4 100644 #include "gdkprivate-x11.h" #include "gdk-private.h" -@@ -5888,7 +5890,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) +@@ -5906,7 +5908,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; impl_class->show_window_menu = gdk_x11_window_show_window_menu; @@ -420,7 +420,7 @@ index 194bc82e29..0302bb68d4 100644 impl_class->get_unscaled_size = gdk_x11_window_get_unscaled_size; } diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h -index edb0ea7dbf..a317d61cca 100644 +index edb0ea7..a317d61 100644 --- a/gdk/x11/gdkx-autocleanups.h +++ b/gdk/x11/gdkx-autocleanups.h @@ -30,7 +30,9 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DeviceXI2, g_object_unref) @@ -434,7 +434,7 @@ index edb0ea7dbf..a317d61cca 100644 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref) diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h -index 1f64bccb6d..4db6c18351 100644 +index 1f64bcc..4db6c18 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -43,7 +43,9 @@ @@ -448,7 +448,7 @@ index 1f64bccb6d..4db6c18351 100644 #include #include diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build -index 754ae0a615..0318c83877 100644 +index 754ae0a..0318c83 100644 --- a/gdk/x11/meson.build +++ b/gdk/x11/meson.build @@ -14,7 +14,6 @@ gdk_x11_sources = files( @@ -480,7 +480,7 @@ index 754ae0a615..0318c83877 100644 install_headers('gdkx.h', subdir: 'gtk-3.0/gdk/') diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c -index 802303ea9f..6439d7745d 100644 +index 802303e..6439d77 100644 --- a/gtk/gtkglarea.c +++ b/gtk/gtkglarea.c @@ -29,7 +29,9 @@ @@ -568,10 +568,10 @@ index 802303ea9f..6439d7745d 100644 static gboolean diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c -index 4fd0c3039c..a8e59ed077 100644 +index a3a3419..274600e 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c -@@ -33,8 +33,10 @@ +@@ -35,8 +35,10 @@ #ifdef GDK_WINDOWING_X11 #include "x11/gdkx.h" @@ -582,7 +582,7 @@ index 4fd0c3039c..a8e59ed077 100644 #ifdef GDK_WINDOWING_WIN32 #include "win32/gdkwin32.h" -@@ -217,6 +219,7 @@ add_label_row (GtkInspectorGeneral *gen, +@@ -221,6 +223,7 @@ add_label_row (GtkInspectorGeneral *gen, gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), label); } @@ -590,7 +590,7 @@ index 4fd0c3039c..a8e59ed077 100644 #ifdef GDK_WINDOWING_X11 static void append_glx_extension_row (GtkInspectorGeneral *gen, -@@ -226,6 +229,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, +@@ -230,6 +233,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, add_check_row (gen, GTK_LIST_BOX (gen->priv->gl_box), ext, epoxy_has_glx_extension (dpy, 0, ext), 0); } #endif @@ -598,7 +598,7 @@ index 4fd0c3039c..a8e59ed077 100644 #ifdef GDK_WINDOWING_WAYLAND static void -@@ -275,6 +279,7 @@ wayland_get_display (struct wl_display *wl_display) +@@ -279,6 +283,7 @@ wayland_get_display (struct wl_display *wl_display) static void init_gl (GtkInspectorGeneral *gen) { @@ -606,7 +606,7 @@ index 4fd0c3039c..a8e59ed077 100644 #ifdef GDK_WINDOWING_X11 if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) { -@@ -301,6 +306,7 @@ init_gl (GtkInspectorGeneral *gen) +@@ -305,6 +310,7 @@ init_gl (GtkInspectorGeneral *gen) } else #endif @@ -615,7 +615,7 @@ index 4fd0c3039c..a8e59ed077 100644 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) { diff --git a/meson.build b/meson.build -index aed48fc3f6..bfc33af0f6 100644 +index 67b24e5..c1cc09a 100644 --- a/meson.build +++ b/meson.build @@ -137,6 +137,7 @@ wayland_enabled = get_option('wayland_backend') @@ -646,7 +646,7 @@ index aed48fc3f6..bfc33af0f6 100644 if iso_codes_dep.found() cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_variable(pkgconfig: 'prefix')) else -@@ -912,9 +917,15 @@ else +@@ -914,9 +919,15 @@ else gio_packages = ['gio-2.0', glib_req] endif @@ -663,7 +663,7 @@ index aed48fc3f6..bfc33af0f6 100644 ['fribidi', fribidi_req])) gtk_packages = ' '.join([ -@@ -928,7 +939,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages) +@@ -930,7 +941,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages) # Requires.private pc_gdk_extra_libs += cairo_libs @@ -673,7 +673,7 @@ index aed48fc3f6..bfc33af0f6 100644 gtk_private_packages += ['pangoft2'] endif diff --git a/meson_options.txt b/meson_options.txt -index 94099aa01e..8bd096896d 100644 +index 94099aa..8bd0968 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -19,6 +19,8 @@ option('profiler', type: 'boolean', value: false, @@ -686,7 +686,7 @@ index 94099aa01e..8bd096896d 100644 # Print backends option('print_backends', type : 'string', value : 'auto', diff --git a/tests/meson.build b/tests/meson.build -index 586fe2f45e..6ecf317dde 100644 +index 6ff249f..f2a9fba 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -5,7 +5,6 @@ gtk_tests = [ @@ -697,7 +697,7 @@ index 586fe2f45e..6ecf317dde 100644 ['listmodel'], ['motion-compression'], ['styleexamples'], -@@ -54,7 +53,6 @@ gtk_tests = [ +@@ -55,7 +54,6 @@ gtk_tests = [ ['testfullscreen'], ['testgeometry'], ['testgiconpixbuf'], @@ -705,7 +705,7 @@ index 586fe2f45e..6ecf317dde 100644 ['testgmenu'], ['testgrid'], ['testgrouping'], -@@ -137,6 +135,13 @@ if x11_enabled +@@ -138,6 +136,13 @@ if x11_enabled ] endif @@ -720,10 +720,10 @@ index 586fe2f45e..6ecf317dde 100644 gtk_tests += [['testfontchooserdialog']] endif diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c -index 24540e313f..e0f863ab6a 100644 +index 95b565c..7f340c3 100644 --- a/testsuite/gtk/objects-finalize.c +++ b/testsuite/gtk/objects-finalize.c -@@ -116,7 +116,9 @@ main (int argc, char **argv) +@@ -109,7 +109,9 @@ main (int argc, char **argv) all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE && all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 && all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER && @@ -733,6 +733,3 @@ index 24540e313f..e0f863ab6a 100644 #endif /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */ all_types[i] != GDK_TYPE_PIXBUF_LOADER && --- -2.30.2 - diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.42.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.43.bb similarity index 87% rename from meta/recipes-gnome/gtk+/gtk+3_3.24.42.bb rename to meta/recipes-gnome/gtk+/gtk+3_3.24.43.bb index 61cecce4d1c..a8cc1152c34 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.42.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.43.bb @@ -5,7 +5,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ file://opengl.patch \ " -SRC_URI[sha256sum] = "50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2" +SRC_URI[sha256sum] = "7e04f0648515034b806b74ae5d774d87cffb1a2a96c468cb5be476d51bf2f3c7" S = "${WORKDIR}/gtk+-${PV}" From patchwork Fri Jul 19 13:25:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 46658 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 495EBC3DA63 for ; Fri, 19 Jul 2024 13:25:35 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.18558.1721395531051552013 for ; Fri, 19 Jul 2024 06:25:31 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 166F51042 for ; Fri, 19 Jul 2024 06:25:56 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 52A3A3F762 for ; Fri, 19 Jul 2024 06:25:30 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 5/6] pango: upgrade 1.52.2 -> 1.54.0 Date: Fri, 19 Jul 2024 14:25:22 +0100 Message-Id: <20240719132523.976790-5-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240719132523.976790-1-ross.burton@arm.com> References: <20240719132523.976790-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 19 Jul 2024 13:25:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202263 Upstream has removed installable tests, although there is pressure to bring them back[1]. - Build fixes - Memory leak fixes - Drop the install-tests build option - Add build-examples and build-tests build options - Require meson 0.63 - Add pango_item_get_char_offset - Update to Unicode 15.1 - Fix wrong use of GWeakRef, leading to crashes [1] https://gitlab.gnome.org/GNOME/pango/-/issues/799 Signed-off-by: Ross Burton --- .../0001-Skip-running-test-layout-test.patch | 45 ------------------- meta/recipes-graphics/pango/pango/run-ptest | 6 --- .../{pango_1.52.2.bb => pango_1.54.0.bb} | 20 ++------- 3 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 meta/recipes-graphics/pango/pango/0001-Skip-running-test-layout-test.patch delete mode 100644 meta/recipes-graphics/pango/pango/run-ptest rename meta/recipes-graphics/pango/{pango_1.52.2.bb => pango_1.54.0.bb} (68%) diff --git a/meta/recipes-graphics/pango/pango/0001-Skip-running-test-layout-test.patch b/meta/recipes-graphics/pango/pango/0001-Skip-running-test-layout-test.patch deleted file mode 100644 index ec7fb4727eb..00000000000 --- a/meta/recipes-graphics/pango/pango/0001-Skip-running-test-layout-test.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b9bfe3a79f165682a6db3d7ee1928365e93b1ccf Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 13 Apr 2022 19:39:29 -0700 -Subject: [PATCH] Skip running test-layout test - -This fails intermittently, it varies based on what version of harfbuzz -is installed and if it does not match with what pango CI tests then we -get random failures in this test. This has been disabled in other -distros [1] too - -We want to drop this on next upgrade and see if this test passes if not -then keep it disabled - -Fixes - -Running test: pango/test-layout.test -1..36 -ok 1 /layout/letterspacing.layout -ok 2 /layout/valid-7.layout -not ok 3 /layout/valid-14.layout -Bail out! -FAIL: pango/test-layout.test (Child process killed by signal 6) - -[1] https://github.com/archlinux/svntogit-packages/commit/3f883e7ff8071adad23b6bcc0ba4b995aff10d52 - -Upstream-Status: Inappropriate [bugfix https://gitlab.gnome.org/GNOME/pango/-/issues/677] -Signed-off-by: Khem Raj ---- - tests/test-layout.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test-layout.c b/tests/test-layout.c -index 1139e4f..b47a066 100644 ---- a/tests/test-layout.c -+++ b/tests/test-layout.c -@@ -222,5 +222,5 @@ main (int argc, char *argv[]) - } - g_dir_close (dir); - -- return g_test_run (); -+ return 77; - } --- -2.35.2 - diff --git a/meta/recipes-graphics/pango/pango/run-ptest b/meta/recipes-graphics/pango/pango/run-ptest deleted file mode 100644 index e1fab050ef9..00000000000 --- a/meta/recipes-graphics/pango/pango/run-ptest +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/sh - -# workaround for https://gitlab.gnome.org/GNOME/pango/-/issues/668 -mkdir -p /usr/share/fonts/pango-private -cp -rf /usr/libexec/installed-tests/pango/fonts/* /usr/share/fonts/pango-private -gnome-desktop-testing-runner pango diff --git a/meta/recipes-graphics/pango/pango_1.52.2.bb b/meta/recipes-graphics/pango/pango_1.54.0.bb similarity index 68% rename from meta/recipes-graphics/pango/pango_1.52.2.bb rename to meta/recipes-graphics/pango/pango_1.54.0.bb index 4f748e65540..de6f8bb3619 100644 --- a/meta/recipes-graphics/pango/pango_1.52.2.bb +++ b/meta/recipes-graphics/pango/pango_1.54.0.bb @@ -11,42 +11,28 @@ LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" - -inherit gnomebase gi-docgen ptest-gnome upstream-version-is-even gobject-introspection +inherit gnomebase gi-docgen upstream-version-is-even gobject-introspection UPSTREAM_CHECK_REGEX = "pango-(?P\d+\.(?!9\d+)\d+\.\d+)" GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled" -SRC_URI += "file://run-ptest \ - file://0001-Skip-running-test-layout-test.patch \ - " - -SRC_URI[archive.sha256sum] = "d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b" +SRC_URI[archive.sha256sum] = "8a9eed75021ee734d7fc0fdf3a65c3bba51dfefe4ae51a9b414a60c70b2d1ed8" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[x11] = ",,virtual/libx11 libxft" -PACKAGECONFIG[tests] = "-Dinstall-tests=true, -Dinstall-tests=false" PACKAGECONFIG[thai] = "-Dlibthai=enabled,-Dlibthai=disabled,libthai" GIR_MESON_OPTION = 'introspection' -do_configure:prepend() { - chmod +x ${S}/tests/*.py -} - LEAD_SONAME = "libpango-1.0*" FILES:${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" -RDEPENDS:${PN}-ptest += "cantarell-fonts" -RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us" - RPROVIDES:${PN} += "pango-modules pango-module-indic-lang \ pango-module-basic-fc pango-module-arabic-lang" From patchwork Fri Jul 19 13:25:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 46655 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 192CEC3DA5D for ; Fri, 19 Jul 2024 13:25:35 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.18508.1721395531689227071 for ; Fri, 19 Jul 2024 06:25:31 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B8EF31042 for ; Fri, 19 Jul 2024 06:25:56 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 00F9A3F762 for ; Fri, 19 Jul 2024 06:25:30 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 6/6] glib-networking: upgrade 2.78.1 -> 2.80.0 Date: Fri, 19 Jul 2024 14:25:23 +0100 Message-Id: <20240719132523.976790-6-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240719132523.976790-1-ross.burton@arm.com> References: <20240719132523.976790-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 19 Jul 2024 13:25:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202264 2.80.0 - March 14, 2024 ======================= - Mark plugin functions as exports on Windows (!250, Amyspark) - Updated translations 2.80.rc - February 29, 2024 =========================== - GnuTLS: fix improper use of IP address in SNI extension (!247, MARTINSONS Frederic) - GnuTLS: major performance improvement: reduce unnecessary trust list creation (!249) - OpenSSL: properly handle BIO_CTRL_EOF (!248) - Updated translations 2.80.alpha - January 5, 2024 ============================ - GnuTLS: Add warning when system has no trusted certificates (!243) - OpenSSL: Fix bug when populating trust store (!244, Alessandro Bono) - Fix license on dtls-connection.c test (!245, David King) - Updated translations Signed-off-by: Ross Burton --- meta/recipes-core/glib-networking/glib-networking/eagain.patch | 2 +- .../{glib-networking_2.78.1.bb => glib-networking_2.80.0.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/glib-networking/{glib-networking_2.78.1.bb => glib-networking_2.80.0.bb} (95%) diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch index 98ff4760716..98974aa4e77 100644 --- a/meta/recipes-core/glib-networking/glib-networking/eagain.patch +++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch @@ -1,4 +1,4 @@ -From 5604707bed4b4a4bc4658c7158a18c1774775775 Mon Sep 17 00:00:00 2001 +From f917ef5579257007bc02850e79769fe5ec48b2b7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 6 May 2023 12:18:50 +0100 Subject: [PATCH] In autobuilder testing we regularly see glib-networking ptest diff --git a/meta/recipes-core/glib-networking/glib-networking_2.78.1.bb b/meta/recipes-core/glib-networking/glib-networking_2.80.0.bb similarity index 95% rename from meta/recipes-core/glib-networking/glib-networking_2.78.1.bb rename to meta/recipes-core/glib-networking/glib-networking_2.80.0.bb index 5060d9fd7a1..c8a13555486 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.78.1.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.80.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SECTION = "libs" DEPENDS = "glib-2.0-native glib-2.0" -SRC_URI[archive.sha256sum] = "e48f2ddbb049832cbb09230529c5e45daca9f0df0eda325f832f7379859bf09f" +SRC_URI[archive.sha256sum] = "d8f4f1aab213179ae3351617b59dab5de6bcc9e785021eee178998ebd4bb3acf" # Upstream note that for the openssl backend, half the tests where this backend don't return # the expected error code or don't work as expected so default to gnutls