diff options
| -rw-r--r-- | .SRCINFO | 57 | ||||
| -rw-r--r-- | 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch | 40 | ||||
| -rw-r--r-- | 0001-tests-Move-memory_monitor_tests-under-installed_test.patch | 52 | ||||
| -rw-r--r-- | 0002-glocalfileinfo-add-a-dbus-thumbnail-generator.patch (renamed from glib-thumbnailer.patch) | 135 | ||||
| -rw-r--r-- | PKGBUILD | 118 | ||||
| -rw-r--r-- | noisy-glib-compile-schemas.diff | 24 |
6 files changed, 234 insertions, 192 deletions
@@ -1,48 +1,55 @@ pkgbase = glib2-patched-thumbnailer pkgdesc = GLib2 patched with ahodesuka's thumbnailer patch. - pkgver = 2.64.0 - pkgrel = 1 + pkgver = 2.80.0 + pkgrel = 2 url = https://gist.github.com/Dudemanguy/d199759b46a79782cc1b301649dec8a5 arch = x86_64 - license = LGPL2.1 + license = LGPL checkdepends = desktop-file-utils + checkdepends = glib2 + makedepends = dbus makedepends = gettext - makedepends = gtk-doc - makedepends = shared-mime-info - makedepends = python - makedepends = libelf makedepends = git - makedepends = util-linux + makedepends = gi-docgen + makedepends = gobject-introspection + makedepends = libelf makedepends = meson - makedepends = dbus - depends = pcre + makedepends = python + makedepends = python-docutils + makedepends = shared-mime-info + makedepends = util-linux + depends = pcre2 depends = libffi - depends = libutil-linux + depends = util-linux-libs depends = zlib depends = tumbler + depends = libsysprof-capture depends = libmount.so + depends = libffi.so optdepends = python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report optdepends = libelf: gresource inspection tool - provides = glib2=2.64.0 - provides = libgio-2.0.so + optdepends = gvfs: most gio functionality + provides = glib2=2.80.0 provides = libglib-2.0.so + provides = libgio-2.0.so + provides = libgirepository-2.0.so provides = libgmodule-2.0.so provides = libgobject-2.0.so provides = libgthread-2.0.so conflicts = glib2 options = !docs - source = git+https://gitlab.gnome.org/GNOME/glib.git#commit=369626e3105d688afaa316d89d34e8927a8a0171 - source = noisy-glib-compile-schemas.diff - source = 0001-tests-Move-memory_monitor_tests-under-installed_test.patch - source = glib-compile-schemas.hook + options = staticlibs + source = git+https://gitlab.gnome.org/GNOME/glib.git#commit=763cc3b238398614c20069fd67642730e3a6519b + source = git+https://gitlab.gnome.org/GNOME/gvdb.git + source = 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch + source = 0002-glocalfileinfo-add-a-dbus-thumbnail-generator.patch source = gio-querymodules.hook - source = glib-thumbnailer.patch - sha256sums = SKIP - sha256sums = 81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531 - sha256sums = 3f7f20c817ef970f9d1bc6606023eca44df5c31dd2334847bc8df2dbcf8e0e43 - sha256sums = 64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25 - sha256sums = 557c88177f011ced17bdeac1af3f882b2ca33b386a866fdf900b35f927a2bbe8 - sha256sums = 9f055d2a4f3fa08a7f0ca9f233a0ca6925247f572fb6873af7ac1e1f43f23d74 + source = glib-compile-schemas.hook + b2sums = cc3a6a7a14fef1aabc08d3bdfe98f66e3ecf3591ac054d83aa9404c8c9cd72e690a4c26c16934700d067bb2cb3d58730387482032cd9ffa04b041869426165ba + b2sums = SKIP + b2sums = 94c73ca7070c239494873dd52d6ee09382bbb5b1201f7afd737cfa140b1a2fb0744b2c2831baf3943d1d072550c35888d21ce6f19f89481ff9d1a60d9a0b30e0 + b2sums = 5eed57eccc15fa9994228815874200135e9ee682b9bd718dae4b486eb3a65f2efb8121f45afedd4dd33208297738b5f1f489cb9a798a896540a505b32a37cc08 + b2sums = 14c9211c0557f6d8d9a914f1b18b7e0e23f79f4abde117cb03ab119b95bf9fa9d7a712aa0a29beb266468aeb352caa3a9e4540503cfc9fe0bbaf764371832a96 + b2sums = d30d349b4cb4407839d9074ce08f5259b8a5f3ca46769aabc621f17d15effdb89c4bf19bd23603f6df3d59f8d1adaded0f4bacd0333afcab782f2d048c882858 pkgname = glib2-patched-thumbnailer - diff --git a/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch b/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch new file mode 100644 index 000000000000..0a0b7f043247 --- /dev/null +++ b/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch @@ -0,0 +1,40 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Fri, 7 Jan 2022 18:59:10 +0000 +Subject: [PATCH] glib-compile-schemas: Remove noisy deprecation warnings + +While the warnings are useful for developers, Arch Linux users also see +them when glib-compile-schemas gets run after upgrades, where they just +add noise. + +The alternative to this patch would be redirecting the compiler's stderr +to /dev/null, but that might also suppress more useful errors or +warnings we want users to see. +--- + gio/glib-compile-schemas.c | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +index 04ef40457eba..e791ce254454 100644 +--- a/gio/glib-compile-schemas.c ++++ b/gio/glib-compile-schemas.c +@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, + return; + } + +- if (path && (g_str_has_prefix (path, "/apps/") || +- g_str_has_prefix (path, "/desktop/") || +- g_str_has_prefix (path, "/system/"))) +- { +- gchar *message = NULL; +- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " +- "Paths starting with " +- "“/apps/”, “/desktop/” or “/system/” are deprecated."), +- id, path); +- g_printerr ("%s\n", message); +- g_free (message); +- } +- + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + 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/glib-thumbnailer.patch b/0002-glocalfileinfo-add-a-dbus-thumbnail-generator.patch index 87ead82363e7..55167c699d43 100644 --- a/glib-thumbnailer.patch +++ b/0002-glocalfileinfo-add-a-dbus-thumbnail-generator.patch @@ -1,8 +1,17 @@ +From 01ce72fb8086fb6984e4409739a821408045612e Mon Sep 17 00:00:00 2001 +From: Dudemanguy <random342@airmail.cc> +Date: Sat, 24 Feb 2024 15:07:31 -0600 +Subject: [PATCH] glocalfileinfo: add a dbus thumbnail generator + +--- + gio/glocalfileinfo.c | 186 +++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 179 insertions(+), 7 deletions(-) + diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c -index 487f8cc1a..b0e6db728 100644 +index 4f51427f5..5e1698da0 100644 --- a/gio/glocalfileinfo.c +++ b/gio/glocalfileinfo.c -@@ -66,6 +66,12 @@ +@@ -68,6 +68,12 @@ #include "glib-private.h" #include "thumbnail-verify.h" @@ -15,7 +24,7 @@ index 487f8cc1a..b0e6db728 100644 #ifdef G_OS_WIN32 #include <windows.h> -@@ -103,6 +109,16 @@ struct ThumbMD5Context { +@@ -109,6 +115,16 @@ struct ThumbMD5Context { unsigned char in[64]; }; @@ -32,8 +41,8 @@ index 487f8cc1a..b0e6db728 100644 #ifndef G_OS_WIN32 typedef struct { -@@ -1355,16 +1371,130 @@ get_content_type (const char *basename, - +@@ -1419,18 +1435,137 @@ get_thumbnail_dirname_from_size (ThumbnailSize size) + g_return_val_if_reached (NULL); } +#ifdef FREEDESKTOP_THUMBNAILER @@ -89,6 +98,7 @@ index 487f8cc1a..b0e6db728 100644 + NULL, + &error); + ++ g_main_context_push_thread_default (thread_context); + proxy = g_dbus_proxy_new_sync (connection, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, + NULL, @@ -100,8 +110,7 @@ index 487f8cc1a..b0e6db728 100644 + if (!proxy) + { + g_warning ("generate_thumbnail (): g_dbus_proxy_new_sync failed"); -+ g_main_loop_unref (state.mainloop); -+ return FALSE; ++ goto done; + } + else + g_debug("generate_thumbnail (): connected to D-Bus"); @@ -109,7 +118,6 @@ index 487f8cc1a..b0e6db728 100644 + g_signal_connect (G_OBJECT (proxy), "g-signal", + G_CALLBACK (thumbnailer_signal_cb), &state); + -+ g_main_context_push_thread_default (thread_context); + result = g_dbus_proxy_call_sync (proxy, + "Queue", + g_variant_new("(^as^asssu)", @@ -125,14 +133,20 @@ index 487f8cc1a..b0e6db728 100644 + if (!result || error) + { + g_warning ("generate_thumbnail (): g_dbus_proxy_call_sync() failed: %s", error->message); -+ return FALSE; ++ goto done; + } + g_variant_get (result, "(u)", &(state.handle)); + g_variant_unref (result); + // block until the loop is terminated in thumbnailer_signal_cb () + g_main_loop_run (state.mainloop); -+ g_object_unref (proxy); -+ g_object_unref (connection); ++ ++done: ++ if (proxy) ++ g_object_unref (proxy); ++ ++ if (connection) ++ g_object_unref (connection); ++ + g_main_loop_unref (state.mainloop); + g_main_context_pop_thread_default (thread_context); + g_main_context_unref (thread_context); @@ -152,43 +166,36 @@ index 487f8cc1a..b0e6db728 100644 static void get_thumbnail_attributes (const char *path, GFileInfo *info, -- const GLocalFileStat *stat_buf) -+ const GLocalFileStat *stat_buf, + const GLocalFileStat *stat_buf, +- ThumbnailSize size) ++ ThumbnailSize size, + gboolean generate) { GChecksum *checksum; + const char *dirname; char *uri; - char *filename; + char *filename = NULL; char *basename; + const char *content_type; - - uri = g_filename_to_uri (path, NULL, NULL); - -@@ -1383,6 +1513,7 @@ get_thumbnail_attributes (const char *path, - _g_file_info_set_attribute_byte_string_by_id (info, G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH, filename); - _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID, + guint32 failed_attr_id; + guint32 is_valid_attr_id; + guint32 path_attr_id; +@@ -1507,6 +1642,7 @@ get_thumbnail_attributes (const char *path, + _g_file_info_set_attribute_byte_string_by_id (info, path_attr_id, filename); + _g_file_info_set_attribute_boolean_by_id (info, is_valid_attr_id, thumbnail_verify (filename, uri, stat_buf)); + generate = FALSE; } else { -@@ -1396,6 +1527,7 @@ get_thumbnail_attributes (const char *path, - _g_file_info_set_attribute_byte_string_by_id (info, G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH, filename); - _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID, +@@ -1521,9 +1657,31 @@ get_thumbnail_attributes (const char *path, + _g_file_info_set_attribute_boolean_by_id (info, failed_attr_id, TRUE); + _g_file_info_set_attribute_boolean_by_id (info, is_valid_attr_id, thumbnail_verify (filename, uri, stat_buf)); + generate = FALSE; } - else - { -@@ -1411,9 +1543,32 @@ get_thumbnail_attributes (const char *path, - _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED, TRUE); - _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID, - thumbnail_verify (filename, uri, stat_buf)); -+ generate = FALSE; - } - } } -+ + + if (generate) + { +#ifdef FREEDESKTOP_THUMBNAILER @@ -196,16 +203,16 @@ index 487f8cc1a..b0e6db728 100644 + if (content_type) + { + g_debug ("invoking Freedesktop Thumbnailer for %s (%s)", uri, content_type); -+ if(generate_thumbnail (uri, content_type)) ++ if (generate_thumbnail (uri, content_type)) + { + /* Now that the thumbnail is generated, find it. */ -+ get_thumbnail_attributes (path, info, stat_buf, FALSE); ++ get_thumbnail_attributes (path, info, stat_buf, size, FALSE); + } -+ else ++ /*else + { + _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED, TRUE); + _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID, FALSE); -+ } ++ }*/ + } +#endif /* FREEDESKTOP_THUMBNAILER */ + } @@ -213,7 +220,7 @@ index 487f8cc1a..b0e6db728 100644 g_free (basename); g_free (filename); g_free (uri); -@@ -1767,6 +1922,18 @@ _g_local_file_info_get (const char *basename, +@@ -1914,6 +2072,18 @@ _g_local_file_info_get (const char *basename, info = g_file_info_new (); @@ -232,7 +239,7 @@ index 487f8cc1a..b0e6db728 100644 /* Make sure we don't set any unwanted attributes */ g_file_info_set_attribute_mask (info, attribute_matcher); -@@ -1901,7 +2068,9 @@ _g_local_file_info_get (const char *basename, +@@ -2049,7 +2219,9 @@ _g_local_file_info_get (const char *basename, _g_file_attribute_matcher_matches_id (attribute_matcher, G_FILE_ATTRIBUTE_ID_STANDARD_ICON) || _g_file_attribute_matcher_matches_id (attribute_matcher, @@ -243,15 +250,51 @@ index 487f8cc1a..b0e6db728 100644 { char *content_type = get_content_type (basename, path, stat_ok ? &statbuf : NULL, is_symlink, symlink_broken, flags, FALSE); -@@ -2018,9 +2187,9 @@ _g_local_file_info_get (const char *basename, +@@ -2165,7 +2337,7 @@ _g_local_file_info_get (const char *basename, + _g_file_attribute_matcher_matches_id (attribute_matcher, G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED)) { - if (stat_ok) -- get_thumbnail_attributes (path, info, &statbuf); -+ get_thumbnail_attributes (path, info, &statbuf, TRUE); - else -- get_thumbnail_attributes (path, info, NULL); -+ get_thumbnail_attributes (path, info, NULL, TRUE); +- get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_AUTO); ++ get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_AUTO, TRUE); + } + + if (_g_file_attribute_matcher_matches_id (attribute_matcher, +@@ -2175,7 +2347,7 @@ _g_local_file_info_get (const char *basename, + _g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_NORMAL)) + { +- get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_NORMAL); ++ get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_NORMAL, TRUE); + } + + if (_g_file_attribute_matcher_matches_id (attribute_matcher, +@@ -2185,7 +2357,7 @@ _g_local_file_info_get (const char *basename, + _g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_LARGE)) + { +- get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_LARGE); ++ get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_LARGE, TRUE); + } + + if (_g_file_attribute_matcher_matches_id (attribute_matcher, +@@ -2195,7 +2367,7 @@ _g_local_file_info_get (const char *basename, + _g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_XLARGE)) + { +- get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_XLARGE); ++ get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_XLARGE, TRUE); + } + + if (_g_file_attribute_matcher_matches_id (attribute_matcher, +@@ -2205,7 +2377,7 @@ _g_local_file_info_get (const char *basename, + _g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_XXLARGE)) + { +- get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_XXLARGE); ++ get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_XXLARGE, TRUE); } vfs = g_vfs_get_default (); +-- +2.43.2 + @@ -1,79 +1,107 @@ -# Maintainer: dudemanguy <random342@airmail.cc> +# Maintainer: Dudemanguy <random342@airmail.cc> # Contributor: Vaporeon <vaporeon@vaporeon.io> +# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=glib2-patched-thumbnailer -pkgver=2.64.0 -pkgrel=1 +pkgver=2.80.0 +pkgrel=2 pkgdesc="GLib2 patched with ahodesuka's thumbnailer patch." url="https://gist.github.com/Dudemanguy/d199759b46a79782cc1b301649dec8a5" arch=(x86_64) -provides=(glib2=$pkgver libgio-2.0.so libglib-2.0.so libgmodule-2.0.so - libgobject-2.0.so libgthread-2.0.so) +provides=(glib2=$pkgver libg{lib,io,irepository,module,object,thread}-2.0.so) conflicts=('glib2') -depends=(pcre libffi libutil-linux zlib tumbler libmount.so) -makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux - meson dbus) -checkdepends=(desktop-file-utils) +depends=(pcre2 libffi util-linux-libs zlib tumbler libsysprof-capture libmount.so libffi.so) +makedepends=( + dbus + gettext + git + gi-docgen + gobject-introspection + libelf + meson + python + python-docutils + shared-mime-info + util-linux +) +checkdepends=(desktop-file-utils glib2) optdepends=('python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report' - 'libelf: gresource inspection tool') -options=('!docs') -license=(LGPL2.1) -_commit=369626e3105d688afaa316d89d34e8927a8a0171 # tags/2.64.0^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') + 'libelf: gresource inspection tool' + 'gvfs: most gio functionality') +options=(!docs staticlibs) +license=(LGPL) +_commit=763cc3b238398614c20069fd67642730e3a6519b # tags/2.80.0^0 +source=( + "git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit" + "git+https://gitlab.gnome.org/GNOME/gvdb.git" + 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch + 0002-glocalfileinfo-add-a-dbus-thumbnail-generator.patch + gio-querymodules.hook + glib-compile-schemas.hook +) +b2sums=('cc3a6a7a14fef1aabc08d3bdfe98f66e3ecf3591ac054d83aa9404c8c9cd72e690a4c26c16934700d067bb2cb3d58730387482032cd9ffa04b041869426165ba' + 'SKIP' + '94c73ca7070c239494873dd52d6ee09382bbb5b1201f7afd737cfa140b1a2fb0744b2c2831baf3943d1d072550c35888d21ce6f19f89481ff9d1a60d9a0b30e0' + '5eed57eccc15fa9994228815874200135e9ee682b9bd718dae4b486eb3a65f2efb8121f45afedd4dd33208297738b5f1f489cb9a798a896540a505b32a37cc08' + '14c9211c0557f6d8d9a914f1b18b7e0e23f79f4abde117cb03ab119b95bf9fa9d7a712aa0a29beb266468aeb352caa3a9e4540503cfc9fe0bbaf764371832a96' + 'd30d349b4cb4407839d9074ce08f5259b8a5f3ca46769aabc621f17d15effdb89c4bf19bd23603f6df3d59f8d1adaded0f4bacd0333afcab782f2d048c882858') pkgver() { cd glib - git describe --tags | sed 's/-/+/g' + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' } prepare() { cd glib # 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 + git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch # Apply patch to generate thumbnails - patch -Np1 -i ../glib-thumbnailer.patch + git apply -3 ../0002-glocalfileinfo-add-a-dbus-thumbnail-generator.patch + + git submodule init + git submodule set-url subprojects/gvdb "$srcdir/gvdb" + git -c protocol.file.allow=always submodule update } build() { - CFLAGS+=" -DG_DISABLE_CAST_CHECKS" - arch-meson glib build \ - -D selinux=disabled \ - -D man=true \ - -D gtk_doc=true - ninja -C build + local meson_options=( + --default-library both + -D glib_debug=disabled + -D introspection=enabled + -D man-pages=enabled + -D selinux=disabled + -D sysprof=enabled + ) + + # Produce more debug info: GLib has a lot of useful macros + CFLAGS+=" -g3" + CXXFLAGS+=" -g3" + + # use fat LTO objects for static libraries + CFLAGS+=" -ffat-lto-objects" + CXXFLAGS+=" -ffat-lto-objects" + + arch-meson glib build "${meson_options[@]}" + meson compile -C build } -#skip this; test fails -#check() { -# meson test -C build --no-suite flaky --print-errorlogs -#} +check() { + meson test -C build --no-suite flaky --no-suite slow --print-errorlogs +} package() { - DESTDIR="$pkgdir" meson install -C build + meson install -C build --destdir "$pkgdir" + install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook + touch "$pkgdir/usr/lib/gio/modules/.keep" python -m compileall -d /usr/share/glib-2.0/codegen \ "$pkgdir/usr/share/glib-2.0/codegen" python -O -m compileall -d /usr/share/glib-2.0/codegen \ "$pkgdir/usr/share/glib-2.0/codegen" - - # rm docs - rm -r "$pkgdir/usr/share/gtk-doc" } + +# vim:set sw=2 sts=-1 et: diff --git a/noisy-glib-compile-schemas.diff b/noisy-glib-compile-schemas.diff deleted file mode 100644 index f5f2d9482229..000000000000 --- a/noisy-glib-compile-schemas.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c -index b8de0907248f6860..130f89b1728f7932 100644 ---- i/gio/glib-compile-schemas.c -+++ w/gio/glib-compile-schemas.c -@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state, - return; - } - -- if (path && (g_str_has_prefix (path, "/apps/") || -- g_str_has_prefix (path, "/desktop/") || -- g_str_has_prefix (path, "/system/"))) -- { -- gchar *message = NULL; -- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " -- "Paths starting with " -- "“/apps/”, “/desktop/” or “/system/” are deprecated."), -- id, path); -- g_printerr ("%s\n", message); -- g_free (message); -- } -- - state->schema_state = schema_state_new (path, gettext_domain, - extends, extends_name, list_of); - |