diff options
| author | spaceman <spaceman@antispaceman.com> | 2015-06-17 16:11:21 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-06-17 16:11:21 +0700 |
| commit | e7edfef3e9b6430a214c031f1a74053741cef365 (patch) | |
| tree | 113b882caa81aaa2f9d84730931ce27f36bd3ccd | |
| parent | 45e97bb0e4ab838a33ab8460b4f5c1b439c03eb6 (diff) | |
games/openttd: Fix build.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | games/openttd/README | 2 | ||||
| -rw-r--r-- | games/openttd/openttd.SlackBuild | 6 | ||||
| -rw-r--r-- | games/openttd/openttd.patch | 13 |
3 files changed, 17 insertions, 4 deletions
diff --git a/games/openttd/README b/games/openttd/README index 6144b4c8228f..17d7dbb39d44 100644 --- a/games/openttd/README +++ b/games/openttd/README @@ -25,5 +25,3 @@ open source data files will not be used by the script and OpenTTD. Or, the user can keep OPENDATA=YES in which case the open source data files will be included giving the user the ability to choose which data file set (original Windows or open source data files) to use within the game options menu. - -See the readme.txt or http://wiki.openttd.org for more information. diff --git a/games/openttd/openttd.SlackBuild b/games/openttd/openttd.SlackBuild index 5685daeefddd..c18f120fff87 100644 --- a/games/openttd/openttd.SlackBuild +++ b/games/openttd/openttd.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=openttd VERSION=${VERSION:-1.4.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} OPENGFX=0.5.0 @@ -85,7 +85,9 @@ find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +patch -p0 < $CWD/openttd.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/games/openttd/openttd.patch b/games/openttd/openttd.patch new file mode 100644 index 000000000000..437d5230b57d --- /dev/null +++ b/games/openttd/openttd.patch @@ -0,0 +1,13 @@ +--- src/fontcache.cpp.orig 2015-01-31 17:48:10.000000000 +0100 ++++ src/fontcache.cpp 2015-01-31 17:49:31.000000000 +0100 +@@ -527,8 +527,8 @@ + aa = (slot->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY); + + /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */ +- int width = max(1, slot->bitmap.width + (this->fs == FS_NORMAL)); +- int height = max(1, slot->bitmap.rows + (this->fs == FS_NORMAL)); ++ int width = max(1u, slot->bitmap.width + (this->fs == FS_NORMAL)); ++ int height = max(1u, slot->bitmap.rows + (this->fs == FS_NORMAL)); + + /* Limit glyph size to prevent overflows later on. */ + if (width > 256 || height > 256) usererror("Font glyph is too large"); |