diff options
Diffstat (limited to 'net-firewall/fwbuilder/files')
-rw-r--r-- | net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch | 28 | ||||
-rw-r--r-- | net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-fix_version.patch (renamed from net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-fix_version.patch) | 8 |
2 files changed, 32 insertions, 4 deletions
diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch new file mode 100644 index 000000000000..d7f2cfb7e113 --- /dev/null +++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch @@ -0,0 +1,28 @@ +From 6021c352a009121870107ed37f07ee520110d4c2 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 27 Aug 2021 03:24:26 +0100 +Subject: [PATCH] Drop automagic ccache usage + +--- + CMakeLists.txt | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 97477b0..cd17c6a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,11 +5,6 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" + CACHE STRING "Minimum macOS deployment version" + ) + +-find_program(CCACHE_PROGRAM ccache) +-if(CCACHE_PROGRAM) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") +-endif() +- + project(firewallbuilder LANGUAGES CXX C) + + ### Version variables and include file +-- +2.33.0 + diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-fix_version.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-fix_version.patch index d71de42d26cd..cce544a58a0c 100644 --- a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-fix_version.patch +++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-fix_version.patch @@ -1,11 +1,11 @@ ---- a/cmake/VERSION.cmake 2020-09-05 14:54:43.767374594 +0200 -+++ b/cmake/VERSION.cmake 2020-09-05 16:13:20.274809080 +0200 +--- a/cmake/VERSION.cmake ++++ b/cmake/VERSION.cmake @@ -3,7 +3,7 @@ set(PROJECT_VERSION_MAJOR "6") set(PROJECT_VERSION_MINOR "0") set(PROJECT_VERSION_PATCH "0") --set(PROJECT_VERSION_EXTRA "-beta") -+set(PROJECT_VERSION_EXTRA "_p20200502") +-set(PROJECT_VERSION_EXTRA "-rc1") ++set(PROJECT_VERSION_EXTRA "_rc1") set(PROJECT_GENERATION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") set(PROJECT_GENERATION_SHORT "${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}") set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${PROJECT_VERSION_EXTRA}") |