From 1eea14d1a367266bc27b633bf2dece81fcff1846 Mon Sep 17 00:00:00 2001 From: Graham Scott Date: Fri, 18 Mar 2022 14:49:31 -0500 Subject: [PATCH 1/2] glm: fix license The glm package currently bundles a random snippet of the glm manual (which is not related to the license or copyright of the library) as its license. I assume, at some point, this portion of the manual actually was the license, but then this was changed in a later glm version? In any case, this commit fixes the issue by just using the actual license file (copying.txt) as the license instead. --- srcpkgs/glm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template index f40f6fcf8fae..9e827db57fb5 100644 --- a/srcpkgs/glm/template +++ b/srcpkgs/glm/template @@ -30,6 +30,6 @@ post_install() { dos2unix "$f" done rm -f "${DESTDIR}/usr/include/CMakeLists.txt" - sed -n '88,110p' manual.md > LICENSE + mv copying.txt LICENSE vlicense LICENSE } From 75f9150c5a4c068abad7d6ea228659daaab6e37e Mon Sep 17 00:00:00 2001 From: Graham Scott Date: Fri, 18 Mar 2022 14:55:29 -0500 Subject: [PATCH 2/2] glm: copy cmake config files The glm package currently does not include glm's CMake config files, meaning CMake commands such as find_package(glm) fail. This commit fixes that by copying all of the glm CMake config files to usr/lib/cmake/glm. I've tested this and verified that it builds on my local Void installation. --- srcpkgs/glm/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template index 9e827db57fb5..0e53a93eff52 100644 --- a/srcpkgs/glm/template +++ b/srcpkgs/glm/template @@ -20,6 +20,8 @@ do_install() { for i in glm ; do vcopy $i usr/include done + vmkdir usr/lib/cmake + vcopy cmake/glm usr/lib/cmake vmkdir usr/share/pkgconfig vinstall ${FILESDIR}/glm.pc 644 usr/share/pkgconfig }