Drop obsolete patch

This commit is contained in:
Jeroen van Meeuwen (Kolab Systems) 2012-08-02 10:26:29 +01:00
parent 997318f51d
commit 96797b751c
2 changed files with 0 additions and 38 deletions

View File

@ -1,35 +0,0 @@
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

View File

@ -23,8 +23,6 @@ URL: http://www.kolab.org
# From http://git.kolab.org/libkolabxml/snapshot/e493785b22b63c89408317ad010d0fbca37a40d3.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
@ -113,7 +111,6 @@ bindings provided through libkolabxml.
%prep
%setup -q
%patch1 -p1
%build
rm -rf build