view src/fribidi-1-fixes.patch @ 4472:0fdeee4cfe11

gnuplot: enable Qt terminal and set default to wxt * src/gnuplot.mk: Depend on qt5 and build with QT=1 QT_DIR=$(HOST_PREFIX)/qt QT_BIN_DIR=(BUILD_TOOLS_PREFIX)/bin, install gnuplot_qt.exe * src/gnuplot-1-fixes.patch: add to patchto allow override of QT tools and paths * installer-files/octave-firsttime.vbs: set GNUTERM=wxt * installer-files/octave.vbs: set GNUTERM=wxt * installer-files/octave.bat: set GNUTERM=wxt * installer-files/cmdshell.bat: set GNUTERM=wxt
author Mike Miller <mtmiller@octave.org>
date Wed, 06 Sep 2017 16:19:37 -0700
parents 39355c49f6bc
children
line wrap: on
line source

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

From c4dc7b368af33821eca1be8a4ec88929b44f3d06 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 17 Jul 2012 10:07:07 +0200
Subject: [PATCH] only include glib.h


diff --git a/charset/fribidi-char-sets.c b/charset/fribidi-char-sets.c
index 5d45e74..e596dee 100644
--- a/charset/fribidi-char-sets.c
+++ b/charset/fribidi-char-sets.c
@@ -114,7 +114,7 @@ static FriBidiCharSetHandler char_sets[FRIBIDI_CHAR_SETS_NUM + 1] = {
 };
 
 #if FRIBIDI_USE_GLIB+0
-# include <glib/gstrfuncs.h>
+# include <glib.h>
 # define fribidi_strcasecmp g_ascii_strcasecmp
 #else /* !FRIBIDI_USE_GLIB */
 static char
diff --git a/lib/mem.h b/lib/mem.h
index c875e0b..031fcc3 100644
--- a/lib/mem.h
+++ b/lib/mem.h
@@ -42,7 +42,7 @@
 #if FRIBIDI_USE_GLIB+0
 
 #ifndef __FRIBIDI_DOC
-# include <glib/gmem.h>
+# include <glib.h>
 #endif /* !__FRIBIDI_DOC */
 
 #define FriBidiMemChunk GMemChunk
-- 
1.7.10.4