[meta-gnome] ghex: Upgrade 3.18.4 -> 45.0

- enable gi,vapi,api-documentation
- switch to gtk4

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb | 17 -----------------
 meta-gnome/recipes-gnome/ghex/ghex_45.0.bb   | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 17 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb
 create mode 100644 meta-gnome/recipes-gnome/ghex/ghex_45.0.bb

Markus

I am seeing a build failure with clang but I doubt its related to compiler type.

| x86_64-yoe-linux-clang -target x86_64-yoe-linux -m64 -march=core2
-mtune=core2 -msse3 -mfpmath=sse -mlittle-endian --dyld-prefix=/usr
-Qunused-arguments -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2
-Wformat -Wformat-
security -Werror=format-security
--sysroot=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot
-Isrc/libgtkhex-4.so.1.4.0.p -Isrc -I../ghex-45.0/src -I.
-I../ghex-45.0 -I/mnt/b/yoe/master/build/tmp
/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/glib-2.0
-I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/lib/glib-2.0/include
-I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe
-linux/ghex/45.0/recipe-sysroot/usr/include/libmount
-I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/blkid
-I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-s
ysroot/usr/include/gtk-4.0
-I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/pango-1.0
-I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/har
fbuzz -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/fribidi
-I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/gdk-pixbuf-2.0
-I/mnt/b/yo
e/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/cairo
-I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/pixman-1
-I/mnt/b/yoe/master/build/tmp/work/c
ore2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/freetype2
-I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/libdrm
-I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/
45.0/recipe-sysroot/usr/include/libpng16
-I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/graphene-1.0
-I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroo
t/usr/lib/graphene-1.0/include -fcolor-diagnostics
-D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wno-unused-variable
-Wno-unused-parameter -Werror=implicit -Wformat=2 -O2 -pipe -g
-feliminate-unused-debug-types -fmacro-prefi
x-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/ghex-45.0=/usr/src/debug/ghex/45.0-r0
-fdebug-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/ghex-45.0=/usr/src/debug/ghex/45.0-
r0 -fmacro-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/build=/usr/src/debug/ghex/45.0-r0
-fdebug-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/build=/usr/src/debug/gh
ex/45.0-r0 -fdebug-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot=
-fmacro-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot=
-fdebug-prefix-ma
p=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot-native=
-fPIC -mfpmath=sse -msse -msse2 -pthread '-DG_LOG_DOMAIN="gtkhex-4"'
-MD -MQ src/libgtkhex-4.so.1.4.0.p/gtkhex.c.o -MF src/libgtkhex-4.
so.1.4.0.p/gtkhex.c.o.d -o src/libgtkhex-4.so.1.4.0.p/gtkhex.c.o -c
../ghex-45.0/src/gtkhex.c
| ../ghex-45.0/src/gtkhex.c:1944:4: error: expected expression
|  1944 |                         gint64 line_beg = self->cursor_pos;
|       |                         ^
| ../ghex-45.0/src/gtkhex.c:1946:11: error: use of undeclared
identifier 'line_beg'
|  1946 |                         while (line_beg % self->cpl != 0)
|       |                                ^
| ../ghex-45.0/src/gtkhex.c:1947:7: error: use of undeclared
identifier 'line_beg'
|  1947 |                                 --line_beg;
|       |                                   ^
| ../ghex-45.0/src/gtkhex.c:1949:33: error: use of undeclared
identifier 'line_beg'
|  1949 |                         hex_widget_set_cursor (self, line_beg);
|       |                                                      ^
| ../ghex-45.0/src/gtkhex.c:1954:4: error: expected expression
|  1954 |                         gint64 line_end = self->cursor_pos;
|       |                         ^
| ../ghex-45.0/src/gtkhex.c:1956:11: error: use of undeclared
identifier 'line_end'
|  1956 |                         while (line_end % self->cpl != self->cpl - 1)
|       |                                ^
| ../ghex-45.0/src/gtkhex.c:1957:7: error: use of undeclared
identifier 'line_end'
|  1957 |                                 ++line_end;
|       |                                   ^
| ../ghex-45.0/src/gtkhex.c:1959:38: error: use of undeclared
identifier 'line_end'
|  1959 |                         hex_widget_set_cursor (self, MIN
(line_end, payload_size));
|       |                                                           ^
| ../ghex-45.0/src/gtkhex.c:1959:38: error: use of undeclared
identifier 'line_end'
| 9 errors generated.

On Sat, Nov 11, 2023 at 4:00 AM Markus Volk <f_l_k@t-online.de> wrote:
>
> - enable gi,vapi,api-documentation
> - switch to gtk4
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb | 17 -----------------
>  meta-gnome/recipes-gnome/ghex/ghex_45.0.bb   | 20 ++++++++++++++++++++
>  2 files changed, 20 insertions(+), 17 deletions(-)
>  delete mode 100644 meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb
>  create mode 100644 meta-gnome/recipes-gnome/ghex/ghex_45.0.bb
>
> diff --git a/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb b/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb
> deleted file mode 100644
> index 08e50409e..000000000
> --- a/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -SUMMARY = "GHex - a hex editor for GNOME"
> -LICENSE = "GPL-2.0-only"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> -
> -GNOMEBASEBUILDCLASS = "meson"
> -
> -DEPENDS = " \
> -    glib-2.0-native \
> -    gtk+3 \
> -"
> -
> -inherit gnomebase gsettings gtk-icon-cache gnome-help gettext upstream-version-is-even
> -
> -SRC_URI[archive.md5sum] = "7e6ed808766bc18285bdc6999bdf0f15"
> -SRC_URI[archive.sha256sum] = "c2d9c191ff5bce836618779865bee4059db81a3a0dff38bda3cc7a9e729637c0"
> -
> -FILES:${PN} += "${datadir}/metainfo"
> diff --git a/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb b/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb
> new file mode 100644
> index 000000000..6d3e9b978
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb
> @@ -0,0 +1,20 @@
> +SUMMARY = "GHex - a hex editor for GNOME"
> +LICENSE = "GPL-2.0-only"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> +
> +
> +DEPENDS = " \
> +    desktop-file-utils-native  \
> +    glib-2.0-native \
> +    gtk4 \
> +    libadwaita \
> +"
> +
> +GIR_MESON_ENABLE_FLAG = 'enabled'
> +GIR_MESON_DISABLE_FLAG = 'disabled'
> +
> +inherit gnomebase gsettings gtk-icon-cache gnome-help gettext gobject-introspection vala gi-docgen
> +
> +SRC_URI[archive.sha256sum] = "05cecc4561ca40b257c5db31da9f68d696133efc0ae427ed82fb985a986e840e"
> +
> +FILES:${PN} += "${libdir} ${datadir}/metainfo"
> --
> 2.42.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#106552): https://lists.openembedded.org/g/openembedded-devel/message/106552
> Mute This Topic: https://lists.openembedded.org/mt/102524551/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

On Sun, Nov 12, 2023 at 4:36 PM Markus Volk <f_l_k@t-online.de> wrote:
>
> Hi Khem,
>
> I guess this issue has already been fixed upstream:
> https://gitlab.gnome.org/GNOME/ghex/-/issues/72
>
> Is it ok to send it as follow up ?

Yes please do.

>
> On Sun, Nov 12 2023 at 04:06:15 PM -08:00:00, Khem Raj <raj.khem@gmail.com> wrote:
>
> Markus I am seeing a build failure with clang but I doubt its related to compiler type. | x86_64-yoe-linux-clang -target x86_64-yoe-linux -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -mlittle-endian --dyld-prefix=/usr -Qunused-arguments -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat- security -Werror=format-security --sysroot=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot -Isrc/libgtkhex-4.so.1.4.0.p -Isrc -I../ghex-45.0/src -I. -I../ghex-45.0 -I/mnt/b/yoe/master/build/tmp /work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/glib-2.0 -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/lib/glib-2.0/include -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe -linux/ghex/45.0/recipe-sysroot/usr/include/libmount -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/blkid -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-s ysroot/usr/include/gtk-4.0 -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/pango-1.0 -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/har fbuzz -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/fribidi -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/gdk-pixbuf-2.0 -I/mnt/b/yo e/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/cairo -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/pixman-1 -I/mnt/b/yoe/master/build/tmp/work/c ore2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/freetype2 -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/libdrm -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/ 45.0/recipe-sysroot/usr/include/libpng16 -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot/usr/include/graphene-1.0 -I/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroo t/usr/lib/graphene-1.0/include -fcolor-diagnostics -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wno-unused-variable -Wno-unused-parameter -Werror=implicit -Wformat=2 -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefi x-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/ghex-45.0=/usr/src/debug/ghex/45.0-r0 -fdebug-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/ghex-45.0=/usr/src/debug/ghex/45.0- r0 -fmacro-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/build=/usr/src/debug/ghex/45.0-r0 -fdebug-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/build=/usr/src/debug/gh ex/45.0-r0 -fdebug-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot= -fmacro-prefix-map=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot= -fdebug-prefix-ma p=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/ghex/45.0/recipe-sysroot-native= -fPIC -mfpmath=sse -msse -msse2 -pthread '-DG_LOG_DOMAIN="gtkhex-4"' -MD -MQ src/libgtkhex-4.so.1.4.0.p/gtkhex.c.o -MF src/libgtkhex-4. so.1.4.0.p/gtkhex.c.o.d -o src/libgtkhex-4.so.1.4.0.p/gtkhex.c.o -c ../ghex-45.0/src/gtkhex.c | ../ghex-45.0/src/gtkhex.c:1944:4: error: expected expression | 1944 | gint64 line_beg = self->cursor_pos; | | ^ | ../ghex-45.0/src/gtkhex.c:1946:11: error: use of undeclared identifier 'line_beg' | 1946 | while (line_beg % self->cpl != 0) | | ^ | ../ghex-45.0/src/gtkhex.c:1947:7: error: use of undeclared identifier 'line_beg' | 1947 | --line_beg; | | ^ | ../ghex-45.0/src/gtkhex.c:1949:33: error: use of undeclared identifier 'line_beg' | 1949 | hex_widget_set_cursor (self, line_beg); | | ^ | ../ghex-45.0/src/gtkhex.c:1954:4: error: expected expression | 1954 | gint64 line_end = self->cursor_pos; | | ^ | ../ghex-45.0/src/gtkhex.c:1956:11: error: use of undeclared identifier 'line_end' | 1956 | while (line_end % self->cpl != self->cpl - 1) | | ^ | ../ghex-45.0/src/gtkhex.c:1957:7: error: use of undeclared identifier 'line_end' | 1957 | ++line_end; | | ^ | ../ghex-45.0/src/gtkhex.c:1959:38: error: use of undeclared identifier 'line_end' | 1959 | hex_widget_set_cursor (self, MIN (line_end, payload_size)); | | ^ | ../ghex-45.0/src/gtkhex.c:1959:38: error: use of undeclared identifier 'line_end' | 9 errors generated. On Sat, Nov 11, 2023 at 4:00 AM Markus Volk <f_l_k@t-online.de> wrote:
>
> - enable gi,vapi,api-documentation - switch to gtk4 Signed-off-by: Markus Volk <f_l_k@t-online.de> --- meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb | 17 ----------------- meta-gnome/recipes-gnome/ghex/ghex_45.0.bb | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 17 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb create mode 100644 meta-gnome/recipes-gnome/ghex/ghex_45.0.bb diff --git a/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb b/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb deleted file mode 100644 index 08e50409e..000000000 --- a/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "GHex - a hex editor for GNOME" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ -" - -inherit gnomebase gsettings gtk-icon-cache gnome-help gettext upstream-version-is-even - -SRC_URI[archive.md5sum] = "7e6ed808766bc18285bdc6999bdf0f15" -SRC_URI[archive.sha256sum] = "c2d9c191ff5bce836618779865bee4059db81a3a0dff38bda3cc7a9e729637c0" - -FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb b/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb new file mode 100644 index 000000000..6d3e9b978 --- /dev/null +++ b/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "GHex - a hex editor for GNOME" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + + +DEPENDS = " \ + desktop-file-utils-native \ + glib-2.0-native \ + gtk4 \ + libadwaita \ +" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +inherit gnomebase gsettings gtk-icon-cache gnome-help gettext gobject-introspection vala gi-docgen + +SRC_URI[archive.sha256sum] = "05cecc4561ca40b257c5db31da9f68d696133efc0ae427ed82fb985a986e840e" + +FILES:${PN} += "${libdir} ${datadir}/metainfo" -- 2.42.0
>
> -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#106618): https://lists.openembedded.org/g/openembedded-devel/message/106618 Mute This Topic: https://lists.openembedded.org/mt/102524551/3618223 Group Owner: openembedded-devel+owner@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [f_l_k@t-online.de] -=-=-=-=-=-=-=-=-=-=-=-