Sync from SUSE:SLFO:Main gobject-introspection revision eda3f9e65556165a49842ed8129178aa

gi-find-deps.sh

@@ -20,7 +20,7 @@ fi
 }
 
 function split_name_version2 {
-  symbol=$(echo $1 | awk -F: '{print $1}' | sed "s:[' ]::g")
+  symbol=$(echo $1 | awk -F: '{sub(/^.*{/, "", $1); print $1}' | sed "s:[' ]::g")
   version=$(echo $1 | awk -F: '{print $2}' | sed "s:[' ]::g")
 }
 
@@ -149,7 +149,7 @@ oldIFS=$IFS
 IFS=:
 for file in "$jspkg"; do
 	IFS=$'\n'
-	PKGS=$(pcre2grep -M "pkg.require\\(([^;])*" $file | grep -o "'.*': '.*'")
+	PKGS=$(pcre2grep -M "pkg.require\\(([^;])*" $file | grep -o -E "'?.*'?: '.*'")
 	for pkg in $PKGS; do
 		split_name_version2 $pkg
 		found=0

gobject-introspection.changes

@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Wed Nov 29 13:15:29 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
+
+- Drop BuildRequires on pkgconfig(cairo)/pkgconfig(cairo-gobject),
+  cairo is only needed for some tests.
+
+-------------------------------------------------------------------
+Sat Sep 16 12:19:42 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.78.1:
+  + Avoid undefined behaviour in the Regress test suite
+
+-------------------------------------------------------------------
+Fri Sep  8 20:04:19 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.78.0:
+  + Update the GIR data for GLib, GObject, and GIO
+  + Add GObject as a dependency for the Cairo GIR
+  + Add more tests for GI marshalling
+  + Update regression test suite
+  + Fix build on Windows for paths using '\' as a separator
+  + Support different prefix for finding GIR data
+  + Add GI_GIR_PATH environment variable for controlling GIR paths
+
+-------------------------------------------------------------------
+Mon May 29 07:37:12 UTC 2023 - Luciano Santos <luc14n0@opensuse.org>
+
+- Adapt split_name_version2 function to deal with possible argument
+  containing "pkg.require({" string before the wanted module name
+  (a case from a JS script from gnome-weather). This is a side
+  effect from the previous change to the pcre2grep regex in the
+  javascript_pkg_requires function. Now, AWK should strip this
+  string with the help of a sub() function call with the ^.*{
+  regex.
+
+-------------------------------------------------------------------
+Sun May 21 03:02:12 UTC 2023 - Luciano Santos <luc14n0@opensuse.org>
+
+- Amend gi-find-deps.sh's javascript_pkg_requires function to
+  extend GREP's filtering by passing the extended regex option flag
+  (-E) and appending ? to the first two single quotes, accounting
+  for quoted AND unquoted names before the colon. This should
+  ensure that typelib() symbols provisioning are versioned where in
+  some previous cases they weren't, but should've, causing a
+  different version than the needed to be pulled. Those changes
+  address the case where Sushi was requiring only
+  typelib(GtkSource), rather than typelib(GtkSource) = 4. And
+  without something else, in a default installation of openSUSE
+  Tumbleweed, pulling in typelib-1_0-GtkSource-4, Sushi would fail
+  to present previews in Nautilus (boo#1211546).
+
 -------------------------------------------------------------------
 Thu Mar 30 09:31:23 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
 

gobject-introspection.spec

@@ -17,7 +17,7 @@
 
 
 Name:           gobject-introspection
-Version:        1.76.1
+Version:        1.78.1
 Release:        0
 # FIXME: Find a way to identify if we need python3-gobject or python-gobject from gi-find-deps.sh.
 Summary:        GObject Introspection Tools
@@ -25,7 +25,7 @@ License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Development/Libraries/GNOME
 URL:            https://wiki.gnome.org/Projects/GObjectIntrospection
 
-Source0:        https://download.gnome.org/sources/gobject-introspection/1.76/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gobject-introspection/1.78/%{name}-%{version}.tar.xz
 # gi-find-deps.sh is a rpm helper for Provides and Requires. Script creates typelib()-style Provides/Requires.
 Source1:        gi-find-deps.sh
 Source2:        gobjectintrospection.attr
@@ -43,8 +43,6 @@ BuildRequires:  python3-Mako
 BuildRequires:  python3-Markdown
 BuildRequires:  python3-devel
 BuildRequires:  python3-xml
-BuildRequires:  pkgconfig(cairo)
-BuildRequires:  pkgconfig(cairo-gobject)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.75.0
@@ -103,8 +101,9 @@ a uniform, machine readable format.
 %autosetup -p1
 
 %build
+# cairo is only needed for some tests, don't enable it
 %meson \
-	-Dcairo=enabled \
+	-Dcairo=disabled \
 	-Ddoctool=enabled \
 	-Dgtk_doc=true \
 	-Dpython='%{_bindir}/python3' \