diff options
| author | Boyuan Yang <byang@debian.org> | 2022-04-26 22:26:52 -0400 |
|---|---|---|
| committer | Boyuan Yang <byang@debian.org> | 2022-04-26 22:41:08 -0400 |
| commit | d7196da0393914780af7d52423a257bc37dfbf22 (patch) | |
| tree | 139e75ed0fc5bfc0acfafb60ec0389a60824835f | |
| parent | 2d312a93059d991a6aa251d82af175909e5ccb5c (diff) | |
update patch to fix ftbfs
| -rw-r--r-- | debian/patches/refresh-libboost-searching-m4macros.patch | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/debian/patches/refresh-libboost-searching-m4macros.patch b/debian/patches/refresh-libboost-searching-m4macros.patch index ab0f117..8d05d85 100644 --- a/debian/patches/refresh-libboost-searching-m4macros.patch +++ b/debian/patches/refresh-libboost-searching-m4macros.patch @@ -1,11 +1,15 @@ From: Boyuan Yang <byang@debian.org> Date: Tue, 26 Apr 2022 22:16:44 -0400 -Subject: Refresh libboost searching m4macros +Subject: Use updated libboost searching m4macros Refresh m4 files under m4macros dir to fix libboost 1.75+ detection. +Also update configure.ac to use new AX_BOOST macros. +libboost macro update has been forwarded. + Forwarded: https://github.com/Aegisub/Aegisub/pull/235 --- + configure.ac | 13 +- m4macros/ac_agi.m4 | 14 +- m4macros/ax_boost_base.m4 | 433 +++++++++++++------------- m4macros/ax_boost_chrono.m4 | 118 ++++++++ @@ -16,7 +20,7 @@ Forwarded: https://github.com/Aegisub/Aegisub/pull/235 m4macros/ax_boost_thread.m4 | 187 ++++++++++++ m4macros/ax_check_gl.m4 | 657 ++++++++++++++++++++++++++++++++-------- m4macros/ax_pthread.m4 | 85 ++++-- - 10 files changed, 1599 insertions(+), 364 deletions(-) + 11 files changed, 1606 insertions(+), 370 deletions(-) create mode 100644 m4macros/ax_boost_chrono.m4 create mode 100644 m4macros/ax_boost_filesystem.m4 create mode 100644 m4macros/ax_boost_locale.m4 @@ -24,6 +28,37 @@ Forwarded: https://github.com/Aegisub/Aegisub/pull/235 create mode 100644 m4macros/ax_boost_system.m4 create mode 100644 m4macros/ax_boost_thread.m4 +diff --git a/configure.ac b/configure.ac +index 62ee5a1..0c0d13a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,6 +25,7 @@ AC_INIT([Aegisub], [aegisub_version],, [aegisub]) + : ${CXXFLAGS=""} + AC_CONFIG_SRCDIR([src/main.cpp]) + AC_CONFIG_HEADER([acconf.h]) ++AC_CONFIG_MACRO_DIRS([m4macros]) + AC_GNU_SOURCE + AC_CANONICAL_HOST + +@@ -217,12 +218,12 @@ FONTCONFIG_CONF_DIR=$($PKG_CONFIG --variable=confdir fontconfig) + AC_SUBST(FONTCONFIG_CONF_DIR) + + AX_BOOST_BASE([boost_required_version]) +-AX_BOOST_LIB(chrono, BOOST_CHRONO_LIB, [chrono.hpp], [boost::chrono::system_clock::time_point time]) +-AX_BOOST_LIB(filesystem, BOOST_FILESYSTEM_LIB, [filesystem/path.hpp], [boost::filesystem::path("data.txt")]) +-AX_BOOST_LIB(locale, BOOST_LOCALE_LIB, [locale.hpp], [boost::locale::generator{}]) +-AX_BOOST_LIB(regex, BOOST_REGEX_LIB, [regex.hpp], [boost::regex{}]) +-AX_BOOST_LIB(system, BOOST_SYSTEM_LIB, [system/error_code.hpp], [boost::system::system_category]) +-AX_BOOST_LIB(thread, BOOST_THREAD_LIB, [thread/thread.hpp], [boost::thread_group{}]) ++AX_BOOST_CHRONO ++AX_BOOST_FILESYSTEM ++AX_BOOST_LOCALE ++AX_BOOST_REGEX ++AX_BOOST_SYSTEM ++AX_BOOST_THREAD + + cppflags_bak="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" diff --git a/m4macros/ac_agi.m4 b/m4macros/ac_agi.m4 index c182ff4..e45a547 100644 --- a/m4macros/ac_agi.m4 |