[arch-commits] Commit in spring/repos/community-x86_64 (6 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Thu Sep 28 07:00:25 UTC 2017
Date: Thursday, September 28, 2017 @ 07:00:24
Author: svenstaro
Revision: 260741
archrelease: copy trunk to community-x86_64
Added:
spring/repos/community-x86_64/0001-fix-build-with-curl-7.50.0.patch
(from rev 260740, spring/trunk/0001-fix-build-with-curl-7.50.0.patch)
spring/repos/community-x86_64/PKGBUILD
(from rev 260740, spring/trunk/PKGBUILD)
spring/repos/community-x86_64/gold-linker.patch
(from rev 260740, spring/trunk/gold-linker.patch)
Deleted:
spring/repos/community-x86_64/0001-fix-build-with-curl-7.50.0.patch
spring/repos/community-x86_64/PKGBUILD
spring/repos/community-x86_64/gold-linker.patch
---------------------------------------+
0001-fix-build-with-curl-7.50.0.patch | 98 ++++++++++++++--------------
PKGBUILD | 110 ++++++++++++++++----------------
gold-linker.patch | 102 ++++++++++++++---------------
3 files changed, 155 insertions(+), 155 deletions(-)
Deleted: 0001-fix-build-with-curl-7.50.0.patch
===================================================================
--- 0001-fix-build-with-curl-7.50.0.patch 2017-09-28 07:00:18 UTC (rev 260740)
+++ 0001-fix-build-with-curl-7.50.0.patch 2017-09-28 07:00:24 UTC (rev 260741)
@@ -1,49 +0,0 @@
-From 3a4f9f6fcd3934840f12ea26377777e13745b681 Mon Sep 17 00:00:00 2001
-From: Johan Rehnberg <cleanrock at 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-x86_64/0001-fix-build-with-curl-7.50.0.patch (from rev 260740, spring/trunk/0001-fix-build-with-curl-7.50.0.patch)
===================================================================
--- 0001-fix-build-with-curl-7.50.0.patch (rev 0)
+++ 0001-fix-build-with-curl-7.50.0.patch 2017-09-28 07:00:24 UTC (rev 260741)
@@ -0,0 +1,49 @@
+From 3a4f9f6fcd3934840f12ea26377777e13745b681 Mon Sep 17 00:00:00 2001
+From: Johan Rehnberg <cleanrock at 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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-09-28 07:00:18 UTC (rev 260740)
+++ PKGBUILD 2017-09-28 07:00:24 UTC (rev 260741)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=spring
-pkgver=103.0
-pkgrel=8
-pkgdesc='A free 3D real-time-strategy (RTS) game engine'
-arch=('i686' '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=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
- gold-linker.patch
- 0001-fix-build-with-curl-7.50.0.patch)
-md5sums=('e71a3dc16262b06b159157ecd52bbbe5'
- '4837a3a273e346d159c3a9ad75ac1a1e'
- '8e4652c98c66016959fdd0dd1f6fc283')
-
-prepare() {
- cd spring_$pkgver
-
- # 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=YES
- 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-x86_64/PKGBUILD (from rev 260740, spring/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-09-28 07:00:24 UTC (rev 260741)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=spring
+pkgver=104.0
+pkgrel=1
+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=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
+ gold-linker.patch
+ 0001-fix-build-with-curl-7.50.0.patch)
+md5sums=('98f14ce1ea2ac0b5e22b214d768c0290'
+ '4837a3a273e346d159c3a9ad75ac1a1e'
+ '8e4652c98c66016959fdd0dd1f6fc283')
+
+prepare() {
+ cd spring_$pkgver
+
+ # 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:
Deleted: gold-linker.patch
===================================================================
--- gold-linker.patch 2017-09-28 07:00:18 UTC (rev 260740)
+++ gold-linker.patch 2017-09-28 07:00:24 UTC (rev 260741)
@@ -1,51 +0,0 @@
-From: Markus Koschany <apo at 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)
Copied: spring/repos/community-x86_64/gold-linker.patch (from rev 260740, spring/trunk/gold-linker.patch)
===================================================================
--- gold-linker.patch (rev 0)
+++ gold-linker.patch 2017-09-28 07:00:24 UTC (rev 260741)
@@ -0,0 +1,51 @@
+From: Markus Koschany <apo at 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)
More information about the arch-commits
mailing list