aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--games/einstein/einstein.SlackBuild17
-rw-r--r--games/einstein/einstein.info8
-rw-r--r--games/einstein/patches/01_sdl.diff108
-rw-r--r--games/einstein/patches/02_prefix.diff11
-rw-r--r--games/einstein/patches/06_srand.diff11
-rw-r--r--games/einstein/patches/07_long.diff31
-rw-r--r--games/einstein/patches/08_gcc43.diff12
-rw-r--r--games/einstein/patches/09_colors.diff22
-rw-r--r--games/einstein/patches/10_gcc43.diff10
9 files changed, 10 insertions, 220 deletions
diff --git a/games/einstein/einstein.SlackBuild b/games/einstein/einstein.SlackBuild
index a71f74da7d5dd..93e0a158564d8 100644
--- a/games/einstein/einstein.SlackBuild
+++ b/games/einstein/einstein.SlackBuild
@@ -2,7 +2,7 @@
#
# Slackware build script for einstein
#
-# Copyright 2009 Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2017 Erik W. Hanson, Minneapolis, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=einstein
-VERSION=2.0
+VERSION=2.1.1
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -53,9 +53,9 @@ set -eu
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-puzzle-$VERSION
+tar xvf $CWD/$PRGNAM-puzzle-$VERSION-src.tar.gz || tar xvf v$VERSION.tar.gz
+cd $PRGNAM-puzzle-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -63,11 +63,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Some patches from debian.
-for PATCH in $CWD/patches/*.diff ; do
- patch -p0 < $PATCH
-done
-
# Build
make PREFIX="/usr" OPTIMIZE="$SLKCFLAGS"
@@ -78,7 +73,7 @@ install -D $CWD/einstein.desktop $PKG/usr/share/applications/einstein.desktop
install -D $CWD/einstein.png $PKG/usr/share/pixmaps/einstein.png
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README $CWD/patches $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/einstein/einstein.info b/games/einstein/einstein.info
index d380471c97c9d..a7a2db838207b 100644
--- a/games/einstein/einstein.info
+++ b/games/einstein/einstein.info
@@ -1,8 +1,8 @@
PRGNAM="einstein"
-VERSION="2.0"
-HOMEPAGE="http://web.archive.org/web/20120928074117/http://games.flowix.com/en/index.html"
-DOWNLOAD="http://ftp.fi.debian.org/gentoo/distfiles/einstein-2.0-src.tar.gz"
-MD5SUM="c1d98e761c10af63f03462ead625f80c"
+VERSION="2.1.1"
+HOMEPAGE="https://github.com/lksj/einstein-puzzle"
+DOWNLOAD="https://github.com/lksj/einstein-puzzle/archive/v2.1.1.tar.gz"
+MD5SUM="1228a1fb0e90bc40d8b0b1737dcbc3c3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/games/einstein/patches/01_sdl.diff b/games/einstein/patches/01_sdl.diff
deleted file mode 100644
index 480a1a519d91f..0000000000000
--- a/games/einstein/patches/01_sdl.diff
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -ruN ../orig/einstein-2.0.dfsg.2/font.h ./font.h
---- ../orig/einstein-2.0.dfsg.2/font.h 2005-08-16 00:33:17.000000000 +0200
-+++ ./font.h 2007-08-31 10:00:33.000000000 +0200
-@@ -3,7 +3,7 @@
-
-
- #include <string>
--#include <SDL_ttf.h>
-+#include <SDL/SDL_ttf.h>
-
-
- class Font
-diff -ruN ../orig/einstein-2.0.dfsg.2/iconset.h ./iconset.h
---- ../orig/einstein-2.0.dfsg.2/iconset.h 2005-08-14 04:40:58.000000000 +0200
-+++ ./iconset.h 2007-08-31 09:51:37.000000000 +0200
-@@ -2,7 +2,7 @@
- #define __ICONSET_H__
-
-
--#include <SDL.h>
-+#include <SDL/SDL.h>
-
-
- class IconSet
-diff -ruN ../orig/einstein-2.0.dfsg.2/main.cpp ./main.cpp
---- ../orig/einstein-2.0.dfsg.2/main.cpp 2007-08-31 08:42:16.000000000 +0200
-+++ ./main.cpp 2007-08-31 10:06:07.000000000 +0200
-@@ -1,8 +1,8 @@
- #include <stdlib.h>
- #include <iostream>
--#include <SDL.h>
--#include <SDL_main.h>
--#include <SDL_ttf.h>
-+#include <SDL/SDL.h>
-+#include <SDL/SDL_main.h>
-+#include <SDL/SDL_ttf.h>
- #include "main.h"
- #include "utils.h"
- #include "storage.h"
-diff -ruN ../orig/einstein-2.0.dfsg.2/screen.cpp ./screen.cpp
---- ../orig/einstein-2.0.dfsg.2/screen.cpp 2005-09-24 07:17:30.000000000 +0200
-+++ ./screen.cpp 2007-08-31 09:52:07.000000000 +0200
-@@ -1,4 +1,4 @@
--#include <SDL.h>
-+#include <SDL/SDL.h>
- #include "screen.h"
- #include "exceptions.h"
- #include "unicode.h"
-diff -ruN ../orig/einstein-2.0.dfsg.2/screen.h ./screen.h
---- ../orig/einstein-2.0.dfsg.2/screen.h 2005-09-24 07:08:44.000000000 +0200
-+++ ./screen.h 2007-08-31 09:52:26.000000000 +0200
-@@ -2,7 +2,7 @@
- #define __SCREEN_H__
-
-
--#include "SDL.h"
-+#include "SDL/SDL.h"
- #include <vector>
- #include <list>
-
-diff -ruN ../orig/einstein-2.0.dfsg.2/sound.cpp ./sound.cpp
---- ../orig/einstein-2.0.dfsg.2/sound.cpp 2005-09-24 08:32:07.000000000 +0200
-+++ ./sound.cpp 2007-08-31 10:07:35.000000000 +0200
-@@ -1,7 +1,7 @@
- #include "sound.h"
-
- #include <iostream>
--#include <SDL_events.h>
-+#include <SDL/SDL_events.h>
- #include "resources.h"
-
-
-diff -ruN ../orig/einstein-2.0.dfsg.2/sound.h ./sound.h
---- ../orig/einstein-2.0.dfsg.2/sound.h 2005-09-24 08:24:20.000000000 +0200
-+++ ./sound.h 2007-08-31 10:01:28.000000000 +0200
-@@ -4,7 +4,7 @@
-
- #include <string>
- #include <map>
--#include <SDL_mixer.h>
-+#include <SDL/SDL_mixer.h>
-
-
- class Sound
-diff -ruN ../orig/einstein-2.0.dfsg.2/utils.h ./utils.h
---- ../orig/einstein-2.0.dfsg.2/utils.h 2005-08-14 04:40:58.000000000 +0200
-+++ ./utils.h 2007-08-31 09:52:39.000000000 +0200
-@@ -1,7 +1,7 @@
- #ifndef __UTILS_H__
- #define __UTILS_H__
-
--#include <SDL.h>
-+#include <SDL/SDL.h>
- #include <string>
- #ifdef WIN32
- #include <sys/time.h>
-diff -ruN ../orig/einstein-2.0.dfsg.2/widgets.h ./widgets.h
---- ../orig/einstein-2.0.dfsg.2/widgets.h 2005-09-24 08:11:11.000000000 +0200
-+++ ./widgets.h 2007-08-31 09:59:58.000000000 +0200
-@@ -4,7 +4,7 @@
- #include <string>
- #include <list>
- #include <set>
--#include <SDL.h>
-+#include <SDL/SDL.h>
- #include "font.h"
-
-
diff --git a/games/einstein/patches/02_prefix.diff b/games/einstein/patches/02_prefix.diff
deleted file mode 100644
index 3ba7833bb2478..0000000000000
--- a/games/einstein/patches/02_prefix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../orig/einstein-2.0.dfsg.2/main.cpp 2007-08-31 08:42:16.000000000 +0200
-+++ main.cpp 2007-08-31 10:39:20.000000000 +0200
-@@ -70,7 +70,7 @@
- #ifdef __APPLE__
- dirs.push_back(getResourcesPath(selfPath));
- #else
-- dirs.push_back(PREFIX L"/share/einstein/res");
-+ dirs.push_back("/usr" L"/share/einstein/res");
- dirs.push_back(fromMbcs(getenv("HOME")) + L"/.einstein/res");
- #endif
- #endif
diff --git a/games/einstein/patches/06_srand.diff b/games/einstein/patches/06_srand.diff
deleted file mode 100644
index fff82848bd4c7..0000000000000
--- a/games/einstein/patches/06_srand.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../orig/einstein-2.0/puzgen.cpp 2005-08-14 04:40:58.000000000 +0200
-+++ puzgen.cpp 2007-08-31 08:42:16.000000000 +0200
-@@ -313,6 +313,8 @@
-
- void genPuzzle(SolvedPuzzle &puzzle, Rules &rules)
- {
-+ srand(time(NULL));
-+
- for (int i = 0; i < PUZZLE_SIZE; i++) {
- for (int j = 0; j < PUZZLE_SIZE; j++)
- puzzle[i][j] = j + 1;
diff --git a/games/einstein/patches/07_long.diff b/games/einstein/patches/07_long.diff
deleted file mode 100644
index 76a35c42880ed..0000000000000
--- a/games/einstein/patches/07_long.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- ../orig/einstein-2.0/formatter.cpp 2005-08-14 04:40:58.000000000 +0200
-+++ formatter.cpp 2007-08-31 08:42:16.000000000 +0200
-@@ -58,7 +58,7 @@
- if ((c.type == INT_ARG) || (c.type == STRING_ARG) ||
- (c.type == FLOAT_ARG) || (c.type == DOUBLE_ARG))
- {
-- int no = (int)c.data;
-+ long no = (long)c.data;
- args[no - 1] = c.type;
- }
- }
-@@ -123,7 +123,7 @@
- std::wstring Formatter::format(std::vector<ArgValue*> &argValues) const
- {
- std::wstring s;
-- int no;
-+ long no;
-
- for (int i = 0; i < commandsCnt; i++) {
- Command *cmd = &commands[i];
-@@ -135,8 +135,8 @@
-
- case STRING_ARG:
- case INT_ARG:
-- no = (int)cmd->data - 1;
-- if (no < (int)argValues.size())
-+ no = (long)cmd->data - 1;
-+ if (no < (long)argValues.size())
- s += argValues[no]->format(cmd);
- break;
-
diff --git a/games/einstein/patches/08_gcc43.diff b/games/einstein/patches/08_gcc43.diff
deleted file mode 100644
index c0c7a80fc71cc..0000000000000
--- a/games/einstein/patches/08_gcc43.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Patch by Martin Michlmayr <tbm@cyrius.com> via bug 421127.
-
---- ../orig/einstein-2.0.dfsg.2/convert.h 2005-08-14 04:40:58.000000000 +0200
-+++ convert.h 2007-08-31 11:33:06.000000000 +0200
-@@ -5,6 +5,7 @@
- #include <iostream>
- #include <sstream>
- #include <string>
-+#include <typeinfo>
-
- #include "exceptions.h"
- #include "unicode.h"
diff --git a/games/einstein/patches/09_colors.diff b/games/einstein/patches/09_colors.diff
deleted file mode 100644
index 5f1ddcebc36c6..0000000000000
--- a/games/einstein/patches/09_colors.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../orig/einstein-2.0.dfsg.2/descr.cpp 2007-08-31 11:02:45.000000000 +0200
-+++ descr.cpp 2007-08-31 13:48:19.000000000 +0200
-@@ -11,6 +11,7 @@
- #include "convert.h"
- #include "utils.h"
- #include "tokenizer.h"
-+#include "storage.h"
-
-
- #define WIDTH 600
-@@ -259,7 +260,10 @@
- {
- if (0 < line.length()) {
- page->add(new Label(&font, offsetX, offsetY + curPosY,
-- 255,255,255, line, false));
-+ getStorage()->get(L"text_red", 0),
-+ getStorage()->get(L"text_green", 0),
-+ getStorage()->get(L"text_blue", 100),
-+ line, false));
- line.clear();
- curPosY += 10 + charHeight;
- lineWidth = 0;
diff --git a/games/einstein/patches/10_gcc43.diff b/games/einstein/patches/10_gcc43.diff
deleted file mode 100644
index f378500531e81..0000000000000
--- a/games/einstein/patches/10_gcc43.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/einstein-2.0.dfsg.2/unicode.cpp ./unicode.cpp
---- ../orig/einstein-2.0.dfsg.2/unicode.cpp 2005-08-14 04:40:58.000000000 +0200
-+++ ./unicode.cpp 2008-01-26 11:49:10.000000000 +0100
-@@ -1,5 +1,6 @@
- #include <wchar.h>
- #include <stdlib.h>
-+#include <string.h>
- #ifdef WIN32
- #include <windows.h>
- #endif
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-23 06:20:36 +0000