Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (07b0f93982cdb3a218cd60a1c2a61db466711eb8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (07b0f93982cdb3a218cd60a1c2a61db466711eb8)
  • Date: Fri, 1 May 2015 16:43:36 -0500

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

devel/graphviz/DETAILS | 4 ++--
devel/graphviz/HISTORY | 3 +++
science/celestia/0001-add-missing-include.patch | 24
++++++++++++++++++++++++
science/celestia/CONFIGURE | 3 ---
science/celestia/DEPENDS | 2 +-
science/celestia/DETAILS | 2 +-
science/celestia/HISTORY | 5 +++++
science/celestia/PRE_BUILD | 3 ++-
8 files changed, 38 insertions(+), 8 deletions(-)

New commits:
commit 07b0f93982cdb3a218cd60a1c2a61db466711eb8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/graphviz: version 2.38.0

commit 1a2885607d09101e200a5048589aaeaa1ce0bfc9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/celestia: fix build with gcc 5

diff --git a/devel/graphviz/DETAILS b/devel/graphviz/DETAILS
index f3a7fc7..8879b2f 100755
--- a/devel/graphviz/DETAILS
+++ b/devel/graphviz/DETAILS
@@ -1,9 +1,9 @@
SPELL=graphviz
- VERSION=2.36.0
+ VERSION=2.38.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.graphviz.org/pub/graphviz/ARCHIVE/$SOURCE
-
SOURCE_HASH=sha512:cca1339cea8d36acbae647a78ff6743a4f77bfa208e74fef615a99dc7d380d2a0a0f0b3fc00de09a9f67c3fad16dc3837ef3aefbfce5a8a3d0f974ed5afbbab5
+
SOURCE_HASH=sha512:0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531
WEB_SITE=http://www.graphviz.org/
GATHER_DOCS="off"
KEYWORDS="graph devel"
diff --git a/devel/graphviz/HISTORY b/devel/graphviz/HISTORY
index 5a298ec..62a0def 100644
--- a/devel/graphviz/HISTORY
+++ b/devel/graphviz/HISTORY
@@ -1,3 +1,6 @@
+2015-05-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.38.0
+
2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: added missing dependencies

diff --git a/science/celestia/0001-add-missing-include.patch
b/science/celestia/0001-add-missing-include.patch
new file mode 100644
index 0000000..fcba427
--- /dev/null
+++ b/science/celestia/0001-add-missing-include.patch
@@ -0,0 +1,24 @@
+From 034b91a065177cfc70b4cc9318bd25b7eddd73d7 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.net>
+Date: Fri, 1 May 2015 10:11:12 +0200
+Subject: [PATCH] add missing include
+
+---
+ src/celmath/intersect.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/celmath/intersect.h b/src/celmath/intersect.h
+index 38fb01f..a1aab6a 100644
+--- a/src/celmath/intersect.h
++++ b/src/celmath/intersect.h
+@@ -15,6 +15,7 @@
+ #include "ray.h"
+ #include "sphere.h"
+ #include "ellipsoid.h"
++#include <celmath/mathlib.h>
+
+
+ template<class T> bool testIntersection(const Ray3<T>& ray,
+--
+2.3.5
+
diff --git a/science/celestia/CONFIGURE b/science/celestia/CONFIGURE
index e1d6f6a..c82547f 100755
--- a/science/celestia/CONFIGURE
+++ b/science/celestia/CONFIGURE
@@ -1,6 +1,3 @@
-config_query_option CELESTIA_XINERAMA 'Enable Xinerama support?' y \
- '--with-xinerama' '--without-xinerama' &&
-
if spell_ok libgnomeui; then
config_query_list CELESTIA_UI 'Choose which interface you would like' \
gnome2 gtk+2 glut
diff --git a/science/celestia/DEPENDS b/science/celestia/DEPENDS
index 0655819..f24530d 100755
--- a/science/celestia/DEPENDS
+++ b/science/celestia/DEPENDS
@@ -1,7 +1,7 @@
depends autoconf &&
depends JPEG &&
depends libpng &&
-depends lua51 &&
+depends lua &&

if [ "$CELESTIA_UI" == "glut" ]; then
depends GLUT '--with-glut' &&
diff --git a/science/celestia/DETAILS b/science/celestia/DETAILS
index 8bf5fbd..6229265 100755
--- a/science/celestia/DETAILS
+++ b/science/celestia/DETAILS
@@ -2,7 +2,7 @@
VERSION=1.6.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/Celestia-source/${VERSION}/${SOURCE}
#
SOURCE_HASH[0]=sha512:82165e4488cb87cbd6d4813c1351ef2b26893e6e7a23bc24d2a668dbcbe18a3cbfda5dccd2a0bc1e3db5e4e0366c3f6618d750f962e2cfd0d41c105453e18465
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
LICENSE[0]=GPL
diff --git a/science/celestia/HISTORY b/science/celestia/HISTORY
index 4db8c97..a84dab7 100644
--- a/science/celestia/HISTORY
+++ b/science/celestia/HISTORY
@@ -1,3 +1,8 @@
+2015-04-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL[0]
+ * CONFIGURE: remove obsolete query for xinerama support
+ * PRE_BUILD, 0001-add-missing-include.patch: fix build with gcc 5
+
2012-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, celestia-1.6.1-gcc46.patch: added patch from gentoo
to fix build with gcc 4.6
diff --git a/science/celestia/PRE_BUILD b/science/celestia/PRE_BUILD
index 3830113..907792a 100755
--- a/science/celestia/PRE_BUILD
+++ b/science/celestia/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p0 < ${SCRIPT_DIRECTORY}/celestia-1.6.1-gcc46.patch
+patch -p0 < ${SPELL_DIRECTORY}/celestia-1.6.1-gcc46.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/0001-add-missing-include.patch



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (07b0f93982cdb3a218cd60a1c2a61db466711eb8), Florian Franzmann, 05/01/2015

Archive powered by MHonArc 2.6.24.

Top of Page