[supertux/el6] fix building with current libcurl
David King
amigadave at fedoraproject.org
Tue Nov 11 18:21:15 UTC 2014
commit 48fb0a46b7dee7d06f278cf1fb94d57ef1411b2d
Author: Nils Philippsen <nils at redhat.com>
Date: Wed Jun 29 17:30:10 2011 +0200
fix building with current libcurl
supertux-0.3.3-curl.patch | 11 +++++++++++
supertux.spec | 9 +++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/supertux-0.3.3-curl.patch b/supertux-0.3.3-curl.patch
new file mode 100644
index 0000000..8d8b769
--- /dev/null
+++ b/supertux-0.3.3-curl.patch
@@ -0,0 +1,11 @@
+diff -up supertux-0.3.3/src/addon/addon_manager.cpp.curl supertux-0.3.3/src/addon/addon_manager.cpp
+--- supertux-0.3.3/src/addon/addon_manager.cpp.curl 2010-03-01 13:40:58.000000000 +0100
++++ supertux-0.3.3/src/addon/addon_manager.cpp 2011-06-29 17:25:35.372680459 +0200
+@@ -29,7 +29,6 @@
+ #ifdef HAVE_LIBCURL
+ # include <curl/curl.h>
+ # include <curl/easy.h>
+-# include <curl/types.h>
+ #endif
+
+ #include "addon/addon.hpp"
diff --git a/supertux.spec b/supertux.spec
index 3d1b968..67f9bf0 100644
--- a/supertux.spec
+++ b/supertux.spec
@@ -8,6 +8,7 @@ URL: http://supertux.lethargik.org/
Source0: http://download.berlios.de/supertux/supertux-%{version}.tar.bz2
Patch0: supertux-0.3.3-desktop.patch
Patch1: supertux-0.3.3-system-squirrel.patch
+Patch2: supertux-0.3.3-curl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel >= 1.2.4
BuildRequires: SDL_image-devel
@@ -37,8 +38,9 @@ Grabbing power-ups and other stuff on the way.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .desktop
+%patch1 -p1 -b .system-squirrel
+%patch2 -p1 -b .curl
%build
@@ -91,6 +93,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Wed Jun 29 2011 Nils Philippsen <nils at redhat.com> - 0.3.3-3
+- fix building with current libcurl
+
* Mon Jun 20 2011 ajax at redhat.com - 0.3.3-3
- Rebuild for new glew soname
More information about the scm-commits
mailing list