Date: Sunday, March 5, 2023 @ 16:19:45 Author: dvzrv Revision: 1413973
upgpkg: ghc-filesystem 1.5.14-1: Upgrade to 1.5.14. Remove upstreamed patch for exporting project version. Move cmake options to local bash array for better handling. Modified: ghc-filesystem/trunk/PKGBUILD Deleted: ghc-filesystem/trunk/ghc-filesystem-1.5.12-fix_project_version.patch -------------------------------------------------+ PKGBUILD | 32 ++++------- ghc-filesystem-1.5.12-fix_project_version.patch | 64 ---------------------- 2 files changed, 12 insertions(+), 84 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-05 16:02:17 UTC (rev 1413972) +++ PKGBUILD 2023-03-05 16:19:45 UTC (rev 1413973) @@ -2,34 +2,26 @@ _name=filesystem pkgname=ghc-filesystem -pkgver=1.5.12 -pkgrel=2 +pkgver=1.5.14 +pkgrel=1 pkgdesc="An implementation of C++17 std::filesystem for C++11 /C++14/C++17/C++20" arch=(any) url="https://github.com/gulrak/filesystem"; license=(MIT) makedepends=(cmake) -source=( - $pkgname-$pkgver.tar.gz::https://github.com/gulrak/filesystem/archive/refs/tags/v$pkgver.tar.gz - $pkgname-1.5.12-fix_project_version.patch -) -sha512sums=('2cba74921104fa84547288ff983260ce1e81967df6a7d2a334074826c355c72945ad64e6979cd302a23c5e3a398990706b01fc573c046512e9f508edca9da12c' - '06fb7392b7ca19127ec6219804e0b5e4cebe9abb92d6d984bb8fd90906fb4a630adf6ed22cb2f076163ed7f72f66ae98b20cbb2fb6411e6bd450fadd4c910243') -b2sums=('9eb0bce08659396f3ef254b0ad772ae9ad29654aef3c90ab1f9eee1c4f830544ad947680e072fcf7d3c251a3afb77447617610c49931d50743444a6b88b4745d' - '7ae22bec02d061a41c043e0480adb25773fa3675221dda88c46bbc518ecea4e2bcdfb4cf5681af16d344cae754cb0ded9fac6a9fd2e244ad535db71cf24bbaee') +source=($url/archive/v$pkgver/$pkgname-$pkgver.tar.gz) +sha512sums=('6eae921485ecdaf4b8329a568b1f4f612ee491fc5fdeafce9c8000b9bf1a73b6fa4e07d0d4ddf05be49efe79e9bddfbcc0aba85529cb016668797a8d89eb9b82') +b2sums=('9734907da65e0f390e461d76c7b1c7e8ffa1a0f7f01e5952d69d9d6b6cc3c85e20f5e4495235f2589635fb665040bf2ee4def4d3bdcb0f3453a00ee8c4e8ac3f') -prepare() { - # add missing version export: https://github.com/gulrak/filesystem/pull/149 - patch -Np1 -d $_name-$pkgver -i ../$pkgname-1.5.12-fix_project_version.patch -} - build() { - cmake \ - -B build \ - -S $_name-$pkgver \ - -DCMAKE_BUILD_TYPE='None' \ - -DCMAKE_INSTALL_PREFIX='/usr' \ + local cmake_options=( + -B build + -S $_name-$pkgver + -DCMAKE_BUILD_TYPE=None + -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev + ) + cmake "${cmake_options[@]}" cmake --build build } Deleted: ghc-filesystem-1.5.12-fix_project_version.patch =================================================================== --- ghc-filesystem-1.5.12-fix_project_version.patch 2023-03-05 16:02:17 UTC (rev 1413972) +++ ghc-filesystem-1.5.12-fix_project_version.patch 2023-03-05 16:19:45 UTC (rev 1413973) @@ -1,64 +0,0 @@ -From 089ef64aa3d8d9fe326cd4f5d4ef85186afc04a8 Mon Sep 17 00:00:00 2001 -From: David Runge <[email protected]> -Date: Fri, 10 Jun 2022 15:25:02 +0200 -Subject: [PATCH] Declare version in cmake project() call - -CMakeLists.txt: -Declare the project's version in the cmake project() call so that it may -be exported to the project's cmake integration (used by other projects). ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7886167..ff712e1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,8 @@ - cmake_minimum_required(VERSION 3.7.2) --project(ghcfilesystem) -+project( -+ ghcfilesystem, -+ VERSION 1.5.12 -+) - - if (POLICY CMP0077) - cmake_policy(SET CMP0077 NEW) - -From 4c33b91fe98d5383c391b5ac2a1b2c990519dd6c Mon Sep 17 00:00:00 2001 -From: David Runge <[email protected]> -Date: Fri, 10 Jun 2022 15:44:04 +0200 -Subject: [PATCH] Write ghc_filesystem-config-version.cmake file - -CMakeLists.txt: -Write a ghc_filesystem-config-version.cmake file and install it, so that -other projects may rely on the exact version of ghc_filesystem. -The compatibility mode implies, that any version of ghc_filesystem with -the same major version is feature compatible. ---- - CMakeLists.txt | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ff712e1..8995f26 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,7 +73,16 @@ if(GHC_FILESYSTEM_WITH_INSTALL) - "${PROJECT_BINARY_DIR}/cmake/ghc_filesystem-config.cmake" - INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ghc_filesystem" - PATH_VARS CMAKE_INSTALL_INCLUDEDIR) -- install(FILES "${PROJECT_BINARY_DIR}/cmake/ghc_filesystem-config.cmake" -- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ghc_filesystem") -+ write_basic_package_version_file( -+ "${PROJECT_BINARY_DIR}/cmake/ghc_filesystem-config-version.cmake" -+ VERSION ${PROJECT_VERSION} -+ COMPATIBILITY SameMajorVersion -+ ) -+ install( -+ FILES -+ "${PROJECT_BINARY_DIR}/cmake/ghc_filesystem-config.cmake" -+ "${PROJECT_BINARY_DIR}/cmake/ghc_filesystem-config-version.cmake" -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ghc_filesystem" -+ ) - add_library(ghcFilesystem::ghc_filesystem ALIAS ghc_filesystem) - endif()
