Github messages for voidlinux
 help / color / mirror / Atom feed
From: Radfordhound <Radfordhound@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] glm: fix license, copy cmake config files
Date: Fri, 18 Mar 2022 21:02:39 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36213@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 503 bytes --]

There is a new pull request by Radfordhound against master on the void-packages repository

https://github.com/Radfordhound/void-packages master
https://github.com/void-linux/void-packages/pull/36213

glm: fix license, copy cmake config files
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/36213.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-36213.patch --]
[-- Type: text/x-diff, Size: 1982 bytes --]

From 1eea14d1a367266bc27b633bf2dece81fcff1846 Mon Sep 17 00:00:00 2001
From: Graham Scott <Radfordhound@users.noreply.github.com>
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 <Radfordhound@users.noreply.github.com>
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
 }

             reply	other threads:[~2022-03-18 20:02 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-18 20:02 Radfordhound [this message]
2022-03-18 20:51 ` [PR REVIEW] " tibequadorian
2022-03-18 21:00 ` [PR PATCH] [Updated] " Radfordhound
2022-03-18 21:03 ` [PR REVIEW] " Radfordhound
2022-03-18 22:20 ` [PR PATCH] [Updated] " Radfordhound
2022-03-18 22:20 ` leahneukirchen
2022-03-18 22:25 ` Radfordhound
2022-03-19  0:20 ` [PR REVIEW] " tibequadorian
2022-03-19  0:21 ` tibequadorian
2022-03-19  1:13 ` [PR PATCH] [Updated] " Radfordhound
2022-03-19  1:17 ` [PR REVIEW] " Radfordhound
2022-03-19  1:18 ` Radfordhound
2022-06-29  2:15 ` github-actions
2022-06-29  2:30 ` Radfordhound
2022-09-29  2:14 ` github-actions
2022-10-05  1:13 ` Radfordhound
2022-12-19  4:38 ` [PR REVIEW] " classabbyamp
2022-12-22  0:53 ` [PR PATCH] [Updated] " Radfordhound
2022-12-22  1:13 ` Radfordhound
2022-12-22  1:16 ` Radfordhound
2023-02-10 18:18 ` [PR PATCH] [Closed]: " classabbyamp

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36213@inbox.vuxu.org \
    --to=radfordhound@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).