gentoo resync : 29.06.2021

4 files changed, 29 insertions, 118 deletions

diff --git a/games-simulation/openttd/files/openttd-1.10.3-icu68.patch b/games-simulation/openttd/files/openttd-1.10.3-icu68.patch
deleted file mode 100644
index 9596ab66606a..000000000000
--- a/games-simulation/openttd/files/openttd-1.10.3-icu68.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 842e0ed5e3220a0e5ab19e7b0892c9c72c230ae7 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 30 Oct 2020 18:45:20 +0100
-Subject: [PATCH] Fix: build with icu-68.1
-
-icu-68.1 removed public macro definitions for TRUE and FALSE
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/gfx_layout.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp
-index 584a71273..ebd1afaa8 100644
---- a/src/gfx_layout.cpp
-+++ b/src/gfx_layout.cpp
-@@ -116,7 +116,7 @@ void Font::getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const
- 
- le_bool Font::getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const
- {
--	return FALSE;
-+	return false;
- }
- 
- /**
--- 
-2.29.2
-
diff --git a/games-simulation/openttd/files/openttd-1.11.2_dont_compress_man.patch b/games-simulation/openttd/files/openttd-1.11.2_dont_compress_man.patch
new file mode 100644
index 000000000000..0dfef300dc5e
--- /dev/null
+++ b/games-simulation/openttd/files/openttd-1.11.2_dont_compress_man.patch
@@ -0,0 +1,29 @@
+From 985c2f4937573ce80add1aa84e4e57148c0a1815 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sun, 23 May 2021 17:39:53 +0300
+Subject: [PATCH] Don't compress man file on install
+
+---
+ cmake/InstallAndPackage.cmake | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/cmake/InstallAndPackage.cmake b/cmake/InstallAndPackage.cmake
+index 9b7d65788..b5b23c95f 100644
+--- a/cmake/InstallAndPackage.cmake
++++ b/cmake/InstallAndPackage.cmake
+@@ -51,11 +51,10 @@ if(OPTION_INSTALL_FHS)
+     install(CODE
+             "
+                 execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${MAN_SOURCE_FILE} ${MAN_BINARY_FILE})
+-                execute_process(COMMAND gzip -9 -n -f ${MAN_BINARY_FILE})
+             "
+             COMPONENT manual)
+     install(FILES
+-                    ${MAN_BINARY_FILE}.gz
++                    ${MAN_BINARY_FILE}
+             DESTINATION ${MAN_DESTINATION_DIR}/man6
+             COMPONENT manual)
+ endif()
+-- 
+2.26.3
+
diff --git a/games-simulation/openttd/files/openttd-1.9.0-cflags.patch b/games-simulation/openttd/files/openttd-1.9.0-cflags.patch
deleted file mode 100644
index 86eb16168dbc..000000000000
--- a/games-simulation/openttd/files/openttd-1.9.0-cflags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6d72f33efe9f911d1427795a06c13d9dcd6fa222 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 3 Apr 2019 14:11:42 +0200
-Subject: [PATCH] Don't mess with our CFLAGS
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- config.lib | 18 ------------------
- 1 file changed, 18 deletions(-)
-
-diff --git a/config.lib b/config.lib
-index f65aaa535..7789c0bea 100644
---- a/config.lib
-+++ b/config.lib
-@@ -1499,11 +1499,6 @@ make_cflags_and_ldflags() {
- 		# No debug, add default stuff
- 		OBJS_SUBDIR="release"
- 
--		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"
- 
-@@ -1511,14 +1506,6 @@ make_cflags_and_ldflags() {
- 		if [ $enable_debug -ge 1 ]; then
- 			CFLAGS="$CFLAGS -g -D_DEBUG"
- 		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
-@@ -1543,11 +1530,6 @@ make_cflags_and_ldflags() {
- 		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
--- 
-2.21.0
-
diff --git a/games-simulation/openttd/files/openttd-1.9.0-dont_compress_manpages.patch b/games-simulation/openttd/files/openttd-1.9.0-dont_compress_manpages.patch
deleted file mode 100644
index d151dbf36931..000000000000
--- a/games-simulation/openttd/files/openttd-1.9.0-dont_compress_manpages.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From da54b0365997181979d5c7131e99957424d4a167 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 3 Apr 2019 13:53:50 +0200
-Subject: [PATCH] Do not compress man-pages by default
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- Makefile.bundle.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Makefile.bundle.in b/Makefile.bundle.in
-index eaf7134dd..1c2523181 100644
---- a/Makefile.bundle.in
-+++ b/Makefile.bundle.in
-@@ -77,7 +77,6 @@ endif
- ifdef MAN_DIR
- 	$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
- 	$(Q)cp "$(ROOT_DIR)/docs/openttd.6"       "$(BUNDLE_DIR)/man/"
--	$(Q)gzip -9 "$(BUNDLE_DIR)/man/openttd.6"
- endif
- 	$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
- 	$(Q)cp "$(ROOT_DIR)/media/openttd."*.png  "$(BUNDLE_DIR)/media/"
-@@ -219,7 +218,7 @@ endif
- ifdef MAN_DIR
- ifndef DO_NOT_INSTALL_MAN
- 	$(Q)install -d "$(INSTALL_MAN_DIR)"
--	$(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6.gz"
-+	$(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6"
- endif
- endif
- ifdef MENU_DIR
--- 
-2.21.0
-