Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] openttd: update to 14.0.
@ 2024-04-14 18:08 Emru1
  2024-04-25 19:49 ` [PR PATCH] [Merged]: " cinerea0
  0 siblings, 1 reply; 2+ messages in thread
From: Emru1 @ 2024-04-14 18:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

There is a new pull request by Emru1 against master on the void-packages repository

https://github.com/Emru1/void-packages openttd
https://github.com/void-linux/void-packages/pull/49841

openttd: update to 14.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/49841.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openttd-49841.patch --]
[-- Type: text/x-diff, Size: 3181 bytes --]

From 8c417764e6e4419cf46ceb32500dbbc9d8dbb38e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Sun, 14 Apr 2024 19:52:06 +0200
Subject: [PATCH] openttd: update to 14.0.

---
 srcpkgs/openttd/patches/regression_tests.patch | 12 ------------
 srcpkgs/openttd/template                       |  6 +++---
 srcpkgs/openttd/update                         |  2 --
 3 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/openttd/patches/regression_tests.patch
 delete mode 100644 srcpkgs/openttd/update

diff --git a/srcpkgs/openttd/patches/regression_tests.patch b/srcpkgs/openttd/patches/regression_tests.patch
deleted file mode 100644
index 59b87e5faa2f52..00000000000000
--- a/srcpkgs/openttd/patches/regression_tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix regression tests on musl libc
-index 19fece83f5..641e1e6de2 100644
---- a/openttd-13.4/cmake/scripts/Regression.cmake
-+++ b/openttd-13.4/cmake/scripts/Regression.cmake
-@@ -53,6 +53,7 @@ endif()
- string(REPLACE "0x(nil)" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
- string(REPLACE "0x0000000000000000" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
- string(REPLACE "0x0x0" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
-+string(REPLACE "(null : 0x0)" "(null : 0x00000000)" REGRESSION_RESULT "${REGRESSION_RESULT}")
- 
- # Remove timestamps if any
- string(REGEX REPLACE "\[[0-9-]+ [0-9:]+\] " "" REGRESSION_RESULT "${REGRESSION_RESULT}")
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index cffbb80b270268..080dd789124ead 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,6 +1,6 @@
 # Template file for 'openttd'
 pkgname=openttd
-version=13.4
+version=14.0
 revision=1
 _gfxver=7.1
 _sfxver=1.0.3
@@ -22,14 +22,14 @@ makedepends="SDL2-devel libcurl-devel freetype-devel fontconfig-devel
  harfbuzz-devel icu-devel libpng-devel liblzma-devel fluidsynth-devel"
 depends="hicolor-icon-theme fluidsynth soundfont-fluid"
 short_desc="Open Source version of Transport Tycoon Deluxe"
-maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
+maintainer="Emil Tomczyk <emru@emru.xyz>"
 license="GPL-2.0-only, Zlib"
 homepage="https://www.openttd.org/"
 distfiles="https://cdn.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz
  https://cdn.openttd.org/opengfx-releases/${_gfxver}/opengfx-${_gfxver}-all.zip
  https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip
  https://cdn.openttd.org/openmsx-releases/${_msxver}/openmsx-${_msxver}-all.zip"
-checksum="2a1deba01bfe58e2188879f450c3fa4f3819271ab49bf348dd66545f040d146f
+checksum="96f76ab858816a5e30038ade0692e6ebf350b9f70bf19c7b48dda845c88418b1
  928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846
  e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759
  5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762"
diff --git a/srcpkgs/openttd/update b/srcpkgs/openttd/update
deleted file mode 100644
index 4303c0c21d179b..00000000000000
--- a/srcpkgs/openttd/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=http://binaries.openttd.org/releases/
-pattern='href="\K[\d]+\.[\d]+\.[\d]+(?=[^-])'

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: openttd: update to 14.0.
  2024-04-14 18:08 [PR PATCH] openttd: update to 14.0 Emru1
@ 2024-04-25 19:49 ` cinerea0
  0 siblings, 0 replies; 2+ messages in thread
From: cinerea0 @ 2024-04-25 19:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1083 bytes --]

There's a merged pull request on the void-packages repository

openttd: update to 14.0.
https://github.com/void-linux/void-packages/pull/49841

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] 2+ messages in thread

end of thread, other threads:[~2024-04-25 19:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-14 18:08 [PR PATCH] openttd: update to 14.0 Emru1
2024-04-25 19:49 ` [PR PATCH] [Merged]: " cinerea0

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).