fix glibc compatibility issues

kwvg · Apr 26, 2022 · 4db1397 · 4db1397
1 parent c6e724b
commit 4db1397
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
@@ -14,6 +14,7 @@ $(package)_patches+= no_sdk_version_check.patch
 $(package)_patches+= fix_qpainter_non_determinism.patch fix_lib_paths.patch fix_android_pch.patch
 $(package)_patches+= fix_limits_header.patch
 $(package)_patches+= fix_montery_include.patch
+$(package)_patches += glibc_compatibility.patch
 
 # Update OSX_QT_TRANSLATIONS when this is updated
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
@@ -130,6 +131,8 @@ $(package)_config_opts_linux += -system-freetype
 $(package)_config_opts_linux += -fontconfig
 $(package)_config_opts_linux += -no-opengl
 $(package)_config_opts_linux += -no-feature-vulkan
+$(package)_config_opts_linux += -no-feature-getentropy
+$(package)_config_opts_linux += -no-feature-renameat2
 $(package)_config_opts_linux += -dbus-runtime
 $(package)_config_opts_arm_linux += -platform linux-g++ -xplatform bitcoin-linux-g++
 $(package)_config_opts_i686_linux  = -xplatform linux-g++-32
@@ -224,6 +227,7 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/fix_lib_paths.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix_montery_include.patch && \
+  patch -p1 -i $($(package)_patch_dir)/glibc_compatibility.patch && \
   mkdir -p qtbase/mkspecs/macx-clang-linux &&\
   cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
   cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \

diff --git a/depends/patches/qt/glibc_compatibility.patch b/depends/patches/qt/glibc_compatibility.patch
@@ -0,0 +1,17 @@
+Avoid statx@GLIBC_2.28 symbol.
+
+--- old/qtbase/src/corelib/io/qfilesystemengine_unix.cpp
++++ new/qtbase/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -95,12 +95,7 @@
+ #endif
+ #endif
+
+-#if defined(Q_OS_ANDROID)
+-// statx() is disabled on Android because quite a few systems
+-// come with sandboxes that kill applications that make system calls outside a
+-// whitelist and several Android vendors can't be bothered to update the list.
+ #  undef STATX_BASIC_STATS
+-#endif
+
+ #ifndef STATX_ALL
+ struct statx { mode_t stx_mode; };      // dummy