* [PR PATCH] rocksndiamonds: update to 4.3.0.1
@ 2021-11-20 15:43 clyhtsuriva
2021-11-20 23:31 ` [PR PATCH] [Updated] " clyhtsuriva
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: clyhtsuriva @ 2021-11-20 15:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1305 bytes --]
There is a new pull request by clyhtsuriva against master on the void-packages repository
https://github.com/clyhtsuriva/void-packages rocksndiamonds-update
https://github.com/void-linux/void-packages/pull/34169
rocksndiamonds: update to 4.3.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures :
- aarch64-musl
- armv7l
- armv6l-musl
#### Note
I modified the build flags as the Makefile now only use BASE_PATH replacing both XX_GAME_DIR.
A patch file from https://github.com/void-linux/void-packages/pull/34169.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rocksndiamonds-update-34169.patch --]
[-- Type: text/x-diff, Size: 1535 bytes --]
From 2204d4bd967a2e668ddb65bc5f1f797b5568dc02 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Sat, 20 Nov 2021 16:18:46 +0100
Subject: [PATCH] rocksndiamonds: update to 4.3.0.1
---
srcpkgs/rocksndiamonds/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index 1985dee75923..b2301018dc39 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -1,6 +1,6 @@
# Template file for 'rocksndiamonds'
pkgname=rocksndiamonds
-version=4.2.3.1
+version=4.3.0.1
revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
@@ -10,14 +10,13 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://www.artsoft.org/rocksndiamonds"
distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=58c1a63c147b7e6a2294d461cb65e6162e8493ec144a4d7b405544f48c432dca
+checksum=997f6cddb2fc48aed6e6b524b150974410f43956b420d37ebc098f40be92807c
replaces="rocksndiamonds-data>=0"
do_build() {
vsed -i Makefile -e "s;^\(MAKE_CMD = \$(MAKE)\);& ${makejobs};"
CFLAGS+=" -DTARGET_SDL2"
- CFLAGS+=" -DRO_GAME_DIR='\"/usr/share/${pkgname}\"'"
- CFLAGS+=" -DRW_GAME_DIR='\"/var/lib/${pkgname}\"'"
+ CFLAGS+=" -DBASE_PATH='\"/usr/share/${pkgname}\"'"
CFLAGS+=" $(sdl2-config --cflags)"
LDFLAGS+=" $(sdl2-config --libs) -lSDL2_image -lSDL2_mixer -lSDL2_net -lm -lz"
make CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] rocksndiamonds: update to 4.3.0.1
2021-11-20 15:43 [PR PATCH] rocksndiamonds: update to 4.3.0.1 clyhtsuriva
@ 2021-11-20 23:31 ` clyhtsuriva
2021-11-21 17:50 ` ericonr
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: clyhtsuriva @ 2021-11-20 23:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1310 bytes --]
There is an updated pull request by clyhtsuriva against master on the void-packages repository
https://github.com/clyhtsuriva/void-packages rocksndiamonds-update
https://github.com/void-linux/void-packages/pull/34169
rocksndiamonds: update to 4.3.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures :
- aarch64-musl
- armv7l
- armv6l-musl
#### Note
I modified the build flags as the Makefile now only use BASE_PATH replacing both XX_GAME_DIR.
A patch file from https://github.com/void-linux/void-packages/pull/34169.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rocksndiamonds-update-34169.patch --]
[-- Type: text/x-diff, Size: 1535 bytes --]
From 2204d4bd967a2e668ddb65bc5f1f797b5568dc02 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Sat, 20 Nov 2021 16:18:46 +0100
Subject: [PATCH] rocksndiamonds: update to 4.3.0.1
---
srcpkgs/rocksndiamonds/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index 1985dee75923..b2301018dc39 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -1,6 +1,6 @@
# Template file for 'rocksndiamonds'
pkgname=rocksndiamonds
-version=4.2.3.1
+version=4.3.0.1
revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
@@ -10,14 +10,13 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://www.artsoft.org/rocksndiamonds"
distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=58c1a63c147b7e6a2294d461cb65e6162e8493ec144a4d7b405544f48c432dca
+checksum=997f6cddb2fc48aed6e6b524b150974410f43956b420d37ebc098f40be92807c
replaces="rocksndiamonds-data>=0"
do_build() {
vsed -i Makefile -e "s;^\(MAKE_CMD = \$(MAKE)\);& ${makejobs};"
CFLAGS+=" -DTARGET_SDL2"
- CFLAGS+=" -DRO_GAME_DIR='\"/usr/share/${pkgname}\"'"
- CFLAGS+=" -DRW_GAME_DIR='\"/var/lib/${pkgname}\"'"
+ CFLAGS+=" -DBASE_PATH='\"/usr/share/${pkgname}\"'"
CFLAGS+=" $(sdl2-config --cflags)"
LDFLAGS+=" $(sdl2-config --libs) -lSDL2_image -lSDL2_mixer -lSDL2_net -lm -lz"
make CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: rocksndiamonds: update to 4.3.0.1
2021-11-20 15:43 [PR PATCH] rocksndiamonds: update to 4.3.0.1 clyhtsuriva
2021-11-20 23:31 ` [PR PATCH] [Updated] " clyhtsuriva
@ 2021-11-21 17:50 ` ericonr
2021-11-21 18:01 ` [PR PATCH] [Updated] " clyhtsuriva
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-11-21 17:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/34169#issuecomment-974863499
Comment:
Can you rebase this PR on `void-linux/master` so the merge commit goes away?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] rocksndiamonds: update to 4.3.0.1
2021-11-20 15:43 [PR PATCH] rocksndiamonds: update to 4.3.0.1 clyhtsuriva
2021-11-20 23:31 ` [PR PATCH] [Updated] " clyhtsuriva
2021-11-21 17:50 ` ericonr
@ 2021-11-21 18:01 ` clyhtsuriva
2021-11-21 18:02 ` clyhtsuriva
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: clyhtsuriva @ 2021-11-21 18:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1310 bytes --]
There is an updated pull request by clyhtsuriva against master on the void-packages repository
https://github.com/clyhtsuriva/void-packages rocksndiamonds-update
https://github.com/void-linux/void-packages/pull/34169
rocksndiamonds: update to 4.3.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures :
- aarch64-musl
- armv7l
- armv6l-musl
#### Note
I modified the build flags as the Makefile now only use BASE_PATH replacing both XX_GAME_DIR.
A patch file from https://github.com/void-linux/void-packages/pull/34169.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rocksndiamonds-update-34169.patch --]
[-- Type: text/x-diff, Size: 1535 bytes --]
From 0f4509ecb79c4d909cc5c9a25d1c4f791446bd71 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Sat, 20 Nov 2021 16:18:46 +0100
Subject: [PATCH] rocksndiamonds: update to 4.3.0.1
---
srcpkgs/rocksndiamonds/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index 1985dee75923..b2301018dc39 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -1,6 +1,6 @@
# Template file for 'rocksndiamonds'
pkgname=rocksndiamonds
-version=4.2.3.1
+version=4.3.0.1
revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
@@ -10,14 +10,13 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://www.artsoft.org/rocksndiamonds"
distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=58c1a63c147b7e6a2294d461cb65e6162e8493ec144a4d7b405544f48c432dca
+checksum=997f6cddb2fc48aed6e6b524b150974410f43956b420d37ebc098f40be92807c
replaces="rocksndiamonds-data>=0"
do_build() {
vsed -i Makefile -e "s;^\(MAKE_CMD = \$(MAKE)\);& ${makejobs};"
CFLAGS+=" -DTARGET_SDL2"
- CFLAGS+=" -DRO_GAME_DIR='\"/usr/share/${pkgname}\"'"
- CFLAGS+=" -DRW_GAME_DIR='\"/var/lib/${pkgname}\"'"
+ CFLAGS+=" -DBASE_PATH='\"/usr/share/${pkgname}\"'"
CFLAGS+=" $(sdl2-config --cflags)"
LDFLAGS+=" $(sdl2-config --libs) -lSDL2_image -lSDL2_mixer -lSDL2_net -lm -lz"
make CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: rocksndiamonds: update to 4.3.0.1
2021-11-20 15:43 [PR PATCH] rocksndiamonds: update to 4.3.0.1 clyhtsuriva
` (2 preceding siblings ...)
2021-11-21 18:01 ` [PR PATCH] [Updated] " clyhtsuriva
@ 2021-11-21 18:02 ` clyhtsuriva
2021-11-21 18:26 ` ericonr
2021-11-21 18:35 ` [PR PATCH] [Merged]: " ericonr
5 siblings, 0 replies; 7+ messages in thread
From: clyhtsuriva @ 2021-11-21 18:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New comment by clyhtsuriva on void-packages repository
https://github.com/void-linux/void-packages/pull/34169#issuecomment-974865293
Comment:
Hi @ericonr, have I done it right ?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: rocksndiamonds: update to 4.3.0.1
2021-11-20 15:43 [PR PATCH] rocksndiamonds: update to 4.3.0.1 clyhtsuriva
` (3 preceding siblings ...)
2021-11-21 18:02 ` clyhtsuriva
@ 2021-11-21 18:26 ` ericonr
2021-11-21 18:35 ` [PR PATCH] [Merged]: " ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-11-21 18:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 144 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/34169#issuecomment-974868843
Comment:
Yes
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: rocksndiamonds: update to 4.3.0.1
2021-11-20 15:43 [PR PATCH] rocksndiamonds: update to 4.3.0.1 clyhtsuriva
` (4 preceding siblings ...)
2021-11-21 18:26 ` ericonr
@ 2021-11-21 18:35 ` ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-11-21 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1132 bytes --]
There's a merged pull request on the void-packages repository
rocksndiamonds: update to 4.3.0.1
https://github.com/void-linux/void-packages/pull/34169
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures :
- aarch64-musl
- armv7l
- armv6l-musl
#### Note
I modified the build flags as the Makefile now only use BASE_PATH replacing both XX_GAME_DIR.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-11-21 18:35 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-20 15:43 [PR PATCH] rocksndiamonds: update to 4.3.0.1 clyhtsuriva
2021-11-20 23:31 ` [PR PATCH] [Updated] " clyhtsuriva
2021-11-21 17:50 ` ericonr
2021-11-21 18:01 ` [PR PATCH] [Updated] " clyhtsuriva
2021-11-21 18:02 ` clyhtsuriva
2021-11-21 18:26 ` ericonr
2021-11-21 18:35 ` [PR PATCH] [Merged]: " ericonr
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).