From 756f98dc31902588f6a80a123f901c24524b8bbb9165ae9e253b969884f2838d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 12 Feb 2024 17:17:43 +0000 Subject: [PATCH 1/2] Accepting request 1146239 from GNOME:Next Update to 45.3 OBS-URL: https://build.opensuse.org/request/show/1146239 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=540 --- _service | 2 +- gnome-control-center-45.2.obscpio | 3 --- gnome-control-center-45.3.obscpio | 3 +++ gnome-control-center.changes | 8 ++++++++ gnome-control-center.obsinfo | 6 +++--- gnome-control-center.spec | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 gnome-control-center-45.2.obscpio create mode 100644 gnome-control-center-45.3.obscpio diff --git a/_service b/_service index a8cb374..6211851 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git https://gitlab.gnome.org/GNOME/gnome-control-center.git - refs/tags/45.2 + 45.3 @PARENT_TAG@+@TAG_OFFSET@ (.*)\+0 \1 diff --git a/gnome-control-center-45.2.obscpio b/gnome-control-center-45.2.obscpio deleted file mode 100644 index eca57d0..0000000 --- a/gnome-control-center-45.2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9621ad8553d8f10ba83bd81e7ddfe2eaaf50956c439cf3c2d8b1d6369929c17b -size 46304781 diff --git a/gnome-control-center-45.3.obscpio b/gnome-control-center-45.3.obscpio new file mode 100644 index 0000000..8da2643 --- /dev/null +++ b/gnome-control-center-45.3.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4e3eb8cdadf9b019ab2d32daa200dce0afee2311dc355ed9f555bf79a299c60 +size 46730253 diff --git a/gnome-control-center.changes b/gnome-control-center.changes index efe6075..670a3a8 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Feb 12 16:56:32 UTC 2024 - Dominique Leuenberger + +- Update to version 45.3: + + Datetime: Fix build with -Wincompatible-pointer-types. + + Region: Prevent preview crash from accessing invalid pointer. + + Wifi: Fix build with -Wincompatible-pointer-types. + ------------------------------------------------------------------- Thu Jan 4 02:08:39 UTC 2024 - Alynx Zhou diff --git a/gnome-control-center.obsinfo b/gnome-control-center.obsinfo index 88e9c28..ad41798 100644 --- a/gnome-control-center.obsinfo +++ b/gnome-control-center.obsinfo @@ -1,4 +1,4 @@ name: gnome-control-center -version: 45.2 -mtime: 1701946236 -commit: cc5da95fecaeb5486435c54917edf9633addc02d +version: 45.3 +mtime: 1707740634 +commit: 4e107fa21250416812d64da8cf32946babb7728d diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 838a5d9..9b8805b 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -26,7 +26,7 @@ %endif Name: gnome-control-center -Version: 45.2 +Version: 45.3 Release: 0 Summary: The GNOME Control Center License: GPL-2.0-or-later From f438697c0b9cb018880f61c04b76a4c49b87b333427b505dbf7386e17a60e3df Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Feb 2024 10:26:11 +0000 Subject: [PATCH 2/2] - Drop gnome-control-center-fix-region-preview-crash.patch: fixed upstream. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=541 --- ...trol-center-fix-region-preview-crash.patch | 51 ------------------- gnome-control-center.changes | 2 + gnome-control-center.spec | 3 -- 3 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 gnome-control-center-fix-region-preview-crash.patch diff --git a/gnome-control-center-fix-region-preview-crash.patch b/gnome-control-center-fix-region-preview-crash.patch deleted file mode 100644 index 75b6eb3..0000000 --- a/gnome-control-center-fix-region-preview-crash.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d4a522277bcd1e172be57f3525c2d24831bb3cc5 Mon Sep 17 00:00:00 2001 -From: Alynx Zhou -Date: Thu, 4 Jan 2024 10:29:49 +0800 -Subject: [PATCH] system/region: Prevent preview crash from accessing invalid - pointer - -In !2051, we switch back to real locale before setting the label text, -however, according to nl_langinfo's manpage, the returned pointer could -be invalid after switching locale or creating new locale, so the program -may crash. - -To fix this, we save the result before switching locale, so we won't -access the invalid pointer after switch locale. ---- - panels/region/cc-format-preview.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/panels/region/cc-format-preview.c b/panels/region/cc-format-preview.c -index 7aea45511..e4f4afa32 100644 ---- a/panels/region/cc-format-preview.c -+++ b/panels/region/cc-format-preview.c -@@ -69,6 +69,7 @@ update_format_examples (CcFormatPreview *self) - g_autofree gchar *s = NULL; - #ifdef LC_MEASUREMENT - const gchar *fmt; -+ gboolean is_imperial = FALSE; - #endif - g_autoptr(GtkPaperSize) paper = NULL; - -@@ -133,6 +134,9 @@ update_format_examples (CcFormatPreview *self) - old_locale = uselocale (locale); - - fmt = nl_langinfo (_NL_MEASUREMENT_MEASUREMENT); -+ /* The returned pointer of nl_langinfo could be invalid after switching -+ locale, so we must use it here. */ -+ is_imperial = fmt && *fmt == 2; - - if (locale != (locale_t) 0) - { -@@ -140,7 +144,7 @@ update_format_examples (CcFormatPreview *self) - freelocale (locale); - } - -- if (fmt && *fmt == 2) -+ if (is_imperial) - gtk_label_set_text (GTK_LABEL (self->measurement_format_label), C_("measurement format", "Imperial")); - else - gtk_label_set_text (GTK_LABEL (self->measurement_format_label), C_("measurement format", "Metric")); --- -2.43.0 - diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 670a3a8..849125d 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -5,6 +5,8 @@ Mon Feb 12 16:56:32 UTC 2024 - Dominique Leuenberger + Datetime: Fix build with -Wincompatible-pointer-types. + Region: Prevent preview crash from accessing invalid pointer. + Wifi: Fix build with -Wincompatible-pointer-types. +- Drop gnome-control-center-fix-region-preview-crash.patch: fixed + upstream. ------------------------------------------------------------------- Thu Jan 4 02:08:39 UTC 2024 - Alynx Zhou diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 9b8805b..9fa19cb 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -39,8 +39,6 @@ Source99: %{name}-rpmlintrc Patch1: gnome-control-center-disable-error-message-for-NM.patch # PATCH-FIX-UPSTREAM gnome-control-center-add-user-button.patch bsc#1215556 glgo#GNOME/Settings!1927 xwang@suse.com -- Show add user button Patch2: gnome-control-center-add-user-button.patch -# PATCH-FIX-UPSTREAM gnome-control-center-fix-region-preview-crash.patch bsc#1218528 glgo#GNOME/gnome-control-center!2122 alynx.zhou@suse.com -- Fix crash of region preview dialog -Patch3: gnome-control-center-fix-region-preview-crash.patch ### patches for Leap >= 15 plus SLE >= 15, but not TW # PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer. @@ -189,7 +187,6 @@ GNOME control center. %setup -q %patch -P 1 -p1 %patch -P 2 -p1 -%patch -P 3 -p1 # patches for Leap >= 15 plus SLE >= 15, but not TW %if 0%{?sle_version} >= 150000