From patchwork Fri Mar 8 01:24:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 40693 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 58603C54798 for ; Fri, 8 Mar 2024 01:24:34 +0000 (UTC) Received: from mail-oa1-f44.google.com (mail-oa1-f44.google.com [209.85.160.44]) by mx.groups.io with SMTP id smtpd.web11.10718.1709861072240614263 for ; Thu, 07 Mar 2024 17:24:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=c+bCPLB+; spf=pass (domain: gmail.com, ip: 209.85.160.44, mailfrom: raj.khem@gmail.com) Received: by mail-oa1-f44.google.com with SMTP id 586e51a60fabf-22002fbbd6bso725897fac.3 for ; Thu, 07 Mar 2024 17:24:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709861071; x=1710465871; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iUcrMXOkSHDD7BchTmEEqoqprDtsVmWjPGUMrrNRF1o=; b=c+bCPLB+3zVYtoKMF6VqEvw08Y/9XbEgHiDH1eFzpGNJq7WgirRVMlhKTxQDQQ1ENZ lUeDnrUzjJTUK/RpT4GpXUDK/kdO7Z743w5s0Mkg3+4xl0/st4w120DBJhik7475+GH/ Q5LhJlbDez6ICB/NNH353wkYMElSknnwr0Z/OFseURnJvVvDxMvBCoApET+hr7NHkLIb w/aeujZU91E0RuFlOtCGaCsqSXsviDsl9E0o042DJ4XmgIvCBwu8oZNGw/2Yiq4gyyJv hh1Ctk67JmQn7Fvp7EXnEzXqLkxuljEY0PNa4m+ZOxhKOTMMIvpeIrB2pp/a1lMCs1e4 cSSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709861071; x=1710465871; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iUcrMXOkSHDD7BchTmEEqoqprDtsVmWjPGUMrrNRF1o=; b=h3rK16AW3Y110ToNYYgYwtUCT1OAWxHmypfhqvLyTCE2J7s7oc+pfTPNEHk4OiGkvG 4boWZJCGMyvEG4P6BPM0A51xOxelSFcDyasZQHNAjlGHcmO61fkbl6I02Nhu7/OEGD74 yUry4DWSippSmf6WWDUCRYI1cPM6Rozw3oFeLpcmX8/df2oFxd8jAIJBlH+D+yxmj6mt Z2QkeKpq5GQhaLeksszGPlngL6IqSrVYHGCymKR63VVoGJKT2VHlHPnlWatvrdHRK9KH pZAUgdH6c2OAAy/yrz7PW/TGm8kryGAwgPK7RCSZf8ZDTp5xkDxDOOiNXJy44RR42YQr FE8w== X-Gm-Message-State: AOJu0YxAKosTZLADB5a6cC2p+a9uNaYdzbsze9tFQQ8mRZfokWMhFK4E tLt/aO86//96RklsWVzYDV7DEwpjjlDXqw1TZtUZeww4YfQRMHYK0sXMY7u6 X-Google-Smtp-Source: AGHT+IGeybXEcTsX6fP9iqT+C4IRtwz4V6JRs1Q1RfOrYqKnMIMD+tq8ZCqV9mrn+4nS4aRb0n5nfA== X-Received: by 2002:a05:6870:4c13:b0:221:491b:28dc with SMTP id pk19-20020a0568704c1300b00221491b28dcmr1907154oab.41.1709861071150; Thu, 07 Mar 2024 17:24:31 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::682a]) by smtp.gmail.com with ESMTPSA id k4-20020aa79984000000b006e559bc3250sm10649731pfh.68.2024.03.07.17.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 17:24:30 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/5] layer.conf: Update for the scarthgap release series Date: Thu, 7 Mar 2024 17:24:23 -0800 Message-ID: <20240308012429.577792-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 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, 08 Mar 2024 01:24:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109212 Signed-off-by: Khem Raj --- meta-filesystems/conf/layer.conf | 2 +- meta-gnome/conf/layer.conf | 2 +- meta-initramfs/conf/layer.conf | 2 +- meta-multimedia/conf/layer.conf | 2 +- meta-networking/conf/layer.conf | 2 +- meta-oe/conf/layer.conf | 2 +- meta-perl/conf/layer.conf | 2 +- meta-python/conf/layer.conf | 2 +- meta-webserver/conf/layer.conf | 2 +- meta-xfce/conf/layer.conf | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-filesystems/conf/layer.conf b/meta-filesystems/conf/layer.conf index 4f13bd911c..c2263c899b 100644 --- a/meta-filesystems/conf/layer.conf +++ b/meta-filesystems/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1" LAYERDEPENDS_filesystems-layer = "core openembedded-layer networking-layer" -LAYERSERIES_COMPAT_filesystems-layer = "nanbield" +LAYERSERIES_COMPAT_filesystems-layer = "scarthgap" diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index 1674283d51..75764e64c7 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer meta-python" -LAYERSERIES_COMPAT_gnome-layer = "nanbield" +LAYERSERIES_COMPAT_gnome-layer = "scarthgap" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ faenza-icon-theme->gdk-pixbuf \ diff --git a/meta-initramfs/conf/layer.conf b/meta-initramfs/conf/layer.conf index ef12daf53f..25023cfc64 100644 --- a/meta-initramfs/conf/layer.conf +++ b/meta-initramfs/conf/layer.conf @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-initramfs = "5" LAYERDEPENDS_meta-initramfs = "core" -LAYERSERIES_COMPAT_meta-initramfs = "nanbield" +LAYERSERIES_COMPAT_meta-initramfs = "scarthgap" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ dracut->virtual/kernel \ diff --git a/meta-multimedia/conf/layer.conf b/meta-multimedia/conf/layer.conf index 99f4987179..82e6f3629f 100644 --- a/meta-multimedia/conf/layer.conf +++ b/meta-multimedia/conf/layer.conf @@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1" LAYERDEPENDS_multimedia-layer = "core openembedded-layer meta-python" -LAYERSERIES_COMPAT_multimedia-layer = "nanbield" +LAYERSERIES_COMPAT_multimedia-layer = "scarthgap" diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index a9088eece4..ac5d15a0c0 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf @@ -15,7 +15,7 @@ LAYERVERSION_networking-layer = "1" LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer" -LAYERSERIES_COMPAT_networking-layer = "nanbield" +LAYERSERIES_COMPAT_networking-layer = "scarthgap" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 732a7e5d01..4d9acb8cc8 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -44,7 +44,7 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "nanbield" +LAYERSERIES_COMPAT_openembedded-layer = "scarthgap" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-perl/conf/layer.conf b/meta-perl/conf/layer.conf index 1b130b9e60..20a6a4239f 100644 --- a/meta-perl/conf/layer.conf +++ b/meta-perl/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_perl-layer = "1" LAYERDEPENDS_perl-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_perl-layer = "nanbield" +LAYERSERIES_COMPAT_perl-layer = "scarthgap" diff --git a/meta-python/conf/layer.conf b/meta-python/conf/layer.conf index add78013b9..f48b28b958 100644 --- a/meta-python/conf/layer.conf +++ b/meta-python/conf/layer.conf @@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1" LAYERDEPENDS_meta-python = "core (>= 12) openembedded-layer" -LAYERSERIES_COMPAT_meta-python = "nanbield" +LAYERSERIES_COMPAT_meta-python = "scarthgap" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-webserver/conf/layer.conf b/meta-webserver/conf/layer.conf index 066165b5d4..c0896f1a2d 100644 --- a/meta-webserver/conf/layer.conf +++ b/meta-webserver/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1" LAYERDEPENDS_webserver = "core openembedded-layer" -LAYERSERIES_COMPAT_webserver = "nanbield" +LAYERSERIES_COMPAT_webserver = "scarthgap" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf index aeaf9617ee..944bd57d1f 100644 --- a/meta-xfce/conf/layer.conf +++ b/meta-xfce/conf/layer.conf @@ -19,7 +19,7 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" LAYERDEPENDS_xfce-layer += "networking-layer" -LAYERSERIES_COMPAT_xfce-layer = "nanbield" +LAYERSERIES_COMPAT_xfce-layer = "scarthgap" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ openzone->gdk-pixbuf \ From patchwork Fri Mar 8 01:24:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 40695 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 DA428C54798 for ; Fri, 8 Mar 2024 01:24:43 +0000 (UTC) Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) by mx.groups.io with SMTP id smtpd.web11.10719.1709861073790540279 for ; Thu, 07 Mar 2024 17:24:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hTMVHR9b; spf=pass (domain: gmail.com, ip: 209.85.160.52, mailfrom: raj.khem@gmail.com) Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-22008177fbeso770128fac.2 for ; Thu, 07 Mar 2024 17:24:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709861073; x=1710465873; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aTj3TCAiBi/SGBz++J+RsfDp06NrV1ZSG27P+RHuBOk=; b=hTMVHR9bNzSCQMmgXmdbIogIrLISUqhya4Vw6saBPz1mG1YtWfu6JG//BDqnbUJdl3 cDk1dGglLxwe9KwuEq+ouqq5nt0ZUSYeAx5XzZcAMwo3GazrZmkdIQnEAao+liBOAbRc fIZv3GX4ggm94wHQYnQzB6PHkFUgIIlux16ZWq5REdxyUJ8LZLT6xPrrX20qg/ktmnxg V1SK9KRMHFTSoyvmMOgYWwY47oFBtSUujnaLsiS3muzovE4ycQTZVwt3AIFocWs7zCZs wKd/C8XlI3y23wjzTemkzVwRWihDvwqqBYKi3wSXxSuh/c84Ni+0/Wl8KrOwndUqgmKv bWng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709861073; x=1710465873; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aTj3TCAiBi/SGBz++J+RsfDp06NrV1ZSG27P+RHuBOk=; b=B+GBOPAiJ0r39fcLV028nO5Uiay36/rcpIDqv3V+2nZXIfZwtUf3NbfFbx4/orraIe u8dmYKLX6AWg3Rt/xEddUCg9SfbFCjfgtvL5BLIPH7OVajrXqSrj4H4iYc7a2nHtgQuo 2sciHi++2jZqTdV88OLrgowEqTfg4cu5Fu48oAnRb5kyh+49DGD6hxVO1AMU4E2sZ3FZ BNpV9zIRoKBMOrz3iPVY++9qnaZEswbM5DrpevUP9/rUpfTfHVEiRd2qNSxzMpBy8tZX WCKGzBAYujHGlCY5aOi8HfQ91huJdsIjQpDnOfdRnCkRIkQKiXhJSu9XyowDNkUdzyM9 y1Ig== X-Gm-Message-State: AOJu0YyJgk0HKJh2XDf3kWRPqCIirRAUpYPhEJnPDBXCa0pjWKUmoleH dVVkN5BtvvmsvKI3akxb5G8MnN+9jdXPt4cAHIwGRcitMIreRspIPlI+VLKy X-Google-Smtp-Source: AGHT+IEy3nqZyjqfmACqgtnTsW+ONO+YBQ2gPueEIJVfuHF8Rx0OoMskmIjpuKi6Gz+1hZ4eTymuvg== X-Received: by 2002:a05:6870:2189:b0:21e:95dd:b212 with SMTP id l9-20020a056870218900b0021e95ddb212mr1640213oae.57.1709861072812; Thu, 07 Mar 2024 17:24:32 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::682a]) by smtp.gmail.com with ESMTPSA id k4-20020aa79984000000b006e559bc3250sm10649731pfh.68.2024.03.07.17.24.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 17:24:31 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/5] xmlstarlet: Fix build with API breakage in libxml2 2.12 Date: Thu, 7 Mar 2024 17:24:24 -0800 Message-ID: <20240308012429.577792-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240308012429.577792-1-raj.khem@gmail.com> References: <20240308012429.577792-1-raj.khem@gmail.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, 08 Mar 2024 01:24:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109213 Fixes | 300 | xmlSetStructuredErrorFunc(&errorInfo, reportError); | | ^~~~~~~~~~~ | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/xmlstarlet/1.6.1/recipe-sysroot/usr/lib/../include/libxml2/libxml/xmlerror.h:898:29: note: passing argument to parameter 'handler' here | 898 | xmlStructuredErrorFunc handler); | | ^ Signed-off-by: Khem Raj --- .../0001-Make-xmlError-struct-constant.patch | 45 +++++++++++++++++++ .../xmlstarlet/xmlstarlet_1.6.1.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch new file mode 100644 index 0000000000..a9d98db69c --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch @@ -0,0 +1,45 @@ +From f7a5ebc3a673b246a64c9a664df304c1520a3951 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 7 Mar 2024 12:35:17 -0800 +Subject: [PATCH] Make xmlError struct constant + +In libxml2 commit v2.12.0~14 the API changed so that +xmlGetLastError() returns pointer to a constant xmlError struct. +Reflect this change in our code. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/xml.c | 2 +- + src/xmlstar.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/xml.c b/src/xml.c +index cf47cc2..e6f19c1 100644 +--- a/src/xml.c ++++ b/src/xml.c +@@ -104,7 +104,7 @@ void reportGenericError(void* ctx, const char * msg, ...) { + /* by default all errors are reported */ + static ErrorInfo errorInfo = { NULL, NULL, VERBOSE, CONTINUE }; + +-void reportError(void *ptr, xmlErrorPtr error) ++void reportError(void *ptr, const xmlError *error) + { + ErrorInfo *errorInfo = (ErrorInfo*) ptr; + assert(errorInfo); +diff --git a/src/xmlstar.h b/src/xmlstar.h +index 3e1eed3..7e41ac4 100644 +--- a/src/xmlstar.h ++++ b/src/xmlstar.h +@@ -32,7 +32,7 @@ typedef struct _errorInfo { + ErrorStop stop; + } ErrorInfo; + +-void reportError(void *ptr, xmlErrorPtr error); ++void reportError(void *ptr, const xmlError* error); + void suppressErrors(void); + + typedef struct _gOptions { +-- +2.44.0 + diff --git a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb index 930fbdd6c7..61eeaaa095 100644 --- a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb +++ b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb @@ -15,6 +15,7 @@ DEPENDS = "libxml2 libxslt" SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ file://configure.ac.patch \ file://0001-usage2c.awk-fix-wrong-basename-regexp.patch \ + file://0001-Make-xmlError-struct-constant.patch \ file://0001-Fix-hash_key_put-signature.patch" SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" From patchwork Fri Mar 8 01:24:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 40697 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 243B5C54E5D for ; Fri, 8 Mar 2024 01:24:44 +0000 (UTC) Received: from mail-il1-f172.google.com (mail-il1-f172.google.com [209.85.166.172]) by mx.groups.io with SMTP id smtpd.web10.10509.1709861074887009488 for ; Thu, 07 Mar 2024 17:24:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZTQDK0KM; spf=pass (domain: gmail.com, ip: 209.85.166.172, mailfrom: raj.khem@gmail.com) Received: by mail-il1-f172.google.com with SMTP id e9e14a558f8ab-36523b9fa11so975965ab.3 for ; Thu, 07 Mar 2024 17:24:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709861074; x=1710465874; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=z0xop/QmM9oZ+HccrMA3qu58piqOx//cjxgy5ZYZNwA=; b=ZTQDK0KMRLjCSqwc/cCfTJM6zgN+34NcGN8QvIajBbIQijiIyTrD9uyNsO7szMpJCG jkzihGD3a1qUch6y30nlSPM4h3PnAuxy9KT2E+7VJdw5kzmjIV/OL+kOPefnRUO2S528 lingqvTvcfSLJ1eRw1LnM0TmM/cQdkpIQgjiZCNimsdgHO2x8T75CvdZKouaoo4t3jVq NvlwhVWVUXhfARCFbW6Gmg+sBT3Uz3JUj+i2Wmq2R6/cwPCM98N61ec8fud/m3dGPqnM BpOYXDcHqxUD0WYRyY306OLFu7EsYOZ6OCpqyEw+Fj6hrlMRyiuBj8+tzNsnDU1NdYUM 3+wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709861074; x=1710465874; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z0xop/QmM9oZ+HccrMA3qu58piqOx//cjxgy5ZYZNwA=; b=uF5S9p1ol1/pFO4s6dqt99IO44lxsq9ePiMy/Iq0fx1krD/EukJs3ONNq3R3lXmRWl sFCe3WuIMkbGmCV5KiSB93af/ak1Ldih48vGBe16wJ9dtFcIru2dkJBQqbxeAO3k649Q JkiDu+V6jNwtiTEUI91aMVUEnlEm8F3CiS8YopDLH2uew4TsuTVL8HJ2rMi4WsriMpTq jX353SL5odbw2vIFtqNTnjzujuyK2ugMUMm8MLLdbFPxVzSuklrx7w9uxPgU8ZJBRNIL Hf4BLxsCNROwvHXFqAr002Iqzgt4p5Ngiij6DjwxkMTJzBpLdjqp7SrWBlMQMa0uBVt/ a/lg== X-Gm-Message-State: AOJu0Yw33wTF/DZAh1Dec75IuqeLA+g85tEyEJf3vxGR7ib7iY++hsl1 pgwgBEaI7LAuBuAwiylkMKiq3SQY1V7ioPJcZu1mJUF10YF3f2bf20MiBLdQ X-Google-Smtp-Source: AGHT+IGX5d8JIK/v7Qx9hjX2rf0/p6DAVcTknuRyMWFZmglE6dge6r++GKWTFMzhMBGFLIomu9tmRw== X-Received: by 2002:a05:6e02:1a22:b0:365:ac7:30b8 with SMTP id g2-20020a056e021a2200b003650ac730b8mr24078201ile.29.1709861073722; Thu, 07 Mar 2024 17:24:33 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::682a]) by smtp.gmail.com with ESMTPSA id k4-20020aa79984000000b006e559bc3250sm10649731pfh.68.2024.03.07.17.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 17:24:33 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/5] mariadb: Fix build with libxml2 2.12 ABI changes Date: Thu, 7 Mar 2024 17:24:25 -0800 Message-ID: <20240308012429.577792-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240308012429.577792-1-raj.khem@gmail.com> References: <20240308012429.577792-1-raj.khem@gmail.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, 08 Mar 2024 01:24:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109214 Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + ...EV-33439-Fix-build-with-libxml2-2.12.patch | 170 ++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 9e6d490cbe..33da32fb28 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -24,6 +24,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://lfs64.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ file://0001-Remove-the-compile_time_assert-lines.patch \ + file://0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" SRC_URI[sha256sum] = "5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch new file mode 100644 index 0000000000..3e42535dad --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch @@ -0,0 +1,170 @@ +From dae52f5916ef59434c93f0b716270f59dd0c3a94 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Sun, 7 Jan 2024 10:19:54 +0100 +Subject: [PATCH] MDEV-33439 Fix build with libxml2 2.12 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +libxml2 2.12.0 made `xmlGetLastError()` return `const` pointer: + +https://gitlab.gnome.org/GNOME/libxml2/-/commit/61034116d0a3c8b295c6137956adc3ae55720711 + +Clang 16 does not like this: + + error: assigning to 'xmlErrorPtr' (aka '_xmlError *') from 'const xmlError *' (aka 'const _xmlError *') discards qualifiers + error: cannot initialize a variable of type 'xmlErrorPtr' (aka '_xmlError *') with an rvalue of type 'const xmlError *' (aka 'const _xmlError *') + +Let’s update the variables to `const`. +For older versions, it will be automatically converted. + +But then `xmlResetError(xmlError*)` will not like the `const` pointer: + + error: no matching function for call to 'xmlResetError' + note: candidate function not viable: 1st argument ('const xmlError *' (aka 'const _xmlError *')) would lose const qualifier + +Let’s replace it with `xmlResetLastError()`. + +ALso remove `LIBXMLDOC::Xerr` protected member property. +It was introduced in 65b0e5455b547a3d574fa77b34cce23ae3bea0a0 +along with the `xmlResetError` calls. +It does not appear to be used for anything. + +Upstream-Status: Backport [https://github.com/MariaDB/server/pull/2983] +Signed-off-by: Khem Raj +--- + storage/connect/libdoc.cpp | 39 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 20 deletions(-) + +diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp +index 67f22ce2..ab588dd4 100644 +--- a/storage/connect/libdoc.cpp ++++ b/storage/connect/libdoc.cpp +@@ -93,7 +93,6 @@ class LIBXMLDOC : public XMLDOCUMENT { + xmlXPathContextPtr Ctxp; + xmlXPathObjectPtr Xop; + xmlXPathObjectPtr NlXop; +- xmlErrorPtr Xerr; + char *Buf; // Temporary + bool Nofreelist; + }; // end of class LIBXMLDOC +@@ -327,7 +326,6 @@ LIBXMLDOC::LIBXMLDOC(char *nsl, char *nsdf, char *enc, PFBLOCK fp) + Ctxp = NULL; + Xop = NULL; + NlXop = NULL; +- Xerr = NULL; + Buf = NULL; + Nofreelist = false; + } // end of LIBXMLDOC constructor +@@ -365,8 +363,8 @@ bool LIBXMLDOC::ParseFile(PGLOBAL g, char *fn) + Encoding = (char*)Docp->encoding; + + return false; +- } else if ((Xerr = xmlGetLastError())) +- xmlResetError(Xerr); ++ } else if (xmlGetLastError()) ++ xmlResetLastError(); + + return true; + } // end of ParseFile +@@ -505,9 +503,9 @@ int LIBXMLDOC::DumpDoc(PGLOBAL g, char *ofn) + #if 1 + // This function does not crash ( + if (xmlSaveFormatFileEnc((const char *)ofn, Docp, Encoding, 0) < 0) { +- xmlErrorPtr err = xmlGetLastError(); ++ const xmlError *err = xmlGetLastError(); + strcpy(g->Message, (err) ? err->message : "Error saving XML doc"); +- xmlResetError(Xerr); ++ xmlResetLastError(); + rc = -1; + } // endif Save + // rc = xmlDocDump(of, Docp); +@@ -546,8 +544,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) + if (Nlist) { + xmlXPathFreeNodeSet(Nlist); + +- if ((Xerr = xmlGetLastError())) +- xmlResetError(Xerr); ++ if (xmlGetLastError()) ++ xmlResetLastError(); + + Nlist = NULL; + } // endif Nlist +@@ -555,8 +553,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) + if (Xop) { + xmlXPathFreeObject(Xop); + +- if ((Xerr = xmlGetLastError())) +- xmlResetError(Xerr); ++ if (xmlGetLastError()) ++ xmlResetLastError(); + + Xop = NULL; + } // endif Xop +@@ -564,8 +562,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) + if (NlXop) { + xmlXPathFreeObject(NlXop); + +- if ((Xerr = xmlGetLastError())) +- xmlResetError(Xerr); ++ if (xmlGetLastError()) ++ xmlResetLastError(); + + NlXop = NULL; + } // endif NlXop +@@ -573,8 +571,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) + if (Ctxp) { + xmlXPathFreeContext(Ctxp); + +- if ((Xerr = xmlGetLastError())) +- xmlResetError(Xerr); ++ if (xmlGetLastError()) ++ xmlResetLastError(); + + Ctxp = NULL; + } // endif Ctxp +@@ -590,6 +588,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) + /******************************************************************/ + xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) + { ++ const xmlError *xerr; + xmlNodeSetPtr nl; + + if (trace(1)) +@@ -649,11 +648,11 @@ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) + } else + xmlXPathFreeObject(Xop); // Caused node not found + +- if ((Xerr = xmlGetLastError())) { +- strcpy(g->Message, Xerr->message); +- xmlResetError(Xerr); ++ if ((xerr = xmlGetLastError())) { ++ strcpy(g->Message, xerr->message); ++ xmlResetLastError(); + return NULL; +- } // endif Xerr ++ } // endif xerr + + } // endif Xop + +@@ -1079,7 +1078,7 @@ void XML2NODE::AddText(PGLOBAL g, PCSZ txtp) + /******************************************************************/ + void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) + { +- xmlErrorPtr xerr; ++ const xmlError *xerr; + + if (trace(1)) + htrc("DeleteChild: node=%p\n", dnp); +@@ -1122,7 +1121,7 @@ void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) + if (trace(1)) + htrc("DeleteChild: errmsg=%-.256s\n", xerr->message); + +- xmlResetError(xerr); ++ xmlResetLastError(); + } // end of DeleteChild + + /* -------------------- class XML2NODELIST ---------------------- */ +-- +2.44.0 + From patchwork Fri Mar 8 01:24:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 40694 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 DFF54C54E49 for ; Fri, 8 Mar 2024 01:24:43 +0000 (UTC) Received: from mail-oa1-f43.google.com (mail-oa1-f43.google.com [209.85.160.43]) by mx.groups.io with SMTP id smtpd.web10.10510.1709861076075444784 for ; Thu, 07 Mar 2024 17:24:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XcUF98/R; spf=pass (domain: gmail.com, ip: 209.85.160.43, mailfrom: raj.khem@gmail.com) Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-221960e3edcso173094fac.0 for ; Thu, 07 Mar 2024 17:24:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709861075; x=1710465875; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Td0eX4YlgNSODS4rDsjntt4TR2peqEiGRQtxnjN/p2A=; b=XcUF98/RCY+ma167q11plsfyWpFhsnHqejiRYbfp9povVyCezU23s9psaMIyjiTl3V 3cvzLTUxeMW4X92UFmZnqHFZSiwXa7ryaSDG3tQ2jOxXTnJsQqtEAwQwYBcD962MYgkK d1Vxdayg4o7VH8JOyFTl+u2TgtERd914aMBIDQkt3+vyq4w0t5O/tmigwN1qJdsIIPsW vUtBOxOWosQcNMXo/zlZplT8BunePL0fMvEyEUwdeyizSeRcY7vGdWIH3P4McSHwXJWr 7lqqIjO1liWjOPTo1hN2kLGF3yJPcWuyUQoFKwkH71DofsTVmBHCfzFgfT7ExxWKmTZ5 XKrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709861075; x=1710465875; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Td0eX4YlgNSODS4rDsjntt4TR2peqEiGRQtxnjN/p2A=; b=iBG0Vp6RDu+mm7ktwmJ6Rjm6WAY/Qy/1TmKaWdQU3jFBEWhcSCaFQUQrWiy1yWoBeE 4RobD7UiYZfoIu9k4hfg7+MA0jXCjnYzFtGoKPOJaR0z2UgGpDDFv7BoogObmoRrTnDw lr6Mu0Xym497Irx+w8D3knJkmwRKi9fmXd01xGfEkt9IMWoQeeefv3jKQYnOxf+Eq51a SzpK3u3Jj6284EzbORTU45LzreXZkIh4YDopcDPt4xxVrLyulnZC9gKKjyuxMJHKnpoa mZOA8ELX+c50JVt8hYu0E1xCh4h2/O10fQIV6tk6DG43DMMXOtD8GZi9YdGiqmqPnETb 177g== X-Gm-Message-State: AOJu0YwlzfShraGJga0Opt/NFnsVm3tN/u+5oTFK1HK85E5oGbCoh4yZ 7x+xr4dG14yegOb7eHvPy3wZwZ7OKQXA2sILWaOR+R/fi3NDd1b6/2NyBABA X-Google-Smtp-Source: AGHT+IHfRex0mBtcjHsj9JqnQXZ//z6QA+3Ap8jVFU+7vSM0q1nfPJQORO07O48/PC606YsP93yo4A== X-Received: by 2002:a05:6870:ec93:b0:221:8a03:6de8 with SMTP id eo19-20020a056870ec9300b002218a036de8mr1923739oab.13.1709861075048; Thu, 07 Mar 2024 17:24:35 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::682a]) by smtp.gmail.com with ESMTPSA id k4-20020aa79984000000b006e559bc3250sm10649731pfh.68.2024.03.07.17.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 17:24:34 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH 4/5] libmusicbrainz: Update to tip of trunk Date: Thu, 7 Mar 2024 17:24:26 -0800 Message-ID: <20240308012429.577792-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240308012429.577792-1-raj.khem@gmail.com> References: <20240308012429.577792-1-raj.khem@gmail.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, 08 Mar 2024 01:24:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109215 This brings the libxml2 2.12 fix Signed-off-by: Khem Raj --- .../recipes-multimedia/musicbrainz/libmusicbrainz_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb index e8b10bc680..2b373d31e5 100644 --- a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb +++ b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb @@ -7,7 +7,7 @@ DEPENDS = "expat libxml2 libxml2-native neon neon-native libmusicbrainz-native" PV = "5.1.0+git" -SRCREV = "8be45b12a86bc0e46f2f836c8ac88e1e98d82aee" +SRCREV = "4655b571a70d73d41467091f59c518517c956198" SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git;branch=master;protocol=https \ file://0001-http-fetch-Pass-a-non-null-buffer-to-ne_set_request_.patch \ " From patchwork Fri Mar 8 01:24:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 40696 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 0268AC54E4A for ; Fri, 8 Mar 2024 01:24:44 +0000 (UTC) Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) by mx.groups.io with SMTP id smtpd.web11.10720.1709861076945025878 for ; Thu, 07 Mar 2024 17:24:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=R9V+gsog; spf=pass (domain: gmail.com, ip: 209.85.160.53, mailfrom: raj.khem@gmail.com) Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-22187576d54so595799fac.1 for ; Thu, 07 Mar 2024 17:24:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709861076; x=1710465876; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xcovI9/xkTmmQ5ZwyeZUuWmnkuEcLKonf0dQPp8jcSE=; b=R9V+gsogtLLImhyjct8HbjXmlt/xy9qF1dhCAQKQsxIEg5dPU2mOKuiqGVkhbOWdlC S/I+qMGMybo1LNJa2tfrInxoHMmTOHAjZ22lEQcROMtGr90qmB/zqMVNFVd7U4Nq0iU2 JHTQyNPiGebfXjz2yfZGmI8n+as6WWODHNPsuzV6bP/BnFjAOUCb9wFq/oij0FHqkGXi y4JHvrzYLXd1rKtJXvglgySQsSAtUKX+SzHkXY1zYSb3XBO6pw5HCZGcJ9krgcscwgk4 VFCoj2tT5V4oVYEF+0/cMBY4DwZ5fdwMlD/w4DD97jSyiHASmhSbMufkS14uqfulFkER B5Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709861076; x=1710465876; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xcovI9/xkTmmQ5ZwyeZUuWmnkuEcLKonf0dQPp8jcSE=; b=d84IOGBd08Xlub6g1D4zTaHVaqUi7xs4t/BaFc+tuKFneSn8EO3BpBlL8kwoVizMsB azdNa6qji9KtdJ3gMNZlf3qdjcFQKMdop+xqSmGyv7D8D86gMK5RXEFGsXA0PfngBDUu cxyDoShmACJ7zs66b87SGrlGgQdLLZzwMJRgTwqVqeXT4BJ5Z1TWDcvb+qToPaXRXc2H SZrJNtB5LBMsjjMOPsbhrtTmMRvr9+cWo2C7lecLWChRvEISS313eXfzGZQGfgxjNR6V +DzbGuMpxzSS2r6vfY6uXTnutXEloMszv4nmlhytqHKvlPn9qa2uBZsERYpy8rpIWyIz mLxg== X-Gm-Message-State: AOJu0YyayPSaz0QObStAYqYwXhHW+AvuDD0deJQXQQbZo0rEUpwOzNv6 iHVP2gy05sNLYTx7hb0+R1bip/b9671CWv1aNJZb4QSjYmlqxfOSlMM7tpb/ X-Google-Smtp-Source: AGHT+IFJ9zHZBth8wAiNIq5U0aXhyOggdXvT6y26y5ZavEjvaFTIu6EhZOP6S2IyLy/63USLKZnYQA== X-Received: by 2002:a05:6870:9712:b0:221:8915:1cc4 with SMTP id n18-20020a056870971200b0022189151cc4mr1821492oaq.12.1709861075925; Thu, 07 Mar 2024 17:24:35 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::682a]) by smtp.gmail.com with ESMTPSA id k4-20020aa79984000000b006e559bc3250sm10649731pfh.68.2024.03.07.17.24.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 17:24:35 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][PATCH 5/5] gnome-commander: Fix build with taglib 2.0 Date: Thu, 7 Mar 2024 17:24:27 -0800 Message-ID: <20240308012429.577792-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240308012429.577792-1-raj.khem@gmail.com> References: <20240308012429.577792-1-raj.khem@gmail.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, 08 Mar 2024 01:24:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109216 Signed-off-by: Khem Raj --- ...001-Build-fix-needed-with-taglib-2.0.patch | 37 +++++++++++++++++++ .../gnome-commander/gnome-commander_1.16.1.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch diff --git a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch new file mode 100644 index 0000000000..8f6920c2cc --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch @@ -0,0 +1,37 @@ +From dc3aa0ff5a41114b17816f1f36f6bb5631c6ab5c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 7 Mar 2024 17:17:29 -0800 +Subject: [PATCH] Build fix needed with taglib 2.0 + +Fixes +| ../gnome-commander-1.16.1/src/tags/gnome-cmd-tags-taglib.cc:153:29: error: no member named 'sampleWidth' in 'TagLib::FLAC::Properties' +| 153 | if (flacProperties->sampleWidth()) +| | ~~~~~~~~~~~~~~ ^ +| ../gnome-commander-1.16.1/src/tags/gnome-cmd-tags-taglib.cc:154:67: error: no member named 'sampleWidth' in 'TagLib::FLAC::Properties' +| 154 | cout << "Audio.FLAC.SampleWidth " << flacProperties->sampleWidth()<< endl; +| | ~~~~~~~~~~~~~~ ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/tags/gnome-cmd-tags-taglib.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tags/gnome-cmd-tags-taglib.cc b/src/tags/gnome-cmd-tags-taglib.cc +index 9e65836..573f5eb 100644 +--- a/src/tags/gnome-cmd-tags-taglib.cc ++++ b/src/tags/gnome-cmd-tags-taglib.cc +@@ -150,8 +150,8 @@ bool getAudioProperties(GnomeCmdFileMetadata &metadata, const TagLib::AudioPrope + if (flacProperties) + { + metadata.add(TAG_AUDIO_CODEC,"FLAC"); +- if (flacProperties->sampleWidth()) +- cout << "Audio.FLAC.SampleWidth " << flacProperties->sampleWidth()<< endl; ++ if (flacProperties->bitsPerSample()) ++ cout << "Audio.FLAC.BitsPerSample " << flacProperties->bitsPerSample()<< endl; + + return true; + } +-- +2.44.0 + diff --git a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb index 474512daa8..bb36d59e56 100644 --- a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb +++ b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb @@ -16,6 +16,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' +SRC_URI += "file://0001-Build-fix-needed-with-taglib-2.0.patch" SRC_URI[archive.sha256sum] = "3f1d00c4a650fe7902167648286b32c9ca4ef86e31a5d8ccca0139f12d10d0b3" PACKAGECONFIG ??= "exiv2 taglib libgsf poppler"