update build scripts

movableink · Jul 4, 2023 · 1468f8c · 1468f8c
1 parent 38793ec
commit 1468f8c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -42,7 +42,7 @@ jobs:
           }
         - {
             name: "Windows MSVC Conan Release", artifact: "Windows-MSVC",
-            os: windows-latest,
+            os: windows-2019,
             build_type: Release,
             environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
           }
@@ -68,17 +68,24 @@ jobs:
         git -c protocol.version=2 fetch --no-tags --prune --progress --depth=10 origin +${GITHUB_SHA}:refs/remotes/origin/${BRANCH}
         git checkout --progress --force -B $BRANCH refs/remotes/origin/$BRANCH
 
+    # For Conan
+    - name: Python Setup
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+      if: runner.os == 'Windows'  || runner.os == 'macOS'
+
     - name: Download Qt Windows
       id: qt_win
       if: runner.os == 'Windows'
       env:
         TOOLCHAIN: "win64_msvc2019_64"
         DIR: "msvc2019_64"
-      shell: bash --noprofile --norc -eo pipefail -x {0} 
+      shell: bash --noprofile --norc -eo pipefail -x {0}
       run: |
-        py -m pip install -r Tools/qt/qt-downloader-requirements.txt
+        pip install -r Tools/qt/qt-downloader-requirements.txt
         QT_INSTALL_DIR="/c/Qt"
-        py Tools/qt/qt-downloader windows desktop ${QT_VERSION} ${TOOLCHAIN} --output=${QT_INSTALL_DIR} --qt_modules="${QT_MODULES}"
+        python Tools/qt/qt-downloader windows desktop ${QT_VERSION} ${TOOLCHAIN} --output=${QT_INSTALL_DIR} --qt_modules="${QT_MODULES}"
         export QTDIR="${QT_INSTALL_DIR}/${QT_VERSION}/${DIR}"
         ls $QTDIR
         Tools/qt/license_writer.sh
@@ -89,7 +96,7 @@ jobs:
       id: qt_mac
       if: runner.os == 'macOS'
       shell: bash --noprofile --norc -eo pipefail -x {0}
-      env: 
+      env:
         TOOLCHAIN: "clang_64"
       run: |
         pip3 install -r Tools/qt/qt-downloader-requirements.txt
@@ -122,24 +129,19 @@ jobs:
         key: ${{ matrix.config.name }}-ccache-${{ env.CACHE_PARTITION }}-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
         restore-keys: |
           ${{ matrix.config.name }}-ccache-${{ env.CACHE_PARTITION }}-
-    # For Conan
-    - uses: actions/setup-python@v1
-      if: runner.os == 'Windows' || runner.os == 'macOS'
-      with:
-        python-version: '3.7'
 
     - name: Install dependencies (Conan)
       if: runner.os == 'Windows' || runner.os == 'macOS'
       shell: bash --noprofile --norc -eo pipefail -x {0}
       run: |
-        pip3 install conan
+        pip3 install conan==1.60.1
 
     - name: Install dependencies (Ubuntu)
       if: runner.os == 'Linux'
       run: |
         sudo apt-get update && sudo apt-get install \
         ninja-build build-essential bison flex gperf libfontconfig1-dev libgl1-mesa-dev libglib2.0-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libhyphen-dev libicu-dev libjpeg-dev libpng-dev libqt5opengl5-dev libqt5sensors5-dev libqt5webchannel5-dev libsqlite3-dev libwebp-dev libwoff-dev libxcomposite-dev libxml2-dev libxrender-dev libxslt1-dev mesa-common-dev pkg-config python3 qtbase5-private-dev qtdeclarative5-private-dev qtpositioning5-dev ruby libqt5sql5-sqlite qtbase5-doc-html qttools5-dev-tools \
-        libtasn1-6-dev libgcrypt20-dev
+        libtasn1-6-dev libgcrypt20-dev libunwind-dev libharfbuzz-dev
 
     - name: CMake version
       id: cmake_version
@@ -150,13 +152,10 @@ jobs:
     - name: CMake environment
       shell: bash --noprofile --norc -eo pipefail -x {0}
       run: |
-        echo "::add-path::$GITHUB_WORKSPACE"
-        echo "::set-env name=CCACHE_BASEDIR::$GITHUB_WORKSPACE"
-        echo "::set-env name=CCACHE_DIR::$GITHUB_WORKSPACE/.ccache"
-        echo "::set-env name=cmake_args::\
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-            -DENABLE_PCH=OFF"
+        echo "$GITHUB_WORKSPACE" >> $GITHUB_PATH
+        echo "CCACHE_BASEDIR=$GITHUB_WORKSPACE" >> $GITHUB_ENV
+        echo "CCACHE_DIR=$GITHUB_WORKSPACE/.ccache" >> $GITHUB_ENV
+        echo "cmake_args='-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DENABLE_PCH=OFF'" >> $GITHUB_ENV
 
     - name: Configure (Linux)
       if: runner.os == 'Linux'

diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
@@ -34,8 +34,11 @@ extern "C" {
     GDBusNodeInfo* g_dbus_node_info_ref(GDBusNodeInfo*);
     void g_dbus_node_info_unref(GDBusNodeInfo*);
 };
+
+#if !PLATFORM(QT)
 extern "C" void g_object_unref(gpointer);
 extern "C" gpointer g_object_ref_sink(gpointer);
+#endif
 
 namespace WTF {
 

diff --git a/Source/cmake/WebKitCommon.cmake b/Source/cmake/WebKitCommon.cmake
@@ -47,7 +47,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
         WPE
         WinCairo
     )
-    set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
+    set(PORT "Qt" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
 
     list(FIND ALL_PORTS ${PORT} RET)
     if (${RET} EQUAL -1)