Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] xmoto: update to 0.6.1.
@ 2020-08-03 21:28 abenson
  2020-08-03 21:32 ` [PR REVIEW] " ericonr
                   ` (12 more replies)
  0 siblings, 13 replies; 14+ messages in thread
From: abenson @ 2020-08-03 21:28 UTC (permalink / raw)
  To: ml

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

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

https://github.com/abenson/void-packages xmoto_0.6.1
https://github.com/void-linux/void-packages/pull/24030

xmoto: update to 0.6.1.


A patch file from https://github.com/void-linux/void-packages/pull/24030.patch is attached

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

From 5631e8b87b46b3ea8e8a1337742fd27b4d137d05 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 22 Jun 2020 21:18:04 -0500
Subject: [PATCH] xmoto: update to 0.6.1.

---
 srcpkgs/xmoto/patches/fix-gcc7.patch          | 47 -------------------
 srcpkgs/xmoto/patches/fix-include.patch       | 25 ----------
 .../patches/modernize-configure_ac.patch      | 16 -------
 srcpkgs/xmoto/patches/musl-stdint_h.patch     | 10 ----
 srcpkgs/xmoto/template                        | 32 +++----------
 5 files changed, 7 insertions(+), 123 deletions(-)
 delete mode 100644 srcpkgs/xmoto/patches/fix-gcc7.patch
 delete mode 100644 srcpkgs/xmoto/patches/fix-include.patch
 delete mode 100644 srcpkgs/xmoto/patches/modernize-configure_ac.patch
 delete mode 100644 srcpkgs/xmoto/patches/musl-stdint_h.patch

diff --git a/srcpkgs/xmoto/patches/fix-gcc7.patch b/srcpkgs/xmoto/patches/fix-gcc7.patch
deleted file mode 100644
index bf8b1cba1f3..00000000000
--- a/srcpkgs/xmoto/patches/fix-gcc7.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./src/WWW.cpp.orig	2018-01-16 10:53:58.725405426 +0100
-+++ ./src/WWW.cpp	2018-01-16 10:55:14.802101942 +0100
-@@ -206,7 +206,7 @@ void FSWeb::downloadFile(const std::stri
-   std::string v_www_agent = WWW_AGENT;
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " 
-         + v_local_file_tmp);
-   }
-@@ -320,7 +320,7 @@ void FSWeb::uploadReplay(const std::stri
-   LogInfo(std::string("Uploading replay " + p_replayFilename).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("UR"));
-   }
-       
-@@ -478,7 +478,7 @@ void FSWeb::sendVote(const std::string&
-   LogInfo("Sending vote");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SV"));
-   }
-       
-@@ -562,7 +562,7 @@ void FSWeb::sendReport(const std::string
-   LogInfo("Sending report");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SR"));
-   }
-       
-@@ -677,7 +677,7 @@ void FSWeb::uploadDbSync(const std::stri
-   LogInfo(std::string("Uploading dbsync " + p_dbSyncFilename + " to " + p_url_to_transfert).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(p_answerFile.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " + p_answerFile);
-   }
-       
diff --git a/srcpkgs/xmoto/patches/fix-include.patch b/srcpkgs/xmoto/patches/fix-include.patch
deleted file mode 100644
index 4bc2179e376..00000000000
--- a/srcpkgs/xmoto/patches/fix-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/net/NetActions.cpp.orig	2018-01-16 11:03:55.152026167 +0100
-+++ src/net/NetActions.cpp	2018-01-16 11:03:59.910007186 +0100
-@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite
- #include <sstream>
- #include "../helpers/SwapEndian.h"
- #include "helpers/Net.h"
--#include "helpers/utf8.h"
-+#include "../helpers/utf8.h"
- 
- char NetAction::m_buffer[NETACTION_MAX_PACKET_SIZE];
- unsigned int NetAction::m_biggestTCPPacketSent = 0;
---- src/helpers/utf8.h.orig	2018-01-16 11:08:10.042009362 +0100
-+++ src/helpers/utf8.h	2018-01-16 11:08:17.306980381 +0100
-@@ -18,8 +18,8 @@ along with XMOTO; if not, write to the F
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- =============================================================================*/
- 
--#ifndef __UTF8_H__
--#define __UTF8_H__
-+#ifndef __MYUTF8_H__
-+#define __MYUTF8_H__
- 
- #include <vector>
- #include <string>
-
diff --git a/srcpkgs/xmoto/patches/modernize-configure_ac.patch b/srcpkgs/xmoto/patches/modernize-configure_ac.patch
deleted file mode 100644
index be88ff4c6b5..00000000000
--- a/srcpkgs/xmoto/patches/modernize-configure_ac.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.in	2014-03-29 11:35:24.000000000 +0100
-+++ configure.in	2015-11-03 13:02:49.686607352 +0100
-@@ -1,8 +1,8 @@
--AC_INIT(src/GameInit.cpp)
--
--AC_CANONICAL_TARGET()
--AM_INIT_AUTOMAKE(xmoto,0.5.11)
--AC_GNU_SOURCE
-+AC_PREREQ([2.69])
-+AC_INIT([xmoto],[0.5.11])
-+AC_CONFIG_SRCDIR(src/GameInit.cpp)
-+AM_INIT_AUTOMAKE([1.15 foreign gnu subdir-objects])
-+LT_INIT
- 
- AC_PROG_CXX
- AC_PROG_CPP
diff --git a/srcpkgs/xmoto/patches/musl-stdint_h.patch b/srcpkgs/xmoto/patches/musl-stdint_h.patch
deleted file mode 100644
index 03684b56923..00000000000
--- a/srcpkgs/xmoto/patches/musl-stdint_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DBuffer.cpp	2011-10-11 22:18:35.000000000 +0200
-+++ src/DBuffer.cpp	2015-10-01 22:28:36.654255001 +0200
-@@ -23,6 +23,7 @@
-  */
- #include "DBuffer.h"
- #include "helpers/SwapEndian.h"
-+#include <stdint.h>
- #include <algorithm>
- 
-   void DBuffer::_FreeDBuffer(void) {
diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template
index 70803d714f2..a0ea2d7353b 100644
--- a/srcpkgs/xmoto/template
+++ b/srcpkgs/xmoto/template
@@ -1,9 +1,9 @@
 # Template file for 'xmoto'
 pkgname=xmoto
-version=0.5.11
-revision=11
-build_style=gnu-configure
-configure_args="--disable-sdltest CPPFLAGS=-DdDOUBLE"
+version=0.6.1
+revision=1
+build_style=cmake
+configure_args="-DOpenGL_GL_PREFERENCE=GLVND"
 hostmakedepends="automake libtool gettext-devel intltool desktop-file-utils"
 makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
  libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel
@@ -13,27 +13,9 @@ short_desc="2D motocross platform game"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://xmoto.tuxfamily.org/"
-distfiles="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"
-checksum=a584a6f9292b184686b72c78f16de4b82d5c5b72ad89e41912ff50d03eca26b2
-
-# Build using the old C++ ABI to fix issue with missing text; the issue
-# should be fixed in the next stable release (if that ever does happen)
-CPPFLAGS+=" -D_GLIBCXX_USE_CXX11_ABI=0"
-
-if [ "$CROSS_BUILD" ]; then
-	# configure can't test this when cross compiling
-	export ac_cv_lib_GLU_gluBuild2DMipmaps=yes
-	LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib"
-	hostmakedepends+=" SDL_mixer-devel libxml2-devel"
-fi
-
-pre_configure() {
-	# remove old ode version
-	rm -r src/ode
-	mv configure.{in,ac}
-	libtoolize
-	./bootstrap
-}
+distfiles="https://github.com/xmoto/xmoto/archive/${version}/${version}.tar.gz"
+checksum=209c8c38b1742d0620d40f90365c7a56f67c86da826c80a76d37fa46ee9c9b66
+nocross="Packing xmoto.bin; /bin/sh: xmoto: command not found"
 
 post_install() {
 	desktop-file-install --set-key=Icon --set-value=xmoto -m 0644 \

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

* Re: [PR REVIEW] xmoto: update to 0.6.1.
  2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
@ 2020-08-03 21:32 ` ericonr
  2020-08-03 23:05 ` [PR PATCH] [Updated] " abenson
                   ` (11 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2020-08-03 21:32 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24030#discussion_r464673606

Comment:
Did you try anything with qemu?

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

* Re: [PR PATCH] [Updated] xmoto: update to 0.6.1.
  2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
  2020-08-03 21:32 ` [PR REVIEW] " ericonr
@ 2020-08-03 23:05 ` abenson
  2020-08-04  0:03 ` abenson
                   ` (10 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: abenson @ 2020-08-03 23:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/abenson/void-packages xmoto_0.6.1
https://github.com/void-linux/void-packages/pull/24030

xmoto: update to 0.6.1.


A patch file from https://github.com/void-linux/void-packages/pull/24030.patch is attached

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

From 7a77d8e514665b6aecd10869424dd968147078c1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 22 Jun 2020 21:18:04 -0500
Subject: [PATCH] xmoto: update to 0.6.1.

---
 srcpkgs/xmoto/patches/fix-gcc7.patch          | 47 -------------------
 srcpkgs/xmoto/patches/fix-include.patch       | 25 ----------
 .../patches/modernize-configure_ac.patch      | 16 -------
 srcpkgs/xmoto/patches/musl-stdint_h.patch     | 10 ----
 srcpkgs/xmoto/template                        | 32 ++++---------
 5 files changed, 9 insertions(+), 121 deletions(-)
 delete mode 100644 srcpkgs/xmoto/patches/fix-gcc7.patch
 delete mode 100644 srcpkgs/xmoto/patches/fix-include.patch
 delete mode 100644 srcpkgs/xmoto/patches/modernize-configure_ac.patch
 delete mode 100644 srcpkgs/xmoto/patches/musl-stdint_h.patch

diff --git a/srcpkgs/xmoto/patches/fix-gcc7.patch b/srcpkgs/xmoto/patches/fix-gcc7.patch
deleted file mode 100644
index bf8b1cba1f3..00000000000
--- a/srcpkgs/xmoto/patches/fix-gcc7.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./src/WWW.cpp.orig	2018-01-16 10:53:58.725405426 +0100
-+++ ./src/WWW.cpp	2018-01-16 10:55:14.802101942 +0100
-@@ -206,7 +206,7 @@ void FSWeb::downloadFile(const std::stri
-   std::string v_www_agent = WWW_AGENT;
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " 
-         + v_local_file_tmp);
-   }
-@@ -320,7 +320,7 @@ void FSWeb::uploadReplay(const std::stri
-   LogInfo(std::string("Uploading replay " + p_replayFilename).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("UR"));
-   }
-       
-@@ -478,7 +478,7 @@ void FSWeb::sendVote(const std::string&
-   LogInfo("Sending vote");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SV"));
-   }
-       
-@@ -562,7 +562,7 @@ void FSWeb::sendReport(const std::string
-   LogInfo("Sending report");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SR"));
-   }
-       
-@@ -677,7 +677,7 @@ void FSWeb::uploadDbSync(const std::stri
-   LogInfo(std::string("Uploading dbsync " + p_dbSyncFilename + " to " + p_url_to_transfert).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(p_answerFile.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " + p_answerFile);
-   }
-       
diff --git a/srcpkgs/xmoto/patches/fix-include.patch b/srcpkgs/xmoto/patches/fix-include.patch
deleted file mode 100644
index 4bc2179e376..00000000000
--- a/srcpkgs/xmoto/patches/fix-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/net/NetActions.cpp.orig	2018-01-16 11:03:55.152026167 +0100
-+++ src/net/NetActions.cpp	2018-01-16 11:03:59.910007186 +0100
-@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite
- #include <sstream>
- #include "../helpers/SwapEndian.h"
- #include "helpers/Net.h"
--#include "helpers/utf8.h"
-+#include "../helpers/utf8.h"
- 
- char NetAction::m_buffer[NETACTION_MAX_PACKET_SIZE];
- unsigned int NetAction::m_biggestTCPPacketSent = 0;
---- src/helpers/utf8.h.orig	2018-01-16 11:08:10.042009362 +0100
-+++ src/helpers/utf8.h	2018-01-16 11:08:17.306980381 +0100
-@@ -18,8 +18,8 @@ along with XMOTO; if not, write to the F
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- =============================================================================*/
- 
--#ifndef __UTF8_H__
--#define __UTF8_H__
-+#ifndef __MYUTF8_H__
-+#define __MYUTF8_H__
- 
- #include <vector>
- #include <string>
-
diff --git a/srcpkgs/xmoto/patches/modernize-configure_ac.patch b/srcpkgs/xmoto/patches/modernize-configure_ac.patch
deleted file mode 100644
index be88ff4c6b5..00000000000
--- a/srcpkgs/xmoto/patches/modernize-configure_ac.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.in	2014-03-29 11:35:24.000000000 +0100
-+++ configure.in	2015-11-03 13:02:49.686607352 +0100
-@@ -1,8 +1,8 @@
--AC_INIT(src/GameInit.cpp)
--
--AC_CANONICAL_TARGET()
--AM_INIT_AUTOMAKE(xmoto,0.5.11)
--AC_GNU_SOURCE
-+AC_PREREQ([2.69])
-+AC_INIT([xmoto],[0.5.11])
-+AC_CONFIG_SRCDIR(src/GameInit.cpp)
-+AM_INIT_AUTOMAKE([1.15 foreign gnu subdir-objects])
-+LT_INIT
- 
- AC_PROG_CXX
- AC_PROG_CPP
diff --git a/srcpkgs/xmoto/patches/musl-stdint_h.patch b/srcpkgs/xmoto/patches/musl-stdint_h.patch
deleted file mode 100644
index 03684b56923..00000000000
--- a/srcpkgs/xmoto/patches/musl-stdint_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DBuffer.cpp	2011-10-11 22:18:35.000000000 +0200
-+++ src/DBuffer.cpp	2015-10-01 22:28:36.654255001 +0200
-@@ -23,6 +23,7 @@
-  */
- #include "DBuffer.h"
- #include "helpers/SwapEndian.h"
-+#include <stdint.h>
- #include <algorithm>
- 
-   void DBuffer::_FreeDBuffer(void) {
diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template
index 70803d714f2..441fa69edcf 100644
--- a/srcpkgs/xmoto/template
+++ b/srcpkgs/xmoto/template
@@ -1,9 +1,10 @@
 # Template file for 'xmoto'
 pkgname=xmoto
-version=0.5.11
-revision=11
-build_style=gnu-configure
-configure_args="--disable-sdltest CPPFLAGS=-DdDOUBLE"
+version=0.6.1
+revision=1
+build_style=cmake
+build_helper="qemu"
+configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DXMOTO_PACK=manual"
 hostmakedepends="automake libtool gettext-devel intltool desktop-file-utils"
 makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
  libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel
@@ -13,26 +14,11 @@ short_desc="2D motocross platform game"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://xmoto.tuxfamily.org/"
-distfiles="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"
-checksum=a584a6f9292b184686b72c78f16de4b82d5c5b72ad89e41912ff50d03eca26b2
+distfiles="https://github.com/xmoto/xmoto/archive/${version}/${version}.tar.gz"
+checksum=209c8c38b1742d0620d40f90365c7a56f67c86da826c80a76d37fa46ee9c9b66
 
-# Build using the old C++ ABI to fix issue with missing text; the issue
-# should be fixed in the next stable release (if that ever does happen)
-CPPFLAGS+=" -D_GLIBCXX_USE_CXX11_ABI=0"
-
-if [ "$CROSS_BUILD" ]; then
-	# configure can't test this when cross compiling
-	export ac_cv_lib_GLU_gluBuild2DMipmaps=yes
-	LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib"
-	hostmakedepends+=" SDL_mixer-devel libxml2-devel"
-fi
-
-pre_configure() {
-	# remove old ode version
-	rm -r src/ode
-	mv configure.{in,ac}
-	libtoolize
-	./bootstrap
+pre_install() {
+	vtargetrun build/src/xmoto --pack build/bin/xmoto.bin bin/
 }
 
 post_install() {

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

* Re: [PR PATCH] [Updated] xmoto: update to 0.6.1.
  2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
  2020-08-03 21:32 ` [PR REVIEW] " ericonr
  2020-08-03 23:05 ` [PR PATCH] [Updated] " abenson
@ 2020-08-04  0:03 ` abenson
  2020-08-04  0:04 ` abenson
                   ` (9 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: abenson @ 2020-08-04  0:03 UTC (permalink / raw)
  To: ml

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

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

https://github.com/abenson/void-packages xmoto_0.6.1
https://github.com/void-linux/void-packages/pull/24030

xmoto: update to 0.6.1.


A patch file from https://github.com/void-linux/void-packages/pull/24030.patch is attached

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

From 96a8fe2d0ba01585b4671e775431b901f402d3d0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 22 Jun 2020 21:18:04 -0500
Subject: [PATCH] xmoto: update to 0.6.1.

---
 srcpkgs/xmoto/patches/fix-gcc7.patch          | 47 -------------------
 srcpkgs/xmoto/patches/fix-include.patch       | 25 ----------
 .../patches/modernize-configure_ac.patch      | 16 -------
 srcpkgs/xmoto/patches/musl-stdint_h.patch     | 10 ----
 srcpkgs/xmoto/template                        | 32 ++++---------
 5 files changed, 9 insertions(+), 121 deletions(-)
 delete mode 100644 srcpkgs/xmoto/patches/fix-gcc7.patch
 delete mode 100644 srcpkgs/xmoto/patches/fix-include.patch
 delete mode 100644 srcpkgs/xmoto/patches/modernize-configure_ac.patch
 delete mode 100644 srcpkgs/xmoto/patches/musl-stdint_h.patch

diff --git a/srcpkgs/xmoto/patches/fix-gcc7.patch b/srcpkgs/xmoto/patches/fix-gcc7.patch
deleted file mode 100644
index bf8b1cba1f3..00000000000
--- a/srcpkgs/xmoto/patches/fix-gcc7.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./src/WWW.cpp.orig	2018-01-16 10:53:58.725405426 +0100
-+++ ./src/WWW.cpp	2018-01-16 10:55:14.802101942 +0100
-@@ -206,7 +206,7 @@ void FSWeb::downloadFile(const std::stri
-   std::string v_www_agent = WWW_AGENT;
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " 
-         + v_local_file_tmp);
-   }
-@@ -320,7 +320,7 @@ void FSWeb::uploadReplay(const std::stri
-   LogInfo(std::string("Uploading replay " + p_replayFilename).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("UR"));
-   }
-       
-@@ -478,7 +478,7 @@ void FSWeb::sendVote(const std::string&
-   LogInfo("Sending vote");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SV"));
-   }
-       
-@@ -562,7 +562,7 @@ void FSWeb::sendReport(const std::string
-   LogInfo("Sending report");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SR"));
-   }
-       
-@@ -677,7 +677,7 @@ void FSWeb::uploadDbSync(const std::stri
-   LogInfo(std::string("Uploading dbsync " + p_dbSyncFilename + " to " + p_url_to_transfert).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(p_answerFile.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " + p_answerFile);
-   }
-       
diff --git a/srcpkgs/xmoto/patches/fix-include.patch b/srcpkgs/xmoto/patches/fix-include.patch
deleted file mode 100644
index 4bc2179e376..00000000000
--- a/srcpkgs/xmoto/patches/fix-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/net/NetActions.cpp.orig	2018-01-16 11:03:55.152026167 +0100
-+++ src/net/NetActions.cpp	2018-01-16 11:03:59.910007186 +0100
-@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite
- #include <sstream>
- #include "../helpers/SwapEndian.h"
- #include "helpers/Net.h"
--#include "helpers/utf8.h"
-+#include "../helpers/utf8.h"
- 
- char NetAction::m_buffer[NETACTION_MAX_PACKET_SIZE];
- unsigned int NetAction::m_biggestTCPPacketSent = 0;
---- src/helpers/utf8.h.orig	2018-01-16 11:08:10.042009362 +0100
-+++ src/helpers/utf8.h	2018-01-16 11:08:17.306980381 +0100
-@@ -18,8 +18,8 @@ along with XMOTO; if not, write to the F
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- =============================================================================*/
- 
--#ifndef __UTF8_H__
--#define __UTF8_H__
-+#ifndef __MYUTF8_H__
-+#define __MYUTF8_H__
- 
- #include <vector>
- #include <string>
-
diff --git a/srcpkgs/xmoto/patches/modernize-configure_ac.patch b/srcpkgs/xmoto/patches/modernize-configure_ac.patch
deleted file mode 100644
index be88ff4c6b5..00000000000
--- a/srcpkgs/xmoto/patches/modernize-configure_ac.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.in	2014-03-29 11:35:24.000000000 +0100
-+++ configure.in	2015-11-03 13:02:49.686607352 +0100
-@@ -1,8 +1,8 @@
--AC_INIT(src/GameInit.cpp)
--
--AC_CANONICAL_TARGET()
--AM_INIT_AUTOMAKE(xmoto,0.5.11)
--AC_GNU_SOURCE
-+AC_PREREQ([2.69])
-+AC_INIT([xmoto],[0.5.11])
-+AC_CONFIG_SRCDIR(src/GameInit.cpp)
-+AM_INIT_AUTOMAKE([1.15 foreign gnu subdir-objects])
-+LT_INIT
- 
- AC_PROG_CXX
- AC_PROG_CPP
diff --git a/srcpkgs/xmoto/patches/musl-stdint_h.patch b/srcpkgs/xmoto/patches/musl-stdint_h.patch
deleted file mode 100644
index 03684b56923..00000000000
--- a/srcpkgs/xmoto/patches/musl-stdint_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DBuffer.cpp	2011-10-11 22:18:35.000000000 +0200
-+++ src/DBuffer.cpp	2015-10-01 22:28:36.654255001 +0200
-@@ -23,6 +23,7 @@
-  */
- #include "DBuffer.h"
- #include "helpers/SwapEndian.h"
-+#include <stdint.h>
- #include <algorithm>
- 
-   void DBuffer::_FreeDBuffer(void) {
diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template
index 70803d714f2..441fa69edcf 100644
--- a/srcpkgs/xmoto/template
+++ b/srcpkgs/xmoto/template
@@ -1,9 +1,10 @@
 # Template file for 'xmoto'
 pkgname=xmoto
-version=0.5.11
-revision=11
-build_style=gnu-configure
-configure_args="--disable-sdltest CPPFLAGS=-DdDOUBLE"
+version=0.6.1
+revision=1
+build_style=cmake
+build_helper="qemu"
+configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DXMOTO_PACK=manual"
 hostmakedepends="automake libtool gettext-devel intltool desktop-file-utils"
 makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
  libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel
@@ -13,26 +14,11 @@ short_desc="2D motocross platform game"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://xmoto.tuxfamily.org/"
-distfiles="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"
-checksum=a584a6f9292b184686b72c78f16de4b82d5c5b72ad89e41912ff50d03eca26b2
+distfiles="https://github.com/xmoto/xmoto/archive/${version}/${version}.tar.gz"
+checksum=209c8c38b1742d0620d40f90365c7a56f67c86da826c80a76d37fa46ee9c9b66
 
-# Build using the old C++ ABI to fix issue with missing text; the issue
-# should be fixed in the next stable release (if that ever does happen)
-CPPFLAGS+=" -D_GLIBCXX_USE_CXX11_ABI=0"
-
-if [ "$CROSS_BUILD" ]; then
-	# configure can't test this when cross compiling
-	export ac_cv_lib_GLU_gluBuild2DMipmaps=yes
-	LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib"
-	hostmakedepends+=" SDL_mixer-devel libxml2-devel"
-fi
-
-pre_configure() {
-	# remove old ode version
-	rm -r src/ode
-	mv configure.{in,ac}
-	libtoolize
-	./bootstrap
+pre_install() {
+	vtargetrun build/src/xmoto --pack build/bin/xmoto.bin bin/
 }
 
 post_install() {

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

* Re: [PR PATCH] [Updated] xmoto: update to 0.6.1.
  2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
                   ` (2 preceding siblings ...)
  2020-08-04  0:03 ` abenson
@ 2020-08-04  0:04 ` abenson
  2020-08-04  0:29 ` sgn
                   ` (8 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: abenson @ 2020-08-04  0:04 UTC (permalink / raw)
  To: ml

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

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

https://github.com/abenson/void-packages xmoto_0.6.1
https://github.com/void-linux/void-packages/pull/24030

xmoto: update to 0.6.1.


A patch file from https://github.com/void-linux/void-packages/pull/24030.patch is attached

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

From 7020e9098db7606edd5a561bce6cb565391e4b18 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 22 Jun 2020 21:18:04 -0500
Subject: [PATCH] xmoto: update to 0.6.1.

---
 srcpkgs/xmoto/patches/fix-gcc7.patch          | 47 -------------------
 srcpkgs/xmoto/patches/fix-include.patch       | 25 ----------
 .../xmoto/patches/fix_nl_msg_cat_cntr.patch   | 16 +++++++
 .../patches/modernize-configure_ac.patch      | 16 -------
 srcpkgs/xmoto/patches/musl-stdint_h.patch     | 10 ----
 srcpkgs/xmoto/template                        | 32 ++++---------
 6 files changed, 25 insertions(+), 121 deletions(-)
 delete mode 100644 srcpkgs/xmoto/patches/fix-gcc7.patch
 delete mode 100644 srcpkgs/xmoto/patches/fix-include.patch
 create mode 100644 srcpkgs/xmoto/patches/fix_nl_msg_cat_cntr.patch
 delete mode 100644 srcpkgs/xmoto/patches/modernize-configure_ac.patch
 delete mode 100644 srcpkgs/xmoto/patches/musl-stdint_h.patch

diff --git a/srcpkgs/xmoto/patches/fix-gcc7.patch b/srcpkgs/xmoto/patches/fix-gcc7.patch
deleted file mode 100644
index bf8b1cba1f3..00000000000
--- a/srcpkgs/xmoto/patches/fix-gcc7.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./src/WWW.cpp.orig	2018-01-16 10:53:58.725405426 +0100
-+++ ./src/WWW.cpp	2018-01-16 10:55:14.802101942 +0100
-@@ -206,7 +206,7 @@ void FSWeb::downloadFile(const std::stri
-   std::string v_www_agent = WWW_AGENT;
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " 
-         + v_local_file_tmp);
-   }
-@@ -320,7 +320,7 @@ void FSWeb::uploadReplay(const std::stri
-   LogInfo(std::string("Uploading replay " + p_replayFilename).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("UR"));
-   }
-       
-@@ -478,7 +478,7 @@ void FSWeb::sendVote(const std::string&
-   LogInfo("Sending vote");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SV"));
-   }
-       
-@@ -562,7 +562,7 @@ void FSWeb::sendReport(const std::string
-   LogInfo("Sending report");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SR"));
-   }
-       
-@@ -677,7 +677,7 @@ void FSWeb::uploadDbSync(const std::stri
-   LogInfo(std::string("Uploading dbsync " + p_dbSyncFilename + " to " + p_url_to_transfert).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(p_answerFile.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " + p_answerFile);
-   }
-       
diff --git a/srcpkgs/xmoto/patches/fix-include.patch b/srcpkgs/xmoto/patches/fix-include.patch
deleted file mode 100644
index 4bc2179e376..00000000000
--- a/srcpkgs/xmoto/patches/fix-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/net/NetActions.cpp.orig	2018-01-16 11:03:55.152026167 +0100
-+++ src/net/NetActions.cpp	2018-01-16 11:03:59.910007186 +0100
-@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite
- #include <sstream>
- #include "../helpers/SwapEndian.h"
- #include "helpers/Net.h"
--#include "helpers/utf8.h"
-+#include "../helpers/utf8.h"
- 
- char NetAction::m_buffer[NETACTION_MAX_PACKET_SIZE];
- unsigned int NetAction::m_biggestTCPPacketSent = 0;
---- src/helpers/utf8.h.orig	2018-01-16 11:08:10.042009362 +0100
-+++ src/helpers/utf8.h	2018-01-16 11:08:17.306980381 +0100
-@@ -18,8 +18,8 @@ along with XMOTO; if not, write to the F
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- =============================================================================*/
- 
--#ifndef __UTF8_H__
--#define __UTF8_H__
-+#ifndef __MYUTF8_H__
-+#define __MYUTF8_H__
- 
- #include <vector>
- #include <string>
-
diff --git a/srcpkgs/xmoto/patches/fix_nl_msg_cat_cntr.patch b/srcpkgs/xmoto/patches/fix_nl_msg_cat_cntr.patch
new file mode 100644
index 00000000000..409d48e309c
--- /dev/null
+++ b/srcpkgs/xmoto/patches/fix_nl_msg_cat_cntr.patch
@@ -0,0 +1,16 @@
+--- src/common/Locales.cpp.orig
++++ src/common/Locales.cpp
+@@ -67,11 +67,13 @@
+           setlocale(LC_MESSAGES, NULL));
+ #endif
+ 
++#if defined(__GLIBC__)
+   /* Make change known.  */
+   {
+     extern int _nl_msg_cat_cntr;
+     ++_nl_msg_cat_cntr;
+   }
++#endif
+ 
+   std::pair<std::string, std::string> locale_str(
+     locale.first == NULL ? std::string("") : std::string(locale.first),
diff --git a/srcpkgs/xmoto/patches/modernize-configure_ac.patch b/srcpkgs/xmoto/patches/modernize-configure_ac.patch
deleted file mode 100644
index be88ff4c6b5..00000000000
--- a/srcpkgs/xmoto/patches/modernize-configure_ac.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.in	2014-03-29 11:35:24.000000000 +0100
-+++ configure.in	2015-11-03 13:02:49.686607352 +0100
-@@ -1,8 +1,8 @@
--AC_INIT(src/GameInit.cpp)
--
--AC_CANONICAL_TARGET()
--AM_INIT_AUTOMAKE(xmoto,0.5.11)
--AC_GNU_SOURCE
-+AC_PREREQ([2.69])
-+AC_INIT([xmoto],[0.5.11])
-+AC_CONFIG_SRCDIR(src/GameInit.cpp)
-+AM_INIT_AUTOMAKE([1.15 foreign gnu subdir-objects])
-+LT_INIT
- 
- AC_PROG_CXX
- AC_PROG_CPP
diff --git a/srcpkgs/xmoto/patches/musl-stdint_h.patch b/srcpkgs/xmoto/patches/musl-stdint_h.patch
deleted file mode 100644
index 03684b56923..00000000000
--- a/srcpkgs/xmoto/patches/musl-stdint_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DBuffer.cpp	2011-10-11 22:18:35.000000000 +0200
-+++ src/DBuffer.cpp	2015-10-01 22:28:36.654255001 +0200
-@@ -23,6 +23,7 @@
-  */
- #include "DBuffer.h"
- #include "helpers/SwapEndian.h"
-+#include <stdint.h>
- #include <algorithm>
- 
-   void DBuffer::_FreeDBuffer(void) {
diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template
index 70803d714f2..441fa69edcf 100644
--- a/srcpkgs/xmoto/template
+++ b/srcpkgs/xmoto/template
@@ -1,9 +1,10 @@
 # Template file for 'xmoto'
 pkgname=xmoto
-version=0.5.11
-revision=11
-build_style=gnu-configure
-configure_args="--disable-sdltest CPPFLAGS=-DdDOUBLE"
+version=0.6.1
+revision=1
+build_style=cmake
+build_helper="qemu"
+configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DXMOTO_PACK=manual"
 hostmakedepends="automake libtool gettext-devel intltool desktop-file-utils"
 makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
  libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel
@@ -13,26 +14,11 @@ short_desc="2D motocross platform game"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://xmoto.tuxfamily.org/"
-distfiles="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"
-checksum=a584a6f9292b184686b72c78f16de4b82d5c5b72ad89e41912ff50d03eca26b2
+distfiles="https://github.com/xmoto/xmoto/archive/${version}/${version}.tar.gz"
+checksum=209c8c38b1742d0620d40f90365c7a56f67c86da826c80a76d37fa46ee9c9b66
 
-# Build using the old C++ ABI to fix issue with missing text; the issue
-# should be fixed in the next stable release (if that ever does happen)
-CPPFLAGS+=" -D_GLIBCXX_USE_CXX11_ABI=0"
-
-if [ "$CROSS_BUILD" ]; then
-	# configure can't test this when cross compiling
-	export ac_cv_lib_GLU_gluBuild2DMipmaps=yes
-	LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib"
-	hostmakedepends+=" SDL_mixer-devel libxml2-devel"
-fi
-
-pre_configure() {
-	# remove old ode version
-	rm -r src/ode
-	mv configure.{in,ac}
-	libtoolize
-	./bootstrap
+pre_install() {
+	vtargetrun build/src/xmoto --pack build/bin/xmoto.bin bin/
 }
 
 post_install() {

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

* Re: xmoto: update to 0.6.1.
  2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
                   ` (3 preceding siblings ...)
  2020-08-04  0:04 ` abenson
@ 2020-08-04  0:29 ` sgn
  2020-08-04  0:30 ` sgn
                   ` (7 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-08-04  0:29 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/24030#issuecomment-668305381

Comment:
This should work without patching for musl:
```
LDFLAGS+=" -lintl"
```

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

* Re: xmoto: update to 0.6.1.
  2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
                   ` (4 preceding siblings ...)
  2020-08-04  0:29 ` sgn
@ 2020-08-04  0:30 ` sgn
  2020-08-04  0:31 ` sgn
                   ` (6 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-08-04  0:30 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/24030#issuecomment-668305381

Comment:
This should work without patching for musl:
```
makedepends+=" gettext-libs"
LDFLAGS+=" -lintl"
```

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

* Re: xmoto: update to 0.6.1.
  2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
                   ` (5 preceding siblings ...)
  2020-08-04  0:30 ` sgn
@ 2020-08-04  0:31 ` sgn
  2020-08-04  0:42 ` [PR PATCH] [Updated] " abenson
                   ` (5 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-08-04  0:31 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/24030#issuecomment-668305381

Comment:
This should work without patching for musl:
```
makedepends+=" gettext-devel"
LDFLAGS+=" -lintl"
```

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

* Re: [PR PATCH] [Updated] xmoto: update to 0.6.1.
  2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
                   ` (6 preceding siblings ...)
  2020-08-04  0:31 ` sgn
@ 2020-08-04  0:42 ` abenson
  2020-08-04  0:50 ` sgn
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: abenson @ 2020-08-04  0:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/abenson/void-packages xmoto_0.6.1
https://github.com/void-linux/void-packages/pull/24030

xmoto: update to 0.6.1.


A patch file from https://github.com/void-linux/void-packages/pull/24030.patch is attached

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

From 967ac9b2148c8a1a6221ef724c6256d278da2831 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 22 Jun 2020 21:18:04 -0500
Subject: [PATCH] xmoto: update to 0.6.1.

---
 srcpkgs/xmoto/patches/fix-gcc7.patch          | 47 -------------------
 srcpkgs/xmoto/patches/fix-include.patch       | 25 ----------
 .../patches/modernize-configure_ac.patch      | 16 -------
 srcpkgs/xmoto/patches/musl-stdint_h.patch     | 10 ----
 srcpkgs/xmoto/template                        | 35 +++++---------
 5 files changed, 13 insertions(+), 120 deletions(-)
 delete mode 100644 srcpkgs/xmoto/patches/fix-gcc7.patch
 delete mode 100644 srcpkgs/xmoto/patches/fix-include.patch
 delete mode 100644 srcpkgs/xmoto/patches/modernize-configure_ac.patch
 delete mode 100644 srcpkgs/xmoto/patches/musl-stdint_h.patch

diff --git a/srcpkgs/xmoto/patches/fix-gcc7.patch b/srcpkgs/xmoto/patches/fix-gcc7.patch
deleted file mode 100644
index bf8b1cba1f3..00000000000
--- a/srcpkgs/xmoto/patches/fix-gcc7.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./src/WWW.cpp.orig	2018-01-16 10:53:58.725405426 +0100
-+++ ./src/WWW.cpp	2018-01-16 10:55:14.802101942 +0100
-@@ -206,7 +206,7 @@ void FSWeb::downloadFile(const std::stri
-   std::string v_www_agent = WWW_AGENT;
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " 
-         + v_local_file_tmp);
-   }
-@@ -320,7 +320,7 @@ void FSWeb::uploadReplay(const std::stri
-   LogInfo(std::string("Uploading replay " + p_replayFilename).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("UR"));
-   }
-       
-@@ -478,7 +478,7 @@ void FSWeb::sendVote(const std::string&
-   LogInfo("Sending vote");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SV"));
-   }
-       
-@@ -562,7 +562,7 @@ void FSWeb::sendReport(const std::string
-   LogInfo("Sending report");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SR"));
-   }
-       
-@@ -677,7 +677,7 @@ void FSWeb::uploadDbSync(const std::stri
-   LogInfo(std::string("Uploading dbsync " + p_dbSyncFilename + " to " + p_url_to_transfert).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(p_answerFile.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " + p_answerFile);
-   }
-       
diff --git a/srcpkgs/xmoto/patches/fix-include.patch b/srcpkgs/xmoto/patches/fix-include.patch
deleted file mode 100644
index 4bc2179e376..00000000000
--- a/srcpkgs/xmoto/patches/fix-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/net/NetActions.cpp.orig	2018-01-16 11:03:55.152026167 +0100
-+++ src/net/NetActions.cpp	2018-01-16 11:03:59.910007186 +0100
-@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite
- #include <sstream>
- #include "../helpers/SwapEndian.h"
- #include "helpers/Net.h"
--#include "helpers/utf8.h"
-+#include "../helpers/utf8.h"
- 
- char NetAction::m_buffer[NETACTION_MAX_PACKET_SIZE];
- unsigned int NetAction::m_biggestTCPPacketSent = 0;
---- src/helpers/utf8.h.orig	2018-01-16 11:08:10.042009362 +0100
-+++ src/helpers/utf8.h	2018-01-16 11:08:17.306980381 +0100
-@@ -18,8 +18,8 @@ along with XMOTO; if not, write to the F
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- =============================================================================*/
- 
--#ifndef __UTF8_H__
--#define __UTF8_H__
-+#ifndef __MYUTF8_H__
-+#define __MYUTF8_H__
- 
- #include <vector>
- #include <string>
-
diff --git a/srcpkgs/xmoto/patches/modernize-configure_ac.patch b/srcpkgs/xmoto/patches/modernize-configure_ac.patch
deleted file mode 100644
index be88ff4c6b5..00000000000
--- a/srcpkgs/xmoto/patches/modernize-configure_ac.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.in	2014-03-29 11:35:24.000000000 +0100
-+++ configure.in	2015-11-03 13:02:49.686607352 +0100
-@@ -1,8 +1,8 @@
--AC_INIT(src/GameInit.cpp)
--
--AC_CANONICAL_TARGET()
--AM_INIT_AUTOMAKE(xmoto,0.5.11)
--AC_GNU_SOURCE
-+AC_PREREQ([2.69])
-+AC_INIT([xmoto],[0.5.11])
-+AC_CONFIG_SRCDIR(src/GameInit.cpp)
-+AM_INIT_AUTOMAKE([1.15 foreign gnu subdir-objects])
-+LT_INIT
- 
- AC_PROG_CXX
- AC_PROG_CPP
diff --git a/srcpkgs/xmoto/patches/musl-stdint_h.patch b/srcpkgs/xmoto/patches/musl-stdint_h.patch
deleted file mode 100644
index 03684b56923..00000000000
--- a/srcpkgs/xmoto/patches/musl-stdint_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DBuffer.cpp	2011-10-11 22:18:35.000000000 +0200
-+++ src/DBuffer.cpp	2015-10-01 22:28:36.654255001 +0200
-@@ -23,6 +23,7 @@
-  */
- #include "DBuffer.h"
- #include "helpers/SwapEndian.h"
-+#include <stdint.h>
- #include <algorithm>
- 
-   void DBuffer::_FreeDBuffer(void) {
diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template
index 70803d714f2..d91f92f7824 100644
--- a/srcpkgs/xmoto/template
+++ b/srcpkgs/xmoto/template
@@ -1,38 +1,29 @@
 # Template file for 'xmoto'
 pkgname=xmoto
-version=0.5.11
-revision=11
-build_style=gnu-configure
-configure_args="--disable-sdltest CPPFLAGS=-DdDOUBLE"
+version=0.6.1
+revision=1
+build_style=cmake
+build_helper="qemu"
+configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DXMOTO_PACK=manual"
 hostmakedepends="automake libtool gettext-devel intltool desktop-file-utils"
 makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
  libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel
- SDL_net-devel SDL_ttf-devel lua52-devel libcurl-devel libode-devel bzip2-devel"
+ SDL_net-devel SDL_ttf-devel lua52-devel libcurl-devel libode-devel bzip2-devel
+ gettext-devel"
 depends="${pkgname}-data"
 short_desc="2D motocross platform game"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://xmoto.tuxfamily.org/"
-distfiles="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"
-checksum=a584a6f9292b184686b72c78f16de4b82d5c5b72ad89e41912ff50d03eca26b2
+distfiles="https://github.com/xmoto/xmoto/archive/${version}/${version}.tar.gz"
+checksum=209c8c38b1742d0620d40f90365c7a56f67c86da826c80a76d37fa46ee9c9b66
 
-# Build using the old C++ ABI to fix issue with missing text; the issue
-# should be fixed in the next stable release (if that ever does happen)
-CPPFLAGS+=" -D_GLIBCXX_USE_CXX11_ABI=0"
-
-if [ "$CROSS_BUILD" ]; then
-	# configure can't test this when cross compiling
-	export ac_cv_lib_GLU_gluBuild2DMipmaps=yes
-	LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib"
-	hostmakedepends+=" SDL_mixer-devel libxml2-devel"
+if [ $XBPS_TARGET_LIBC = "musl" ]; then
+	export LDFLAGS+=" -lintl"
 fi
 
-pre_configure() {
-	# remove old ode version
-	rm -r src/ode
-	mv configure.{in,ac}
-	libtoolize
-	./bootstrap
+pre_install() {
+	vtargetrun build/src/xmoto --pack build/bin/xmoto.bin bin/
 }
 
 post_install() {

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

* Re: xmoto: update to 0.6.1.
  2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
                   ` (7 preceding siblings ...)
  2020-08-04  0:42 ` [PR PATCH] [Updated] " abenson
@ 2020-08-04  0:50 ` sgn
  2020-08-04  0:51 ` ericonr
                   ` (3 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-08-04  0:50 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/24030#issuecomment-668311607

Comment:
I've spent sometime to read their `CMakeLists.txt`
They have `find_package(Intl, REQUIRED)` already, so the template can be a bit simpler:
```diff
diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template
index d91f92f782..ae400bdce0 100644
--- a/srcpkgs/xmoto/template
+++ b/srcpkgs/xmoto/template
@@ -9,7 +9,7 @@ hostmakedepends="automake libtool gettext-devel intltool desktop-file-utils"
 makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
  libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel
  SDL_net-devel SDL_ttf-devel lua52-devel libcurl-devel libode-devel bzip2-devel
- gettext-devel"
+ gettext-libs"
 depends="${pkgname}-data"
 short_desc="2D motocross platform game"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,10 +18,6 @@ homepage="http://xmoto.tuxfamily.org/"
 distfiles="https://github.com/xmoto/xmoto/archive/${version}/${version}.tar.gz"
 checksum=209c8c38b1742d0620d40f90365c7a56f67c86da826c80a76d37fa46ee9c9b66
 
-if [ $XBPS_TARGET_LIBC = "musl" ]; then
-	export LDFLAGS+=" -lintl"
-fi
-
 pre_install() {
 	vtargetrun build/src/xmoto --pack build/bin/xmoto.bin bin/
 }
```

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

* Re: xmoto: update to 0.6.1.
  2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
                   ` (8 preceding siblings ...)
  2020-08-04  0:50 ` sgn
@ 2020-08-04  0:51 ` ericonr
  2020-08-04  0:57 ` [PR PATCH] [Updated] " abenson
                   ` (2 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2020-08-04  0:51 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24030#issuecomment-668311995

Comment:
Is libs enough for cross to work?

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

* Re: [PR PATCH] [Updated] xmoto: update to 0.6.1.
  2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
                   ` (9 preceding siblings ...)
  2020-08-04  0:51 ` ericonr
@ 2020-08-04  0:57 ` abenson
  2020-08-04  0:57 ` sgn
  2020-08-04  1:26 ` [PR PATCH] [Merged]: " abenson
  12 siblings, 0 replies; 14+ messages in thread
From: abenson @ 2020-08-04  0:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/abenson/void-packages xmoto_0.6.1
https://github.com/void-linux/void-packages/pull/24030

xmoto: update to 0.6.1.


A patch file from https://github.com/void-linux/void-packages/pull/24030.patch is attached

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

From 261e6fbd7bc79b2225a0066512ca2b246491ea1c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 22 Jun 2020 21:18:04 -0500
Subject: [PATCH] xmoto: update to 0.6.1.

---
 srcpkgs/xmoto/patches/fix-gcc7.patch          | 47 -------------------
 srcpkgs/xmoto/patches/fix-include.patch       | 25 ----------
 .../patches/modernize-configure_ac.patch      | 16 -------
 srcpkgs/xmoto/patches/musl-stdint_h.patch     | 10 ----
 srcpkgs/xmoto/template                        | 35 +++++---------
 5 files changed, 11 insertions(+), 122 deletions(-)
 delete mode 100644 srcpkgs/xmoto/patches/fix-gcc7.patch
 delete mode 100644 srcpkgs/xmoto/patches/fix-include.patch
 delete mode 100644 srcpkgs/xmoto/patches/modernize-configure_ac.patch
 delete mode 100644 srcpkgs/xmoto/patches/musl-stdint_h.patch

diff --git a/srcpkgs/xmoto/patches/fix-gcc7.patch b/srcpkgs/xmoto/patches/fix-gcc7.patch
deleted file mode 100644
index bf8b1cba1f3..00000000000
--- a/srcpkgs/xmoto/patches/fix-gcc7.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./src/WWW.cpp.orig	2018-01-16 10:53:58.725405426 +0100
-+++ ./src/WWW.cpp	2018-01-16 10:55:14.802101942 +0100
-@@ -206,7 +206,7 @@ void FSWeb::downloadFile(const std::stri
-   std::string v_www_agent = WWW_AGENT;
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " 
-         + v_local_file_tmp);
-   }
-@@ -320,7 +320,7 @@ void FSWeb::uploadReplay(const std::stri
-   LogInfo(std::string("Uploading replay " + p_replayFilename).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("UR"));
-   }
-       
-@@ -478,7 +478,7 @@ void FSWeb::sendVote(const std::string&
-   LogInfo("Sending vote");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SV"));
-   }
-       
-@@ -562,7 +562,7 @@ void FSWeb::sendReport(const std::string
-   LogInfo("Sending report");
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SR"));
-   }
-       
-@@ -677,7 +677,7 @@ void FSWeb::uploadDbSync(const std::stri
-   LogInfo(std::string("Uploading dbsync " + p_dbSyncFilename + " to " + p_url_to_transfert).c_str());
- 
-   /* open the file */
--  if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == false) {
-+  if( !(v_destinationFile = fopen(p_answerFile.c_str(), "wb")) ) {
-     throw Exception("error : unable to open output file " + p_answerFile);
-   }
-       
diff --git a/srcpkgs/xmoto/patches/fix-include.patch b/srcpkgs/xmoto/patches/fix-include.patch
deleted file mode 100644
index 4bc2179e376..00000000000
--- a/srcpkgs/xmoto/patches/fix-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/net/NetActions.cpp.orig	2018-01-16 11:03:55.152026167 +0100
-+++ src/net/NetActions.cpp	2018-01-16 11:03:59.910007186 +0100
-@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite
- #include <sstream>
- #include "../helpers/SwapEndian.h"
- #include "helpers/Net.h"
--#include "helpers/utf8.h"
-+#include "../helpers/utf8.h"
- 
- char NetAction::m_buffer[NETACTION_MAX_PACKET_SIZE];
- unsigned int NetAction::m_biggestTCPPacketSent = 0;
---- src/helpers/utf8.h.orig	2018-01-16 11:08:10.042009362 +0100
-+++ src/helpers/utf8.h	2018-01-16 11:08:17.306980381 +0100
-@@ -18,8 +18,8 @@ along with XMOTO; if not, write to the F
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- =============================================================================*/
- 
--#ifndef __UTF8_H__
--#define __UTF8_H__
-+#ifndef __MYUTF8_H__
-+#define __MYUTF8_H__
- 
- #include <vector>
- #include <string>
-
diff --git a/srcpkgs/xmoto/patches/modernize-configure_ac.patch b/srcpkgs/xmoto/patches/modernize-configure_ac.patch
deleted file mode 100644
index be88ff4c6b5..00000000000
--- a/srcpkgs/xmoto/patches/modernize-configure_ac.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.in	2014-03-29 11:35:24.000000000 +0100
-+++ configure.in	2015-11-03 13:02:49.686607352 +0100
-@@ -1,8 +1,8 @@
--AC_INIT(src/GameInit.cpp)
--
--AC_CANONICAL_TARGET()
--AM_INIT_AUTOMAKE(xmoto,0.5.11)
--AC_GNU_SOURCE
-+AC_PREREQ([2.69])
-+AC_INIT([xmoto],[0.5.11])
-+AC_CONFIG_SRCDIR(src/GameInit.cpp)
-+AM_INIT_AUTOMAKE([1.15 foreign gnu subdir-objects])
-+LT_INIT
- 
- AC_PROG_CXX
- AC_PROG_CPP
diff --git a/srcpkgs/xmoto/patches/musl-stdint_h.patch b/srcpkgs/xmoto/patches/musl-stdint_h.patch
deleted file mode 100644
index 03684b56923..00000000000
--- a/srcpkgs/xmoto/patches/musl-stdint_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DBuffer.cpp	2011-10-11 22:18:35.000000000 +0200
-+++ src/DBuffer.cpp	2015-10-01 22:28:36.654255001 +0200
-@@ -23,6 +23,7 @@
-  */
- #include "DBuffer.h"
- #include "helpers/SwapEndian.h"
-+#include <stdint.h>
- #include <algorithm>
- 
-   void DBuffer::_FreeDBuffer(void) {
diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template
index 70803d714f2..ae400bdce0a 100644
--- a/srcpkgs/xmoto/template
+++ b/srcpkgs/xmoto/template
@@ -1,38 +1,25 @@
 # Template file for 'xmoto'
 pkgname=xmoto
-version=0.5.11
-revision=11
-build_style=gnu-configure
-configure_args="--disable-sdltest CPPFLAGS=-DdDOUBLE"
+version=0.6.1
+revision=1
+build_style=cmake
+build_helper="qemu"
+configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DXMOTO_PACK=manual"
 hostmakedepends="automake libtool gettext-devel intltool desktop-file-utils"
 makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
  libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel
- SDL_net-devel SDL_ttf-devel lua52-devel libcurl-devel libode-devel bzip2-devel"
+ SDL_net-devel SDL_ttf-devel lua52-devel libcurl-devel libode-devel bzip2-devel
+ gettext-libs"
 depends="${pkgname}-data"
 short_desc="2D motocross platform game"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://xmoto.tuxfamily.org/"
-distfiles="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"
-checksum=a584a6f9292b184686b72c78f16de4b82d5c5b72ad89e41912ff50d03eca26b2
+distfiles="https://github.com/xmoto/xmoto/archive/${version}/${version}.tar.gz"
+checksum=209c8c38b1742d0620d40f90365c7a56f67c86da826c80a76d37fa46ee9c9b66
 
-# Build using the old C++ ABI to fix issue with missing text; the issue
-# should be fixed in the next stable release (if that ever does happen)
-CPPFLAGS+=" -D_GLIBCXX_USE_CXX11_ABI=0"
-
-if [ "$CROSS_BUILD" ]; then
-	# configure can't test this when cross compiling
-	export ac_cv_lib_GLU_gluBuild2DMipmaps=yes
-	LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib"
-	hostmakedepends+=" SDL_mixer-devel libxml2-devel"
-fi
-
-pre_configure() {
-	# remove old ode version
-	rm -r src/ode
-	mv configure.{in,ac}
-	libtoolize
-	./bootstrap
+pre_install() {
+	vtargetrun build/src/xmoto --pack build/bin/xmoto.bin bin/
 }
 
 post_install() {

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

* Re: xmoto: update to 0.6.1.
  2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
                   ` (10 preceding siblings ...)
  2020-08-04  0:57 ` [PR PATCH] [Updated] " abenson
@ 2020-08-04  0:57 ` sgn
  2020-08-04  1:26 ` [PR PATCH] [Merged]: " abenson
  12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-08-04  0:57 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/24030#issuecomment-668313632

Comment:
> Is libs enough for cross to work?

Yes, they declare the variable themselves https://github.com/xmoto/xmoto/blob/ebf4d1c32df8c5ab9dc52b2965a58aad23cb0c99/src/common/Locales.cpp#L72

And I tried compiling anyway ;)

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

* Re: [PR PATCH] [Merged]: xmoto: update to 0.6.1.
  2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
                   ` (11 preceding siblings ...)
  2020-08-04  0:57 ` sgn
@ 2020-08-04  1:26 ` abenson
  12 siblings, 0 replies; 14+ messages in thread
From: abenson @ 2020-08-04  1:26 UTC (permalink / raw)
  To: ml

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

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

xmoto: update to 0.6.1.
https://github.com/void-linux/void-packages/pull/24030

Description:


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

end of thread, other threads:[~2020-08-04  1:26 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-03 21:28 [PR PATCH] xmoto: update to 0.6.1 abenson
2020-08-03 21:32 ` [PR REVIEW] " ericonr
2020-08-03 23:05 ` [PR PATCH] [Updated] " abenson
2020-08-04  0:03 ` abenson
2020-08-04  0:04 ` abenson
2020-08-04  0:29 ` sgn
2020-08-04  0:30 ` sgn
2020-08-04  0:31 ` sgn
2020-08-04  0:42 ` [PR PATCH] [Updated] " abenson
2020-08-04  0:50 ` sgn
2020-08-04  0:51 ` ericonr
2020-08-04  0:57 ` [PR PATCH] [Updated] " abenson
2020-08-04  0:57 ` sgn
2020-08-04  1:26 ` [PR PATCH] [Merged]: " abenson

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