--- grundhog.old/files/1.4-gcc3.patch 2003-09-14 06:37:58.000000000 +0200 +++ groundhog/files/1.4-gcc3.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -diff -ur src.orig/game.cc src/game.cc ---- src.orig/game.cc 2003-09-14 00:31:24.735219680 -0400 -+++ src/game.cc 2003-09-14 00:30:40.688915736 -0400 -@@ -18,7 +18,8 @@ - - #include - --#include -+#include -+using namespace std; - #include - #include - -diff -ur src.orig/highscore_tab.cc src/highscore_tab.cc ---- src.orig/highscore_tab.cc 2003-09-14 00:31:24.744218312 -0400 -+++ src/highscore_tab.cc 2003-09-14 00:30:56.376530856 -0400 -@@ -16,7 +16,8 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - --#include -+#include -+using namespace std; - - #include "highscore_tab.h" - #include "intl.h" -diff -ur src.orig/solved_dialog.cc src/solved_dialog.cc ---- src.orig/solved_dialog.cc 2003-09-14 00:31:24.743218464 -0400 -+++ src/solved_dialog.cc 2003-09-14 00:30:48.212771936 -0400 -@@ -16,7 +16,8 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - --#include -+#include -+using namespace std; - - #include "intl.h" - #include "solved_dialog.h" --- grundhog.old/files/groundhog-1.4-gcc41.patch 2006-05-07 22:45:39.000000000 +0200 +++ groundhog/files/groundhog-1.4-gcc41.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/options_dialog.h.old 2006-05-07 22:26:32.000000000 +0200 -+++ src/options_dialog.h 2006-05-07 22:26:46.000000000 +0200 -@@ -28,7 +28,7 @@ - Game* _game; - GtkWidget* _tooltips; - -- void OptionsDialog::OnOk(); -+ void OnOk(); - public: - OptionsDialog(Game* game); - }; --- grundhog.old/files/groundhog-1.4-gcc-fixup.patch 1970-01-01 01:00:00.000000000 +0100 +++ groundhog/files/groundhog-1.4-gcc-fixup.patch 2008-04-19 00:29:38.000000000 +0200 @@ -0,0 +1,283 @@ +--- groundhog-1.4.orig/src/dialog.cc 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/src/dialog.cc 2008-04-19 00:17:01.000000000 +0200 +@@ -14,11 +14,11 @@ + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +-#include ++#include + + #include "dialog.h" + #include "intl.h" + + gint +--- groundhog-1.4.orig/src/game.cc 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/src/game.cc 2008-04-19 00:17:01.000000000 +0200 +@@ -16,14 +16,20 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + #include + +-#include ++#include ++#include ++#include ++ ++#include + #include + #include + ++using namespace std; ++ + #include "about_dialog.h" + #include "ball.h" + #include "game.h" + #include "highscore_dialog.h" + #include "icons.h" +@@ -191,25 +197,27 @@ + } + + void + Game::DisplayMoves() + { +- char info[128]; +- ostrstream ost(info, sizeof(info)); ++ string info; ++ ostringstream ost; + + ost << _("Moves: ") << _nr_of_moves << std::ends; +- gtk_label_set(GTK_LABEL(_moves), info); ++ info = ost.str(); ++ gtk_label_set(GTK_LABEL(_moves), info.c_str()); + } + + void + Game::DisplayTime() + { +- char info[128]; +- ostrstream ost(info, sizeof(info)); ++ string info; ++ ostringstream ost; + + ost << _("Time: ") << _seconds << std::ends; +- gtk_label_set(GTK_LABEL(_time), info); ++ info = ost.str(); ++ gtk_label_set(GTK_LABEL(_time), info.c_str()); + } + + void + Game::StopTime() + { +--- groundhog-1.4.orig/src/highscore.cc 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/src/highscore.cc 2008-04-19 00:17:01.000000000 +0200 +@@ -14,11 +14,13 @@ + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +-#include ++#include ++#include ++using namespace std; + + #include "highscore.h" + + void + HighScore::Read() +--- groundhog-1.4.orig/src/highscore_tab.cc 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/src/highscore_tab.cc 2008-04-19 00:17:01.000000000 +0200 +@@ -14,11 +14,13 @@ + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +-#include ++#include ++#include ++using namespace std; + + #include "highscore_tab.h" + #include "intl.h" + #include "score.h" + +@@ -35,15 +37,16 @@ + + label = gtk_label_new(_("Seconds")); + gtk_table_attach_defaults(GTK_TABLE(table), label, 2, 3, 0, 1); + + for (int i = 1; i <= 10; i++) { +- char scratch[16]; +- std::ostrstream ost(scratch, sizeof(scratch)); ++ string scratch; ++ ostringstream ost; + + ost << i << std::ends; +- GtkWidget* index_label = gtk_label_new(scratch); ++ scratch = ost.str(); ++ GtkWidget* index_label = gtk_label_new(scratch.c_str()); + gtk_table_attach_defaults(GTK_TABLE(table), index_label, 0, 1, i, i + 1); + + _names[i] = gtk_label_new(N_("")); + gtk_table_attach_defaults(GTK_TABLE(table), _names[i], 1, 2, i, i + 1); + +@@ -66,16 +69,17 @@ + HighScoreTab::Fill(const ScoreList& slist) + { + int index = 1; + for (std::list::const_iterator i = slist.Begin(); + i != slist.End(); i++) { +- char scratch[16]; +- std::ostrstream ost(scratch, sizeof(scratch)); ++ string scratch; ++ ostringstream ost; + + ost << (*i).GetSeconds() << std::ends; ++ scratch = ost.str(); + +- FillOneScore(index++, (*i).GetName().c_str(), scratch); ++ FillOneScore(index++, (*i).GetName().c_str(), scratch.c_str()); + } + + for (; index <= 10; index++) + FillOneScore(index, "-", "-"); + } +--- groundhog-1.4.orig/src/new_highscore_dialog.cc 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/src/new_highscore_dialog.cc 2008-04-19 00:17:01.000000000 +0200 +@@ -14,10 +14,11 @@ + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include + #include + #include + + #include "game.h" + #include "icons.h" +--- groundhog-1.4.orig/src/new_highscore_dialog.h 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/src/new_highscore_dialog.h 2008-04-19 00:17:01.000000000 +0200 +@@ -18,10 +18,11 @@ + + #ifndef _NEW_HIGHSCORE_DIALOG_H + #define _NEW_HIGHSCORE_DIALOG_H + + #include ++using namespace std; + #include "dialog.h" + + class Game; + + class NewHighScoreDialog : public Dialog { +--- groundhog-1.4.orig/src/options_dialog.h 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/src/options_dialog.h 2008-04-19 00:17:01.000000000 +0200 +@@ -26,11 +26,11 @@ + class OptionsDialog : public Dialog { + protected: + Game* _game; + GtkWidget* _tooltips; + +- void OptionsDialog::OnOk(); ++ void OnOk(); + public: + OptionsDialog(Game* game); + }; + + #endif // _OPTIONS_DIALOG_H +--- groundhog-1.4.orig/src/pocket.h 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/src/pocket.h 2008-04-19 00:17:01.000000000 +0200 +@@ -18,10 +18,11 @@ + + #ifndef _POCKET_H_ + #define _POCKET_H_ + + #include ++using namespace std; + + #include + + #include "ball.h" + #include "element.h" +--- groundhog-1.4.orig/src/score.cc 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/src/score.cc 2008-04-19 00:17:01.000000000 +0200 +@@ -15,10 +15,11 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + #include ++using namespace std; + #include "score.h" + + std::ostream& + operator<<(std::ostream& s, const Score& score) + { +--- groundhog-1.4.orig/src/score.h 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/src/score.h 2008-04-19 00:17:01.000000000 +0200 +@@ -19,10 +19,13 @@ + #ifndef _SCORE_H + #define _SCORE_H + + #include + #include ++#include ++ ++using namespace std; + + class Score { + std::string _name; + int _seconds; + protected: +--- groundhog-1.4.orig/src/solved_dialog.cc 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/src/solved_dialog.cc 2008-04-19 00:17:01.000000000 +0200 +@@ -14,11 +14,13 @@ + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +-#include ++#include ++#include ++using namespace std; + + #include "intl.h" + #include "solved_dialog.h" + + SolvedDialog::SolvedDialog() : Dialog(_("Game Solved!")) +@@ -31,11 +33,12 @@ + } + + void + SolvedDialog::SetLabel(int moves) + { +- char info[128]; +- std::ostrstream ost(info, sizeof(info)); ++ string info; ++ ostringstream ost; + + ost << _(" Game solved in ") << moves << _(" moves!") << std::ends; +- gtk_label_set(GTK_LABEL(_label), info); ++ info = ost.str(); ++ gtk_label_set(GTK_LABEL(_label), info.c_str()); + } +--- groundhog-1.4.orig/src/tube_pair.cc 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/src/tube_pair.cc 2008-04-19 00:17:01.000000000 +0200 +@@ -14,10 +14,12 @@ + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include ++ + #include "icons.h" + #include "tube.h" + #include "tube_pair.h" + + TubePair::TubePair(GtkWidget* table, int row, int col) --- grundhog.old/files/groundhog-1.4-missing.patch 1970-01-01 01:00:00.000000000 +0100 +++ groundhog/files/groundhog-1.4-missing.patch 2008-04-19 10:30:31.000000000 +0200 @@ -0,0 +1,406 @@ +--- missing.old 1999-06-07 22:06:34.000000000 +0200 ++++ missing 2008-03-19 16:11:48.000000000 +0100 +@@ -1,9 +1,13 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. +-# Copyright (C) 1996, 1997 Free Software Foundation, Inc. +-# Franc,ois Pinard , 1996. ++ ++scriptversion=2006-05-10.23 ++ ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 ++# Free Software Foundation, Inc. ++# Originally by Fran,cois Pinard , 1996. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2, or (at your option) + # any later version. +@@ -13,19 +17,53 @@ + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. ++ ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. + + if test $# -eq 0; then + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 + fi + +-case "$1" in ++run=: ++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' ++sed_minuso='s/.* -o \([^ ]*\).*/\1/p' ++ ++# In the cases where this matters, `missing' is being run in the ++# srcdir already. ++if test -f configure.ac; then ++ configure_ac=configure.ac ++else ++ configure_ac=configure.in ++fi ++ ++msg="missing on your system" ++ ++case $1 in ++--run) ++ # Try to run requested program, and just exit if it succeeds. ++ run= ++ shift ++ "$@" && exit 0 ++ # Exit code 63 means version mismatch. This often happens ++ # when the user try to use an ancient version of a tool on ++ # a file that requires a minimum version. In this case we ++ # we should proceed has if the program had been absent, or ++ # if --run hadn't been passed. ++ if test $? = 63; then ++ run=: ++ msg="probably too old" ++ fi ++ ;; + + -h|--h|--he|--hel|--help) + echo "\ + $0 [OPTION]... PROGRAM [ARGUMENT]... + +@@ -33,158 +71,297 @@ + error status if there is no known handling for PROGRAM. + + Options: + -h, --help display this help and exit + -v, --version output version information and exit ++ --run try to run the given command, and emulate it if it fails + + Supported PROGRAM values: + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' ++ autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c ++ help2man touch the output file + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file +- yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ++ tar try tar, gnutar, gtar, then tar without non-portable flags ++ yacc create \`y.tab.[ch]', if possible, from existing .[ch] ++ ++Send bug reports to ." ++ exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) +- echo "missing - GNU libit 0.0" ++ echo "missing $scriptversion (GNU Automake)" ++ exit $? + ;; + + -*) + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 + ;; + +- aclocal) ++esac ++ ++# Now exit if we have it, but it failed. Also exit now if we ++# don't have it and --version was passed (most likely to detect ++# the program). ++case $1 in ++ lex|yacc) ++ # Not GNU programs, they don't have --version. ++ ;; ++ ++ tar) ++ if test -n "$run"; then ++ echo 1>&2 "ERROR: \`tar' requires --run" ++ exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ exit 1 ++ fi ++ ;; ++ ++ *) ++ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then ++ # We have it, but it failed. ++ exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ # Could not run --version or --help. This is probably someone ++ # running `$TOOL --version' or `$TOOL --help' to check whether ++ # $TOOL exists and not knowing $TOOL uses missing. ++ exit 1 ++ fi ++ ;; ++esac ++ ++# If it does not exist, or fails to run (possibly an outdated version), ++# try to emulate it. ++case $1 in ++ aclocal*) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if +- you modified \`acinclude.m4' or \`configure.in'. You might want ++WARNING: \`$1' is $msg. You should only need it if ++ you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if +- you modified \`configure.in'. You might want to install the ++WARNING: \`$1' is $msg. You should only need it if ++ you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; + + autoheader) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if +- you modified \`acconfig.h' or \`configure.in'. You might want ++WARNING: \`$1' is $msg. You should only need it if ++ you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." +- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in` ++ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do +- case "$f" in ++ case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files + ;; + +- automake) ++ automake*) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if +- you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. ++WARNING: \`$1' is $msg. You should only need it if ++ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + ++ autom4te) ++ echo 1>&2 "\ ++WARNING: \`$1' is needed, but is $msg. ++ You might have modified some files without having the ++ proper tools for further handling them. ++ You can get \`$1' as part of \`Autoconf' from any GNU ++ archive site." ++ ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ++ if test -f "$file"; then ++ touch $file ++ else ++ test -z "$file" || exec >$file ++ echo "#! /bin/sh" ++ echo "# Created by GNU Automake missing as a replacement of" ++ echo "# $ $@" ++ echo "exit 0" ++ chmod +x $file ++ exit 1 ++ fi ++ ;; ++ + bison|yacc) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi +- if [ ! -f y.tab.h ]; then ++ if test ! -f y.tab.h; then + echo >y.tab.h + fi +- if [ ! -f y.tab.c ]; then ++ if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex|flex) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi +- if [ ! -f lex.yy.c ]; then ++ if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + ++ help2man) ++ echo 1>&2 "\ ++WARNING: \`$1' is $msg. You should only need it if ++ you modified a dependency of a manual page. You may need the ++ \`Help2man' package in order for those modifications to take ++ effect. You can get \`Help2man' from any GNU archive site." ++ ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ++ if test -f "$file"; then ++ touch $file ++ else ++ test -z "$file" || exec >$file ++ echo ".ab help2man is required to generate this page" ++ exit 1 ++ fi ++ ;; ++ + makeinfo) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." +- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` ++ # The file to touch is that specified with -o ... ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then +- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` ++ # ... or it is the one specified with @setfilename ... ++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ++ file=`sed -n ' ++ /^@setfilename/{ ++ s/.* \([^ ]*\) *$/\1/ ++ p ++ q ++ }' $infile` ++ # ... or it is derived from the source name (dir/f.texi becomes f.info) ++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi ++ # If the file does not exist, the user really needs makeinfo; ++ # let's fail without touching anything. ++ test -f $file || exit 1 + touch $file + ;; + ++ tar) ++ shift ++ ++ # We have already tried tar in the generic part. ++ # Look for gnutar/gtar before invocation to avoid ugly error ++ # messages. ++ if (gnutar --version > /dev/null 2>&1); then ++ gnutar "$@" && exit 0 ++ fi ++ if (gtar --version > /dev/null 2>&1); then ++ gtar "$@" && exit 0 ++ fi ++ firstarg="$1" ++ if shift; then ++ case $firstarg in ++ *o*) ++ firstarg=`echo "$firstarg" | sed s/o//` ++ tar "$firstarg" "$@" && exit 0 ++ ;; ++ esac ++ case $firstarg in ++ *h*) ++ firstarg=`echo "$firstarg" | sed s/h//` ++ tar "$firstarg" "$@" && exit 0 ++ ;; ++ esac ++ fi ++ ++ echo 1>&2 "\ ++WARNING: I can't seem to be able to run \`tar' with the given arguments. ++ You may want to install GNU tar or Free paxutils, or check the ++ command line arguments." ++ exit 1 ++ ;; ++ + *) + echo 1>&2 "\ +-WARNING: \`$1' is needed, and you do not seem to have it handy on your +- system. You might have modified some files without having the ++WARNING: \`$1' is needed, and is $msg. ++ You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, +- it often tells you about the needed prerequirements for installing ++ it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; + esac + + exit 0 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: --- grundhog.old/files/groundhog-1.4-readme.patch 1970-01-01 01:00:00.000000000 +0100 +++ groundhog/files/groundhog-1.4-readme.patch 2008-04-19 00:29:38.000000000 +0200 @@ -0,0 +1,11 @@ +--- groundhog-1.4.orig/README 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/README 2008-04-19 00:17:01.000000000 +0200 +@@ -1,6 +1,6 @@ +-This is Groundhog 1.3.1, a simple logic game. See the INSTALL file for ++This is Groundhog 1.4, a simple logic game. See the INSTALL file for + build instructions. + + Groundhog's homepage is at + + http://home-2.consunet.nl/~cb007736 + --- grundhog.old/files/groundhog-1.4-swedish.patch 1970-01-01 01:00:00.000000000 +0100 +++ groundhog/files/groundhog-1.4-swedish.patch 2008-04-19 00:29:38.000000000 +0200 @@ -0,0 +1,355 @@ +--- groundhog-1.4.orig/configure.in 2008-04-19 00:09:24.000000000 +0200 ++++ groundhog-1.4/configure.in 2008-04-19 00:17:01.000000000 +0200 +@@ -6,11 +6,11 @@ + + GLIB_REQUIRED_VERSION=2.0.0 + GTK_REQUIRED_VERSION=$GLIB_REQUIRED_VERSION + + dnl Add the languages which your application supports here. +-ALL_LINGUAS="nl fr" ++ALL_LINGUAS="nl fr sv" + AM_GNU_GETTEXT + + dnl Set PACKAGE_LOCALE_DIR in config.h. + if test "x${prefix}" = "xNONE"; then + AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale") +@@ -65,11 +65,11 @@ + *) CFLAGS="$CFLAGS -Wall" ;; + esac + fi + changequote([,])dnl + +-AC_OUTPUT([ m4/Makefile intl/Makefile intl/Makefile ++AC_OUTPUT([ m4/Makefile intl/Makefile + Makefile + src/Makefile + po/Makefile.in]) + + +--- groundhog-1.4.orig/po/sv.po 1970-01-01 01:00:00.000000000 +0100 ++++ groundhog-1.4/po/sv.po 2008-04-19 00:17:01.000000000 +0200 +@@ -0,0 +1,324 @@ ++# Swedish translation of groundhog. ++# Copyright (C) 2006 Free Software Foundation, Inc. ++# Daniel Nylander , 2006. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: groundhog 1.4-7\n" ++"POT-Creation-Date: 1999-11-22 20:57+0100\n" ++"PO-Revision-Date: 2006-01-09 08:38+0100\n" ++"Last-Translator: Daniel Nylander \n" ++"Language-Team: Swedish \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=iso-8859-1\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: about_dialog.cc:27 ++msgid "About Groundhog" ++msgstr "Om Groundhog" ++ ++#: about_dialog.cc:46 ++msgid "" ++"Groundhog 1.2\n" ++"Copyright (C) 1998-1999 by Maurits Rijk\n" ++"lpeek.mrijk@consunet.nl" ++msgstr "" ++"Groundhog 1.2\n" ++"Copyright (C) 1998-1999 av Maurits Rijk\n" ++"lpeek.mrijk@consunet.nl" ++ ++#: about_dialog.cc:52 ++msgid " Released under the GNU General Public License " ++msgstr " Utgiven under GNU General Public License " ++ ++#: dialog.cc:34 ++msgid "Ok" ++msgstr "Ok" ++ ++#: dialog.cc:36 ++#: dialog.cc:71 ++#: game.cc:222 ++#: new_game_dialog.cc:62 ++#: tube_pair.cc:59 ++msgid "clicked" ++msgstr "klickad" ++ ++#: dialog.cc:38 ++#: game.cc:83 ++msgid "delete_event" ++msgstr "delete_event" ++ ++#: dialog.cc:70 ++msgid "Cancel" ++msgstr "Avbryt" ++ ++#: game.cc:42 ++msgid "/_File" ++msgstr "/_Arkiv" ++ ++#: game.cc:42 ++msgid "" ++msgstr "" ++ ++#: game.cc:43 ++msgid "/File/_New..." ++msgstr "/Arkiv/_Ny..." ++ ++#: game.cc:43 ++#: game.cc:57 ++msgid "N" ++msgstr "N" ++ ++#: game.cc:44 ++msgid "/File/Show _Highscore..." ++msgstr "/Arkiv/Visa _po�ngtoppen..." ++ ++#: game.cc:46 ++msgid "/File/_Options..." ++msgstr "/Arkiv/_Alternativ..." ++ ++#: game.cc:47 ++msgid "/File/sep1" ++msgstr "/Arkiv/sep1" ++ ++#: game.cc:47 ++msgid "" ++msgstr "" ++ ++#: game.cc:48 ++msgid "/File/_Quit" ++msgstr "/Arkiv/_Avsluta" ++ ++#: game.cc:48 ++#: game.cc:61 ++msgid "Q" ++msgstr "Q" ++ ++#: game.cc:49 ++msgid "/_Help" ++msgstr "/_Hj�lp" ++ ++#: game.cc:49 ++msgid "" ++msgstr "" ++ ++#: game.cc:50 ++msgid "/Help/_About..." ++msgstr "/Hj�lp/_Om..." ++ ++#: game.cc:57 ++msgid "
/File/New..." ++msgstr "
/Arkiv/Ny..." ++ ++#: game.cc:58 ++msgid "
/File/Show Highscore..." ++msgstr "
/Arkiv/Visa po�ngtoppen..." ++ ++#: game.cc:59 ++msgid "
/File/Options..." ++msgstr "
/Arkiv/Alternativ..." ++ ++#: game.cc:60 ++msgid "
/File/" ++msgstr "
/Arkiv/" ++ ++#: game.cc:61 ++msgid "
/File/Quit" ++msgstr "
/Arkiv/Avsluta" ++ ++#: game.cc:62 ++msgid "
/Help/About..." ++msgstr "
/Hj�lp/Om..." ++ ++#: game.cc:80 ++msgid "Groundhog" ++msgstr "Groundhog" ++ ++#: game.cc:86 ++msgid "destroy" ++msgstr "f�rst�r" ++ ++#: game.cc:111 ++#: game.cc:115 ++msgid "
" ++msgstr "
" ++ ++#: game.cc:125 ++msgid "
" ++msgstr "
" ++ ++#: game.cc:131 ++msgid "
/Help" ++msgstr "
/Hj�lp" ++ ++#: game.cc:164 ++msgid "New" ++msgstr "Ny" ++ ++#: game.cc:164 ++msgid "Start new game" ++msgstr "Starta nytt spel" ++ ++#: game.cc:165 ++#: game.cc:176 ++msgid "Private" ++msgstr "Privat" ++ ++#: game.cc:175 ++msgid "Highscore" ++msgstr "Po�ngtoppen" ++ ++#: game.cc:175 ++msgid "Show highscore" ++msgstr "Visa po�ngtoppen" ++ ++#: game.cc:219 ++msgid "Go" ++msgstr "K�r" ++ ++#: game.cc:225 ++msgid "Play move" ++msgstr "Spela drag" ++ ++#: game.cc:253 ++msgid "Moves: " ++msgstr "Drag: " ++ ++#: game.cc:263 ++msgid "Time: " ++msgstr "Tid: " ++ ++#: highscore.cc:26 ++#: highscore.cc:35 ++msgid "HOME" ++msgstr "HEM" ++ ++#: highscore.cc:27 ++#: highscore.cc:36 ++msgid "/.groundhog.highscore" ++msgstr "/.groundhog.highscore" ++ ++#: highscore_dialog.cc:24 ++msgid "High scores" ++msgstr "Po�ngtoppen" ++ ++#: highscore_dialog.cc:32 ++msgid "Beginner" ++msgstr "Nyb�rjare" ++ ++#: highscore_dialog.cc:33 ++msgid "Intermediate" ++msgstr "Medelsv�r" ++ ++#: highscore_dialog.cc:34 ++msgid "Expert" ++msgstr "Expert" ++ ++#: highscore_tab.cc:29 ++msgid "Rank" ++msgstr "Rank" ++ ++#: highscore_tab.cc:33 ++msgid "Name" ++msgstr "Namn" ++ ++#: highscore_tab.cc:37 ++msgid "Seconds" ++msgstr "Sekunder" ++ ++#: highscore_tab.cc:86 ++msgid "-" ++msgstr "-" ++ ++#: main.cc:31 ++msgid "../po" ++msgstr "../po" ++ ++#: new_game_dialog.cc:24 ++msgid "New Game" ++msgstr "Nytt spel" ++ ++#: new_game_dialog.cc:27 ++msgid "Size" ++msgstr "Storlek" ++ ++#: new_game_dialog.cc:43 ++msgid "Beginner (2x2)" ++msgstr "Nyb�rjare (2x2)" ++ ++#: new_game_dialog.cc:49 ++msgid "Intermediate (5x5)" ++msgstr "Medelsv�r (5x5)" ++ ++#: new_game_dialog.cc:55 ++msgid "Expert (9x9)" ++msgstr "Expert (9x9)" ++ ++#: new_game_dialog.cc:60 ++msgid "User definable" ++msgstr "Anpassningsbar" ++ ++#: new_game_dialog.cc:67 ++msgid "Columns:" ++msgstr "Kolumner:" ++ ++#: new_game_dialog.cc:71 ++msgid "Rows:" ++msgstr "Rader:" ++ ++#: new_highscore_dialog.cc:29 ++msgid "New Highscore" ++msgstr "Nytt rekord" ++ ++#: new_highscore_dialog.cc:50 ++msgid "Congratulations, a new highscore!" ++msgstr "Gratulerar, ett nytt rekord!" ++ ++#: new_highscore_dialog.cc:54 ++msgid "Name:" ++msgstr "Namn:" ++ ++#: new_highscore_dialog.cc:74 ++msgid "LOGNAME" ++msgstr "LOGGNAMN" ++ ++#: new_highscore_dialog.cc:76 ++msgid "USER" ++msgstr "ANV�NDARE" ++ ++#: new_highscore_dialog.cc:79 ++msgid "nobody" ++msgstr "ingen" ++ ++#: new_highscore_dialog.cc:90 ++msgid "Anonymous" ++msgstr "Anonym" ++ ++#: options_dialog.cc:24 ++msgid "Options" ++msgstr "Alternativ" ++ ++#: options_dialog.cc:30 ++msgid "Show Tooltips" ++msgstr "Visa verktygstips" ++ ++#: score.cc:24 ++msgid "(\"" ++msgstr "(\"" ++ ++#: score.cc:24 ++msgid "\" " ++msgstr "\" " ++ ++#: solved_dialog.cc:25 ++msgid "Game Solved!" ++msgstr "Spelet l�st!" ++ ++#: solved_dialog.cc:40 ++msgid " Game solved in " ++msgstr " Spelet l�st p� " ++ ++#: solved_dialog.cc:40 ++msgid " moves!" ++msgstr " drag!" ++ --- grundhog.old/groundhog-1.4.ebuild 2006-10-04 23:35:56.000000000 +0200 +++ groundhog/groundhog-1.4.ebuild 2008-04-19 12:47:05.000000000 +0200 @@ -1,16 +1,16 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/games-puzzle/groundhog/groundhog-1.4.ebuild,v 1.18 2006/10/04 21:12:52 nyhm Exp $ -inherit eutils games +inherit eutils autotools games DESCRIPTION="Put the balls in the pockets of the same color by manipulating a maze of tubes" HOMEPAGE="http://home-2.consunet.nl/~cb007736/groundhog.html" SRC_URI="http://home-2.consunet.nl/~cb007736/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="BSD-2 GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="nls" RDEPEND="=x11-libs/gtk+-2* @@ -18,23 +18,45 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" src_unpack() { unpack ${A} + cd "${S}" - epatch "${FILESDIR}"/${PV}-gcc3.patch \ - "${FILESDIR}/${P}"-gcc41.patch - sed -i 's:$(localedir):/usr/share/locale:' \ - $(find . -name 'Makefile.in*') \ - || die "sed failed" + + local patch + local patches="gcc-fixup swedish readme missing" + for patch in ${patches}; do + epatch "${FILESDIR}/${P}-${patch}.patch" + done + + if use nls; then + gettext_modify + + ebegin Running gettextize --force --intl --po-dir=./po + "${T}"/gettextize --force --intl --po-dir=./po &> /dev/null + local greturn="${?}" + eend ${greturn} + + eautoreconf + fi } src_compile() { egamesconf $(use_enable nls) || die emake CXXFLAGS="${CXXFLAGS}" || die "emake failed" } src_install() { emake DESTDIR="${D}" install || die "emake install failed" dodoc README NEWS AUTHORS TODO + make_desktop_entry "groundhog" "Groundhog" prepgamesdirs } + +#Snatched from enlightenment.eclass +gettext_modify() { + cp $(type -P gettextize) "${T}"/ || die "could not copy gettextize" + sed -i \ + -e 's:read dummy < /dev/tty::' \ + "${T}"/gettextize +}