update to naev 0.5.1, from maintainer Kyrill Bychkov

feedback from Antti Harri

Changes include:
- Many new missions, and improvements for older ones.
- Soromid faction added.
- New planet and station graphics.
- Store user data in XDG-compliant locations (migration script included)
- Misc. bug fixes
This commit is contained in:
sthen 2012-03-14 22:54:28 +00:00
parent e55fa6c13c
commit c65e41f5a2
6 changed files with 61 additions and 18 deletions

View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.1.1.1 2012/01/25 11:30:24 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.2 2012/03/14 22:54:28 sthen Exp $
VERSION = 0.5.0
VERSION = 0.5.1
CATEGORIES = games x11

View File

@ -1,5 +1,5 @@
MD5 (naev/naev-0.5.0.tar.bz2) = 99dUoXrOh6rFQNDW1IMT1g==
RMD160 (naev/naev-0.5.0.tar.bz2) = /DoHOEOz+MkM7rALdy+5UfdBzLg=
SHA1 (naev/naev-0.5.0.tar.bz2) = sQ/gt0CQl4XsdMhMag66/CmocOY=
SHA256 (naev/naev-0.5.0.tar.bz2) = y6oJ0DYYiiLAyccPHbbgCSOxOP+JfN03ByrfSkOKUD0=
SIZE (naev/naev-0.5.0.tar.bz2) = 905700
MD5 (naev/naev-0.5.1.tar.bz2) = pf6i9OD+8j2JMhZ7Vo0YaA==
RMD160 (naev/naev-0.5.1.tar.bz2) = 7/C2SdS53KldGkaK1cmrQNudOiU=
SHA1 (naev/naev-0.5.1.tar.bz2) = QEnJxhNNgSObeL/GZ+R8YewFxt8=
SHA256 (naev/naev-0.5.1.tar.bz2) = wUIj/0kueijaAauNxN+vj6eOLnaM6LhA96QHKeVvWb0=
SIZE (naev/naev-0.5.1.tar.bz2) = 999618

View File

@ -0,0 +1,42 @@
$OpenBSD: patch-naev-confupdate_sh,v 1.1 2012/03/14 22:54:28 sthen Exp $
--- naev-confupdate.sh.orig Wed Feb 29 23:42:03 2012
+++ naev-confupdate.sh Sun Mar 11 20:53:16 2012
@@ -16,29 +16,24 @@ cd "$HOME/.naev" || exit
if mkdir -p "$XDG_DATA_HOME/naev"; then
# Attempt to migrate each save, but don't overwrite existing ones.
- if [[ -d saves/ ]] && mkdir -p "$XDG_DATA_HOME/naev/saves"; then
- mv -n saves/*.ns "$XDG_DATA_HOME/naev/saves/"
- stat *.ns.backup >/dev/null 2>&1 && mv -n saves/*.ns.backup "$XDG_DATA_HOME/naev/saves"
- fi
+ [[ -d saves/ ]] && cp -r saves/ "$XDG_DATA_HOME/naev/"
# Screenshots are numbered from zero, so old screenshots cannot coexist with new ones.
- [[ -d screenshots/ ]] && mv -n screenshots/ "$XDG_DATA_HOME/naev/"
+ [[ -d screenshots/ ]] && cp -r screenshots/ "$XDG_DATA_HOME/naev/"
fi
# Naev writes the config on exit. Clobber if necessary.
if mkdir -p "$XDG_CONFIG_HOME/naev"; then
- [[ -r conf.lua ]] && mv conf.lua "$XDG_CONFIG_HOME/naev/"
- [[ -r conf.lua.backup ]] && mv conf.lua.backup "$XDG_CONFIG_HOME/naev/"
+ [[ -r conf.lua ]] && cp conf.lua "$XDG_CONFIG_HOME/naev/"
+ [[ -r conf.lua.backup ]] && cp conf.lua.backup "$XDG_CONFIG_HOME/naev/"
fi
# Nebula images are generated on first-run if absent; we'll clobber the new ones if necessary.
-if [[ -d gen/ ]] && mkdir -p "$XDG_CACHE_HOME/naev/nebula"; then
- mv gen/nebu_bg_*.png "$XDG_CACHE_HOME/naev/nebula/"
+if [[ -d nebula/ ]] && mkdir -p "$XDG_CACHE_HOME/naev/nebula"; then
+ cp nebula/nebu_bg_*.png "$XDG_CACHE_HOME/naev/nebula/"
fi
-# Clean up if nothing remains.
-for dir in saves screenshots gen; do
- [[ -d $dir ]] && rmdir --ignore-fail-on-non-empty "$dir/"
-done
+# Save old data
+mv "$HOME/.naev/" "$HOME/.naev.bak/"
-rmdir --ignore-fail-on-non-empty "$HOME/.naev/"
+echo "If everything works OK, you can safely remove "$HOME/.naev.bak/""

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_opengl_c,v 1.1.1.1 2012/01/25 11:30:24 sthen Exp $
--- src/opengl.c.orig Sun Jul 31 18:26:59 2011
+++ src/opengl.c Sun Jul 31 18:27:27 2011
$OpenBSD: patch-src_opengl_c,v 1.2 2012/03/14 22:54:28 sthen Exp $
--- src/opengl.c.orig Wed Feb 29 23:42:05 2012
+++ src/opengl.c Sun Mar 11 20:03:21 2012
@@ -38,6 +38,7 @@
#include <stdio.h>
#include <string.h>
#include "nstring.h"
#include <stdarg.h> /* va_list for gl_print */
+#include <zlib.h>
#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
#include <png.h>

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/01/25 11:30:24 sthen Exp $
@comment $OpenBSD: PLIST,v 1.2 2012/03/14 22:54:28 sthen Exp $
@bin bin/naev
@man man/man6/naev.6
share/applications/naev.desktop
@ -7,6 +7,7 @@ share/doc/naev/AUTHORS
share/doc/naev/LICENSE
share/doc/naev/README
share/doc/naev/TODO
share/naev/naev-confupdate.sh
share/pixmaps/
share/pixmaps/naev.png
@exec %D/bin/update-desktop-database

View File

@ -1,5 +1,5 @@
MD5 (naev/ndata-0.5.0) = SrOkNk10b+Ebcr2gM0mzsA==
RMD160 (naev/ndata-0.5.0) = gtssH/WMHZDAT5RRq4IEdvIHZKM=
SHA1 (naev/ndata-0.5.0) = 3+4E/ZCH5IN39yo9kqcE6wSjjT0=
SHA256 (naev/ndata-0.5.0) = Jpvo17oOOaeaV+zyb7uF5kLqt7BWbasMLHJov1bvBVA=
SIZE (naev/ndata-0.5.0) = 227724242
MD5 (naev/ndata-0.5.1) = nKsLznpNy3zchA/GDaXtHw==
RMD160 (naev/ndata-0.5.1) = BD8jHLKn+aoK7DOCsGQnTpjXI6A=
SHA1 (naev/ndata-0.5.1) = iTuQAiXtxHT0Jw4DTxB7uGOmHrE=
SHA256 (naev/ndata-0.5.1) = MxItbhBwsAEwE3vaeITMcERqjnnD8SaxHNspYM1+mjE=
SIZE (naev/ndata-0.5.1) = 244647456