Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d <jason1987d@users.noreply.github.com>]

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

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- 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

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

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

From 653438777616abbc1d27009a15f6a7d4b6214937 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Mon, 16 May 2022 16:14:16 -0500
Subject: [PATCH 1/2] New package: q5go-2.12

---
 srcpkgs/q5go/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/q5go/template

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..41c4abd23e8f
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,20 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"

From f48a87a4507d7005c846f01d08328103d5dc958d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 15 May 2022 19:14:45 +0300
Subject: [PATCH 2/2] 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"