Hello community,
here is the log from the commit of package xplanet for openSUSE:Factory checked in at 2016-07-01 09:58:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xplanet (Old)
and /work/SRC/openSUSE:Factory/.xplanet.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xplanet"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xplanet/xplanet.changes 2014-06-05 10:50:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xplanet.new/xplanet.changes 2016-07-01 09:58:21.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Jun 17 18:53:46 UTC 2016 - asterios.dramis@gmail.com
+
+- Update to 1.3.1:
+ * Changelog not available.
+- Removed xplanet-libpng16.patch (fixed upstream).
+- Updated xplanet-giflib5.patch (taken from Fedora). Only needed
+ for openSUSE > 13.2.
+- Added gcc6.patch to fix compilation with GCC 6 (boo#985129).
+
+-------------------------------------------------------------------
Old:
----
xplanet-1.3.0.tar.gz
xplanet-libpng16.patch
New:
----
gcc6.patch
xplanet-1.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xplanet.spec ++++++
--- /var/tmp/diff_new_pack.xDmz04/_old 2016-07-01 09:58:22.000000000 +0200
+++ /var/tmp/diff_new_pack.xDmz04/_new 2016-07-01 09:58:22.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xplanet
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2013 B1 Systems GmbH, Vohburg, Germany.
#
# All modifications and additions to the file contributed by third parties
@@ -18,17 +18,17 @@
Name: xplanet
-Version: 1.3.0
+Version: 1.3.1
Release: 0
Summary: Planets as Background Pictures or Interactive Animations
License: GPL-2.0+
Group: Productivity/Scientific/Astronomy
Url: http://xplanet.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# build also with libpng16, patch sent to hari@alumni.caltech.edu
-Patch0: xplanet-libpng16.patch
# new giflib-5 api
-Patch1: xplanet-giflib5.patch
+Patch0: xplanet-giflib5.patch
+# PATCH-FIX-UPSTREAM gcc6.patch boo#985129 asterios.dramis@gmail.com -- Fix compilation with GCC 6
+Patch1: gcc6.patch
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: giflib-devel
@@ -61,8 +61,10 @@
%prep
%setup -q
+%if 0%{?suse_version} > 1320
%patch0 -p1
-%patch1 -p1
+%endif
+%patch1
%build
# configure does not check if netpbm headers are installed in /usr/include/netpbm
@@ -80,7 +82,7 @@
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_bindir}/%{name}
-%doc %{_mandir}/man1/%{name}.1%{ext_man}
+%{_mandir}/man1/%{name}.1%{ext_man}
%{_datadir}/%{name}/
%changelog
++++++ gcc6.patch ++++++
Index: src/libmultiple/RayleighScattering.cpp
===================================================================
--- src/libmultiple/RayleighScattering.cpp (revision 206)
+++ src/libmultiple/RayleighScattering.cpp (revision 207)
@@ -369,7 +369,7 @@
diskTemplate_.clear();
limbTemplate_.clear();
- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
{
int i = 0;
while (isDelimiter(line[i]))
@@ -439,7 +439,7 @@
values.clear();
char line[MAX_LINE_LENGTH];
- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
{
int i = 0;
while (isDelimiter(line[i]))
@@ -470,7 +470,7 @@
double &value)
{
char line[MAX_LINE_LENGTH];
- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
{
int i = 0;
while (isDelimiter(line[i]))
Index: src/libmultiple/drawStars.cpp
===================================================================
--- src/libmultiple/drawStars.cpp (revision 206)
+++ src/libmultiple/drawStars.cpp (revision 207)
@@ -41,7 +41,7 @@
ifstream inFile(starMap.c_str());
char line[MAX_LINE_LENGTH];
- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
{
if (line[0] == '#') continue;
Index: src/readConfig.cpp
===================================================================
--- src/readConfig.cpp (revision 206)
+++ src/readConfig.cpp (revision 207)
@@ -550,7 +550,7 @@
ifstream inFile(configFile.c_str());
char *line = new char[256];
- while (inFile.getline(line, 256, '\n') != NULL)
+ while (inFile.getline(line, 256, '\n'))
readConfig(line, planetProperties);
// This condition will only be true if [default] is the only
Index: src/libannotate/addArcs.cpp
===================================================================
--- src/libannotate/addArcs.cpp (revision 206)
+++ src/libannotate/addArcs.cpp (revision 207)
@@ -258,7 +258,7 @@
{
ifstream inFile(arcFile.c_str());
char *line = new char[MAX_LINE_LENGTH];
- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
readArcFile(line, planet, view, projection,
planetProperties, annotationMap);
@@ -292,7 +292,7 @@
{
ifstream inFile(arcFile.c_str());
char *line = new char[256];
- while (inFile.getline (line, 256, '\n') != NULL)
+ while (inFile.getline (line, 256, '\n'))
readArcFile(line, NULL, view, NULL, NULL, annotationMap);
inFile.close();
Index: src/libannotate/addMarkers.cpp
===================================================================
--- src/libannotate/addMarkers.cpp (revision 206)
+++ src/libannotate/addMarkers.cpp (revision 207)
@@ -429,7 +429,7 @@
{
ifstream inFile(markerFile.c_str());
char *line = new char[MAX_LINE_LENGTH];
- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
{
unsigned char color[3];
memcpy(color, planetProperties->MarkerColor(), 3);
@@ -475,7 +475,7 @@
{
ifstream inFile(markerFile.c_str());
char *line = new char[MAX_LINE_LENGTH];
- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
{
unsigned char color[3];
memcpy(color, options->Color(), 3);
Index: src/libannotate/addSatellites.cpp
===================================================================
--- src/libannotate/addSatellites.cpp (revision 206)
+++ src/libannotate/addSatellites.cpp (revision 207)
@@ -488,10 +488,10 @@
{
ifstream inFile(tleFile.c_str());
char lines[3][80];
- while (inFile.getline(lines[0], 80) != NULL)
+ while (inFile.getline(lines[0], 80))
{
- if ((inFile.getline(lines[1], 80) == NULL)
- || (inFile.getline(lines[2], 80) == NULL))
+ if ((!inFile.getline(lines[1], 80))
+ || (!inFile.getline(lines[2], 80)))
{
ostringstream errStr;
errStr << "Malformed TLE file (" << tleFile << ")?\n";
@@ -542,7 +542,7 @@
{
ifstream inFile(satFile.c_str());
char *line = new char[MAX_LINE_LENGTH];
- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
readSatelliteFile(line, planet, view, projection,
planetProperties, annotationMap);
Index: src/libannotate/addSpiceObjects.cpp
===================================================================
--- src/libannotate/addSpiceObjects.cpp (revision 206)
+++ src/libannotate/addSpiceObjects.cpp (revision 207)
@@ -524,7 +524,7 @@
{
ifstream inFile(kernelFile.c_str());
char *line = new char[MAX_LINE_LENGTH];
- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
{
int ii = 0;
while (isDelimiter(line[ii]))
@@ -576,7 +576,7 @@
{
ifstream inFile(spiceFile.c_str());
char *line = new char[MAX_LINE_LENGTH];
- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
readSpiceFile(line, planetsFromSunMap, view, projection,
annotationMap);
inFile.close();
++++++ xplanet-1.3.0.tar.gz -> xplanet-1.3.1.tar.gz ++++++
++++ 10882 lines of diff (skipped)
++++++ xplanet-giflib5.patch ++++++
--- /var/tmp/diff_new_pack.xDmz04/_old 2016-07-01 09:58:22.000000000 +0200
+++ /var/tmp/diff_new_pack.xDmz04/_new 2016-07-01 09:58:22.000000000 +0200
@@ -1,199 +1,55 @@
----
- src/libimage/gif.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 85 insertions(+)
-
-Index: xplanet-1.3.0/src/libimage/gif.c
-===================================================================
---- xplanet-1.3.0.orig/src/libimage/gif.c
-+++ xplanet-1.3.0/src/libimage/gif.c
-@@ -23,6 +23,35 @@
+--- a/src/libimage/gif.c
++++ b/src/libimage/gif.c
+@@ -20,6 +20,7 @@
+
+ #include