Merge branch 'refs/heads/601_hotfix'

theCheeseboard · Oct 15, 2023 · 6a5a3d2 · 6a5a3d2
2 parents 6406b53 + feef140
commit 6a5a3d2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/cmake-scripts/cntp-blueprint.cmake b/lib/cmake-scripts/cntp-blueprint.cmake
@@ -11,14 +11,21 @@ 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
             OUTPUT_STRIP_TRAILING_WHITESPACE
             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?")

diff --git a/lib/libcontemporary_global.h b/lib/libcontemporary_global.h
@@ -44,7 +44,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) \