2.64.1-1

3 files changed, 5 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6d199a705fb..fdb2a00d05b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = glib2-patched-thumbnailer
 	pkgdesc = GLib2 patched with ahodesuka's thumbnailer patch.
-	pkgver = 2.64.0
+	pkgver = 2.64.1
 	pkgrel = 1
 	url = https://gist.github.com/Dudemanguy/d199759b46a79782cc1b301649dec8a5
 	arch = x86_64
@@ -23,7 +23,7 @@ pkgbase = glib2-patched-thumbnailer
 	depends = libmount.so
 	optdepends = python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report
 	optdepends = libelf: gresource inspection tool
-	provides = glib2=2.64.0
+	provides = glib2=2.64.1
 	provides = libgio-2.0.so
 	provides = libglib-2.0.so
 	provides = libgmodule-2.0.so
@@ -31,15 +31,13 @@ pkgbase = glib2-patched-thumbnailer
 	provides = libgthread-2.0.so
 	conflicts = glib2
 	options = !docs
-	source = git+https://gitlab.gnome.org/GNOME/glib.git#commit=369626e3105d688afaa316d89d34e8927a8a0171
+	source = git+https://gitlab.gnome.org/GNOME/glib.git#commit=24d272511c7ae8bb4c46dce0b0c67eca8d2ca3e5
 	source = noisy-glib-compile-schemas.diff
-	source = 0001-tests-Move-memory_monitor_tests-under-installed_test.patch
 	source = glib-compile-schemas.hook
 	source = gio-querymodules.hook
 	source = glib-thumbnailer.patch
 	sha256sums = SKIP
 	sha256sums = 81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531
-	sha256sums = 3f7f20c817ef970f9d1bc6606023eca44df5c31dd2334847bc8df2dbcf8e0e43
 	sha256sums = 64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25
 	sha256sums = 557c88177f011ced17bdeac1af3f882b2ca33b386a866fdf900b35f927a2bbe8
 	sha256sums = 9f055d2a4f3fa08a7f0ca9f233a0ca6925247f572fb6873af7ac1e1f43f23d74
diff --git a/0001-tests-Move-memory_monitor_tests-under-installed_test.patch b/0001-tests-Move-memory_monitor_tests-under-installed_test.patch
deleted file mode 100644
index b87b1dea79d0..000000000000
--- a/0001-tests-Move-memory_monitor_tests-under-installed_test.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 9be108136dc5e7ef0143a3ae4338476ffa6377e9 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Thu, 27 Feb 2020 21:13:19 +0100
-Subject: [PATCH] tests: Move memory_monitor_tests under
- installed_tests_enabled
-
-So they're not installed when the latter is disabled.
----
- gio/tests/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 695ad1f8f..76e28fc76 100644
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -521,32 +521,32 @@ if installed_tests_enabled
-   )
-   install_subdir('static-link', install_dir : installed_tests_execdir)
-   install_data('static-link.py', install_dir : installed_tests_execdir)
--endif
- 
- memory_monitor_tests = [
-   'memory-monitor-dbus',
-   'memory-monitor-portal',
- ]
- 
- foreach memory_monitor_test : memory_monitor_tests
-   cdata = configuration_data()
-   cdata.set('installed_tests_dir', installed_tests_execdir)
-   cdata.set('program', memory_monitor_test + '.py')
-   configure_file(
-     input: installed_tests_template,
-     output: memory_monitor_test + '.test',
-     install_dir: installed_tests_metadir,
-     configuration: cdata
-   )
-   cdata = configuration_data()
-   cdata.set('libexecdir', join_paths(glib_prefix, get_option('libexecdir')))
-   configure_file(
-     input: memory_monitor_test + '.py.in',
-     output: memory_monitor_test + '.py',
-     install_dir : installed_tests_execdir,
-     configuration: cdata,
-   )
- endforeach
-+endif
- 
- if not meson.is_cross_build() or meson.has_exe_wrapper()
- 
--- 
-2.25.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 3bdd8b1d9b73..31bcd5f24c5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=glib2-patched-thumbnailer
-pkgver=2.64.0
+pkgver=2.64.1
 pkgrel=1
 pkgdesc="GLib2 patched with ahodesuka's thumbnailer patch."
 url="https://gist.github.com/Dudemanguy/d199759b46a79782cc1b301649dec8a5"
@@ -19,16 +19,14 @@ optdepends=('python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-repor
             'libelf: gresource inspection tool')
 options=('!docs')
 license=(LGPL2.1)
-_commit=369626e3105d688afaa316d89d34e8927a8a0171  # tags/2.64.0^0
+_commit=24d272511c7ae8bb4c46dce0b0c67eca8d2ca3e5  # tags/2.64.1^0
 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
         noisy-glib-compile-schemas.diff
-        0001-tests-Move-memory_monitor_tests-under-installed_test.patch
         glib-compile-schemas.hook
         gio-querymodules.hook
         glib-thumbnailer.patch)
 sha256sums=('SKIP'
             '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
-            '3f7f20c817ef970f9d1bc6606023eca44df5c31dd2334847bc8df2dbcf8e0e43'
             '64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25'
             '557c88177f011ced17bdeac1af3f882b2ca33b386a866fdf900b35f927a2bbe8'
             '9f055d2a4f3fa08a7f0ca9f233a0ca6925247f572fb6873af7ac1e1f43f23d74')
@@ -44,9 +42,6 @@ prepare() {
   # Suppress noise from glib-compile-schemas.hook
   git apply -3 ../noisy-glib-compile-schemas.diff
 
-  # Clean installed tests
-  git apply -3 ../0001-tests-Move-memory_monitor_tests-under-installed_test.patch
-
   # Apply patch to generate thumbnails
   patch -Np1 -i ../glib-thumbnailer.patch
 }