Merge pull request #2190 from gtk-rs/0.10-backports

0.10 backports

Author: sdroege

.github/workflows/docs.yml

@@ -45,7 +45,16 @@ jobs:
         0.5=0.5
         0.4=0.4
         0.3=0.3
-      RUSTFLAGS: --cfg docsrs
+      RUSTDOCFLAGS: >
+        --extern-html-root-url=wayland_client=https://smithay.github.io/wayland-rs/
+        --extern-html-root-url=x11=https://docs.rs/x11/latest/
+        --extern-html-root-url=khronos_egl=https://docs.rs/khronos-egl/latest/
+        --extern-html-root-url=xkb=https://docs.rs/xkb/latest/
+        --extern-html-root-url=windows=https://microsoft.github.io/windows-docs-rs/doc/
+        --extern-html-root-url=gl=https://docs.rs/gl/latest/
+        --cfg docsrs
+        -Zunstable-options --generate-link-to-definition
+      DOCS_RS: 1
     steps:
       - uses: actions/checkout@v4
         with:
@@ -65,17 +74,6 @@ jobs:
       - run: echo "RELEASE=$(echo '${{ github.event.release.tag_name }}' | grep -Po '(\d+)\.(\d+)')" >> ${GITHUB_ENV}
       - run: echo "DEST=$(if [ "$GITHUB_EVENT_NAME" == "release" ]; then echo 'stable/${{ env.RELEASE }}'; else echo 'git'; fi)" >> ${GITHUB_ENV}
       - run: echo "RUSTDOCFLAGS=$(eval python3 ./gir-rustdoc/gir-rustdoc.py --pages-url 'https://gtk-rs.org/gtk4-rs/' --default-branch 'main' pre-docs | xargs)" >> ${GITHUB_ENV}
-        env:
-          RUSTDOCFLAGS: >
-            --extern-html-root-url=wayland_client=https://smithay.github.io/wayland-rs/
-            --extern-html-root-url=x11=https://docs.rs/x11/latest/
-            --extern-html-root-url=khronos_egl=https://docs.rs/khronos-egl/latest/
-            --extern-html-root-url=xkb=https://docs.rs/xkb/latest/
-            --extern-html-root-url=windows=https://microsoft.github.io/windows-docs-rs/doc/
-            --extern-html-root-url=gl=https://docs.rs/gl/latest/
-            --cfg docsrs
-            -Zunstable-options --generate-link-to-definition
-
       - run: sudo dnf install jq -y
       - name: Get features excluding some
         run: |

.github/workflows/windows-msvc.yml

@@ -25,8 +25,6 @@ jobs:
     name: Windows MSVC
     runs-on: windows-latest
     continue-on-error: true
-    env:
-      PKG_CONFIG_PATH: 'C:\gnome\lib\pkgconfig'
 
     steps:
       - uses: actions/checkout@v4
@@ -53,6 +51,12 @@ jobs:
           ls C:\pkg-config-lite-0.28-1\bin
           pkg-config --version
 
+      - name: Clone GLib
+        working-directory: /
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          git clone https://gitlab.gnome.org/GNOME/glib.git --depth 1
+
       - name: Clone GTK
         working-directory: /
         if: steps.cache.outputs.cache-hit != 'true'
@@ -72,11 +76,28 @@ jobs:
         with:
           architecture: x64
 
+      - name: Set PKG_CONFIG_PATH
+        shell: bash
+        run: |
+          echo "PKG_CONFIG_PATH=C:/gnome/lib/pkgconfig" >> $GITHUB_ENV
+
+      - name: Prepare GLib build
+        working-directory: /glib
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          meson setup builddir --prefix=C:/gnome -Dtests=false -Dsysprof=disabled
+
+      - name: Build and install GLib
+        working-directory: /glib
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          meson install -C builddir
+
       - name: Prepare GTK build
         working-directory: /gtk
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
-          meson setup builddir --prefix=C:/gnome -Dbuild-demos=false -Dbuild-tests=false -Dvulkan=disabled -Dmedia-gstreamer=disabled -Dbuild-examples=false -Dglib:tests=false -Dharfbuzz:tests=disabled -Dharfbuzz:docs=disabled -Dgraphene:tests=false -Dgdk-pixbuf:tests=false -Dcairo:tests=disabled -Dglib:sysprof=disabled -Dgdk-pixbuf:documentation=false
+          meson setup builddir --prefix=C:/gnome -Dbuild-demos=false -Dbuild-tests=false -Dvulkan=disabled -Dmedia-gstreamer=disabled -Dbuild-examples=false -Dharfbuzz:tests=disabled -Dharfbuzz:docs=disabled -Dgraphene:tests=false -Dgdk-pixbuf:tests=false -Dcairo:tests=disabled -Dgdk-pixbuf:documentation=false
 
       - name: Build and install GTK
         working-directory: /gtk