[packages/ufraw] - added c++ patch (don't use extern C for glib, now it provides some C++ support); release 14 (cfits

[qboosh]

commit 0bbd1d40102aba3e9bbe2e60544f46dadcb09c7c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jan 21 08:05:07 2023 +0100

    - added c++ patch (don't use extern C for glib, now it provides some C++ support); release 14 (cfitsio 4.2)

 ufraw-c++.patch | 19 +++++++++++++++++++
 ufraw.spec      |  6 ++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/ufraw.spec b/ufraw.spec
index f06296d..4ae71e9 100644
--- a/ufraw.spec
+++ b/ufraw.spec
@@ -7,7 +7,7 @@ Summary:	RAW photo loader
 Summary(pl.UTF-8):	Narzędzie do wczytywania zdjęć w formacie RAW
 Name:		ufraw
 Version:	0.22
-Release:	13
+Release:	14
 License:	GPL v2+
 Group:		Applications/Graphics
 Source0:	http://downloads.sourceforge.net/ufraw/%{name}-%{version}.tar.gz
@@ -19,6 +19,7 @@ Patch3:		ufraw-multipliers.patch
 Patch4:		exiv2-0.27.patch
 Patch5:		%{name}-include.patch
 Patch6:		%{name}-openmp.patch
+Patch7:		%{name}-c++.patch
 URL:		http://ufraw.sourceforge.net/
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
@@ -50,7 +51,7 @@ Requires:	gtk+2 >= 1:2.12
 Requires:	gtkimageview >= 1.6
 Requires:	lcms2 >= 2
 Requires:	lensfun >= 0.2.5
-Obsoletes:	cinepaint-plugin-ufraw
+Obsoletes:	cinepaint-plugin-ufraw < 0.20
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{with gimp}
@@ -113,6 +114,7 @@ Wtyczka GIMP-a do wczytywania zdjęć w formacie RAW.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 cp -f /usr/share/automake/mkinstalldirs .
diff --git a/ufraw-c++.patch b/ufraw-c++.patch
new file mode 100644
index 0000000..1b11ace
--- /dev/null
+++ b/ufraw-c++.patch
@@ -0,0 +1,19 @@
+--- ufraw-0.22/uf_glib.h.orig	2015-06-16 05:58:38.000000000 +0200
++++ ufraw-0.22/uf_glib.h	2023-01-21 08:01:14.865902851 +0100
+@@ -13,13 +13,13 @@
+ #ifndef _UF_GLIB_H
+ #define _UF_GLIB_H
+ 
++#include <glib.h>
++#include <glib/gstdio.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-#include <glib.h>
+-#include <glib/gstdio.h>
+-
+ // g_win32_locale_filename_from_utf8 is needed only on win32
+ #ifdef _WIN32
+ #define uf_win32_locale_filename_from_utf8(__some_string__) \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ufraw.git/commitdiff/0bbd1d40102aba3e9bbe2e60544f46dadcb09c7c