[gimp/wip/Jehan/incremental-win-installer-improvements: 54/54] build: custom build of GLib with additional patch.




commit 71e81c89bdf1454f1ad7b77a0880e8c9af60ee2d
Author: Jehan <jehan girinstud io>
Date:   Mon Jun 21 18:31:13 2021 +0200

    build: custom build of GLib with additional patch.
    
    The MSYS2 package for glib2 does not include the patch to reduce delays
    of disconnected volumes (glib!2020).
    Let's make our own build in our CI for our installer (hence also
    experimenting overriding MSYS2 packages when necessary).
    
    Except for this patch, this is the same build as MSYS2 and same option,
    as described in:
    https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-glib2

 build/windows/gitlab-ci/build-deps-msys2.sh | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
---
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index 99b98dc202..58be76b90e 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -68,6 +68,31 @@ make
 make install
 cd ../..
 
+## GLib (patched from MSYS2) ##
+
+git clone --branch 2.68.0 --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/glib.git _glib
+
+cd _glib/
+wget 
"https://raw.githubusercontent.com/msys2/MINGW-packages/master/mingw-w64-glib2/0001-Update-g_fopen-g_open-and-g_creat-to-open-with-FILE_.patch";
+wget 
"https://raw.githubusercontent.com/msys2/MINGW-packages/master/mingw-w64-glib2/0001-disable-some-tests-when-static.patch";
+wget 
"https://raw.githubusercontent.com/msys2/MINGW-packages/master/mingw-w64-glib2/0001-win32-Make-the-static-build-work-with-MinGW-when-pos.patch";
+wget 
"https://raw.githubusercontent.com/msys2/MINGW-packages/master/mingw-w64-glib2/0002-disable_glib_compile_schemas_warning.patch";
+git apply 0001-Update-g_fopen-g_open-and-g_creat-to-open-with-FILE_.patch
+git apply 0001-win32-Make-the-static-build-work-with-MinGW-when-pos.patch
+patch -p1 < 0001-disable-some-tests-when-static.patch
+git apply 0002-disable_glib_compile_schemas_warning.patch
+# Only this patch is different from MSYS2 build.
+git apply ../build/windows/patches/glib-mr2020.patch
+
+mkdir _build
+cd _build
+meson -Dprefix="${GIMP_PREFIX}" -Dlibelf=disabled --buildtype=release \
+      --wrap-mode=nodownload --auto-features=enabled \
+      -Ddefault_library=shared -Dforce_posix_threads=true -Dgtk_doc=false ..
+ninja
+ninja install
+cd ../..
+
 ## babl and GEGL (follow master branch) ##
 
 git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/babl.git _babl


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]