- added gphoto2-Add-missing-cheader-attributes-of-delegate-s patch to fix build with...

diff --git a/shotwell-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch b/shotwell-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch
new file mode 100644 (file)
index 0000000..76e9592
--- /dev/null
+++ b/shotwell-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch
@@ -0,0 +1,57 @@
+From cd82759231e5ece2fa0dea40397c9051d15fd5c2 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sun, 5 Feb 2023 20:44:49 +0100
+Subject: [PATCH] gphoto2: Add missing cheader attributes of delegate symbols
+
+---
+ vapi/libgphoto2.vapi | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
+index e9387b29..67cb2098 100644
+--- a/vapi/libgphoto2.vapi
++++ b/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 (
+-- 
+2.39.2
+

diff --git a/shotwell.spec b/shotwell.spec
index ae6896a5cda693a8d4f1722019164b600ff1d9e5..b270a95a9e2d03e9346c4d29feb7e3325c9fd3a9 100644 (file)
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -8,11 +8,12 @@ Summary:      Photo manager for GNOME
 Summary(pl.UTF-8):     Zarządca zdjęć dla GNOME
 Name:          shotwell
 Version:       0.30.17
-Release:       1
+Release:       2
 License:       LGPL v2+ and CC-BY-SA
 Group:         X11/Applications
 Source0:       https://download.gnome.org/sources/shotwell/0.30/%{name}-%{version}.tar.xz
 # Source0-md5: da1f096b97075ad79b74194fe2d7292e
+Patch0:                %{name}-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch
 URL:           https://wiki.gnome.org/Apps/Shotwell
 BuildRequires: cairo-devel
 BuildRequires: gcr-devel >= 3
@@ -84,6 +85,7 @@ pełnoekranowym oraz eksportować, aby podzielić się nimi z innymi.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %meson build \