From patchwork Thu Aug 14 15:32:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4248 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E1F4641EE7 for ; Thu, 14 Aug 2025 17:33:27 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-6188b653d69sf928512a12.1 for ; Thu, 14 Aug 2025 08:33:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755185607; cv=pass; d=google.com; s=arc-20240605; b=bX1k8nXi8IN1fXOFhEuELOBo2SIJyCtb73J1JwU8lvY0WBE0+ulPuC3TxtgN0G47ap aWfPjSNlBCDx09JulfMh42FtIMIy9oSNCXpRNreqneg526a3Pva7tJRIUALAwlFNdfbe +6sQicfWYQypwzSCk22o7orslgd9QTK6XhtP0PncZtzGMmdXWWdANNQlmR6cCTbKVAwm 67xEhX3tPS8F9N3yajWsSYPaGQskh96NgAirHK5v/z6hzA+Gjf8hfKMOUzQAjUfMyekt WihH8hV4H2QQ2OwXc/88fTuin7yCD6NagmkQqIwGf48ux6+XVfSHZJasS/1qgIlqSjdK lZ9g== 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=qTxkTCJ6AGZMVTSlAr4rGippUxsY/mS5E1xQOfrT6K0=; b=lqs9AAHcaYBBgT+XMnU0H6CxwpX4f4nadw7/7To27ofW+fnAOJGNnNJemlGWWezfV6 AjEsBTplQAH9bJ8GST1ACSJXNkaAIWRByDVsvxG5o7KqdI7SBUfozx1HmtpKYkof6z38 Urwb5ocDGv2llmbPK8weLoGTGvQ8bNB9U1A4fAT0ZOYchuzIqseFtCd/+HASo41j/aDX qDO9X3Yn0nWTD9KR0ZlX2GQhG4ih1/CzfKHBlyjVR/A70qfvMbm34zfRj8YqCA7gBA0t KraBBLFIM2mWmYRdS4Pz0XVxJo3G70lIovK0fb4pxf6lz7DttFpEjo02ZvJDqCnhubUn 4IQg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ibL3Vgv0; 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=1755185607; x=1755790407; 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=rHRXcKNGHHcHimEYj8S9oxF1FbB6cwJmUVbYmOehhySF6oXvQKl0CvvB5J1osqWWop RhkSMYGiEW9Q3HL8ZXIDWGoUCnixgnToXjml79xhEHmSoIdpDcItbC6jhyaorj82UcSX V99uy8cWJ51lyLrtuuZ3G8fWrUqKm8trlUyfc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755185607; x=1755790407; 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=YFeo+m4coJVDlUh7HBCPlYRdMyJ6gjg3heoUsVCmLX389ZQgVFMYylNcIE7UjoY+sG INaJpyO+RUAwGbpKpuGfqAPsmoh+enxWkcMj/XUEkjjshF6NTJG1cJEUgM2uFogbv49h jbcbuaguYZf3uAxJXQgbfr6hHJfGoXluZfOERiCdgo5HqeLTeWgujNCS+YV/zsbTjNXM k6HrURlUYqimU5ACsvvsK5Ki1hXm0+EeOu5+a2J3F9CyM9fw5vxBhB1hTqr7W7S5mcBC TrkUk7IUsOzym1vld6atKPgiq1vdLF8PzyLrIZO5lp6Ophz07OJYGcfQNi8OOqHDlcCI NPEA== X-Forwarded-Encrypted: i=2; AJvYcCXYvpgatyl5Dc5os2wVXPIQkeeUqkuWl8qIlBvcOjwTwzQPfpxWI4nJ5rhGfJpowElEbvk/hGahKaSgaqVQ@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Yz3idu+L7vhONpCV6MmjCVimcAiYqodo7sXF50MGQiPDqc2cRUk 9XqfAx4X4GMqKzSPMAgOBgC58fZp+K52rujs6sXeGStjSbVmYjxTLMsFyG87fSBDlYRhNw== X-Google-Smtp-Source: AGHT+IH2KlncwqkE9Qc634lyzS3DDwbOZ8Ha4IDLr518Elw6iGjOVFnxFxzZZ1xT09jA0JXUHKqP1A== X-Received: by 2002:a05:6402:1e8c:b0:618:1bdb:8515 with SMTP id 4fb4d7f45d1cf-618919c8284mr2621804a12.29.1755185607115; Thu, 14 Aug 2025 08:33:27 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZcJFEmjsAydVPK7S4bikrhnsGXwJqh/6GfyXk6zj8sB/w== Received: by 2002:a05:6402:4399:b0:601:d62c:7601 with SMTP id 4fb4d7f45d1cf-6188a37d842ls865772a12.2.-pod-prod-01-eu; Thu, 14 Aug 2025 08:33:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPqAfXjBj37kMcmKHP7raNWydccC9caAozkF8zOawvsOM9uk7cbk25b5WjdExtBW8VUtD4fiT5I6yWUdiD@amarulasolutions.com X-Received: by 2002:a17:907:c0d:b0:ade:9b52:4cc0 with SMTP id a640c23a62f3a-afcbe0a2566mr318353866b.26.1755185604693; Thu, 14 Aug 2025 08:33:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755185604; cv=none; d=google.com; s=arc-20240605; b=VDOnayeaF/6zHX0polzOjgeh9FPM66NsP4aqeDQ8nY/7j/7bmS/n+mJOgD6kCrpekp Pq6mh8WJQIJ8sg+vTNMzBb48ND4kEBEXH8Phr3kPJ11HutmxsKFJPgIHXGdgNSEdfu66 vQyGJ/9qBtE1GPC10ZC6mHH7WvcaKkPMT33AAK/QCYVthIBJ618ztRNTNjQ5Bd2pcTlu pysk+eHsOx/95mtKmu9ovPAVAuzk1TP7/JP96aIK/1pQxXZbOfR7ynM2HARPcwpP3v7y euD/2GBv6fkSPd/YJ0eg5ohpzCc9CaD6LK9YIvSYNq0h3Owz/goO+RIM6oO11X+m2Fo9 CymA== 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=mJhoxtsk2Jgyma2Pz3+ykJcm+Mmalr1nAWx180pGe7A=; b=Kqx/9CWuVQr7TqD44PtPFWQAlI25AgrRVScdpnnA6TKQX8jbv+NIc3oqUGEifHhbPD rUn7QDAy1cgfUaOyaJ422qxgePJZnv0Wtxa8iHYKKfpzHHopWc6jjIyCRyYeoXaaW12x 8ej0sDxvRiwAbGmExO8/PvJIgbnI3NZrffrkJz1jmbbYXCaOUKdbgYeuy+jFc0nyYw6W gI/u1QeccMwmTxMPHJWkADncIT2kZtrNdKId6qfgLnLE9p35DD09rKMxwzQUYnhjnTRg UZxfGXixq9q4wRMAIERjkUl10H1MIcz2oLIfknhrWdhELTpy5jfr+itYBE6vHK24CCfB A3Jw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ibL3Vgv0; 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-af91a11e6c3sor2047115666b.7.2025.08.14.08.33.24 for (Google Transport Security); Thu, 14 Aug 2025 08:33:24 -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; AJvYcCULAxvxyfrekNyY8y6z7pEH5GbEXDxogZDPU48mOLlivhK9t3PHwyCPC0P5JGyyBOzh0cHwLNkSQYl4BjTd@amarulasolutions.com X-Gm-Gg: ASbGncs23G+a/nlQKZIppWXkOGIw2oqVRMYTd5g8QgPV6idMMPigNfc0hxK4bllIP++ hVxULD3z25jecQY96aUTBz75cD1L5gkPkPDy6PSBcSc5rUh5FkDHimbA2WP/raIVU8A06YlPzSS hgpUCUxmP3c2cGmjiR9qyovc3K0ocpTX4yABf1FuJ/4jIFyTkZnd7fSzCuArIJRaOxTSQXpQHBG nwtJPbqotyFtxu3tgNYQY6hJfy4ERbVMcZFvKEm63osHgcV/o2DGJOKpG0+NGXNSArVrSCfVypM EAF2ABmb9HgvTAaLSqFWtfsKa5Spj/gsLK0A+Eale5i1oi3pKBoiHzZXag+FC5aB7UuqBtKGM4k 4hWfsnKA/cruxqJzkvPxBLHlW922vmUImC16J2Uk3dmEuWUxaHanz9UJXPh5ktkyP8mzMXrKUh4 dv X-Received: by 2002:a17:907:9815:b0:af8:f187:3222 with SMTP id a640c23a62f3a-afcbe1afac3mr280899666b.33.1755185604170; Thu, 14 Aug 2025 08:33:24 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.fritz.box ([2001:871:248:acda:9b30:e43:d6cd:c58f]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-af91a21c022sm2561928966b.101.2025.08.14.08.33.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 08:33:23 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , Andrea Ricchi , Giuseppe D'Angelo , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [RFC v3 4/5] package/qwt: enable build with Qt6 Date: Thu, 14 Aug 2025 17:32:58 +0200 Message-ID: <20250814153259.6822-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250814153259.6822-1-dario.binacchi@amarulasolutions.com> References: <20250814153259.6822-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=ibL3Vgv0; 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