commit: 33c126c22038c8673048713e1816949ae0383522 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue Apr 16 17:43:01 2019 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Tue Apr 16 19:56:57 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c126c2
games-simulation/openttd: remove unused patches Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11709 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> .../openttd/files/openttd-1.6.0-cflags.patch | 42 --------- .../openttd/files/openttd-1.8.0-icu61.patch | 45 ---------- .../openttd/files/openttd-1.8.0-icu62.patch | 99 ---------------------- 3 files changed, 186 deletions(-) diff --git a/games-simulation/openttd/files/openttd-1.6.0-cflags.patch b/games-simulation/openttd/files/openttd-1.6.0-cflags.patch deleted file mode 100644 index bb7f768b379..00000000000 --- a/games-simulation/openttd/files/openttd-1.6.0-cflags.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- openttd-1.4.4/config.lib -+++ openttd-1.4.4/config.lib -@@ -1450,12 +1450,6 @@ - CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS" - LDFLAGS="$LDFLAGS -noixemul" - fi -- -- if [ "$enable_profiling" = "0" ]; then -- # -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible) -- CFLAGS="-fomit-frame-pointer $CFLAGS" -- fi -- CFLAGS="-O2 $CFLAGS" - else - OBJS_SUBDIR="debug" - -@@ -1466,14 +1460,6 @@ - CFLAGS="$CFLAGS -G0" - fi - fi -- if [ $enable_debug -ge 2 ]; then -- CFLAGS="$CFLAGS -fno-inline" -- fi -- if [ $enable_debug -ge 3 ]; then -- CFLAGS="$CFLAGS -O0" -- else -- CFLAGS="$CFLAGS -O2" -- fi - fi - - if [ $enable_debug -le 2 ]; then -@@ -1498,11 +1484,6 @@ - CFLAGS="$CFLAGS -fno-expensive-optimizations" - fi - -- if [ "$enable_profiling" != "0" ]; then -- CFLAGS="$CFLAGS -pg" -- LDFLAGS="$LDFLAGS -pg" -- fi -- - if [ "$with_threads" = "0" ]; then - CFLAGS="$CFLAGS -DNO_THREADS" - fi diff --git a/games-simulation/openttd/files/openttd-1.8.0-icu61.patch b/games-simulation/openttd/files/openttd-1.8.0-icu61.patch deleted file mode 100644 index e4143d82f67..00000000000 --- a/games-simulation/openttd/files/openttd-1.8.0-icu61.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 19076c24c1f3baf2a22d1fa832d5688216cf54a3 Mon Sep 17 00:00:00 2001 -From: Charles Pigott <charlespig...@googlemail.com> -Date: Sun, 8 Apr 2018 01:06:18 +0100 -Subject: [PATCH] Fix #6690: Compilation with ICU 61 - ---- - src/language.h | 2 +- - src/strings.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/language.h b/src/language.h -index d33ba81892..ec241dbd8c 100644 ---- a/src/language.h -+++ b/src/language.h -@@ -105,7 +105,7 @@ extern LanguageList _languages; - 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); -diff --git a/src/strings.cpp b/src/strings.cpp -index 1c539d9343..fd7420259a 100644 ---- a/src/strings.cpp -+++ b/src/strings.cpp -@@ -52,7 +52,7 @@ const LanguageMetadata *_current_language = NULL; ///< The currently loaded lang - 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. -@@ -1795,7 +1795,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang) - - /* 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/games-simulation/openttd/files/openttd-1.8.0-icu62.patch b/games-simulation/openttd/files/openttd-1.8.0-icu62.patch deleted file mode 100644 index 9ba907fa47e..00000000000 --- a/games-simulation/openttd/files/openttd-1.8.0-icu62.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 55bf7628e299ef2c143e9ac97e87817b5eda3239 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin <stefan.stro...@gmail.com> -Date: Wed, 19 Sep 2018 23:52:10 +0300 -Subject: [PATCH] Fix #6854: Compilation with ICU 62 - ---- - src/gfx_layout.cpp | 18 +++++++++--------- - src/gfx_layout.h | 2 +- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp -index f5463d401..e13ece0e7 100644 ---- a/src/gfx_layout.cpp -+++ b/src/gfx_layout.cpp -@@ -126,7 +126,7 @@ static size_t AppendToBuffer(UChar *buff, const UChar *buffer_last, WChar c) - * Wrapper for doing layouts with ICU. - */ - class ICUParagraphLayout : public AutoDeleteSmallVector<ParagraphLayouter::Line *, 4>, public ParagraphLayouter { -- ParagraphLayout *p; ///< The actual ICU paragraph layout. -+ icu::ParagraphLayout *p; ///< The actual ICU paragraph layout. - public: - /** Helper for GetLayouter, to get the right type. */ - typedef UChar CharType; -@@ -135,10 +135,10 @@ public: - - /** Visual run contains data about the bit of text with the same font. */ - class ICUVisualRun : public ParagraphLayouter::VisualRun { -- const ParagraphLayout::VisualRun *vr; ///< The actual ICU vr. -+ const icu::ParagraphLayout::VisualRun *vr; ///< The actual ICU vr. - - public: -- ICUVisualRun(const ParagraphLayout::VisualRun *vr) : vr(vr) { } -+ ICUVisualRun(const icu::ParagraphLayout::VisualRun *vr) : vr(vr) { } - - const Font *GetFont() const { return (const Font*)vr->getFont(); } - int GetGlyphCount() const { return vr->getGlyphCount(); } -@@ -150,10 +150,10 @@ public: - - /** A single line worth of VisualRuns. */ - class ICULine : public AutoDeleteSmallVector<ICUVisualRun *, 4>, public ParagraphLayouter::Line { -- ParagraphLayout::Line *l; ///< The actual ICU line. -+ icu::ParagraphLayout::Line *l; ///< The actual ICU line. - - public: -- ICULine(ParagraphLayout::Line *l) : l(l) -+ ICULine(icu::ParagraphLayout::Line *l) : l(l) - { - for (int i = 0; i < l->countRuns(); i++) { - *this->Append() = new ICUVisualRun(l->getVisualRun(i)); -@@ -173,13 +173,13 @@ public: - } - }; - -- ICUParagraphLayout(ParagraphLayout *p) : p(p) { } -+ ICUParagraphLayout(icu::ParagraphLayout *p) : p(p) { } - ~ICUParagraphLayout() { delete p; } - void Reflow() { p->reflow(); } - - ParagraphLayouter::Line *NextLine(int max_width) - { -- ParagraphLayout::Line *l = p->nextLine(max_width); -+ icu::ParagraphLayout::Line *l = p->nextLine(max_width); - return l == NULL ? NULL : new ICULine(l); - } - }; -@@ -196,7 +196,7 @@ static ParagraphLayouter *GetParagraphLayout(UChar *buff, UChar *buff_end, FontM - } - - /* Fill ICU's FontRuns with the right data. */ -- FontRuns runs(fontMapping.Length()); -+ icu::FontRuns runs(fontMapping.Length()); - for (FontMap::iterator iter = fontMapping.Begin(); iter != fontMapping.End(); iter++) { - runs.add(iter->second, iter->first); - } -@@ -204,7 +204,7 @@ static ParagraphLayouter *GetParagraphLayout(UChar *buff, UChar *buff_end, FontM - LEErrorCode status = LE_NO_ERROR; - /* ParagraphLayout does not copy "buff", so it must stay valid. - * "runs" is copied according to the ICU source, but the documentation does not specify anything, so this might break somewhen. */ -- ParagraphLayout *p = new ParagraphLayout(buff, length, &runs, NULL, NULL, NULL, _current_text_dir == TD_RTL ? UBIDI_DEFAULT_RTL : UBIDI_DEFAULT_LTR, false, status); -+ icu::ParagraphLayout *p = new icu::ParagraphLayout(buff, length, &runs, NULL, NULL, NULL, _current_text_dir == TD_RTL ? UBIDI_DEFAULT_RTL : UBIDI_DEFAULT_LTR, false, status); - if (status != LE_NO_ERROR) { - delete p; - return NULL; -diff --git a/src/gfx_layout.h b/src/gfx_layout.h -index 0a21d9b0c..028f5be63 100644 ---- a/src/gfx_layout.h -+++ b/src/gfx_layout.h -@@ -21,7 +21,7 @@ - - #ifdef WITH_ICU_LAYOUT - #include "layout/ParagraphLayout.h" --#define ICU_FONTINSTANCE : public LEFontInstance -+#define ICU_FONTINSTANCE : public icu::LEFontInstance - #else /* WITH_ICU_LAYOUT */ - #define ICU_FONTINSTANCE - #endif /* WITH_ICU_LAYOUT */ --- -2.19.0 -
