commit octave-forge-octclip for openSUSE:Factory
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.0 +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
+
+- 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
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,n
commit octave-forge-octclip for openSUSE:Factory
Hello community,
here is the log from the commit of package octave-forge-octclip for
openSUSE:Factory checked in at 2015-07-12 22:52:56
Comparing /work/SRC/openSUSE:Factory/octave-forge-octclip (Old)
and /work/SRC/openSUSE:Factory/.octave-forge-octclip.new (New)
Package is "octave-forge-octclip"
Changes:
---
/work/SRC/openSUSE:Factory/octave-forge-octclip/octave-forge-octclip.changes
2015-06-16 15:13:01.0 +0200
+++
/work/SRC/openSUSE:Factory/.octave-forge-octclip.new/octave-forge-octclip.changes
2015-07-12 22:52:57.0 +0200
@@ -1,0 +2,6 @@
+Tue Jul 7 17:28:26 UTC 2015 - dmitr...@opensuse.org
+
+- Update to version 1.0.8
+ * Bug fixes and minor changes
+
+---
Old:
octclip-1.0.3.tar.gz
New:
octclip-1.0.8.tar.gz
Other differences:
--
++ octave-forge-octclip.spec ++
--- /var/tmp/diff_new_pack.1aiP8N/_old 2015-07-12 22:52:57.0 +0200
+++ /var/tmp/diff_new_pack.1aiP8N/_new 2015-07-12 22:52:57.0 +0200
@@ -18,7 +18,7 @@
%define octpkg octclip
Name: octave-forge-%{octpkg}
-Version:1.0.3
+Version:1.0.8
Release:0
Summary:Octave clipping polygons tool
License:GPL-3.0+ and BSD-3-Clause
@@ -39,7 +39,7 @@
%prep
%setup -q -c %{name}-%{version}
-%patch1 -p1
+%patch1 -p0
%octave_pkg_src
%build
++ octclip-1.0.3.tar.gz -> octclip-1.0.8.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/octclip/DESCRIPTION new/octclip-1.0.8/DESCRIPTION
--- old/octclip/DESCRIPTION 2012-10-03 15:58:51.0 +0200
+++ new/octclip-1.0.8/DESCRIPTION 2015-06-16 15:23:52.0 +0200
@@ -1,6 +1,6 @@
Name: OctCLIP
-Version: 1.0.3
-Date: 2012-10-03
+Version: 1.0.8
+Date: 2015-06-16
Author: José Luis García Pallero
Maintainer: José Luis García Pallero
Title: GNU Octave clipping polygons tool
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/octclip/NEWS new/octclip-1.0.8/NEWS
--- old/octclip/NEWS2012-10-03 10:27:02.0 +0200
+++ new/octclip-1.0.8/NEWS 2015-06-16 15:23:52.0 +0200
@@ -1,3 +1,23 @@
+Summary of important user-visible changes for version 1.0.8:
+
+
+** Minor changes in src/Makefile
+
+Summary of important user-visible changes for version 1.0.7:
+
+
+** Minor changes and corrections in help strings
+
+Summary of important user-visible changes for version 1.0.6:
+
+
+** All calls to ismatrix() are changed by isnumeric()
+
+Summary of important user-visible changes for version 1.0.5:
+
+
+** Only minor changes in Mercurial repository managment
+
Summary of important user-visible changes for version 1.0.3:
Files old/octclip/doc/octclip.pdf and new/octclip-1.0.8/doc/octclip.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/octclip/doc/octclip.tex
new/octclip-1.0.8/doc/octclip.tex
--- old/octclip/doc/octclip.tex 2012-10-01 10:46:15.0 +0200
+++ new/octclip-1.0.8/doc/octclip.tex 2015-06-16 15:23:52.0 +0200
@@ -12,7 +12,9 @@
\author{Jos\'e Luis Garc\'ia Pallero\footnote{ETSI en Topograf\'ia, Geodesia y
Cartograf\'ia, Universidad Polit\'ecnica de Madrid.
\texttt{jlg.pall...@upm.es}, \texttt{jgpall...@gmail.com}}}
-\date{October 1, 2012 (version 1.0.2)\\
+\date{February 13, 2015 (version 1.0.6)\\
+ June 20, 2013 (version 1.0.5)\\
+ October 1, 2012 (version 1.0.2)\\
November 21, 2011 (version 1.0.1)\\
May 24, 2011 (version 1.0.0)}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/octclip/inst/oc_polybool.m
new/octclip-1.0.8/inst/oc_polybool.m
--- old/octclip/inst/oc_polybool.m 2012-09-30 22:55:58.0 +0200
+++ new/octclip-1.0.8/inst/oc_polybool.m2015-06-16 15:23:52.0
+0200
@@ -1,4 +1,4 @@
-## Copyright (C) 2011, José Luis García Pallero,
+## Copyright (C) 2011-2015, José Luis García Pallero,
##
## This file is part of OctCLIP.
##
@@ -45,7 +45,8 @@
##
## For the matrices @var{sub} and @var{clip}, the first point is not needed to
## be repeated at the end (but is permitted). Pairs of (NaN,NaN) coordinates in
-## @var{sub} and/or @var{clip} are ommitted.
+## @var{sub} and/or @var{clip} are omitted, so they are treated as if each one
+## stored a single polygon.
#
commit octave-forge-octclip for openSUSE:Factory
Hello community,
here is the log from the commit of package octave-forge-octclip for
openSUSE:Factory checked in at 2015-06-16 15:13:01
Comparing /work/SRC/openSUSE:Factory/octave-forge-octclip (Old)
and /work/SRC/openSUSE:Factory/.octave-forge-octclip.new (New)
Package is "octave-forge-octclip"
Changes:
New Changes file:
--- /dev/null 2015-05-15 19:41:08.266053825 +0200
+++
/work/SRC/openSUSE:Factory/.octave-forge-octclip.new/octave-forge-octclip.changes
2015-06-16 15:13:01.0 +0200
@@ -0,0 +1,11 @@
+---
+Thu Apr 9 08:27:58 UTC 2015 - dmitr...@opensuse.org
+
+- Fix build with OpenMP
+ * octclip-openmp.patch
+
+---
+Thu Feb 26 16:06:43 UTC 2015 - dmitr...@opensuse.org
+
+- Split from octave-forge package, version 1.0.3
+
New:
octave-forge-octclip.changes
octave-forge-octclip.spec
octclip-1.0.3.tar.gz
octclip-openmp.patch
Other differences:
--
++ octave-forge-octclip.spec ++
#
# spec file for package octave-forge-octclip
#
# Copyright (c) 2015 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# 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/
#
%define octpkg octclip
Name: octave-forge-%{octpkg}
Version:1.0.3
Release:0
Summary:Octave clipping polygons tool
License:GPL-3.0+ and BSD-3-Clause
Group: Productivity/Scientific/Math
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
BuildRequires: gcc-c++
BuildRequires: hdf5-devel
BuildRequires: octave-devel
Requires: octave-cli >= 2.9.7
%description
This package allows to do boolean operations with polygons using
the Greiner-Hormann algorithm.
This is part of Octave-Forge project.
%prep
%setup -q -c %{name}-%{version}
%patch1 -p1
%octave_pkg_src
%build
%octave_pkg_build
%install
%octave_pkg_install
%check
%octave_pkg_test
%post
%octave --eval "pkg rebuild"
%postun
%octave --eval "pkg rebuild"
%files
%defattr(-,root,root)
%{octpackages_dir}/%{octpkg}-%{version}
%{octlib_dir}/%{octpkg}-%{version}
%changelog
++ octclip-openmp.patch ++
Index: octave-forge-octclip/octclip/src/Makefile
===
--- octave-forge-octclip.orig/octclip/src/Makefile
+++ octave-forge-octclip/octclip/src/Makefile
@@ -33,7 +33,7 @@ compile:
$(CC) -c -I. recpolil.c -o recpolil.o
$(CC) -c -I. segmento.c -o segmento.o
$(CC) -c -I. ventorno.c -o ventorno.o
- $(CC) -s -I. _oc_polybool.cc *.o
+ $(CC) -s -lgomp -I. _oc_polybool.cc *.o
.PHONY: clean
clean:
