From patchwork Fri Sep 25 06:42:56 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4857 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 5769F3F9EB for ; Fri, 25 Sep 2026 08:43:18 +0200 (CEST) Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-4870487e33asf162533f8f.1 for ; Thu, 24 Sep 2026 23:43:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790318598; cv=pass; d=google.com; s=arc-20260327; b=RN5Qzzlz2bQEOxic4LjNspvTPO/wxTyRZa6ckKrSc/zOhoYAQ06dyzZ1ri0UqkMc5o DXIMOunr8ArciQX4yTJnEXyzo40gzZjIlzDh7l9mL6NU6GWw9UabBqTCg3gVO4RFnKgw rlMG0NzikrR6xDXa5i5Z6jfDoD9dR3PXF8P9sTGgnAJ3ha9IRSWTQQLSNrLqaLOfmzuM EUImr2DfFF73Sd1XDFZQ+zL7pcojauxZxatYVP/ybfeVfXxsPwX4SIXf60GKEPQ0K50c 0UGt4a/X8lO8/Sl0ciig22g/YYdf0L62SjoIqTOVhVCyR4TTTtN1djKKQrkKVvJJCiIq cHnA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; 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=2YRX5im0wfrGvWLxt2lS5FjQvbYMLZmXzPKk1DIIW8Y=; fh=EBl0EW9Yvp7+8RtKtik20fzmspk3zwkRPVJW+5yl7TQ=; b=g0FaDOd4LzUEGWi8X9HVM/LmdUpdh+/j8IaP/tHhJCyQcxWrRtAbR13qwgzDlSPss1 2+iSwBmMCDfqoP+esrNN2oZ9ygn9xkAZjIfbNJA2ZHyOjhxwui6kt932kO/0b9+/4Y5L zsbMpep8qLGTN0Oc3M3ZWllDgbSR6+38iQjtOZ/1I04T4xB8M7ZQtqFnJNba/ieZ8rnp aXdUyfmmi3NrWcPtkRs5BZ148BbP5GRQLCHbzMg5qrvcJOsiuBRnYmuXbxqQI+iYrkGc viCQXsPBgTPFywZQAAPF4PbTbzgVLRaCpGccMFDpuBHn5yuDauWqX4+D8WszQWQKGq7Z m8+Q==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BMXgUQYD; 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=neutral header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1790318598; x=1790923398; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-type :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:content-type; bh=2YRX5im0wfrGvWLxt2lS5FjQvbYMLZmXzPKk1DIIW8Y=; b=B/AIpDAYXzKbGqlhKYLubx1w/VXVv7H1XVz8VA1lRvDnDpfGnVTyWBQT7AiQljkWSA fKqvU8FmD0RZyMgAIQ97g1JZniLkCnMhAkSwfgqUbEUVY571ICuCpiqM0MnKDv/LS/rA A7NTIQCjJX20IceRc2nrVjWWOSLXHR3SMXhWM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790318598; x=1790923398; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type:x-original-authentication-results:x-original-sender :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-gg:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=2YRX5im0wfrGvWLxt2lS5FjQvbYMLZmXzPKk1DIIW8Y=; b=2lCT1HICtVIr5zyh3KHGr9aH+bpr2+LXcn71L+4CEAo1wBinbQTCoJ6SkM8BRDEtlg BE5JdFUbjAEXZ+D0r2F1v9M0dWw1LZVi/afuWDgTJ5/paAK/h1fMITFdNfjhpZaZ9lqO JhfVqaOl6zfFy7jsUVdVZonQlga+RFYakYQORERXIJ7kvHiUSisq12e3iNMKg0waDbl8 rvFpbbg2uqgwERhazC9jiPhELrIYwPu1FscbABsOPPkMjTO1N6MwA8TR/ZctKwofUviS luX6w2C7zh6LI1MZW2P7ja4OQ4iZLiBtX1dXAjofGJ/k9EiyLUCquUoHqY/Up62MTbB5 rKvg== X-Forwarded-Encrypted: i=2; AKwUvBy74q6tEt3SphX1heijfvuOpNaXH57xl+finwEq/uqx5rKrPAiDNLs30+Ane7tt4ODHV77XZGey3iipWnHC@patchwork.amarulasolutions.com X-Gm-Message-State: AFuF++kAhh3qXfrRy0SHipGUTsj15xxk+jC8S0E0j+towyaFQrYVxMpv qWn1D0Rmbgnx3cMXldTmKD50SUVJeYhpgNE94M4KTgOlPb/i+N1dJz2NAStFuP0hiGuzgQ== X-Received: by 2002:a5d:5e0d:0:b0:488:7b66:1413 with SMTP id ffacd0b85a97d-4887b66155fmr1951072f8f.39.1790318598012; Thu, 24 Sep 2026 23:43:18 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h="ATskLdcxlMCwZnC4jxDLfgJf64Dlkza5NPcSqwcweMUuSCb4eA==" Received: by 2002:a05:6000:18ac:b0:486:fa76:492d with SMTP id ffacd0b85a97d-488795dc7c1ls513700f8f.0.-pod-prod-03-eu; Thu, 24 Sep 2026 23:43:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvByHuNTOOPlKz2UUtTRmzQhQz1I00ZcUuq/488JUM9/M+36dIs5AKAlYST0xZpGgAlGOR2UtYaDWtYHpLyJr@amarulasolutions.com X-Received: by 2002:a05:600c:8b26:b0:49c:c0d4:53d9 with SMTP id 5b1f17b1804b1-49fe66d5f50mr90689115e9.14.1790318596256; Thu, 24 Sep 2026 23:43:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790318596; cv=none; d=google.com; s=arc-20260327; b=ePv9x+lICiXk8ISJ0ZX/+W98CYzERnilceoCndZMJT7CLX0PgVN5I3+53+AWPvGSFD ld1j+Ocy0tYN5Sy1YbsKLZ/a8kz4e80xFFsVxGim7xVqbc6tcyCX3SeFivaB0fPN6gpU Dxp2p+uV/fYfSS/WkQ+jQ387oIqI9pnqLoDhkYuSyN0+6uWSN8Jxtk01Rb3K/aBdrR0+ GTpVwVMzsrqEJB2VIfnKOMMuTmpfxue/M1xkk/BDa8dAsWO28rKA03XXpgBGVl4pIX7H NYak74NfMPRf7avRIlqFRw6Z64ZVT1CRIvmGl1ThMlyT/BxPXuJUGDtzaKZZpTdwUe+b LQDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=O5P5nkyq0hPCVocnpTwOrn9Pkk7unn0FdtvmXk4STK8=; fh=g332I62xY7mDK5eyfxcW1JkCzVcSlkJEeZjD7aWENBw=; b=kqepdaAVFaBw2oWE2dr9YvoDQ54GxGcLDwty9ZFV/O9qcP38bOJRL1kQ8G8d7+WayT W69qFlgcPMsXBogJjZDcZe83gjpxUzM9k7uBrTD2x25EvnjeI5TWPnfwt4Xb50u4HHxo /SSZgXEu+K+INasWc5mG4QqMu++1+7IfMumbxToSS4o6n3ikGloIT9GkZJhRMOuIJ9Jp O1Sn873IH7UcUjcNszvK74HjhBp/YDRRbZkyKxHuNlcz/NR/t1eq/59FZcTIDDx/42/+ N3OZp9e5rDa1BstHcBZs4C/gkZ4ih8O2PMyepXmPBfKtUw4Ve6axG8fZzaCDXmW+8DMj YMAA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BMXgUQYD; 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=neutral 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-49ff06cc6aesor1607355e9.19.2026.09.24.23.43.16 for (Google Transport Security); Thu, 24 Sep 2026 23:43:16 -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; AKwUvByEOMkG235yHF78FM64ZvsMWBxWUJJ0EOGjQoLFMUEEslT++HtnvSuebUYNXCy83XZuUgqZRKVYv05dLJ+G@amarulasolutions.com X-Gm-Gg: AYBFou1LPXq4r/cO1T1vxGH6JHSF3B3ItTMfB73gJzZdJGmzZUT7h2phVX9uVCZPBO2 g46Bp8p0PgzbDDu6mkFFF0IGg+qiYP6zCZec2gdK5s56Oci57/QYnnno9vz2q1RDVk+u09BfGUi eK9Ke4FiNfbCdggAu982NbA0CFz+HgMgylHi0j5uSgrsjLKM+VQxl+WBHByOx9vCqn+0DhVQNOV sI0ZeT8YMvjZp4JB3S8MnD4ouXOX0bllCGupQfoUFocnI7NkFJYJJMmKeJdD5yKbZkoOcGCiUgV 6d37vfIFd5E8JA96u+XubN3Aplxag24+bFTumo7VLpNNZq/H1jMFlRaKJH2xvZJyNZYylOPQybU NLR4YXNaaJlQauBG+fDCjob5kqqtv2g4I+Fr1BD3Dxyc3AvxwYajLeIgSTbL94OHqzSP8G5PQpu szjtoG/rvQ3gR2Etw5z7kWkCQpUgiCZkM/YHcJGcLXy533Zb8uUwULpqhmJCsHbZ3RGleq3O9tq Wn55Xa1otGiopsxy97ekDfJ4+dHFTKpIAC4wxjp5atl86F3ThAzcuuiK3VReQ5+/kxHim43AyqG N31xby3mMVtH9GRdWtK3dWi9IwKoasLJuoK8hxhcIoNqxQ8WHwclfTaIWHaXQOcyocdvP9w= X-Received: by 2002:a05:600c:83c5:b0:499:bf0e:95c8 with SMTP id 5b1f17b1804b1-49fe66c8623mr78638385e9.1.1790318595912; Thu, 24 Sep 2026 23:43:15 -0700 (PDT) Received: from dario-ThinkPad-P14s-Gen-5.homenet.telecomitalia.it (host-79-14-29-58.business.telecomitalia.it. [79.14.29.58]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fe5df44f9sm115584445e9.11.2026.09.24.23.43.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 23:43:15 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andrea Ricchi , Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , linux-amarula@amarulasolutions.com, Thomas Petazzoni , Richard GENOUD , Dario Binacchi Subject: [PATCH v6 5/6] package/qwt: enable build with Qt6 Date: Fri, 25 Sep 2026 08:42:56 +0200 Message-ID: <20260925064257.1162394-6-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> References: <20260925064257.1162394-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=BMXgUQYD; 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=neutral 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 --- Changes v4 -> v5: - OpenGL option depends on BR2_PACKAGE_QT6_GL_SUPPORTS 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..7b0e068ad131 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_GL_SUPPORTS + 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