* Re: [PR PATCH] [Updated] Fix fillets-ng not including game data
2022-06-28 7:18 [PR PATCH] Fix fillets-ng not including game data stellarskylark
@ 2022-06-28 7:27 ` stellarskylark
2022-06-28 22:12 ` Duncaen
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: stellarskylark @ 2022-06-28 7:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 777 bytes --]
There is an updated pull request by stellarskylark against master on the void-packages repository
https://github.com/stellarskylark/void-packages master
https://github.com/void-linux/void-packages/pull/37720
Fix fillets-ng not including game data
Basically all I did was copy `do_install` from the `gnu-configure` build style and add a couple lines to copy the game data into `DESTDIR` as well. I chose to install it to `/usr/share/games/fillets-ng` because that is where Fillets looks for the game data by default.
#### 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/37720.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37720.patch --]
[-- Type: text/x-diff, Size: 2482 bytes --]
From f828f3083c9dad769d98916304c8beaaa1bbfa80 Mon Sep 17 00:00:00 2001
From: Skylar Hill <stellarskylark@posteo.net>
Date: Tue, 28 Jun 2022 02:12:21 -0500
Subject: [PATCH 1/2] Fix fillets-ng not including game data
---
srcpkgs/fillets-ng/template | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/fillets-ng/template b/srcpkgs/fillets-ng/template
index 8db27477c3c4..3678456e1407 100644
--- a/srcpkgs/fillets-ng/template
+++ b/srcpkgs/fillets-ng/template
@@ -1,7 +1,7 @@
# Template file for 'fillets-ng'
pkgname=fillets-ng
version=1.0.1
-revision=2
+revision=3
create_wrksrc=yes
build_wrksrc="fillets-ng-${version}"
build_style=gnu-configure
@@ -16,3 +16,12 @@ distfiles="${SOURCEFORGE_SITE}/fillets/fillets-ng-${version}.tar.gz
checksum="329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da
f0c979fb35ec550a43246fc209add8f45ca550a382c94d6383bb3f01b1073799"
replaces="fillets-ng-data>=0"
+do_install() {
+ : ${make_cmd:=make}
+ : ${make_install_target:=install}
+
+ ${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+
+ mkdir -p ${DESTDIR}/usr/share/games/fillets-ng
+ cp -r $wrksrc/fillets-ng-data-${version}/* ${DESTDIR}/usr/share/games/fillets-ng
+}
From 02b80ea1a46b7acd42c8acf660caae53d51be327 Mon Sep 17 00:00:00 2001
From: Skylar Hill <stellarskylark@posteo.net>
Date: Tue, 28 Jun 2022 02:26:58 -0500
Subject: [PATCH 2/2] Replace spaces with tabs
---
srcpkgs/fillets-ng/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/fillets-ng/template b/srcpkgs/fillets-ng/template
index 3678456e1407..0aed94ccde14 100644
--- a/srcpkgs/fillets-ng/template
+++ b/srcpkgs/fillets-ng/template
@@ -17,11 +17,11 @@ checksum="329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da
f0c979fb35ec550a43246fc209add8f45ca550a382c94d6383bb3f01b1073799"
replaces="fillets-ng-data>=0"
do_install() {
- : ${make_cmd:=make}
- : ${make_install_target:=install}
+ : ${make_cmd:=make}
+ : ${make_install_target:=install}
- ${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+ ${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
- mkdir -p ${DESTDIR}/usr/share/games/fillets-ng
- cp -r $wrksrc/fillets-ng-data-${version}/* ${DESTDIR}/usr/share/games/fillets-ng
+ mkdir -p ${DESTDIR}/usr/share/games/fillets-ng
+ cp -r $wrksrc/fillets-ng-data-${version}/* ${DESTDIR}/usr/share/games/fillets-ng
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Fix fillets-ng not including game data
2022-06-28 7:18 [PR PATCH] Fix fillets-ng not including game data stellarskylark
2022-06-28 7:27 ` [PR PATCH] [Updated] " stellarskylark
@ 2022-06-28 22:12 ` Duncaen
2022-06-28 22:35 ` [PR PATCH] [Updated] " stellarskylark
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Duncaen @ 2022-06-28 22:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/37720#issuecomment-1169335410
Comment:
Instead of copying `do_install` you can add a `post_install` function that insatlls the additional files.
Please squash the commits and format the commit message according to [CONTRIBUTING.md](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes), something like `fillets-ng: include game data`.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] Fix fillets-ng not including game data
2022-06-28 7:18 [PR PATCH] Fix fillets-ng not including game data stellarskylark
2022-06-28 7:27 ` [PR PATCH] [Updated] " stellarskylark
2022-06-28 22:12 ` Duncaen
@ 2022-06-28 22:35 ` stellarskylark
2022-06-29 12:18 ` [PR PATCH] [Closed]: " Duncaen
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: stellarskylark @ 2022-06-28 22:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 777 bytes --]
There is an updated pull request by stellarskylark against master on the void-packages repository
https://github.com/stellarskylark/void-packages master
https://github.com/void-linux/void-packages/pull/37720
Fix fillets-ng not including game data
Basically all I did was copy `do_install` from the `gnu-configure` build style and add a couple lines to copy the game data into `DESTDIR` as well. I chose to install it to `/usr/share/games/fillets-ng` because that is where Fillets looks for the game data by default.
#### 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/37720.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37720.patch --]
[-- Type: text/x-diff, Size: 1082 bytes --]
From 0afe0ee330adb1d776f258b56c80656b213cadc7 Mon Sep 17 00:00:00 2001
From: Skylar Hill <stellarskylark@posteo.net>
Date: Tue, 28 Jun 2022 02:12:21 -0500
Subject: [PATCH] fillets-ng: include game data
---
srcpkgs/fillets-ng/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/fillets-ng/template b/srcpkgs/fillets-ng/template
index 8db27477c3c4..ca8b930a7842 100644
--- a/srcpkgs/fillets-ng/template
+++ b/srcpkgs/fillets-ng/template
@@ -1,7 +1,7 @@
# Template file for 'fillets-ng'
pkgname=fillets-ng
version=1.0.1
-revision=2
+revision=3
create_wrksrc=yes
build_wrksrc="fillets-ng-${version}"
build_style=gnu-configure
@@ -16,3 +16,7 @@ distfiles="${SOURCEFORGE_SITE}/fillets/fillets-ng-${version}.tar.gz
checksum="329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da
f0c979fb35ec550a43246fc209add8f45ca550a382c94d6383bb3f01b1073799"
replaces="fillets-ng-data>=0"
+post_install() {
+ mkdir -p ${DESTDIR}/usr/share/games/fillets-ng
+ cp -r $wrksrc/fillets-ng-data-${version}/* ${DESTDIR}/usr/share/games/fillets-ng
+}
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Closed]: Fix fillets-ng not including game data
2022-06-28 7:18 [PR PATCH] Fix fillets-ng not including game data stellarskylark
` (2 preceding siblings ...)
2022-06-28 22:35 ` [PR PATCH] [Updated] " stellarskylark
@ 2022-06-29 12:18 ` Duncaen
2022-07-01 16:13 ` stellarskylark
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Duncaen @ 2022-06-29 12:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 608 bytes --]
There's a closed pull request on the void-packages repository
Fix fillets-ng not including game data
https://github.com/void-linux/void-packages/pull/37720
Description:
Basically all I did was copy `do_install` from the `gnu-configure` build style and add a couple lines to copy the game data into `DESTDIR` as well. I chose to install it to `/usr/share/games/fillets-ng` because that is where Fillets looks for the game data by default.
#### 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] 8+ messages in thread
* Re: Fix fillets-ng not including game data
2022-06-28 7:18 [PR PATCH] Fix fillets-ng not including game data stellarskylark
` (3 preceding siblings ...)
2022-06-29 12:18 ` [PR PATCH] [Closed]: " Duncaen
@ 2022-07-01 16:13 ` stellarskylark
2022-07-01 18:07 ` paper42
2022-07-01 18:09 ` stellarskylark
6 siblings, 0 replies; 8+ messages in thread
From: stellarskylark @ 2022-07-01 16:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New comment by stellarskylark on void-packages repository
https://github.com/void-linux/void-packages/pull/37720#issuecomment-1172503565
Comment:
Hello,
Why was this closed without merging?
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Fix fillets-ng not including game data
2022-06-28 7:18 [PR PATCH] Fix fillets-ng not including game data stellarskylark
` (4 preceding siblings ...)
2022-07-01 16:13 ` stellarskylark
@ 2022-07-01 18:07 ` paper42
2022-07-01 18:09 ` stellarskylark
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2022-07-01 18:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 362 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37720#issuecomment-1172594389
Comment:
![image](https://user-images.githubusercontent.com/23639164/176947686-9354f6d6-3d20-43d0-8922-4bb4c9b65414.png)
This was merged in the linked commit, github just marked it as closed because of the way this was merged.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Fix fillets-ng not including game data
2022-06-28 7:18 [PR PATCH] Fix fillets-ng not including game data stellarskylark
` (5 preceding siblings ...)
2022-07-01 18:07 ` paper42
@ 2022-07-01 18:09 ` stellarskylark
6 siblings, 0 replies; 8+ messages in thread
From: stellarskylark @ 2022-07-01 18:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New comment by stellarskylark on void-packages repository
https://github.com/void-linux/void-packages/pull/37720#issuecomment-1172596098
Comment:
ohh thanks, I was just sitting here like "oh no, what did I do wrong???"
^ permalink raw reply [flat|nested] 8+ messages in thread