* [PR PATCH] devilutionX: switch to the -src tarball; drop gettext
@ 2023-01-16 10:16 kruceter
2023-01-17 2:55 ` [PR PATCH] [Updated] " kruceter
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: kruceter @ 2023-01-16 10:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1882 bytes --]
There is a new pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages devilutionx
https://github.com/void-linux/void-packages/pull/41678
devilutionX: switch to the -src tarball; drop gettext
One of the upstream maintainers (glebm) suggested[^1] to use the `src` tarball instead of `src-fully-vendored`, which does not bundle libraries already available in the repository (SDL2, SDL2_image, libfmt, bzip2, libsodium, googletest) without the need to specify dedicated configure flags for them.
gettext is used for generating `libdevilutionX.mpq` but not required here because it is shipped in the tarball.
Rebuild is not required as the result is the same: shlibs, extracted files, configuration are identical.
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[^1]: https://github.com/diasurgical/devilutionX/issues/5664#issuecomment-1383685675
A patch file from https://github.com/void-linux/void-packages/pull/41678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionx-41678.patch --]
[-- Type: text/x-diff, Size: 2299 bytes --]
From 95988d9e27e363ea32bc0738a87b76aad88ace7d Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 16 Jan 2023 12:48:51 +0300
Subject: [PATCH] devilutionX: switch to the -src tarball; drop gettext
One of the upstream maintainers (glebm) suggested to use the "src"
tarball instead of "src-fully-vendored", which does not bundle
libraries already available in the repository (SDL2, SDL2_image,
libfmt, bzip2, libsodium, googletest) without the need to specify
dedicated configure flags for them.
gettext is used for generating libdevilutionX.mpq but not required here
because it is shipped in the tarball.
Rebuild is not required as the result is the same: shlibs, extracted
files, configuration are identical.
---
srcpkgs/devilutionX/template | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 7e46cd95a68e..030024aaa00b 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -4,11 +4,8 @@ version=1.4.1
revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DFETCHCONTENT_FULLY_DISCONNECTED=ON
- -DDISABLE_ZERO_TIER=ON -DDEVILUTIONX_SYSTEM_GOOGLETEST=ON
- -DDEVILUTIONX_SYSTEM_SDL2=ON -DDEVILUTIONX_SYSTEM_SDL_IMAGE=ON
- -DDEVILUTIONX_SYSTEM_LIBFMT=ON -DDEVILUTIONX_SYSTEM_BZIP2=ON
- -DDEVILUTIONX_SYSTEM_LIBSODIUM=ON"
-hostmakedepends="pkg-config gettext"
+ -DDISABLE_ZERO_TIER=ON"
+hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
@@ -16,8 +13,8 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src-fully-vendored.tar.xz"
-checksum=80527c29cd1d369ce905be426b671350b400c9468b73ef8cfbe6a09a563aeac0
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
+checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: switch to the -src tarball; drop gettext
2023-01-16 10:16 [PR PATCH] devilutionX: switch to the -src tarball; drop gettext kruceter
@ 2023-01-17 2:55 ` kruceter
2023-01-17 2:57 ` kruceter
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: kruceter @ 2023-01-17 2:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1887 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages devilutionx
https://github.com/void-linux/void-packages/pull/41678
devilutionX: switch to the -src tarball; drop gettext
One of the upstream maintainers (glebm) suggested[^1] to use the `src` tarball instead of `src-fully-vendored`, which does not bundle libraries already available in the repository (SDL2, SDL2_image, libfmt, bzip2, libsodium, googletest) without the need to specify dedicated configure flags for them.
gettext is used for generating `libdevilutionX.mpq` but not required here because it is shipped in the tarball.
Rebuild is not required as the result is the same: shlibs, extracted files, configuration are identical.
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[^1]: https://github.com/diasurgical/devilutionX/issues/5664#issuecomment-1383685675
A patch file from https://github.com/void-linux/void-packages/pull/41678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionx-41678.patch --]
[-- Type: text/x-diff, Size: 2546 bytes --]
From a5a4f08a540ca5c5e7f272787c7e7b8af109dfb1 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 16 Jan 2023 12:48:51 +0300
Subject: [PATCH] devilutionX: switch to the -src tarball; drop gettext
One of the upstream maintainers (glebm) suggested to use the "src"
tarball instead of "src-fully-vendored", which does not bundle
libraries already available in the repository (SDL2, SDL2_image,
libfmt, bzip2, libsodium, googletest) without the need to specify
dedicated configure flags for them.
gettext is used for generating libdevilutionX.mpq but not required here
because it is shipped in the tarball.
Rebuild is not required as the result is the same: shlibs, extracted
files, configuration are identical.
"-DFETCHCONTENT_FULLY_DISCONNECTED=ON" now is globally used in
48dabfa86779c1b32d40055ffc5747ba36332152 following the previous update
for this package, so it is not needed here anymore.
---
srcpkgs/devilutionX/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 7e46cd95a68e..902309be5352 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -3,12 +3,8 @@ pkgname=devilutionX
version=1.4.1
revision=1
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DFETCHCONTENT_FULLY_DISCONNECTED=ON
- -DDISABLE_ZERO_TIER=ON -DDEVILUTIONX_SYSTEM_GOOGLETEST=ON
- -DDEVILUTIONX_SYSTEM_SDL2=ON -DDEVILUTIONX_SYSTEM_SDL_IMAGE=ON
- -DDEVILUTIONX_SYSTEM_LIBFMT=ON -DDEVILUTIONX_SYSTEM_BZIP2=ON
- -DDEVILUTIONX_SYSTEM_LIBSODIUM=ON"
-hostmakedepends="pkg-config gettext"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
@@ -16,8 +12,8 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src-fully-vendored.tar.xz"
-checksum=80527c29cd1d369ce905be426b671350b400c9468b73ef8cfbe6a09a563aeac0
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
+checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: switch to the -src tarball; drop gettext
2023-01-16 10:16 [PR PATCH] devilutionX: switch to the -src tarball; drop gettext kruceter
2023-01-17 2:55 ` [PR PATCH] [Updated] " kruceter
@ 2023-01-17 2:57 ` kruceter
2023-01-17 23:31 ` paper42
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: kruceter @ 2023-01-17 2:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1887 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages devilutionx
https://github.com/void-linux/void-packages/pull/41678
devilutionX: switch to the -src tarball; drop gettext
One of the upstream maintainers (glebm) suggested[^1] to use the `src` tarball instead of `src-fully-vendored`, which does not bundle libraries already available in the repository (SDL2, SDL2_image, libfmt, bzip2, libsodium, googletest) without the need to specify dedicated configure flags for them.
gettext is used for generating `libdevilutionX.mpq` but not required here because it is shipped in the tarball.
Rebuild is not required as the result is the same: shlibs, extracted files, configuration are identical.
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[^1]: https://github.com/diasurgical/devilutionX/issues/5664#issuecomment-1383685675
A patch file from https://github.com/void-linux/void-packages/pull/41678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionx-41678.patch --]
[-- Type: text/x-diff, Size: 2542 bytes --]
From 97edde072bb1ebee6167489a8b31802fd097c5d4 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 16 Jan 2023 12:48:51 +0300
Subject: [PATCH] devilutionX: switch to the -src tarball; drop gettext
One of the upstream maintainers (glebm) suggested to use the "src"
tarball instead of "src-fully-vendored", which does not bundle
libraries already available in the repository (SDL2, SDL2_image,
libfmt, bzip2, libsodium, googletest) without the need to specify
dedicated configure flags for them.
gettext is used for generating libdevilutionX.mpq but not required here
because it is shipped in the tarball.
Rebuild is not required as the result is the same: shlibs, extracted
files, configuration are identical.
"-DFETCHCONTENT_FULLY_DISCONNECTED=ON" now is globally used in
48dabfa86779c1b32d40055ffc5747ba36332152 after the previous update
for this package, so it is not needed here anymore.
---
srcpkgs/devilutionX/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 7e46cd95a68e..902309be5352 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -3,12 +3,8 @@ pkgname=devilutionX
version=1.4.1
revision=1
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DFETCHCONTENT_FULLY_DISCONNECTED=ON
- -DDISABLE_ZERO_TIER=ON -DDEVILUTIONX_SYSTEM_GOOGLETEST=ON
- -DDEVILUTIONX_SYSTEM_SDL2=ON -DDEVILUTIONX_SYSTEM_SDL_IMAGE=ON
- -DDEVILUTIONX_SYSTEM_LIBFMT=ON -DDEVILUTIONX_SYSTEM_BZIP2=ON
- -DDEVILUTIONX_SYSTEM_LIBSODIUM=ON"
-hostmakedepends="pkg-config gettext"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
@@ -16,8 +12,8 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src-fully-vendored.tar.xz"
-checksum=80527c29cd1d369ce905be426b671350b400c9468b73ef8cfbe6a09a563aeac0
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
+checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: devilutionX: switch to the -src tarball; drop gettext
2023-01-16 10:16 [PR PATCH] devilutionX: switch to the -src tarball; drop gettext kruceter
2023-01-17 2:55 ` [PR PATCH] [Updated] " kruceter
2023-01-17 2:57 ` kruceter
@ 2023-01-17 23:31 ` paper42
2023-01-18 0:24 ` bugcrazy
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: paper42 @ 2023-01-17 23:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41678#issuecomment-1386237688
Comment:
@bugcrazy would you mind reviewing these changes?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: devilutionX: switch to the -src tarball; drop gettext
2023-01-16 10:16 [PR PATCH] devilutionX: switch to the -src tarball; drop gettext kruceter
` (2 preceding siblings ...)
2023-01-17 23:31 ` paper42
@ 2023-01-18 0:24 ` bugcrazy
2023-01-18 1:00 ` [PR REVIEW] " bugcrazy
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: bugcrazy @ 2023-01-18 0:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New comment by bugcrazy on void-packages repository
https://github.com/void-linux/void-packages/pull/41678#issuecomment-1386279564
Comment:
> @bugcrazy would you mind reviewing these changes?
I reviewed the changes, it's all right (okay)!
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR REVIEW] devilutionX: switch to the -src tarball; drop gettext
2023-01-16 10:16 [PR PATCH] devilutionX: switch to the -src tarball; drop gettext kruceter
` (3 preceding siblings ...)
2023-01-18 0:24 ` bugcrazy
@ 2023-01-18 1:00 ` bugcrazy
2023-01-18 1:20 ` kruceter
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: bugcrazy @ 2023-01-18 1:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New review comment by bugcrazy on void-packages repository
https://github.com/void-linux/void-packages/pull/41678#discussion_r1072977800
Comment:
Change to `revision=2`
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR REVIEW] devilutionX: switch to the -src tarball; drop gettext
2023-01-16 10:16 [PR PATCH] devilutionX: switch to the -src tarball; drop gettext kruceter
` (4 preceding siblings ...)
2023-01-18 1:00 ` [PR REVIEW] " bugcrazy
@ 2023-01-18 1:20 ` kruceter
2023-01-18 1:32 ` ahesford
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: kruceter @ 2023-01-18 1:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 467 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41678#discussion_r1072995105
Comment:
Why should I do that? Whatever I have done here does not affect the distributed package at all (see CI's "compare to previous" output).
The commit message written by me has the following reasoning:
```
Rebuild is not required as the result is the same: shlibs, extracted files, configuration are identical.
```
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR REVIEW] devilutionX: switch to the -src tarball; drop gettext
2023-01-16 10:16 [PR PATCH] devilutionX: switch to the -src tarball; drop gettext kruceter
` (5 preceding siblings ...)
2023-01-18 1:20 ` kruceter
@ 2023-01-18 1:32 ` ahesford
2023-01-18 1:38 ` kruceter
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: ahesford @ 2023-01-18 1:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/41678#discussion_r1073001139
Comment:
You're changing the source tarball and the arguments passed at configuration time. Whether the metadata appears different or not, the revision should be bumped.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR REVIEW] devilutionX: switch to the -src tarball; drop gettext
2023-01-16 10:16 [PR PATCH] devilutionX: switch to the -src tarball; drop gettext kruceter
` (6 preceding siblings ...)
2023-01-18 1:32 ` ahesford
@ 2023-01-18 1:38 ` kruceter
2023-01-18 1:38 ` [PR PATCH] [Updated] " kruceter
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: kruceter @ 2023-01-18 1:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41678#discussion_r1073004266
Comment:
Done!
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: switch to the -src tarball; drop gettext
2023-01-16 10:16 [PR PATCH] devilutionX: switch to the -src tarball; drop gettext kruceter
` (7 preceding siblings ...)
2023-01-18 1:38 ` kruceter
@ 2023-01-18 1:38 ` kruceter
2023-01-18 1:45 ` kruceter
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: kruceter @ 2023-01-18 1:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2070 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages devilutionx
https://github.com/void-linux/void-packages/pull/41678
devilutionX: switch to the -src tarball; drop gettext
One of the upstream maintainers (glebm) suggested[^1] to use the `src` tarball instead of `src-fully-vendored`, which does not bundle libraries already available in the repository (SDL2, SDL2_image, libfmt, bzip2, libsodium, googletest) without the need to specify dedicated configure flags for them.
gettext is used for generating `libdevilutionX.mpq` but not required here because it is shipped in the tarball.
Rebuild is not required as the result is the same: shlibs, extracted files, configuration are identical.
`-DFETCHCONTENT_FULLY_DISCONNECTED=ON` now is globally used in 48dabfa86779c1b32d40055ffc5747ba36332152 after the previous update for this package, so it is not needed here anymore.
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[^1]: https://github.com/diasurgical/devilutionX/issues/5664#issuecomment-1383685675
A patch file from https://github.com/void-linux/void-packages/pull/41678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionx-41678.patch --]
[-- Type: text/x-diff, Size: 2593 bytes --]
From cd177a0230aadf37b2088ed80bd561c45adca059 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 16 Jan 2023 12:48:51 +0300
Subject: [PATCH] devilutionX: switch to the -src tarball; drop gettext
One of the upstream maintainers (glebm) suggested to use the "src"
tarball instead of "src-fully-vendored", which does not bundle
libraries already available in the repository (SDL2, SDL2_image,
libfmt, bzip2, libsodium, googletest) without the need to specify
dedicated configure flags for them.
gettext is used for generating libdevilutionX.mpq but not required here
because it is shipped in the tarball.
Rebuild is not required as the result is the same: shlibs, extracted
files, configuration are identical.
"-DFETCHCONTENT_FULLY_DISCONNECTED=ON" now is globally used in
48dabfa86779c1b32d40055ffc5747ba36332152 after the previous update
for this package, so it is not needed here anymore.
---
srcpkgs/devilutionX/template | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 7e46cd95a68e..b9a7c445409f 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,14 +1,10 @@
# Template file for 'devilutionX'
pkgname=devilutionX
version=1.4.1
-revision=1
+revision=2
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DFETCHCONTENT_FULLY_DISCONNECTED=ON
- -DDISABLE_ZERO_TIER=ON -DDEVILUTIONX_SYSTEM_GOOGLETEST=ON
- -DDEVILUTIONX_SYSTEM_SDL2=ON -DDEVILUTIONX_SYSTEM_SDL_IMAGE=ON
- -DDEVILUTIONX_SYSTEM_LIBFMT=ON -DDEVILUTIONX_SYSTEM_BZIP2=ON
- -DDEVILUTIONX_SYSTEM_LIBSODIUM=ON"
-hostmakedepends="pkg-config gettext"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
@@ -16,8 +12,8 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src-fully-vendored.tar.xz"
-checksum=80527c29cd1d369ce905be426b671350b400c9468b73ef8cfbe6a09a563aeac0
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
+checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: switch to the -src tarball; drop gettext
2023-01-16 10:16 [PR PATCH] devilutionX: switch to the -src tarball; drop gettext kruceter
` (8 preceding siblings ...)
2023-01-18 1:38 ` [PR PATCH] [Updated] " kruceter
@ 2023-01-18 1:45 ` kruceter
2023-01-18 1:47 ` kruceter
2023-01-18 4:50 ` [PR PATCH] [Merged]: " classabbyamp
11 siblings, 0 replies; 13+ messages in thread
From: kruceter @ 2023-01-18 1:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2070 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages devilutionx
https://github.com/void-linux/void-packages/pull/41678
devilutionX: switch to the -src tarball; drop gettext
One of the upstream maintainers (glebm) suggested[^1] to use the `src` tarball instead of `src-fully-vendored`, which does not bundle libraries already available in the repository (SDL2, SDL2_image, libfmt, bzip2, libsodium, googletest) without the need to specify dedicated configure flags for them.
gettext is used for generating `libdevilutionX.mpq` but not required here because it is shipped in the tarball.
Rebuild is not required as the result is the same: shlibs, extracted files, configuration are identical.
`-DFETCHCONTENT_FULLY_DISCONNECTED=ON` now is globally used in 48dabfa86779c1b32d40055ffc5747ba36332152 after the previous update for this package, so it is not needed here anymore.
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[^1]: https://github.com/diasurgical/devilutionX/issues/5664#issuecomment-1383685675
A patch file from https://github.com/void-linux/void-packages/pull/41678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionx-41678.patch --]
[-- Type: text/x-diff, Size: 2487 bytes --]
From 5bf046bab4f89b01b9a0cf0ff54bddbc0ee1ccb2 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 16 Jan 2023 12:48:51 +0300
Subject: [PATCH] devilutionX: switch to the -src tarball; drop gettext
One of the upstream maintainers (glebm) suggested to use the "src"
tarball instead of "src-fully-vendored", which does not bundle
libraries already available in the repository (SDL2, SDL2_image,
libfmt, bzip2, libsodium, googletest) without the need to specify
dedicated configure flags for them.
gettext is used for generating libdevilutionX.mpq but not required here
because it is shipped in the tarball.
"-DFETCHCONTENT_FULLY_DISCONNECTED=ON" now is globally used in
48dabfa86779c1b32d40055ffc5747ba36332152 after the previous update
for this package, so it is not needed here anymore.
---
srcpkgs/devilutionX/template | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 7e46cd95a68e..b9a7c445409f 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,14 +1,10 @@
# Template file for 'devilutionX'
pkgname=devilutionX
version=1.4.1
-revision=1
+revision=2
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DFETCHCONTENT_FULLY_DISCONNECTED=ON
- -DDISABLE_ZERO_TIER=ON -DDEVILUTIONX_SYSTEM_GOOGLETEST=ON
- -DDEVILUTIONX_SYSTEM_SDL2=ON -DDEVILUTIONX_SYSTEM_SDL_IMAGE=ON
- -DDEVILUTIONX_SYSTEM_LIBFMT=ON -DDEVILUTIONX_SYSTEM_BZIP2=ON
- -DDEVILUTIONX_SYSTEM_LIBSODIUM=ON"
-hostmakedepends="pkg-config gettext"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
@@ -16,8 +12,8 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src-fully-vendored.tar.xz"
-checksum=80527c29cd1d369ce905be426b671350b400c9468b73ef8cfbe6a09a563aeac0
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
+checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: switch to the -src tarball; drop gettext
2023-01-16 10:16 [PR PATCH] devilutionX: switch to the -src tarball; drop gettext kruceter
` (9 preceding siblings ...)
2023-01-18 1:45 ` kruceter
@ 2023-01-18 1:47 ` kruceter
2023-01-18 4:50 ` [PR PATCH] [Merged]: " classabbyamp
11 siblings, 0 replies; 13+ messages in thread
From: kruceter @ 2023-01-18 1:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1962 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages devilutionx
https://github.com/void-linux/void-packages/pull/41678
devilutionX: switch to the -src tarball; drop gettext
One of the upstream maintainers (glebm) suggested[^1] to use the `src` tarball instead of `src-fully-vendored`, which does not bundle libraries already available in the repository (SDL2, SDL2_image, libfmt, bzip2, libsodium, googletest) without the need to specify dedicated configure flags for them.
gettext is used for generating `libdevilutionX.mpq` but not required here because it is shipped in the tarball.
`-DFETCHCONTENT_FULLY_DISCONNECTED=ON` now is globally used in 48dabfa86779c1b32d40055ffc5747ba36332152 after the previous update for this package, so it is not needed here anymore.
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[^1]: https://github.com/diasurgical/devilutionX/issues/5664#issuecomment-1383685675
A patch file from https://github.com/void-linux/void-packages/pull/41678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionx-41678.patch --]
[-- Type: text/x-diff, Size: 2487 bytes --]
From 57dbbffea14320c3bad3c218ba8fea41de4f9458 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 16 Jan 2023 12:48:51 +0300
Subject: [PATCH] devilutionX: switch to the -src tarball; drop gettext
One of the upstream maintainers (glebm) suggested to use the "src"
tarball instead of "src-fully-vendored", which does not bundle
libraries already available in the repository (SDL2, SDL2_image,
libfmt, bzip2, libsodium, googletest) without the need to specify
dedicated configure flags for them.
gettext is used for generating libdevilutionX.mpq but not required here
because it is shipped in the tarball.
"-DFETCHCONTENT_FULLY_DISCONNECTED=ON" now is globally used in
48dabfa86779c1b32d40055ffc5747ba36332152 after the previous update
for this package, so it is not needed here anymore.
---
srcpkgs/devilutionX/template | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 7e46cd95a68e..b9a7c445409f 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,14 +1,10 @@
# Template file for 'devilutionX'
pkgname=devilutionX
version=1.4.1
-revision=1
+revision=2
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DFETCHCONTENT_FULLY_DISCONNECTED=ON
- -DDISABLE_ZERO_TIER=ON -DDEVILUTIONX_SYSTEM_GOOGLETEST=ON
- -DDEVILUTIONX_SYSTEM_SDL2=ON -DDEVILUTIONX_SYSTEM_SDL_IMAGE=ON
- -DDEVILUTIONX_SYSTEM_LIBFMT=ON -DDEVILUTIONX_SYSTEM_BZIP2=ON
- -DDEVILUTIONX_SYSTEM_LIBSODIUM=ON"
-hostmakedepends="pkg-config gettext"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
@@ -16,8 +12,8 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src-fully-vendored.tar.xz"
-checksum=80527c29cd1d369ce905be426b671350b400c9468b73ef8cfbe6a09a563aeac0
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
+checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Merged]: devilutionX: switch to the -src tarball; drop gettext
2023-01-16 10:16 [PR PATCH] devilutionX: switch to the -src tarball; drop gettext kruceter
` (10 preceding siblings ...)
2023-01-18 1:47 ` kruceter
@ 2023-01-18 4:50 ` classabbyamp
11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2023-01-18 4:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1800 bytes --]
There's a merged pull request on the void-packages repository
devilutionX: switch to the -src tarball; drop gettext
https://github.com/void-linux/void-packages/pull/41678
Description:
One of the upstream maintainers (glebm) suggested[^1] to use the `src` tarball instead of `src-fully-vendored`, which does not bundle libraries already available in the repository (SDL2, SDL2_image, libfmt, bzip2, libsodium, googletest) without the need to specify dedicated configure flags for them.
gettext is used for generating `libdevilutionX.mpq` but not required here because it is shipped in the tarball.
`-DFETCHCONTENT_FULLY_DISCONNECTED=ON` now is globally used in 48dabfa86779c1b32d40055ffc5747ba36332152 after the previous update for this package, so it is not needed here anymore.
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[^1]: https://github.com/diasurgical/devilutionX/issues/5664#issuecomment-1383685675
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2023-01-18 4:50 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-16 10:16 [PR PATCH] devilutionX: switch to the -src tarball; drop gettext kruceter
2023-01-17 2:55 ` [PR PATCH] [Updated] " kruceter
2023-01-17 2:57 ` kruceter
2023-01-17 23:31 ` paper42
2023-01-18 0:24 ` bugcrazy
2023-01-18 1:00 ` [PR REVIEW] " bugcrazy
2023-01-18 1:20 ` kruceter
2023-01-18 1:32 ` ahesford
2023-01-18 1:38 ` kruceter
2023-01-18 1:38 ` [PR PATCH] [Updated] " kruceter
2023-01-18 1:45 ` kruceter
2023-01-18 1:47 ` kruceter
2023-01-18 4:50 ` [PR PATCH] [Merged]: " 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).