From patchwork Thu May 25 05:47:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 24438 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 A5BD6C77B7A for ; Thu, 25 May 2023 05:47:16 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web10.5510.1684993635212582139 for ; Wed, 24 May 2023 22:47:15 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=Lkwfu6yY; spf=pass (domain: gmail.com, ip: 209.85.215.170, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-534696e4e0aso834818a12.0 for ; Wed, 24 May 2023 22:47:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684993634; x=1687585634; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5/LgeoOG0CYejlsvOL1QjniGr+fUZi/pS2x6SaCU9fQ=; b=Lkwfu6yY1oSo23lqdiCHfCdWHAFDFknz5dLtwMJQpb1MSOPfWrHdf7YG6dnEvyLGYP 7TsF1fRipSqqr2D32gZSBLTV1qEWWhvaYEtKYnjoK7ZKd1aVcUpKztWvWpcZveKAckeh XaiPzMRIzRMED421eq5jy6XgPVLzxC6gduQ4jJVWxR1cDzfhbD6H/ew8XQa3Y4b3qU1c f9CbWDeeKv/t8QhIZVjwD3UU8E77AOxkWtxIHRM9CfFWyZRUryh6mjeLlwacWEyjO1mC rHone/U91H6aaxPcE/cd5hPw1XGw0UMVLpmiUGjuYKCpl2xZQxZzMEnTqNC2F1o0nXnv uFmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684993634; x=1687585634; 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=5/LgeoOG0CYejlsvOL1QjniGr+fUZi/pS2x6SaCU9fQ=; b=K7Ao9XY43POfOXXjnpcrOGBteD94EW31DvTrU75rzpetcimlOU3EjbOR1KvEse7PH8 6rEmiMds+IbTtLoVLUXPEEzzP/ZxS1O4wRBN8UwEJ56gsFgYCF52kBSOB0X9NebSFRfB x4ItQkY8ksoYnHPcn59qOa4QExQMGrVCO+WBrcqgYh+qiam6H34Nj7tLzRXlIgFOomHS sUucgvQvYMO8KHhJaCFjGp9OQ+5nUt6b2/JoX3VFL935lQkyQAHZZfTC/BCi+EwVWaui FoXenXiEm2hg/BxkdD8Wyr6nOIdmzcetgOaxTbxRNfjoxoaYuTMTTanJA1+Tga0ss+e1 rMxg== X-Gm-Message-State: AC+VfDwXTjKskWsGSWiiI/WFZnf2N6gSP0Xq5p+CrC9vgxkjj00D/ixg pA309Rm/sfgpUmfOqTxRhYYuzpUMcCE= X-Google-Smtp-Source: ACHHUZ5/JprhSkCF7f1rt0foB/mCRS+GKD9pU4pgVCI3YAX0xLpeLRUKY7H9XR+jeeSp7BT4PBCxRg== X-Received: by 2002:a17:903:32c7:b0:1ac:820e:c348 with SMTP id i7-20020a17090332c700b001ac820ec348mr635395plr.0.1684993634033; Wed, 24 May 2023 22:47:14 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::c4c0]) by smtp.gmail.com with ESMTPSA id j7-20020a17090276c700b001a6d4ea7301sm441286plt.251.2023.05.24.22.47.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 22:47:13 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/5] remmina: Fix buildpaths QA warnings Date: Wed, 24 May 2023 22:47:08 -0700 Message-Id: <20230525054712.1593592-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.1 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 ; Thu, 25 May 2023 05:47:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102799 buildflags.h is generated file which contains buildtime CFLAGS and it gets included into sources via src/remmina_exec.c Fixes WARNING: remmina-1.4.30-r0 do_package_qa: QA Issue: File /usr/bin/remmina in package remmina contains reference to TMPDIR [buildpaths] Signed-off-by: Khem Raj --- meta-oe/recipes-support/remmina/remmina_1.4.30.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-oe/recipes-support/remmina/remmina_1.4.30.bb b/meta-oe/recipes-support/remmina/remmina_1.4.30.bb index c22eaf1d38..0437fba515 100644 --- a/meta-oe/recipes-support/remmina/remmina_1.4.30.bb +++ b/meta-oe/recipes-support/remmina/remmina_1.4.30.bb @@ -38,6 +38,10 @@ PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" # Switch on gtk support in avahi recipe if you want to enable avahi support PACKAGECONFIG[avahi] = "-DWITH_AVAHI=ON, -DWITH_AVAHI=OFF, avahi" +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/generated/buildflags.h +} + RDEPENDS:${PN} = "bash" FILES:${PN}+= " \ From patchwork Thu May 25 05:47:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 24439 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 A9CB7C7EE2E for ; Thu, 25 May 2023 05:47:16 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web11.5431.1684993635694500018 for ; Wed, 24 May 2023 22:47:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Tizwc0vz; spf=pass (domain: gmail.com, ip: 209.85.215.174, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-51b33c72686so828992a12.1 for ; Wed, 24 May 2023 22:47:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684993635; x=1687585635; 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=D0skwCOyQXTgWH9dRu2ko2Y+ZiUi+ZYNDUnbq620RxE=; b=Tizwc0vzFpu8QL/VFVruVOteBMswqZlminWTGsvTGun21Z7/wMwUt/kCQfXgPEkz1F 49oNvzy9N+ZqmHfOdf0C+frInKlLCGWYjImlpTI7dTRL94qbKSWFSTwBLHWZrkT3LpBQ DZun5CKQwdLOdCkoHJNlXDvyY5wdBzLYz0ys/LaVGNempY6ttVs7WZnUDrhxeimiUkrY IpU4d7YiKuaBC2zsJYWUIS+qN4DuX3FHFOdVNkvNAbiOh9yE5CY9icvS8v+xUtznYLDU L2FuWN+GFrN8Qrca+CXbh7jMH1P48Zqk2su2EdoVhx5DNokrDfc7KISgVc/GgQXlQC1P q7xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684993635; x=1687585635; 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=D0skwCOyQXTgWH9dRu2ko2Y+ZiUi+ZYNDUnbq620RxE=; b=UPgCV5nsjSPv3LQBF/Eu8Y4QI+FJk2PDvK6soenWSYOtx+A5N6izvUERpfUecfRStp Z8LqbYEmLvQekoTEWn8fj44slXYmKp2g6+s8VTiigt92cD1oI9WqKF72pf0DCr3WXPwj h+0tClrJZmLhjunzQ4+TqNVHc1Y1zXjBXcMJwmTT8ckxoq+SIX3kCQ7MRRQVFv41P0F9 tBKCyNnI0DmOHtgXwZ5RfDqqbW4d0gmwoPox8iJPd/g5Ke/TAt33IxrkdMd47W3QckT/ pjgXHQ3MFu48aNDohejiVs2yRuoE9Um5hNirLqQoE/TsIhTQReXF3APoZHijcTTX6GS8 2qhg== X-Gm-Message-State: AC+VfDzkRKytaywgNUhE0qmq1Txv3Sy3m0Y7LB/25o9k5CZKruvzTNqI vS/7eV1SiPNHloE5cdsBkmpsygY+Z+A= X-Google-Smtp-Source: ACHHUZ7dZPu8fPSx+8Uqb3ENxCGUqHm/Awv6N3c8IVR4ebUrLZ1hlbrMnE3p7l8/MZyI/wlRgnegbw== X-Received: by 2002:a17:902:d88f:b0:1ae:2b97:f387 with SMTP id b15-20020a170902d88f00b001ae2b97f387mr450608plz.21.1684993634714; Wed, 24 May 2023 22:47:14 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::c4c0]) by smtp.gmail.com with ESMTPSA id j7-20020a17090276c700b001a6d4ea7301sm441286plt.251.2023.05.24.22.47.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 22:47:14 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/5] cgdb: Fix buildpaths emitted into cgdb binary Date: Wed, 24 May 2023 22:47:09 -0700 Message-Id: <20230525054712.1593592-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230525054712.1593592-1-raj.khem@gmail.com> References: <20230525054712.1593592-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 ; Thu, 25 May 2023 05:47:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102800 Do not add builddir to search paths for cgdb.txt Fixes WARNING: cgdb-0.8.0-r0 do_package_qa: QA Issue: File /usr/bin/cgdb in package cgdb contains reference to TMPDIR [buildpaths] Signed-off-by: Khem Raj --- ...not-search-for-cgdb.txt-in-build-dir.patch | 34 +++++++++++++++++++ meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/cgdb/cgdb/0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch diff --git a/meta-oe/recipes-devtools/cgdb/cgdb/0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch b/meta-oe/recipes-devtools/cgdb/cgdb/0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch new file mode 100644 index 0000000000..989df8ed92 --- /dev/null +++ b/meta-oe/recipes-devtools/cgdb/cgdb/0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch @@ -0,0 +1,34 @@ +From be56e955a32e5e9da0be32008afb8a8ee60e9b56 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 24 May 2023 19:31:23 -0700 +Subject: [PATCH] cgdb: Do not search for cgdb.txt in build dir + +If we do cross builds it encodes the build time workdir here and it wont +be useful to look into this dir since cross-built cgdb may not run on +build host and build workdir will not exist on target + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj +--- + cgdb/interface.cpp | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/cgdb/interface.cpp b/cgdb/interface.cpp +index dc58137..d3aab5e 100644 +--- a/cgdb/interface.cpp ++++ b/cgdb/interface.cpp +@@ -1568,11 +1568,6 @@ void if_display_help(void) + + fs_util_get_path(PKGDATADIR, "cgdb.txt", cgdb_help_file); + +- /* File doesn't exist. Try to find cgdb.txt in the build dir in case +- * the user is running a built cgdb binary directly. */ +- if (!fs_verify_file_exists(cgdb_help_file)) +- fs_util_get_path(TOPBUILDDIR, "doc/cgdb.txt", cgdb_help_file); +- + ret_val = source_set_exec_line(src_viewer, cgdb_help_file, 1, 0); + + if (ret_val == 0) +-- +2.40.1 + diff --git a/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb b/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb index c5a0030823..922dfc7763 100644 --- a/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb +++ b/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb @@ -9,7 +9,8 @@ DEPENDS = "flex-native readline ncurses" inherit autotools texinfo -SRC_URI = "http://cgdb.me/files/${BP}.tar.gz" +SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \ + file://0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch" SRC_URI[sha256sum] = "0d38b524d377257b106bad6d856d8ae3304140e1ee24085343e6ddf1b65811f1" CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2 ac_cv_file__proc_self_status=yes" From patchwork Thu May 25 05:47:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 24437 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 A8DE4C77B73 for ; Thu, 25 May 2023 05:47:16 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.5511.1684993636215031597 for ; Wed, 24 May 2023 22:47:16 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=rGrMigyy; spf=pass (domain: gmail.com, ip: 209.85.210.174, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-64d41763796so1311072b3a.2 for ; Wed, 24 May 2023 22:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684993635; x=1687585635; 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=sKFmJ3BWo5lTvEF2Bg+U2TwxSVSdbM+dkln1Y/yHUgM=; b=rGrMigyypbodHSLcTw0DOxwTWU04Qx8Jxef2lCm96rrUf6O3K5ljAfdW6LtMvf7Is7 MlYkfsVzod3x3yKtmODrBdQjK9lxmZODxcbCXxLjxWMEe8PuhIIFhxEoqnE0B/fejX+L 0iOmxY8EwPYbZl1VdyDNbZEu6MxAd7G5XuvPHiB6XzZgXBTapuoV7fjbAElaShU7mFQ1 NDGXGo9np3Pk7EVd8E1/03C7yQJRDPStvJ64QGgJov3/ixgVQPT8Ca6XNMvMJ9343tGv UGS0qCuWdZwm2+w40MbB5o2XAueQdDEDax114iIqGjH1KgfZ5jGuRpuKlJBZZMnYzfva QLlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684993635; x=1687585635; 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=sKFmJ3BWo5lTvEF2Bg+U2TwxSVSdbM+dkln1Y/yHUgM=; b=FZHLEI8YMDBEG3e3sIpDiR0RuVJuhKsie1TKAMCSDBYSGYa6Jg3etjNdbWKLL3zfow 2d3zFk9qvI7ujp/k6BDqwPTP0BQXFG3s5BXNrvhSSqsXLmBfuLbeG40pvnRg+npvuIQH kRWXgAePVsLSu7klXC9Loy/BCwiHjOiq3jN09dXosGgYLRMBZ7CjOZUMpiBiu0S5cU3b dX0b5a2dk2Ixm62QhjP/CG8fPMXN0F4qCvUaJJ7eAILMtbh2qkoVX69tr5IGTw3thB8f CN00lt89jYbFAR0FlEMS5JF7SM8hN8CqWpcIw8Tb/tsNkj32eMI7XE8lwB7dpE7OFKyx MuCw== X-Gm-Message-State: AC+VfDyL1899OiJFrGxG8YEpT2q0VQulGfi+buyP6Osmcthap8TfDUgy hB776fIypXBG9elur1GGWiYCBHlCZgA= X-Google-Smtp-Source: ACHHUZ65J0ewLYaMuU10DG6TV55FCtlPTY4+DM5yelIde/SRYFlK4zL3CEYtiQfgeMQU/6J7kWKlXw== X-Received: by 2002:a05:6a20:4323:b0:10c:2fce:96cc with SMTP id h35-20020a056a20432300b0010c2fce96ccmr11776076pzk.34.1684993635329; Wed, 24 May 2023 22:47:15 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::c4c0]) by smtp.gmail.com with ESMTPSA id j7-20020a17090276c700b001a6d4ea7301sm441286plt.251.2023.05.24.22.47.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 22:47:15 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][PATCH 3/5] ibus: Point python interpreter to target location Date: Wed, 24 May 2023 22:47:10 -0700 Message-Id: <20230525054712.1593592-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230525054712.1593592-1-raj.khem@gmail.com> References: <20230525054712.1593592-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 ; Thu, 25 May 2023 05:47:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102801 it encoded PYTHON variable during build which otherwise points to python on build host which is not correct for cross compiled packages. Add missing dependency on python3-core which is needed for ibus-setup script to run Signed-off-by: Khem Raj --- meta-gnome/recipes-support/ibus/ibus.bb | 2 +- meta-gnome/recipes-support/ibus/ibus.inc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb index 7156081499..141341e341 100644 --- a/meta-gnome/recipes-support/ibus/ibus.bb +++ b/meta-gnome/recipes-support/ibus/ibus.bb @@ -38,4 +38,4 @@ FILES:${PN} += " \ FILES:${PN}-dev += " \ ${datadir}/gettext \ " - +RDEPENDS:${PN} += "python3-core" diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc index bb662f2ec9..9579404b3e 100644 --- a/meta-gnome/recipes-support/ibus/ibus.inc +++ b/meta-gnome/recipes-support/ibus/ibus.inc @@ -31,6 +31,9 @@ EXTRA_OECONF = " \ --disable-emoji-dict \ --disable-python2 \ " +EXTRA_OECONF:append:class-target = "\ + --with-python=${bindir}/python3 \ +" do_configure:prepend() { touch ${S}/ChangeLog From patchwork Thu May 25 05:47:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 24441 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 9D419C7EE2C for ; Thu, 25 May 2023 05:47:26 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web10.5512.1684993636832980705 for ; Wed, 24 May 2023 22:47:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=B+Sg1qgZ; spf=pass (domain: gmail.com, ip: 209.85.214.180, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1ae5dc9eac4so7883595ad.1 for ; Wed, 24 May 2023 22:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684993636; x=1687585636; 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=i4pUB/Ev4N6YL6c1dLrkgYXnpMZZBaXsfrcdmbaemZk=; b=B+Sg1qgZCq2mrg0vZKuE8n7P8Q7/ifW87OvHwvgZT+2nVvI3IhAA4skRlUAp7ALssh rSk73QO+KraLljoGNyQFqqqwaUYoXL0XqhOpZIe6kXpxGNoTaJFce5O2ToC41SUyA7Z4 fwk25tsWNdoFtvFS9ActaNuUIZiWPav2lfGpdUUrcUmF9/VZvvr7lIV2pEfVzL8FxiQa BLTbu61Jk4R4aAigc6suoytY+IqVLqu/M20zl6Ew8sf8qRQCkfDMqRG+AzAcAofMJgOR oYkRFJxDxKf9Ozb9FqcmYIDlUMJQGnV0RTVe/mnmbM0lzHTChB8ylXiw+oRRs4AzypEk c/cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684993636; x=1687585636; 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=i4pUB/Ev4N6YL6c1dLrkgYXnpMZZBaXsfrcdmbaemZk=; b=E/rqq8+c38dU5WnvtpETOpuu0VlShM8L1/NRjib2cr8KEvDS4T44Ep/b5OQP9qYn3Q TTMEunsJjLc3t5GpL5GJKWSv0hBAiDRU8as7FZ70G+QyFCl4CTtr0ct9RYa+0XqrtWDn zU37QMQS4nNJIXISMxSnANLNhK+CqXaGVtoDIDmT4cvfD4VP8e2ygPtZfj0UZgX7heBY /LcK2BjQ7ta64CLO0NWfhLfLemIhFjeDth8R2TP1VWLjx1lYtxYGI0PY45DpB9VHU30V pg3gnPaPbszgdCKK3MXI3RXPa5KzEfZtMz6qm39A9ewsc8VDLCMOZIN6LZHsE8luCYMm JDVg== X-Gm-Message-State: AC+VfDwOC9pkGFqPUtdahlqLyUcZyJgyeAr9hX/mpJKmV4Y/rmlxl8qw D8N8vl2j6qimhkDluvtgKmMpUhQIVEY= X-Google-Smtp-Source: ACHHUZ7YJjY6jV27a1lIybCDFUBlizs9A1D1jDkAcpsovHzU+MPCTyyBuHhalz8qZHJACsc97UFiFw== X-Received: by 2002:a17:903:2308:b0:1ac:71a7:a1fb with SMTP id d8-20020a170903230800b001ac71a7a1fbmr513783plh.18.1684993635931; Wed, 24 May 2023 22:47:15 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::c4c0]) by smtp.gmail.com with ESMTPSA id j7-20020a17090276c700b001a6d4ea7301sm441286plt.251.2023.05.24.22.47.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 22:47:15 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][PATCH 4/5] eog: Fix absolute src paths in generated files Date: Wed, 24 May 2023 22:47:11 -0700 Message-Id: <20230525054712.1593592-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230525054712.1593592-1-raj.khem@gmail.com> References: <20230525054712.1593592-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 ; Thu, 25 May 2023 05:47:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102802 Fixes WARNING: eog-44.1-r0 do_package_qa: QA Issue: File /usr/src/debug/eog/44.1-r0/src/eog-enum-types.h in package eog-src contains reference to TMPDIR [buildpaths] Signed-off-by: Khem Raj --- .../0001-Replace-filename-with-basename.patch | 48 +++++++++++++++++++ meta-gnome/recipes-gnome/eog/eog_44.1.bb | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch diff --git a/meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch b/meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch new file mode 100644 index 0000000000..26d75780b2 --- /dev/null +++ b/meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch @@ -0,0 +1,48 @@ +From d00edda1f57f904e1590828bea3cedb53d789c48 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 24 May 2023 20:33:59 -0700 +Subject: [PATCH] Replace filename with basename + +This avoids emitting absolute paths into generated sourcecode, it +improves reproducibility. See [1] + +[1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/eog/-/merge_requests/154] +Signed-off-by: Khem Raj +--- + src/eog-enum-types.c.template | 4 ++-- + src/eog-enum-types.h.template | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/eog-enum-types.c.template b/src/eog-enum-types.c.template +index 0249baf..1013dcf 100644 +--- a/src/eog-enum-types.c.template ++++ b/src/eog-enum-types.c.template +@@ -4,8 +4,8 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ +-#include "@filename@" ++/* enumerations from "@basename@" */ ++#include "@basename@" + + /*** END file-production ***/ + +diff --git a/src/eog-enum-types.h.template b/src/eog-enum-types.h.template +index bc3c195..8f4e916 100644 +--- a/src/eog-enum-types.h.template ++++ b/src/eog-enum-types.h.template +@@ -8,7 +8,7 @@ G_BEGIN_DECLS + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* Enumerations from "@filename@" */ ++/* Enumerations from "@basename@" */ + + /*** END file-production ***/ + +-- +2.40.1 + diff --git a/meta-gnome/recipes-gnome/eog/eog_44.1.bb b/meta-gnome/recipes-gnome/eog/eog_44.1.bb index fad7de6b28..95e421c883 100644 --- a/meta-gnome/recipes-gnome/eog/eog_44.1.bb +++ b/meta-gnome/recipes-gnome/eog/eog_44.1.bb @@ -21,6 +21,7 @@ inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg fea REQUIRED_DISTRO_FEATURES = "opengl" +SRC_URI += "file://0001-Replace-filename-with-basename.patch" SRC_URI[archive.sha256sum] = "e2c963f232fe5a1091dcc18bec25a730e91b02af6e466601efa55e500cd74cab" GTKDOC_MESON_OPTION = "gtk_doc" From patchwork Thu May 25 05:47:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 24440 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 9D3B2C77B73 for ; Thu, 25 May 2023 05:47:26 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.5432.1684993637400754207 for ; Wed, 24 May 2023 22:47:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=IC2XXwLT; spf=pass (domain: gmail.com, ip: 209.85.214.174, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1ae507af2e5so4765935ad.1 for ; Wed, 24 May 2023 22:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684993637; x=1687585637; 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=9z9XuXfYHh6aOdx+1IRWoJjYAImixyEY7NbkGMesqzY=; b=IC2XXwLTZm9svAG9dJRJlWpxZtQDu48KIulMXP8oAlHbcbnilft64Xr8xf9qr5rGox Ato/Ky5Uc8uKvpi6g8MQ8sFnlqTFPDkeKIA1hlJrD+ujUBZjhQ//DtNdlDJJ7GMPDygQ J+VF498jK92lYMYrInsE3dw3m3dl6BRaOHJEisRA4MLNUWOkDH8A2ES3NLWvyD9TYhHQ rDK6uY8DC9wE8ZfJ0megYf5Wmc5RKsO8HJSYc6hgDDrYUYqykYaTi4zqojQc6GkGvE9U ZDfOSaDEssMrjj9QheV9AR1r0KVJ8Ah8nqBo6j42CCN2X3PuIsasYRH8uAEKOk7Hh6EW SpjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684993637; x=1687585637; 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=9z9XuXfYHh6aOdx+1IRWoJjYAImixyEY7NbkGMesqzY=; b=I4pn1zUZ+XLYb4/UO8RD0zG213CgfQKi/V51olfjle1kmDDvBiLFBjzCdTfQ6tZ0aN jOAFeEziOu0bCTvdIhkhe43Z/U3ZoPe6Lf9qD/LAJ/IXM/DuPRvMNp0woTS4NYLa+rES I5NYz54I72z3UiN+pHOzZnIDV+UOO/dnoqyz1d3GSxNc33F+lXw0crj1NuAZ5ExNxbp8 k27f8l+7nkbUO0Nwgzz/KUEcJo5JoKY4vWwuMQKJ/eFZIiys07ao32PFSGPx27vTNaO4 LIHXyjj80OGWwUpITSDnJYNrAgUHwSeZhspjNqH5i269+4LGPde7l+VxIqVabx9mN5d9 Y+Jw== X-Gm-Message-State: AC+VfDzQtpznCTptaH4t+9IysoFdTKR1vw7FeEyIORh5w+gJ+bHlUZJb 70UG+Emn5LZTncvQt1oXHgBM9XIWiz8= X-Google-Smtp-Source: ACHHUZ6kBzCW80GLVgRbgyNxn2U3+ei5Dnhof5tIoeU+qQvr1490cR01vn2cv01xhb6U7Q/xIx3NkA== X-Received: by 2002:a17:902:ea0d:b0:1ad:b5ed:e951 with SMTP id s13-20020a170902ea0d00b001adb5ede951mr367799plg.13.1684993636520; Wed, 24 May 2023 22:47:16 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::c4c0]) by smtp.gmail.com with ESMTPSA id j7-20020a17090276c700b001a6d4ea7301sm441286plt.251.2023.05.24.22.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 22:47:16 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][PATCH 5/5] gimp: Fix buildpaths in binaries and scripts Date: Wed, 24 May 2023 22:47:12 -0700 Message-Id: <20230525054712.1593592-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230525054712.1593592-1-raj.khem@gmail.com> References: <20230525054712.1593592-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 ; Thu, 25 May 2023 05:47:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102803 Fixes WARNING: gimp-2.10.34-r0 do_package_qa: QA Issue: File /usr/libexec/gimp-debug-tool-2.0 in package gimp contains reference to TMPDIR File /usr/bin/gimp-console-2.10 in package gimp contains reference to TMPDIR File /usr/bin/gimptool-2.0 in package gimp contains reference to TMPDIR File /usr/bin/gimp-2.10 in package gimp contains reference to TMPDIR [buildpaths] Signed-off-by: Khem Raj --- ...irst-line-of-compiler-version-string.patch | 30 ++++++++++++++++ ...dd-build-time-library-paths-to-LD_LI.patch | 34 +++++++++++++++++++ meta-gnome/recipes-gimp/gimp/gimp_2.10.34.bb | 4 ++- 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch create mode 100644 meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch new file mode 100644 index 0000000000..618b4cc7a7 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch @@ -0,0 +1,30 @@ +From 5711ccfab40e304ced7f5be39a4083e3fcecff91 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 24 May 2023 22:22:41 -0700 +Subject: [PATCH] configure: Keep first line of compiler version string + +Full output of cc -v may contain additional information which could +contain build path information, which is unnessasary + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/926] +Signed-off-by: Khem Raj +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c25415d..68707a0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -599,7 +599,7 @@ fi + for CC_VERSION_OPT in $CC_VERSION_OPTS; do + # We run $CC, and escape and format its output, in a single step, + # since some shells expand escape sequences in "echo" arguments. +- CC_VERSION="`$CC $CC_VERSION_OPT 2>&1 | sed -e 's/\\\\/\\\\\\\\\\\\\\\\/g;s/^/\\\\t/;s/$/\\\\n/' | tr -d '\n'`" ++ CC_VERSION="`$CC $CC_VERSION_OPT 2>&1 | head -1 | sed -e 's/\\\\/\\\\\\\\\\\\\\\\/g;s/^/\\\\t/;s/$/\\\\n/' | tr -d '\n'`" + if test $? -eq 0; then + break + fi +-- +2.40.1 + diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch new file mode 100644 index 0000000000..cec0055284 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch @@ -0,0 +1,34 @@ +From c720df90dfe3a3e92e34bfb36a04cc792064a501 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 24 May 2023 22:39:02 -0700 +Subject: [PATCH] libtool: Do not add build time library paths to + LD_LIBRARY_PATH + +This does not serve much purpose on cross builds as it will add build +time paths which are only useful when trying to run these tools from +build area but when they are cross built this is not possible to run +them like this. + +Upstream-Status: Inappropriate [Cross-compile specific] + +Signed-off-by: Khem Raj +--- + ltmain.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 134902c..068d74a 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -5748,7 +5748,7 @@ func_exec_program () + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var +- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" ++ $shlibpath_var=\"$shlibpath_var\" + + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed +-- +2.40.1 + diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.34.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.34.bb index 76825d96c5..7343036807 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.34.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.34.bb @@ -43,7 +43,9 @@ REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" -SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" +SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \ + file://0001-configure-Keep-first-line-of-compiler-version-string.patch \ + file://0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch" SRC_URI[sha256sum] = "84004642d351b398a4293cd7fd3592044a944f05bb52850ee6068f247c657aa3" EXTRA_OECONF = "--disable-python \