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 3a4f9f6fcd3934840f12ea26377777e13745b681 Mon Sep 17 00:00:00 2001 +From: Johan Rehnberg <cleanr...@gmail.com> +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 <stdio.h> +-#include <curl/curl.h> + #include <string> + #include <sstream> + #include <stdlib.h> +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 <curl/curl.h> + #include <string> + #include <list> + +@@ -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 <s...@lutzhaase.com> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +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 . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDATADIR=share/spring \ + -DJAVA_HOME=/usr/lib/jvm/java-8-openjdk \ + -DCMAKE_SKIP_RPATH=ON + make +} + +package() { + cd spring_${pkgver} + + make DESTDIR="$pkgdir" 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-reinterpret_cast-in-constexpr.patch (from rev 334873, spring/trunk/fix-reinterpret_cast-in-constexpr.patch) =================================================================== --- community-staging-x86_64/fix-reinterpret_cast-in-constexpr.patch (rev 0) +++ community-staging-x86_64/fix-reinterpret_cast-in-constexpr.patch 2018-05-31 15:46:34 UTC (rev 334874) @@ -0,0 +1,15 @@ +diff --git a/rts/Rendering/GL/myGL.cpp b/rts/Rendering/GL/myGL.cpp +index 5abef32ce0..95a786970c 100644 +--- a/rts/Rendering/GL/myGL.cpp ++++ b/rts/Rendering/GL/myGL.cpp +@@ -146,8 +147,8 @@ static bool GetVideoMemInfoMESA(GLint* memInfo) + + typedef PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC QCRIProc; + +- static constexpr const GLubyte* qcriProcName = (const GLubyte*) "glXQueryCurrentRendererIntegerMESA"; +- static const QCRIProc qcriProcAddr = (QCRIProc) glXGetProcAddress(qcriProcName); ++ static const char qcriProcName[] = "glXQueryCurrentRendererIntegerMESA"; ++ static const QCRIProc qcriProcAddr = (QCRIProc) glXGetProcAddress(reinterpret_cast<const GLubyte*>(qcriProcName)); + + if (qcriProcAddr == nullptr) + return false; Copied: spring/repos/community-staging-x86_64/gold-linker.patch (from rev 334873, spring/trunk/gold-linker.patch) =================================================================== --- community-staging-x86_64/gold-linker.patch (rev 0) +++ community-staging-x86_64/gold-linker.patch 2018-05-31 15:46:34 UTC (rev 334874) @@ -0,0 +1,51 @@ +From: Markus Koschany <a...@debian.org> +Date: Tue, 6 Dec 2016 18:04:02 +0100 +Subject: gold linker + +This is a bug in binutils which will probably not fixed in time for Stretch. +Work around the build failure by switching to Debian's default linker instead +of the gold linker. This patch can be reverted as soon as #847356 is fixed. + +Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=846921 +Forwarded: not-needed +--- + rts/build/cmake/TestCXXFlags.cmake | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/rts/build/cmake/TestCXXFlags.cmake b/rts/build/cmake/TestCXXFlags.cmake +index 7b338d3..d566c55 100644 +--- a/rts/build/cmake/TestCXXFlags.cmake ++++ b/rts/build/cmake/TestCXXFlags.cmake +@@ -162,21 +162,21 @@ if (CMAKE_COMPILER_IS_GNUCXX) + ) + set(hasGold FALSE) + if (${linkerVersion} MATCHES "gold") +- set(hasGold TRUE) ++ set(hasGold FALSE) + endif() + + +- if (NOT hasGold AND NOT WIN32) #FIND_PROGRAM fails in crosscompile environments (it detects the native ld.gold) ++ #if (NOT hasGold AND NOT WIN32) #FIND_PROGRAM fails in crosscompile environments (it detects the native ld.gold) + # since gcc 4.8 it is possible to switch the linker via that argument +- CHECK_CXX_ACCEPTS_FLAG("-fuse-ld=gold" HAS_USE_LD) +- IF (HAS_USE_LD) +- FIND_PROGRAM(LD_GOLD ld.gold) +- if (LD_GOLD) +- set(hasGold TRUE) +- set(LDGOLD_CXX_FLAGS "-fuse-ld=gold") +- endif () +- EndIf () +- endif () ++ #CHECK_CXX_ACCEPTS_FLAG("-fuse-ld=gold" HAS_USE_LD) ++ #IF (HAS_USE_LD) ++ # FIND_PROGRAM(LD_GOLD ld.gold) ++ # if (LD_GOLD) ++ # set(hasGold TRUE) ++ # set(LDGOLD_CXX_FLAGS "-fuse-ld=gold") ++ # endif () ++ # EndIf () ++ #endif () + + if (hasGold) + set(LDGOLD_FOUND TRUE)