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

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Fri Oct 7 18:17:19 UTC 2016 

    Date: Friday, October 7, 2016 @ 18:17:19
  Author: bpiotrowski
Revision: 191581

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  spring/repos/community-staging-i686/
  spring/repos/community-staging-i686/0001-fix-build-with-curl-7.50.0.patch
    (from rev 191580, spring/trunk/0001-fix-build-with-curl-7.50.0.patch)
  spring/repos/community-staging-i686/PKGBUILD
    (from rev 191580, spring/trunk/PKGBUILD)
  spring/repos/community-staging-x86_64/
  spring/repos/community-staging-x86_64/0001-fix-build-with-curl-7.50.0.patch
    (from rev 191580, spring/trunk/0001-fix-build-with-curl-7.50.0.patch)
  spring/repos/community-staging-x86_64/PKGBUILD
    (from rev 191580, spring/trunk/PKGBUILD)

----------------------------------------------------------------+
 community-staging-i686/0001-fix-build-with-curl-7.50.0.patch   |   49 +++++++++
 community-staging-i686/PKGBUILD                                |   51 ++++++++++
 community-staging-x86_64/0001-fix-build-with-curl-7.50.0.patch |   49 +++++++++
 community-staging-x86_64/PKGBUILD                              |   51 ++++++++++
 4 files changed, 200 insertions(+)

Copied: spring/repos/community-staging-i686/0001-fix-build-with-curl-7.50.0.patch (from rev 191580, spring/trunk/0001-fix-build-with-curl-7.50.0.patch)
===================================================================
--- community-staging-i686/0001-fix-build-with-curl-7.50.0.patch	                        (rev 0)
+++ community-staging-i686/0001-fix-build-with-curl-7.50.0.patch	2016-10-07 18:17:19 UTC (rev 191581)
@@ -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
+

Copied: spring/repos/community-staging-i686/PKGBUILD (from rev 191580, spring/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2016-10-07 18:17:19 UTC (rev 191581)
@@ -0,0 +1,51 @@
+# $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=4
+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
+        0001-fix-build-with-curl-7.50.0.patch)
+md5sums=('e71a3dc16262b06b159157ecd52bbbe5'
+         '8e4652c98c66016959fdd0dd1f6fc283')
+
+prepare() {
+  bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
+
+  cd spring_${pkgver}/tools/pr-downloader
+
+  patch -Np1 -i ${srcdir}/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-staging-x86_64/0001-fix-build-with-curl-7.50.0.patch (from rev 191580, 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	2016-10-07 18:17:19 UTC (rev 191581)
@@ -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
+

Copied: spring/repos/community-staging-x86_64/PKGBUILD (from rev 191580, spring/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2016-10-07 18:17:19 UTC (rev 191581)
@@ -0,0 +1,51 @@
+# $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=4
+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
+        0001-fix-build-with-curl-7.50.0.patch)
+md5sums=('e71a3dc16262b06b159157ecd52bbbe5'
+         '8e4652c98c66016959fdd0dd1f6fc283')
+
+prepare() {
+  bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
+
+  cd spring_${pkgver}/tools/pr-downloader
+
+  patch -Np1 -i ${srcdir}/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:

More information about the arch-commits mailing list