Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] supertux2: update to 0.6.3.
@ 2022-05-15 16:16 mobinmob
  2022-05-16 21:22 ` ericonr
  2022-05-16 21:22 ` [PR PATCH] [Merged]: " ericonr
  0 siblings, 2 replies; 3+ messages in thread
From: mobinmob @ 2022-05-15 16:16 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mobinmob/void-packages supertux
https://github.com/void-linux/void-packages/pull/37143

supertux2: update to 0.6.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

@beefcurtains 
@ericonr I think the patch is not needed anymore....

<!--
#### 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 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/37143.patch is attached

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

From 83c7c41bc480bf3ba54f13d2f157530d63164232 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 15 May 2022 19:14:45 +0300
Subject: [PATCH] supertux2: update to 0.6.3.

---
 srcpkgs/supertux2/patches/locale.patch | 36 --------------------------
 srcpkgs/supertux2/template             |  8 +++---
 2 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/supertux2/patches/locale.patch

diff --git a/srcpkgs/supertux2/patches/locale.patch b/srcpkgs/supertux2/patches/locale.patch
deleted file mode 100644
index ffe38ae8a266..000000000000
--- a/srcpkgs/supertux2/patches/locale.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 4380f504fbd51aa9ef7eb222b0bced481402fa7d
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Wed Dec 9 16:22:22 2020 -0300
-
-    supertux/main: add try-catch for locale initialization.
-    
-    Fixes #1564.
-
-diff --git src/supertux/main.cpp src/supertux/main.cpp
-index ad5e3fde6..c33627e18 100644
---- a/src/supertux/main.cpp
-+++ b/src/supertux/main.cpp
-@@ -563,10 +563,19 @@ Main::run(int argc, char** argv)
- 	_wfreopen(w_errpath.c_str(), L"a", stderr);
- #endif
- 
--  // Create and install global locale
--  std::locale::global(boost::locale::generator().generate(""));
--  // Make boost.filesystem use it
--  boost::filesystem::path::imbue(std::locale());
-+  // Create and install global locale - this can fail on some setups:
-+  // - with bad LANG values
-+  // - targets where libstdc++ uses its generic locales code (https://gcc.gnu.org/legacy-ml/libstdc++/2003-02/msg00345.html)
-+  try
-+  {
-+    std::locale::global(boost::locale::generator().generate(""));
-+    // Make boost.filesystem use it
-+    boost::filesystem::path::imbue(std::locale());
-+  }
-+  catch(const std::runtime_error& err)
-+  {
-+    std::cout << "Warning: " << err.what() << std::endl;
-+  }
- 
-   int result = 0;
- 
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 4c39b458dad4..56057f5837d5 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
 # Template file for 'supertux2'
 pkgname=supertux2
-version=0.6.2
-revision=3
+version=0.6.3
+revision=1
 wrksrc="SuperTux-v${version}-Source"
 build_style=cmake
 configure_args="
@@ -12,13 +12,13 @@ configure_args="
 make_cmd=make
 hostmakedepends="pkg-config"
 makedepends="SDL2_image-devel boost-devel glew-devel libcurl-devel
- libopenal-devel libraqm-devel physfs-devel"
+ libopenal-devel libraqm-devel physfs-devel glm"
 short_desc="Side-scrolling platform game, milestone 2"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
 license="GPL-3.0-or-later, GPL-2.0-or-later, CC-BY-SA-3.0, CC-BY-SA-4.0, CC-BY-3.0"
 homepage="https://supertux.github.io/"
 distfiles="https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"
-checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
+checksum=f7940e6009c40226eb34ebab8ffb0e3a894892d891a07b35d0e5762dd41c79f6
 replaces="supertux2-data>=0"
 
 export CMAKE_GENERATOR="Unix Makefiles"

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

* Re: supertux2: update to 0.6.3.
  2022-05-15 16:16 [PR PATCH] supertux2: update to 0.6.3 mobinmob
@ 2022-05-16 21:22 ` ericonr
  2022-05-16 21:22 ` [PR PATCH] [Merged]: " ericonr
  1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2022-05-16 21:22 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/37143#issuecomment-1128150451

Comment:
Yup, I upstreamed it. Thanks!

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

* Re: [PR PATCH] [Merged]: supertux2: update to 0.6.3.
  2022-05-15 16:16 [PR PATCH] supertux2: update to 0.6.3 mobinmob
  2022-05-16 21:22 ` ericonr
@ 2022-05-16 21:22 ` ericonr
  1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2022-05-16 21:22 UTC (permalink / raw)
  To: ml

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

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

supertux2: update to 0.6.3.
https://github.com/void-linux/void-packages/pull/37143

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

@beefcurtains 
@ericonr I think the patch is not needed anymore....

<!--
#### 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 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] 3+ messages in thread

end of thread, other threads:[~2022-05-16 21:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-15 16:16 [PR PATCH] supertux2: update to 0.6.3 mobinmob
2022-05-16 21:22 ` ericonr
2022-05-16 21:22 ` [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).