d/patches: Replace with the version that was applied upstream

4 files changed, 37 insertions, 55 deletions

diff --git a/debian/patches/series b/debian/patches/series
index 538c601f7..db5ed24cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-valacodecontext-Really-look-for-GIR-XML-in-Config.GI_GIRD.patch
-valacodecontext-Look-for-GIR-XML-in-usr-share-not-.-usr-s.patch
+vala-Correctly-use-Path.build_path.patch
diff --git a/debian/patches/vala-Correctly-use-Path.build_path.patch b/debian/patches/vala-Correctly-use-Path.build_path.patch
new file mode 100644
index 000000000..5fc80d23a
--- /dev/null
+++ b/debian/patches/vala-Correctly-use-Path.build_path.patch
@@ -0,0 +1,36 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Tue, 19 Mar 2024 02:13:52 +0000
+Subject: vala: Correctly use Path.build_path()
+
+The first argument to Path.build_path() is a separator, and for it to be
+practically useful, at least two subsequent arguments are needed.
+
+Also to find GIR XML in /usr/share we should make the second argument be
+an absolute path.
+
+Forwarded: https://gitlab.gnome.org/GNOME/vala/-/merge_requests/379
+Applied-upstream: 0.56.17, commit:5e963bf138bcac53c8a8cae4fa9053cfbf13a714
+---
+ vala/valacodecontext.vala | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vala/valacodecontext.vala b/vala/valacodecontext.vala
+index 8461403..59ef28c 100644
+--- a/vala/valacodecontext.vala
++++ b/vala/valacodecontext.vala
+@@ -726,13 +726,13 @@ public class Vala.CodeContext {
+ 		}
+ 
+ 		// Search $GI_GIRDIR set by user or retrieved from gobject-introspection-1.0.pc
+-		path = Path.build_path (Config.GI_GIRDIR, girname);
++		path = Path.build_path ("/", Config.GI_GIRDIR, girname);
+ 		if (FileUtils.test (path, FileTest.EXISTS | FileTest.IS_REGULAR)) {
+ 			return path;
+ 		}
+ 
+ 		// Search /usr/share
+-		path = Path.build_path ("/", "usr", "share", GIR_SUFFIX, girname);
++		path = Path.build_path ("/", "/usr", "share", GIR_SUFFIX, girname);
+ 		if (FileUtils.test (path, FileTest.EXISTS | FileTest.IS_REGULAR)) {
+ 			return path;
+ 		}
diff --git a/debian/patches/valacodecontext-Look-for-GIR-XML-in-usr-share-not-.-usr-s.patch b/debian/patches/valacodecontext-Look-for-GIR-XML-in-usr-share-not-.-usr-s.patch
deleted file mode 100644
index 44dbdfb6d..000000000
--- a/debian/patches/valacodecontext-Look-for-GIR-XML-in-usr-share-not-.-usr-s.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Tue, 19 Mar 2024 02:17:07 +0000
-Subject: valacodecontext: Look for GIR XML in /usr/share, not ./usr/share
-
-The first argument to g_build_path() is a separator, not the first
-path element, so to find GIR XML in /usr/share we should make the
-second argument be an absolute path.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Forwarded: https://gitlab.gnome.org/GNOME/vala/-/merge_requests/379
----
- vala/valacodecontext.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vala/valacodecontext.vala b/vala/valacodecontext.vala
-index 98e0340..59ef28c 100644
---- a/vala/valacodecontext.vala
-+++ b/vala/valacodecontext.vala
-@@ -732,7 +732,7 @@ public class Vala.CodeContext {
- 		}
- 
- 		// Search /usr/share
--		path = Path.build_path ("/", "usr", "share", GIR_SUFFIX, girname);
-+		path = Path.build_path ("/", "/usr", "share", GIR_SUFFIX, girname);
- 		if (FileUtils.test (path, FileTest.EXISTS | FileTest.IS_REGULAR)) {
- 			return path;
- 		}
diff --git a/debian/patches/valacodecontext-Really-look-for-GIR-XML-in-Config.GI_GIRD.patch b/debian/patches/valacodecontext-Really-look-for-GIR-XML-in-Config.GI_GIRD.patch
deleted file mode 100644
index 008ac4d4b..000000000
--- a/debian/patches/valacodecontext-Really-look-for-GIR-XML-in-Config.GI_GIRD.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Tue, 19 Mar 2024 02:13:52 +0000
-Subject: valacodecontext: Really look for GIR XML in Config.GI_GIRDIR
-
-The first argument to Path.build_path is a separator, and for it to be
-practically useful, at least two subsequent arguments are needed.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Forwarded: https://gitlab.gnome.org/GNOME/vala/-/merge_requests/379
----
- vala/valacodecontext.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vala/valacodecontext.vala b/vala/valacodecontext.vala
-index 8461403..98e0340 100644
---- a/vala/valacodecontext.vala
-+++ b/vala/valacodecontext.vala
-@@ -726,7 +726,7 @@ public class Vala.CodeContext {
- 		}
- 
- 		// Search $GI_GIRDIR set by user or retrieved from gobject-introspection-1.0.pc
--		path = Path.build_path (Config.GI_GIRDIR, girname);
-+		path = Path.build_path ("/", Config.GI_GIRDIR, girname);
- 		if (FileUtils.test (path, FileTest.EXISTS | FileTest.IS_REGULAR)) {
- 			return path;
- 		}