Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xplanet: ver. bump to 1.3.1

Browse Source
This commit is contained in:
suvari
2017-06-06 19:20:57 +03:00
parent 042301fabd
commit c49a677f4f
5 changed files with 228 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main_35_list.txt
-3
View File
@@ -1,8 +1,5 @@
2016-06-09 /multimedia/graphics/librecad/pspec.xml
2016-05-13 /util/admin/pisiyap/pspec.xml
2016-06-09 /science/astronomy/xplanet/pspec.xml
2016-06-09 /science/mathematics/plotutils/pspec.xml
2016-06-09 /programming/php/php/pspec.xml
2016-06-27 /programming/language/R-lang/pspec.xml
2016-12-13 /system/installer/Calamares/pspec.xml
2016-06-08 /system/installer/calamares-theme-pisilinux/pspec.xml
science/astronomy/xplanet/actions.py
+2 -1
View File
@@ -8,7 +8,8 @@ from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
def setup():
autotools.configure("--with-xscreensaver \
autotools.configure("--prefix=/usr \
--with-xscreensaver \
--with-freetype \
--with-pango \
--with-cspice \
science/astronomy/xplanet/files/giflib6.patch
+44 -119
View File
@@ -1,130 +1,55 @@
diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c
--- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300
+++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c 2013-07-30 18:21:17.412474692 +0400
@@ -20,7 +20,7 @@
--- a/src/libimage/gif.c
+++ b/src/libimage/gif.c
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <stdlib.h>
-
+#define FALSE 0
+#include <stdbool.h>
#include <string.h>
#include <gif_lib.h>
/*
@@ -42,11 +42,11 @@
int color_index;
unsigned char *ptr = NULL;
- infile = DGifOpenFileName(filename);
+ infile = DGifOpenFileName(filename, NULL);
if (infile == NULL)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
@@ -179,7 +180,11 @@
}
}
+#if GIFLIB_MAJOR >= 5
+ if (DGifCloseFile(GifFile, NULL) == GIF_ERROR) {
+#else
if (DGifCloseFile(GifFile) == GIF_ERROR) {
+#endif
return(0);
}
@@ -54,7 +54,7 @@
{
if (DGifGetRecordType(infile, &record_type) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -240,7 +245,7 @@
* Also non of the parameter are allocated by this routine.
* This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
******************************************************************************/
-static int
+int
QuantizeBuffer(unsigned int Width,
unsigned int Height,
int *ColorMapSize,
@@ -493,7 +498,11 @@
static void QuitGifError(GifFileType *GifFile)
{
fprintf(stderr, "Error writing GIF file\n");
+#if GIFLIB_MAJOR >= 5
+ if (GifFile != NULL) EGifCloseFile(GifFile, NULL);
+#else
if (GifFile != NULL) EGifCloseFile(GifFile);
+#endif
}
@@ -63,7 +63,7 @@
case IMAGE_DESC_RECORD_TYPE:
if (DGifGetImageDesc(infile) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -107,14 +107,14 @@
GifByteType *ext;
if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
while (ext != NULL)
{
if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
}
@@ -178,7 +178,7 @@
return(0);
int
@@ -589,7 +598,11 @@
Ptr += width;
}
- colormap = MakeMapObject(colormap_size, NULL);
+ colormap = GifMakeMapObject(colormap_size, NULL);
+#if GIFLIB_MAJOR >= 5
+ if (EGifCloseFile(GifFile, NULL) == GIF_ERROR)
+#else
if (EGifCloseFile(GifFile) == GIF_ERROR)
+#endif
for (i = 0; i < width * height; i++)
{
@@ -187,10 +187,10 @@
blue[i] = (GifByteType) rgb[3*i+2];
}
- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,
+ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue,
buffer, colormap->Colors) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -198,24 +198,24 @@
free(green);
free(blue);
- outfile = EGifOpenFileName((char *) filename, FALSE);
+ outfile = EGifOpenFileName((char *) filename, FALSE, NULL);
if (outfile == NULL)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap)
== GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL)
== GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -224,7 +224,7 @@
{
if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
ptr += width;
@@ -233,7 +233,7 @@
EGifSpew(outfile);
if (EGifCloseFile(outfile) == GIF_ERROR)
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
free(buffer);
QuitGifError(GifFile);
science/astronomy/xplanet/files/xplanet-1.3.1-remove-null-comparison.patch
+159
View File
@@ -0,0 +1,159 @@
Index: src/libannotate/addArcs.cpp
===================================================================
diff --git a/src/libannotate/addArcs.cpp b/src/libannotate/addArcs.cpp
--- a/src/libannotate/addArcs.cpp (revision 206)
+++ b/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
===================================================================
diff --git a/src/libannotate/addMarkers.cpp b/src/libannotate/addMarkers.cpp
--- a/src/libannotate/addMarkers.cpp (revision 206)
+++ b/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
===================================================================
diff --git a/src/libannotate/addSatellites.cpp b/src/libannotate/addSatellites.cpp
--- a/src/libannotate/addSatellites.cpp (revision 206)
+++ b/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
===================================================================
diff --git a/src/libannotate/addSpiceObjects.cpp b/src/libannotate/addSpiceObjects.cpp
--- a/src/libannotate/addSpiceObjects.cpp (revision 206)
+++ b/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();
Index: src/libmultiple/RayleighScattering.cpp
===================================================================
diff --git a/src/libmultiple/RayleighScattering.cpp b/src/libmultiple/RayleighScattering.cpp
--- a/src/libmultiple/RayleighScattering.cpp (revision 206)
+++ b/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
===================================================================
diff --git a/src/libmultiple/drawStars.cpp b/src/libmultiple/drawStars.cpp
--- a/src/libmultiple/drawStars.cpp (revision 206)
+++ b/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
===================================================================
diff --git a/src/readConfig.cpp b/src/readConfig.cpp
--- a/src/readConfig.cpp (revision 206)
+++ b/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
science/astronomy/xplanet/pspec.xml
+23 -11
View File
@@ -12,30 +12,35 @@
<IsA>app:gui</IsA>
<Summary>Render a planetary image into an X window</Summary>
<Description>Xplanet was inspired by Xearth, which renders an image of the earth into the X root window. All of the major planets and most satellites can be drawn, similar to the Solar System Simulator. A number of different map projections are also supported, including azimuthal, Lambert, Mercator, Mollweide, orthographic, and rectangular.</Description>
<Archive sha1sum="7c5208b501b441a0184cbb334a5658d0309d7dac" type="targz">mirrors://sourceforge/project/xplanet/xplanet/1.3.0/xplanet-1.3.0.tar.gz</Archive>
<Archive sha1sum="e711dc5a561f83d5bafcc4e47094addfd1806af7" type="targz">mirrors://sourceforge/project/xplanet/xplanet/1.3.1/xplanet-1.3.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>tiff-devel</Dependency>
<Dependency>pango-devel</Dependency>
<Dependency>netpbm-devel</Dependency>
<Dependency>libXScrnSaver-devel</Dependency>
<Dependency>giflib-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency>libXScrnSaver-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">giflib6.patch</Patch>
<Patch>xplanet-1.2.1-fix-gcc44.patch</Patch>
<Patch>giflib6.patch</Patch>
<Patch>xplanet-1.3.1-remove-null-comparison.patch</Patch>
</Patches>
</Source>
<Package>
<Name>xplanet</Name>
<RuntimeDependencies>
<Dependency>pango</Dependency>
<Dependency>netpbm</Dependency>
<Dependency>libXScrnSaver</Dependency>
<Dependency>giflib</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>tiff</Dependency>
<Dependency>pango</Dependency>
<Dependency>giflib</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libpng</Dependency>
<Dependency>netpbm</Dependency>
<Dependency>freetype</Dependency>
<Dependency>libXScrnSaver</Dependency>
<Dependency>libjpeg-turbo</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -46,6 +51,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-06-06</Date>
<Version>1.3.1</Version>
<Comment>Version Bump</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>1.3.0</Version>
@@ -61,4 +73,4 @@
<Email>osman.erkan@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>