From patchwork Wed Aug 13 19:26:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4242 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 7AB6040D6F for ; Wed, 13 Aug 2025 21:26:28 +0200 (CEST) Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-afcb790fcfdsf11876966b.1 for ; Wed, 13 Aug 2025 12:26:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755113188; cv=pass; d=google.com; s=arc-20240605; b=lQZ71Xs0v467GdFdnEFiFUx0b4fobcStu8o4mi4y/cfQt3Rw6kH2B0Q9hDuyjSZtea S0Gz0mILmKAsl4Cfk6y/1eL68DhmWSugLJjhxkfQDoGjaFVzkV0cdtAZo75sr+k+BqYY qFbvGxhYHuZE6/mBMOnQyXFrl4bXWcaY4GN2g/sFG37mqnNm1OCf+cu+nGcJcXP6BqdZ q9EtNv3E9DBQBm+BxJha6mE3uJTPhUDIR7joFeF1mYpmz4EdO6hHo2gj0dL9HDyckk7K nQMWIck3F93k5uoPlQ5r7B3Wk8f+tkW/L74TeEhN9V/1cemcsQu2Zk0xl28XtTaDOhY4 jBgg== 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=rGvuQl8E8faL5/lCzf39cDRu6zxiLEdjN9OkpCfrJMM=; b=DEgDspwBgdbGJyK8vpUojJtVyHCwhg82QnE3x9la//23MBwBPwf6f5h/9gd6ugzJYo rVDtwd6mpjf0HUiEd364EM3aMw6W4rxh9qsNX4ZFO/xB7QkVFM5zH6yiSe4/xXSPwO9r xPUsmq+LyuSVBDtJnKkC/YfB5HWfitHcDwsTuxMxQXTjGjmFFZwX6kg+/+ciLHUniUzj OOwtckO7JOfQYKxWbiMWuBeBjheG6XJqiG6GXkAAHovcu4jiv1ZmoOFM7CoVCIQLUKS/ 5BujGEIV9NIiHOvqw8IFhCY7r8sNsPDbqnTNAAG1oDQ0PNRWuEsBDgjz/rYyO4bs/KJ7 D6Lw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KYyBaigH; 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=1755113188; x=1755717988; 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=Bjcrs+aieZrdDKjRFkWL4zPaLF2A2f8zivOVAHlJWTaJ/aXlGssboSwXU9YSMMHESj NpwRWEjNSluvsLaYV6Ac/7Py+Iad1lKJFlQrHbuU+Kmhw+aQNdaiWS5O9EwJF1Dj5KoX idtglzGa400yKifxDtpx2Se3TmHa82eJ2Lv5g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755113188; x=1755717988; 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=MDVoIzzPjgBxQM8b8SKGwGROeCma7bTiay5fuYg5pjT1v1WD0XefUz7GAJJwt9Pm63 WMAHVcWH8entA/CmVQ90C+Ef67UcoVKhpXzjRVeWv16mj1dHmgRhG7afamLgHTauRf4s u50IaHPNMvNExfwUa+kCKF4ldP3iURpHetgbV5DrPUh506hxPzcWKN0lQ14i6bU8LW0J eUmx2GwbUR0KDmtCvSlYWr5QIj4mRmmi7FbBou3NKkG5B43AaeWGjRkIqcuiAbBmlBj2 TjxGhekeMZpnSVFHr9DKYcj73tD1p5DCPdQ5wn8JVRP044NNBjX+pwDxC8jgefGccKKu yA0A== X-Forwarded-Encrypted: i=2; AJvYcCXZc/nySLtM+nfSxAmvlzc6Ij9ux63BvXk5kswC581XyuhxRnD/KtsKgZ4A2eVutnY7JbnOpeVJxyduQnz2@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Yz0mI1iyIm7hHVaGiPEFkNj0ONnXH/jpYJCEiaSqPaza37MBfcQ ToptWTudxYGIo8oJbdkBY17Us4OKJ5n3kRIHWNEDuTD/2v5B1bgyKJIyrG3vpV65NhECrg== X-Google-Smtp-Source: AGHT+IFIOrz/9stSEj80Kuzj1TkRwAwHDvF+9I6ftrNRDYM59+nN95x1YWRkZSoORy1laJJDAbU44w== X-Received: by 2002:a17:907:6d16:b0:af9:e1f0:cd30 with SMTP id a640c23a62f3a-afcb99dd8cemr32474266b.60.1755113188048; Wed, 13 Aug 2025 12:26:28 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZc1HzRwOsjjnST27S6RKOJMr3UPbaUlP9L/bW+veRoOBg== Received: by 2002:a05:6402:4389:b0:618:10c3:d7ca with SMTP id 4fb4d7f45d1cf-618899fece4ls118339a12.0.-pod-prod-05-eu; Wed, 13 Aug 2025 12:26:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXgkVoewfux5P3Ilalhz85odqDkdBIgVtYJsy7XLAEQqYYQUk4n4KG3aYuqMOeXJ2t4MFg8PePSkZecYk6C@amarulasolutions.com X-Received: by 2002:a17:906:f58c:b0:adf:7740:9284 with SMTP id a640c23a62f3a-afcb99a1663mr33427466b.57.1755113185604; Wed, 13 Aug 2025 12:26:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755113185; cv=none; d=google.com; s=arc-20240605; b=CgP3DUj00c6m0uGFtOs0AbTGLQuK4k8MUWiMiNOLNbFnLqGLUbEHQ8qC0V3O/Kadpy Vs6wKuUebdaAPI1TGGskbIQLjNt5T2u1O9+KWIrFU/giDGWyyzKEsJ46Fccvd9uzhla8 ZrhcAbB0nFEwJoprbB/xG4Co+7VsyItCJmOTCKn3SceGMBuG4ex8Os0OSj6hdGFXOvp+ UpuroT01QTJkPunXZkPmM2eNB1VgRM0MvgzLKmiFioAH3bJT/9HeMdzSCDvv1oc+YDT+ wkEAAFirv4iEMTwaLIJJBHoQEHqzu/cCUriMUCqyg9N1Qeg/mxYCB4aYGMdis2AKzbPc 9o3A== 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=Z/nTetMZqW/n6FrDl72W00WUVCgxu6gUaI48P6tBysk=; b=lwjQKPDOruF+mVdEBaxgmaPpWPSjHuq2UscSH69l+VTfZmKiag0sx1Wg/36N5cGmI7 eXNKyiZfEqB1v7syP6UdzvdWJM1s2gQtW0PJgVP+sT8SqIoz2BxWOJYK0x63T4yHQi4t i81Fx4aVGCm8+8M5M/2hA0XEWJiwL7dtCw6/2iihb/yl/J5oyH+E/mcaKT5RuFCOb299 iEQsPmlow3atHeb+xGDGo4TQAViD1FluZQ3kscMdnUMy5UuYABbWWNOrHwClRSo/A6AB nGJ3rIjXXtVEgD/U6/foL4sNmPPLhaHQ/0qbhOzKblqW5HjQtfsbRQHCgAu+q80bPWtX piiQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KYyBaigH; 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-af994171aaasor696152766b.1.2025.08.13.12.26.25 for (Google Transport Security); Wed, 13 Aug 2025 12:26:25 -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; AJvYcCVao59kX56OhN7n1ZyuWIbpy+1dYjH0PsI6PlxivJjiMXLsA8W02xRv8qFUFFyjrCTcgnOHYk/aL3y8nI5O@amarulasolutions.com X-Gm-Gg: ASbGncsOgL5abtMxWGWGt4XvpN4jONn4ydI3ae7tHNrnmEd3BtK3eOPx/JveDET42cv irGSv1Gmp1s6Qws40vlmLcTzHd/yzn4Qe5SuDBDlxvBwz0ddHvOOsj0lgBjG5nc12gl0acsgGL7 LVNaQ4r+Exypxwt5bq7A9IF8HInvxrVNuEQ9eGXCmL4dQ/osVokkqouxRHgNug/0ZT/jbUvVXUH aivkppw+OiaIMpeVU962vO0HDsEecH1ZKMCXXSdHwAB0pLP2P+qUpoCFu3vd7ERa4USe9Aixxbf 02/9y7ZqxGLWsTOviUbYdiv3yQKOpTfKpyWBAgcEfid56U4S6HEvjqm8nmXjfUwmcCQUyj28D/1 JxGURzh6EVkF/cTqhigY3/6g6Kzjcp3LVqru02ru2CcDPPzShdJH4yIHHEncha66/6eZMPAtm6Z FOYLHKI8zciN+g X-Received: by 2002:a17:907:6e91:b0:af9:b4e9:8677 with SMTP id a640c23a62f3a-afcb99238c0mr31670566b.40.1755113185047; Wed, 13 Aug 2025 12:26:25 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.fritz.box ([2001:871:248:acda:3fd1:eaf1:73ac:376f]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-af91a0df10asm2453396166b.59.2025.08.13.12.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Aug 2025 12:26:24 -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 , Dario Binacchi Subject: [RFC v2 4/5] package/qwt: enable build with Qt6 Date: Wed, 13 Aug 2025 21:26:04 +0200 Message-ID: <20250813192605.1540321-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250813192605.1540321-1-dario.binacchi@amarulasolutions.com> References: <20250813192605.1540321-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=KYyBaigH; 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