From patchwork Fri Dec 9 14:11:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 16583 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 EDAF7C4708E for ; Fri, 9 Dec 2022 14:11:33 +0000 (UTC) Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by mx.groups.io with SMTP id smtpd.web11.1978.1670595088019693175 for ; Fri, 09 Dec 2022 06:11:28 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.80, mailfrom: f_l_k@t-online.de) Received: from fwd72.dcpf.telekom.de (fwd72.aul.t-online.de [10.223.144.98]) by mailout01.t-online.de (Postfix) with SMTP id C6615173C7 for ; Fri, 9 Dec 2022 15:11:25 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([84.163.47.94]) by fwd72.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1p3e61-3QaSED0; Fri, 9 Dec 2022 15:11:25 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCHv10 1/6] graphene: import from meta-oe Date: Fri, 9 Dec 2022 15:11:12 +0100 Message-Id: <20221209141117.1311827-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1670595085-5B7E9991-C44A0247/0/0 CLEAN NORMAL X-TOI-MSGID: 3c05fc90-ef04-46e2-bd20-d8e9621fcac6 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, 09 Dec 2022 14:11:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174454 Signed-off-by: Markus Volk --- .../graphene/graphene_1.10.8.bb | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 meta/recipes-graphics/graphene/graphene_1.10.8.bb diff --git a/meta/recipes-graphics/graphene/graphene_1.10.8.bb b/meta/recipes-graphics/graphene/graphene_1.10.8.bb new file mode 100644 index 0000000000..813ff74adf --- /dev/null +++ b/meta/recipes-graphics/graphene/graphene_1.10.8.bb @@ -0,0 +1,22 @@ +SUMMARY = "A thin layer of graphic data types" +HOMEPAGE = "http://ebassi.github.io/graphene/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7d871d9e23c450c421a85bb2819f648" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gobject-introspection gtk-doc + +SRC_URI[archive.sha256sum] = "a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a" + +# gtk4 & mutter 41.0 requires graphene build with introspection +PACKAGECONFIG ?= "introspection" +PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled," + +GTKDOC_MESON_OPTION = "gtk_doc" + +EXTRA_OEMESON = "-Dinstalled_tests=false" + +FILES:${PN} += "${libdir}/graphene-1.0" + +BBCLASSEXTEND = "native nativesdk" From patchwork Fri Dec 9 14:11:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 16584 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 E153FC4708D for ; Fri, 9 Dec 2022 14:11:33 +0000 (UTC) Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by mx.groups.io with SMTP id smtpd.web10.2005.1670595087802008361 for ; Fri, 09 Dec 2022 06:11:28 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.80, mailfrom: f_l_k@t-online.de) Received: from fwd72.dcpf.telekom.de (fwd72.aul.t-online.de [10.223.144.98]) by mailout01.t-online.de (Postfix) with SMTP id 0196B173C6 for ; Fri, 9 Dec 2022 15:11:26 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([84.163.47.94]) by fwd72.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1p3e61-3QaSEE0; Fri, 9 Dec 2022 15:11:25 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCHv10 2/6] gtk4: import recipe from meta-gnome Date: Fri, 9 Dec 2022 15:11:13 +0100 Message-Id: <20221209141117.1311827-2-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221209141117.1311827-1-f_l_k@t-online.de> References: <20221209141117.1311827-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1670595085-5BFE8991-7D325482/0/0 CLEAN NORMAL X-TOI-MSGID: 01ecae4a-b0f0-4a90-b7b5-4b11d1822e18 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, 09 Dec 2022 14:11:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174453 Signed-off-by: Markus Volk --- meta/recipes-gnome/gtk+/gtk4_4.8.2.bb | 129 ++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 meta/recipes-gnome/gtk+/gtk4_4.8.2.bb diff --git a/meta/recipes-gnome/gtk+/gtk4_4.8.2.bb b/meta/recipes-gnome/gtk+/gtk4_4.8.2.bb new file mode 100644 index 0000000000..98850f7ea0 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk4_4.8.2.bb @@ -0,0 +1,129 @@ +SUMMARY = "Multi-platform toolkit for creating GUIs" +DESCRIPTION = "GTK is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ +set of widgets, GTK is suitable for projects ranging from small one-off projects to complete application suites." +HOMEPAGE = "http://www.gtk.org" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "libs" + +DEPENDS = " \ + atk \ + cairo \ + fribidi \ + gdk-pixbuf \ + gdk-pixbuf-native \ + gi-docgen \ + glib-2.0 \ + graphene \ + harfbuzz \ + jpeg \ + libepoxy \ + libpng \ + librsvg \ + libxkbcommon \ + pango \ + tiff \ +" + +LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ + file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ + file://tests/testgtk.c;endline=25;md5=49d06770681b8322466b52ed19d29fb2 \ +" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +UPSTREAM_CHECK_REGEX = "gtk-(?P\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" +SRC_URI[sha256sum] = "85b7a160b6e02eafa4e7d38f046f8720fab537d3fe73c01c864333a983a692a9" + +S = "${WORKDIR}/gtk-${PV}" + +inherit meson gettext pkgconfig gi-docgen update-alternatives gsettings features_check gobject-introspection + +# TBD: nativesdk +# gobject-introspection.bbclass pins introspection off for nativesk. As long as +# we do not remove this wisdom or hack gtk4, it is not possible to build +# nativesdk-gtk4 +BBCLASSEXTEND = "native" + +GSETTINGS_PACKAGE:class-native = "" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "opengl" +GTKDOC_MESON_OPTION = "gtk_doc" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +EXTRA_OEMESON = " -Dbuild-tests=false -Ddemos=false" + +PACKAGECONFIG ??= "gstreamer ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11 vulkan', d)}" +PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" + +PACKAGECONFIG[x11] = "-Dx11-backend=true,-Dx11-backend=false,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes xinerama" +PACKAGECONFIG[wayland] = "-Dwayland-backend=true,-Dwayland-backend=false,wayland wayland-protocols virtual/egl virtual/libgles2 wayland-native" +PACKAGECONFIG[cups] = "-Dprint-cups=enabled,-Dprint-cups=disabled,cups" +PACKAGECONFIG[colord] = "-Dcolord=enabled,-Dcolord=disabled,colord" +PACKAGECONFIG[iso-codes] = ",,iso-codes,iso-codes" +PACKAGECONFIG[ffmpeg] = "-Dmedia-ffmpeg=enabled,-Dmedia-ffmpeg=disabled,ffmpeg" +# gtk4 wants gstreamer-player-1.0 -> gstreamer1.0-plugins-bad +PACKAGECONFIG[gstreamer] = "-Dmedia-gstreamer=enabled,-Dmedia-gstreamer=disabled,gstreamer1.0-plugins-bad" +PACKAGECONFIG[tracker] = "-Dtracker=enabled,-Dtracker=disabled,tracker" +PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled, vulkan-loader vulkan-headers shaderc-native" + +LIBV = "4.0.0" + +FILES:${PN}:append = " \ + ${datadir}/glib-2.0/schemas/ \ + ${datadir}/gtk-4.0/emoji/ \ + ${datadir}/metainfo/ \ + ${datadir}/icons/hicolor/*/apps/org.gtk.PrintEditor4*.* \ + ${libdir}/gtk-4.0/${LIBV}/media \ + ${bindir}/gtk4-update-icon-cache \ + ${bindir}/gtk4-launch \ +" + +FILES:${PN}-dev += " \ + ${datadir}/gtk-4.0/gtk4builder.rng \ + ${datadir}/gtk-4.0/include \ + ${datadir}/gtk-4.0/valgrind \ + ${datadir}/gettext/its \ + ${bindir}/gtk4-builder-tool \ + ${bindir}/gtk4-encode-symbolic-svg \ + ${bindir}/gtk4-query-settings \ +" + +GTKBASE_RRECOMMENDS ?= " \ + liberation-fonts \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-jpeg \ + gdk-pixbuf-loader-gif \ + gdk-pixbuf-loader-xpm \ + shared-mime-info \ + adwaita-icon-theme-symbolic \ +" + + +GTKBASE_RRECOMMENDS:class-native ?= "" + +GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" + +RRECOMMENDS:${PN} = "${GTKBASE_RRECOMMENDS}" +RRECOMMENDS:${PN}:libc-glibc = "${GTKGLIBC_RRECOMMENDS}" +RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" + +PACKAGES_DYNAMIC += "^gtk4-printbackend-.*" +python populate_packages:prepend () { + import os.path + + gtk_libdir = d.expand('${libdir}/gtk-4.0/${LIBV}') + printmodules_root = os.path.join(gtk_libdir, 'printbackends'); + + do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk4-printbackend-%s', 'GTK printbackend module for %s') + + if (d.getVar('DEBIAN_NAMES')): + d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-4.0') +} From patchwork Fri Dec 9 14:11:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 16582 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 EC3B4C4167B for ; Fri, 9 Dec 2022 14:11:33 +0000 (UTC) Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by mx.groups.io with SMTP id smtpd.web11.1982.1670595089610108110 for ; Fri, 09 Dec 2022 06:11:29 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.80, mailfrom: f_l_k@t-online.de) Received: from fwd72.dcpf.telekom.de (fwd72.aul.t-online.de [10.223.144.98]) by mailout01.t-online.de (Postfix) with SMTP id 15A0076F0 for ; Fri, 9 Dec 2022 15:11:27 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([84.163.47.94]) by fwd72.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1p3e61-3QaSEF0; Fri, 9 Dec 2022 15:11:26 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCHv10 3/6] gcr: rename gcr -> gcr3 Date: Fri, 9 Dec 2022 15:11:14 +0100 Message-Id: <20221209141117.1311827-3-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221209141117.1311827-1-f_l_k@t-online.de> References: <20221209141117.1311827-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1670595086-5AFEE991-C3D38A26/0/0 CLEAN NORMAL X-TOI-MSGID: cb19a284-f2e1-4cca-9865-8ad8fb39aa55 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, 09 Dec 2022 14:11:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174456 gcr-3 recipe is still needed for gnome projects that stick to gtk+3, rename to gcr3. Signed-off-by: Markus Volk --- ...1-gcr-meson.build-fix-one-parallel-build-failure.patch | 0 .../b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch | 0 meta/recipes-gnome/gcr/{gcr_3.40.0.bb => gcr3_3.40.0.bb} | 8 ++++++-- 3 files changed, 6 insertions(+), 2 deletions(-) rename meta/recipes-gnome/gcr/{gcr => gcr3}/0001-gcr-meson.build-fix-one-parallel-build-failure.patch (100%) rename meta/recipes-gnome/gcr/{gcr => gcr3}/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch (100%) rename meta/recipes-gnome/gcr/{gcr_3.40.0.bb => gcr3_3.40.0.bb} (87%) diff --git a/meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch b/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch similarity index 100% rename from meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch rename to meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch diff --git a/meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch b/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch similarity index 100% rename from meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch rename to meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch diff --git a/meta/recipes-gnome/gcr/gcr_3.40.0.bb b/meta/recipes-gnome/gcr/gcr3_3.40.0.bb similarity index 87% rename from meta/recipes-gnome/gcr/gcr_3.40.0.bb rename to meta/recipes-gnome/gcr/gcr3_3.40.0.bb index 917be5938b..5318768db6 100644 --- a/meta/recipes-gnome/gcr/gcr_3.40.0.bb +++ b/meta/recipes-gnome/gcr/gcr3_3.40.0.bb @@ -20,11 +20,15 @@ GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg UPSTREAM_CHECK_REGEX = "[^\d\.](?P\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar" -SRC_URI += "file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch \ - file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch" +SRC_URI = " \ + https://download.gnome.org/sources/gcr/3.40/gcr-${PV}.tar.xz;name=archive \ + file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch \ + file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch" SRC_URI[archive.sha256sum] = "b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5" +S = "${WORKDIR}/gcr-${PV}" + PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \ From patchwork Fri Dec 9 14:11:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 16585 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 EDD28C25B04 for ; Fri, 9 Dec 2022 14:11:33 +0000 (UTC) Received: from mailout05.t-online.de (mailout05.t-online.de [194.25.134.82]) by mx.groups.io with SMTP id smtpd.web10.2006.1670595088751178691 for ; Fri, 09 Dec 2022 06:11:29 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.82, mailfrom: f_l_k@t-online.de) Received: from fwd72.dcpf.telekom.de (fwd72.aul.t-online.de [10.223.144.98]) by mailout05.t-online.de (Postfix) with SMTP id 1DDE314A43 for ; Fri, 9 Dec 2022 15:11:27 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([84.163.47.94]) by fwd72.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1p3e62-3QaSEG0; Fri, 9 Dec 2022 15:11:26 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCHv10 4/6] gcr: add recipe for gcr-4, needed to build with gtk4 Date: Fri, 9 Dec 2022 15:11:15 +0100 Message-Id: <20221209141117.1311827-4-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221209141117.1311827-1-f_l_k@t-online.de> References: <20221209141117.1311827-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1670595086-5AFEE991-C09599ED/0/0 CLEAN NORMAL X-TOI-MSGID: d214d72e-e9fb-4233-a8b3-89cce15833f4 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, 09 Dec 2022 14:11:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174455 Signed-off-by: Markus Volk --- ...ectly-handle-disabled-ssh_agent-opti.patch | 49 ++++++++++++++++ meta/recipes-gnome/gcr/gcr_4.0.0.bb | 57 +++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch create mode 100644 meta/recipes-gnome/gcr/gcr_4.0.0.bb diff --git a/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch b/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch new file mode 100644 index 0000000000..940f78ebab --- /dev/null +++ b/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch @@ -0,0 +1,49 @@ +From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 16 Nov 2022 11:27:24 +0100 +Subject: [PATCH 1/2] meson.build: correctly handle disabled ssh_agent option + +Existing code produces these errors: +| gcr/meson.build:61:0: ERROR: Unable to get the path of a not-found external program +| gcr/meson.build:101:5: ERROR: Unknown variable "ssh_add_path". + +Signed-off-by: Alexander Kanavin + +Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ] +--- + meson.build | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 3f35173..11d7fa7 100644 +--- a/meson.build ++++ b/meson.build +@@ -58,8 +58,10 @@ if p11_system_config_modules == '' + error('Couldn\'t find location for pkcs11 module config') + endif + libsecret_dep = dependency('libsecret-1', version: '>= 0.20', required: get_option('ssh_agent')) +-ssh_add_path = find_program('ssh-add', required: get_option('ssh_agent')).full_path() +-ssh_agent_path = find_program('ssh-agent', required: get_option('ssh_agent')).full_path() ++if get_option('ssh_agent') ++ ssh_add_path = find_program('ssh-add').full_path() ++ ssh_agent_path = find_program('ssh-agent').full_path() ++endif + + with_systemd = false + libsystemd_deps = [] +@@ -96,8 +98,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm')) + conf.set('HAVE_MLOCK', cc.has_function('mlock')) + conf.set_quoted('GPG_EXECUTABLE', gpg_path) + conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version()) +-conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path) +-conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path) ++if get_option('ssh_agent') ++ conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path) ++ conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path) ++endif + conf.set10('WITH_SYSTEMD', with_systemd) + config_file = configure_file( + output: 'config.h', +-- +2.34.1 + diff --git a/meta/recipes-gnome/gcr/gcr_4.0.0.bb b/meta/recipes-gnome/gcr/gcr_4.0.0.bb new file mode 100644 index 0000000000..264069ffd1 --- /dev/null +++ b/meta/recipes-gnome/gcr/gcr_4.0.0.bb @@ -0,0 +1,57 @@ +SUMMARY = "A library for bits of crypto UI and parsing etc" +DESCRIPTION = "GCR is a library for displaying certificates, and crypto UI, \ +accessing key stores. It also provides the viewer for crypto files on the \ +GNOME desktop." +HOMEPAGE = "https://gitlab.gnome.org/GNOME/gcr" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" + +DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" + +CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'" + +CFLAGS += "-D_GNU_SOURCE" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" +inherit gnomebase gtk-icon-cache gi-docgen features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg +UPSTREAM_CHECK_REGEX = "gcr-(?P\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" + +SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch" +SRC_URI[archive.sha256sum] = "c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c" + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \ +" +PACKAGECONFIG[gtk] = "-Dgtk4=true,-Dgtk4=false,gtk4" +PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,libsecret,openssh" +#'Use systemd socket activation for server programs' +PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/gcr-4 \ + ${systemd_user_unitdir}/gcr-ssh-agent.socket \ + ${systemd_user_unitdir}/gcr-ssh-agent.service \ +" + +# http://errors.yoctoproject.org/Errors/Details/20229/ +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" + +EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross" + +do_write_config:append() { + cat >${WORKDIR}/meson-${PN}.cross < X-Patchwork-Id: 16581 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 DFD8DC4332F for ; Fri, 9 Dec 2022 14:11:33 +0000 (UTC) Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by mx.groups.io with SMTP id smtpd.web10.2008.1670595090128458017 for ; Fri, 09 Dec 2022 06:11:30 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.80, mailfrom: f_l_k@t-online.de) Received: from fwd72.dcpf.telekom.de (fwd72.aul.t-online.de [10.223.144.98]) by mailout01.t-online.de (Postfix) with SMTP id 41443125F5 for ; Fri, 9 Dec 2022 15:11:27 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([84.163.47.94]) by fwd72.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1p3e62-3QaSEH0; Fri, 9 Dec 2022 15:11:26 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCHv10 5/6] Add entries for the newly added recipes to maintainers.inc Date: Fri, 9 Dec 2022 15:11:16 +0100 Message-Id: <20221209141117.1311827-5-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221209141117.1311827-1-f_l_k@t-online.de> References: <20221209141117.1311827-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1670595086-5B7E9991-61C607AF/0/0 CLEAN NORMAL X-TOI-MSGID: 2d5c536c-8107-44d2-9a02-0d7afecea622 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, 09 Dec 2022 14:11:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174457 Signed-off-by: Markus Volk --- meta/conf/distro/include/maintainers.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 7437beda4d..66797db02c 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -188,6 +188,7 @@ RECIPE_MAINTAINER:pn-gcc-runtime = "Khem Raj " RECIPE_MAINTAINER:pn-gcc-sanitizers = "Khem Raj " RECIPE_MAINTAINER:pn-gcc-source-12.2.0 = "Khem Raj " RECIPE_MAINTAINER:pn-gconf = "Ross Burton " +RECIPE_MAINTAINER:pn-gcr3 = "Markus Volk " RECIPE_MAINTAINER:pn-gcr = "Alexander Kanavin " RECIPE_MAINTAINER:pn-gdb = "Khem Raj " RECIPE_MAINTAINER:pn-gdb-cross-${TARGET_ARCH} = "Khem Raj " @@ -229,6 +230,7 @@ RECIPE_MAINTAINER:pn-gperf = "Alexander Kanavin " RECIPE_MAINTAINER:pn-gpgme = "Hongxu Jia " RECIPE_MAINTAINER:pn-gptfdisk = "Alexander Kanavin " RECIPE_MAINTAINER:pn-gcompat = "Khem Raj " +RECIPE_MAINTAINER:pn-graphene = "Markus Volk " RECIPE_MAINTAINER:pn-grep = "Denys Dmytriyenko " RECIPE_MAINTAINER:pn-groff = "Hongxu Jia " RECIPE_MAINTAINER:pn-grub = "Anuj Mittal " @@ -249,6 +251,7 @@ RECIPE_MAINTAINER:pn-gstreamer1.0-python = "Anuj Mittal " RECIPE_MAINTAINER:pn-gstreamer1.0-rtsp-server = "Anuj Mittal " RECIPE_MAINTAINER:pn-gstreamer1.0-vaapi = "Anuj Mittal " RECIPE_MAINTAINER:pn-gtk+3 = "Ross Burton " +RECIPE_MAINTAINER:pn-gtk4 = "Markus Volk " RECIPE_MAINTAINER:pn-gtk-doc = "Alexander Kanavin " RECIPE_MAINTAINER:pn-gzip = "Denys Dmytriyenko " RECIPE_MAINTAINER:pn-harfbuzz = "Anuj Mittal " From patchwork Fri Dec 9 14:11:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 16580 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 E09B2C04FDE for ; Fri, 9 Dec 2022 14:11:33 +0000 (UTC) Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by mx.groups.io with SMTP id smtpd.web11.1984.1670595090221056293 for ; Fri, 09 Dec 2022 06:11:30 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.80, mailfrom: f_l_k@t-online.de) Received: from fwd72.dcpf.telekom.de (fwd72.aul.t-online.de [10.223.144.98]) by mailout01.t-online.de (Postfix) with SMTP id 5707A125F6 for ; Fri, 9 Dec 2022 15:11:27 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([84.163.47.94]) by fwd72.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1p3e62-3QaSEI0; Fri, 9 Dec 2022 15:11:26 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCHv10 6/6] epiphany: use gcr3 Date: Fri, 9 Dec 2022 15:11:17 +0100 Message-Id: <20221209141117.1311827-6-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221209141117.1311827-1-f_l_k@t-online.de> References: <20221209141117.1311827-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1670595086-5B7E9991-79502951/0/0 CLEAN NORMAL X-TOI-MSGID: eed610e8-f696-4006-8525-a5a09833a349 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, 09 Dec 2022 14:11:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174458 Signed-off-by: Markus Volk --- meta/recipes-gnome/epiphany/epiphany_42.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-gnome/epiphany/epiphany_42.4.bb b/meta/recipes-gnome/epiphany/epiphany_42.4.bb index afaaefc46f..0cbe1c9c58 100644 --- a/meta/recipes-gnome/epiphany/epiphany_42.4.bb +++ b/meta/recipes-gnome/epiphany/epiphany_42.4.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = " \ webkitgtk \ - gcr \ + gcr3 \ gsettings-desktop-schemas \ nettle \ json-glib \