Skip to contentSkip to conversation

pango: upgrade 1.42.4 -> 1.44.3

PATCH In review Anuj Mittal 3 participants 4 messages Aug 5, 2019 – Aug 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 pango: upgrade 1.42.4 -> 1.44.3

* For changes, see:
https://github.com/GNOME/pango/blob/master/NEWS

* Remove upstreamed patch, rename docs and introspection meson options and add PACKAGECONFIG for tests.

---
 .../pango/pango/insensitive-diff.patch        | 28 -------------------
 .../{pango_1.42.4.bb => pango_1.44.3.bb}      | 22 ++++++---------
 2 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-graphics/pango/pango/insensitive-diff.patch
 rename meta/recipes-graphics/pango/{pango_1.42.4.bb => pango_1.44.3.bb} (73%)
meta/recipes-graphics/pango/pango/insensitive-diff.patch deleted +0 -28
deleted file mode 100644
index faaa96133f..0000000000
@@ -1,28 +0,0 @@
-Do case-insensitive diffs as the test is sensitive as to whether 0x0 is printed
-as (null) or (NULL).
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/pango/merge_requests/44]
-Signed-off-by: Ross Burton <[email protected]>
-
-diff --git a/tests/markup-parse.c b/tests/markup-parse.c
-index 633f3e89..36d2c776 100644
---- a/tests/markup-parse.c
-+++ b/tests/markup-parse.c
-@@ -217,7 +217,7 @@ diff_with_file (const char  *file1,
-                 GString     *string,
-                 GError     **error)
- {
--  const char *command[] = { "diff", "-u", file1, NULL, NULL };
-+  const char *command[] = { "diff", "-u", "-i", file1, NULL, NULL };
-   char *diff, *tmpfile;
-   int fd;
- 
-@@ -237,7 +237,7 @@ diff_with_file (const char  *file1,
-       goto done;
-     }
-   close (fd);
--  command[3] = tmpfile;
-+  command[4] = tmpfile;
- 
-   /* run diff command */
-   g_spawn_sync (NULL, (char **)command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &diff, NULL, NULL, error);
meta/recipes-graphics/pango/pango_1.44.3.bb renamed from meta/recipes-graphics/pango/pango_1.42.4.bb +9 -13
similarity index 73%
rename from meta/recipes-graphics/pango/pango_1.42.4.bb
rename to meta/recipes-graphics/pango/pango_1.44.3.bb
index 58e1f41be5..1973c63f82 100644
@@ -16,18 +16,21 @@ GNOMEBASEBUILDCLASS = "meson"
 inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection
 
 SRC_URI += "file://run-ptest \
-            file://insensitive-diff.patch"
+            "
 
-SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c"
-SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d"
+SRC_URI[archive.md5sum] = "7f91f1b5883ff848b445ab11ebabcf03"
+SRC_URI[archive.sha256sum] = "290bb100ca5c7025ec3f97332eaf783b76ba1f444110f06ac5ee3285e3e5aece"
 
 DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
 
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
+                   ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
+
 PACKAGECONFIG[x11] = ",,virtual/libx11 libxft"
+PACKAGECONFIG[tests] = "-Dinstall-tests=true, -Dinstall-tests=false"
 
-GTKDOC_MESON_OPTION = "enable_docs"
-GIR_MESON_OPTION = 'gir'
+GTKDOC_MESON_OPTION = "gtk_doc"
+GIR_MESON_OPTION = 'introspection'
 
 LEAD_SONAME = "libpango-1.0*"
 LIBV = "1.8.0"
@@ -41,10 +44,3 @@ RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \
                     pango-module-basic-fc pango-module-arabic-lang"
 
 BBCLASSEXTEND = "native nativesdk"
-
-do_install_append () {
-	if [ "${PTEST_ENABLED}" != "1" ]; then
-		rm -rf ${D}${libexecdir}/installed-tests ${D}${datadir}/installed-tests
-                rmdir --ignore-fail-on-non-empty ${D}${libexecdir} ${D}${datadir}
-	fi
-}
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/2 harfbuzz: upgrade 2.4.0 -> 2.5.3

License-Update: Copyright years added, and point to correct source file.

For changes in this version, see:
https://github.com/harfbuzz/harfbuzz/blob/2.5.3/NEWS

---
 .../harfbuzz/{harfbuzz_2.4.0.bb => harfbuzz_2.5.3.bb} | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_2.4.0.bb => harfbuzz_2.5.3.bb} (75%)
meta/recipes-graphics/harfbuzz/harfbuzz_2.5.3.bb renamed from meta/recipes-graphics/harfbuzz/harfbuzz_2.4.0.bb +5 -6
similarity index 75%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_2.4.0.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_2.5.3.bb
index 4691d16df8..a90ff52255 100644
@@ -4,15 +4,14 @@ 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=e021dd6dda6ff1e6b1044002fc662b9b \
-                    file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \
-"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e11f5c3149cdec4bb309babb020b32b9 \
+                    file://src/hb-ucd.cc;md5=343f1797944de49ab2b5f5cf3126d3f2"
 
 DEPENDS = "glib-2.0 cairo fontconfig freetype"
 
-SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2"
-SRC_URI[md5sum] = "49f111f9b52ae3d9b31c1a3631a320bd"
-SRC_URI[sha256sum] = "b470eff9dd5b596edf078596b46a1f83c179449f051a469430afc15869db336f"
+SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.xz"
+SRC_URI[md5sum] = "29a310e74a90b4e4f6d62f3e74a571e5"
+SRC_URI[sha256sum] = "fed00dc797b7ba3ca943225f0a854baaed4c1640fff8a31d455cd3b5caec855c"
 
 inherit autotools pkgconfig lib_package gtk-doc
 
Signature · 1 line
2.21.0
#2 lore raw
In reply to Anuj Mittal

This causes

https://errors.yoctoproject.org/Errors/Details/258300/

Quoted 103 lines · Anuj Mittal

* For changes, see:
https://github.com/GNOME/pango/blob/master/NEWS

* Remove upstreamed patch, rename docs and introspection meson options and add PACKAGECONFIG for tests.

---
 .../pango/pango/insensitive-diff.patch        | 28 -------------------
 .../{pango_1.42.4.bb => pango_1.44.3.bb}      | 22 ++++++---------
 2 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-graphics/pango/pango/insensitive-diff.patch
 rename meta/recipes-graphics/pango/{pango_1.42.4.bb => pango_1.44.3.bb} (73%)
meta/recipes-graphics/pango/pango/insensitive-diff.patch deleted +0 -28
deleted file mode 100644
index faaa96133f..0000000000
@@ -1,28 +0,0 @@
-Do case-insensitive diffs as the test is sensitive as to whether 0x0 is printed
-as (null) or (NULL).
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/pango/merge_requests/44]
-Signed-off-by: Ross Burton <[email protected]>
-
-diff --git a/tests/markup-parse.c b/tests/markup-parse.c
-index 633f3e89..36d2c776 100644
---- a/tests/markup-parse.c
-+++ b/tests/markup-parse.c
-@@ -217,7 +217,7 @@ diff_with_file (const char  *file1,
-                 GString     *string,
-                 GError     **error)
- {
--  const char *command[] = { "diff", "-u", file1, NULL, NULL };
-+  const char *command[] = { "diff", "-u", "-i", file1, NULL, NULL };
-   char *diff, *tmpfile;
-   int fd;
-
-@@ -237,7 +237,7 @@ diff_with_file (const char  *file1,
-       goto done;
-     }
-   close (fd);
--  command[3] = tmpfile;
-+  command[4] = tmpfile;
-
-   /* run diff command */
-   g_spawn_sync (NULL, (char **)command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &diff, NULL, NULL, error);
meta/recipes-graphics/pango/pango_1.44.3.bb renamed from meta/recipes-graphics/pango/pango_1.42.4.bb +9 -14
similarity index 73%
rename from meta/recipes-graphics/pango/pango_1.42.4.bb
rename to meta/recipes-graphics/pango/pango_1.44.3.bb
index 58e1f41be5..1973c63f82 100644
@@ -16,18 +16,21 @@ GNOMEBASEBUILDCLASS = "meson"
 inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection
 
 SRC_URI += "file://run-ptest \
-            file://insensitive-diff.patch"
+            "
 
-SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c"
-SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d"
+SRC_URI[archive.md5sum] = "7f91f1b5883ff848b445ab11ebabcf03"
+SRC_URI[archive.sha256sum] = "290bb100ca5c7025ec3f97332eaf783b76ba1f444110f06ac5ee3285e3e5aece"
 
 DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
 
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
+                   ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
+
 PACKAGECONFIG[x11] = ",,virtual/libx11 libxft"
+PACKAGECONFIG[tests] = "-Dinstall-tests=true, -Dinstall-tests=false"
 
-GTKDOC_MESON_OPTION = "enable_docs"
-GIR_MESON_OPTION = 'gir'
+GTKDOC_MESON_OPTION = "gtk_doc"
+GIR_MESON_OPTION = 'introspection'
 
 LEAD_SONAME = "libpango-1.0*"
 LIBV = "1.8.0"
@@ -41,10 +44,3 @@ RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \
                     pango-module-basic-fc pango-module-arabic-lang"
 
 BBCLASSEXTEND = "native nativesdk"
-
-do_install_append () {
-       if [ "${PTEST_ENABLED}" != "1" ]; then
-               rm -rf ${D}${libexecdir}/installed-tests ${D}${datadir}/installed-tests
-                rmdir --ignore-fail-on-non-empty ${D}${libexecdir} ${D}${datadir}
-       fi
-}
--

2.21.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#3 lore raw
Quoted 3 lines · Khem Raj

This causes

https://errors.yoctoproject.org/Errors/Details/258300/

gvtextlayout_pango.c:140:10: error: unknown type name ‘FT_Face’

          FT_Face face;
          ^~~~~~~

Looks like graphviz was assuming Pango would pull in Freetype headers, and it no longer does by design. Fix graphviz to include what it needs.

Ross