[arch-commits] Commit in xplanet/repos/community-x86_64 (6 files)
Antonio Rojas
arojas at archlinux.org
Fri Nov 30 07:23:48 UTC 2018
Date: Friday, November 30, 2018 @ 07:23:47
Author: arojas
Revision: 410585
archrelease: copy trunk to community-x86_64
Added:
xplanet/repos/community-x86_64/PKGBUILD
(from rev 410584, xplanet/trunk/PKGBUILD)
xplanet/repos/community-x86_64/giflib6.patch
(from rev 410584, xplanet/trunk/giflib6.patch)
xplanet/repos/community-x86_64/xplanet-c++11.patch
(from rev 410584, xplanet/trunk/xplanet-c++11.patch)
Deleted:
xplanet/repos/community-x86_64/PKGBUILD
xplanet/repos/community-x86_64/giflib6.patch
xplanet/repos/community-x86_64/xplanet-c++11.patch
---------------------+
PKGBUILD | 70 +++++------
giflib6.patch | 60 ++++-----
xplanet-c++11.patch | 314 +++++++++++++++++++++++++-------------------------
3 files changed, 223 insertions(+), 221 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-30 07:23:19 UTC (rev 410584)
+++ PKGBUILD 2018-11-30 07:23:47 UTC (rev 410585)
@@ -1,34 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Committer: Judd Vinet <jvinet at zeroflux.org>
-
-pkgname=xplanet
-pkgver=1.3.1
-pkgrel=2
-pkgdesc="An Xearth wannabe"
-arch=(x86_64)
-url="http://xplanet.sourceforge.net/"
-license=('GPL')
-depends=('pango' 'giflib' 'libtiff' 'libxss')
-source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz
- giflib6.patch xplanet-c++11.patch)
-md5sums=('9797dbd9697d10205ca1671f728ea30d'
- '4ccddbd3edfae97a8d4cf36ea571282f'
- '71ea4c0fddcf0643db97ede1044c681d')
-
-prepare() {
- cd "$srcdir"/$pkgname-$pkgver
- patch -p1 <"$srcdir"/giflib6.patch
- patch -p1 -i ../xplanet-c++11.patch # Fix build with C++11 (Gentoo)
-}
-
-build() {
- cd "$srcdir"/$pkgname-$pkgver
- ./configure --prefix=/usr --with-freetype
- make
-}
-
-package() {
- cd "$srcdir"/$pkgname-$pkgver
- make prefix="$pkgdir"/usr install
-}
Copied: xplanet/repos/community-x86_64/PKGBUILD (from rev 410584, xplanet/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-11-30 07:23:47 UTC (rev 410585)
@@ -0,0 +1,36 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: dorphell <dorphell at archlinux.org>
+# Committer: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=xplanet
+pkgver=1.3.1
+pkgrel=3
+pkgdesc="An Xearth wannabe"
+arch=(x86_64)
+url="http://xplanet.sourceforge.net/"
+license=('GPL')
+depends=('pango' 'giflib' 'libtiff' 'libxss')
+source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz
+ giflib6.patch xplanet-c++11.patch)
+md5sums=('9797dbd9697d10205ca1671f728ea30d'
+ '4ccddbd3edfae97a8d4cf36ea571282f'
+ '71ea4c0fddcf0643db97ede1044c681d')
+
+prepare() {
+ cd "$srcdir"/$pkgname-$pkgver
+ patch -p1 <"$srcdir"/giflib6.patch
+ patch -p1 -i ../xplanet-c++11.patch # Fix build with C++11 (Gentoo)
+ sed -e 's|freetype-config|pkg-config freetype2|g' -i acinclude.m4
+ autoreconf -vif
+}
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr --with-freetype
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make prefix="$pkgdir"/usr install
+}
Deleted: giflib6.patch
===================================================================
--- giflib6.patch 2018-11-30 07:23:19 UTC (rev 410584)
+++ giflib6.patch 2018-11-30 07:23:47 UTC (rev 410585)
@@ -1,30 +0,0 @@
-diff -wbBur xplanet-1.3.1/src/libimage/gif.c xplanet-1.3.1.q/src/libimage/gif.c
---- xplanet-1.3.1/src/libimage/gif.c 2013-02-16 23:37:47.000000000 +0400
-+++ xplanet-1.3.1.q/src/libimage/gif.c 2016-03-14 17:41:14.244144734 +0300
-@@ -179,7 +179,7 @@
- }
- }
-
-- if (DGifCloseFile(GifFile) == GIF_ERROR) {
-+ if (DGifCloseFile(GifFile, NULL) == GIF_ERROR) {
- return(0);
- }
-
-@@ -493,7 +493,7 @@
- static void QuitGifError(GifFileType *GifFile)
- {
- fprintf(stderr, "Error writing GIF file\n");
-- if (GifFile != NULL) EGifCloseFile(GifFile);
-+ if (GifFile != NULL) EGifCloseFile(GifFile, NULL);
- }
-
- int
-@@ -589,7 +589,7 @@
- Ptr += width;
- }
-
-- if (EGifCloseFile(GifFile) == GIF_ERROR)
-+ if (EGifCloseFile(GifFile, NULL) == GIF_ERROR)
-
- {
- QuitGifError(GifFile);
Copied: xplanet/repos/community-x86_64/giflib6.patch (from rev 410584, xplanet/trunk/giflib6.patch)
===================================================================
--- giflib6.patch (rev 0)
+++ giflib6.patch 2018-11-30 07:23:47 UTC (rev 410585)
@@ -0,0 +1,30 @@
+diff -wbBur xplanet-1.3.1/src/libimage/gif.c xplanet-1.3.1.q/src/libimage/gif.c
+--- xplanet-1.3.1/src/libimage/gif.c 2013-02-16 23:37:47.000000000 +0400
++++ xplanet-1.3.1.q/src/libimage/gif.c 2016-03-14 17:41:14.244144734 +0300
+@@ -179,7 +179,7 @@
+ }
+ }
+
+- if (DGifCloseFile(GifFile) == GIF_ERROR) {
++ if (DGifCloseFile(GifFile, NULL) == GIF_ERROR) {
+ return(0);
+ }
+
+@@ -493,7 +493,7 @@
+ static void QuitGifError(GifFileType *GifFile)
+ {
+ fprintf(stderr, "Error writing GIF file\n");
+- if (GifFile != NULL) EGifCloseFile(GifFile);
++ if (GifFile != NULL) EGifCloseFile(GifFile, NULL);
+ }
+
+ int
+@@ -589,7 +589,7 @@
+ Ptr += width;
+ }
+
+- if (EGifCloseFile(GifFile) == GIF_ERROR)
++ if (EGifCloseFile(GifFile, NULL) == GIF_ERROR)
+
+ {
+ QuitGifError(GifFile);
Deleted: xplanet-c++11.patch
===================================================================
--- xplanet-c++11.patch 2018-11-30 07:23:19 UTC (rev 410584)
+++ xplanet-c++11.patch 2018-11-30 07:23:47 UTC (rev 410585)
@@ -1,157 +0,0 @@
-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
Copied: xplanet/repos/community-x86_64/xplanet-c++11.patch (from rev 410584, xplanet/trunk/xplanet-c++11.patch)
===================================================================
--- xplanet-c++11.patch (rev 0)
+++ xplanet-c++11.patch 2018-11-30 07:23:47 UTC (rev 410585)
@@ -0,0 +1,157 @@
+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
More information about the arch-commits
mailing list