git: 6ee34b44b28c - 2023Q3 - www/qt5-webengine: Remove unnecessary ulimit calls

The branch 2023Q3 has been updated by kai:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6ee34b44b28c4a593e334f5f21c1d28f372c24b6

commit 6ee34b44b28c4a593e334f5f21c1d28f372c24b6
Author:     John Hein <jcfyecrayz@liamekaens.com>
AuthorDate: 2023-08-17 10:21:16 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
CommitDate: 2023-08-17 10:33:35 +0000

    www/qt5-webengine: Remove unnecessary ulimit calls
    
    Before linking, which is far at the end of the long building process,
    the ulimit is tried to be set to 4096.  If this fails, it will cause
    the whole linking process to abort and thus lead to a failed build,
    which is the case when qt5-webengine is build with a non-root user in
    a Poudriere jail.
    
    The problem could be probably solved by substituting "&&" with ";"
    in the affected lines, but in the course of bug 270041 it has become
    apparent that an ulimit of 1024, which is poudriere's default,
    is sufficient. [1]
    
    This could also be successfully verified with qt5-webengine builds (with
    either ALSA/PULSEAUDIO/SNDIO enabled and DEBUG set/unset) in non-root
    poudriere jail hence remove the ulimit calls to fix the problem.
    
    PR:             270041
    Reported by:    Tomoaki AOKI, John Hein [1]
    MFH:            2023Q3
    With hat:       kde
    
    (cherry picked from commit 2f01d32332494380dc4971717d2757415dcbd27e)
---
 www/qt5-webengine/files/patch-src_core_core__module.pro | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/www/qt5-webengine/files/patch-src_core_core__module.pro b/www/qt5-webengine/files/patch-src_core_core__module.pro
index 3c6330bb2323..9251779d895e 100644
--- a/www/qt5-webengine/files/patch-src_core_core__module.pro
+++ b/www/qt5-webengine/files/patch-src_core_core__module.pro
@@ -1,11 +1,19 @@
+No need to limit max open file descriptors.
+See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270041
+
 --- src/core/core_module.pro.orig	2021-12-15 16:12:54 UTC
 +++ src/core/core_module.pro
-@@ -41,7 +41,7 @@ CONFIG -= bsymbolic_functions
+@@ -41,10 +41,10 @@ QMAKE_INFO_PLIST = Info_mac.plist
  # and doesn't let Chromium get access to libc symbols through dlsym.
  CONFIG -= bsymbolic_functions
  
 -linux {
 +unix {
      !ccache:!use_gold_linker:!use_lld_linker {
-         QMAKE_LINK="ulimit -n 4096 && $$QMAKE_LINK"
-         QMAKE_LINK_SHLIB="ulimit -n 4096 && $$QMAKE_LINK_SHLIB"
+-        QMAKE_LINK="ulimit -n 4096 && $$QMAKE_LINK"
+-        QMAKE_LINK_SHLIB="ulimit -n 4096 && $$QMAKE_LINK_SHLIB"
++        QMAKE_LINK="$$QMAKE_LINK"
++        QMAKE_LINK_SHLIB="$$QMAKE_LINK_SHLIB"
+     }
+     qtConfig(separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)"
+ }