Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=513eb9d3549e2cea3141d77f8257523feb5e8640
commit 513eb9d3549e2cea3141d77f8257523feb5e8640 Author: DeX77 <[email protected]> Date: Tue Aug 2 15:43:28 2016 +0200 manaplus-1.6.7.30-1-x86_64 * version bump diff --git a/source/games-extra/manaplus/FrugalBuild b/source/games-extra/manaplus/FrugalBuild index cfd0bcc..28cfa7c 100644 --- a/source/games-extra/manaplus/FrugalBuild +++ b/source/games-extra/manaplus/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: DeX77 <[email protected]> pkgname=manaplus -pkgver=1.6.7.16 +pkgver=1.6.7.30 pkgrel=1 pkgdesc="ManaPlus is a free OpenSource 2D MMORPG client for Evol Online, The mana world and similar servers." url="http://manaplus.org" @@ -17,7 +17,10 @@ archs=('i686' 'x86_64') _F_github_tag=y _F_github_tag_v=y Finclude github -sha1sums=('6772fd13a64c771e3c70d2dbb6d051880f8be4f5') +source=("${source[@]}" \ + curl750.patch ) +sha1sums=('aceb8a3e4ed1e4c02bd9e18100fe939c9f1b5134' \ + '9bbb66f357407c1cc5f559fbe86a89c0be8a2fdd') _F_cd_path="ManaPlus-$pkgver" build() { diff --git a/source/games-extra/manaplus/curl750.patch b/source/games-extra/manaplus/curl750.patch new file mode 100644 index 0000000..a6bd5ef --- /dev/null +++ b/source/games-extra/manaplus/curl750.patch @@ -0,0 +1,47 @@ +From 95eee98d9b137678f76d55e17163a2bc10897981 Mon Sep 17 00:00:00 2001 +From: Andrei Karas <[email protected]> +Date: Sun, 31 Jul 2016 22:33:01 +0300 +Subject: [PATCH] Possible fix for Curl 7.50 + +--- + src/net/download.cpp | 2 -- + src/net/download.h | 3 ++- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/net/download.cpp b/src/net/download.cpp +index 69acb68..b923850 100644 +--- a/src/net/download.cpp ++++ b/src/net/download.cpp +@@ -29,8 +29,6 @@ + #include "utils/files.h" + #include "utils/sdlhelper.h" + +-#include <curl/curl.h> +- + #include <zlib.h> + + #define CURLVERSION_ATLEAST(a, b, c) ((LIBCURL_VERSION_MAJOR > (a)) || \ +diff --git a/src/net/download.h b/src/net/download.h +index 9ffd76c..ddceb15 100644 +--- a/src/net/download.h ++++ b/src/net/download.h +@@ -24,6 +24,8 @@ + + #include "enums/net/downloadstatus.h" + ++#include <curl/curl.h> ++ + #include <string> + #include <queue> + +@@ -39,7 +41,6 @@ typedef size_t (*WriteFunction)( void *ptr, size_t size, size_t nmemb, + void *stream); + + struct SDL_Thread; +-typedef void CURL; + struct curl_httppost; + struct curl_slist; + +-- +libgit2 0.24.0 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
