From 5449d6bb791af01ca485935a0a93b384707295c679a1a164940ae6971e94197a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 10 Oct 2022 10:45:49 +0000 Subject: [PATCH] Accepting request 1008790 from home:okitaxxx - Add the following upstream patch to solve GIMP crashes: f0dd96c28751f15d0703b384bfc7c314af01caa8.diff See https://gitlab.gnome.org/GNOME/glib/-/issues/2770 OBS-URL: https://build.opensuse.org/request/show/1008790 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=491 --- f0dd96c28751f15d0703b384bfc7c314af01caa8.diff | 14 ++++++++++++++ glib2.changes | 6 ++++++ glib2.spec | 3 +++ 3 files changed, 23 insertions(+) create mode 100644 f0dd96c28751f15d0703b384bfc7c314af01caa8.diff diff --git a/f0dd96c28751f15d0703b384bfc7c314af01caa8.diff b/f0dd96c28751f15d0703b384bfc7c314af01caa8.diff new file mode 100644 index 0000000..a9945a4 --- /dev/null +++ b/f0dd96c28751f15d0703b384bfc7c314af01caa8.diff @@ -0,0 +1,14 @@ +diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c +index f17b3488b9b0e9a376dcd9e999062613ac580497..17b8606572385dca8453e7d5a6194db0706dad08 100644 +--- a/gobject/gparamspecs.c ++++ b/gobject/gparamspecs.c +@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec *pspec, + { + GParamSpec *param = value->data[0].v_pointer; + ++ if (param == NULL) ++ return FALSE; ++ + return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec)); + } + diff --git a/glib2.changes b/glib2.changes index a4fa6e5..5b3815d 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 7 01:25:03 UTC 2022 - Haochuan Chen + +- Add the following upstream patch to solve GIMP crashes: + f0dd96c28751f15d0703b384bfc7c314af01caa8.diff + ------------------------------------------------------------------- Sun Sep 18 06:56:01 UTC 2022 - Bjørn Lie diff --git a/glib2.spec b/glib2.spec index df0ce5d..ac46926 100644 --- a/glib2.spec +++ b/glib2.spec @@ -58,6 +58,8 @@ Patch2: glib2-suppress-schema-deprecated-path-warning.patch Patch3: glib2-dbus-socket-path.patch # PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch olaf@aepfle.de -- Remove version string from files generated by gdbus-codegen Patch4: glib2-gdbus-codegen-version.patch +# Fix upstream bug #2770 +Patch99: f0dd96c28751f15d0703b384bfc7c314af01caa8.diff BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gcc-c++ @@ -260,6 +262,7 @@ the functionality of the installed glib2 package. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch99 -p1 cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} . cp -a %{SOURCE4} gnome_defaults.conf # replace /usr/bin/env shebangs