[SM-Commit] GIT changes to master grimoire by Florian Franzmann (fa7425cfa756ebf8c260c563c9ea3390a0e749d6)

Florian Franzmann scm at sourcemage.org
Sun May 18 13:44:17 EDT 2008


GIT changes to master grimoire by Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>:

 x11/xplanet/HISTORY      |    4 ++
 x11/xplanet/PRE_BUILD    |    3 +
 x11/xplanet/gcc43.patch  |   80 +++++++++++++++++++++++++++++++++++++++++++++++
 x11/xscreensaver/BUILD   |   14 ++++++--
 x11/xscreensaver/DEPENDS |   26 ++++++++++++++-
 x11/xscreensaver/HISTORY |    4 ++
 6 files changed, 127 insertions(+), 4 deletions(-)

New commits:
commit fa7425cfa756ebf8c260c563c9ea3390a0e749d6
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    x11/xscreensaver: addded a few suggest_depends

commit 58329824757677b3e415a9ce8423f7b5ee12f826
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    x11/xplanet: added a patch to make it compile with gcc 4.3

diff --git a/x11/xplanet/HISTORY b/x11/xplanet/HISTORY
index c33f7fa..8a53278 100644
--- a/x11/xplanet/HISTORY
+++ b/x11/xplanet/HISTORY
@@ -1,3 +1,7 @@
+2008-05-18 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* gcc43.patch, PRE_BUILD: added a patch to make xplanet compile
+	  with recent versions of gcc
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/x11/xplanet/PRE_BUILD b/x11/xplanet/PRE_BUILD
new file mode 100755
index 0000000..b4c1cb3
--- /dev/null
+++ b/x11/xplanet/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build      &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc43.patch
diff --git a/x11/xplanet/gcc43.patch b/x11/xplanet/gcc43.patch
new file mode 100644
index 0000000..6ed2635
--- /dev/null
+++ b/x11/xplanet/gcc43.patch
@@ -0,0 +1,80 @@
+diff -Naupr xplanet-1.2.0/src/buildPlanetMap.cpp xplanet-1.2.0.fixed/src/buildPlanetMap.cpp
+--- xplanet-1.2.0/src/buildPlanetMap.cpp	2004-04-20 23:47:21.000000000 +0200
++++ xplanet-1.2.0.fixed/src/buildPlanetMap.cpp	2008-05-18 19:09:26.674392256 +0200
+@@ -1,3 +1,4 @@
++#include <cstdlib>
+ #include <cmath>
+ #include <cstdio>
+ #include <map>
+diff -Naupr xplanet-1.2.0/src/libannotate/Icon.cpp xplanet-1.2.0.fixed/src/libannotate/Icon.cpp
+--- xplanet-1.2.0/src/libannotate/Icon.cpp	2004-02-16 19:36:42.000000000 +0100
++++ xplanet-1.2.0.fixed/src/libannotate/Icon.cpp	2008-05-18 19:03:53.104274715 +0200
+@@ -8,6 +8,7 @@ using namespace std;
+ 
+ #include "libdisplay/libdisplay.h"
+ #include "libimage/Image.h"
++#include <cstring>
+ 
+ Icon::Icon(const int x, const int y, const std::string &filename,
+            const unsigned char *transparent)
+diff -Naupr xplanet-1.2.0/src/libplanet/Planet.cpp xplanet-1.2.0.fixed/src/libplanet/Planet.cpp
+--- xplanet-1.2.0/src/libplanet/Planet.cpp	2005-06-14 20:04:05.000000000 +0200
++++ xplanet-1.2.0.fixed/src/libplanet/Planet.cpp	2008-05-18 19:05:12.344297804 +0200
+@@ -1,3 +1,4 @@
++#include <cstring>
+ #include <cmath>
+ #include <cstdio>
+ #include <cctype>
+diff -Naupr xplanet-1.2.0/src/libprojection/getProjection.cpp xplanet-1.2.0.fixed/src/libprojection/getProjection.cpp
+--- xplanet-1.2.0/src/libprojection/getProjection.cpp	2005-06-13 17:13:11.000000000 +0200
++++ xplanet-1.2.0.fixed/src/libprojection/getProjection.cpp	2008-05-18 19:07:42.291085791 +0200
+@@ -1,3 +1,4 @@
++#include <cstdlib>
+ #include <cctype>
+ #include <cstring>
+ #include <sstream>
+diff -Naupr xplanet-1.2.0/src/Map.cpp xplanet-1.2.0.fixed/src/Map.cpp
+--- xplanet-1.2.0/src/Map.cpp	2005-06-15 01:40:46.000000000 +0200
++++ xplanet-1.2.0.fixed/src/Map.cpp	2008-05-18 19:08:50.101035754 +0200
+@@ -1,3 +1,4 @@
++#include <cstdlib>
+ #include <map>
+ #include <sstream>
+ #include <string>
+diff -Naupr xplanet-1.2.0/src/parseColor.cpp xplanet-1.2.0.fixed/src/parseColor.cpp
+--- xplanet-1.2.0/src/parseColor.cpp	2004-11-23 18:49:48.000000000 +0100
++++ xplanet-1.2.0.fixed/src/parseColor.cpp	2008-05-18 19:10:34.168627069 +0200
+@@ -1,3 +1,5 @@
++#include <cstdlib>
++#include <cstring>
+ #include <cstdio>
+ #include <fstream>
+ #include <map>
+diff -Naupr xplanet-1.2.0/src/PlanetProperties.h xplanet-1.2.0.fixed/src/PlanetProperties.h
+--- xplanet-1.2.0/src/PlanetProperties.h	2005-04-02 02:43:06.000000000 +0200
++++ xplanet-1.2.0.fixed/src/PlanetProperties.h	2008-05-18 19:03:14.124299203 +0200
+@@ -3,6 +3,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <cstring>
+ 
+ #include "body.h"
+ 
+diff -Naupr xplanet-1.2.0/src/xplanet.cpp xplanet-1.2.0.fixed/src/xplanet.cpp
+--- xplanet-1.2.0/src/xplanet.cpp	2004-09-09 17:46:05.000000000 +0200
++++ xplanet-1.2.0.fixed/src/xplanet.cpp	2008-05-18 19:11:54.607880344 +0200
+@@ -1,3 +1,4 @@
++#include <cstdlib>
+ #include <clocale>
+ #include <cstdio>
+ #include <iostream>
+diff -Naupr xplanet-1.2.0/src/xpUtil.cpp xplanet-1.2.0.fixed/src/xpUtil.cpp
+--- xplanet-1.2.0/src/xpUtil.cpp	2005-04-02 02:22:51.000000000 +0200
++++ xplanet-1.2.0.fixed/src/xpUtil.cpp	2008-05-18 19:11:31.280905627 +0200
+@@ -1,3 +1,5 @@
++#include <cstdlib>
++#include <cstring>
+ #include <cerrno>
+ #include <clocale>
+ #include <cmath>
diff --git a/x11/xscreensaver/BUILD b/x11/xscreensaver/BUILD
index d8802b0..1a307c3 100755
--- a/x11/xscreensaver/BUILD
+++ b/x11/xscreensaver/BUILD
@@ -1,8 +1,16 @@
 #sedit  "6690s/Screensaver/Screensaver Properties/"  po/es.po    &&
 
-OPTS="--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext     \
-            --with-xf86gamma-ext --with-proc-interrupts --with-xshm-ext  \
-            --with-xdbe-ext --with-readdisplay  --without-motif $OPTS"  &&
+OPTS="--with-dpms-ext $OPTS"
+OPTS="--with-xinerama-ext $OPTS"
+OPTS="--with-xf86vmode-ext $OPTS"
+OPTS="--with-xf86gamma-ext $OPTS"
+OPTS="--with-randr-ext $OPTS"
+OPTS="--with-proc-interrupts $OPTS"
+OPTS="--with-xshm-ext $OPTS"
+OPTS="--with-xdbe-ext $OPTS"
+OPTS="--with-readdisplay $OPTS"
+OPTS="--enable-locking $OPTS"
+OPTS="--without-motif $OPTS"
 if [ "$XSCSV" == "n" ]; then
    OPTS="--without-gtk --without-xml $OPTS"
 fi  &&
diff --git a/x11/xscreensaver/DEPENDS b/x11/xscreensaver/DEPENDS
index a10b7e7..568c744 100755
--- a/x11/xscreensaver/DEPENDS
+++ b/x11/xscreensaver/DEPENDS
@@ -46,4 +46,28 @@ optional_depends  jpeg                                          \
 optional_depends  gdk-pixbuf                                    \
                   "--with-pixbuf"                               \
                  "--without-pixbuf"                             \
-                  "for GDK-Pixbuf image support"
+                  "for GDK-Pixbuf image support"                &&
+suggest_depends  xplanet                                        \
+                  ""                                            \
+                  ""                                            \
+                  "support for xplanet screensaver"             &&
+suggest_depends  xsnow                                          \
+                  ""                                            \
+                  ""                                            \
+                  "support for xsnow screensaver"               &&
+suggest_depends  xmountains                                     \
+                  ""                                            \
+                  ""                                            \
+                  "support for xmountains screensaver"          &&
+suggest_depends  xearth                                         \
+                  ""                                            \
+                  ""                                            \
+                  "support for xearth screensaver"              &&
+suggest_depends  xdaliclock                                     \
+                  ""                                            \
+                  ""                                            \
+                  "support for xdaliclock screensaver"          &&
+suggest_depends  electricsheep                                  \
+                  ""                                            \
+                  ""                                            \
+                  "support for ElectricSheep screensaver"
diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY
index 1fa607b..7014a76 100644
--- a/x11/xscreensaver/HISTORY
+++ b/x11/xscreensaver/HISTORY
@@ -1,3 +1,7 @@
+2008-05-18 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD: added support for the randr extension
+	* DEPENDS: added a few suggest_depends
+
 2008-03-24 David Kowis <dkowis at shlrm.org>
 	* PRE_BUILD, demo-Gtk.patch: Removed
 	* DETAILS: version to 5.05, fixing bug that previous patch supposedly



More information about the SM-Commit mailing list