mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Tretter <m.tretter@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: mtr@pengutronix.de
Subject: [ptxdist] [PATCH] host-meson: ignore uic if it is not found
Date: Fri, 15 Mar 2024 10:56:23 +0100	[thread overview]
Message-ID: <20240315095623.1888719-1-m.tretter@pengutronix.de> (raw)

Qt builds and installs the uic only if Widgets are enabled, but meson
always checks for the uic when checking for the Qt tools. This breaks
the build of applications that use Qt, but don't use Widgets.

Add a patch to ignore the uic if it is not found, as PTXdist already
correctly handles the dependencies.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 ...04-HACK-don-t-fail-if-uic-is-missing.patch | 29 +++++++++++++++++++
 patches/meson-1.3.0/series                    |  3 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch

diff --git a/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch b/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch
new file mode 100644
index 000000000000..c404d3149d4c
--- /dev/null
+++ b/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch
@@ -0,0 +1,29 @@
+From: Michael Tretter <m.tretter@pengutronix.de>
+Date: Tue, 12 Mar 2024 18:22:06 +0100
+Subject: [PATCH] HACK: don't fail if uic is missing
+
+Qt5 builds the uic only if Widgets are enabled. The uic is not required
+for applications that don't use Widgets, but is required as standard
+tool by meson.
+
+Ignore uic if it is not found.
+
+Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
+---
+ mesonbuild/modules/qt.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py
+index b3242ceaf167..26b5dbc9fc0d 100644
+--- a/mesonbuild/modules/qt.py
++++ b/mesonbuild/modules/qt.py
+@@ -281,6 +281,9 @@ class QtBaseModule(ExtensionModule):
+                 if tool.name == 'lrelease':
+                     mlog.warning('Ignoring missing lrelease')
+                     continue
++                if tool.name == 'uic':
++                    mlog.warning('Ignoring missing uic')
++                    continue
+                 if required:
+                     raise MesonException('Qt tools not found')
+                 return False
diff --git a/patches/meson-1.3.0/series b/patches/meson-1.3.0/series
index 209f73f563c2..3bba04f5b328 100644
--- a/patches/meson-1.3.0/series
+++ b/patches/meson-1.3.0/series
@@ -3,4 +3,5 @@
 0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
 0002-HACK-enable-NEON-only-for-ARMv7.patch
 0003-HACK-don-t-fail-if-lrelease-is-missing.patch
-# ab164f87a7e08b87479345777ce62823  - git-ptx-patches magic
+0004-HACK-don-t-fail-if-uic-is-missing.patch
+# 344e721ffeeec9faa5876797156d7064  - git-ptx-patches magic
-- 
2.39.2




             reply	other threads:[~2024-03-15  9:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-15  9:56 Michael Tretter [this message]
2024-03-23  8:59 ` [ptxdist] [APPLIED] " Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240315095623.1888719-1-m.tretter@pengutronix.de \
    --to=m.tretter@pengutronix.de \
    --cc=mtr@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox