cleanup

Author: slipher

Dockerfile

@@ -72,7 +72,6 @@ COPY md5sums-qt.txt build-qt.sh qtbase.patch /build-qt/
 ARG release
 # Note: {foo:+bar} here is a syntax of the Dockerfile, not the shell!
 ENV IPO_ARG=${release:+-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON}
-RUN echo IPO_ARG ${IPO_ARG}
 RUN BUILDQT_CMAKE_ARGS="${IPO_ARG} -DCMAKE_POSITION_INDEPENDENT_CODE=OFF -DFEATURE_reduce_relocations=OFF" CXXFLAGS='-fno-pic -no-pie' CFLAGS='-fno-pic -no-pie' PKG_CONFIG_PATH=/openssl/lib64/pkgconfig ./build-qt.sh && mv qt /qt && rm -rf /build-qt
 
 ###############

build-qt.sh

@@ -25,8 +25,6 @@ build_module() {
     module_vars "${module}"
     cd "${WORK_DIR}/${dirname}"
     options_var="options_${module}"
-    truncate_var="truncate_${module}"
-    echo ${!truncate_var:-} | xargs --no-run-if-empty truncate -s 0
     if [[ "${module}" = qtbase ]]; then
         patch -p1 < "${SCRIPT_DIR}/qtbase.patch"
         ./configure ${!options_var} ${common_options_cmake}
@@ -42,7 +40,6 @@ SCRIPT_DIR=$(realpath "$(dirname "$0")")
 INSTALL_DIR="${WORK_DIR}/qt"
 
 #FIXME bad warning in qtdeclarative-everywhere-src-6.8.3/src/quickwidgets/qquickwidget.cpp
-# TODO: no-pie linux-only
 
 common_options_cmake="
     -DFEATURE_accessibility=OFF
@@ -241,7 +238,6 @@ options_qtdeclarative='
     -DFEATURE_quicktemplates2_hover=OFF
     -DFEATURE_quicktemplates2_multitouch=OFF
 '
-truncate_qtbase='src/tools/uic/CMakeLists.txt'
 
 # qt5compat depends on qtdeclarative
 # qtdeclarative depends on qtshadertools, qtsvg

qtbase.patch

@@ -33,3 +33,14 @@ diff -u -r qtbase.old/src/tools/rcc/rcc.cpp qtbase.new/src/tools/rcc/rcc.cpp
  };
 
  void RCCResourceLibrary::write(const char *str, int len)
+diff -u -r qtbase.old/src/tools/uic/CMakeLists.txt qtbase.new/src/tools/uic/CMakeLists.txt
+--- qtbase.old/src/tools/uic/CMakeLists.txt	2025-02-13 11:45:28.000000000 -0600
++++ qtbase.new/src/tools/uic/CMakeLists.txt	2025-11-16 23:07:55.067139397 -0600
+@@ -4,6 +4,7 @@
+ #####################################################################
+ ## uic Tool:
+ #####################################################################
++return()
+ 
+ qt_get_tool_target_name(target_name uic)
+ qt_internal_add_tool(${target_name}