diff options
author | Zheng Junjie <zhengjunjie@iscas.ac.cn> | 2024-07-05 23:23:57 +0800 |
---|---|---|
committer | Zheng Junjie <zhengjunjie@iscas.ac.cn> | 2024-07-18 10:44:59 +0800 |
commit | dbe43da6dae4e64f2c38741fee6041ceabf01a13 (patch) | |
tree | 44f5a36c31e64ee93bcbc9f26fdc93a789042864 /gnu/packages/patches | |
parent | 5b1b7662916ac1e1be16eae7ed8d3ad10008012d (diff) | |
download | guix-dbe43da6dae4e64f2c38741fee6041ceabf01a13.tar guix-dbe43da6dae4e64f2c38741fee6041ceabf01a13.tar.gz |
gnu: appstream: Update to 1.0.3.
* gnu/packages/freedesktop.scm (appstream): Update to 1.0.3.
[source]: Remove patch.
[native-inputs]: Add gi-docgen.
(appstream-qt)[arguments]: Pass -Dqt-versions=5.
* gnu/packages/patches/appstream-force-reload-stemmer.patch: Delete it.
* gnu/local.mk (dist_patch_DATA): Unregister it.
Change-Id: I7037c0e1b6c8e0d4212506e9caac9fe64a762d96
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/appstream-force-reload-stemmer.patch | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/gnu/packages/patches/appstream-force-reload-stemmer.patch b/gnu/packages/patches/appstream-force-reload-stemmer.patch deleted file mode 100644 index a2cf84c8b1..0000000000 --- a/gnu/packages/patches/appstream-force-reload-stemmer.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 32182d7a7a67d0d204cd0a37bd211bfd0177bc27 Mon Sep 17 00:00:00 2001 -Message-ID: <32182d7a7a67d0d204cd0a37bd211bfd0177bc27.1700093066.git.vivien@planete-kraus.eu> -From: Matthias Klumpp <matthias@tenstral.net> -Date: Thu, 16 Nov 2023 00:59:15 +0100 -Subject: [PATCH] stemmer: Resolve potential issue where stemmer may never be - initialized - -If the initial locale was equal to the current stemming language, we may -never have initialized the stemmer (which could lead to crashes or -stemming being disabled). - -So we force the reload to always happen on initialization. -CC: #558 ---- - src/as-stemmer.c | 33 +++++++++++++++++++++------------ - 1 file changed, 21 insertions(+), 12 deletions(-) - -diff --git a/src/as-stemmer.c b/src/as-stemmer.c -index 63d45267..16ebd09b 100644 ---- a/src/as-stemmer.c -+++ b/src/as-stemmer.c -@@ -47,6 +47,8 @@ G_DEFINE_TYPE (AsStemmer, as_stemmer, G_TYPE_OBJECT) - - static gpointer as_stemmer_object = NULL; - -+static void as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force); -+ - /** - * as_stemmer_finalize: - **/ -@@ -76,21 +78,14 @@ as_stemmer_init (AsStemmer *stemmer) - - /* we don't use the locale in XML, so it can be POSIX */ - locale = as_get_current_locale_posix (); -- stemmer->current_lang = as_utils_locale_to_language (locale); - -- as_stemmer_reload (stemmer, stemmer->current_lang); -+ /* force a reload for initialization */ -+ as_stemmer_reload_internal (stemmer, locale, TRUE); - #endif - } - --/** -- * as_stemmer_reload: -- * @stemmer: A #AsStemmer -- * @locale: The stemming language as POSIX locale. -- * -- * Allows realoading the #AsStemmer with a different language. -- */ --void --as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) -+static void -+as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force) - { - #ifdef HAVE_STEMMING - g_autofree gchar *lang = NULL; -@@ -99,7 +94,7 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) - /* check if we need to reload */ - lang = as_utils_locale_to_language (locale); - locker = g_mutex_locker_new (&stemmer->mutex); -- if (as_str_equal0 (lang, stemmer->current_lang)) { -+ if (!force && as_str_equal0 (lang, stemmer->current_lang)) { - g_mutex_locker_free (locker); - return; - } -@@ -119,6 +114,20 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) - #endif - } - -+/** -+ * as_stemmer_reload: -+ * @stemmer: A #AsStemmer -+ * @locale: The stemming language as POSIX locale. -+ * -+ * Allows realoading the #AsStemmer with a different language. -+ * Does nothing if the stemmer is already using the selected language. -+ */ -+void -+as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) -+{ -+ as_stemmer_reload_internal (stemmer, locale, FALSE); -+} -+ - /** - * as_stemmer_stem: - * @stemmer: A #AsStemmer --- -2.41.0 - |