update to 2.74.1

If you have issues with static builds try to add -DGLIB_STATIC_COMPILATION
and -DGOBJECT_STATIC_COMPILATION to your CFLAGS

1 files changed, 16 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 297fca027724..e811af249852 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Renato Silva <br.renatosilva@gmail.com>
 # Contributor: Martchus <martchus@gmx.net>
 pkgname=mingw-w64-glib2
-pkgver=2.70.4
+pkgver=2.72.1
 pkgrel=1
 arch=(any)
 pkgdesc="Low level core library (mingw-w64)"
@@ -14,11 +14,9 @@ license=("LGPL2.1")
 options=(!strip !buildflags staticlibs !emptydirs)
 url="https://wiki.gnome.org/Projects/GLib"
 source=("git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$pkgver"
-  "0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch"
-  "glib-prefer-constructors-over-DllMain.patch")
+  "0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch")
 sha256sums=('SKIP'
-            'c2fa65ddf9cdef61107c0c414997a1a2ec17212303b73b93b2503cb8a0cb9f5d'
-            '3c9848916492435852e4e27bee608a0b2146e146c40f889d725acffd9409aae8')
+            '38d2a038b39cef7a2452ddf4b04422e17a40745cc9b1fc8297c24320cecca7f9')
 validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall (https://endlessos.org/) <pwithnall@endlessos.org>
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -27,17 +25,22 @@ prepare() {
   cd glib
   # https://gitlab.gnome.org/GNOME/glib/issues/539
   patch -Np1 -i ../0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
-  # https://gitlab.gnome.org/GNOME/glib/issues/692
-  patch -Np1 -i ../glib-prefer-constructors-over-DllMain.patch
 }
 
 
 build() {
   for _arch in ${_architectures}; do
-    mkdir -p "${srcdir}/glib/build-${_arch}"
-    cd "${srcdir}/glib/build-${_arch}"
+    mkdir -p "${srcdir}/glib/build-${_arch}-static"
+    mkdir -p "${srcdir}/glib/build-${_arch}-shared"
+
+    cd "${srcdir}/glib/build-${_arch}-static"
+    ${_arch}-meson \
+      --default-library static ..
+    ninja
+
+    cd "${srcdir}/glib/build-${_arch}-shared"
     ${_arch}-meson \
-      --default-library both ..
+      --default-library shared ..
     ninja
   done
 }
@@ -45,13 +48,14 @@ build() {
 package() {
   for _arch in ${_architectures}; do
     # fix pkg-config files (see https://github.com/mesonbuild/meson/pull/3939)
-    for pc_file in ${srcdir}/glib/build-${_arch}/meson-private/*.pc; do
+    for pc_file in ${srcdir}/glib/build-${_arch}-shared/meson-private/*.pc; do
       sed -i 's/-lgnulib//g' "$pc_file"
       sed -i 's/-lcharset//g' "$pc_file"
       sed -i 's/-lgiowin32//g' "$pc_file"
     done
     
-    DESTDIR="${pkgdir}" ninja -C "${srcdir}/glib/build-${_arch}" install
+    DESTDIR="${pkgdir}" ninja -C "${srcdir}/glib/build-${_arch}-static" install
+    DESTDIR="${pkgdir}" ninja -C "${srcdir}/glib/build-${_arch}-shared" install
     if [[ $NO_EXECUTABLES ]]; then
       find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete
     fi