diff options
| author | Nixpkgs Monitor <none@none> | 2015-06-07 14:57:29 +0200 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2015-06-07 15:43:53 +0200 |
| commit | c25027f2106ab153d71cab1f4db2a60bcba9e276 (patch) | |
| tree | 2c90a8c118b361274ca4551669b677be88fb7990 | |
| parent | ab8561e3e53081114f0e168aebfa8ce17980faa2 (diff) | |
| download | nixlib-c25027f2106ab153d71cab1f4db2a60bcba9e276.tar nixlib-c25027f2106ab153d71cab1f4db2a60bcba9e276.tar.gz nixlib-c25027f2106ab153d71cab1f4db2a60bcba9e276.tar.bz2 nixlib-c25027f2106ab153d71cab1f4db2a60bcba9e276.tar.lz nixlib-c25027f2106ab153d71cab1f4db2a60bcba9e276.tar.xz nixlib-c25027f2106ab153d71cab1f4db2a60bcba9e276.tar.zst nixlib-c25027f2106ab153d71cab1f4db2a60bcba9e276.zip | |
openttd: update from 1.4.4 to 1.5.1
| -rw-r--r-- | pkgs/games/openttd/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/games/openttd/fix-freetype-1.4.4.patch | 31 |
2 files changed, 2 insertions, 39 deletions
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index afef33cce2d3..903466524fb7 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.4.4"; + version = "1.5.1"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "1xykqb5bx2dzffxhvm4cbn1nf72f7zcdz8hy25i5wky4hfw31x3h"; + sha256 = "0jcg8b0jbiw5kg7rqqw74hdh675r08pgm95grk9ch4z2gpjpd3n9"; }; buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; @@ -17,12 +17,6 @@ stdenv.mkDerivation rec { "--without-liblzo2" ]; - # NOTE: Remove this patch in 1.4.5 or greater - patches = [ - # Adapted from svn r27079 - ./fix-freetype-1.4.4.patch - ]; - makeFlags = "INSTALL_PERSONAL_DIR="; postInstall = '' diff --git a/pkgs/games/openttd/fix-freetype-1.4.4.patch b/pkgs/games/openttd/fix-freetype-1.4.4.patch deleted file mode 100644 index 37706ce05c96..000000000000 --- a/pkgs/games/openttd/fix-freetype-1.4.4.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/fontcache.cpp b/src/fontcache.cpp -=================================================================== ---- a/src/fontcache.cpp -+++ b/src/fontcache.cpp -@@ -537,6 +537,6 @@ - - /* 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)); -+ unsigned int width = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL)); -+ unsigned int height = max(1U, (unsigned int)slot->bitmap.rows + (this->fs == FS_NORMAL)); - - /* Limit glyph size to prevent overflows later on. */ -@@ -554,6 +554,6 @@ - /* Draw shadow for medium size */ - if (this->fs == FS_NORMAL && !aa) { -- for (int y = 0; y < slot->bitmap.rows; y++) { -- for (int x = 0; x < slot->bitmap.width; x++) { -+ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { -+ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { - if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { - sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR; -@@ -564,6 +564,6 @@ - } - -- for (int y = 0; y < slot->bitmap.rows; y++) { -- for (int x = 0; x < slot->bitmap.width; x++) { -+ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { -+ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { - if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { - sprite.data[x + y * sprite.width].m = FACE_COLOUR; |