[packages/libmemcached] add pointer_comparison.patch

jajcus jajcus at pld-linux.org
Fri Oct 12 10:36:34 CEST 2018


commit 8c457ca144f271982ea9f26c8ece83401b779a36
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Fri Oct 12 10:35:57 2018 +0200

    add pointer_comparison.patch
    
    fixes:
    > clients/memflush.cc:42:22: error: ISO C++ forbids comparison between pointer and integer [-fpermissive]

 libmemcached.spec        |  5 ++++-
 pointer_comparison.patch | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/libmemcached.spec b/libmemcached.spec
index 3c4cbcf..b08f65c 100644
--- a/libmemcached.spec
+++ b/libmemcached.spec
@@ -9,11 +9,12 @@ Summary:	memcached client library
 Summary(pl.UTF-8):	Blblioteka kliencka memcached
 Name:		libmemcached
 Version:	1.0.18
-Release:	3
+Release:	4
 License:	BSD
 Group:		Libraries
 Source0:	https://launchpad.net/libmemcached/1.0/%{version}/+download/%{name}-%{version}.tar.gz
 # Source0-md5:	b3958716b4e53ddc5992e6c49d97e819
+Patch1:		pointer_comparison.patch
 URL:		http://libmemcached.org/
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	libevent-devel
@@ -62,6 +63,8 @@ Statyczna biblioteka memcached.
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 %configure \
 	PTHREAD_CFLAGS="-pthread" \
diff --git a/pointer_comparison.patch b/pointer_comparison.patch
new file mode 100644
index 0000000..1d67e39
--- /dev/null
+++ b/pointer_comparison.patch
@@ -0,0 +1,21 @@
+diff -dur -x '*~' libmemcached-1.0.18.orig/clients/memflush.cc libmemcached-1.0.18/clients/memflush.cc
+--- libmemcached-1.0.18.orig/clients/memflush.cc	2014-02-09 12:52:42.000000000 +0100
++++ libmemcached-1.0.18/clients/memflush.cc	2018-10-12 10:29:45.000000000 +0200
+@@ -39,7 +39,7 @@
+ {
+   options_parse(argc, argv);
+ 
+-  if (opt_servers == false)
++  if (!opt_servers)
+   {
+     char *temp;
+ 
+@@ -48,7 +48,7 @@
+       opt_servers= strdup(temp);
+     }
+ 
+-    if (opt_servers == false)
++    if (!opt_servers)
+     {
+       std::cerr << "No Servers provided" << std::endl;
+       exit(EXIT_FAILURE);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libmemcached.git/commitdiff/8c457ca144f271982ea9f26c8ece83401b779a36



More information about the pld-cvs-commit mailing list