From 233896c47a16c35ce82cbfcd98fa8e5bc849355f Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Wed, 21 Jan 2026 22:14:56 -0700 Subject: [PATCH 1/5] externpro 25.07.3-38-g6ecb6ef --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 87611cd..6ecb6ef 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 87611cd05d96e6da21200487bb1b4d4ad701c8d9 +Subproject commit 6ecb6efd2c51ff0f83638817b0d3dbb8fbdc87b9 From 9d7cf3af45abaf4ba65dbd6d9f6d3495a42f03cd Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Wed, 21 Jan 2026 22:24:56 -0700 Subject: [PATCH 2/5] workflows: externpro@25.07.3 --- .github/workflows/xpbuild.yml | 20 ++++++++++---------- .github/workflows/xprelease.yml | 3 +-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index fb55758..8d2fdec 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -1,4 +1,7 @@ name: Build +permissions: + contents: read + pull-requests: write on: push: branches: [ "dev" ] @@ -7,24 +10,21 @@ on: workflow_dispatch: jobs: linux: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 + permissions: + contents: read + pull-requests: write + packages: write + uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.3 with: cmake-workflow-preset: LinuxRelease - runon: ubuntu-latest - secrets: inherit - linux-arm64: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 - with: - cmake-workflow-preset: LinuxRelease - runon: ubuntu-24.04-arm secrets: inherit macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1 + uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.3 with: cmake-workflow-preset: DarwinRelease secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1 + uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.3 with: cmake-workflow-preset: WindowsRelease secrets: inherit diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index f868a82..86b6f88 100644 --- a/.github/workflows/xprelease.yml +++ b/.github/workflows/xprelease.yml @@ -9,10 +9,9 @@ on: jobs: # Upload build artifacts as release assets release-from-build: - uses: externpro/externpro/.github/workflows/release-from-build.yml@25.05.1 + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.3 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} - artifact_pattern: "*.tar.xz" permissions: contents: write id-token: write From 1bf26e9726e67ad00acfafa291d8b3ca61dbf2e7 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Wed, 21 Jan 2026 22:26:32 -0700 Subject: [PATCH 3/5] CMakePresets: updates from externpro cmake/presets --- CMakePresetsBase.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json index 09653d8..085cdc3 100644 --- a/CMakePresetsBase.json +++ b/CMakePresetsBase.json @@ -6,5 +6,11 @@ "hidden": true, "binaryDir": "${sourceDir}/_bld-${presetName}" } + ], + "buildPresets": [ + { + "name": "build-base", + "hidden": true + } ] } From dee04ca5da0d59a740905ad7afd625af4e295ec8 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Wed, 21 Jan 2026 22:28:19 -0700 Subject: [PATCH 4/5] cmake: xproinc enhancements --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6baaa9a..1e2582b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.31) 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) From 5626fade8c323dc46235401850316eb9973925ff Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Wed, 21 Jan 2026 22:33:15 -0700 Subject: [PATCH 5/5] cmake: xpExternPackage() replaces xpPackageDevel() --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e2582b..2530779 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 3.31) set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) project(patch VERSION 2.7.6) -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) @@ -42,6 +41,12 @@ else() "" ) endif() -xpPackageDevel(EXE_PATH ${patchExe}) +xpExternPackage( + EXE_PATH ${patchExe} + BASE v0 XPDIFF "bin(msw), native(unix)" + WEB "https://savannah.gnu.org/projects/patch/" UPSTREAM "git.savannah.gnu.org/cgit/patch.git" + DESC "takes a patch file containing a difference listing produced by the diff program and applies those differences to one or more original files, producing patched versions" + LICENSE "[GPL-3.0](https://savannah.gnu.org/projects/patch/ 'GNU General Public License v3 or later')" + ) ExternalProject_Get_Property(${PROJECT_NAME} INSTALL_DIR) install(DIRECTORY ${INSTALL_DIR}/ DESTINATION . USE_SOURCE_PERMISSIONS)