From 91957a52d50a30fadc0ecf32ffa295ddb5ab847f49eff80f8bcbce3335472a45 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 13 Sep 2022 07:35:05 +0000
Subject: [PATCH] Accepting request 1002658 from GNOME:Next

GNOME 43.rc - let's get this into Staging to see what we break (e.g meson:test seems to be an issue already)

OBS-URL: https://build.opensuse.org/request/show/1002658
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=231
---
 gi-find-deps.sh                     | 13 +++++++++++++
 gobject-introspection-1.72.0.tar.xz |  3 ---
 gobject-introspection-1.73.1.tar.xz |  3 +++
 gobject-introspection.changes       | 29 +++++++++++++++++++++++++++++
 gobject-introspection.spec          |  4 ++--
 5 files changed, 47 insertions(+), 5 deletions(-)
 delete mode 100644 gobject-introspection-1.72.0.tar.xz
 create mode 100644 gobject-introspection-1.73.1.tar.xz

diff --git a/gi-find-deps.sh b/gi-find-deps.sh
index c249b4c..2916a70 100644
--- a/gi-find-deps.sh
+++ b/gi-find-deps.sh
@@ -24,6 +24,13 @@ function split_name_version2 {
   version=$(echo $1 | awk -F: '{print $2}' | sed "s:[' ]::g")
 }
 
+# some javascript code imports gi like this (seen since GNOME 43, e.g. GNOME Maps)
+# import 'gi://GeocodeGlib?version=2.0'
+function split_name_versionjs_gi_name_version {
+  symbol=$(echo $1 | awk -F? '{print $1}')
+  version=$(echo $1 | awk -F? '/version=/ {print $2}' | sed 's/version=//')
+}
+
 function print_req_prov {
 echo -n "typelib($symbol)"
 if [ ! -z "$version" ]; then
@@ -93,6 +100,12 @@ function javascript_requires {
 		split_name_version $module
 		print_req_prov
 	done
+  # some javascript code imports gi like this (seen since GNOME 43, e.g. GNOME Maps)
+  # import 'gi://GeocodeGlib?version=2.0'
+        for module in $(grep -h -P -o "[']gi://([^']+)" $1 | sed "s|'gi://||"); do
+                split_name_versionjs_gi_name_version $module
+                print_req_prov
+        done
     # This is, at the moment, specifically for Polari where a "const { Foo, Bar } = imports.gi;" is used.
 	for module in $(grep -h -E -o "\{ \w+(: \w+|, \w+)+ \} = imports.gi;" $1 | \
         sed -r -e '0,/\w+:\s\w+/ s/:\s\w+//g' -e 's: = imports.gi;:: ; s:\{ :: ; s: \}:: ; s/,//g'); do
diff --git a/gobject-introspection-1.72.0.tar.xz b/gobject-introspection-1.72.0.tar.xz
deleted file mode 100644
index ce98e6e..0000000
--- a/gobject-introspection-1.72.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc
-size 1040936
diff --git a/gobject-introspection-1.73.1.tar.xz b/gobject-introspection-1.73.1.tar.xz
new file mode 100644
index 0000000..e034a87
--- /dev/null
+++ b/gobject-introspection-1.73.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64d4d6b9abaa6ff5450d082592f332b24fc81d1172ccc30d12620fadc4e86bbe
+size 1043892
diff --git a/gobject-introspection.changes b/gobject-introspection.changes
index 413fdc7..c1815c2 100644
--- a/gobject-introspection.changes
+++ b/gobject-introspection.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Sat Sep  3 14:09:34 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.73.1:
+  + Update the GIR data for GLib, GObject, GModule, and GIO
+  + Disable rpath on Windows
+  + Add llvm/mingw support on Windows
+  + Fix annotations in libgirepository
+  + Support C99 designated initializers when parsing C declarations
+  + Add some more types to win32 GIR
+  + Let doctool prepend emitting objects in GJS signals
+  + Require a C99 toolchain like GLib
+
+-------------------------------------------------------------------
+Thu Sep  1 14:09:49 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- gi-find-deps.sh: extend js script parser to detect imports in the
+  form import 'gi://GeocodeGlib?version=2.0'.
+
+-------------------------------------------------------------------
+Thu Jul 21 13:30:09 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.73.0:
+  + Update the GIR data for GLib, GObject, GModule, and GIO.
+  + scanner:
+    - Support pre-processor macros with zero arguments.
+    - Support ISO C varargs in macros.
+  + Fix subproject build.
+
 -------------------------------------------------------------------
 Fri Mar 18 12:30:38 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gobject-introspection.spec b/gobject-introspection.spec
index 41db7dc..65cb181 100644
--- a/gobject-introspection.spec
+++ b/gobject-introspection.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gobject-introspection
-Version:        1.72.0
+Version:        1.73.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.72/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gobject-introspection/1.73/%{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