aboutsummaryrefslogtreecommitdiff
path: root/astro/xglobe/files
diff options
context:
space:
mode:
Diffstat (limited to 'astro/xglobe/files')
-rw-r--r--astro/xglobe/files/patch-aa60
-rw-r--r--astro/xglobe/files/patch-random47
2 files changed, 107 insertions, 0 deletions
diff --git a/astro/xglobe/files/patch-aa b/astro/xglobe/files/patch-aa
new file mode 100644
index 000000000000..66a0983403d4
--- /dev/null
+++ b/astro/xglobe/files/patch-aa
@@ -0,0 +1,60 @@
+--- Makefile.orig Mon Jul 19 05:56:27 1999
++++ Makefile Sun May 5 01:53:17 2002
+@@ -4,29 +4,30 @@
+
+ ####### Installation directory
+
+-XGLOBE_DIR = /usr/local
+-XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe
++XGLOBE_DIR = $(PREFIX)
++XGLOBE_LIB_DIR = $(XGLOBE_DIR)/share/xglobe
+ XGLOBE_BIN_DIR = $(XGLOBE_DIR)/bin
+
+ ####### Library directories - you may need to modify these
+
+-X11_INCLUDE_DIR = /usr/X11R6/include
+-QT_INCLUDE_DIR = $(QTDIR)/include
++X11_INCLUDE_DIR = $(X11BASE)/include
++QT_INCLUDE_DIR = $(X11BASE)/include/X11/qt1
+
+-QT_LIB_DIR = $(QTDIR)/lib
+-X11_LIB_DIR = /usr/X11R6/lib
++QT_LIB_DIR = $(X11BASE)/lib
++X11_LIB_DIR = $(X11BASE)/lib
+
+
+ ####### Compiler and tools
+
+-CPP = g++
+-LINK = g++
+-MOC = moc
++CXX ?= c++
++CPP = ${CXX}
++LINK = ${CXX}
++MOC = moc1
+ INSTALL = install
+
+ ####### compile and link options
+
+-CFLAGS = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO) -O2 -Wall
++CFLAGS += $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO)
+
+ LFLAGS =
+
+@@ -34,13 +35,13 @@
+
+ LIB_DIRS = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR)
+
+-LIBS = -lX11 -lqt -lm
++LIBS = -lX11 -lqt1 -lm
+ # If you want to use the QImageIO lib (to support jpg and png maps) use the
+ # next two lines and comment the one above
+ #WITH_QIMGIO = -DWITH_QIMAGEIO
+-#LIBS = -lX11 -lqt -lm -lqimgio
++#LIBS = -lX11 -lqt1 -lm -lqimgio
+ # If the linker complains about unresolved references try this:
+-#LIBS = -lX11 -lqt -lm -lqimgio -lpng -lz -ljpeg
++#LIBS = -lX11 -lqt1 -lm -lqimgio -lpng -lz -ljpeg
+
+ ####### Target
+
diff --git a/astro/xglobe/files/patch-random b/astro/xglobe/files/patch-random
new file mode 100644
index 000000000000..ba9f41cf8b9e
--- /dev/null
+++ b/astro/xglobe/files/patch-random
@@ -0,0 +1,47 @@
+--- earthapp.cpp.orig Sat Feb 24 10:13:10 2001
++++ earthapp.cpp Sat Feb 24 10:13:29 2001
+@@ -937,8 +937,8 @@
+
+ void EarthApplication::randomPosition()
+ {
+- view_lat = ((rand()%30001)/30000.)*180. - 90.;
+- view_long = ((rand()%30001)/30000.)*360. - 180.;
++ view_lat = ((random()%30001)/30000.)*180. - 90.;
++ view_long = ((random()%30001)/30000.)*360. - 180.;
+ }
+
+ /* ------------------------------------------------------------------------*/
+--- renderer.cpp.orig Sat Feb 24 10:12:53 2001
++++ renderer.cpp Sat Feb 24 10:13:04 2001
+@@ -1562,9 +1562,9 @@
+
+ for(int i=0; i<numstars; i++)
+ {
+- x = rand() % renderedImage->width();
+- y = rand() % renderedImage->height();
+- brightness = 150+ (rand() % 106);
++ x = random() % renderedImage->width();
++ y = random() % renderedImage->height();
++ brightness = 150+ (random() % 106);
+ p = (unsigned int *)renderedImage->scanLine(y);
+ p += x;
+ *p = qRgb(brightness, brightness, brightness);
+--- main.cpp.orig Tue Jul 13 10:32:55 1999
++++ main.cpp Sat Feb 24 10:14:56 2001
+@@ -24,6 +24,7 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <qstring.h>
+ #include "config.h"
+@@ -36,6 +37,8 @@
+ int main(int argc, char **argv)
+ {
+ EarthApplication myApp(argc, argv);
++
++ srandomdev();
+
+ #ifdef WITH_QIMAGEIO
+ qInitImageIO();