[packages/libwapcaplet] - added memcpy patch (fixes build with -Werror); release 2

qboosh qboosh at pld-linux.org
Fri Dec 28 16:02:19 CET 2018


commit 85828280f2780ccc948cdc3cead0d96c0c1c1473
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Dec 28 16:07:01 2018 +0100

    - added memcpy patch (fixes build with -Werror); release 2

 libwapcaplet-memcpy.patch | 38 ++++++++++++++++++++++++++++++++++++++
 libwapcaplet.spec         |  4 +++-
 2 files changed, 41 insertions(+), 1 deletion(-)
---
diff --git a/libwapcaplet.spec b/libwapcaplet.spec
index 964469d..db97f40 100644
--- a/libwapcaplet.spec
+++ b/libwapcaplet.spec
@@ -6,11 +6,12 @@ Summary:	String internment library
 Summary(pl.UTF-8):	Biblioteka do więzienia łańcuchów znaków
 Name:		libwapcaplet
 Version:	0.4.1
-Release:	1
+Release:	2
 License:	MIT
 Group:		Libraries
 Source0:	http://download.netsurf-browser.org/libs/releases/%{name}-%{version}-src.tar.gz
 # Source0-md5:	fc46f9b9c1e7ad432eda74c0fa38e45d
+Patch0:		%{name}-memcpy.patch
 URL:		http://www.netsurf-browser.org/projects/libwapcaplet/
 BuildRequires:	netsurf-buildsystem >= 1.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,6 +56,7 @@ Statyczna biblioteka libwapcaplet.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export CC="%{__cc}"
diff --git a/libwapcaplet-memcpy.patch b/libwapcaplet-memcpy.patch
new file mode 100644
index 0000000..17debe9
--- /dev/null
+++ b/libwapcaplet-memcpy.patch
@@ -0,0 +1,38 @@
+--- libwapcaplet-0.4.1/src/libwapcaplet.c.orig	2018-12-28 05:38:25.523287642 +0100
++++ libwapcaplet-0.4.1/src/libwapcaplet.c	2018-12-28 05:45:37.209286994 +0100
+@@ -47,7 +47,7 @@
+ 
+ typedef lwc_hash (*lwc_hasher)(const char *, size_t);
+ typedef int (*lwc_strncmp)(const char *, const char *, size_t);
+-typedef void (*lwc_memcpy)(char *, const char *, size_t);
++typedef void *(*lwc_memcpy)(void *, const void *, size_t);
+ 
+ static lwc_error
+ lwc__initialise(void)
+@@ -145,7 +145,7 @@
+ {
+ 	return lwc__intern(s, slen, ret,
+ 			   lwc__calculate_hash,
+-			   strncmp, (lwc_memcpy)memcpy);
++			   strncmp, memcpy);
+ }
+ 
+ lwc_error
+@@ -238,12 +238,15 @@
+ 	return 0;
+ }
+ 
+-static void
+-lwc__lcase_memcpy(char *target, const char *source, size_t n)
++static void *
++lwc__lcase_memcpy(void *targetp, const void *sourcep, size_t n)
+ {
++        char *target = targetp;
++	const char *source = sourcep;
+ 	while (n--) {
+ 		*target++ = lwc__dolower(*source++);
+ 	}
++	return targetp;
+ }
+ 
+ lwc_error
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libwapcaplet.git/commitdiff/85828280f2780ccc948cdc3cead0d96c0c1c1473



More information about the pld-cvs-commit mailing list