Sync from SUSE:SLFO:Main dcraw revision 8f826fc5138f950cfdd1e9b37ce1e5f9

This commit is contained in:
Adrian Schröter 2024-10-01 08:33:03 +02:00
parent 5cd871ac23
commit 5358cdf443
3 changed files with 45 additions and 9 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Mar 1 20:52:46 UTC 2024 - Michal Jireš <michal.jires@suse.com>
- Add fix_gcc14_errors.patch (bsc#1220467)
-------------------------------------------------------------------
Thu Feb 22 07:54:56 UTC 2024 - Michael Vetter <mvetter@suse.com>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Mon Aug 7 09:53:25 UTC 2023 - Dirk Müller <dmueller@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package dcraw
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -48,6 +48,7 @@ Patch4: dcraw-CVE-2018-5801.patch
Patch5: iowrappers.patch
Patch6: dcraw-CVE-2021-3624.patch
Patch7: dcraw-glibc-2.38.patch
Patch8: fix_gcc14_errors.patch
BuildRequires: gettext-runtime
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
@ -62,14 +63,15 @@ Command line tools for raw digital photo decoding and processing.
%prep
%setup -q -n %{name}
cp -a %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
%patch0
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch -P 0
%patch -P 1 -p1
%patch -P 2 -p1
%patch -P 3 -p1
%patch -P 4 -p1
%patch -P 5 -p1
%patch -P 6 -p1
%patch -P 7 -p1
%patch -P 8 -p1
%build
export CFLAGS="%{optflags} -fno-strict-aliasing -fstack-protector-all"

24
fix_gcc14_errors.patch Normal file
View File

@ -0,0 +1,24 @@
Index: dcraw/fuji_green.c
===================================================================
--- dcraw.orig/fuji_green.c
+++ dcraw/fuji_green.c
@@ -5,6 +5,7 @@
$Date: 2006/03/01 01:46:47 $
*/
+#define _XOPEN_SOURCE
#include <ctype.h>
#include <math.h>
#include <setjmp.h>
Index: dcraw/fujiturn.c
===================================================================
--- dcraw.orig/fujiturn.c
+++ dcraw/fujiturn.c
@@ -15,6 +15,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
+#include <arpa/inet.h>
#ifdef _16BIT
typedef unsigned short value;