commit: 497e28748483ab7404c088dec8e2213147971fa8 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Apr 25 15:35:42 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Apr 26 20:38:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=497e2874
dev-libs/date: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Part-of: https://github.com/gentoo/gentoo/pull/41746 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../date/files/date-3.0.0-c-locale-export.patch | 90 ---------------------- dev-libs/date/files/date-3.0.0-version.patch | 15 ---- ...date-3.0.1_p20240913_remove-failing-tests.patch | 35 --------- 3 files changed, 140 deletions(-) diff --git a/dev-libs/date/files/date-3.0.0-c-locale-export.patch b/dev-libs/date/files/date-3.0.0-c-locale-export.patch deleted file mode 100644 index a4e5a9a93ef0..000000000000 --- a/dev-libs/date/files/date-3.0.0-c-locale-export.patch +++ /dev/null @@ -1,90 +0,0 @@ -Fixes an compilation error when 'ONLY_C_LOCALE' is used to build the project. - -Upstream-Bug: https://github.com/HowardHinnant/date/issues/589 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -76,10 +76,25 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.15) - # public headers will get installed: - set_target_properties( date PROPERTIES PUBLIC_HEADER include/date/date.h ) - endif () --target_compile_definitions( date INTERFACE -- #To workaround libstdc++ issue https://github.com/HowardHinnant/date/issues/388 -- ONLY_C_LOCALE=$<IF:$<BOOL:${COMPILE_WITH_C_LOCALE}>,1,0> -- $<$<BOOL:${DISABLE_STRING_VIEW}>:HAS_STRING_VIEW=0> ) -+ -+# These used to be set with generator expressions, -+# -+# ONLY_C_LOCALE=$<IF:$<BOOL:${COMPILE_WITH_C_LOCALE}>,1,0> -+# -+# which expand in the output target file to, e.g. -+# -+# ONLY_C_LOCALE=$<IF:$<BOOL:FALSE>,1,0> -+# -+# This string is then (somtimes?) not correctly interpreted. -+if ( COMPILE_WITH_C_LOCALE ) -+ # To workaround libstdc++ issue https://github.com/HowardHinnant/date/issues/388 -+ target_compile_definitions( date INTERFACE ONLY_C_LOCALE=1 ) -+else() -+ target_compile_definitions( date INTERFACE ONLY_C_LOCALE=0 ) -+endif() -+if ( DISABLE_STRING_VIEW ) -+ target_compile_definitions( date INTERFACE HAS_STRING_VIEW=0 ) -+endif() - - #[===================================================================[ - tz (compiled) library -@@ -89,27 +104,40 @@ if( BUILD_TZ_LIB ) - target_sources( date-tz - PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>$<INSTALL_INTERFACE:include>/date/tz.h -- $<$<BOOL:${IOS}>:$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>$<INSTALL_INTERFACE:include>/date/ios.h> - PRIVATE - include/date/tz_private.h -- $<$<BOOL:${IOS}>:src/ios.mm> - src/tz.cpp ) -+ if ( IOS ) -+ target_sources( date-tz -+ PUBLIC -+ $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>$<INSTALL_INTERFACE:include>/date/ios.h -+ PRIVATE -+ src/ios.mm ) -+ endif() - add_library( date::tz ALIAS date-tz ) - target_link_libraries( date-tz PUBLIC date ) - target_include_directories( date-tz PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> - $<INSTALL_INTERFACE:include> ) -- target_compile_definitions( date-tz -- PRIVATE -- AUTO_DOWNLOAD=$<IF:$<OR:$<BOOL:${USE_SYSTEM_TZ_DB}>,$<BOOL:${MANUAL_TZ_DB}>>,0,1> -- HAS_REMOTE_API=$<IF:$<OR:$<BOOL:${USE_SYSTEM_TZ_DB}>,$<BOOL:${MANUAL_TZ_DB}>>,0,1> -- $<$<AND:$<BOOL:${WIN32}>,$<BOOL:${BUILD_SHARED_LIBS}>>:DATE_BUILD_DLL=1> -- $<$<BOOL:${USE_TZ_DB_IN_DOT}>:INSTALL=.> -- PUBLIC -- USE_OS_TZDB=$<IF:$<AND:$<BOOL:${USE_SYSTEM_TZ_DB}>,$<NOT:$<BOOL:${WIN32}>>,$<NOT:$<BOOL:${MANUAL_TZ_DB}>>>,1,0> -- INTERFACE -- $<$<AND:$<BOOL:${WIN32}>,$<BOOL:${BUILD_SHARED_LIBS}>>:DATE_USE_DLL=1> ) -+ -+ if ( USE_SYSTEM_TZ_DB OR MANUAL_TZ_DB ) -+ target_compile_definitions( date-tz PRIVATE AUTO_DOWNLOAD=0 HAS_REMOTE_API=0 ) -+ else() -+ target_compile_definitions( date-tz PRIVATE AUTO_DOWNLOAD=1 HAS_REMOTE_API=1 ) -+ endif() -+ -+ if ( USE_SYSTEM_TZ_DB AND NOT WIN32 AND NOT MANUAL_TZ_DB ) -+ target_compile_definitions( date-tz PRIVATE INSTALL=. PUBLIC USE_OS_TZDB=1 ) -+ else() -+ target_compile_definitions( date-tz PUBLIC USE_OS_TZDB=0 ) -+ endif() -+ -+ if ( WIN32 AND BUILD_SHARED_LIBS ) -+ target_compile_definitions( date-tz PUBLIC DATE_BUILD_DLL=1 ) -+ endif() -+ - set(TZ_HEADERS include/date/tz.h) -+ - if( IOS ) - list(APPEND TZ_HEADERS include/date/ios.h) - endif( ) --- diff --git a/dev-libs/date/files/date-3.0.0-version.patch b/dev-libs/date/files/date-3.0.0-version.patch deleted file mode 100644 index 398b2107059c..000000000000 --- a/dev-libs/date/files/date-3.0.0-version.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fixes an oversight in the build-system versioning. - -Upstream-Bug: https://github.com/HowardHinnant/date/issues/583 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,7 @@ - - cmake_minimum_required( VERSION 3.7 ) - --project( date VERSION 2.4.1 ) -+project( date VERSION 3.0.0 ) - - include( GNUInstallDirs ) - diff --git a/dev-libs/date/files/date-3.0.1_p20240913_remove-failing-tests.patch b/dev-libs/date/files/date-3.0.1_p20240913_remove-failing-tests.patch deleted file mode 100644 index 91e2de2566c0..000000000000 --- a/dev-libs/date/files/date-3.0.1_p20240913_remove-failing-tests.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Filip Kobierski <[email protected]> - -Here are the failiure messages: -test_c(): Assertion `!in.fail()' failed. -test_Ip(): Assertion `tp == sys_days{2016_y/12/11} + hours{13}' failed. -test_p(): Assertion `tp == sys_days{2016_y/12/11} + hours{23}' failed. ---- - test/date_test/parse.pass.cpp | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/test/date_test/parse.pass.cpp b/test/date_test/parse.pass.cpp -index a7fecfd..bd1cef4 100644 ---- a/test/date_test/parse.pass.cpp -+++ b/test/date_test/parse.pass.cpp -@@ -891,17 +891,14 @@ main() - { - test_a(); - test_b(); -- test_c(); - test_C(); - test_d(); - test_D(); - test_F(); - test_H(); -- test_Ip(); - test_j(); - test_m(); - test_M(); -- test_p(); - test_r(); - test_R(); - test_S(); --- -2.44.2 -
