[arch-commits] Commit in spring/repos (5 files)

2020-12-12 Thread Felix Yan via arch-commits 
Date: Saturday, December 12, 2020 @ 16:03:54
  Author: felixonmars
Revision: 773384

archrelease: copy trunk to community-staging-x86_64

Added:
  spring/repos/community-staging-x86_64/
  spring/repos/community-staging-x86_64/PKGBUILD
(from rev 773382, spring/trunk/PKGBUILD)
  
spring/repos/community-staging-x86_64/fix-6358-compile-error-because-of-new-openal-version.patch
(from rev 773382, 
spring/trunk/fix-6358-compile-error-because-of-new-openal-version.patch)
  spring/repos/community-staging-x86_64/fix-include.patch
(from rev 773382, spring/trunk/fix-include.patch)
  spring/repos/community-staging-x86_64/fix-reinterpret_cast-in-constexpr.patch
(from rev 773382, spring/trunk/fix-reinterpret_cast-in-constexpr.patch)

+
 PKGBUILD   |   59 +++
 fix-6358-compile-error-because-of-new-openal-version.patch |   44 
 fix-include.patch  |   12 ++
 fix-reinterpret_cast-in-constexpr.patch|   15 ++
 4 files changed, 130 insertions(+)

Copied: spring/repos/community-staging-x86_64/PKGBUILD (from rev 773382, 
spring/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-12-12 16:03:54 UTC (rev 773384)
@@ -0,0 +1,59 @@
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Arkham 
+# Contributor: Christoph Zeiler 
+
+pkgname=spring
+pkgver=104.0
+pkgrel=11
+pkgdesc='A free 3D real-time-strategy (RTS) game engine'
+arch=('x86_64')
+url="http://springrts.com/;
+license=('GPL')
+depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl2' 
'libunwind'
+ 'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils' 'libx11')
+makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python' 'jdk8-openjdk' 'mesa')
+optdepends=('python: python-based bots'
+'java-runtime: java-based bots')
+source=(https://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
+fix-6358-compile-error-because-of-new-openal-version.patch
+fix-reinterpret_cast-in-constexpr.patch
+fix-include.patch)
+sha512sums=('be8922e798d7c959c248501494ab61cff625154c109debd324875a4e2a7149748224b6fcb428948f2b4d66cc9e484bc002a63810f55c5f25a499c34a01dfc225'
+
'76cf4c596f87f8306ad19ae82d68a36db250fbf7e2e3656c05453be761d13fd1a5cbc8e6499c24b46af993566ed624da744b9e21b240627c214ae4b505f0701b'
+
'ba8a6f3031c7507983f2ae10de9f19b27434cd9159df6ce431d1f83b21b37974e8add4bea8bc0d738f88f5bfebdbeeacaeb3964b9db31b5181d12bed66ff2109'
+
'0fd54748e3dfa3792ff66b6cbe2c482f1d553033dc48f6279863ad0b07aaff15069669b1d1d85be11e89fdad2faba5f16e4b9c99af718da0152ac9aba7b0f75a')
+
+prepare() {
+  cd spring_$pkgver
+
+  # https://springrts.com/mantis/view.php?id=5781
+  # https://github.com/spring/spring/commit/6104061fe3
+  patch -Np1 -i ../fix-reinterpret_cast-in-constexpr.patch
+
+  # https://springrts.com/mantis/view.php?id=6358
+  patch -Np1 -i ../fix-6358-compile-error-because-of-new-openal-version.patch
+
+  patch -Np1 -i ../fix-include.patch
+}
+
+build() {
+  cd spring_${pkgver}
+
+  cmake. \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DDATADIR=share/spring \
+-DJAVA_HOME=/usr/lib/jvm/java-8-openjdk \
+-DCMAKE_SKIP_RPATH=ON
+  make
+}
+
+package() {
+  cd spring_${pkgver}
+
+  DESTDIR="$pkgdir" make install
+
+  install -d "$pkgdir/etc/spring"
+  echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
+}
+
+# vim sw=2:ts=2 et:

Copied: 
spring/repos/community-staging-x86_64/fix-6358-compile-error-because-of-new-openal-version.patch
 (from rev 773382, 
spring/trunk/fix-6358-compile-error-because-of-new-openal-version.patch)
===
--- 
community-staging-x86_64/fix-6358-compile-error-because-of-new-openal-version.patch
 (rev 0)
+++ 
community-staging-x86_64/fix-6358-compile-error-because-of-new-openal-version.patch
 2020-12-12 16:03:54 UTC (rev 773384)
@@ -0,0 +1,44 @@
+From d159c9f0d21d3bc96c85063cc258b6fd8ec1be2d Mon Sep 17 00:00:00 2001
+From: abma 
+Date: Mon, 6 Jan 2020 11:16:25 +0100
+Subject: [PATCH] fix #6358: compile error because of new openal version /
+ changed struct
+
+---
+ rts/System/Sound/OpenAL/Sound.cpp | 1 -
+ rts/System/Sound/OpenAL/Sound.h   | 3 +--
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/rts/System/Sound/OpenAL/Sound.cpp 
b/rts/System/Sound/OpenAL/Sound.cpp
+index 50bc40e8c4..9ea2ad6a73 100644
+--- a/rts/System/Sound/OpenAL/Sound.cpp
 b/rts/System/Sound/OpenAL/Sound.cpp
+@@ -4,7 +4,6 @@
+ 
+ #include 
+ #include 
+-#include 
+ 
+ #ifndef ALC_ALL_DEVICES_SPECIFIER
+ #define ALC_ALL_DEVICES_SPECIFIER 0x1013
+diff --git a/rts/System/Sound/OpenAL/Sound.h b/rts/System/Sound/OpenAL/Sound.h
+index

[arch-commits] Commit in spring/repos (5 files)

2020-12-06 Thread Felix Yan via arch-commits 
Date: Sunday, December 6, 2020 @ 22:00:24
  Author: felixonmars
Revision: 771232

archrelease: copy trunk to community-staging-x86_64

Added:
  spring/repos/community-staging-x86_64/
  spring/repos/community-staging-x86_64/PKGBUILD
(from rev 771230, spring/trunk/PKGBUILD)
  
spring/repos/community-staging-x86_64/fix-6358-compile-error-because-of-new-openal-version.patch
(from rev 771230, 
spring/trunk/fix-6358-compile-error-because-of-new-openal-version.patch)
  spring/repos/community-staging-x86_64/fix-include.patch
(from rev 771230, spring/trunk/fix-include.patch)
  spring/repos/community-staging-x86_64/fix-reinterpret_cast-in-constexpr.patch
(from rev 771230, spring/trunk/fix-reinterpret_cast-in-constexpr.patch)

+
 PKGBUILD   |   59 +++
 fix-6358-compile-error-because-of-new-openal-version.patch |   44 
 fix-include.patch  |   12 ++
 fix-reinterpret_cast-in-constexpr.patch|   15 ++
 4 files changed, 130 insertions(+)

Copied: spring/repos/community-staging-x86_64/PKGBUILD (from rev 771230, 
spring/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-12-06 22:00:24 UTC (rev 771232)
@@ -0,0 +1,59 @@
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Arkham 
+# Contributor: Christoph Zeiler 
+
+pkgname=spring
+pkgver=104.0
+pkgrel=10
+pkgdesc='A free 3D real-time-strategy (RTS) game engine'
+arch=('x86_64')
+url="http://springrts.com/;
+license=('GPL')
+depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl2' 
'libunwind'
+ 'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils' 'libx11')
+makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python' 'jdk8-openjdk' 'mesa')
+optdepends=('python: python-based bots'
+'java-runtime: java-based bots')
+source=(https://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
+fix-6358-compile-error-because-of-new-openal-version.patch
+fix-reinterpret_cast-in-constexpr.patch
+fix-include.patch)
+sha512sums=('be8922e798d7c959c248501494ab61cff625154c109debd324875a4e2a7149748224b6fcb428948f2b4d66cc9e484bc002a63810f55c5f25a499c34a01dfc225'
+
'76cf4c596f87f8306ad19ae82d68a36db250fbf7e2e3656c05453be761d13fd1a5cbc8e6499c24b46af993566ed624da744b9e21b240627c214ae4b505f0701b'
+
'ba8a6f3031c7507983f2ae10de9f19b27434cd9159df6ce431d1f83b21b37974e8add4bea8bc0d738f88f5bfebdbeeacaeb3964b9db31b5181d12bed66ff2109'
+
'0fd54748e3dfa3792ff66b6cbe2c482f1d553033dc48f6279863ad0b07aaff15069669b1d1d85be11e89fdad2faba5f16e4b9c99af718da0152ac9aba7b0f75a')
+
+prepare() {
+  cd spring_$pkgver
+
+  # https://springrts.com/mantis/view.php?id=5781
+  # https://github.com/spring/spring/commit/6104061fe3
+  patch -Np1 -i ../fix-reinterpret_cast-in-constexpr.patch
+
+  # https://springrts.com/mantis/view.php?id=6358
+  patch -Np1 -i ../fix-6358-compile-error-because-of-new-openal-version.patch
+
+  patch -Np1 -i ../fix-include.patch
+}
+
+build() {
+  cd spring_${pkgver}
+
+  cmake. \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DDATADIR=share/spring \
+-DJAVA_HOME=/usr/lib/jvm/java-8-openjdk \
+-DCMAKE_SKIP_RPATH=ON
+  make
+}
+
+package() {
+  cd spring_${pkgver}
+
+  DESTDIR="$pkgdir" make install
+
+  install -d "$pkgdir/etc/spring"
+  echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
+}
+
+# vim sw=2:ts=2 et:

Copied: 
spring/repos/community-staging-x86_64/fix-6358-compile-error-because-of-new-openal-version.patch
 (from rev 771230, 
spring/trunk/fix-6358-compile-error-because-of-new-openal-version.patch)
===
--- 
community-staging-x86_64/fix-6358-compile-error-because-of-new-openal-version.patch
 (rev 0)
+++ 
community-staging-x86_64/fix-6358-compile-error-because-of-new-openal-version.patch
 2020-12-06 22:00:24 UTC (rev 771232)
@@ -0,0 +1,44 @@
+From d159c9f0d21d3bc96c85063cc258b6fd8ec1be2d Mon Sep 17 00:00:00 2001
+From: abma 
+Date: Mon, 6 Jan 2020 11:16:25 +0100
+Subject: [PATCH] fix #6358: compile error because of new openal version /
+ changed struct
+
+---
+ rts/System/Sound/OpenAL/Sound.cpp | 1 -
+ rts/System/Sound/OpenAL/Sound.h   | 3 +--
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/rts/System/Sound/OpenAL/Sound.cpp 
b/rts/System/Sound/OpenAL/Sound.cpp
+index 50bc40e8c4..9ea2ad6a73 100644
+--- a/rts/System/Sound/OpenAL/Sound.cpp
 b/rts/System/Sound/OpenAL/Sound.cpp
+@@ -4,7 +4,6 @@
+ 
+ #include 
+ #include 
+-#include 
+ 
+ #ifndef ALC_ALL_DEVICES_SPECIFIER
+ #define ALC_ALL_DEVICES_SPECIFIER 0x1013
+diff --git a/rts/System/Sound/OpenAL/Sound.h b/rts/System/Sound/OpenAL/Sound.h
+index

[arch-commits] Commit in spring/repos (5 files)

2018-05-31 Thread Felix Yan via arch-commits 
Date: Thursday, May 31, 2018 @ 15:46:34
  Author: felixonmars
Revision: 334874

archrelease: copy trunk to community-staging-x86_64

Added:
  spring/repos/community-staging-x86_64/
  spring/repos/community-staging-x86_64/0001-fix-build-with-curl-7.50.0.patch
(from rev 334872, spring/trunk/0001-fix-build-with-curl-7.50.0.patch)
  spring/repos/community-staging-x86_64/PKGBUILD
(from rev 334872, spring/trunk/PKGBUILD)
  spring/repos/community-staging-x86_64/fix-reinterpret_cast-in-constexpr.patch
(from rev 334873, spring/trunk/fix-reinterpret_cast-in-constexpr.patch)
  spring/repos/community-staging-x86_64/gold-linker.patch
(from rev 334873, spring/trunk/gold-linker.patch)

-+
 0001-fix-build-with-curl-7.50.0.patch   |   49 
 PKGBUILD|   61 ++
 fix-reinterpret_cast-in-constexpr.patch |   15 +++
 gold-linker.patch   |   51 +
 4 files changed, 176 insertions(+)

Copied: 
spring/repos/community-staging-x86_64/0001-fix-build-with-curl-7.50.0.patch 
(from rev 334872, spring/trunk/0001-fix-build-with-curl-7.50.0.patch)
===
--- community-staging-x86_64/0001-fix-build-with-curl-7.50.0.patch  
(rev 0)
+++ community-staging-x86_64/0001-fix-build-with-curl-7.50.0.patch  
2018-05-31 15:46:34 UTC (rev 334874)
@@ -0,0 +1,49 @@
+From 3a4f9f6fcd3934840f12ea2637e13745b681 Mon Sep 17 00:00:00 2001
+From: Johan Rehnberg 
+Date: Wed, 27 Jul 2016 11:13:18 +0200
+Subject: [PATCH] fix build with curl 7.50.0
+
+See the following commits for some details:
+https://github.com/curl/curl/commit/9adf3c4
+https://github.com/curl/curl/commit/434f8d0
+---
+ src/Downloader/Http/HttpDownloader.cpp | 1 -
+ src/Downloader/Http/HttpDownloader.h   | 3 +--
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/Downloader/Http/HttpDownloader.cpp 
b/src/Downloader/Http/HttpDownloader.cpp
+index 6e13c12..dd33bba 100644
+--- a/src/Downloader/Http/HttpDownloader.cpp
 b/src/Downloader/Http/HttpDownloader.cpp
+@@ -22,7 +22,6 @@
+ #endif
+ 
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+diff --git a/src/Downloader/Http/HttpDownloader.h 
b/src/Downloader/Http/HttpDownloader.h
+index 77bbcee..47e0e79 100644
+--- a/src/Downloader/Http/HttpDownloader.h
 b/src/Downloader/Http/HttpDownloader.h
+@@ -5,6 +5,7 @@
+ 
+ #include "../IDownloader.h"
+ 
++#include 
+ #include 
+ #include 
+ 
+@@ -13,8 +14,6 @@ class HashSHA1;
+ class CFile;
+ class FileData;
+ class DownloadData;
+-typedef void CURLM;
+-typedef void CURL;
+ 
+ class CHttpDownloader: public IDownloader
+ {
+-- 
+2.9.2
+

Copied: spring/repos/community-staging-x86_64/PKGBUILD (from rev 334872, 
spring/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-05-31 15:46:34 UTC (rev 334874)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Arkham 
+# Contributor: Christoph Zeiler 
+
+pkgname=spring
+pkgver=104.0
+pkgrel=3
+pkgdesc='A free 3D real-time-strategy (RTS) game engine'
+arch=('x86_64')
+url="http://springrts.com/;
+license=('GPL')
+depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl2' 
'libunwind'
+ 'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils' 'libx11')
+makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'jdk8-openjdk' 
'mesa')
+optdepends=('python2: python-based bots'
+'java-runtime: java-based bots')
+source=(https://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
+fix-reinterpret_cast-in-constexpr.patch
+gold-linker.patch
+0001-fix-build-with-curl-7.50.0.patch)
+sha512sums=('be8922e798d7c959c248501494ab61cff625154c109debd324875a4e2a7149748224b6fcb428948f2b4d66cc9e484bc002a63810f55c5f25a499c34a01dfc225'
+
'ba8a6f3031c7507983f2ae10de9f19b27434cd9159df6ce431d1f83b21b37974e8add4bea8bc0d738f88f5bfebdbeeacaeb3964b9db31b5181d12bed66ff2109'
+
'd400f9b5055e4a3bddab4a1fc839dc1f35b34e8cd309e3bece53028184250013186480f5ffb60c0b1a7d35844c75c80d2619c9cc8e51be94deca3f44d4d1ec9f'
+
'c87954af0192784e6318ceb997a7fb21b3dcc740e5b8a8ed14671ac19923bd0ab6655512fa3d7b17ce0997505b0ad6f51bf0866dbbfe1c0b22cc2b9ba14e8ab1')
+
+prepare() {
+  cd spring_$pkgver
+
+  # https://springrts.com/mantis/view.php?id=5781
+  # https://github.com/spring/spring/commit/6104061fe3
+  patch -Np1 -i ../fix-reinterpret_cast-in-constexpr.patch
+
+  # https://springrts.com/mantis/view.php?id=5413
+  # patch -Np1 -i ../gold-linker.patch
+  #
+  # patch -Np1 -d tools/pr-downloader <../0001-fix-build-with-curl-7.50.0.patch
+
+}
+
+build() {
+  cd spring_${pkgver}
+
+  cmake. \
+