[packages/openttd] - up to 1.11.2
mrozowik
mrozowik at pld-linux.org
Thu Jun 10 17:44:54 CEST 2021
commit d1862a9a43c613aa0569535b80095e5bce8c0761
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date: Thu Jun 10 15:44:34 2021 +0000
- up to 1.11.2
openttd-home_etc.patch | 67 --------------------------------------------------
openttd-icu64.patch | 31 -----------------------
openttd-libiconv.patch | 10 --------
openttd.spec | 6 +++--
4 files changed, 4 insertions(+), 110 deletions(-)
---
diff --git a/openttd.spec b/openttd.spec
index 3a78899..7767e70 100644
--- a/openttd.spec
+++ b/openttd.spec
@@ -1,14 +1,15 @@
Summary: An open source reimplementation of the Microprose game "Transport Tycoon Deluxe"
Summary(pl.UTF-8): Otwarta reimplementacja gry Transport Tycoon Deluxe
Name: openttd
-Version: 1.11.1
+Version: 1.11.2
Release: 1
License: GPL v2+
Group: X11/Applications/Games
Source0: https://cdn.openttd.org/openttd-releases/%{version}/%{name}-%{version}-source.tar.xz
-# Source0-md5: f655453d1c9eee54415e1193a4ee499d
+# Source0-md5: 77ff800d6682f86201a10c23f19a3dcf
Source1: %{name}.desktop
Source2: %{name}-server.desktop
+Patch0: %{name}-create-grf.patch
URL: http://www.openttd.org/
BuildRequires: SDL2-devel
BuildRequires: fontconfig-devel
@@ -73,6 +74,7 @@ graficzny klient OpenTTD również zawiera taką funkcjonalność.
%prep
%setup -q
+%patch0 -p1
# Let's pldize
find src/lang/ -type f -exec %{__sed} -i 's/:Unix/:PLD Linux/' \{\} \;
diff --git a/openttd-home_etc.patch b/openttd-home_etc.patch
deleted file mode 100644
index 87bd3b4..0000000
--- a/openttd-home_etc.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -dur -x '*.orig' -x '*.rej' -x '*~' openttd-1.4.0.orig/config.lib openttd-1.4.0/config.lib
---- openttd-1.4.0.orig/config.lib 2014-04-01 20:37:07.000000000 +0200
-+++ openttd-1.4.0/config.lib 2014-04-08 19:28:02.013554008 +0200
-@@ -69,6 +69,7 @@
- with_allegro="1"
- with_sdl="1"
- with_cocoa="1"
-+ with_home_etc="1"
- with_zlib="1"
- with_lzma="1"
- with_lzo2="1"
-@@ -144,6 +145,7 @@
- with_allegro
- with_sdl
- with_cocoa
-+ with_home_etc
- with_zlib
- with_lzma
- with_lzo2
-@@ -333,6 +335,9 @@
- --without-cocoa) with_cocoa="0";;
- --with-cocoa=*) with_cocoa="$optarg";;
-
-+ --with-home-etc) with_home_etc="1";;
-+ --without-home-etc) with_home_etc="0";;
-+
- --with-zlib) with_zlib="2";;
- --without-zlib) with_zlib="0";;
- --with-zlib=*) with_zlib="$optarg";;
-@@ -1651,6 +1656,11 @@
- fi
- fi
-
-+ if [ "$with_home_etc" != 0 ]; then
-+ CFLAGS="$CFLAGS -DWITH_HOME_ETC"
-+ LIBS="$LIBS -lhome_etc"
-+ fi
-+
- if [ "$with_zlib" != "0" ]; then
- if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then
- LIBS="$LIBS $zlib"
-diff -dur -x '*.orig' -x '*.rej' -x '*~' openttd-1.4.0.orig/src/fileio.cpp openttd-1.4.0/src/fileio.cpp
---- openttd-1.4.0.orig/src/fileio.cpp 2014-04-01 20:37:03.000000000 +0200
-+++ openttd-1.4.0/src/fileio.cpp 2014-04-08 19:30:30.296888687 +0200
-@@ -32,6 +32,10 @@
- #include "basedir.h"
- #endif
-
-+#ifdef HOME_ETC
-+#include <home_etc.h>
-+#endif
-+
- /** Size of the #Fio data buffer. */
- #define FIO_BUFFER_SIZE 512
-
-@@ -1103,7 +1107,11 @@
- * or at least before something else touches the environment
- * variables in any way. It can also contain all kinds of
- * unvalidated data we rather not want internally. */
-+#ifdef HOME_ETC
-+ const char *homedir = _HEdir;
-+#else
- const char *homedir = getenv("HOME");
-+#endif
- if (homedir != NULL) {
- homedir = strndup(homedir, MAX_PATH);
- }
diff --git a/openttd-icu64.patch b/openttd-icu64.patch
deleted file mode 100644
index 931aacd..0000000
--- a/openttd-icu64.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- openttd-1.6.1/src/language.h~ 2019-04-13 22:53:25.090428421 +0200
-+++ openttd-1.6.1/src/language.h 2019-04-13 22:46:25.201737686 +0200
-@@ -111,7 +111,7 @@
- extern const LanguageMetadata *_current_language;
-
- #ifdef WITH_ICU_SORT
--extern Collator *_current_collator;
-+extern icu::Collator *_current_collator;
- #endif /* WITH_ICU_SORT */
-
- bool ReadLanguagePack(const LanguageMetadata *lang);
---- openttd-1.6.1/src/strings.cpp~ 2019-04-13 22:53:26.100481421 +0200
-+++ openttd-1.6.1/src/strings.cpp 2019-04-13 22:51:17.253720586 +0200
-@@ -52,7 +52,7 @@
- TextDirection _current_text_dir; ///< Text direction of the currently selected language.
-
- #ifdef WITH_ICU_SORT
--Collator *_current_collator = NULL; ///< Collator for the language currently in use.
-+icu::Collator *_current_collator = NULL; ///< Collator for the language currently in use.
- #endif /* WITH_ICU_SORT */
-
- static uint64 _global_string_params_data[20]; ///< Global array of string parameters. To access, use #SetDParam.
-@@ -1801,7 +1801,7 @@
-
- /* Create a collator instance for our current locale. */
- UErrorCode status = U_ZERO_ERROR;
-- _current_collator = Collator::createInstance(Locale(_current_language->isocode), status);
-+ _current_collator = icu::Collator::createInstance(icu::Locale(_current_language->isocode), status);
- /* Sort number substrings by their numerical value. */
- if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status);
- /* Avoid using the collator if it is not correctly set. */
diff --git a/openttd-libiconv.patch b/openttd-libiconv.patch
deleted file mode 100644
index 28cc5b8..0000000
--- a/openttd-libiconv.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- openttd-0.7.0/config.lib~ 2009-04-03 09:49:26.000000000 +0200
-+++ openttd-0.7.0/config.lib 2009-04-03 09:50:32.000000000 +0200
-@@ -1333,7 +1333,6 @@
- if [ "$with_iconv" != "0" ]; then
- CFLAGS="$CFLAGS -DWITH_ICONV"
- if [ "$link_to_iconv" = "yes" ]; then
-- LIBS="$LIBS -liconv"
- if [ "$with_iconv" != "2" ]; then
- CFLAGS="$CFLAGS -I$with_iconv/include"
- LIBS="$LIBS -L$with_iconv/lib"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openttd.git/commitdiff/d1862a9a43c613aa0569535b80095e5bce8c0761
More information about the pld-cvs-commit
mailing list