[arch-commits] Commit in ghc-filesystem/repos/community-any (3 files)
David Runge
dvzrv at gemini.archlinux.org
Fri Jun 10 14:56:18 UTC 2022
Date: Friday, June 10, 2022 @ 14:56:18
Author: dvzrv
Revision: 1230310
archrelease: copy trunk to community-any
Added:
ghc-filesystem/repos/community-any/PKGBUILD
(from rev 1230309, ghc-filesystem/trunk/PKGBUILD)
ghc-filesystem/repos/community-any/ghc-filesystem-1.5.12-fix_project_version.patch
(from rev 1230309, ghc-filesystem/trunk/ghc-filesystem-1.5.12-fix_project_version.patch)
Deleted:
ghc-filesystem/repos/community-any/PKGBUILD
-------------------------------------------------+
PKGBUILD | 78 ++++++++++++----------
ghc-filesystem-1.5.12-fix_project_version.patch | 64 ++++++++++++++++++
2 files changed, 108 insertions(+), 34 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-10 14:56:09 UTC (rev 1230309)
+++ PKGBUILD 2022-06-10 14:56:18 UTC (rev 1230310)
@@ -1,34 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-
-_name=filesystem
-pkgname=ghc-filesystem
-pkgver=1.5.12
-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)
-sha512sums=('2cba74921104fa84547288ff983260ce1e81967df6a7d2a334074826c355c72945ad64e6979cd302a23c5e3a398990706b01fc573c046512e9f508edca9da12c')
-b2sums=('9eb0bce08659396f3ef254b0ad772ae9ad29654aef3c90ab1f9eee1c4f830544ad947680e072fcf7d3c251a3afb77447617610c49931d50743444a6b88b4745d')
-
-build() {
- cmake \
- -B build \
- -S $_name-$pkgver \
- -DCMAKE_BUILD_TYPE='None' \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -Wno-dev
- cmake --build build
-}
-
-check() {
- ctest --output-on-failure --test-dir build/test
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
- install -vDm 644 $_name-$pkgver/README.md -t "$pkgdir/usr/share/doc/$pkgname/"
- install -vDm 644 $_name-$pkgver/LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-}
Copied: ghc-filesystem/repos/community-any/PKGBUILD (from rev 1230309, ghc-filesystem/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-06-10 14:56:18 UTC (rev 1230310)
@@ -0,0 +1,44 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+_name=filesystem
+pkgname=ghc-filesystem
+pkgver=1.5.12
+pkgrel=2
+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')
+
+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' \
+ -Wno-dev
+ cmake --build build
+}
+
+check() {
+ ctest --output-on-failure --test-dir build/test
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+ install -vDm 644 $_name-$pkgver/README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+ install -vDm 644 $_name-$pkgver/LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+}
Copied: ghc-filesystem/repos/community-any/ghc-filesystem-1.5.12-fix_project_version.patch (from rev 1230309, ghc-filesystem/trunk/ghc-filesystem-1.5.12-fix_project_version.patch)
===================================================================
--- ghc-filesystem-1.5.12-fix_project_version.patch (rev 0)
+++ ghc-filesystem-1.5.12-fix_project_version.patch 2022-06-10 14:56:18 UTC (rev 1230310)
@@ -0,0 +1,64 @@
+From 089ef64aa3d8d9fe326cd4f5d4ef85186afc04a8 Mon Sep 17 00:00:00 2001
+From: David Runge <dave at sleepmap.de>
+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 <dave at sleepmap.de>
+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()
More information about the arch-commits
mailing list