Hello community,
here is the log from the commit of package ufraw for openSUSE:Factory checked in at 2019-06-01 10:14:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ufraw (Old)
and /work/SRC/openSUSE:Factory/.ufraw.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ufraw"
Sat Jun 1 10:14:38 2019 rev:48 rq:706748 version:0.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/ufraw/ufraw.changes 2019-02-13 10:06:13.873548436 +0100
+++ /work/SRC/openSUSE:Factory/.ufraw.new.5148/ufraw.changes 2019-06-01 10:14:42.230719961 +0200
@@ -1,0 +2,7 @@
+Tue May 28 11:00:38 UTC 2019 - Christophe Giboudeaux
+
+- Add Fix-build-with-GCC9.patch
+- Refresh patches, use %autosetup
+- Run spec-cleaner
+
+-------------------------------------------------------------------
New:
----
Fix-build-with-GCC9.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ufraw.spec ++++++
--- /var/tmp/diff_new_pack.Y0jaKD/_old 2019-06-01 10:14:43.058719537 +0200
+++ /var/tmp/diff_new_pack.Y0jaKD/_new 2019-06-01 10:14:43.058719537 +0200
@@ -12,15 +12,34 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+# gimptool-2.0 --gimpplugindir
+%define _gimpplugindir %(gimptool-2.0 --gimpplugindir)
Name: ufraw
+Version: 0.22
+Release: 0
+Summary: The Unidentified Flying Raw
+License: GPL-2.0-or-later
+Group: Productivity/Graphics/Other
+URL: http://ufraw.sourceforge.net/
+Source: http://downloads.sourceforge.net/project/ufraw/ufraw/%{name}-%{version}/%{name}-%{version}.tar.gz
+Patch0: %{name}-desktop.patch
+Patch1: %{name}-boundary.patch
+Patch2: %{name}-glibc210.patch
+Patch3: narrowing-conversion.patch
+Patch4: ufraw-gcc7.patch
+Patch5: ufraw-0.22-jpeg9.patch
+Patch6: ufraw-0.22-exiv2-0.27.patch
+Patch7: 01_no-gimp-remote.patch
+Patch8: 02_CVE-2015-8366.patch
+Patch9: 04_fix-abs-gcc-7.patch
+Patch10: 05_CVE-2018-19655.patch
+Patch11: 06_lensfun_destroy_cleanup.patch
+Patch12: Fix-build-with-GCC9.patch
BuildRequires: automake
-%if 0%{?suse_version} > 1310
-BuildRequires: cfitsio-devel
-%endif
BuildRequires: gcc-c++
BuildRequires: gimp-devel
BuildRequires: lensfun-devel
@@ -32,28 +51,10 @@
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
BuildRequires: update-desktop-files
-Url: http://ufraw.sourceforge.net/
-# gimptool-2.0 --gimpplugindir
-%define _gimpplugindir %(gimptool-2.0 --gimpplugindir)
-Version: 0.22
-Release: 0
-Summary: The Unidentified Flying Raw
-License: GPL-2.0+
-Group: Productivity/Graphics/Other
-Source: http://downloads.sourceforge.net/project/ufraw/ufraw/%{name}-%{version}/%{name}-%{version}.tar.gz
-Patch: %{name}-desktop.patch
-Patch1: %{name}-boundary.patch
-Patch2: %{name}-glibc210.patch
-Patch3: narrowing-conversion.patch
-Patch4: ufraw-gcc7.patch
-Patch10: ufraw-0.22-jpeg9.patch
-Patch11: ufraw-0.22-exiv2-0.27.patch
-Patch12: 01_no-gimp-remote.patch
-Patch13: 02_CVE-2015-8366.patch
-Patch14: 04_fix-abs-gcc-7.patch
-Patch15: 05_CVE-2018-19655.patch
-Patch16: 06_lensfun_destroy_cleanup.patch
Recommends: %{name}-lang
+%if 0%{?suse_version} > 1310
+BuildRequires: cfitsio-devel
+%endif
%description
Application to read and manipulate raw images from digital cameras. It
@@ -61,22 +62,16 @@
has an editor for the tone curves. For batch processing of images you
can use the command-line.
-
-
-Authors:
---------
- Udi Fuchs UdiFuchs@gmail.com
-
%package -n gimp-ufraw
Summary: Raw photo loader plugin for The GIMP
Group: Productivity/Graphics/Other
+Suggests: dcraw-gnome
+Enhances: gimp-2.0
Obsoletes: rawphoto < %{version}
Obsoletes: ufraw-gimp < %{version}
Provides: gimp-2.0-dcraw-plugin
Provides: rawphoto = %{version}
Provides: ufraw-gimp = %{version}
-Enhances: gimp-2.0
-Suggests: dcraw-gnome
%if %{?gimp_api_version:1}0
Requires: gimp(abi) = %{gimp_abi_version}
Requires: gimp(api) = %{gimp_api_version}
@@ -90,33 +85,16 @@
Dave Coffin's raw conversion utility DCRaw. And it supports basic color
management using Little CMS, allowing the user to apply color profiles.
-
-
-Authors:
---------
- Udi Fuchs UdiFuchs@gmail.com
-
%lang_package
+
%prep
-%setup -q
-%patch
-%patch1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
+%autosetup -p1
%build
%ifarch ppc64
- export CFLAGS="-m64 $RPM_OPT_FLAGS"
+ export CFLAGS="-m64 %{optflags}"
%else
- export CFLAGS="$RPM_OPT_FLAGS"
+ export CFLAGS="%{optflags}"
%endif
export CXXFLAGS="$CFLAGS"
autoreconf -fi
@@ -125,25 +103,24 @@
make %{?_smp_mflags}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
%suse_update_desktop_file -i ufraw Photography
-%find_lang %name
+%find_lang %{name}
-%files lang -f %name.lang
+%files lang -f %{name}.lang
%files
-%defattr(-,root,root)
-%doc COPYING MANIFEST README TODO
-%_bindir/ufraw
-%_bindir/ufraw-batch
-%_mandir/man?/*
-%_datadir/pixmaps/ufraw.png
-%_datadir/applications/*.desktop
+%license COPYING
+%doc MANIFEST README TODO
+%{_bindir}/ufraw
+%{_bindir}/ufraw-batch
+%{_mandir}/man?/*
+%{_datadir}/pixmaps/ufraw.png
+%{_datadir}/applications/*.desktop
%files -n gimp-ufraw
-%defattr(-,root,root)
%dir %{_libdir}/gimp/
%dir %{_libdir}/gimp/2.0
-%_gimpplugindir/plug-ins/
+%{_gimpplugindir}/plug-ins/
%changelog
++++++ Fix-build-with-GCC9.patch ++++++
From ac8c74699cba65d65f918b3f4cba2de64e039ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?=
Date: Thu, 14 Feb 2019 03:26:02 +0000
Subject: [PATCH] Fix GCC 9 OpenMP issues by drop default(none)
---
dcraw_api.cc | 4 ++--
dcraw_indi.c | 4 ----
ufraw_ufraw.c | 6 +++---
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/dcraw_api.cc b/dcraw_api.cc
index c3d2902..6096cb7 100644
--- a/dcraw_api.cc
+++ b/dcraw_api.cc
@@ -686,7 +686,7 @@ extern "C" {
rgbWB[3] = rgbWB[1];
if (dark) {
#ifdef _OPENMP
- #pragma omp parallel for schedule(static) default(none) \
+ #pragma omp parallel for schedule(static) \
shared(h,dark,rgbWB)
#endif
for (int i = 0; i < pixels; i++) {
@@ -699,7 +699,7 @@ extern "C" {
}
} else {
#ifdef _OPENMP
- #pragma omp parallel for schedule(static) default(none) \
+ #pragma omp parallel for schedule(static) \
shared(h,dark,rgbWB)
#endif
for (int i = 0; i < pixels; i++) {
diff --git a/dcraw_indi.c b/dcraw_indi.c
index a291af2..777ce39 100644
--- a/dcraw_indi.c
+++ b/dcraw_indi.c
@@ -137,12 +137,10 @@ void CLASS wavelet_denoise_INDI(ushort(*image)[4], const int black,
#ifdef _OPENMP
#if defined(__sun) && !defined(__GNUC__) /* Fix bug #3205673 - NKBJ */
#pragma omp parallel for \
- default(none) \
shared(nc,image,size,noise) \
private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp)
#else
#pragma omp parallel for \
- default(none) \
shared(nc,image,size) \
private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp)
#endif
@@ -413,7 +411,6 @@ void CLASS vng_interpolate_INDI(ushort(*image)[4], const unsigned filters,
progress(PROGRESS_INTERPOLATE, -height);
#ifdef _OPENMP
#pragma omp parallel \
- default(none) \
shared(image,code,prow,pcol,h) \
private(row,col,g,brow,rowtmp,pix,ip,gval,diff,gmin,gmax,thold,sum,color,num,c,t)
#endif
@@ -496,7 +493,6 @@ void CLASS ppg_interpolate_INDI(ushort(*image)[4], const unsigned filters,
#ifdef _OPENMP
#pragma omp parallel \
- default(none) \
shared(image,dir,diff) \
private(row,col,i,d,c,pix,guess)
#endif
diff --git a/ufraw_ufraw.c b/ufraw_ufraw.c
index ce9d262..48a0d91 100644
--- a/ufraw_ufraw.c
+++ b/ufraw_ufraw.c
@@ -1043,7 +1043,7 @@ static void ufraw_shave_hotpixels(ufraw_data *uf, dcraw_image_type *img,
delta = rgbMax / (uf->conf->hotpixel + 1.0);
count = 0;
#ifdef _OPENMP
- #pragma omp parallel for schedule(static) default(none) \
+ #pragma omp parallel for schedule(static) \
shared(uf,img,width,height,colors,rgbMax,delta) \
reduction(+:count) \
private(h,p,w,c,t,v,hi,i)
@@ -1365,7 +1365,7 @@ static void ufraw_convert_reverse_wb(ufraw_data *uf, UFRawPhase phase)
mul[i] = (guint64)0x10000 * 0x10000 / uf->developer->rgbWB[i];
size = img->height * img->width;
#ifdef _OPENMP
- #pragma omp parallel for schedule(static) default(none) \
+ #pragma omp parallel for schedule(static) \
shared(uf,phase,img,mul,size) \
private(i,p16,c,px)
#endif
@@ -1390,7 +1390,7 @@ static void ufraw_convert_image_tca(ufraw_data *uf, ufraw_image_data *img,
return;
int y;
#ifdef _OPENMP
- #pragma omp parallel for schedule(static) default(none) \
+ #pragma omp parallel for schedule(static) \
shared(uf,img,outimg,area)
#endif
for (y = area->y; y < area->y + area->height; y++) {
++++++ ufraw-0.22-jpeg9.patch ++++++
--- /var/tmp/diff_new_pack.Y0jaKD/_old 2019-06-01 10:14:43.098719516 +0200
+++ /var/tmp/diff_new_pack.Y0jaKD/_new 2019-06-01 10:14:43.098719516 +0200
@@ -1,9 +1,11 @@
Fix build with >=jpeg-9
Thanks-to: Moran Z.
---- a/dcraw.cc 2014-09-02 07:50:38.000000000 +0300
-+++ b/dcraw.cc 2015-02-21 04:54:13.957561352 +0200
-@@ -2330,7 +2330,7 @@
+diff --git a/dcraw.cc b/dcraw.cc
+index 81543b2..5d793d6 100644
+--- a/dcraw.cc
++++ b/dcraw.cc
+@@ -2404,7 +2404,7 @@ fill_input_buffer (j_decompress_ptr cinfo)
#endif
cinfo->src->next_input_byte = jpeg_buffer;
cinfo->src->bytes_in_buffer = nbytes;
@@ -12,7 +14,7 @@
}
void CLASS kodak_jpeg_load_raw()
-@@ -2346,7 +2346,7 @@
+@@ -2420,7 +2420,7 @@ void CLASS kodak_jpeg_load_raw()
jpeg_create_decompress (&cinfo);
jpeg_stdio_src (&cinfo, ifp);
cinfo.src->fill_input_buffer = fill_input_buffer;
@@ -21,7 +23,7 @@
jpeg_start_decompress (&cinfo);
if ((cinfo.output_width != width ) ||
(cinfo.output_height*2 != height ) ||
-@@ -2419,7 +2419,7 @@
+@@ -2493,7 +2493,7 @@ void CLASS lossy_dng_load_raw()
if (tile_length < INT_MAX)
fseek (ifp, get4(), SEEK_SET);
jpeg_stdio_src (&cinfo, ifp);
++++++ ufraw-boundary.patch ++++++
--- /var/tmp/diff_new_pack.Y0jaKD/_old 2019-06-01 10:14:43.106719512 +0200
+++ /var/tmp/diff_new_pack.Y0jaKD/_new 2019-06-01 10:14:43.110719510 +0200
@@ -1,8 +1,8 @@
-Index: dcraw.cc
-===================================================================
---- dcraw.cc.orig
-+++ dcraw.cc
-@@ -8584,9 +8584,9 @@ void CLASS identify()
+diff --git a/dcraw.cc b/dcraw.cc
+index 88c8068..de03771 100644
+--- a/dcraw.cc
++++ b/dcraw.cc
+@@ -8992,9 +8992,9 @@ void CLASS identify()
if (!strncasecmp(model,"PENTAX",6))
strcpy (make, "Pentax");
cp = make + strlen(make); /* Remove trailing spaces */
++++++ ufraw-desktop.patch ++++++
--- /var/tmp/diff_new_pack.Y0jaKD/_old 2019-06-01 10:14:43.114719508 +0200
+++ /var/tmp/diff_new_pack.Y0jaKD/_new 2019-06-01 10:14:43.118719506 +0200
@@ -1,5 +1,7 @@
---- ufraw.desktop.orig 2010-03-10 04:28:27.000000000 +0100
-+++ ufraw.desktop 2010-05-02 00:42:40.000000000 +0200
+diff --git a/ufraw.desktop b/ufraw.desktop
+index 2c276e0..f97a870 100644
+--- a/ufraw.desktop
++++ b/ufraw.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Name=UFRaw
++++++ ufraw-glibc210.patch ++++++
--- /var/tmp/diff_new_pack.Y0jaKD/_old 2019-06-01 10:14:43.126719502 +0200
+++ /var/tmp/diff_new_pack.Y0jaKD/_new 2019-06-01 10:14:43.126719502 +0200
@@ -1,8 +1,8 @@
-Index: ufraw-0.17/dcraw.cc
-===================================================================
---- ufraw-0.17.orig/dcraw.cc
-+++ ufraw-0.17/dcraw.cc
-@@ -8670,7 +8670,7 @@ thumbnail:
+diff --git a/dcraw.cc b/dcraw.cc
+index de03771..709b814 100644
+--- a/dcraw.cc
++++ b/dcraw.cc
+@@ -10605,7 +10605,7 @@ thumbnail:
strcpy (ofname,_("standard output"));
else {
strcpy (ofname, ifname);