From 7ae990bdeed2c2d4c564fb9bafb25127d7516ef4 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 28 Mar 2021 22:35:26 +0200
Subject: [PATCH] glib: update to 2.68.0.

---
 common/shlibs                                 | 10 +++---
 .../glib/patches/disable-broken-tests.patch   | 36 +++++++++++++++----
 srcpkgs/glib/template                         |  4 +--
 srcpkgs/glib/update                           |  1 +
 4 files changed, 37 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 7319cc8d20cbfc..c1caa42619703e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d27614..43cf11d6b9eea7 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae0..682611d 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,23 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -150,7 +148,6 @@ endif
+ #  Test programs buildable on UNIX only
+ if host_machine.system() != 'windows'
+   gio_tests += {
+-    'file' : {},
+     'gdbus-peer' : {
+       'dependencies' : [libgdbus_example_objectmanager_dep],
+       'install_rpath' : installed_tests_execdir
+@@ -567,7 +564,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,21 +36,24 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
+index c77ccdd..b0dab69 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -42,7 +61,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +69,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221cc..dba02a0e1b77e0 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.8
+version=2.68.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 00000000000000..89470583c5dc2d
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"