From patchwork Thu Aug 14 15:32:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4245 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 67E864207C for ; Thu, 14 Aug 2025 17:33:24 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-6188b766f8esf890892a12.3 for ; Thu, 14 Aug 2025 08:33:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755185604; cv=pass; d=google.com; s=arc-20240605; b=cpJlufqSOVIflfZDzlxP1o+1uYL0fiSPNp4sH9Z3DHFt49Y75fSYr3bryzCLzVgJvP sPXhcFk885RdDkbAoIpbSnbhAYaeCd/un/t2+H7Lm8Spe8TrfaDW9doL9DVDBPb7G+ML jwm8nD3FMeUkw+lBrJV9HFZ2ltIi77gMyFZrmTdzM7AF0xr7yNCp+cpopaD/XDDSTV/x 8LZhjmt+GSqKN0hnUgNLsr6DKrozaOyE3uG9jpdLVcyfU7Mn84bZqWY3ZTd0MaHx2Kdb GxrkSdkHeXxiblcoMaIwNOM9P3MzWpamprR/gEHyK4feiIXwzEqXkthRtnwoXlL4QLdd 2lNA== 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=bBbk7qXnYOA/nop6dNmOQDOBHUHKn8rKNm/100Hv5QQ=; fh=D8xjs1817yb2/V9hEP2y8BKk50BYbbuAzHf+AQqVtcY=; b=f82hEC0HXS9+6aBC+PPUlcLc1N72QCA78LpYGF+iy9HJ4MKxLeaXGiZ28o3uYFsUaP NnjgGGVShIzVqjAHx819NTYzrGBsAqtY2wqvbusZ2PNe8ys9QXKn5+sc14PA5GZfnhlM IeJQfR+SJvB7OPLyb1ORN8HuchXg+Js9mnj5q+/Zi2/ok2jq/I2iV8fpOw/Iqncw6LT8 UqJBvX2RE1IweHbzPntP7PmqN1/IhBQxQs0bp+F7O4mhDKUvMi8Rx7UsR4vnOtAcKbkI fDqiqLPvgpCr6Ji+kcv8qNc79zzBxYTAZJSMijjl7DMn5NRqbpNkoCPgwBSCXgLqiyTt ar3A==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=SDy2l3aH; 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=1755185604; x=1755790404; 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=bBbk7qXnYOA/nop6dNmOQDOBHUHKn8rKNm/100Hv5QQ=; b=bjTjo3kM0qABPt810JmdQpO1zSJPNYYgqZJVuHk44DotBje/bfNCKb5LcGzq97Y/i9 UZjPtko1Ots0SzS3YDM8HlMeRVYasHUwG3dLNVBVzVjq5zerAmFXMJTzbMhLWrX9y5xd F7ZCL0T8QzdClgFvWiLxVYbsO4G5e4v/qdEjw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755185604; x=1755790404; 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=bBbk7qXnYOA/nop6dNmOQDOBHUHKn8rKNm/100Hv5QQ=; b=a3ShGCc44XIhNm6HxHGCxmNx9iUyAz3D4Whl690dvJHFgeMx8YsS+x5+Y//LJjFvZB 9rvGghK9Dl4QWWg6VNlTbPdc/QZhZFBuZUHnoOD01tcHAgcv7Yu+uifzC8IT6cgiGoH1 q9EkW60Va6ibDQyIpa7BtVVHOBYxNWBFTiQ+lx0IEOzfKdMQgE7qwhHCqfHSFhbIuEeE 0mlcFAVyr7d6+7Tn7RNW9eAwfIMHc4ti13J6s0moXCKhDKpEXR2KwRkRmNP0aVglJ84l wcW7gsIeiXCpeNwMUG79N+Q8T+mtvoa3KberpQYbQ31GcYFbUCYKqHIM3LRwimkNp1m7 n7Zg== X-Forwarded-Encrypted: i=2; AJvYcCVjR4/xQWrernRorONIwd210apBh2iT/T05TvFwQhzi/ClcbRI6BAOAzWfi4F00YWkVqtX+SxQvwDB5dWEA@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YwxSWR6HpofWQ6NL9p84jzZ8DrIL5cw2Ci+ukO0KfZr2Z6Xm78P vcQpx+SZQBLHXyJUZsytc2Bax8pUBa8W0aj6RFTb9B/450WKhE9xgXSshZeMBpA6gGUYnA== X-Google-Smtp-Source: AGHT+IF7vy0Be0cdSevnNIxj5KD1PUtNIGKUW/P011bi4VM1Tmo+pK5N/mVoZuY/jPv1ZLJfJmEHdg== X-Received: by 2002:a05:6402:5205:b0:617:5be3:bba9 with SMTP id 4fb4d7f45d1cf-6188ba1b45bmr3219395a12.22.1755185603802; Thu, 14 Aug 2025 08:33:23 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZcIIFLWCWYNHBwpL0hpA7uQZR2dA9wkwSCW+kd+85QWog== Received: by 2002:a05:6402:a0d0:b0:60c:44d6:282c with SMTP id 4fb4d7f45d1cf-6188a3698d6ls944790a12.1.-pod-prod-04-eu; Thu, 14 Aug 2025 08:33:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWD6HIhAYjAPTehXRkaGTjvkWDHAqs0T1CwwruWD1dKo/rejfLRW/UbS/vJP4gTMWsjJ6X9/L0BH1mUFgnd@amarulasolutions.com X-Received: by 2002:a17:907:60d1:b0:ae3:b2b7:7f2f with SMTP id a640c23a62f3a-afcb98fc895mr344279766b.40.1755185601240; Thu, 14 Aug 2025 08:33:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755185601; cv=none; d=google.com; s=arc-20240605; b=HTA6/jlq2+GdwzBsZ1nSrFXPMBmldXI8cib4N5wMkqiw9RKQB9qkLSy8HyStDyH1Xc IBPAd/i9YtPpC+QXIwEMvObXwBLFCvdtGPglE13KNDTKiZzDdp9zrN0qfS4Q22jYFiVA x+gktdJzVV4w9uIl67nktPYa/GOAGIbJ6HmDwPwFLgrI66FyQb71Xi6FYjVGzyFDiora 1MrWQIlqqzLlEy1PTrUemu48P7J/zlO0zwhx+uHJcN+gHDni8XeXRxbOsPkXN53gPMSw 3kLEx+qZuGpQrBYuPBoNlTN+S+ezuns/eQVVo9hPR5kQ3j99429dM413+V9Yc72lTyHY aTHQ== 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=/UVV26tK45QFSOx6uuH60vDni796S+uZz8/iozC+1c8=; fh=kzGFCcnZl9M6ebmn2/yTXEdOM0EjAgDm0V04tEOk+Rk=; b=IxWlfABNoXV7zdQr7dftE8TYz2xZzG5F//KaH4vvPEjzjGl0tCFx6n/YyndvoIGqMQ oqh6rHtw2YEZRGV1dr/3ZQik6voYorL2G3+qWCE+6/8pSfn2emXsLC4RJsqvxxQL4lhg HTFbDDphPESTDdH4u7nW+Y2fjDsw2vJV0m5wemyrjEtLrV1zl/myxm4DWQA4WZ+CWuoA uYqIv4HBP5k9YHJ6Mx7ZYPE4TWYNSdcNG21jhJz5d3ptjCKmA1y0p5le3Z3e4sb/SxRW zTzCAmm1ub4lKUoveSbdU5+QBNAROqwSADT2HUhNhNjgRFFb4hefVXkU/LhBitoksmJw ke6Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=SDy2l3aH; 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-af98bc88372sor1020531166b.16.2025.08.14.08.33.21 for (Google Transport Security); Thu, 14 Aug 2025 08:33:21 -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; AJvYcCUnGhoQ+VxRa6su0prZ2uD1uPhaffFL4FL0gYaLcL+9rBSLFWcpzU51izuGQn05nyEv3TpoxnUKHl0SvUoh@amarulasolutions.com X-Gm-Gg: ASbGncsxiGdK8vESCScObZH7+9FVPhPZpIH0sOVUWo9Ug7eBIladELj4/V/aJYXcleQ u0bBF4YPL3UlR4Rm0JllQRwZWIPhvYcRC0aMK2G7iFiqxIBzrLoiS3tfejx/KHeNv9JVUc1gE33 f7BZjWMo51DMKuaFHP8QbNzlcEpQ28aWE8IP2dlCL4oeNIfCsUnaMwmouf0yB2V+OFXoGUgSWuc xL6U6vvSxu7g2xgTQTbARb7k4jr+05I2wPCmWUFODjT0XSLDxOxmpSlSlOG0avXj5OKZZHY80x0 nLDY1qBl8oRVIHrjHXNaHskIFypOpXTcDknI4kbo49TSQYFjBIB4aHC23Q+Lpr3wqANePODrb/p MaOb+lYBtyCvfzKhz5qX9Aux3Rvw1K1nPZ4GXo/HXPwk9PpaZ26xIG9HAJRgg1nlz5Ek/WbsBLS Qr X-Received: by 2002:a17:907:72c4:b0:ae3:7255:ba53 with SMTP id a640c23a62f3a-afcb9926c82mr357431766b.53.1755185600696; Thu, 14 Aug 2025 08:33:20 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 08:33:20 -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, Angelo Compagnucci , Dario Binacchi Subject: [RFC v3 1/5] package/qt6: Add qmake functionality Date: Thu, 14 Aug 2025 17:32:55 +0200 Message-ID: <20250814153259.6822-2-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=SDy2l3aH; 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: , From: Jesse Van Gavere The qmake functionality had been missing due to the new host/target build requirement, to get it working the main parts of the qt5 qmake has been kept, we're still making our own device spec which we use to run qmake with along with passing some additional device options for our flags/cross-compiler the biggest difference is that where previously qt.conf was used to fixup per-paths builds, this is now always created with changed contents so qmake looks at the correct target directories. A big thanks to Angelo Compagnucci for the encouragement and testing. Signed-off-by: Jesse Van Gavere Tested-by: Angelo Compagnucci [dario: fix HostData in qt.conf.in] Signed-off-by: Dario Binacchi --- Changes v2 -> v3: - Drop package/qt6/qt6base/qt6base.mk.save package/qt6/qt6.mk | 18 +++++++++++++++ package/qt6/qt6base/qmake.conf.in | 36 +++++++++++++++++++++++++++++ package/qt6/qt6base/qplatformdefs.h | 1 + package/qt6/qt6base/qt.conf.in | 7 ++++++ package/qt6/qt6base/qt6base.mk | 18 +++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 package/qt6/qt6base/qmake.conf.in create mode 100644 package/qt6/qt6base/qplatformdefs.h create mode 100644 package/qt6/qt6base/qt.conf.in diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 33cbf7551f23..2d51c69269ac 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -12,3 +12,21 @@ QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION) QT6_GIT = git://code.qt.io include $(sort $(wildcard package/qt6/*/*.mk)) + +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install paths +define QT6_INSTALL_QT_CONF + rm -f $(HOST_DIR)/bin/qt.conf + sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ + $(QT6BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf +endef + +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define QT6_QT_CONF_FIXUP + $(QT6_INSTALL_QT_CONF) +endef +endif + +# Variable for other Qt applications to use +QT6_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ diff --git a/package/qt6/qt6base/qmake.conf.in b/package/qt6/qt6base/qmake.conf.in new file mode 100644 index 000000000000..ebb8497d2df5 --- /dev/null +++ b/package/qt6/qt6base/qmake.conf.in @@ -0,0 +1,36 @@ +# Qt6 has a mechanism to support "device" profiles, so that people can +# specify the compiler, compiler flags and so on for a specific device. + +# We leverage this mechanism in the Buildroot packaging of qt6 to +# simplify cross-compilation: we have our own "device" definition, which +# allows us to easily pass the cross-compiler paths and flags from our +# qt6.mk. + +include(../common/linux_device_pre.conf) + +# modifications to g++-unix.conf +QMAKE_CC = $${CROSS_COMPILE}gcc +QMAKE_CXX = $${CROSS_COMPILE}g++ +QMAKE_LINK = $${CROSS_COMPILE}g++ + +# modifications to gcc-base.conf +QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} +QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} +# Remove all optimisation flags, we really only want our own. +QMAKE_CFLAGS_OPTIMIZE = +QMAKE_CFLAGS_OPTIMIZE_DEBUG = +QMAKE_CFLAGS_OPTIMIZE_FULL = +QMAKE_CFLAGS_OPTIMIZE_SIZE = +QMAKE_CFLAGS_DEBUG = +QMAKE_CXXFLAGS_DEBUG = +QMAKE_CFLAGS_RELEASE = +QMAKE_CXXFLAGS_RELEASE = +CONFIG += nostrip + +QMAKE_LIBS += -lrt -lpthread -ldl +QMAKE_CFLAGS_ISYSTEM = + +@EGLFS_DEVICE@ + +include(../common/linux_device_post.conf) +load(qt_config) diff --git a/package/qt6/qt6base/qplatformdefs.h b/package/qt6/qt6base/qplatformdefs.h new file mode 100644 index 000000000000..99e9a2792329 --- /dev/null +++ b/package/qt6/qt6base/qplatformdefs.h @@ -0,0 +1 @@ +#include "../../linux-g++/qplatformdefs.h" diff --git a/package/qt6/qt6base/qt.conf.in b/package/qt6/qt6base/qt.conf.in new file mode 100644 index 000000000000..fee209f38c00 --- /dev/null +++ b/package/qt6/qt6base/qt.conf.in @@ -0,0 +1,7 @@ +[Paths] +Prefix=/usr +HostPrefix=@@HOST_DIR@@ +HostData=@@STAGING_DIR@@/usr +Sysroot=@@STAGING_DIR@@ +SysrootifyPrefix=true +TargetSpec=devices/linux-buildroot-g++ diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 51a4f1b5be7f..697d1a96a920 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -55,6 +55,9 @@ QT6BASE_CONF_OPTS = \ -DFEATURE_system_zlib=ON \ -DFEATURE_system_libb2=ON +QT6BASE_CFLAGS = $(TARGET_CFLAGS) +QT6BASE_CXXFLAGS = $(TARGET_CXXFLAGS) + # x86 optimization options. While we have a BR2_X86_CPU_HAS_AVX512, it # is not clear yet how it maps to all the avx512* options of Qt, so we # for now keeps them disabled. @@ -431,5 +434,20 @@ define QT6BASE_RM_USR_MKSPECS endef QT6BASE_TARGET_FINALIZE_HOOKS += QT6BASE_RM_USR_MKSPECS +define QT6BASE_MAKE_BR_SPEC + mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/ + sed 's/@EGLFS_DEVICE@/$(QT6BASE_EGLFS_DEVICE)/g' \ + $(QT6BASE_PKGDIR)/qmake.conf.in > \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h +endef + +QT6BASE_CONF_OPTS += -DQT_QMAKE_DEVICE_OPTIONS=CROSS_COMPILE="$(TARGET_CROSS)";BR_COMPILER_CFLAGS="$(QT6BASE_CFLAGS)";BR_COMPILER_CXXFLAGS="$(QT6BASE_CXX_FLAGS)" + +QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC + +QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF + $(eval $(cmake-package)) $(eval $(host-cmake-package)) From patchwork Thu Aug 14 15:32:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4246 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 6E30741EE7 for ; Thu, 14 Aug 2025 17:33:25 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-6188b653d69sf928483a12.1 for ; Thu, 14 Aug 2025 08:33:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755185605; cv=pass; d=google.com; s=arc-20240605; b=IU48yf1vJ/+iEJq5gVMlRHX/uRWr2zI09f6KoNcGW7UEAqZ8iFMiOmyLPetVmTIH1g 2nHBad9K/8QTbrBox3/RTkpDoLId31A8gdGwwzNPMMpNdCoN1vWfS6dCs83l9cPOenJa CvsRLY+DV0D0jX0yVixUGXqoHtlZ4PRJbBVJ7ujLmP6oQPZ6hFoTmtk/LDuxKk2CB59u KZkTfI52Mc6Gd3ljqircDVKjWAiJN2eE0eNwH54L1hZ2FQncNdso0agbzjyADEu2gfOi KZxgrmtWpTl76ZSf/Z6/rtcNkc69nbVUOZzQf0LxfeCpBjKOSEOmcaWbjDVSJ7KaFHsH BAbw== 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=gmNy/ku+9maRWDTxXrX9OFvw4O9Rxzf36/eCP7NvM/g=; fh=5QfUo0yI9rTTviNxVjgNNIAlzrw0306YBqFZzGMKqNA=; b=QA2gvdfcyYhgkIgPRxJXxgAmduuTHhOfarASGzYRakvDjw2Cs+U/5gONa9fcuZXxnR G6MKVPSo4cUgCZlBqjYDttoK9mUyaH0LCMRS7Ct+H8edezwO67gKuMl9Rl8cwaejrRYX Lwu/KLloySz4Ti1FaLC4k5G4pajg+PFMZGqezD+VAWWUr/tG9iP3E4YAcnkeDbdNfdPG n7MVtoyMYqXAyAsDWd4U0rSZYVNiDsj0Y72KLG5yiiGC2GIWC5pNicN9n7P5t1n35Rnn 0dBi5l8RFY29YDPOXdzgQRXuzhG7+hKQyX8eqzk4OEGOnBqrDd/Q3oLyPie+Otw/aHrH GQJA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=R5SpobIV; 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=1755185605; x=1755790405; 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=gmNy/ku+9maRWDTxXrX9OFvw4O9Rxzf36/eCP7NvM/g=; b=hNeDUzwOCIG8ZsgF10NFX8BiKugaTXQsLtHIhbYn8YNR1pW7JJpqmk7VnHiAnFLGQX ZV0vuxFAaBNcVGRDMvC6Fw2xksh6MCFmTp9KnXO+uNyzKtXyMqg2JhoFCTxKP+SmsPCG 2vnSxeCDdJ5cCWW9jLuyNSV+k5ElOoyea5hRg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755185605; x=1755790405; 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=gmNy/ku+9maRWDTxXrX9OFvw4O9Rxzf36/eCP7NvM/g=; b=svPnXHsZvPVPJHUNuADN/8DipJN3d/VNRllpo77zBsBLtaa5B3IESWGjFVYa5b7zMV AIaFngokqeuZJn0vHFEjPTfEGfzpo60jkcROr70chXp/7nbTlsqkgfXWfguzwqaOA3Du EGesvptgz8xIr/o7AmJP3zwsm7AZwaY5aO8udFaTRx2cwhDwD4B7fsZGYjn0Dt5gAs0E 7WL2ShRMTagZus0A7x/B7mFN//JMw12rIBqdTEDK+Aai3Z5ggq6q1tpYrjePhEwTwmGN h6D1Nn5ci+ajquvnrOMhDUtzctwzjw9c+zGpYs/t+q4ECf/jtEdvttsjtWWP6TonIsRv Pdjw== X-Forwarded-Encrypted: i=2; AJvYcCVgoE1SxSWPwFhOEYk3TQRR7RXY1Uw8u2rIIoECYW0O8MhOXDZTSlStSel05OF4paI0BqKuAx344Sw4MLQ3@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YwuY3aXxvl6U+uds4WPXze42jI7aLQIuwE2+u5sCTeoJNxjqAAV 1p1ygw4Q+xnK85H168TiR6jk6CF6tRBv7WUohFn1h3rWOOpU4/6wtxryMdHUWWcSu4WL+g== X-Google-Smtp-Source: AGHT+IGFm7Wb5iGK2+/2F1tmI+7QTPAV+hjhPe87Xb3h2NYxBczSzJUdgkNwsM0VuOC60kMx72grog== X-Received: by 2002:a05:6402:40c8:b0:618:1c42:369f with SMTP id 4fb4d7f45d1cf-618919d7e4fmr2673757a12.30.1755185604852; Thu, 14 Aug 2025 08:33:24 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZfBs/jfH3gSMR0VRHPOhpywPbH7EBetA8xDr7b4RJY6aA== Received: by 2002:a05:6402:4399:b0:601:d62c:7601 with SMTP id 4fb4d7f45d1cf-6188a37d842ls865748a12.2.-pod-prod-01-eu; Thu, 14 Aug 2025 08:33:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXyAbywysz2o4NAyOHq5lw+z1a/xcMErfVXJabgaOrd5/2IeLHacf5yCYeqtPUNqA4U1mseMrIKNVGp5NA4@amarulasolutions.com X-Received: by 2002:a17:906:c141:b0:add:ede0:b9d4 with SMTP id a640c23a62f3a-afcbd634692mr284516266b.0.1755185602345; Thu, 14 Aug 2025 08:33:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755185602; cv=none; d=google.com; s=arc-20240605; b=cxRX6mu/kYkpwieDX82dkOwyhL/aNPN+gy/EkoI6Jdbgniv/E4YxQDOXtYePBiEuv9 /hW7JOGYSCaxNb7P5CBC7XtnDDFhjnlRCvTDMgL0Lj7q3RO0qRb9ZPA7nYQzEOt/tMfh n/sqZAxAaXHkp5YigDkFtFsDffvsspvpgfsmr7dM6qnBk1gfX0iGIpZHA5a6cpkEFkaT Z0vrVgt/9fo57+0+sO8olfbrZ7qGmBstmwRM+iJ6vD3KpYq4iAfWAea/bCzumbY0zoSK dBTajJNyRx2TXWmA6tmDx50SHUfGsuh0WwBidZLrBefwDrDL48f7S17pc49VhqDEGj7l L2tg== 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=JT8MvWsy5P59IqKvZtPcHmV5Q2HyVsjBIgeB0M1+FgE=; fh=N1264fZxShdOCR62vftlDq5pUlwwD4WFWhwwAJi2Llg=; b=PPNblrA0AZ2urRSC5aTmYdlk0+si+08YZmqKk/tHPKmlC7Hh8pBzQAYgDiRFo4DfuA m5QOU6asyUwzlxGz4+0Z++u357UZH2jxfEHmsBPcEu4hrv7wpemfpVCh6jXMaKXrTSY8 8znFT+zfl/aWKtzc0wjqxvaSHChjcoP9c24GXto9+N9kyLU72Tgd2E56M9Yes81IAlpL RwGUpuyGsMEa1/+YwAqUk4zFmcBDvB6h2f1xoKgYN0nnjIXPabVQb+s6T9l169rF3aXN /Ijsdl9ywGsNa1USRyc8B24Dr6AQjDeFUeisXEW3DIK/7XcbWTX/xgg3vgO3WaIJOcpU zZNQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=R5SpobIV; 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-af919eace61sor1928153366b.0.2025.08.14.08.33.22 for (Google Transport Security); Thu, 14 Aug 2025 08:33:22 -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; AJvYcCX7mfvF9oPSq3ajkkGZZqsyKnuA1xbSSJIo5PJaH3N8C7EYHhSIfdUiBf3prvgIjUBl/omG+OBf7t68ISH4@amarulasolutions.com X-Gm-Gg: ASbGnctktFvQ26g5oHyZwNpc6x0BaXJfBGujeTfVuP3xuV7oLWZ4o0Uf9PRGtP1x3mR a9cQcH9d5oTo+DtYuZdfYgAoOY/rDjTqesvcVzFJCONTtnwkg0Xp/Bm21MjaqeIKBPmXhv/hzaH 7UNqBuoNqHvRMdC/JTK6USd3ShCleD3WlGnvsgMuB63SsNvO8z75yGMHto+KS4XznR/JUnNv45S ukaLWt0+TJgeBETi7ruNXZaIUMM2qZFicYAnBT8BeSu9cJDfn77pyI2zBqy5kSVMRNm5xnuIc2k Op7uktr7377w4LOsq5OTOtSQrkC8YDb3PMpih/FE3aoU6nhfOcgSqpo6eI475HCKBf7FB8NkpUv bTmSmeY1N7OsKJufj84OtGB5zHvq+HmfFPjp1J24j9yPE+KQ9KWn0eQdrWi7Q+lF+0Vx1KT4gWF rl X-Received: by 2002:a17:907:3e8b:b0:ae0:b7c8:d735 with SMTP id a640c23a62f3a-afcbe212092mr292761266b.42.1755185601815; Thu, 14 Aug 2025 08:33:21 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 08:33:21 -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 2/5] package/qwt: bump to version 6.3.0 Date: Thu, 14 Aug 2025 17:32:56 +0200 Message-ID: <20250814153259.6822-3-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=R5SpobIV; 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: , Release notes: https://sourceforge.net/p/qwt/git/ci/qwt-6.2/tree/CHANGES-6.2 https://sourceforge.net/p/qwt/git/ci/develop/tree/CHANGES-6.3 Signed-off-by: Dario Binacchi --- (no changes since v1) package/qwt/qwt.hash | 8 ++++---- package/qwt/qwt.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/qwt/qwt.hash b/package/qwt/qwt.hash index d4fd210cbd69..e20c9ebadab9 100644 --- a/package/qwt/qwt.hash +++ b/package/qwt/qwt.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/qwt/files/qwt/6.1.6 -md5 cc71be5d6c33c2fc19ae8082ccdd3e83 qwt-6.1.6.tar.bz2 -sha1 b1f17a86c9b1b0790a0c0067ef69fb6277efac79 qwt-6.1.6.tar.bz2 +# From https://sourceforge.net/projects/qwt/files/qwt/6.3.0 +md5 06a8f8eb1bc07bedfb1df601804439cb qwt-6.3.0.tar.bz2 +sha1 9180f33f75ff8817f27019c94d10f92de840a5e4 qwt-6.3.0.tar.bz2 # Locally computed -sha256 99460d31c115ee4117b0175d885f47c2c590d784206f09815dc058fbe5ede1f6 qwt-6.1.6.tar.bz2 +sha256 dcb085896c28aaec5518cbc08c0ee2b4e60ada7ac929d82639f6189851a6129a qwt-6.3.0.tar.bz2 sha256 d8737db330e1eeb439962e11654ab7f1aece3561d9415454a8c538643824ede6 COPYING diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index 9f0b78655f6f..67292ee025be 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QWT_VERSION = 6.1.6 +QWT_VERSION = 6.3.0 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION) QWT_INSTALL_STAGING = YES From patchwork Thu Aug 14 15:32:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4247 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 43BA24207C for ; Thu, 14 Aug 2025 17:33:26 +0200 (CEST) Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-afcb79ff10asf15165066b.2 for ; Thu, 14 Aug 2025 08:33:26 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755185606; cv=pass; d=google.com; s=arc-20240605; b=T5Lt9xJwYrDs6HY6XbOgDBXYEJVnBzLHKZWS4m3XzxiK5kVXcbOwpGaHRs9X+P9EgK clmh0ZMj2BkfcTiyiUM5Zu/JPOzC69ORQfcVOvclbFIDnk2vnpqP2XZilvWEZV0hq79j pSnj280nhnAZvwe2KRK+7oPbP5x/p3awdSZLFaPH9ue3mUv+KB9/FAlDVkrcPUc57l0b qxrNucBun6pGHcuJbgN6tv9T+HL3khEtKGPC//6E21zly4VEwWQNhkzKebWVOCtKSlio 1+Q3HL5d6lQV80uYkdILYW5k/RrL6sQ6XPuH87oXKNasks1/AysxwTduClmZH6P39b67 7uuA== 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=oG92LOUBq2w8zGrUWMssFVqeLln27tVLCgnErHvHC6U=; fh=0DiH81bv9s5ZMvyQ8tScx2UMN+lZj4PpNtkrk4ub5W4=; b=AC1Jr9a5mpZRio53ykeipdyCOrSndKFT4wntaVtRAEYrtm8Zple79Bk5noLzHmpnRu CH4miqeYa9cub17bRjbMnU/+X1a+8b5im5pGrt/IoF3f8wBgC8JLsG9KZ6jYKfTP3Gyl snQjccTYy/r6pJs6A+IalK+UzLLdg54pGqaYfzC7cTNyqnRpGA1T797vWYKt2/bFwi9g OC4XLcIl4pZl6talcE+1UHiMhpnAD3li/KhXBXvKVvQhlUWn1tw2jWWY5ilVxnsucVb2 dZctBRPsEzBsajR67MzuIKc8KwRSfocIdfiw3gIg/+fXGQFtq58g7aSQWmWxgw13wpK2 rwCg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UHinUT+f; 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=1755185606; x=1755790406; 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=oG92LOUBq2w8zGrUWMssFVqeLln27tVLCgnErHvHC6U=; b=F+sJiGJ2S8MPC5A4eZQx6CPbQg882pakxFDDswIEqF080fOa4BKbhmBuIa5HQo5Q4c ETkiu+U0PvLrL/3eVyPxlJjVnkWbk9sA3DnVvgFcqZMYRPL4J9ItJ7vhV6iMlVNWNgHM 5I9toMYT+XmZZjvabLVX8gJAbiSbldZeH0vrY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755185606; x=1755790406; 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=oG92LOUBq2w8zGrUWMssFVqeLln27tVLCgnErHvHC6U=; b=R0VGH984Vds/vJ0A+gh2KE6HQeXbdwhDWDVitGzMhRNi1hCNYo3286X/S5nqCmWmWY svv0yp4L2brm5xgRy35ErM+UeNLVYeoPDrZmE7qVOv75XmUnHhVlzF+HQvYB7gHuv5Ba uVffP0fTI29nI7fjUGPpuok6IoJAEOBKBFqBFiLM/zOEE/1YltAU6BE2r1UcB1HVbuYW 9bplQXCPp7K0h3G2l/MOvXlyqQVh1LLYnvnwUwUMkj9lf0EWCBvTRLVgSXBi0MN5oxou +2QEvZ5+zJogRG0y2SxhhSPiISeHKMYqrJM7DWV4TKN/moU437ZbvlX3vG6/5ALdu2R9 B6ig== X-Forwarded-Encrypted: i=2; AJvYcCXlaBAR/MqalRpqjyMaPxIuoGCEx9RxVZXvDJpiayEdfP3v357yeZre9lHjcpbMuSs3w/5PXVfDFbKsuIke@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YySaCH6R6xNjpYYe04nOfkPCq5Q9TUoCAd1QGKLyR1pmsmWPNOC LUrxnb4tnx+F2SQ9theu38jnSausUgOZp792EIXzq1EB/5pNnXXqoIOGOZ98vcyCSc1Bww== X-Google-Smtp-Source: AGHT+IG+Iy/hlCT0KLFIz0JrNGVbjZPrO3NwYNhMPrVMhwR8ee80wEOKzN2qBezB4cJ5LMXEQkzhwA== X-Received: by 2002:a05:6402:5191:b0:615:d492:5bf3 with SMTP id 4fb4d7f45d1cf-6188ba28c06mr1314223a12.6.1755185605819; Thu, 14 Aug 2025 08:33:25 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZcV42wn9/wBcdQrNfRmfNrXIN1y3nSFWPylRLucdPSozw== Received: by 2002:a50:d686:0:b0:604:f62b:4112 with SMTP id 4fb4d7f45d1cf-6188a394f8als767256a12.2.-pod-prod-06-eu; Thu, 14 Aug 2025 08:33:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV3IOtyOGKanXDEEN+Q/QXmlG5ebGlMSdNdq1oHTH7FbL5xSlhOafBkS841rHnR7sMQgKf1OXu2AKTfNErW@amarulasolutions.com X-Received: by 2002:a17:906:dc90:b0:af9:acc3:823f with SMTP id a640c23a62f3a-afcb995ef91mr308661166b.58.1755185603435; Thu, 14 Aug 2025 08:33:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755185603; cv=none; d=google.com; s=arc-20240605; b=A/dWbawh8j5u1KfnnJgRJIqZhIe9WJoKhlsDjfMQ/4MWj+8gqI6lzDchU9mZxk1b7G XYmYxjxulqnzyLvV2FdU78zgZFOMWlRsick5qZCmfpGbUc7NZd90u3vv8wJ3Iymsm7UN OIZUA7KommUxCHN2Sih3aeO7tnUzcB+ID++OSfCklrMpyvTDuJe+UgUQdhA27rJ6mQda tx1HtQdkUlrRCaRKdgHlbuhpufp+hRiMYJFSXrOXuZ8yd8Z5oUjeKIpnr9zxS34Dmm9R y/rUxqa4JNELa34MF3gvmvHFVpGVObNp4KhPPHm2s9HjBsQw52pcLQ++KdefaMV9N/Y8 lCqg== 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=8SSie2DvEC8aGt7yKTAVRQPP/EjwDwwbFMlKAoB2DOk=; fh=pWdIbbagmQlE+dim+/UbLBjzwrUQmYCL3012/re7fXQ=; b=QBZlQiNEur77NtUNABigpCgWZ1fVTQKcqh9FHpzTX1Jw02RWOVZGDJb4Vv9BJHj+u/ X/IBROqt+cy2eJHD4IlmKlchDZRBoQtnOVvn32i/i8l/eZPa7SVwlKt0tAMWE/sWH+Db ms2b9A+LKa9pj8bL/2Re3J/Tuw6xC4LNDAfQSoQs0wsoWYtS9std2mz4B0LGD4U/K7Wg xsdi96fgZg1Kt+BsA0TdJ5QtTJ5j5IgBRIXOpLFRlc76qZvIhT8PsnCnikQGtmW6uKwK 1EbEfGOHJoVx8Gpic4M/WVsGcxAquFYiL0vX7a6OCQhkWCfdTGfkZyNezD1h2zWTfbXl qt3Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UHinUT+f; 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-af932112ad6sor1804606066b.4.2025.08.14.08.33.23 for (Google Transport Security); Thu, 14 Aug 2025 08:33:23 -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; AJvYcCVxMyWBgiIuEKQNFHPSwBLOIg/peE+zmkNTTd9JsZqiS8ClYFA4V7z1OQyrIhUODJcKRV+hUoUVBFcAWAG9@amarulasolutions.com X-Gm-Gg: ASbGncvYvxJxC2VyuYGOPwoMywGenu5ISRe0aCva6dpT9TPO+8OPPROtBDAYbdRUPI/ znNiFcAIvx3JO0eWHx83WCWifQyS9MGnm6AiZYwlIk7CZRisbGdIC84JQ8EJzbVmh3ibrbgvzau p1x+YE1R66eKv+L+YY4NmNiJU6YB1VMnkAmaR4CZ2fZzjKtDncjZ1vB7iE+OUSPrM6crzEUNRBR yPNY0ptnzg35b2XkQ+fDxl7epSFE1AJZ0ye7junDOOyFScmiFJr2So0+E/HO5R92MyJZZk2mj5Z GqgvdtOma3O5QSB5vxHogNzD3zh7mhk5l5mVSzuKiYo3kyjqQq3Lhnd7I/TBah6kviwNP4I5LCW qozmNNUex9MZqqu01UgDnbfErSXy9xHq2DgYj63UTIqr67U7UuUKSb6YOT3+QGagUzhtsANpNoN OT X-Received: by 2002:a17:907:9710:b0:af9:c119:3b4 with SMTP id a640c23a62f3a-afcb93be17bmr352138066b.13.1755185602927; Thu, 14 Aug 2025 08:33:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 08:33:22 -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 3/5] package/pkg-qmake: support Qt6 Date: Thu, 14 Aug 2025 17:32:57 +0200 Message-ID: <20250814153259.6822-4-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=UHinUT+f; 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: , Extend build support to Qt6. Signed-off-by: Dario Binacchi --- (no changes since v1) package/pkg-qmake.mk | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index ccf78692e885..1449690ca114 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -20,11 +20,22 @@ # ################################################################################ + +ifeq ($(BR2_PACKAGE_QT5),y) +QT_VERSION = 5.15 +else +QT_VERSION = 6.8 +endif + +QT_VERSION_MAJOR = $(word 1,$(subst ., ,$(QT_VERSION))) +QT_VERSION_MINOR = $(word 2,$(subst ., ,$(QT_VERSION))) +QT_BASE = qt$(QT_VERSION_MAJOR)base + # # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + sed -e '/^MODULE_VERSION/s/$(QT_VERSION_MAJOR)\.$(QT_VERSION_MINOR)\.[3456789]/$(QT_VERSION)/' -i \ $($(PKG)_BUILDDIR)/.qmake.conf touch $($(PKG)_BUILDDIR)/.git endef @@ -45,15 +56,15 @@ define inner-qmake-package $(2)_INSTALL_STAGING_OPTS ?= install $(2)_INSTALL_TARGET_OPTS ?= $$($(2)_INSTALL_STAGING_OPTS) -ifneq ($(1),qt5base) -$(2)_DEPENDENCIES += qt5base +ifneq ($(1),$(QT_BASE)) +$(2)_DEPENDENCIES += $(QT_BASE) endif ifeq ($$($(2)_SYNC_QT_HEADERS),YES) $(2)_PRE_CONFIGURE_HOOKS += QT_HEADERS_SYNC_HOOK endif -$(2)_POST_PREPARE_HOOKS += QT5_QT_CONF_FIXUP +$(2)_POST_PREPARE_HOOKS += QT$(QT_VERSION_MAJOR)_QT_CONF_FIXUP # # Configure step. Only define it if not already defined by the package @@ -62,7 +73,7 @@ $(2)_POST_PREPARE_HOOKS += QT5_QT_CONF_FIXUP ifndef $(2)_CONFIGURE_CMDS define $(2)_CONFIGURE_CMDS cd $$($(2)_BUILDDIR) && \ - $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) $$($(2)_CONF_OPTS) + $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT$(QT_VERSION_MAJOR)_QMAKE) $$($(2)_CONF_OPTS) endef endif 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 From patchwork Thu Aug 14 15:32:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4249 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 AF2A443665 for ; Thu, 14 Aug 2025 17:33:28 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-6188945942bsf1219256a12.0 for ; Thu, 14 Aug 2025 08:33:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755185608; cv=pass; d=google.com; s=arc-20240605; b=SoTo40oEj+50U9tvDPs+BeumOiNVNf1f7M6oujjuv1MgcymHmP1rH3PeVCAwXcsEzM cfjufcY7ndL5424J9h8jabTF+65s0BL44/5nPS986Nh4WUBCivO6WC/S6eSsN2fI6Fzb FMqZRpAqr5NGaAGfojO10askS3geKk5q4exV79ldVT6KURlc4k8be8Qpv0RSqmErjSz9 KGWTWeRI+5/NTPjJicDpfQsSzj+MN8xb9/ifhYQy7/7FumA2tdmOfI4wt2p0pp1G9tuk pvsMLr1felypw4IT/hrNfBuUV9qxH+WzqS8OvU4HqND6//rx359eiBp5fZcihWC0yEj9 fKQw== 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=4kZFOmk4O4k9OuPf6kQyZg5cQc4j0Z9U3BY1kR5AibA=; fh=PObDPTmxMXqWSmoIwUPYzgJxsEUeQD5prekt+3K+9Wg=; b=L/6l2LeDGjuMZHWJvdWqWApTzJd3Jpk8ROr7O4I8l9qoWeFRvrew6JB8VUBEZgrSqu 086SMREtq/6n/oIN7tLkCeuO80CssIO23pbKu6ZwA9Ct6VyVpIjeGwQtBXpAXJWb2/9K B6aFx2uW0YPnHKGR4Y5u74KD1CYRxro+bQOqmOH6iZmpdMvKTS1ka0p2YQDu+bJB1yy3 nf4GgAByQsaFU+If2+NS+RYzJ7sYd3obg2guwCy8v98AemWzLWqVlILEMuU5Qc7yyErV o9wGkAnV50506p8KCZqEJCTBH1vhY7rD+OAsr2tegdtUaXlFfcZPM3XSlcMSRM3yW1NJ jCfg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=H4r4DHxn; 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=1755185608; x=1755790408; 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=4kZFOmk4O4k9OuPf6kQyZg5cQc4j0Z9U3BY1kR5AibA=; b=XSuf80klMmcg/IQ4rklMHkvTiL46p/vyskWU7ycg0ttojky7moKvNosO0US94KTiyF usZuabzKLcUBjfkbQvCC6etb9lmG3zobec6g/FPTOQHVonwf4++NE9aSLuIUca97H9tc RW1nfy032W9OP9TXc3ulGiE4a4bxfqpRYf6vs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755185608; x=1755790408; 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=4kZFOmk4O4k9OuPf6kQyZg5cQc4j0Z9U3BY1kR5AibA=; b=WWXb+er74Kb+3asR01vPTqxDo6NDiZM1egk0MBcd66Ks1S9CY1iKM+l87IGzUYFbhy Gbnru1Wo4IlrzylAh9xz+6mpBVJNYw1W6COKtNtD2lgTn+Buxhgp/fpmRFGuVJ4h7hz5 KXULxiLlcN8IdzLu3knRRWZgNKT0iH3A86gCcDffA53sMC7Ke+B19UR+i3jemDokqzLS fZL/CLKdUqRH7ahX3KIAYQfMfSQjM4FklrAc2MZjN1pkHnBtJa10VNrWGjN0qvXfJO3G YDbtuQbBd2dmCqy7xb9WFeoTf1Wb9UBlvk3va2hdqnciETd8R0ql8FqWwyXzDtf/ZTt3 5aDA== X-Forwarded-Encrypted: i=2; AJvYcCXIvqButLWxgLalcrV+ui5TI60DIA8UNMZhXKq6lA8e95iVfP6A6CWFT8XO5AUwkFG3xtLykHdIkhyskIxd@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YyZGzp8T5/7BEPNMy/GVbCsyoDd8XxIa532kjqKkkw/BDTN+slx 1BM0PdavWs+8B3+iEMMmnJY5/IAGxJIS5gR3xmDH1jnhUHkscOPilwrySunEx4n5+TrX/A== X-Google-Smtp-Source: AGHT+IESVxwPBfg1yhiuElCJWJrT5nc9KRXunwk/CO2IJkt7InOVprck9An4w6VTF7LDG3PRGB85lg== X-Received: by 2002:a50:c059:0:b0:617:c586:9bca with SMTP id 4fb4d7f45d1cf-6189199faa0mr1958411a12.4.1755185608055; Thu, 14 Aug 2025 08:33:28 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZcU7Uhv2fU4qxrLpeUbaY3Lbppbnm8m+aR+ik9nbgxaNw== Received: by 2002:a05:6402:440f:b0:615:3262:824f with SMTP id 4fb4d7f45d1cf-6187f6d1454ls681627a12.2.-pod-prod-00-eu-canary; Thu, 14 Aug 2025 08:33:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUHZQPVPwtCGpKT75jnPFDMGobfgismaQTi34JLKsD8wY+GKQjZMBO8PXC9hzgxpnkUHTiBXuUXIZOWOOUV@amarulasolutions.com X-Received: by 2002:a17:906:f597:b0:af9:116e:e373 with SMTP id a640c23a62f3a-afcbd894332mr269778766b.21.1755185605708; Thu, 14 Aug 2025 08:33:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755185605; cv=none; d=google.com; s=arc-20240605; b=el5EevkylG+SPySJT4rAoRLogA3bWZC/htBDebokSn3UnAoPDQNndMakGaN7ojcSmc qSlllXI4HbjT9b5KQqdjtSJHoo8nSCAvngSGiseF1mKmAO8KFywG3QcMkx/A7kpeqRHL /pvSEXpuyJjLGp09R5dPL0jXnqob1BcsG7uM53vGY79W3M/ZxC+9JSQim/TzAZ7R+YTj OKU5I7AhqDtyZbA1uiPIXSJ2ZbGwXza33M3OfMzkB4mJiCIQwv5LGrePln3LAXF2v0X9 nMKJPCKiVUW92Mc3CgPZtxzDiBiGTP9vS+Kqm2YNVsiiW5HIOjO7GfLn8ujjv/HiirZd ZKkQ== 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=jo6XNWQjvvZivIg+e9Jllj7wGYs4TiNC3o3+uYMg5Is=; fh=/t+oA6yhRP8HHXrZK0hRvM0NBk5fxdSeuGAGK87smrE=; b=Wpeix28AhDQZRz8JGl3dGZHGPv/y7hb/OxoujflIwdLgkPv2UoZMpG9clc17bE6/Ch ukzkI/QF3lndUzYEX/wEsbbmegK/rSzhuxjNTv9lC40Cvco/1d9/8ZRD2UGeyzfKKrd5 xuBYYasmvqIjTX+2c0vd0aB1iNLatd6F8vKc0F9ALTYYV53luAZ3jm5Zb4MC+hbOSXmn F/gCs/kn0IqvTjrOM+u3XO3+VaA/Hw7wCFO5+dY/jlifj20mIsYPuZaX1TWBe3kCgzVN zg8nNmUVLU3KdSRfUIIRE4sqLC+PncFG+jk7lv69+3DKMlG/sPrgGwIFUMPqYy77euTd 5SCA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=H4r4DHxn; 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-afcc57e529asor57134666b.6.2025.08.14.08.33.25 for (Google Transport Security); Thu, 14 Aug 2025 08:33: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; AJvYcCVvUOrDBzC0D0MPDdIltT5bSvfjn5/K//Fv4t5CZJLT+sZg7Mx/wCOvVefJAA0Xc3UzBjWeg8zEloBASbON@amarulasolutions.com X-Gm-Gg: ASbGnctUVf3w9fWdAt3llaUwJYeqCVZd7kbmaYQX/yIQb6JF47Rh3IWbkTBdhNJDTYZ o+uW3XR6JRTyX8fCXeG4ensATa6R8tNrQ0oBdXc4nEHXUPYw5nTSWiJvwNDPAk+KUxbBB2cUAGn 732FQCdNe+JlUL607w6H4EKZPDdybAmTJn6VnlHY8nMyx3l+mKFoRaeV+WnIrFPzNxZfJJjOowl pBd75ZwoTnFaLYj8fI7UN11bW0mGTo66K/RKh2GmPIZEqbUFAQrrHbcQepQIFLOBdVDAp1cBTvf Bb69Kdnhxk+Ekl2X4hFnjSTfKRU69lqOYNNbYj62HJhwpr6UhnYORl//4a3R358zxsfzAE2Lv5x ZXyoXxDa9WKI7zIX2SOUiy8LHztJz0R2YTsJIQRuDVOSJIGDg2vUon2/ZSCRAN9DBHCn2PdQwz7 7l X-Received: by 2002:a17:907:160c:b0:afc:a3b2:d100 with SMTP id a640c23a62f3a-afcbe7c8410mr356831366b.7.1755185605262; Thu, 14 Aug 2025 08:33:25 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 08:33:24 -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 5/5] package/cutekeyboard: enable build with Qt6 Date: Thu, 14 Aug 2025 17:32:59 +0200 Message-ID: <20250814153259.6822-6-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=H4r4DHxn; 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: , Enable building of cutekeyboard with Qt6. With the merge of QuickControls2 into qtdeclarative, the corresponding Kconfig option has also disappeared in Buildroot. Signed-off-by: Dario Binacchi --- (no changes since v2) Added in v2 package/cutekeyboard/Config.in | 13 ++++++++----- package/cutekeyboard/cutekeyboard.mk | 6 +++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package/cutekeyboard/Config.in b/package/cutekeyboard/Config.in index bd661b0cd42e..4f83316644a2 100644 --- a/package/cutekeyboard/Config.in +++ b/package/cutekeyboard/Config.in @@ -1,10 +1,13 @@ config BR2_PACKAGE_CUTEKEYBOARD bool "cutekeyboard" - depends on BR2_PACKAGE_QT5 - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK - select BR2_PACKAGE_QT5QUICKCONTROLS2 + depends on BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6 + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE || BR2_PACKAGE_QT6 # qt5declarative + select BR2_PACKAGE_QT5DECLARATIVE if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5DECLARATIVE_QUICK if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5QUICKCONTROLS2 if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE_GUI if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6DECLARATIVE if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6DECLARATIVE_QUICK if BR2_PACKAGE_QT6 help CuteKeyboard is a Qt virtual keyboard plugin for embedded applications. diff --git a/package/cutekeyboard/cutekeyboard.mk b/package/cutekeyboard/cutekeyboard.mk index 775bed0fe995..8181950aac50 100644 --- a/package/cutekeyboard/cutekeyboard.mk +++ b/package/cutekeyboard/cutekeyboard.mk @@ -6,7 +6,11 @@ CUTEKEYBOARD_VERSION = v1.3.0 CUTEKEYBOARD_SITE = $(call github,amarula,cutekeyboard,$(CUTEKEYBOARD_VERSION)) -CUTEKEYBOARD_DEPENDENCIES = qt5declarative qt5quickcontrols2 +ifeq ($(BR2_PACKAGE_QT5),y) +CUTEKEYBOARD_DEPENDENCIES += qt5declarative qt5quickcontrols2 +else +CUTEKEYBOARD_DEPENDENCIES += qt6declarative +endif CUTEKEYBOARD_INSTALL_STAGING = YES CUTEKEYBOARD_LICENSE = MIT CUTEKEYBOARD_LICENSE_FILES = LICENSE