commit: aa3ffb8396032ddd22b68304bdc83d117bd94fbd
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 8 21:26:38 2024 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Thu Aug 8 21:31:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3ffb83
media-video/aegisub: Fix build with icu 75
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
...aegisub-9999.ebuild => aegisub-3.3.3-r1.ebuild} | 7 +++---
media-video/aegisub/aegisub-9999.ebuild | 7 +++---
.../files/3.3.3/aegisub-3.3.3-support-icu-75.patch | 26 ++++++++++++++++++++++
3 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/media-video/aegisub/aegisub-9999.ebuild
b/media-video/aegisub/aegisub-3.3.3-r1.ebuild
similarity index 96%
copy from media-video/aegisub/aegisub-9999.ebuild
copy to media-video/aegisub/aegisub-3.3.3-r1.ebuild
index 208e6b0e5adb..530606341ba5 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-3.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -75,11 +75,12 @@ PATCHES=(
"${FILESDIR}/3.3.3/${PN}-3.3.3-support-system-gtest.patch"
"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-tests_luarocks_lua_version.patch"
"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost-181-build.patch"
+ "${FILESDIR}/3.3.3/${PN}-3.3.3-support-icu-75.patch"
)
aegisub_check_compiler() {
- if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++14; then
- die "Your compiler lacks C++14 support."
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++17; then
+ die "Your compiler lacks C++17 support."
fi
}
diff --git a/media-video/aegisub/aegisub-9999.ebuild
b/media-video/aegisub/aegisub-9999.ebuild
index 208e6b0e5adb..530606341ba5 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -75,11 +75,12 @@ PATCHES=(
"${FILESDIR}/3.3.3/${PN}-3.3.3-support-system-gtest.patch"
"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-tests_luarocks_lua_version.patch"
"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost-181-build.patch"
+ "${FILESDIR}/3.3.3/${PN}-3.3.3-support-icu-75.patch"
)
aegisub_check_compiler() {
- if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++14; then
- die "Your compiler lacks C++14 support."
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++17; then
+ die "Your compiler lacks C++17 support."
fi
}
diff --git a/media-video/aegisub/files/3.3.3/aegisub-3.3.3-support-icu-75.patch
b/media-video/aegisub/files/3.3.3/aegisub-3.3.3-support-icu-75.patch
new file mode 100644
index 000000000000..0287527117ba
--- /dev/null
+++ b/media-video/aegisub/files/3.3.3/aegisub-3.3.3-support-icu-75.patch
@@ -0,0 +1,26 @@
+From 5ef040ffe2fc743ecff0d744b82a24e5c9b521a8 Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <[email protected]>
+Date: Thu, 8 Aug 2024 17:21:31 -0400
+Subject: [PATCH] Fix build with icu 75
+
+Signed-off-by: Nick Sarnie <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 197d0a788..02cb56052 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -144,7 +144,7 @@ AS_IF([test x$enable_compiler_flags != xno], [
+ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter
-fno-strict-aliasing"
+
+ # For mac compiler which still stuck on c++98
+- AC_CXX_FLAG([-std=c++14])
++ AC_CXX_FLAG([-std=c++17])
+
+ # -O* messes with debugging.
+ AS_IF([test x$enable_debug = xyes], [
+--
+2.45.2
+
