From patchwork Wed Aug 6 11:52:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4233 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 7EE763F165 for ; Wed, 6 Aug 2025 13:53:23 +0200 (CEST) Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3b782c29be3sf3872376f8f.0 for ; Wed, 06 Aug 2025 04:53:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1754481203; cv=pass; d=google.com; s=arc-20240605; b=D5sV5ZP29yd5/CsotLYU10OSnIeef63dRXND22ln5n+HcCbmnKlDiD+r4arh6HlTPa lDyZoT+sUVCd0bg6ozuprAm61hSsozW/7Hz9AToEF8n1dM4qawHEViIS+jQHcj/EVz/k o+gQXRimDJLtYC1kQjyn+IDiaKoW/cD6xpX+qXHtZ2ZodkGaQJPSMB95TdJZrtX4KXlK XvHBJ+TwmMiuTSPFEzr2z1KFD5bWemNzdjYv4V0o6ftxDunczMUYq8gCpZpNBlLUZ8M0 tRyoU7UCQrsDAanHGivPWV5iKKpqN2/o/zu6vKKeSc2jvax4HmktHDVqXD7GM9KY3qd4 Y5rg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ty04nsLHKcBuZL10wkvGXXCupv9CJ0ObWmCiAPSMxKg=; fh=X4R6lOJsZ9CkxCqnQZwyVaMQqggMD+/63jb3LsXI49E=; b=eigNcmQv1RGbQIQq5Q06Y30pBsMPfZM0hsISetzS+rkjlvvRF9w+4AkMvyaGmf5/QD UDvgyNZk89iuOicBpenKNtTbYDMgoRX9wdigRu0xl2Td2dsCw+lJLKAyowKJ1MLwKRm5 chj+wUIfs7ov45QrNLbKYoMYWH6nO7LRS9v0SEDk6Zk04CvnC/bkHPWu3Jw6bIetZWZK 0T5cJsFrSfgjcL54jEqnpZT8I1sLPYFDZ6hJ6x3Yjio+SDeHKNcreDLvCKQnEblgjuVa D39f1Gyx+ZmVx1ymbKPspZ4Qx1LD/k55etqkwOrCiMguy7ZKoTiJVaeYpgLYGNtW1OvJ f+mg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HFComnKZ; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1754481203; x=1755086003; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=ty04nsLHKcBuZL10wkvGXXCupv9CJ0ObWmCiAPSMxKg=; b=Yn7t8GHyP2xbxZQMzD3OCECcWjO7oD9y6ZG6nT+36Dr3RTpajCf7Vh9l7iEWsi9q0A FeRin1QI2RNOMRUTiNAcHBSQFM/UE2b2ypHGVXeGYXGmtWVX5izb2zgNy2Sn/qjqwAyK 0eQNKEv2P6rsO51YaGn6eMZdblbfWBcr8SBDQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754481203; x=1755086003; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ty04nsLHKcBuZL10wkvGXXCupv9CJ0ObWmCiAPSMxKg=; b=YmnJDlqS+S+3ZxqFremA3xEYe6yRNCVcoHYr9psj/mQ9JIS/RkazKt5ZMTN99sG9GD OM7tWMuSXXBpDnijK3Pf+1Vfn89Q2eFNnD0xzTkzDYLGyyvcyvog6Mc88hIXKwDr7NVi L5U5JGBCPNolhIyBc/L9IDdTHRL421uSNtWg+IjssrAeJ/09y0e+ENqfXcAz0g1uZ2O7 J0E1A+KceFm8RQfiC+8t29NiMDEwgWNJjS2JpL/SbFqen+8EoctALi7rTgF1foz7NiiQ LX8tJ5kKKeDdmeE7RAbSOKWA9Nn9gg7Hf2l4D3aWEOtUOfH/84samnl6+Ha13oXAtvkW RGHg== X-Forwarded-Encrypted: i=2; AJvYcCXtCa7QAyfj8s51XVzybRBJ5+VekFX3fJSheh//3P7PsoaLGldQmZ0I2NQjlTbTynSTYvFxLi1DrUrY7bNt@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YzsM9edCkBsKWbBYCKQvU3ems8I82Hu9BAZIuvvXJnZbecLSRSe pxQ8lgFSAh1A9fB+KeO3oEJ/W7rzIjUy4cZHw/qsUi4rtBIZn3V43WOKGbpfoK4bWibdjA== X-Google-Smtp-Source: AGHT+IF7a99XU0wRucoAVndP5cmr65PbQfd3UR56mY64Qywlt9nkv/P1XKE/f2YMvDx5KMW8XWYIHg== X-Received: by 2002:a05:6000:4020:b0:3a4:e7d3:bd9c with SMTP id ffacd0b85a97d-3b8f4161da8mr2023942f8f.17.1754481203059; Wed, 06 Aug 2025 04:53:23 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZfxNCuUUDXpTDe90palMEalJVJVTBbBQaW7F2ZMA3T/Cg== Received: by 2002:a05:6000:2892:b0:3a4:eed9:752c with SMTP id ffacd0b85a97d-3b79c3f99d6ls2887663f8f.2.-pod-prod-05-eu; Wed, 06 Aug 2025 04:53:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX7QMZ2qBPSuuTX49opXToRMspjnyFHpsqkkS3vz1Xskzxe1czIm7G1EDnKsvoNc1tw6HAJtlp2GsOb8c57@amarulasolutions.com X-Received: by 2002:a5d:64e8:0:b0:3b8:d955:5382 with SMTP id ffacd0b85a97d-3b8f419bdcemr2130791f8f.32.1754481200507; Wed, 06 Aug 2025 04:53:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1754481200; cv=none; d=google.com; s=arc-20240605; b=hQNUorcKprQZUbsaBGoMLpG+IY2Q5pQPyTjp25uOlWUqHAkgZyu5Bmu5Ov/f3oxEkA 4r6Yd3I4U4It1qIVD7aE0q6gLHX9xJ2uvAZCAmAJP4Wr1PvSeSRaOItVL5RGFJSywFZY OOn0uOji0EDo+ij6FiXkFiqdZwU8X2xqw3Y/OQJmA92e5WS69yjfzsIUVAeXLxq5kDHr Umcd/Z+7eNvQzELcGWXVDZbQwmMa3bnk+T3ZgeRtKeGpfYzxq5hItB+zgf90YJ6/hZJR 30Y+32Gm882eRSHJQsIQwRLVfNnbh4I4c2BfR6m/c7cTLLVXOVI2p9OTVtefgb1Y90mv SqMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=dmWSYwXOcPmSXa8Lu26abcCknd4OLA+/OVCekEU4hHg=; fh=eernEyErBY3IM1zKSoirNITJqj8C9xIzgoV3I95wPco=; b=S4PprLTnnqj/M6L9pE9w97peWofeyLi1IlqDQsUz0VQdSf7or63v/HV/Q22P9p0u2d 1y4D0XjGhkFDYkFn7j+Oi0Ys7JTR4LiKRYbaCfaDGcjKuf+AsA9gZQFfRut7yzAySvts EI+q8BKAi9KETiLt09s7vzrzO121pQVpC4h+AaXQlwUfXf4RJLMuN8SPZV9eXWTFWxgo OsTUbc2Xzv71QwaexQ11DnCTbgMJpP33kv1vDw/0BM7g5P/jm8WIOk6tA2vBTNEdlfnw EQSimBouEnWef/eoCPrCsfb5bcvzkrPYQZlX4u0sufazyuKPYYVBLX/ElpxXwdVo9vsn WBJg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HFComnKZ; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-458a993df19sor70880305e9.2.2025.08.06.04.53.20 for (Google Transport Security); Wed, 06 Aug 2025 04:53:20 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCUnAHEXmy+m5YgcC6GZu9tS2YgSQ0FPHL0iLO2iX8ufMyK0DtVxPjG/VTigr4tc1gZ9asLm03O6+bQCVetp@amarulasolutions.com X-Gm-Gg: ASbGncsbLcGhxjBUqDcqKAT+ITDa6gcxA3rfi1V1esJ8W8lVWpgFvZtfuas7UTWTWov 8rRY+b7OPf3Xv6qIKsmeyDwx2ylt47TPvVlxpZ+QixC38i43Y/4r9tS+GLYf5rCF2vwycPDbHrs ibGD/rIvorvDbZS7IbeTJ8wlO1MRrtQp7MDfBVeUMzmIFoOjf3CfQkLOz1UIdr+MH4EusU5eIdY Z2ZwUJJU9bHX06VfvGoUVi+JPO2aSpiUhoR9sF+WilVXhd3glxZnP83arzqD2E/5L/EzYjraa+L gogAy7JEgDv9D1tJrIHLhjUClni2KDYwtcvfjofLTPPo+jHl19gZDs9SvdMC2rlPMf0qDDTW3Ac x6ordw98MG3tuBMtqwiXDgOJnEYBnrfKb7+lQzBYP9jusXFvZsNRshc/onC8sAZ90bmKmxcsYFe Yp/YMmxkBiURIH8/aSI+YyB4B47hiI X-Received: by 2002:a05:600c:a342:b0:459:e3a1:a0c4 with SMTP id 5b1f17b1804b1-459e70f63cfmr25010995e9.30.1754481200076; Wed, 06 Aug 2025 04:53:20 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2001:b07:6474:ebbf:3f96:8759:f916:8982]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459c58ed07fsm142606555e9.22.2025.08.06.04.53.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 04:53:19 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , linux-amarula@amarulasolutions.com, Angelo Compagnucci , Giuseppe D'Angelo , Dario Binacchi Subject: [RFC PATCH 4/4] package/qwt: enable build with Qt6 Date: Wed, 6 Aug 2025 13:52:19 +0200 Message-ID: <20250806115219.3307438-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250806115219.3307438-1-dario.binacchi@amarulasolutions.com> References: <20250806115219.3307438-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HFComnKZ; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Version 6.3.0 added support for Qt6, so enable building Qwt with Qt6 as well. Signed-off-by: Dario Binacchi --- package/qwt/Config.in | 22 ++++++++++++++-------- package/qwt/qwt.mk | 4 ++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/package/qwt/Config.in b/package/qwt/Config.in index 736ccc2a5ea5..c816b48a0851 100644 --- a/package/qwt/Config.in +++ b/package/qwt/Config.in @@ -1,9 +1,13 @@ config BR2_PACKAGE_QWT bool "qwt" - depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE_GUI - select BR2_PACKAGE_QT5BASE_WIDGETS # printsupport - select BR2_PACKAGE_QT5BASE_CONCURRENT + depends on BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 # printsupport + select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE_GUI if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_WIDGETS if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_PRINTSUPPORT if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_CONCURRENT if BR2_PACKAGE_QT6 help Qwt is a graphics extension to the Qt GUI application framework. It provides a 2D plotting widget and more. @@ -14,15 +18,17 @@ if BR2_PACKAGE_QWT config BR2_PACKAGE_QWT_SVG bool "SVG support" - select BR2_PACKAGE_QT5SVG + select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6SVG if BR2_PACKAGE_QT6 config BR2_PACKAGE_QWT_MATHML bool "MathML support" config BR2_PACKAGE_QWT_OPENGL bool "OpenGL support" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - select BR2_PACKAGE_QT5BASE_OPENGL - select BR2_PACKAGE_QT5BASE_OPENGL_LIB + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6 endif diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index 67292ee025be..0e835c700e16 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -18,8 +18,12 @@ QWT_CONFIG += -e 's%/features%/mkspecs/features%' ifeq ($(BR2_PACKAGE_QWT_SVG),y) QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/' +ifeq ($(BR2_PACKAGE_QT5),y) QWT_DEPENDENCIES += qt5svg else +QWT_DEPENDENCIES += qt6svg +endif +else QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/' endif