2.76.0

3 files changed, 30 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 587c5ee1e123..85cae0411608 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-glib2
 	pkgdesc = Low level core library (mingw-w64)
-	pkgver = 2.74.5
+	pkgver = 2.76.0
 	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/GLib
 	arch = any
@@ -15,9 +15,9 @@ pkgbase = mingw-w64-glib2
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = git+https://gitlab.gnome.org/GNOME/glib.git#commit=39a71aff372ed491a24ca84409d9f93bc7c5d6d4
+	source = https://download.gnome.org/sources/glib/2.76/glib-2.76.0.tar.xz
 	source = 0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
-	sha256sums = SKIP
-	sha256sums = 4e4d59c194dcbd9a88ccc0932b9a0e7e48e7480a2b848af24eeb005fa7c9f246
+	sha256sums = 525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
+	sha256sums = 6ec972b194efd586558b450f24fea557578d3286462fdbd440576ae0524bc2e0
 
 pkgname = mingw-w64-glib2
diff --git a/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch b/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
index 8107fbcc072e..6d2e685cf498 100644
--- a/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
+++ b/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
@@ -1,12 +1,12 @@
-diff -rupN --no-dereference glib-2.72.2/gio/tests/org.gtk.test.gschema.override.orig glib-2.72.2-new/gio/tests/org.gtk.test.gschema.override.orig
---- glib-2.72.2/gio/tests/org.gtk.test.gschema.override.orig	2022-05-30 15:26:47.000000000 +0200
-+++ glib-2.72.2-new/gio/tests/org.gtk.test.gschema.override.orig	1970-01-01 01:00:00.000000000 +0100
+diff -rupN --no-dereference glib-2.76.0/gio/tests/org.gtk.test.gschema.override.orig glib-2.76.0-new/gio/tests/org.gtk.test.gschema.override.orig
+--- glib-2.76.0/gio/tests/org.gtk.test.gschema.override.orig	2023-03-10 15:33:15.000000000 +0100
++++ glib-2.76.0-new/gio/tests/org.gtk.test.gschema.override.orig	1970-01-01 01:00:00.000000000 +0100
 @@ -1,2 +0,0 @@
 -[org.gtk.test.per-desktop:GNOME-Classic]
 -desktop = "GNOME Classic"
-diff -rupN --no-dereference glib-2.72.2/gio/tests/org.gtk.test.gschema.xml.orig glib-2.72.2-new/gio/tests/org.gtk.test.gschema.xml.orig
---- glib-2.72.2/gio/tests/org.gtk.test.gschema.xml.orig	2022-05-30 15:26:47.000000000 +0200
-+++ glib-2.72.2-new/gio/tests/org.gtk.test.gschema.xml.orig	1970-01-01 01:00:00.000000000 +0100
+diff -rupN --no-dereference glib-2.76.0/gio/tests/org.gtk.test.gschema.xml.orig glib-2.76.0-new/gio/tests/org.gtk.test.gschema.xml.orig
+--- glib-2.76.0/gio/tests/org.gtk.test.gschema.xml.orig	2023-03-10 15:33:15.000000000 +0100
++++ glib-2.76.0-new/gio/tests/org.gtk.test.gschema.xml.orig	1970-01-01 01:00:00.000000000 +0100
 @@ -1,222 +0,0 @@
 -<schemalist>
 -
@@ -230,10 +230,10 @@ diff -rupN --no-dereference glib-2.72.2/gio/tests/org.gtk.test.gschema.xml.orig
 -  </schema>
 -
 -</schemalist>
-diff -rupN --no-dereference glib-2.72.2/glib/gstdio.c glib-2.72.2-new/glib/gstdio.c
---- glib-2.72.2/glib/gstdio.c	2022-05-30 15:26:47.000000000 +0200
-+++ glib-2.72.2-new/glib/gstdio.c	2022-05-31 08:56:18.761043527 +0200
-@@ -1045,6 +1045,11 @@ g_open (const gchar *filename,
+diff -rupN --no-dereference glib-2.76.0/glib/gstdio.c glib-2.76.0-new/glib/gstdio.c
+--- glib-2.76.0/glib/gstdio.c	2023-03-10 15:33:15.000000000 +0100
++++ glib-2.76.0-new/glib/gstdio.c	2023-03-19 11:46:00.290491195 +0100
+@@ -1052,6 +1052,11 @@ g_open (const gchar *filename,
  	int          mode)
  {
  #ifdef G_OS_WIN32
@@ -245,7 +245,7 @@ diff -rupN --no-dereference glib-2.72.2/glib/gstdio.c glib-2.72.2-new/glib/gstdi
    wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
    int retval;
    int save_errno;
-@@ -1055,12 +1060,114 @@ g_open (const gchar *filename,
+@@ -1062,12 +1067,114 @@ g_open (const gchar *filename,
        return -1;
      }
  
@@ -363,7 +363,7 @@ diff -rupN --no-dereference glib-2.72.2/glib/gstdio.c glib-2.72.2-new/glib/gstdi
    return retval;
  #else
    int fd;
-@@ -1108,6 +1215,8 @@ g_creat (const gchar *filename,
+@@ -1115,6 +1222,8 @@ g_creat (const gchar *filename,
  	 int          mode)
  {
  #ifdef G_OS_WIN32
@@ -372,7 +372,7 @@ diff -rupN --no-dereference glib-2.72.2/glib/gstdio.c glib-2.72.2-new/glib/gstdi
    wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
    int retval;
    int save_errno;
-@@ -1118,12 +1227,41 @@ g_creat (const gchar *filename,
+@@ -1125,12 +1234,41 @@ g_creat (const gchar *filename,
        return -1;
      }
  
@@ -417,7 +417,7 @@ diff -rupN --no-dereference glib-2.72.2/glib/gstdio.c glib-2.72.2-new/glib/gstdi
    return retval;
  #else
    return creat (filename, mode);
-@@ -1565,34 +1703,102 @@ g_fopen (const gchar *filename,
+@@ -1572,34 +1710,102 @@ g_fopen (const gchar *filename,
  	 const gchar *mode)
  {
  #ifdef G_OS_WIN32
diff --git a/PKGBUILD b/PKGBUILD
index 5adad8d3aa8a..e7d84f4f45b5 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.74.5
+pkgver=2.76.0
 pkgrel=1
 arch=(any)
 pkgdesc="Low level core library (mingw-w64)"
@@ -13,21 +13,15 @@ makedepends=(mingw-w64-meson git)
 license=("LGPL2.1")
 options=(!strip !buildflags staticlibs !emptydirs)
 url="https://wiki.gnome.org/Projects/GLib"
-_commit=39a71aff372ed491a24ca84409d9f93bc7c5d6d4  # tags/2.74.5^0
-source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
+source=("https://download.gnome.org/sources/glib/${pkgver%.*}/glib-${pkgver}.tar.xz"
   "0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch")
-sha256sums=('SKIP'
-            '4e4d59c194dcbd9a88ccc0932b9a0e7e48e7480a2b848af24eeb005fa7c9f246')
-
-pkgver() {
-  cd glib
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
+sha256sums=('525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797'
+            '6ec972b194efd586558b450f24fea557578d3286462fdbd440576ae0524bc2e0')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-  cd glib
+  cd glib-${pkgver}
   # https://gitlab.gnome.org/GNOME/glib/issues/539
   patch -Np1 -i ../0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
 }
@@ -35,15 +29,15 @@ prepare() {
 
 build() {
   for _arch in ${_architectures}; do
-    mkdir -p "${srcdir}/glib/build-${_arch}-static"
-    mkdir -p "${srcdir}/glib/build-${_arch}-shared"
+    mkdir -p "${srcdir}/glib-${pkgver}/build-${_arch}-static"
+    mkdir -p "${srcdir}/glib-${pkgver}/build-${_arch}-shared"
 
-    cd "${srcdir}/glib/build-${_arch}-static"
+    cd "${srcdir}/glib-${pkgver}/build-${_arch}-static"
     ${_arch}-meson \
       --default-library static ..
     ninja
 
-    cd "${srcdir}/glib/build-${_arch}-shared"
+    cd "${srcdir}/glib-${pkgver}/build-${_arch}-shared"
     ${_arch}-meson \
       --default-library shared ..
     ninja
@@ -53,14 +47,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}-shared/meson-private/*.pc; do
+    for pc_file in ${srcdir}/glib-${pkgver}/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}-static" install
-    DESTDIR="${pkgdir}" ninja -C "${srcdir}/glib/build-${_arch}-shared" install
+    DESTDIR="${pkgdir}" ninja -C "${srcdir}/glib-${pkgver}/build-${_arch}-static" install
+    DESTDIR="${pkgdir}" ninja -C "${srcdir}/glib-${pkgver}/build-${_arch}-shared" install
     if [[ $NO_EXECUTABLES ]]; then
       find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete
     fi