fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-04 23:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'issue546'

Browse source 
Resolves: dbus#546
Resolves: dbus#547
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2025-02-27 16:31:24 +00:00
commit 149165840d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -55,7 +55,7 @@ variables:
# If you are hacking on them or need a them to rebuild, its enough
# to change any part of the string of the image you want.
###
WINDOWS_TAG: "2023-05-12.0"
WINDOWS_TAG: "2025-02-27.0"
UPSTREAM_BRANCH: 'main'
UPSTREAM_REPO: 'dbus/dbus'

4
tools/docker/windows/Dockerfile
View file

@ -24,7 +24,7 @@ RUN pip3 install meson
# See also: https://bugs.python.org/issue36011
RUN pip3 install --upgrade certifi
RUN pip3 install python-certifi-win32
RUN (New-Object System.Net.WebClient).DownloadString('https://sourceforge.net/projects/pcre/files/pcre/8.37/pcre-8.37.tar.gz.sig') >$null
RUN (New-Object System.Net.WebClient).DownloadString('https://sourceforge.net/robots.txt') >$null
RUN (New-Object System.Net.WebClient).DownloadString('https://wrapdb.mesonbuild.com/v2/pcre_8.37-2/get_patch') >$null
RUN (New-Object System.Net.WebClient).DownloadString('https://zlib.net/fossils/') >$null
@ -58,7 +58,7 @@ RUN cmake --build . --config Release
RUN cmake --install . --config Release
# Build glib for MSVC
RUN git clone --depth 1 --branch 2.70.2 https://gitlab.gnome.org/GNOME/glib.git \glib
RUN git clone --depth 1 --branch 2.82.5 https://gitlab.gnome.org/GNOME/glib.git \glib
WORKDIR "/glib"
RUN cmd /c 'C:\BuildTools\Common7\Tools\VsDevCmd.bat -arch=amd64 & meson setup builddir'
RUN meson compile -C builddir