From patchwork Wed Sep 4 12:20:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1980724 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WzM6D2Lc8z1yXY for ; Wed, 4 Sep 2024 22:21:08 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 67486402B1; Wed, 4 Sep 2024 12:21:05 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 4QakYKD4-9Xg; Wed, 4 Sep 2024 12:21:04 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2460D402B2 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 2460D402B2; Wed, 4 Sep 2024 12:21:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8D1051BF47A for ; Wed, 4 Sep 2024 12:21:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 798AE80C7F for ; Wed, 4 Sep 2024 12:21:02 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ReLxHtqAoRFn for ; Wed, 4 Sep 2024 12:21:01 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22c; helo=mail-lj1-x22c.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 4BDB280C6F DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4BDB280C6F Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4BDB280C6F for ; Wed, 4 Sep 2024 12:21:00 +0000 (UTC) Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2f3f07ac2dcso72537751fa.2 for ; Wed, 04 Sep 2024 05:21:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725452458; x=1726057258; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=boZ4YuA/2Sf88w9E0YNE6ImutR5jU0EzBfPDNpUnCx4=; b=Ku+a3X888Jjbded8KzY6b9mAFkyTaXCsubqHA9sUxyv/E6JqD4unto5VhBj6jDY0fp M7wvwioiHCtfnaGtHRSBvj+m+qYjs5WOl9uODaRBFFbxgowJ60KmqCSED42uymC1+Bi0 +U5bJdDn02bk9L2Cm79DzDEaaS3WJOfihiXgIf06aXPRkLqehoUocZIgLoVmlKLvcVAn sG1wZaSMtwPSuBNopZhxynn5Yz8nED292xiLPpn1LwMtZrcLj1v3herFxTJlkVrw3knS adrPUTFmvMxzp8EA70oP/FM7AhSjm/yHH6CSsa7PWevU6H0doDbY/uTWCDKoeTyiJAO3 wPMg== X-Gm-Message-State: AOJu0Yz9Nkcb12Iq0YEXDYAU80Xa0Jfh2UoZV3ppzpYprI5erz65GtUN oBDhy0R2dizzgSHwHFtQ6L7N1pfZborviFGpE0QGQsXIRbXsEaB2RiG1Fw== X-Google-Smtp-Source: AGHT+IHkxEL8AotS4Snptra0o9KQAeryVMgLcoRSawsiDUAmCtefAJQKe2lYA98EHaVRT/IIiewa6Q== X-Received: by 2002:a05:6512:b09:b0:52c:df6f:a66 with SMTP id 2adb3069b0e04-53546ba03a3mr12198868e87.58.1725452457148; Wed, 04 Sep 2024 05:20:57 -0700 (PDT) Received: from precision7530-arch-roy.lan ([79.161.254.12]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53540841326sm2333930e87.197.2024.09.04.05.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 05:20:56 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Wed, 4 Sep 2024 14:20:37 +0200 Message-ID: <20240904122040.738362-1-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725452458; x=1726057258; darn=buildroot.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=boZ4YuA/2Sf88w9E0YNE6ImutR5jU0EzBfPDNpUnCx4=; b=V5sUFNJ/z3436p2f/NAyj496ntkqV3DEmd9X0U3hJW5GEVQZZkjwZ/kf7PszCeepaB P/mo0WrBcYm9XIq+WP7mpj0PZOWt+fWl0VWEEa8HTjvXf/BiEdwMPQOrWrW6d60J/CGp 0kBlyq43cppTzK6xTpLYWfATA5vkpRfa8dRSfDhca4JU+Bi/1L93t0QH8eekqJxPH+DX bB8B+NXtuiBzpljzjPsZO1y12usFBzFRx11rBEi406urjM+s2ydWrC97qEmIwKkakz7H j8DVrvgzBddLHAN2WQxK4tpLC+Ggg+p41aC0k61UHQ3kizP6nUmluTmx2QJsf8/H/lHr Y27A== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=V5sUFNJ/ Subject: [Buildroot] [PATCH 1/2] package/qt6/qt6tools: allow building host Qt Linguist Tools X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" According to src/linguist/CMakeLists.txt we need to enable the linguist feature: ... if(NOT QT_FEATURE_linguist) return() endif() add_subdirectory(lconvert) add_subdirectory(lprodump) add_subdirectory(lrelease) add_subdirectory(lrelease-pro) add_subdirectory(lupdate) add_subdirectory(lupdate-pro) if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png) add_subdirectory(linguist) endif() ... And according to configure.cmake we need to select print support: ... qt_feature("linguist" PRIVATE LABEL "Qt Linguist" PURPOSE "Qt Linguist can be used by translator to translate text in Qt applications." CONDITION TARGET Qt::PrintSupport ) ... Signed-off-by: Roy Kollen Svendsen --- package/qt6/qt6tools/Config.in | 11 +++++++++++ package/qt6/qt6tools/qt6tools.mk | 10 ++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in index 5f52c5644f..eea461a2a9 100644 --- a/package/qt6/qt6tools/Config.in +++ b/package/qt6/qt6tools/Config.in @@ -15,3 +15,14 @@ config BR2_PACKAGE_QT6TOOLS and design of applications. https://github.com/qt/qttools + +if BR2_PACKAGE_QT6TOOLS + +config BR2_PACKAGE_HOST_QT6TOOLS_LINGUIST_TOOLS + bool "linguist tools (host)" + select BR2_PACKAGE_HOST_QT6BASE_PRINTSUPPORT + help + Translate Qt C++ and Qt Quick applications into local + languages. + +endif diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk index 09c986cfc6..897cf43054 100644 --- a/package/qt6/qt6tools/qt6tools.mk +++ b/package/qt6/qt6tools/qt6tools.mk @@ -37,11 +37,17 @@ QT6TOOLS_DEPENDENCIES = \ qt6base \ host-qt6tools +HOST_QT6TOOLS_DEPENDENCIES = host-qt6base + +ifeq ($(BR2_PACKAGE_HOST_QT6TOOLS_LINGUIST_TOOLS),y) +HOST_QT6TOOLS_CONF_OPTS += -DFEATURE_linguist=ON +else +HOST_QT6TOOLS_CONF_OPTS += -DFEATURE_linguist=OFF +endif + ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y) QT6TOOLS_DEPENDENCIES += qt6declarative endif -HOST_QT6TOOLS_DEPENDENCIES = host-qt6base - $(eval $(cmake-package)) $(eval $(host-cmake-package)) From patchwork Wed Sep 4 12:20:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1980725 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WzM6J2KG9z1yXY for ; Wed, 4 Sep 2024 22:21:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 86F12404D9; Wed, 4 Sep 2024 12:21:08 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id GlrGAlL6tRxE; Wed, 4 Sep 2024 12:21:07 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 1CB2D4049A Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 1CB2D4049A; Wed, 4 Sep 2024 12:21:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 32DA41BF47A for ; Wed, 4 Sep 2024 12:21:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1FADB40129 for ; Wed, 4 Sep 2024 12:21:04 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id gHkoZQHmXzvF for ; Wed, 4 Sep 2024 12:21:03 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22a; helo=mail-lj1-x22a.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org BC45940467 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org BC45940467 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by smtp2.osuosl.org (Postfix) with ESMTPS id BC45940467 for ; Wed, 4 Sep 2024 12:21:02 +0000 (UTC) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2f3f07ac2dcso72538071fa.2 for ; Wed, 04 Sep 2024 05:21:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725452460; x=1726057260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BsCg33FtuZUF8hsHjEbpAdlh1j9dWWPnAIFcR2VFbC4=; b=W3Ge+A+AsPaQX01sG2FKC2QEZBMIjJUn6naQzfH4qGKUJ/kZ5Ohzv2B71JWrXVCTvW JjwV51PCtRn44pwl//ZdlhoNXdZZMNeMaYw5DGq6QUOuwvQXjdUTpNfAMmhOkeb/7Ely Onz10duh+qNqT1h7VD5EKympwtTgKh2SIk+rEoAjItyyM5I9z4bppLmnxEbIogNw7obb i5R4Kkn57F1eQgAH8QbvUTdBAqdpHrWAeu+ItVan6hMs30uq5EaFLG8FthJNr1SHLxPT SLkHTKECgXJk5k94mFY6K5lpaegSSfT+qX72NsqTB1qgklUctvk7i9mp4do74mudR2cy Opqw== X-Gm-Message-State: AOJu0YzdeT+MfveyWf9DO7Zj8qKI8IiNkoaalf20dDkZh6PdnABDBs7J RhmdsJgWZ79zJcj216WGiD8e/+TSyFOdZsXZwluJVuZzgtQcbWXG3lZ84A== X-Google-Smtp-Source: AGHT+IF1doYAPLH+03+DTB/jVyPm+fC0jDmR5cecjScLWCNjRR+AAS+UEVaHNUd80JmZfeEBhyLSng== X-Received: by 2002:a05:6512:3e02:b0:533:483f:957f with SMTP id 2adb3069b0e04-53546b2c0c9mr11842599e87.32.1725452458808; Wed, 04 Sep 2024 05:20:58 -0700 (PDT) Received: from precision7530-arch-roy.lan ([79.161.254.12]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53540841326sm2333930e87.197.2024.09.04.05.20.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 05:20:58 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Wed, 4 Sep 2024 14:20:38 +0200 Message-ID: <20240904122040.738362-2-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240904122040.738362-1-roykollensvendsen@gmail.com> References: <20240904122040.738362-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725452460; x=1726057260; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BsCg33FtuZUF8hsHjEbpAdlh1j9dWWPnAIFcR2VFbC4=; b=XSEmQPkGJNRmUfKaKi3FVNdVQ8Z1g8I5+9iIY7jB/OXuZ0eh+ufLg8ZPZdY7H3udZj QNviMhIwf+WZfES/BLSSNEvxKCdbEWStoUFOmKLsp4QtYI6dwKCs6IQsr8vQ4cVwkD6A bY1O/1JNC/FMv+cMCH3hbs9UvKqlRCSCPz+hq5huA4iWHZvvWzKYKcZp32g+XU61hcox SC7IYfX7DH8rRUudLPfgFEhYnE5HkYvkuXOBnDJ5m3Au641xG4IetW5CHU+EO5k6gEko 4nVmb2Pqc6bZJyfnPkA2cOI6nNlsfqVtOvUtY2SBeNSxlKptQ2bY9Wlos2SG4gNsfBpM 2N1Q== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=XSEmQPkG Subject: [Buildroot] [PATCH 2/2] package/qt6/qt6base: allow selecting the host Qt Print Support module X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" According to configure.cmake printsupport requires widgets: qt_feature("printsupport" PRIVATE LABEL "Qt PrintSupport" CONDITION QT_FEATURE_widgets SECTION "Module" PURPOSE "Provides the Qt PrintSupport module." ) So we let print support automatically select widgets support. Signed-off-by: Roy Kollen Svendsen --- package/qt6/qt6base/Config.in.host | 11 +++++++++++ package/qt6/qt6base/qt6base.mk | 16 ++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host index 46fb668817..8f0bc1f070 100644 --- a/package/qt6/qt6base/Config.in.host +++ b/package/qt6/qt6base/Config.in.host @@ -8,6 +8,13 @@ config BR2_PACKAGE_HOST_QT6BASE_GUI config BR2_PACKAGE_HOST_QT6BASE_NETWORK bool +# Select this if you need host qt6 tools that require the Qt Print Support +# module +# (e.g. Qt Tools Linguist Tools). +config BR2_PACKAGE_HOST_QT6BASE_PRINTSUPPORT + bool + select BR2_PACKAGE_HOST_QT6BASE_WIDGETS + # Select this if you need host qt6 tools that require the Qt::Test module # (e.g. qmltestrunner). config BR2_PACKAGE_HOST_QT6BASE_TEST @@ -17,3 +24,7 @@ config BR2_PACKAGE_HOST_QT6BASE_TEST # (e.g. qhelpgenerator). config BR2_PACKAGE_HOST_QT6BASE_SQL bool + +# The Qt Widgets module is required by the Qt Print Support module +config BR2_PACKAGE_HOST_QT6BASE_WIDGETS + bool diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 4c0392f92d..271f464115 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -113,10 +113,8 @@ HOST_QT6BASE_CONF_OPTS += \ -DFEATURE_png=OFF \ -DFEATURE_gif=OFF \ -DFEATURE_jpeg=OFF \ - -DFEATURE_printsupport=OFF \ -DFEATURE_kms=OFF \ -DFEATURE_fontconfig=OFF \ - -DFEATURE_widgets=OFF \ -DFEATURE_libinput=OFF \ -DFEATURE_tslib=OFF \ -DFEATURE_eglfs=OFF @@ -131,6 +129,13 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF endif +# The Qt Print Support module is required for building Qt Tools Linguist Tools +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_PRINTSUPPORT),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF +endif + # We need host qt6base with Sql support for host-qt6tools to generate the # qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not # available. @@ -150,6 +155,13 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF endif +# The Qt Widgets module is required by the Qt Print Support module +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_WIDGETS),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF +endif + # Conditional blocks below are ordered by alphabetic ordering of the # BR2_PACKAGE_* option.