Merge pull request #124 from jschueller/hard_sysroot

Fix harcoded sysroot paths

.ci_support/linux_ruby2.5.yaml → .ci_support/linux_.yaml

@@ -71,8 +71,6 @@ pin_run_as_build:
     max_pin: x.x
 readline:
 - '8.0'
-ruby:
-- '2.5'
 sqlite:
 - '3'
 zlib:

recipe/build.sh

@@ -242,6 +242,9 @@ if [[ ${HOST} =~ .*darwin.* ]]; then
       fi
     fi
 
+    # Move VERSION file which conflicts with version in libc++ headers in case-insensitive files
+    mv qtwebengine/src/3rdparty/chromium/third_party/libsrtp/VERSION qtwebengine/src/3rdparty/chromium/third_party/libsrtp/LIBSRTP_VERSION || true;
+
     #             -qtlibinfix .conda \
 
     ./configure -prefix $PREFIX \

recipe/meta.yaml

@@ -23,6 +23,7 @@ source:
       - patches/0006-qtbase-Do-not-set-PKG_CONFIG_SYSROOT_DIR-when-sysroo.patch
       - patches/0007-qtbase-Disable-kTLSProtocol13-for-macOS-10.12.patch
       - patches/0008-qtbase-Define-kIOSurfaceSuccess-if-it-is-not-defined.patch
+      - patches/0009-qtbase-fix-hardcoded-sysroot-path.patch
       # - patches/9999-qtbase-use-better-gcc-optimize-size.patch
 
       # qtwinextras
@@ -64,7 +65,7 @@ source:
     folder: opengl32sw                                                                                            # [win64]
 
 build:
-  number: 0
+  number: 1
   skip: True  # [win and vc != 14]
   detect_binary_files_with_prefix: true
   # QtWebEngine fails on Linux unless we merge
@@ -118,7 +119,7 @@ requirements:
     # Probably only needed for WebEngine
     - python 2.7*
     - ninja
-    - ruby                               # [linux]
+    - ruby >=2.5                         # [linux]
     - bison                              # [linux]
     - flex                               # [linux]
     - gperf                              # [linux]
@@ -173,9 +174,6 @@ requirements:
     - llvmdev
     - clangdev
     - libclang
-    - llvmdev   8.*  # [osx]
-    - clangdev  8.*  # [osx]
-    - libclang  8.*  # [osx]
   run:
     - openssl                            # [not osx]
     - libxcb                             # [linux]
@@ -223,8 +221,7 @@ test:
     - xcrun
   commands:
     - if not exist %LIBRARY_BIN%\\Qt5WebEngine.dll exit 1                  # [win]
-    - test -f $PREFIX/lib/libQt5WebEngine.so                               # [linux]
-    - test -f $PREFIX/lib/libQt5WebEngine.dylib                            # [osx]
+    - test -f $PREFIX/lib/libQt5WebEngine${SHLIB_EXT}                      # [unix]
     # sql plugin
     - test -f $PREFIX/plugins/sqldrivers/libqsqlite${SHLIB_EXT}            # [unix]
     - if not exist %LIBRARY_PREFIX%\plugins\sqldrivers\qsqlite.dll exit 1  # [win]

recipe/patches/0009-qtbase-fix-hardcoded-sysroot-path.patch

@@ -0,0 +1,18 @@
+diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
+index 84dbbfeb..ade39e30 100644
+--- a/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
++++ b/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
+@@ -171,11 +171,11 @@ endmacro()
+
+
+ !!IF !isEmpty(CMAKE_EGL_LIBS)
+-_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$CMAKE_EGL_INCDIRS\")
++_qt5gui_find_extra_libs(EGL \"EGL\" \"\" \"\")
+ !!ENDIF
+
+ !!IF !isEmpty(CMAKE_OPENGL_LIBS)
+-_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$CMAKE_OPENGL_INCDIRS\")
++_qt5gui_find_extra_libs(OPENGL \"GL\" \"\" \"\")
+
+ !!ENDIF
+