From 6ee43b0e7b491db84d06ed1810b397c55b225eff Mon Sep 17 00:00:00 2001 From: zhangpan Date: Thu, 1 Aug 2024 08:42:50 +0000 Subject: [PATCH] backport patch from upstream --- backport-spelling-fixes.patch | 108 ++++++++++++++++++++++++++++++++++ dconf.spec | 12 ++-- 2 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 backport-spelling-fixes.patch diff --git a/backport-spelling-fixes.patch b/backport-spelling-fixes.patch new file mode 100644 index 0000000..a2f30b9 --- /dev/null +++ b/backport-spelling-fixes.patch @@ -0,0 +1,108 @@ +From d64a9a6ed855b1bc559d070db2d203cd85ecb69b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Sun, 14 Apr 2024 09:53:09 +0300 +Subject: [PATCH] *: Spelling fixes + +Reference:https://github.com/GNOME/dconf/commit/d64a9a6ed855b1bc559d070db2d203cd85ecb69b +Conflict:NA + +--- + NEWS | 2 +- + engine/dconf-engine.h | 2 +- + tests/dbus.c | 2 +- + tests/gvdb.c | 4 ++-- + tests/test-dconf.py | 2 +- + tests/writer.c | 4 ++-- + 6 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/NEWS b/NEWS +index 23a2eae..0310eef 100644 +--- a/NEWS ++++ b/NEWS +@@ -151,7 +151,7 @@ Changes in dconf 0.29.1 + a changed signal is only sent for the path being subscribed to + instead of the root path. (Daniel Playfair Cal; !1, !5, #790640) + +- - Engine: fix deadlock which occured when using the engine from libsoup ++ - Engine: fix deadlock which occurred when using the engine from libsoup + within flatpak by extending the existing workaround for Glib !541, aka + #674885. GSocket and various other GObject types are now also + initialised in the main thread. (Owen Taylor; !15) +diff --git a/engine/dconf-engine.h b/engine/dconf-engine.h +index 6d57782..ea5f9ed 100644 +--- a/engine/dconf-engine.h ++++ b/engine/dconf-engine.h +@@ -78,7 +78,7 @@ void dconf_engine_dbus_handle_connection_closed (GDBusCo + GCallback bus_closed_callback, + gpointer bus_closed_callback_user_data); + +-/* Notifies that a change occured. ++/* Notifies that a change occurred. + * + * The engine lock is never held when calling this function so it is + * safe to run user callbacks or emit signals from this function. +diff --git a/tests/dbus.c b/tests/dbus.c +index e604924..2c73ff2 100644 +--- a/tests/dbus.c ++++ b/tests/dbus.c +@@ -2,7 +2,7 @@ + #include + #include + +-/* Test the DBus communicaton code. ++/* Test the DBus communication code. + */ + + #include "../engine/dconf-engine.h" +diff --git a/tests/gvdb.c b/tests/gvdb.c +index b34def9..79fbc39 100644 +--- a/tests/gvdb.c ++++ b/tests/gvdb.c +@@ -89,10 +89,10 @@ verify_table (GvdbTable *table) + gboolean has; + + /* We could not normally expect these to be in a particular order but +- * we are using a specific test file that we know to be layed out this ++ * we are using a specific test file that we know to be laid out this + * way... + * +- * It's pure luck that they happened to be layed out in this nice way. ++ * It's pure luck that they happened to be laid out in this nice way. + */ + list = gvdb_table_get_names (table, &n_names); + g_assert_cmpint (n_names, ==, g_strv_length (list)); +diff --git a/tests/test-dconf.py b/tests/test-dconf.py +index 5e65884..1f50da8 100755 +--- a/tests/test-dconf.py ++++ b/tests/test-dconf.py +@@ -309,7 +309,7 @@ def test_reset_key(self): + self.assertEqual([], dconf_list('/app/')) + + def test_reset_dir(self): +- """Reseting whole directory is possible with -f option. ++ """Resetting whole directory is possible with -f option. + + It is an error not to use -f when resetting a dir. + """ +diff --git a/tests/writer.c b/tests/writer.c +index df33fc4..3cb0b93 100644 +--- a/tests/writer.c ++++ b/tests/writer.c +@@ -353,7 +353,7 @@ static void test_writer_commit_real_changes (Fixture *fixture, + /* End transaction */ + writer_class->end (writer); + +- /* Check that no extra write was done (even afer committing a real change) */ ++ /* Check that no extra write was done (even after committing a real change) */ + g_assert_cmpuint (db_mtime_us, ==, get_file_mtime_us (db_filename)); + db_mtime_us = get_file_mtime_us (db_filename); + +@@ -367,7 +367,7 @@ static void test_writer_commit_real_changes (Fixture *fixture, + g_assert_no_error (local_error); + g_assert_true (retval); + +- /* Check that no extra write was done (even afer committing a real change) */ ++ /* Check that no extra write was done (even after committing a real change) */ + g_assert_cmpuint (db_mtime_us, ==, get_file_mtime_us (db_filename)); + db_mtime_us = get_file_mtime_us (db_filename); + diff --git a/dconf.spec b/dconf.spec index 8b1c0f1..e5fa21a 100644 --- a/dconf.spec +++ b/dconf.spec @@ -1,13 +1,14 @@ Name: dconf Version: 0.40.0 -Release: 3 +Release: 4 Summary: Dconf provides a backend to the GSettings API in Glib License: LGPLv2+ and GPLv2+ and GPLv3+ URL: http://live.gnome.org/%{name} Source0: http://download.gnome.org/sources/%{name}/0.40/%{name}-%{version}.tar.xz -Patch9000: memset-chunk-date-to-eliminate-discrepancy.patch +Patch6000: backport-spelling-fixes.patch +Patch9000: memset-chunk-date-to-eliminate-discrepancy.patch BuildRequires: bash-completion dbus-devel glib2-devel >= 2.44.0 gtk-doc meson vala libxslt Requires: dbus glib2%{?_isa} >= 2.44.0 @@ -91,13 +92,16 @@ dconf update %{_mandir}/man7/dconf.7.gz %changelog -* Thu Apr 7 2022 liuyumeng -0.40.0-3 +* Thu Aug 1 2024 zhangpan - 0.40.0-4 +- backport patch from upstream + +* Thu Apr 7 2022 liuyumeng - 0.40.0-3 - enable tests,remove redundant files * Tue Jan 18 2022 liuyumeng - 0.40.0-2 - add patch:dconf read random contents of memory causing discrepancy,initialize memory to eliminate discrepancy -* Thu Dec 09 2021 liuyumeng -0.40.0-1 +* Thu Dec 09 2021 liuyumeng - 0.40.0-1 - update to 0.40.0 * Sat Jan 30 2021 yanglu - 0.38.0-1 -- Gitee