From patchwork Mon Sep 1 20:32:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4264 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 2EE3C40CE8 for ; Mon, 1 Sep 2025 22:32:53 +0200 (CEST) Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-afcb732ec92sf414860666b.0 for ; Mon, 01 Sep 2025 13:32:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1756758773; cv=pass; d=google.com; s=arc-20240605; b=cJn9+PUGyILJ3aC3eOCQSzc5SVmHI4lMIZo+YjPqm2AQN8nbQ3IGYtN1H7f75j8LmO eo1qocAbaZk1VgdIjpPcngYuberJj2ijCplQ0uw31R/TBmKlUKhAMPm88Qp/ntnrX8h4 eBUYzqJjW1BLoWmxtsEtnZFLY0SAHCXLFejsEpeGnkqbIVoWkdAsrDBjUeL8sYSiTN0n RxCxCJQfmSNlwhq841aMcpMj7WCpryDFmHpaDR+06Ws0Q9fAg7hzp9iNFFj5EykBvknC DgulnafFs5adUOSwDZQWwzHvJ+/TuYFEijTe2KqhPN1JmCaDbMNsHaztRkupxy/JFj2q hQIg== 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=vf+a9u2L+FoM7qtCxVtSl7HARjVTkt0vRcQd6E9d2TQ=; fh=4j1d/QtDwCl4p5o468r2nnW72yBHVB0RHmWbHHXXZME=; b=Z/yYQ0iO6EsdD7Sx81zwff9vhnUZzPTZO8mXfH9MKwlw8jZk+U8SU1ruv0n/lyiq9S eetIPwyq90txN8E0zA7F6sit0ZsOpF4aY/cWZB9mEOgURsxpTGiZ0vNkd2xeRM8JdsBn cpiLl9rkOXZj2iQrvlyo9tPCcRv2N8M6jwlG+sgG6s8BzbaNZhwR8HewJUlPrR5gHEBx vSLERVYoxdsX4hu54mlv8c4M0bHcElyb9znQRi0AIz64tvsjihGASHMWMFfeEzIoNcOZ 4teDdqH8rXJFX2/Ox/DG0C3Cqs91iHylf2RT7nkcB2W1YwWrYWzf0BT3/r7z2MNa82mJ 5BDA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=N1r25v3v; 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=1756758773; x=1757363573; 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=vf+a9u2L+FoM7qtCxVtSl7HARjVTkt0vRcQd6E9d2TQ=; b=nglrExicwJulCUFDClmwUPV48IRCAaZKvAzyVNpqjiLAJszrK33SJ0gMaGBZWb3soH 3WkbAYF1p+ARBis5/AQzfCeMUWmK7+FBU1Gw7qjAwMe71zVZH2Ao7WUq6VkhJ39q1OhG deOOPYgg6E9pEGeiCQ1Dt1rkUEDSIf52gcgZ0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756758773; x=1757363573; 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=vf+a9u2L+FoM7qtCxVtSl7HARjVTkt0vRcQd6E9d2TQ=; b=h+X0+rG06oBatRRHsSRWUieXM9R2TKVDDmpXcsjPE/rCFks/RjPejWeSZlU3AsYQrD 8r+M8xLR52Ju1YDtzW/9BIV/7Desl7MmWHBhJWGHHc5Rc7YRnrJ3vkB1HNRMQcoS08lr xl6mfCcgd4X7yhV4a9OIgEUXof2YoNKStB5R2845ckOOO5OP7NnVMZQHrOMbaWlPLAi7 ArJA2ZR993qO0P34XPyXqgIndcCDHh+2NHTWNkYdqyAAVLUuEeiInaaKjb5Bdkj42mD/ q30JKYw8i2+vEWvzXLxK7Vu4TN8mTS+nKkQsybEGWoVfBSLWzYXImAY85C2X3kiGfES3 Ir3A== X-Forwarded-Encrypted: i=2; AJvYcCW/oxufLxfkhfdSGkHJdSqqX8TfyhWryKHHamuyuVRmM3LnLReXtIS98VyKxv4hnRWjbAKDwhQVPsQVRqnF@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Yye+69ZtE7WzFie7gDg0hVkBqhiGCqbSCdJ38hxI6rUoJ2sMidQ NZD/k40wwz7XVMQ4njzWGynoDUvWzLpZrPzQkRm6epBBx9bwkMhE8WG3VQANlcJq2VpMVQ== X-Google-Smtp-Source: AGHT+IE8JfSsk2I1liWqgSpg/Kdr0j9ReZbyzQEE4tmn2F9Olw6cstiGZNQ7+rQFqcF7cLvhxUoC1Q== X-Received: by 2002:a17:906:478d:b0:b04:2e62:f7cc with SMTP id a640c23a62f3a-b042e62fee0mr430818166b.6.1756758772797; Mon, 01 Sep 2025 13:32:52 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZc5IbWbbAEhPnvTK+QueymzBdLZ+puvZtnfz6v7La0UqA== Received: by 2002:a05:6402:220b:b0:61c:5b2a:acc2 with SMTP id 4fb4d7f45d1cf-61cd3f56025ls4411948a12.1.-pod-prod-06-eu; Mon, 01 Sep 2025 13:32:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXDKEsV7hreUyiTlp1yFk/aRcurj5ir+Af2+PHsOd3ph3aAxbSOlDK5N5atQOdSAXS9yV1ZnFAt1dhBg0WM@amarulasolutions.com X-Received: by 2002:a17:907:a07:b0:afe:dd76:7cd7 with SMTP id a640c23a62f3a-b01d8a266c2mr972424566b.4.1756758770423; Mon, 01 Sep 2025 13:32:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1756758770; cv=none; d=google.com; s=arc-20240605; b=HHdzxUKePMFlGkiiyd7Hp9VZOKHucV8Zlv6qK+m4x3snE+pnc7kChYNcpEqjMDWc/L frjFdf/+8G2EyJX8lkJnttU4WB3aNyeSdLAR4NKyNGH94JtL5mcd3fKTL5Pks0lfPmcM ugAsZvksMrQyKGDxv/QVQWQpfxHce65uviCtiCh5zvvdut0UWW1DYjmTYX9ut8ZneIMx +ItKSdFhkyFwuRtwQFCF1FLR9FDRaOE+iuVGywG2acHfKDRP8eFISUEp2chfRIrjB/As k/FE8a7Ndl6BaqnB4nFIrorPzr0wSlXpdANlhWnDSXSgcODKz39lnmzR73YQfUDbZMMw KzWA== 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=D81YniUm0d5I2fh0KwtxE7j/KmEcZkOvoWFi71EYJBU=; fh=p/uEIFl0AClXeQi5ubTbMkpjo0PbPPtwUixX7M4QnDk=; b=ggkOkLSZAnY/TTKvSeftnooyB2hPaETEf9ssLAlvm4DCCqIUPGMut7PPwGTvox473g IY0acmqwAEkXvrAMVLb5wUfiypR6WZW1/PScfcOvFCaTQZqSmbaPCtkEMjxMaLdu89g8 Edk533wI2G/NOVC3CDcN4Jh9yh/Bj2OJzSaH6XEOJ0I652Mhf7ZfDe/zC7tCRghUOISd 6o94cHXkxzxax7ClePwhGvrEtY9qlDWkMrkhnIltcdBL6hXnVkSwLc/RGoInTS+ObF2g +pVUn8MYqT/c0sLnDJONHwmE6kVzSX8RlSPs8iM5yMNu3WBpgaTW/OT1bhShUzkyQ7zB smUg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=N1r25v3v; 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 a640c23a62f3a-b0422d904aesor161120966b.9.2025.09.01.13.32.50 for (Google Transport Security); Mon, 01 Sep 2025 13:32:50 -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; AJvYcCUGnqv8ZB0zZTdo7AH1Z45aJL8SJo8NZ5oAU+V1hqMYFrecA2bnq6xp1LV1N0SZIeFr2POBBQ9GAd6QPgPP@amarulasolutions.com X-Gm-Gg: ASbGnctfb/SEfOsGyNvRbg39WgRT7VNKqlDQoWuvtexbyDsJxZ3FLmElLTL/4VGhyQ2 Oqn+LLuAUqP+JxMTF8HWR34mxLyFtMedRVbDD+8tfB3Y26PjosM+NCM8lK54lPa63c93k7A+0FL x7Z1NMj1VJJ7rgtApd43sUXIG5eiIiaZH63uWI1LukdJtAdz40UB/FmaQhL5k476w7QyYMJN4IF 5GZvf8OnLpmZveljd7pDOWOCDn33e07hv5kBIz7sxlVEMOuV7rXzItJ6XYAqlVqi0C6lOGkBEsG kJzVWplwVleAj5Bb0f5Di66NWSFGO/+rvKD4Q1BBeSUXUCiE/AvtNaAVVzPOOfDjAdt0zC8mOSS a2K7WoqR5rXl3vJ1XqupQ7tIOkwtr0LGgNEmmDQAHh/WtwS2K7GDzx/vKLKpVDVm1ATL5uwnpkm UVQlCrsUL/Yg1FfHHWk4E0u7pN60URGJyO X-Received: by 2002:a17:907:720f:b0:afe:c1e4:5561 with SMTP id a640c23a62f3a-b01d8c802bcmr933337366b.25.1756758769977; Mon, 01 Sep 2025 13:32:49 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.43.39]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b0411bf1b09sm553530166b.79.2025.09.01.13.32.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Sep 2025 13:32:49 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , linux-amarula@amarulasolutions.com, Andrea Ricchi , Giuseppe D'Angelo , Richard Genoud , Dario Binacchi Subject: [RFC v4 4/5] package/qwt: enable build with Qt6 Date: Mon, 1 Sep 2025 22:32:09 +0200 Message-ID: <20250901203210.804061-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250901203210.804061-1-dario.binacchi@amarulasolutions.com> References: <20250901203210.804061-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=N1r25v3v; 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 --- (no changes since v1) 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