diff --git a/.gitignore b/.gitignore index 028d1da..2ab5e0c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /AppStream-0.16.1.tar.xz /appstream-d88ed03cb5b3b1803bdee3528c9b99d528ceb065.tar.gz /AppStream-1.0.0.tar.xz +/AppStream-1.0.1.tar.xz diff --git a/0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch b/0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch deleted file mode 100644 index 71b72e0..0000000 --- a/0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 32182d7a7a67d0d204cd0a37bd211bfd0177bc27 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -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 - diff --git a/appstream.spec b/appstream.spec index 54ea3ac..147d3f5 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,6 +1,6 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 1.0.0 +Version: 1.0.1 Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ @@ -10,8 +10,7 @@ URL: https://github.com/ximion/appstream Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz # upstream patches -## From: https://github.com/ximion/appstream/commit/32182d7a7a67d0d204cd0a37bd211bfd0177bc27 -Patch0001: 0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch + # upstreamable patches @@ -197,6 +196,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Wed Jan 03 2024 Steve Cossette - 1.0.1-1 +- Update to 1.0.1 + * Fri Nov 17 2023 Neal Gompa - 1.0.0-1 - Update to 1.0.0 final diff --git a/sources b/sources index f04060e..033330a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-1.0.0.tar.xz) = 273f1bbb64794691f04bee0cff782670465c6da238beec040af71a99395afdc8a85a6712c77777ff7c7ca872db6b2c8549782b7773d882e5ed7e9aa2a880f04c +SHA512 (AppStream-1.0.1.tar.xz) = 9e7d275910778ad119ac6029f61104619857a61582ec1022cea3a852cd8794b191aefadbde61d21801607ba5d5d0bed0e636ce8807af5c6d5b1e3c4c753842ab