From 1a74d99fc123c6dc828179bbe65e365aec64c07d Mon Sep 17 00:00:00 2001 From: Victor Tran Date: Sun, 15 Oct 2023 12:41:51 +1100 Subject: [PATCH 1/2] Hotfix for git blueprint detection --- lib/cmake-scripts/cntp-blueprint.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/cmake-scripts/cntp-blueprint.cmake b/lib/cmake-scripts/cntp-blueprint.cmake index e288bd73..cf247853 100644 --- a/lib/cmake-scripts/cntp-blueprint.cmake +++ b/lib/cmake-scripts/cntp-blueprint.cmake @@ -11,6 +11,11 @@ elseif(FORCE_BLUEPRINT) else() find_program(CNTP_GIT_COMMAND git) if(CNTP_GIT_COMMAND) + execute_process(COMMAND ${CNTP_GIT_COMMAND} rev-parse --show-toplevel + OUTPUT_VARIABLE GIT_ROOT_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + execute_process(COMMAND ${CNTP_GIT_COMMAND} tag --points-at HEAD OUTPUT_VARIABLE CNTP_GIT_OUTPUT RESULT_VARIABLE CNTP_GIT_RESULT @@ -18,7 +23,9 @@ else() WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) if(CNTP_GIT_RESULT EQUAL 0) if("${CNTP_GIT_OUTPUT}" STREQUAL "") - set(BLUEPRINT ON) + if(NOT EXISTS "${GIT_ROOT_DIR}/PKGBUILD") + set(BLUEPRINT ON) + endif() endif() else() message("Cannot determine Blueprint status from Git; maybe not a Git repository?") From feef1402cc60d67b85f9547c55bc59803d543c98 Mon Sep 17 00:00:00 2001 From: Victor Tran Date: Sun, 15 Oct 2023 12:44:48 +1100 Subject: [PATCH 2/2] Bump to 6.0.2 --- lib/libcontemporary_global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcontemporary_global.h b/lib/libcontemporary_global.h index 5b4f86bd..9eaeb7bd 100644 --- a/lib/libcontemporary_global.h +++ b/lib/libcontemporary_global.h @@ -54,7 +54,7 @@ #endif #define THE_LIBS_API_VERSION 9 -#define THE_LIBS_VERSION "6.0.1" +#define THE_LIBS_VERSION "6.0.2" #ifdef QT_WIDGETS_LIB #define SC_DPI(pixels) \