* [PR PATCH] glm: fix license, copy cmake config files
@ 2022-03-18 20:02 Radfordhound
2022-03-18 20:51 ` [PR REVIEW] " tibequadorian
` (19 more replies)
0 siblings, 20 replies; 21+ messages in thread
From: Radfordhound @ 2022-03-18 20:02 UTC (permalink / raw)
To: ml
[-- 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
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
@ 2022-03-18 20:51 ` tibequadorian
2022-03-18 21:00 ` [PR PATCH] [Updated] " Radfordhound
` (18 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2022-03-18 20:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/36213#discussion_r830342908
Comment:
use `vlicense` to install the license, the 2nd argument can be used to change the filename
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
2022-03-18 20:51 ` [PR REVIEW] " tibequadorian
@ 2022-03-18 21:00 ` Radfordhound
2022-03-18 21:03 ` [PR REVIEW] " Radfordhound
` (17 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Radfordhound @ 2022-03-18 21:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated 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: 2639 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/3] 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/3] 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
}
From 9499240e201bd32b1fdcbabc67951ebe926c5bbb Mon Sep 17 00:00:00 2001
From: Graham Scott <Radfordhound@users.noreply.github.com>
Date: Fri, 18 Mar 2022 16:00:25 -0500
Subject: [PATCH 3/3] glm: copy license using vlicense instead of mv
---
srcpkgs/glm/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template
index 0e53a93eff52..a90b93bbd33b 100644
--- a/srcpkgs/glm/template
+++ b/srcpkgs/glm/template
@@ -32,6 +32,5 @@ post_install() {
dos2unix "$f"
done
rm -f "${DESTDIR}/usr/include/CMakeLists.txt"
- mv copying.txt LICENSE
- vlicense LICENSE
+ vlicense copying.txt LICENSE
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
2022-03-18 20:51 ` [PR REVIEW] " tibequadorian
2022-03-18 21:00 ` [PR PATCH] [Updated] " Radfordhound
@ 2022-03-18 21:03 ` Radfordhound
2022-03-18 22:20 ` [PR PATCH] [Updated] " Radfordhound
` (16 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Radfordhound @ 2022-03-18 21:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New review comment by Radfordhound on void-packages repository
https://github.com/void-linux/void-packages/pull/36213#discussion_r830349446
Comment:
My bad, somehow missed that when I looked in the packages manual. Should be fixed now
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (3 preceding siblings ...)
2022-03-18 22:20 ` [PR PATCH] [Updated] " Radfordhound
@ 2022-03-18 22:20 ` leahneukirchen
2022-03-18 22:25 ` Radfordhound
` (14 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2022-03-18 22:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 510 bytes --]
There is an updated pull request by leahneukirchen 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: 1938 bytes --]
From 8b93bdf88297c5aa41da905bd6fce7cb9fca5b02 Mon Sep 17 00:00:00 2001
From: Graham Scott <Grahamlrscott@gmail.com>
Date: Fri, 18 Mar 2022 17:14:00 -0500
Subject: [PATCH 1/3] glm: fix license
---
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 1e3d997b781024eb359a72c320874cdd6600fe4f 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/3] glm: copy cmake config files
---
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
}
From 8700448b8af175a38cea9203f7a71644da02645d Mon Sep 17 00:00:00 2001
From: Graham Scott <Radfordhound@users.noreply.github.com>
Date: Fri, 18 Mar 2022 16:00:25 -0500
Subject: [PATCH 3/3] glm: copy license using vlicense instead of mv
---
srcpkgs/glm/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template
index 0e53a93eff52..a90b93bbd33b 100644
--- a/srcpkgs/glm/template
+++ b/srcpkgs/glm/template
@@ -32,6 +32,5 @@ post_install() {
dos2unix "$f"
done
rm -f "${DESTDIR}/usr/include/CMakeLists.txt"
- mv copying.txt LICENSE
- vlicense LICENSE
+ vlicense copying.txt LICENSE
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (2 preceding siblings ...)
2022-03-18 21:03 ` [PR REVIEW] " Radfordhound
@ 2022-03-18 22:20 ` Radfordhound
2022-03-18 22:20 ` leahneukirchen
` (15 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Radfordhound @ 2022-03-18 22:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated 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: 1938 bytes --]
From 8b93bdf88297c5aa41da905bd6fce7cb9fca5b02 Mon Sep 17 00:00:00 2001
From: Graham Scott <Grahamlrscott@gmail.com>
Date: Fri, 18 Mar 2022 17:14:00 -0500
Subject: [PATCH 1/3] glm: fix license
---
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 1e3d997b781024eb359a72c320874cdd6600fe4f 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/3] glm: copy cmake config files
---
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
}
From 8700448b8af175a38cea9203f7a71644da02645d Mon Sep 17 00:00:00 2001
From: Graham Scott <Radfordhound@users.noreply.github.com>
Date: Fri, 18 Mar 2022 16:00:25 -0500
Subject: [PATCH 3/3] glm: copy license using vlicense instead of mv
---
srcpkgs/glm/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template
index 0e53a93eff52..a90b93bbd33b 100644
--- a/srcpkgs/glm/template
+++ b/srcpkgs/glm/template
@@ -32,6 +32,5 @@ post_install() {
dos2unix "$f"
done
rm -f "${DESTDIR}/usr/include/CMakeLists.txt"
- mv copying.txt LICENSE
- vlicense LICENSE
+ vlicense copying.txt LICENSE
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (4 preceding siblings ...)
2022-03-18 22:20 ` leahneukirchen
@ 2022-03-18 22:25 ` Radfordhound
2022-03-19 0:20 ` [PR REVIEW] " tibequadorian
` (13 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Radfordhound @ 2022-03-18 22:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
New comment by Radfordhound on void-packages repository
https://github.com/void-linux/void-packages/pull/36213#issuecomment-1072863825
Comment:
I've force pushed to remove the lengthy descriptions from my commit messages so the lint template check succeeds.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (5 preceding siblings ...)
2022-03-18 22:25 ` Radfordhound
@ 2022-03-19 0:20 ` tibequadorian
2022-03-19 0:21 ` tibequadorian
` (12 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2022-03-19 0:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/36213#discussion_r830413578
Comment:
I think they meant
```suggestion
rm -f "${DESTDIR}/usr/include/glm/CMakeLists.txt"
```
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (6 preceding siblings ...)
2022-03-19 0:20 ` [PR REVIEW] " tibequadorian
@ 2022-03-19 0:21 ` tibequadorian
2022-03-19 1:13 ` [PR PATCH] [Updated] " Radfordhound
` (11 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: tibequadorian @ 2022-03-19 0:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/36213#issuecomment-1072901312
Comment:
Don't seperate your changes into multiple commits. Just do one commit with a description. You also need to revbump.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (7 preceding siblings ...)
2022-03-19 0:21 ` tibequadorian
@ 2022-03-19 1:13 ` Radfordhound
2022-03-19 1:17 ` [PR REVIEW] " Radfordhound
` (10 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Radfordhound @ 2022-03-19 1:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated 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: 1147 bytes --]
From a74982a28abea464847bcbae6b316d41ef1d8b96 Mon Sep 17 00:00:00 2001
From: Graham Scott <Grahamlrscott@gmail.com>
Date: Fri, 18 Mar 2022 17:14:00 -0500
Subject: [PATCH] glm: fix license, copy cmake config files
---
srcpkgs/glm/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template
index f40f6fcf8fae..659aa607934b 100644
--- a/srcpkgs/glm/template
+++ b/srcpkgs/glm/template
@@ -1,7 +1,7 @@
# Template file for 'glm'
pkgname=glm
version=0.9.9.8
-revision=1
+revision=2
wrksrc=glm
build_style=cmake
hostmakedepends="dos2unix unzip"
@@ -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
}
@@ -29,7 +31,6 @@ post_install() {
for f in $(find ${DESTDIR}/usr/include -type f); do
dos2unix "$f"
done
- rm -f "${DESTDIR}/usr/include/CMakeLists.txt"
- sed -n '88,110p' manual.md > LICENSE
- vlicense LICENSE
+ rm -f "${DESTDIR}/usr/include/glm/CMakeLists.txt"
+ vlicense copying.txt LICENSE
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (8 preceding siblings ...)
2022-03-19 1:13 ` [PR PATCH] [Updated] " Radfordhound
@ 2022-03-19 1:17 ` Radfordhound
2022-03-19 1:18 ` Radfordhound
` (9 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Radfordhound @ 2022-03-19 1:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New review comment by Radfordhound on void-packages repository
https://github.com/void-linux/void-packages/pull/36213#discussion_r830421222
Comment:
Yeah that seems to be the path that was intended. I've added this change to the PR
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (9 preceding siblings ...)
2022-03-19 1:17 ` [PR REVIEW] " Radfordhound
@ 2022-03-19 1:18 ` Radfordhound
2022-06-29 2:15 ` github-actions
` (8 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Radfordhound @ 2022-03-19 1:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
New comment by Radfordhound on void-packages repository
https://github.com/void-linux/void-packages/pull/36213#issuecomment-1072911336
Comment:
Gotcha. I've merged all the commits into one and bumped the revision number to 2.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (10 preceding siblings ...)
2022-03-19 1:18 ` Radfordhound
@ 2022-06-29 2:15 ` github-actions
2022-06-29 2:30 ` Radfordhound
` (7 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: github-actions @ 2022-06-29 2:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/36213#issuecomment-1169458523
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (11 preceding siblings ...)
2022-06-29 2:15 ` github-actions
@ 2022-06-29 2:30 ` Radfordhound
2022-09-29 2:14 ` github-actions
` (6 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Radfordhound @ 2022-06-29 2:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New comment by Radfordhound on void-packages repository
https://github.com/void-linux/void-packages/pull/36213#issuecomment-1169466417
Comment:
Bumping this as I believe it to still be relevant.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (12 preceding siblings ...)
2022-06-29 2:30 ` Radfordhound
@ 2022-09-29 2:14 ` github-actions
2022-10-05 1:13 ` Radfordhound
` (5 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: github-actions @ 2022-09-29 2:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/36213#issuecomment-1261655685
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (13 preceding siblings ...)
2022-09-29 2:14 ` github-actions
@ 2022-10-05 1:13 ` Radfordhound
2022-12-19 4:38 ` [PR REVIEW] " classabbyamp
` (4 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Radfordhound @ 2022-10-05 1:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 229 bytes --]
New comment by Radfordhound on void-packages repository
https://github.com/void-linux/void-packages/pull/36213#issuecomment-1267791162
Comment:
Not trying to nag lol, but bumping this again as I still believe it to be relevant
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (14 preceding siblings ...)
2022-10-05 1:13 ` Radfordhound
@ 2022-12-19 4:38 ` classabbyamp
2022-12-22 0:53 ` [PR PATCH] [Updated] " Radfordhound
` (3 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: classabbyamp @ 2022-12-19 4:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/36213#discussion_r1051785875
Comment:
```suggestion
rm "${DESTDIR}/usr/include/glm/CMakeLists.txt"
```
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (15 preceding siblings ...)
2022-12-19 4:38 ` [PR REVIEW] " classabbyamp
@ 2022-12-22 0:53 ` Radfordhound
2022-12-22 1:13 ` Radfordhound
` (2 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Radfordhound @ 2022-12-22 0:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated 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: 1195 bytes --]
From 028619bc63892a7acf7cf450a810073ba19663f2 Mon Sep 17 00:00:00 2001
From: Graham Scott <Grahamlrscott@gmail.com>
Date: Fri, 18 Mar 2022 17:14:00 -0500
Subject: [PATCH] glm: fix license, copy cmake config files
---
srcpkgs/glm/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template
index 7ccca2b74ebf..1d9009eb1f2d 100644
--- a/srcpkgs/glm/template
+++ b/srcpkgs/glm/template
@@ -1,7 +1,7 @@
# Template file for 'glm'
pkgname=glm
version=0.9.9.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="dos2unix unzip"
short_desc="C++ mathematics library for graphics programming"
@@ -19,6 +19,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
}
@@ -28,7 +30,6 @@ post_install() {
for f in $(find ${DESTDIR}/usr/include -type f); do
dos2unix "$f"
done
- rm -f "${DESTDIR}/usr/include/CMakeLists.txt"
- sed -n '88,110p' manual.md > LICENSE
- vlicense LICENSE
+ rm "${DESTDIR}/usr/include/glm/CMakeLists.txt"
+ vlicense copying.txt LICENSE
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (16 preceding siblings ...)
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
19 siblings, 0 replies; 21+ messages in thread
From: Radfordhound @ 2022-12-22 1:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated 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: 1195 bytes --]
From e374415a275593c3cac9518a6a69bc8c07916aa7 Mon Sep 17 00:00:00 2001
From: Graham Scott <Grahamlrscott@gmail.com>
Date: Wed, 21 Dec 2022 19:07:24 -0600
Subject: [PATCH] glm: fix license, copy cmake config files
---
srcpkgs/glm/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template
index 7ccca2b74ebf..1d9009eb1f2d 100644
--- a/srcpkgs/glm/template
+++ b/srcpkgs/glm/template
@@ -1,7 +1,7 @@
# Template file for 'glm'
pkgname=glm
version=0.9.9.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="dos2unix unzip"
short_desc="C++ mathematics library for graphics programming"
@@ -19,6 +19,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
}
@@ -28,7 +30,6 @@ post_install() {
for f in $(find ${DESTDIR}/usr/include -type f); do
dos2unix "$f"
done
- rm -f "${DESTDIR}/usr/include/CMakeLists.txt"
- sed -n '88,110p' manual.md > LICENSE
- vlicense LICENSE
+ rm "${DESTDIR}/usr/include/glm/CMakeLists.txt"
+ vlicense copying.txt LICENSE
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (17 preceding siblings ...)
2022-12-22 1:13 ` Radfordhound
@ 2022-12-22 1:16 ` Radfordhound
2023-02-10 18:18 ` [PR PATCH] [Closed]: " classabbyamp
19 siblings, 0 replies; 21+ messages in thread
From: Radfordhound @ 2022-12-22 1:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New comment by Radfordhound on void-packages repository
https://github.com/void-linux/void-packages/pull/36213#issuecomment-1362278622
Comment:
Sure thing. Conflicts should be resolved now, and I've removed the -f from the remove command as suggested.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Closed]: glm: fix license, copy cmake config files
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
` (18 preceding siblings ...)
2022-12-22 1:16 ` Radfordhound
@ 2023-02-10 18:18 ` classabbyamp
19 siblings, 0 replies; 21+ messages in thread
From: classabbyamp @ 2023-02-10 18:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
There's a closed pull request on the void-packages repository
glm: fix license, copy cmake config files
https://github.com/void-linux/void-packages/pull/36213
Description:
#### 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)
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2023-02-10 18:18 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-18 20:02 [PR PATCH] glm: fix license, copy cmake config files Radfordhound
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
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).