view src/libgsasl-1-fixes.patch @ 4222:44b1a9b2193e

qt5: add initial qt5 to mxe-octave, based on mxe.cc * src/qt5.mk: new file * src/qtbase-1-fixes.patch: new file * src/qtbase.mk: new file * src/qtimageformats-1.patch: new file * src/qtimageformats.mk: new file * src/qtsvg.mk: new file * src/qttools-1.patch: new file * added src/qttools.mk: new file * changed Makefile.in: added ENABLE_QT5 option * configure.ac: added enable-qt5 option * index.html: added new files to packages * installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path * installer-files/octave.vbs: added setup of qt5 bin, plugin path * installer-files/octave.bat: added setup of qt5 bin path * src/default-octave.mk: added settig fot qt5 usage * src/qscintilla.mk: added qt5 path
author John D
date Thu, 29 Sep 2016 11:22:51 -0400
parents dddd4581f8d3
children
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

Contains ad hoc patches for cross building.

From 1f0955db1bf81de15e1dd04f1fe29f73ef3983c8 Mon Sep 17 00:00:00 2001
From: MXE
Date: Mon, 7 Nov 2011 18:01:56 +0100
Subject: [PATCH] use memxor from nettle


diff --git a/gl/memxor.c b/gl/memxor.c
index 7fec454..d9b62cd 100644
--- a/gl/memxor.c
+++ b/gl/memxor.c
@@ -22,7 +22,7 @@
 #include "memxor.h"
 
 void *
-memxor (void *restrict dest, const void *restrict src, size_t n)
+gsasl_memxor (void *restrict dest, const void *restrict src, size_t n)
 {
   char const *s = src;
   char *d = dest;
diff --git a/libgsasl.pc.in b/libgsasl.pc.in
index b0c477d..d8d8ccc 100644
--- a/libgsasl.pc.in
+++ b/libgsasl.pc.in
@@ -16,4 +16,5 @@ URL: http://www.gnu.org/software/gsasl/
 Version: @VERSION@
 Libs: -L${libdir} -lgsasl
 Libs.private: @LTLIBGCRYPT@ @LTLIBIDN@ @LTLIBNTLM@
+Requires.private: nettle
 Cflags: -I${includedir}
-- 
1.7.7