From 93c131e84a173104e784af68cf2202c6b12bbbd1 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 23 Sep 2025 17:10:09 -0600 Subject: [PATCH 1/2] externpro 25.05.1-78-g87611cd --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 1042238..87611cd 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 104223840fd869a21043e134b433685266ee298e +Subproject commit 87611cd05d96e6da21200487bb1b4d4ad701c8d9 From 9e8adb1fe266b02b2c693f9bd17e82e81660682b Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 23 Sep 2025 17:13:39 -0600 Subject: [PATCH 2/2] cmake toplevel updates * externpro as dependency provider (xproinc) * project VERSION matches official/upstream version * no longer using 4th digit for externpro-specific version * externpro devel package gets version from 'git describe --tags' * externpro flags.cmake renamed to xpflags.cmake --- CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0306a01..6baaa9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,13 @@ cmake_minimum_required(VERSION 3.31) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake) -set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES xproinc) -project(patch VERSION 2.7.6.3) -include(flags) +set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) +project(patch VERSION 2.7.6) +include(xpflags) include(GNUInstallDirs) set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) include(ExternalProject) set_property(DIRECTORY PROPERTY "EP_BASE" ${CMAKE_BINARY_DIR}/epbase) if(WIN32 AND NOT UNIX) - set(VER 2.7.6) + set(VER ${CMAKE_PROJECT_VERSION}) ExternalProject_Add(${PROJECT_NAME} DOWNLOAD_EXTRACT_TIMESTAMP true URL https://github.com/externpro/patch/releases/download/v2.7/patch-${VER}-bin.zip @@ -26,7 +25,7 @@ if(WIN32 AND NOT UNIX) "" ) else() - set(VER 2.7.6) + set(VER ${CMAKE_PROJECT_VERSION}) ExternalProject_Add(${PROJECT_NAME} DOWNLOAD_EXTRACT_TIMESTAMP true URL http://ftp.gnu.org/gnu/patch/patch-${VER}.tar.xz