]> git.pld-linux.org Git - packages/celestia.git/commitdiff
- outdated
authorJakub Bogusz <qboosh@pld-linux.org>
Fri, 29 Aug 2008 15:31:51 +0000 (15:31 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    celestia-gcc4.patch -> 1.2
    celestia-lua50.patch -> 1.4
    celestia-makefile.patch -> 1.4

celestia-gcc4.patch [deleted file]
celestia-lua50.patch [deleted file]
celestia-makefile.patch [deleted file]

diff --git a/celestia-gcc4.patch b/celestia-gcc4.patch
deleted file mode 100644 (file)
index a05b9c4..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN celestia-1.4.0./src/celengine/command.h celestia-1.4.0/src/celengine/command.h
---- celestia-1.4.0./src/celengine/command.h    2004-12-22 23:07:15.000000000 +0100
-+++ celestia-1.4.0/src/celengine/command.h     2005-12-25 00:40:12.545499680 +0100
-@@ -94,7 +94,7 @@
- class CommandGotoLongLat : public InstantaneousCommand
- {
-  public:
--    CommandGotoLongLat::CommandGotoLongLat(double t,
-+    CommandGotoLongLat(double t,
-                                            double dist,
-                                            float _longitude, float _latitude,
-                                            Vec3f _up);
-diff -ruN celestia-1.4.0./src/celengine/star.h celestia-1.4.0/src/celengine/star.h
---- celestia-1.4.0./src/celengine/star.h       2005-12-06 18:30:23.000000000 +0100
-+++ celestia-1.4.0/src/celengine/star.h        2005-12-25 00:40:20.201335816 +0100
-@@ -30,7 +30,7 @@
-     // orbits and StarDetails objects.  Currently, it's assumed that they
-     // have lifetimes that continue until program termination.
-  public:
--    StarDetails::StarDetails();
-+    StarDetails();
-     inline float getRadius() const;
-     inline float getTemperature() const;
diff --git a/celestia-lua50.patch b/celestia-lua50.patch
deleted file mode 100644 (file)
index 18558dc..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -urN celestia-1.4.1.orig/configure.in celestia-1.4.1.mod/configure.in
---- celestia-1.4.1.orig/configure.in   2006-02-03 19:09:54.000000000 +0100
-+++ celestia-1.4.1.mod/configure.in    2006-06-29 21:41:44.159248250 +0200
-@@ -256,8 +256,9 @@
- dnl (this is a silly trick to make configure behave)
- AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x" = "y")
-+PKG_PROG_PKG_CONFIG
-+
- if (test "$ui_gtk" != "no"); then
--      PKG_PROG_PKG_CONFIG
-       dnl GNOME is an extension to the GTK options
-       if (test "$ui_gnome" = "yes"); then
-@@ -363,43 +364,15 @@
- AC_ARG_WITH([lua],
--            AC_HELP_STRING([--with-lua[=DIR]],
-+            AC_HELP_STRING([--with-lua],
-                            [Use Lua for Celestia Extension Language support]),
--            enable_lua="$withval",
-+            enable_lua="yes",
-             enable_lua="no")
-                       
--AC_ARG_WITH([lua-inc],
--            AC_HELP_STRING([--with-lua-includes[=DIR]],
--                           [Specify location of Lua headers]),
--            lua_includes="$withval",
--            lua_includes="no")
--                      
--AC_ARG_WITH([lua-lib],
--            AC_HELP_STRING([--with-lua-libs[=DIR]],
--                           [Specify location of Lua libs]),
--            lua_libs="$withval",
--            lua_libs="no")
--
--AC_MSG_CHECKING([whether to enable Celestia Extension Language])
--if (test "$enable_lua" != "no"); then
--      CXXFLAGS="$CXXFLAGS -DCELX"
--      LDFLAGS="$LDFLAGS -llualib -llua"
--      
--      if (test "$lua_includes" != "no"); then
--              CXXFLAGS="$CXXFLAGS -I$lua_includes"
--      fi
--      
--      if (test "$lua_libs" != "no"); then
--              LIBS="$LIBS -L$lua_libs"
--      fi
--      AC_MSG_RESULT(yes)
--      
--      if (test "$enable_lua" != "yes"); then
--              CXXFLAGS="$CXXFLAGS -I$enable_lua/include"
--              LIBS="$LIBS  -L$enable_lua/lib"
--      fi
--else
--      AC_MSG_RESULT(no)
-+if (test "x$enable_lua" = "xyes"); then
-+      PKG_CHECK_MODULES(LUA, lua,
-+                        CXXFLAGS="$CXXFLAGS -DCELX $LUA_CFLAGS"
-+                        LIBS="$LIBS $LUA_LIBS")
- fi
- AM_CONDITIONAL(ENABLE_CELX, test "$enable_lua" != "no")
diff --git a/celestia-makefile.patch b/celestia-makefile.patch
deleted file mode 100644 (file)
index 3fe23ad..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN celestia-1.4.1.orig/Makefile.am celestia-1.4.1/Makefile.am
---- celestia-1.4.1.orig/Makefile.am    2006-02-03 19:04:33.000000000 +0100
-+++ celestia-1.4.1/Makefile.am 2006-06-30 00:27:56.358471750 +0200
-@@ -66,11 +66,11 @@
-       )
- install-data-hook:
--      if [ "$(kde_datadir)" -a -d $(kde_datadir)/@PACKAGE@ -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
--              mv -f -b $(kde_datadir)/@PACKAGE@/* $(datadir)/@PACKAGE@/ ; \
--              rmdir $(kde_datadir)/@PACKAGE@ ; \
-+      if [ "$(DESTDIR)$(kde_datadir)" -a -d $(DESTDIR)$(kde_datadir)/@PACKAGE@ -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \
-+              mv -f -b $(DESTDIR)$(kde_datadir)/@PACKAGE@/* $(DESTDIR)$(datadir)/@PACKAGE@/ ; \
-+              rmdir $(DESTDIR)$(kde_datadir)/@PACKAGE@ ; \
-       fi
--      if [ "$(kde_datadir)" -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
--              ln -s $(datadir)/@PACKAGE@ $(kde_datadir)/@PACKAGE@ ; \
-+      if [ "$(DESTDIR)$(kde_datadir)" -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \
-+              ln -s $(datadir)/@PACKAGE@ $(DESTDIR)$(kde_datadir)/@PACKAGE@ ; \
-       fi
This page took 0.093677 seconds and 4 git commands to generate.