Fix build on ppc64
This commit is contained in:
parent
da8760f14e
commit
f9328a3443
35
libkolabxml-0.7.0-fix-build-without-fpermissive.patch
Normal file
35
libkolabxml-0.7.0-fix-build-without-fpermissive.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From 8678445bd6cadbd5bfebc8d7de03e83ca1c68234 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Mollekopf <mollekopf@kolabsys.com>
|
||||
Date: Fri, 20 Jul 2012 12:06:29 +0200
|
||||
Subject: [PATCH] fix build without -fpermissive (cherry picked from commit
|
||||
8f8a2f3b9f3d227a60f1a733476b13c60a352e21)
|
||||
|
||||
---
|
||||
src/uriencode.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/uriencode.cpp b/src/uriencode.cpp
|
||||
index 363f98e..3c30331 100644
|
||||
--- a/src/uriencode.cpp
|
||||
+++ b/src/uriencode.cpp
|
||||
@@ -21,7 +21,7 @@
|
||||
std::string uriEncode(const std::string &s)
|
||||
{
|
||||
CURL *easyhandle = curl_easy_init();
|
||||
- const char *result = curl_easy_escape(easyhandle, s.c_str(), s.length());
|
||||
+ char *result = curl_easy_escape(easyhandle, s.c_str(), static_cast<int>(s.length()));
|
||||
curl_easy_cleanup(easyhandle);
|
||||
if (!result) {
|
||||
return std::string();
|
||||
@@ -35,7 +35,7 @@ std::string uriDecode(const std::string &s)
|
||||
{
|
||||
CURL *easyhandle = curl_easy_init();
|
||||
int length = 0;
|
||||
- const char *result = curl_easy_unescape(easyhandle, s.c_str(), s.length(), &length);
|
||||
+ char *result = curl_easy_unescape(easyhandle, s.c_str(), static_cast<int>(s.length()), &length);
|
||||
curl_easy_cleanup(easyhandle);
|
||||
if (!length) {
|
||||
return std::string();
|
||||
--
|
||||
1.7.10.4
|
||||
|
@ -13,16 +13,17 @@
|
||||
|
||||
Name: libkolabxml
|
||||
Version: 0.7.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Kolab XML format collection parser library
|
||||
|
||||
Group: System Environment/Libraries
|
||||
License: LGPLv3+
|
||||
URL: http://www.kolab.org
|
||||
|
||||
# From git.kolab.org/libkolabxml/snapshot/5c360b5c0de1257ae942db547dfa54b2b99a8ad5.tar.gz
|
||||
Source0: http://git.kolab.org/libkolabxml/snapshot/%{name}-%{version}.tar.gz
|
||||
|
||||
Patch1: libkolabxml-0.7.0-fix-build-without-fpermissive.patch
|
||||
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
%if 0%{?rhel} < 6 && 0%{?fedora} < 15
|
||||
@ -110,6 +111,7 @@ bindings provided through libkolabxml.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
rm -rf build
|
||||
@ -190,7 +192,8 @@ rm -rf %{buildroot}
|
||||
%{python_sitearch}/_kolabformat.so
|
||||
|
||||
%changelog
|
||||
* Wed Jul 25 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.0-1
|
||||
* Wed Jul 25 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.0-2
|
||||
- Fix build on ppc64
|
||||
- New upstream version
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-4
|
||||
|
Loading…
Reference in New Issue
Block a user