* [PR PATCH] devilutionX: update to 1.5.0
@ 2023-06-14 7:27 bugcrazy
2023-06-19 19:12 ` Duncaen
` (17 more replies)
0 siblings, 18 replies; 19+ messages in thread
From: bugcrazy @ 2023-06-14 7:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is a new pull request by bugcrazy against master on the void-packages repository
https://github.com/bugcrazy/void-packages patch-10
https://github.com/void-linux/void-packages/pull/44425
devilutionX: update to 1.5.0
<!-- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/44425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-10-44425.patch --]
[-- Type: text/x-diff, Size: 1488 bytes --]
From 761cf23d2aaae3069635149d854cac071370ffd5 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Wed, 14 Jun 2023 04:26:07 -0300
Subject: [PATCH] devilutionX: update to 1.5.0
---
srcpkgs/devilutionX/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index b9a7c445409f..dfcec90c53a0 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=2
+version=1.5.0
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,12 @@ 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"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
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.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=425e63891792c4ab213865f8e1b4401317439bf47450f18064ee72ebf9a2abf8
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: devilutionX: update to 1.5.0
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
@ 2023-06-19 19:12 ` Duncaen
2023-06-20 7:25 ` bugcrazy
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Duncaen @ 2023-06-19 19:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/44425#issuecomment-1597638542
Comment:
This may be "nonfree".
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: devilutionX: update to 1.5.0
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
2023-06-19 19:12 ` Duncaen
@ 2023-06-20 7:25 ` bugcrazy
2023-06-20 7:51 ` [PR PATCH] [Updated] " bugcrazy
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: bugcrazy @ 2023-06-20 7:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
New comment by bugcrazy on void-packages repository
https://github.com/void-linux/void-packages/pull/44425#issuecomment-1598256470
Comment:
> This may be "nonfree".
It's a nonfree license!
https://blog.n8n.io/announcing-new-sustainable-use-license/
https://n8n.io/blog/fair-code-for-sustainable-open-source-alternatives/
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.0
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
2023-06-19 19:12 ` Duncaen
2023-06-20 7:25 ` bugcrazy
@ 2023-06-20 7:51 ` bugcrazy
2023-06-20 14:45 ` SolitudeSF
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: bugcrazy @ 2023-06-20 7:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is an updated pull request by bugcrazy against master on the void-packages repository
https://github.com/bugcrazy/void-packages patch-10
https://github.com/void-linux/void-packages/pull/44425
devilutionX: update to 1.5.0
<!-- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/44425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-10-44425.patch --]
[-- Type: text/x-diff, Size: 1511 bytes --]
From dd35685dd30efdda27a60b21cf8b29d8960fa536 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Tue, 20 Jun 2023 04:50:45 -0300
Subject: [PATCH] devilutionX: update to 1.5.0
---
srcpkgs/devilutionX/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index b9a7c445409f..23b525650198 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=2
+version=1.5.0
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ 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"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
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.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=425e63891792c4ab213865f8e1b4401317439bf47450f18064ee72ebf9a2abf8
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: devilutionX: update to 1.5.0
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (2 preceding siblings ...)
2023-06-20 7:51 ` [PR PATCH] [Updated] " bugcrazy
@ 2023-06-20 14:45 ` SolitudeSF
2023-06-27 5:25 ` bugcrazy
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: SolitudeSF @ 2023-06-20 14:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New comment by SolitudeSF on void-packages repository
https://github.com/void-linux/void-packages/pull/44425#issuecomment-1598933681
Comment:
https://github.com/void-linux/void-packages/pull/44521#issuecomment-1597602204
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: devilutionX: update to 1.5.0
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (3 preceding siblings ...)
2023-06-20 14:45 ` SolitudeSF
@ 2023-06-27 5:25 ` bugcrazy
2023-06-27 7:35 ` SolitudeSF
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: bugcrazy @ 2023-06-27 5:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 238 bytes --]
New comment by bugcrazy on void-packages repository
https://github.com/void-linux/void-packages/pull/44425#issuecomment-1608819280
Comment:
I compiled on 2 different machines for x86_64, x86_64-musl and i686, there were no test errors.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: devilutionX: update to 1.5.0
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (4 preceding siblings ...)
2023-06-27 5:25 ` bugcrazy
@ 2023-06-27 7:35 ` SolitudeSF
2023-06-27 7:36 ` SolitudeSF
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: SolitudeSF @ 2023-06-27 7:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New comment by SolitudeSF on void-packages repository
https://github.com/void-linux/void-packages/pull/44425#issuecomment-1608957643
Comment:
Unless you somehow included game data in chroot, there should be test errors.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: devilutionX: update to 1.5.0
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (5 preceding siblings ...)
2023-06-27 7:35 ` SolitudeSF
@ 2023-06-27 7:36 ` SolitudeSF
2023-06-28 6:15 ` [PR PATCH] [Updated] " bugcrazy
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: SolitudeSF @ 2023-06-27 7:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New comment by SolitudeSF on void-packages repository
https://github.com/void-linux/void-packages/pull/44425#issuecomment-1608957643
Comment:
Unless you somehow included game data in chroot, there should be test errors. As indicated by CI.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.0
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (6 preceding siblings ...)
2023-06-27 7:36 ` SolitudeSF
@ 2023-06-28 6:15 ` bugcrazy
2023-06-28 6:40 ` bugcrazy
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: bugcrazy @ 2023-06-28 6:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is an updated pull request by bugcrazy against master on the void-packages repository
https://github.com/bugcrazy/void-packages patch-10
https://github.com/void-linux/void-packages/pull/44425
devilutionX: update to 1.5.0
<!-- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/44425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-10-44425.patch --]
[-- Type: text/x-diff, Size: 2414 bytes --]
From dd35685dd30efdda27a60b21cf8b29d8960fa536 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Tue, 20 Jun 2023 04:50:45 -0300
Subject: [PATCH 1/2] devilutionX: update to 1.5.0
---
srcpkgs/devilutionX/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index b9a7c445409f..23b525650198 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=2
+version=1.5.0
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ 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"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
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.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=425e63891792c4ab213865f8e1b4401317439bf47450f18064ee72ebf9a2abf8
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 0f277b588d23e8ffc0742ed368b199364ecc675a Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Wed, 28 Jun 2023 03:15:12 -0300
Subject: [PATCH 2/2] Added SolitudeSF patch
---
srcpkgs/devilutionX/patches/disable_test.patch | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 000000000000..b89421cd7aaa
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,12 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index b84cb2e..bcdcf51 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -38,7 +38,6 @@ set(tests
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.0
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (7 preceding siblings ...)
2023-06-28 6:15 ` [PR PATCH] [Updated] " bugcrazy
@ 2023-06-28 6:40 ` bugcrazy
2023-06-28 6:41 ` bugcrazy
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: bugcrazy @ 2023-06-28 6:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is an updated pull request by bugcrazy against master on the void-packages repository
https://github.com/bugcrazy/void-packages patch-10
https://github.com/void-linux/void-packages/pull/44425
devilutionX: update to 1.5.0
<!-- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/44425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-10-44425.patch --]
[-- Type: text/x-diff, Size: 2217 bytes --]
From 26a9fa587d826341976faf581ecf091d7a3d12b1 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Tue, 20 Jun 2023 04:50:45 -0300
Subject: [PATCH] devilutionX: update to 1.5.0
Added SolitudeSF patch
---
srcpkgs/devilutionX/patches/disable_test.patch | 12 ++++++++++++
srcpkgs/devilutionX/template | 11 ++++++-----
2 files changed, 18 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 000000000000..b89421cd7aaa
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,12 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index b84cb2e..bcdcf51 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -38,7 +38,6 @@ set(tests
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index b9a7c445409f..23b525650198 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=2
+version=1.5.0
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ 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"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
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.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=425e63891792c4ab213865f8e1b4401317439bf47450f18064ee72ebf9a2abf8
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: devilutionX: update to 1.5.0
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (8 preceding siblings ...)
2023-06-28 6:40 ` bugcrazy
@ 2023-06-28 6:41 ` bugcrazy
2023-07-24 1:00 ` kedodrill
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: bugcrazy @ 2023-06-28 6:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
New comment by bugcrazy on void-packages repository
https://github.com/void-linux/void-packages/pull/44425#issuecomment-1610854178
Comment:
> Unless you somehow included game data in chroot, there should be test errors. As indicated by CI.
I added your patch!
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: devilutionX: update to 1.5.0
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (9 preceding siblings ...)
2023-06-28 6:41 ` bugcrazy
@ 2023-07-24 1:00 ` kedodrill
2023-09-04 18:52 ` [PR PATCH] [Updated] " bugcrazy
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: kedodrill @ 2023-07-24 1:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
New comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/44425#issuecomment-1647043425
Comment:
Fwiw, played through the shareware version of diablo with this and it was fine. Although the license changed and now must be stuck in the nonfree repo, 1.5.0 does bring a lot of fixes.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.0
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (10 preceding siblings ...)
2023-07-24 1:00 ` kedodrill
@ 2023-09-04 18:52 ` bugcrazy
2023-12-04 1:46 ` devilutionX: update to 1.5.1 github-actions
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: bugcrazy @ 2023-09-04 18:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is an updated pull request by bugcrazy against master on the void-packages repository
https://github.com/bugcrazy/void-packages patch-10
https://github.com/void-linux/void-packages/pull/44425
devilutionX: update to 1.5.0
<!-- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/44425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-10-44425.patch --]
[-- Type: text/x-diff, Size: 2220 bytes --]
From f591971ed152b520bf4d80adf9d3d1dc2b951864 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Mon, 4 Sep 2023 14:30:59 -0300
Subject: [PATCH] devilutionX: update to 1.5.1
Added SolitudeSF patch
---
srcpkgs/devilutionX/patches/disable_test.patch | 12 ++++++++++++
srcpkgs/devilutionX/template | 11 ++++++-----
2 files changed, 18 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 0000000000000..b89421cd7aaa5
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,12 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index b84cb2e..bcdcf51 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -38,7 +38,6 @@ set(tests
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index b9a7c445409f5..6bdb2c69e8277 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=2
+version=1.5.1
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ 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"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
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.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=e3d478aa7da95385d67d6e37016441df969965f5653f83c64e0019ee824ebd4f
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: devilutionX: update to 1.5.1
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (11 preceding siblings ...)
2023-09-04 18:52 ` [PR PATCH] [Updated] " bugcrazy
@ 2023-12-04 1:46 ` github-actions
2023-12-06 13:48 ` bugcrazy
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: github-actions @ 2023-12-04 1:46 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/44425#issuecomment-1837711750
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] 19+ messages in thread
* Re: devilutionX: update to 1.5.1
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (12 preceding siblings ...)
2023-12-04 1:46 ` devilutionX: update to 1.5.1 github-actions
@ 2023-12-06 13:48 ` bugcrazy
2024-01-21 15:49 ` [PR PATCH] [Updated] " bugcrazy
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: bugcrazy @ 2023-12-06 13:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New comment by bugcrazy on void-packages repository
https://github.com/void-linux/void-packages/pull/44425#issuecomment-1842924356
Comment:
PR is waiting for approval or not!?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.1
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (13 preceding siblings ...)
2023-12-06 13:48 ` bugcrazy
@ 2024-01-21 15:49 ` bugcrazy
2024-02-15 15:20 ` MIvanchev
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: bugcrazy @ 2024-01-21 15:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is an updated pull request by bugcrazy against master on the void-packages repository
https://github.com/bugcrazy/void-packages patch-10
https://github.com/void-linux/void-packages/pull/44425
devilutionX: update to 1.5.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 [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
-->
A patch file from https://github.com/void-linux/void-packages/pull/44425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-10-44425.patch --]
[-- Type: text/x-diff, Size: 2198 bytes --]
From 9edf0caf0dfbad24d51e51be49e06b3bc1b39d6e Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sun, 21 Jan 2024 12:40:47 -0300
Subject: [PATCH] devilutionX: update to 1.5.1
---
srcpkgs/devilutionX/patches/disable_test.patch | 12 ++++++++++++
srcpkgs/devilutionX/template | 11 ++++++-----
2 files changed, 18 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 0000000000000..b89421cd7aaa5
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,12 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index b84cb2e..bcdcf51 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -38,7 +38,6 @@ set(tests
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..6bdb2c69e8277 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.1
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ 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"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
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.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=e3d478aa7da95385d67d6e37016441df969965f5653f83c64e0019ee824ebd4f
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: devilutionX: update to 1.5.1
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (14 preceding siblings ...)
2024-01-21 15:49 ` [PR PATCH] [Updated] " bugcrazy
@ 2024-02-15 15:20 ` MIvanchev
2024-05-16 1:46 ` github-actions
2024-05-30 1:47 ` [PR PATCH] [Closed]: " github-actions
17 siblings, 0 replies; 19+ messages in thread
From: MIvanchev @ 2024-02-15 15:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/44425#issuecomment-1946308768
Comment:
Hey, I updated to 1.5.2 in #48628 so IMO this can be closed. I did some additional patching to deal with the covert downloads of dependencies. I also fixed the failing test by downloading the shareware version during the build.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: devilutionX: update to 1.5.1
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (15 preceding siblings ...)
2024-02-15 15:20 ` MIvanchev
@ 2024-05-16 1:46 ` github-actions
2024-05-30 1:47 ` [PR PATCH] [Closed]: " github-actions
17 siblings, 0 replies; 19+ messages in thread
From: github-actions @ 2024-05-16 1:46 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/44425#issuecomment-2113785553
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] 19+ messages in thread
* Re: [PR PATCH] [Closed]: devilutionX: update to 1.5.1
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
` (16 preceding siblings ...)
2024-05-16 1:46 ` github-actions
@ 2024-05-30 1:47 ` github-actions
17 siblings, 0 replies; 19+ messages in thread
From: github-actions @ 2024-05-30 1:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]
There's a closed pull request on the void-packages repository
devilutionX: update to 1.5.1
https://github.com/void-linux/void-packages/pull/44425
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 [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
-->
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-05-30 1:47 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-14 7:27 [PR PATCH] devilutionX: update to 1.5.0 bugcrazy
2023-06-19 19:12 ` Duncaen
2023-06-20 7:25 ` bugcrazy
2023-06-20 7:51 ` [PR PATCH] [Updated] " bugcrazy
2023-06-20 14:45 ` SolitudeSF
2023-06-27 5:25 ` bugcrazy
2023-06-27 7:35 ` SolitudeSF
2023-06-27 7:36 ` SolitudeSF
2023-06-28 6:15 ` [PR PATCH] [Updated] " bugcrazy
2023-06-28 6:40 ` bugcrazy
2023-06-28 6:41 ` bugcrazy
2023-07-24 1:00 ` kedodrill
2023-09-04 18:52 ` [PR PATCH] [Updated] " bugcrazy
2023-12-04 1:46 ` devilutionX: update to 1.5.1 github-actions
2023-12-06 13:48 ` bugcrazy
2024-01-21 15:49 ` [PR PATCH] [Updated] " bugcrazy
2024-02-15 15:20 ` MIvanchev
2024-05-16 1:46 ` github-actions
2024-05-30 1:47 ` [PR PATCH] [Closed]: " github-actions
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).