Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=eac4d04eaf3ba4f31449fe704f2ce0fa60c6f8cb

commit eac4d04eaf3ba4f31449fe704f2ce0fa60c6f8cb
Author: Melko <[email protected]>
Date:   Fri Oct 21 21:12:42 2011 +0200

springlobby-0.101-4-i686

* util-linux-ng -> util-linux
* fix build against curl-7.21.7

diff --git a/source/games-extra/springlobby/FrugalBuild 
b/source/games-extra/springlobby/FrugalBuild
index 4116baf..86a2f2a 100644
--- a/source/games-extra/springlobby/FrugalBuild
+++ b/source/games-extra/springlobby/FrugalBuild
@@ -3,11 +3,12 @@

pkgname=springlobby
pkgver=0.101
-pkgrel=3
+pkgrel=4
pkgdesc="A free cross-platform lobby client for the Spring RTS project."
url="http://springlobby.info/";
rodepends=('spring')
-depends=('wxgtk' 'libtorrent-rasterbar>=0.14.6' 'sdl_mixer' 'libstdc++' 
'libxau' 'libxdmcp' 'libxxf86vm' 'expat' 'libxdamage' 'libxml2>=2.7.8' 'libice' 
'util-linux-ng' 'sdl_sound' 'openal' 'curl' 'mpg321')
+depends=('wxgtk' 'libtorrent-rasterbar>=0.14.6' 'sdl_mixer' 'libstdc++' 
'libxau' 'libxdmcp' 'libxxf86vm' 'expat' \
+        'libxdamage' 'libxml2>=2.7.8' 'libice' 'util-linux' 'sdl_sound' 
'openal' 'curl>=7.21.7' 'mpg321')
makedepends=('asio' 'boost>=1.46.1')
options=('scriptlet')
groups=('games-extra')
@@ -15,8 +16,10 @@ archs=('i686' 'x86_64')
_F_gnome_iconcache="y"
Finclude cmake gnome-scriptlet
up2date="Flasttar $url/tarballs/"
-source=($url/tarballs/$pkgname-$pkgver.tar.bz2)
-sha1sums=('9f415e2eb624036870e080c35fe33d616e1ae4d0')
+source=($url/tarballs/$pkgname-$pkgver.tar.bz2 \
+       curl7217.patch) ## fixed upstream
+sha1sums=('9f415e2eb624036870e080c35fe33d616e1ae4d0' \
+          '9f65b7e48a673c1624e59e16cf10267a0ffd2d5c')

build() {
Fsed 'boost_system-mt' 'boost_system' CMakeLists.txt
diff --git a/source/games-extra/springlobby/curl7217.patch 
b/source/games-extra/springlobby/curl7217.patch
new file mode 100644
index 0000000..e0a5dbe
--- /dev/null
+++ b/source/games-extra/springlobby/curl7217.patch
@@ -0,0 +1,22 @@
+diff -ru springlobby-0.101.old/src/utils/curlhelper.h 
springlobby-0.101/src/utils/curlhelper.h
+--- springlobby-0.101.old/src/utils/curlhelper.h       2011-10-21 
21:25:26.727389966 +0200
++++ springlobby-0.101/src/utils/curlhelper.h   2011-10-21 21:25:50.740389420 
+0200
+@@ -12,7 +12,6 @@
+ #endif
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ extern "C"
+diff -ru springlobby-0.101.old/src/utils/downloader.cpp 
springlobby-0.101/src/utils/downloader.cpp
+--- springlobby-0.101.old/src/utils/downloader.cpp     2011-10-21 
21:25:26.727389966 +0200
++++ springlobby-0.101/src/utils/downloader.cpp 2011-10-21 21:26:05.284389062 
+0200
+@@ -29,7 +29,6 @@
+ #include "../uiutils.h"
+ #include "conversion.h"
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include "curlhelper.h"
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to