Hello community,
here is the log from the commit of package octave-forge-octclip for
openSUSE:Factory checked in at 2019-08-27 10:29:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/octave-forge-octclip (Old)
and /work/SRC/openSUSE:Factory/.octave-forge-octclip.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave-forge-octclip"
Tue Aug 27 10:29:05 2019 rev:3 rq:726387 version:1.0.8
Changes:
--------
---
/work/SRC/openSUSE:Factory/octave-forge-octclip/octave-forge-octclip.changes
2015-07-12 22:52:57.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.octave-forge-octclip.new.7948/octave-forge-octclip.changes
2019-08-27 10:29:16.287905974 +0200
@@ -1,0 +2,6 @@
+Mon Aug 26 21:13:51 UTC 2019 - Christophe Giboudeaux <[email protected]>
+
+- Add compile-with-gcc-9.patch from Debian
+- Run spec-cleaner
+
+-------------------------------------------------------------------
New:
----
compile-with-gcc-9.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ octave-forge-octclip.spec ++++++
--- /var/tmp/diff_new_pack.OB57aC/_old 2019-08-27 10:29:18.391905816 +0200
+++ /var/tmp/diff_new_pack.OB57aC/_new 2019-08-27 10:29:18.395905817 +0200
@@ -1,7 +1,7 @@
#
# spec file for package octave-forge-octclip
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# 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/
#
@@ -21,12 +21,14 @@
Version: 1.0.8
Release: 0
Summary: Octave clipping polygons tool
-License: GPL-3.0+ and BSD-3-Clause
+License: GPL-3.0-or-later AND BSD-3-Clause
Group: Productivity/Scientific/Math
-Url: http://octave.sourceforge.net
+URL: http://octave.sourceforge.net
Source0:
http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM octclip-openmp.patch -- Fix build with OpenMP
-Patch1: octclip-openmp.patch
+Patch0: octclip-openmp.patch
+# PATCH-FIX-UPSTREAM compile-with-gcc-9.patch
+Patch1: compile-with-gcc-9.patch
BuildRequires: gcc-c++
BuildRequires: hdf5-devel
BuildRequires: octave-devel
@@ -39,7 +41,10 @@
%prep
%setup -q -c %{name}-%{version}
-%patch1 -p0
+pushd %{octpkg}-%{version}
+%patch0 -p1
+%patch1 -p1
+popd
%octave_pkg_src
%build
@@ -58,7 +63,6 @@
%octave --eval "pkg rebuild"
%files
-%defattr(-,root,root)
%{octpackages_dir}/%{octpkg}-%{version}
%{octlib_dir}/%{octpkg}-%{version}
++++++ compile-with-gcc-9.patch ++++++
Description: Allow compilation with GCC 9
Fix issues regarding OpenMP data sharing.
Author: Rafael Laboissiere <[email protected]>
Bug-Debian: https://bugs.debian.org/925791
Forwarded: https://savannah.gnu.org/bugs/index.php?56786
Last-Update: 2019-08-24
--- a/src/fgeneral.c
+++ b/src/fgeneral.c
@@ -268,6 +268,7 @@
#if defined(_OPENMP)&&(_OPENMP>=GEOC_OMP_F_3_1)
#pragma omp parallel for default(none) \
shared(lista) \
+ firstprivate(nDatos,incDatos) \
private(i,pos) \
reduction(min:salida)
#endif
@@ -307,6 +308,7 @@
#if defined(_OPENMP)&&(_OPENMP>=GEOC_OMP_F_3_1)
#pragma omp parallel for default(none) \
shared(lista) \
+ firstprivate(nDatos,incDatos) \
private(i,pos) \
reduction(max:salida)
#endif
@@ -346,6 +348,7 @@
#if defined(_OPENMP)&&(_OPENMP>=GEOC_OMP_F_3_1)
#pragma omp parallel for default(none) \
shared(lista) \
+ firstprivate(nDatos,incDatos) \
private(i,pos) \
reduction(min:salida)
#endif
@@ -385,6 +388,7 @@
#if defined(_OPENMP)&&(_OPENMP>=GEOC_OMP_F_3_1)
#pragma omp parallel for default(none) \
shared(lista) \
+ firstprivate(nDatos,incDatos) \
private(i,pos) \
reduction(max:salida)
#endif
@@ -424,7 +428,8 @@
#if defined(_OPENMP)&&(_OPENMP>=GEOC_OMP_F_3_1)
#pragma omp parallel for default(none) \
shared(lista) \
- private(i,pos) \
+ firstprivate(nDatos,incDatos) \
+ private(i,pos) \
reduction(min:salida)
#endif
//recorremos el resto de elementos de la lista
@@ -463,6 +468,7 @@
#if defined(_OPENMP)&&(_OPENMP>=GEOC_OMP_F_3_1)
#pragma omp parallel for default(none) \
shared(lista) \
+ firstprivate(nDatos,incDatos) \
private(i,pos) \
reduction(max:salida)
#endif
--- a/src/polig.c
+++ b/src/polig.c
@@ -383,7 +383,8 @@
//paralelización con OpenMP
#if defined(_OPENMP)
#pragma omp parallel sections default(none) \
- shared(posNanX,x,nNanX,posNanY,y,nNanY)
+ shared(posNanX,x,nNanX,posNanY,y,nNanY) \
+ firstprivate(incX,incY,nElem)
#endif
{
#if defined(_OPENMP)
@@ -1088,7 +1089,8 @@
//paralelización con OpenMP
#if defined(_OPENMP)
#pragma omp parallel sections default(none) \
- shared(x,posXMin,posXMax,y,posYMin,posYMax)
+ shared(x,posXMin,posXMax,y,posYMin,posYMax) \
+ firstprivate(nElem,incX,incY)
#endif
{
//posiciones en el vector X
@@ -1137,6 +1139,7 @@
#if defined(_OPENMP)
#pragma omp parallel for default(none) schedule(dynamic) \
shared(posIni,x,y,nVert,xMin,xMax,yMin,yMax) \
+ firstprivate(incX,incY,nPolig,restaPosIni) \
private(i,pI)
#endif
//recorremos el número de polígonos
@@ -1256,6 +1259,7 @@
#if defined(_OPENMP)
#pragma omp parallel for default(none) schedule(dynamic) \
shared(posIni,area,x,y,nVert) \
+ firstprivate(incX,incY,nPolig,restaPosIni) \
private(i,pI)
#endif
//recorremos el número de polígonos
@@ -1285,7 +1289,8 @@
//paralelización con OpenMP
#if defined(_OPENMP)
#pragma omp parallel sections default(none) \
- shared(poli)
+ shared(poli) \
+ firstprivate(escalaX,escalaY,trasladaX,trasladaY)
#endif
{
#if defined(_OPENMP)
@@ -1338,7 +1343,8 @@
//paralelización con OpenMP
#if defined(_OPENMP)
#pragma omp parallel sections default(none) \
- shared(poli)
+ shared(poli) \
+ firstprivate(escalaX,escalaY,trasladaX,trasladaY)
#endif
{
#if defined(_OPENMP)
--- a/src/polil.c
+++ b/src/polil.c
@@ -379,7 +379,8 @@
//paralelización con OpenMP
#if defined(_OPENMP)
#pragma omp parallel sections default(none) \
- shared(posNanX,x,nNanX,posNanY,y,nNanY)
+ shared(posNanX,x,nNanX,posNanY,y,nNanY) \
+ firstprivate(nElem,incX,incY)
#endif
{
#if defined(_OPENMP)
@@ -1010,7 +1011,8 @@
//paralelización con OpenMP
#if defined(_OPENMP)
#pragma omp parallel sections default(none) \
- shared(poli)
+ shared(poli) \
+ firstprivate(escalaX,escalaY,trasladaX,trasladaY)
#endif
{
#if defined(_OPENMP)
@@ -1055,7 +1057,8 @@
//paralelización con OpenMP
#if defined(_OPENMP)
#pragma omp parallel sections default(none) \
- shared(poli)
+ shared(poli) \
+ firstprivate(escalaX,escalaY,trasladaX,trasladaY)
#endif
{
#if defined(_OPENMP)
--- a/src/ptopol.c
+++ b/src/ptopol.c
@@ -627,6 +627,7 @@
#if defined(_OPENMP)
#pragma omp parallel for default(none) schedule(dynamic) \
shared(continuar,posNan,coorX,coorY,pos,poli) \
+ firstprivate(x,y,incX,incY,nNan) \
private(i,iniX,iniY,nElem,posAux)
#endif
//recorremos desde el primer NaN hasta el penúltimo
@@ -728,6 +729,7 @@
#if defined(_OPENMP)
#pragma omp parallel for default(none) schedule(dynamic) \
shared(continuar,posNan,coorX,coorY,pos,poli) \
+ firstprivate(x,y,incX,incY,nNan) \
private(i,iniX,iniY,nElem,posAux)
#endif
//recorremos desde el primer NaN hasta el penúltimo
@@ -829,6 +831,7 @@
#if defined(_OPENMP)
#pragma omp parallel for default(none) schedule(dynamic) \
shared(continuar,posNan,coorX,coorY,pos,poli) \
+ firstprivate(x,y,incX,incY,nNan) \
private(i,iniX,iniY,nElem,posAux)
#endif
//recorremos desde el primer NaN hasta el penúltimo
@@ -933,6 +936,7 @@
#if defined(_OPENMP)
#pragma omp parallel for default(none) schedule(dynamic) \
shared(continuar,posNan,coorX,coorY,pos,poli) \
+ firstprivate(x,y,incX,incY,factor,redondeo,nNan) \
private(i,iniX,iniY,nElem,posAux)
#endif
//recorremos desde el primer NaN hasta el penúltimo
