diff --git a/dev-cpp/antlr-cpp/antlr_cpp-4.13.1.recipe b/dev-cpp/antlr-cpp/antlr_cpp-4.13.2.recipe similarity index 92% rename from dev-cpp/antlr-cpp/antlr_cpp-4.13.1.recipe rename to dev-cpp/antlr-cpp/antlr_cpp-4.13.2.recipe index 4c6102e2d..82c6bb1ea 100644 --- a/dev-cpp/antlr-cpp/antlr_cpp-4.13.1.recipe +++ b/dev-cpp/antlr-cpp/antlr_cpp-4.13.2.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2012-2022 The ANTLR Project" LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="https://www.antlr.org/download/antlr4-cpp-runtime-$portVersion-source.zip" -CHECKSUM_SHA256="d350e09917a633b738c68e1d6dc7d7710e91f4d6543e154a78bb964cfd8eb4de" +CHECKSUM_SHA256="0ed13668906e86dbc0dcddf30fdee68c10203dea4e83852b4edb810821bee3c4" SOURCE_DIR="" PATCHES="antlr_cpp-$portVersion.patchset" @@ -38,7 +38,6 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:cmake - cmd:find # required for fixCMake cmd:make cmd:gcc$secondaryArchSuffix " diff --git a/dev-cpp/antlr-cpp/patches/antlr_cpp-4.13.1.patchset b/dev-cpp/antlr-cpp/patches/antlr_cpp-4.13.2.patchset similarity index 73% rename from dev-cpp/antlr-cpp/patches/antlr_cpp-4.13.1.patchset rename to dev-cpp/antlr-cpp/patches/antlr_cpp-4.13.2.patchset index 94a75af93..a96597f41 100644 --- a/dev-cpp/antlr-cpp/patches/antlr_cpp-4.13.1.patchset +++ b/dev-cpp/antlr-cpp/patches/antlr_cpp-4.13.2.patchset @@ -1,4 +1,4 @@ -From de9a87eee9cf13dce8f5dce4e6462d16634f33da Mon Sep 17 00:00:00 2001 +From f7c2609eb1bc41165bc0608d6a1d139c5b4bd32f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= Date: Sun, 5 Feb 2023 20:55:24 +0100 Subject: fix install paths @@ -27,33 +27,33 @@ index 7efb19c..a1a1803 100644 set(CPACK_PACKAGE_CONTACT "antlr-discussion@googlegroups.com") set(CPACK_PACKAGE_VERSION ${ANTLR_VERSION}) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt -index c053fc3..a6d993c 100644 +index be0d8bf..09f8256 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt -@@ -183,7 +183,7 @@ if (TARGET antlr4_static) +@@ -7,7 +7,7 @@ if (NOT ANTLR_BUILD_SHARED AND NOT ANTLR_BUILD_STATIC) + message(FATAL_ERROR "Options ANTLR_BUILD_SHARED and ANTLR_BUILD_STATIC can't both be OFF") endif() - install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/" -- DESTINATION "include/antlr4-runtime" -+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/antlr4-runtime" - COMPONENT dev - FILES_MATCHING PATTERN "*.h" - ) +-set(libantlrcpp_INCLUDE_INSTALL_DIR "include/antlr4-runtime") ++set(libantlrcpp_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/antlr4-runtime") + + set(libantlrcpp_INCLUDE_DIRS + ${PROJECT_SOURCE_DIR}/runtime/src -- -2.37.3 +2.45.2 -From 0a5fad673bda6688e374bd956fee31dc3c3b5f72 Mon Sep 17 00:00:00 2001 +From ac1344fed45b71be367a57ae8279623c33963ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= Date: Sun, 5 Feb 2023 21:04:31 +0100 Subject: use packaged gtest diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt -index a6d993c..db109f2 100644 +index 09f8256..3d304f3 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt -@@ -56,19 +56,6 @@ IF(TRACE_ATN) +@@ -66,19 +66,6 @@ IF(TRACE_ATN) ENDIF(TRACE_ATN) if (ANTLR_BUILD_CPP_TESTS) @@ -73,7 +73,7 @@ index a6d993c..db109f2 100644 file(GLOB libantlrcpp_TESTS "${PROJECT_SOURCE_DIR}/runtime/tests/*.cpp" ) -@@ -82,6 +69,7 @@ if (ANTLR_BUILD_CPP_TESTS) +@@ -92,6 +79,7 @@ if (ANTLR_BUILD_CPP_TESTS) antlr4_tests $,antlr4_static,antlr4_shared> gtest_main @@ -82,5 +82,5 @@ index a6d993c..db109f2 100644 include(GoogleTest) -- -2.37.3 +2.45.2 diff --git a/dev-java/antlr-runtime/antlr_runtime-4.13.1.recipe b/dev-java/antlr-runtime/antlr_runtime-4.13.2.recipe similarity index 90% rename from dev-java/antlr-runtime/antlr_runtime-4.13.1.recipe rename to dev-java/antlr-runtime/antlr_runtime-4.13.2.recipe index dc7d07cb9..36f5bd8de 100644 --- a/dev-java/antlr-runtime/antlr_runtime-4.13.1.recipe +++ b/dev-java/antlr-runtime/antlr_runtime-4.13.2.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2012-2022 The ANTLR Project" LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="https://www.antlr.org/download/antlr-runtime-$portVersion.jar#noarchive" -CHECKSUM_SHA256="54665d2838cc66458343468efc539e454fc95b46a8a04b13c6ac43fc9be63505" +CHECKSUM_SHA256="dd3e8a13a2d669bf84fb8d834de35ce4875f27157698d206241ec8488aadcaf7" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" diff --git a/dev-java/antlr-tool/antlr_tool-4.13.1.recipe b/dev-java/antlr-tool/antlr_tool-4.13.2.recipe similarity index 91% rename from dev-java/antlr-tool/antlr_tool-4.13.1.recipe rename to dev-java/antlr-tool/antlr_tool-4.13.2.recipe index fda2a6be0..6626dab04 100644 --- a/dev-java/antlr-tool/antlr_tool-4.13.1.recipe +++ b/dev-java/antlr-tool/antlr_tool-4.13.2.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2012-2022 The ANTLR Project" LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="https://www.antlr.org/download/antlr-$portVersion-complete.jar#noarchive" -CHECKSUM_SHA256="bc13a9c57a8dd7d5196888211e5ede657cb64a3ce968608697e4f668251a8487" +CHECKSUM_SHA256="eae2dfa119a64327444672aff63e9ec35a20180dc5b8090b7a6ab85125df4d76" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes"