From 2acad05de94a31fd268366e6e73ade5684dba4ab Mon Sep 17 00:00:00 2001
From: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
Date: Fri, 13 May 2011 23:28:39 -0300
Subject: desktop/xplanet: Updated for version 1.2.2.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 desktop/xplanet/README             |  4 ++--
 desktop/xplanet/src.patch          | 22 ----------------------
 desktop/xplanet/xplanet.SlackBuild |  5 +----
 desktop/xplanet/xplanet.info       |  8 ++++----
 4 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 desktop/xplanet/src.patch

diff --git a/desktop/xplanet/README b/desktop/xplanet/README
index 70cf8807b5..641dae6637 100644
--- a/desktop/xplanet/README
+++ b/desktop/xplanet/README
@@ -1,6 +1,6 @@
-Xplanet renders planetary and solar system images.  It can be used to create 
+Xplanet renders planetary and solar system images. It can be used to create
 computer wallpapers or single images. Xplanet can show city names, overlay 
-cloud maps or display which regions of Earth are day or night.  Xplanet can 
+cloud maps or display which regions of Earth are day or night.  Xplanet can
 be used to produce projected maps based on several projections, such as 
 mollweide, which show the whole earth at once, or mercator, which is 
 rectangular and is suitable for filling the screen.
diff --git a/desktop/xplanet/src.patch b/desktop/xplanet/src.patch
deleted file mode 100644
index b599bfb96e..0000000000
--- a/desktop/xplanet/src.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -crB src/Satellite.cpp src.new//Satellite.cpp
-*** src/Satellite.cpp	2010-06-24 08:32:19.923302138 +0300
---- src.new//Satellite.cpp	2010-06-24 08:31:30.857301301 +0300
-***************
-*** 1,4 ****
---- 1,5 ----
-  #include <clocale>
-+ #include <cstdio>
-  #include <cstring>
-  #include <iostream>
-  using namespace std;
-diff -crB src/Separation.cpp src.new//Separation.cpp
-*** src/Separation.cpp	2010-06-24 08:32:19.911301998 +0300
---- src.new//Separation.cpp	2010-06-24 08:31:34.542300533 +0300
-***************
-*** 1,4 ****
---- 1,5 ----
-  #include <cmath>
-+ #include <cstdio>
-  #include <iostream>
-  
-  #include "Separation.h"
diff --git a/desktop/xplanet/xplanet.SlackBuild b/desktop/xplanet/xplanet.SlackBuild
index 2de22d6d01..72a7792011 100644
--- a/desktop/xplanet/xplanet.SlackBuild
+++ b/desktop/xplanet/xplanet.SlackBuild
@@ -3,7 +3,7 @@
 # Based on http://slackbuilds.org/template.SlackBuild
 
 PRGNAM=xplanet
-VERSION=${VERSION:-1.2.1}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,9 +50,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# patch to add <cstdio> to two source files as needed by gcc 4.4
-patch -p0 < $CWD/src.patch 
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/desktop/xplanet/xplanet.info b/desktop/xplanet/xplanet.info
index fd9fe13696..df48b4e823 100644
--- a/desktop/xplanet/xplanet.info
+++ b/desktop/xplanet/xplanet.info
@@ -1,10 +1,10 @@
 PRGNAM="xplanet"
-VERSION="1.2.1"
+VERSION="1.2.2"
 HOMEPAGE="http://xplanet.sourceforge.net/"
-DOWNLOAD="http://prdownloads.sourceforge.net/xplanet/xplanet-1.2.1.tar.gz"
-MD5SUM="5dca0369ca64fa3c006b616b72b5e1cf"
+DOWNLOAD="http://prdownloads.sourceforge.net/xplanet/xplanet-1.2.2.tar.gz"
+MD5SUM="b38c3b4cfdd772643f876a9bb15f288b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="bosth@alumni.sfu.ca"
-APPROVED="rworkman"
+APPROVED="rworkman,Niels Horn"
-- 
cgit v1.2.3