From 02055495eaf2bc4034cb5313b134c27c9ad6ddb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Tue, 13 Jun 2023 21:52:01 +0200
Subject: New d/p/0105-vala_56.6.patch to fix FTBFS with newer vala releases
---
debian/changelog | 5 ++++-
debian/control | 2 +-
debian/patches/0105-vala_56.6.patch | 45 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 51 insertions(+), 2 deletions(-)
create mode 100644 debian/patches/0105-vala_56.6.patch
diff --git a/debian/changelog b/debian/changelog
index 71a39b8..72317ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ shotwell (0.30.18-1) UNRELEASED; urgency=medium
* debian/copyright:
- Add year 2023 to myself.
* Declare compliance with Debian Policy 4.6.2.0 (No changes needed).
+ * New debian/patches/0105-vala_56.6.patch to fix FTBFS with newer vala
+ releases (Closes: ##1034011).
+ - Thanks to Jeremy Bícha <jeremy.bicha@canonical.com>.
- -- Jörg Frings-Fürst <debian@jff.email> Mon, 10 Apr 2023 15:09:35 +0200
+ -- Jörg Frings-Fürst <debian@jff.email> Tue, 13 Jun 2023 18:52:46 +0200
shotwell (0.30.17-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index c92c32e..4ecdd9a 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Standards-Version: 4.6.2.0
Rules-Requires-Root: binary-targets
Homepage: https://wiki.gnome.org/Apps/Shotwell
Vcs-Git: git://git.jff.email/shotwell.git
-Vcs-Browser: https://gir.jff.email/cgit/shotwell.git
+Vcs-Browser: https://git.jff.email/cgit/shotwell.git
Package: shotwell
Architecture: linux-any
diff --git a/debian/patches/0105-vala_56.6.patch b/debian/patches/0105-vala_56.6.patch
new file mode 100644
index 0000000..d0bbbc3
--- /dev/null
+++ b/debian/patches/0105-vala_56.6.patch
@@ -0,0 +1,45 @@
+Index: trunk/vapi/libgphoto2.vapi
+===================================================================
+--- trunk.orig/vapi/libgphoto2.vapi
++++ trunk/vapi/libgphoto2.vapi
+@@ -340,19 +340,40 @@ namespace GPhoto {
+ public void set_message_func([CCode (delegate_target_pos=3.1)] ContextMessageFunc messageFunc);
+ }
+
++ [CCode (
++ cheader_filename="gphoto2/gphoto2-context.h"
++ )]
+ public delegate void ContextIdleFunc(Context context);
+
++ [CCode (
++ cheader_filename="gphoto2/gphoto2-context.h"
++ )]
+ public delegate void ContextErrorFunc(Context context, string text);
+
++ [CCode (
++ cheader_filename="gphoto2/gphoto2-context.h"
++ )]
+ public delegate void ContextStatusFunc(Context context, string text);
+
++ [CCode (
++ cheader_filename="gphoto2/gphoto2-context.h"
++ )]
+ public delegate void ContextMessageFunc(Context context, string text);
+
+ // TODO: Support for va_args in Vala, esp. for delegates?
++ [CCode (
++ cheader_filename="gphoto2/gphoto2-context.h"
++ )]
+ public delegate uint ContextProgressStartFunc(Context context, float target, string text);
+
++ [CCode (
++ cheader_filename="gphoto2/gphoto2-context.h"
++ )]
+ public delegate void ContextProgressUpdateFunc(Context context, uint id, float current);
+
++ [CCode (
++ cheader_filename="gphoto2/gphoto2-context.h"
++ )]
+ public delegate void ContextProgressStopFunc(Context context, uint id);
+
+ [CCode (
diff --git a/debian/patches/series b/debian/patches/series
index f7b4a86..62cf3ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0100-webp.patch
+0105-vala_56.6.patch
--
cgit v1.2.3