diff options
| author | joerg <joerg@pkgsrc.org> | 2006-01-20 03:09:17 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-01-20 03:09:17 +0000 |
| commit | b91547e8cbdedc097639dae5e5df18abb2e654f2 (patch) | |
| tree | 570f877ee444ba36554c5b0a03f528606c2b8bc5 /misc | |
| parent | fe14c9ecb147d53ce8516bf597baa6c6c2f27fa3 (diff) | |
| download | pkgsrc-b91547e8cbdedc097639dae5e5df18abb2e654f2.tar.gz | |
Add some explicit typename keywords to apeace GCC 3.4+.
Use OS X style localtime handling for DragonFly as well.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/celestia/distinfo | 4 | ||||
| -rw-r--r-- | misc/celestia/patches/patch-ai | 22 | ||||
| -rw-r--r-- | misc/celestia/patches/patch-aj | 13 |
3 files changed, 38 insertions, 1 deletions
diff --git a/misc/celestia/distinfo b/misc/celestia/distinfo index 7c8629cc472..9870e36ced6 100644 --- a/misc/celestia/distinfo +++ b/misc/celestia/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2005/06/20 06:02:30 hira Exp $ +$NetBSD: distinfo,v 1.8 2006/01/20 03:09:17 joerg Exp $ SHA1 (celestia-1.3.2.tar.gz) = 3407610f3844cd8aaf4f079e1ec5b0c236d3d547 RMD160 (celestia-1.3.2.tar.gz) = 4f891866be70a2d918bdb75ad4fd7d4dddcef4ce @@ -11,3 +11,5 @@ SHA1 (patch-ae) = 09923dc44ed2c16193f634360f49c9fd12bab353 SHA1 (patch-af) = df2dae0d054a475ee98286281780037f088f07bc SHA1 (patch-ag) = 16a8ae890c82bf1fa4f89953a5ebfc1c07ec1491 SHA1 (patch-ah) = d48d210f7ddc35c85e86600f3c3cac2f425f372a +SHA1 (patch-ai) = 26e44588bf810d9002249bb7dab3581d6ba1bdc9 +SHA1 (patch-aj) = 36a1a71e630b7fe477dd0c6413b29dffa33e8111 diff --git a/misc/celestia/patches/patch-ai b/misc/celestia/patches/patch-ai new file mode 100644 index 00000000000..22cdf9a64ea --- /dev/null +++ b/misc/celestia/patches/patch-ai @@ -0,0 +1,22 @@ +$NetBSD: patch-ai,v 1.1 2006/01/20 03:09:17 joerg Exp $ + +--- src/celutil/resmanager.h.orig 2006-01-20 02:31:51.000000000 +0000 ++++ src/celutil/resmanager.h +@@ -72,7 +72,7 @@ template<class T> class ResourceManager + { + ResourceHandle h = handles.size(); + resources.insert(resources.end(), info); +- handles.insert(ResourceHandleMap::value_type(info, h)); ++ handles.insert(typename ResourceHandleMap::value_type(info, h)); + return h; + } + } +@@ -105,7 +105,7 @@ template<class T> class ResourceManager + else + { + resources[h].state = ResourceLoaded; +- loadedResources.insert(NameMap::value_type(resources[h].resolvedName, resources[h].resource)); ++ loadedResources.insert(typename NameMap::value_type(resources[h].resolvedName, resources[h].resource)); + } + } + } diff --git a/misc/celestia/patches/patch-aj b/misc/celestia/patches/patch-aj new file mode 100644 index 00000000000..0c3e13568ac --- /dev/null +++ b/misc/celestia/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1 2006/01/20 03:09:17 joerg Exp $ + +--- src/celestia/glutmain.cpp.orig 2006-01-20 02:46:31.000000000 +0000 ++++ src/celestia/glutmain.cpp +@@ -511,7 +511,7 @@ int main(int argc, char* argv[]) + // Set the simulation starting time to the current system time + time_t curtime=time(NULL); + appCore->start((double) curtime / 86400.0 + (double) astro::Date(1970, 1, 1)); +- #ifdef MACOSX ++ #if defined(MACOSX) || defined(__DragonFly__) + /* localtime in Darwin is is reentrant only + equiv to Linux localtime_r() + should probably port !MACOSX code to use this too, available since |