diff mbox series

[31/39] harfbuzz: upgrade 6.0.0 -> 7.0.0

Message ID 20230219193101.338397-31-alex@linutronix.de
State Accepted, archived
Commit f7532332e9dde401d9cca5b7f53e2a4e47164261
Headers show
Series [01/39] scripts/oe-setup-layers: correct variable names - layers should be called repos | expand

Commit Message

Alexander Kanavin Feb. 19, 2023, 7:30 p.m. UTC
License-Update: copyright years

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...subset-threads.cc-add-missing-cstdio.patch | 34 -------------------
 .../{harfbuzz_6.0.0.bb => harfbuzz_7.0.0.bb}  |  7 ++--
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_6.0.0.bb => harfbuzz_7.0.0.bb} (87%)

Comments

Ross Burton Feb. 20, 2023, 4:02 p.m. UTC | #1
FYI there’s a 7.0.1 now too.

Ross

> On 19 Feb 2023, at 19:30, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote:
> 
> License-Update: copyright years
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
> ...subset-threads.cc-add-missing-cstdio.patch | 34 -------------------
> .../{harfbuzz_6.0.0.bb => harfbuzz_7.0.0.bb}  |  7 ++--
> 2 files changed, 3 insertions(+), 38 deletions(-)
> delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch
> rename meta/recipes-graphics/harfbuzz/{harfbuzz_6.0.0.bb => harfbuzz_7.0.0.bb} (87%)
> 
> diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch
> deleted file mode 100644
> index 13819f5cf8..0000000000
> --- a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From 7dfa672dac958bdbc7703ab0920e167eaa126754 Mon Sep 17 00:00:00 2001
> -From: Sergei Trofimovich <slyich@gmail.com>
> -Date: Mon, 16 Jan 2023 19:49:53 +0000
> -Subject: [PATCH] test/threads/hb-subset-threads.cc: add missing <cstdio> include
> -
> -This week's `gcc-13` snapshot cleaned further up it's standard headers
> -and exposed missing declaration as a build failure:
> -
> -    ../test/threads/hb-subset-threads.cc: In function 'void test_operation(operation_t, const char*, const test_input_t&)':
> -    ../test/threads/hb-subset-threads.cc:127:3: error: 'printf' was not declared in this scope
> -
> -    ../test/threads/hb-subset-threads.cc: In function 'int main(int, char**)':
> -    ../test/threads/hb-subset-threads.cc:157:19: error: 'atoi' was not declared in this scope
> -
> -Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/7dfa672dac958bdbc7703ab0920e167eaa126754]
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - test/threads/hb-subset-threads.cc | 2 ++
> - 1 file changed, 2 insertions(+)
> -
> -diff --git a/test/threads/hb-subset-threads.cc b/test/threads/hb-subset-threads.cc
> -index 9d86d8d51..f0e4b7e2a 100644
> ---- a/test/threads/hb-subset-threads.cc
> -+++ b/test/threads/hb-subset-threads.cc
> -@@ -1,4 +1,6 @@
> - #include <cassert>
> -+#include <cstdio>
> -+#include <cstdlib>
> - #include <cstring>
> - #include <thread>
> - #include <condition_variable>
> --- 
> -2.39.1
> -
> diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_7.0.0.bb
> similarity index 87%
> rename from meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb
> rename to meta/recipes-graphics/harfbuzz/harfbuzz_7.0.0.bb
> index 1fce127d07..a85c4ca1ce 100644
> --- a/meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb
> +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_7.0.0.bb
> @@ -4,13 +4,12 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz"
> BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz"
> SECTION = "libs"
> LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \
> +LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \
>                     file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \
>                     "
> 
> -SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz \
> -           file://0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch"
> -SRC_URI[sha256sum] = "1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4"
> +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz"
> +SRC_URI[sha256sum] = "7b4685b7066c5c6b8dc6cd7b02f63c554fb8cc1c4ddcfc44bc284efa3c20cf28"
> 
> inherit meson pkgconfig lib_package gtk-doc gobject-introspection github-releases
> 
> -- 
> 2.30.2
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#177374): https://lists.openembedded.org/g/openembedded-core/message/177374
> Mute This Topic: https://lists.openembedded.org/mt/97072168/6875888
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ross.burton@arm.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Alexander Kanavin Feb. 20, 2023, 4:19 p.m. UTC | #2
Yes, and it will be picked up by the next AUH round, just like this
one was :-) I'm not chasing the hottest updates, for the sake of
personal sanity.

Alex


On Mon, 20 Feb 2023 at 17:02, Ross Burton <Ross.Burton@arm.com> wrote:
>
> FYI there’s a 7.0.1 now too.
>
> Ross
>
> > On 19 Feb 2023, at 19:30, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote:
> >
> > License-Update: copyright years
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> > ...subset-threads.cc-add-missing-cstdio.patch | 34 -------------------
> > .../{harfbuzz_6.0.0.bb => harfbuzz_7.0.0.bb}  |  7 ++--
> > 2 files changed, 3 insertions(+), 38 deletions(-)
> > delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch
> > rename meta/recipes-graphics/harfbuzz/{harfbuzz_6.0.0.bb => harfbuzz_7.0.0.bb} (87%)
> >
> > diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch
> > deleted file mode 100644
> > index 13819f5cf8..0000000000
> > --- a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch
> > +++ /dev/null
> > @@ -1,34 +0,0 @@
> > -From 7dfa672dac958bdbc7703ab0920e167eaa126754 Mon Sep 17 00:00:00 2001
> > -From: Sergei Trofimovich <slyich@gmail.com>
> > -Date: Mon, 16 Jan 2023 19:49:53 +0000
> > -Subject: [PATCH] test/threads/hb-subset-threads.cc: add missing <cstdio> include
> > -
> > -This week's `gcc-13` snapshot cleaned further up it's standard headers
> > -and exposed missing declaration as a build failure:
> > -
> > -    ../test/threads/hb-subset-threads.cc: In function 'void test_operation(operation_t, const char*, const test_input_t&)':
> > -    ../test/threads/hb-subset-threads.cc:127:3: error: 'printf' was not declared in this scope
> > -
> > -    ../test/threads/hb-subset-threads.cc: In function 'int main(int, char**)':
> > -    ../test/threads/hb-subset-threads.cc:157:19: error: 'atoi' was not declared in this scope
> > -
> > -Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/7dfa672dac958bdbc7703ab0920e167eaa126754]
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ----
> > - test/threads/hb-subset-threads.cc | 2 ++
> > - 1 file changed, 2 insertions(+)
> > -
> > -diff --git a/test/threads/hb-subset-threads.cc b/test/threads/hb-subset-threads.cc
> > -index 9d86d8d51..f0e4b7e2a 100644
> > ---- a/test/threads/hb-subset-threads.cc
> > -+++ b/test/threads/hb-subset-threads.cc
> > -@@ -1,4 +1,6 @@
> > - #include <cassert>
> > -+#include <cstdio>
> > -+#include <cstdlib>
> > - #include <cstring>
> > - #include <thread>
> > - #include <condition_variable>
> > ---
> > -2.39.1
> > -
> > diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_7.0.0.bb
> > similarity index 87%
> > rename from meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb
> > rename to meta/recipes-graphics/harfbuzz/harfbuzz_7.0.0.bb
> > index 1fce127d07..a85c4ca1ce 100644
> > --- a/meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb
> > +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_7.0.0.bb
> > @@ -4,13 +4,12 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz"
> > BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz"
> > SECTION = "libs"
> > LICENSE = "MIT"
> > -LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \
> >                     file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \
> >                     "
> >
> > -SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz \
> > -           file://0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch"
> > -SRC_URI[sha256sum] = "1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4"
> > +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz"
> > +SRC_URI[sha256sum] = "7b4685b7066c5c6b8dc6cd7b02f63c554fb8cc1c4ddcfc44bc284efa3c20cf28"
> >
> > inherit meson pkgconfig lib_package gtk-doc gobject-introspection github-releases
> >
> > --
> > 2.30.2
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#177374): https://lists.openembedded.org/g/openembedded-core/message/177374
> > Mute This Topic: https://lists.openembedded.org/mt/97072168/6875888
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ross.burton@arm.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
diff mbox series

Patch

diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch
deleted file mode 100644
index 13819f5cf8..0000000000
--- a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From 7dfa672dac958bdbc7703ab0920e167eaa126754 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Mon, 16 Jan 2023 19:49:53 +0000
-Subject: [PATCH] test/threads/hb-subset-threads.cc: add missing <cstdio> include
-
-This week's `gcc-13` snapshot cleaned further up it's standard headers
-and exposed missing declaration as a build failure:
-
-    ../test/threads/hb-subset-threads.cc: In function 'void test_operation(operation_t, const char*, const test_input_t&)':
-    ../test/threads/hb-subset-threads.cc:127:3: error: 'printf' was not declared in this scope
-
-    ../test/threads/hb-subset-threads.cc: In function 'int main(int, char**)':
-    ../test/threads/hb-subset-threads.cc:157:19: error: 'atoi' was not declared in this scope
-
-Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/7dfa672dac958bdbc7703ab0920e167eaa126754]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- test/threads/hb-subset-threads.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/test/threads/hb-subset-threads.cc b/test/threads/hb-subset-threads.cc
-index 9d86d8d51..f0e4b7e2a 100644
---- a/test/threads/hb-subset-threads.cc
-+++ b/test/threads/hb-subset-threads.cc
-@@ -1,4 +1,6 @@
- #include <cassert>
-+#include <cstdio>
-+#include <cstdlib>
- #include <cstring>
- #include <thread>
- #include <condition_variable>
--- 
-2.39.1
-
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_7.0.0.bb
similarity index 87%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_7.0.0.bb
index 1fce127d07..a85c4ca1ce 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_6.0.0.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_7.0.0.bb
@@ -4,13 +4,12 @@  HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz"
 BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz"
 SECTION = "libs"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \
+LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \
                     file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \
                     "
 
-SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz \
-           file://0001-test-threads-hb-subset-threads.cc-add-missing-cstdio.patch"
-SRC_URI[sha256sum] = "1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4"
+SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz"
+SRC_URI[sha256sum] = "7b4685b7066c5c6b8dc6cd7b02f63c554fb8cc1c4ddcfc44bc284efa3c20cf28"
 
 inherit meson pkgconfig lib_package gtk-doc gobject-introspection github-releases