[arch-commits] Commit in spring/trunk (3 files)

[Laurent Carlier]

    Date: Wednesday, August 3, 2016 @ 08:42:50
  Author: lcarlier
Revision: 184952

upgpkg: spring 103.0-2

glew 2.0.0/poppler 0.46.0 rebuild

Added:
  spring/trunk/0001-fix-build-with-curl-7.50.0.patch
Modified:
  spring/trunk/PKGBUILD
Deleted:
  spring/trunk/spring.install

---------------------------------------+
 0001-fix-build-with-curl-7.50.0.patch |   49 ++++++++++++++++++++++++++++++++
 PKGBUILD                              |   13 +++++---
 spring.install                        |   12 -------
 3 files changed, 58 insertions(+), 16 deletions(-)

Added: 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	2016-08-03 08:42:50 UTC (rev 184952)
@@ -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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-03 08:32:01 UTC (rev 184951)
+++ PKGBUILD	2016-08-03 08:42:50 UTC (rev 184952)
@@ -5,7 +5,7 @@
 
 pkgname=spring
 pkgver=103.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64')
 url="http://springrts.com/"
@@ -15,12 +15,17 @@
 makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'jdk8-openjdk' 'mesa')
 optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
-install=spring.install
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma)
-md5sums=('e71a3dc16262b06b159157ecd52bbbe5')
+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() {

Deleted: spring.install
===================================================================
--- spring.install	2016-08-03 08:32:01 UTC (rev 184951)
+++ spring.install	2016-08-03 08:42:50 UTC (rev 184952)
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}