From 03c23d299ab683c34bc69ad7423584e511c29d74 Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Thu, 11 May 2023 15:21:51 +0200
Subject: [PATCH] qt5: reduce external dependencies of host tools

Fixes #4868
---
 repos/libports/lib/import/import-qt5_cmake.mk | 2 +-
 repos/libports/lib/import/import-qt5_qmake.mk | 2 +-
 tool/tool_chain_qt5                           | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/repos/libports/lib/import/import-qt5_cmake.mk b/repos/libports/lib/import/import-qt5_cmake.mk
index 8a9e3bd800..d9cd2e2bbd 100644
--- a/repos/libports/lib/import/import-qt5_cmake.mk
+++ b/repos/libports/lib/import/import-qt5_cmake.mk
@@ -6,7 +6,7 @@
 # QT5_PORT_LIBS:        Qt5 libraries used from port (for example libQt5Core)
 #
 
-QT_TOOLS_DIR = /usr/local/genode/qt5/22.08
+QT_TOOLS_DIR = /usr/local/genode/qt5/23.05
 
 ifeq ($(filter-out $(SPECS),arm),)
 QT_PLATFORM = genode-arm-g++
diff --git a/repos/libports/lib/import/import-qt5_qmake.mk b/repos/libports/lib/import/import-qt5_qmake.mk
index a4e853123e..bf64b5f70b 100644
--- a/repos/libports/lib/import/import-qt5_qmake.mk
+++ b/repos/libports/lib/import/import-qt5_qmake.mk
@@ -6,7 +6,7 @@
 # QT5_PORT_LIBS:        Qt5 libraries used from port (for example libQt5Core)
 #
 
-QT_TOOLS_DIR = /usr/local/genode/qt5/22.08
+QT_TOOLS_DIR = /usr/local/genode/qt5/23.05
 QMAKE        = $(QT_TOOLS_DIR)/bin/qmake
 
 ifeq ($(filter-out $(SPECS),arm),)
diff --git a/tool/tool_chain_qt5 b/tool/tool_chain_qt5
index f4331210f0..8c3b3b343e 100755
--- a/tool/tool_chain_qt5
+++ b/tool/tool_chain_qt5
@@ -39,7 +39,7 @@ CONTRIB_DIR               = $(shell $(GENODE_DIR)/tool/ports/current qt5-host)
 QTBASE_DIR                = $(CONTRIB_DIR)/src/lib/qtbase
 QTDECLARATIVE_DIR         = $(CONTRIB_DIR)/src/lib/qtdeclarative
 QTTOOLS_DIR               = $(CONTRIB_DIR)/src/lib/qttools
-TOOL_VERSION              = 22.08
+TOOL_VERSION              = 23.05
 BUILD_DIR                 = $(GENODE_DIR)/build/tool/qt5/$(TOOL_VERSION)
 DEFAULT_INSTALL_LOCATION  = /usr/local/genode/qt5/$(TOOL_VERSION)
 INSTALL_LOCATION         ?= $(DEFAULT_INSTALL_LOCATION)
@@ -57,10 +57,13 @@ $(QMAKE): $(QTBASE_DIR)/configure
 	$(VERBOSE)cd $(BUILD_DIR)/qtbase && $(QTBASE_DIR)/configure \
 	                                    -opensource \
 	                                    -confirm-license \
+	                                    -no-glib \
 	                                    -no-iconv \
-	                                    -no-zstd \
+	                                    -no-icu \
 	                                    -no-opengl \
 	                                    -no-strip \
+	                                    -no-zstd \
+	                                    -qt-pcre \
 	                                    -prefix $(INSTALL_LOCATION)
 
 $(BUILD_DIR)/qtbase/src/Makefile: $(QMAKE)