games-action/openlierox: Patch for curl 7.21.7 (bug #376215)

Package-Manager: portage-2.1.10.4/cvs/Linux x86_64

diff --git a/games-action/openlierox/ChangeLog b/games-action/openlierox/ChangeLog
index b811bf1576e864cc8e1f0d995716ef013940dccb..d48273118ac525740a8b9f323a01d609a6c841d6 100644 (file)
--- a/games-action/openlierox/ChangeLog
+++ b/games-action/openlierox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/openlierox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/openlierox/ChangeLog,v 1.6 2011/03/22 17:55:15 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/openlierox/ChangeLog,v 1.7 2011/07/25 04:15:06 sping Exp $
+
+  25 Jul 2011; Sebastian Pipping <sping@gentoo.org>
+  openlierox-0.58_rc1-r1.ebuild, +files/openlierox-0.58_rc1-curl.patch:
+  Integrate patch for curl 7.21.7 (bug #376215)
 
 *openlierox-0.58_rc1-r1 (22 Mar 2011)
 

diff --git a/games-action/openlierox/Manifest b/games-action/openlierox/Manifest
index a70e8fe54df0e32f4128a7551c092f24b39a77e4..440c7da03ac7d069b44600875804d7b6c5d43392 100644 (file)
--- a/games-action/openlierox/Manifest
+++ b/games-action/openlierox/Manifest
@@ -1,10 +1,11 @@
 AUX openlierox-0.58-beta9-joystick-cmake.patch 1115 RMD160 7e207e8e1585026e895c405bb5f982a53489f104 SHA1 e27790e6bdbcee21b91f4f1b9078bcdbf0a32e81 SHA256 0eab9a526d997584ecb917897c72f66b6458029ba6160b274564d167f8adea65
 AUX openlierox-0.58-beta9-joystick-cpp.patch 5234 RMD160 96c1726c6e8cdf95ae435255ea5b0df1e0aa4d31 SHA1 6ad6f69ff81bf91c78f39b1a3fb70e97c8e1cdce SHA256 08de10ecd9dac7d0d22369294ac563668c9a0aad45ce3b36be42826f1d007cd9
+AUX openlierox-0.58_rc1-curl.patch 2543 RMD160 36092aacb3895121adf021e4b7db7e255f4046e0 SHA1 35be19eae2f850109c4edd56c43bd8402497b0f1 SHA256 0e7ef802020a7475c1c34a12af141e07d767edf18bb548a1be2f757d6743f4ba
 AUX openlierox-0.58_rc1-icu.patch 2491 RMD160 87e5a5f3e99e9c221c15620490e46eaeaf8bdb37 SHA1 2b2ed4933ea9b06689b3028c1c5e6010389aebc2 SHA256 0a88eb57357eb6c1f3e1f20792b0504a2a11da680b8cd46a76990c37cd06c139
 DIST OpenLieroX_0.58_beta9.src.tar.bz2 82815579 RMD160 1fa481b01e116a190128f68c979c40c2c280df09 SHA1 63363009c56536e205892c02bc641550e81564a1 SHA256 9f272f530e2a2648c53272e0c835092615d9bc9f14f5e733b2d0935a0edfc014
 DIST OpenLieroX_0.58_rc1.src.tar.bz2 99189771 RMD160 aa1e306bfcc9d082a88e572ccb7770985275e7a1 SHA1 b41a35bc2a9a8c4d49911f48e45ea2396263669b SHA256 0471c54e9d994b1bddc550eac146f6d07ae9be3c95bdcfb254ed2993df99e9cc
 EBUILD openlierox-0.58_beta9-r1.ebuild 1938 RMD160 1834e4a9ee962617223219ad8f832dbe050c8f35 SHA1 7596635b3932717ead65cf9eb23b1a1c02cbaf76 SHA256 abebe3c23fdc2efdd6544dcfc51628b497dd47da25134c9d398d5563aca18a14
-EBUILD openlierox-0.58_rc1-r1.ebuild 1859 RMD160 dec60c25fc8c70111af99966722e5c6c8101feb5 SHA1 4bd4bb6cc09a21af7b235944578c7b20f47be066 SHA256 c4ed9b2f3d7d9e1906d242220e52372c433747d0ec18e7b5e63841afe139b267
+EBUILD openlierox-0.58_rc1-r1.ebuild 1894 RMD160 5345d4137b18f5c0538333516bb8ec26d1c9e981 SHA1 3fbb3d1d32dc0301e8dd7b319a3dc8c3d7fc10b4 SHA256 343f0964ef2cc02e298c85223a586a340b610fceb491630d542b2a861898dd21
 EBUILD openlierox-0.58_rc1.ebuild 1799 RMD160 a0ac5c4ca4ad5f559b758c0657d8efc251edf75e SHA1 e6ebe30391d71f33bb735b4ce4fb3d0e0b1f99d6 SHA256 a6a98924bd961671513561ec4b5a452f97da20cfc1a4d5d25ddcb4df5b5b3de5
-MISC ChangeLog 1401 RMD160 398cafcfe0b8fedc917cad87d1a393b22da5e044 SHA1 ba133fa535714ea387466b362fb9edea895b83df SHA256 3e19ed52ffe7a7fcbb03c0e3ef5c21a3d78f5d8dc4d83163eb7c16ca01768d69
+MISC ChangeLog 1574 RMD160 a2f8500e456fdb5c6a831c5f4e4423accd1e9d2a SHA1 1541c8bb0af7a940461bd366ed6d11ea8964045e SHA256 2dfc49d1b7bb102d84ca01c0d34b47c9339765c101ecb10a3a513ff04f049ddd
 MISC metadata.xml 335 RMD160 7e8053c7d62145463dbff50e6d06eef77039a1da SHA1 39be11e5af990bdd1a1d70347bc4815e1fcfe3b2 SHA256 17e6687a622dc2faf6d29b8fc05d2298f7a3bbaf717b8f867c322d88c0ebb11f

diff --git a/games-action/openlierox/files/openlierox-0.58_rc1-curl.patch b/games-action/openlierox/files/openlierox-0.58_rc1-curl.patch
new file mode 100644 (file)
index 0000000..d151036
--- /dev/null
+++ b/games-action/openlierox/files/openlierox-0.58_rc1-curl.patch
@@ -0,0 +1,72 @@
+diff --git a/include/HTTP.h b/include/HTTP.h
+index 6be27f9..916193b 100644
+--- a/include/HTTP.h
++++ b/include/HTTP.h
+@@ -21,7 +21,12 @@
+ 
+ #include <string>
+ #include <curl/curl.h>
+-#include <curl/types.h>
++#if ! defined(LIBCURL_VERSION_PATCH) \
++    || (LIBCURL_VERSION_MAJOR < 7) \
++    || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR < 21)) \
++    || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR == 21) && (LIBCURL_VERSION_PATCH < 7))
++# include <curl/types.h>
++#endif
+ #include <curl/easy.h>
+ 
+ #include "Networking.h"
+diff --git a/src/breakpad/external/src/common/linux/http_upload.cc b/src/breakpad/external/src/common/linux/http_upload.cc
+index 8748d11..c079aef 100644
+--- a/src/breakpad/external/src/common/linux/http_upload.cc
++++ b/src/breakpad/external/src/common/linux/http_upload.cc
+@@ -31,7 +31,12 @@
+ #include <dlfcn.h>
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
++#if ! defined(LIBCURL_VERSION_PATCH) \
++    || (LIBCURL_VERSION_MAJOR < 7) \
++    || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR < 21)) \
++    || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR == 21) && (LIBCURL_VERSION_PATCH < 7))
++# include <curl/types.h>
++#endif
+ 
+ #include "common/linux/http_upload.h"
+ 
+diff --git a/src/breakpad/external/src/common/linux/libcurl_wrapper.cc b/src/breakpad/external/src/common/linux/libcurl_wrapper.cc
+index 5bea3af..1fa6d24 100644
+--- a/src/breakpad/external/src/common/linux/libcurl_wrapper.cc
++++ b/src/breakpad/external/src/common/linux/libcurl_wrapper.cc
+@@ -29,7 +29,12 @@
+ 
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
++#if ! defined(LIBCURL_VERSION_PATCH) \
++    || (LIBCURL_VERSION_MAJOR < 7) \
++    || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR < 21)) \
++    || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR == 21) && (LIBCURL_VERSION_PATCH < 7))
++# include <curl/types.h>
++#endif
+ #include <dlfcn.h>
+ 
+ #include <string>
+diff --git a/src/common/HTTP.cpp b/src/common/HTTP.cpp
+index 0782f9c..7f7a852 100644
+--- a/src/common/HTTP.cpp
++++ b/src/common/HTTP.cpp
+@@ -25,7 +25,12 @@
+       #include <stdlib.h>
+ #endif
+ #include <curl/curl.h>
+-#include <curl/types.h>
++#if ! defined(LIBCURL_VERSION_PATCH) \
++    || (LIBCURL_VERSION_MAJOR < 7) \
++    || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR < 21)) \
++    || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR == 21) && (LIBCURL_VERSION_PATCH < 7))
++# include <curl/types.h>
++#endif
+ #include <curl/easy.h>
+ 
+ #include "LieroX.h"

diff --git a/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild b/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild
index 17ba70143df85837537df6040d78bd9cb5dfbaa9..ef2825b0b89114442dc559f11c20e775462cab52 100644 (file)
--- a/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild
+++ b/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild,v 1.1 2011/03/22 17:55:15 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild,v 1.2 2011/07/25 04:15:06 sping Exp $
 
 EAPI="2"
 
@@ -33,7 +33,8 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_PN}"
 
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-icu.patch
+       epatch "${FILESDIR}"/${P}-icu.patch \
+                       "${FILESDIR}"/${P}-curl.patch
 }
 
 src_configure() {