Mercurial > mxe-octave

changeset 5593:552fca54749c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add glib-2-fixes.patch * src/glib-2-fixes.patch: new file * dist-files.mk: add ref to glib-2-fixes.patch
author John Donoghue <john.donoghue@ieee.org>
date Tue, 01 Dec 2020 09:39:40 -0500
parents beb523b00504
children 8e1d63f092d6
files dist-files.mk src/glib-2-fixes.patch
diffstat 2 files changed, 25 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Tue Dec 01 08:45:29 2020 -0500
+++ b/dist-files.mk	Tue Dec 01 09:39:40 2020 -0500
@@ -142,6 +142,7 @@
   glew-test.c \
   glew.mk \
   glib-1-fixes.patch \
+  glib-2-fixes.patch \
   glib.mk \
   glibmm.mk \
   glpk-1-fixes.patch \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/glib-2-fixes.patch	Tue Dec 01 09:39:40 2020 -0500
@@ -0,0 +1,24 @@
+See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1428
+
+--- a/glib/gtypes.h	2016-10-22 07:21:52.000000000 +0200
++++ b/glib/gtypes.h	2020-05-17 11:13:49.369639688 +0200
+@@ -522,7 +522,7 @@
+ #    else /* !GLIB_STATIC_COMPILATION */
+ #      ifdef GLIB_COMPILATION
+ #        ifdef DLL_EXPORT
+-#          define GLIB_VAR __declspec(dllexport)
++#          define GLIB_VAR extern __declspec(dllexport)
+ #        else /* !DLL_EXPORT */
+ #          define GLIB_VAR extern
+ #        endif /* !DLL_EXPORT */
+--- a/gobject/gparamspecs.h	2016-10-22 07:22:21.000000000 +0200
++++ b/gobject/gparamspecs.h	2020-05-17 11:16:37.803281391 +0200
+@@ -1144,7 +1144,7 @@
+ #    else /* !GOBJECT_STATIC_COMPILATION */
+ #      ifdef GOBJECT_COMPILATION
+ #        ifdef DLL_EXPORT
+-#          define GOBJECT_VAR __declspec(dllexport)
++#          define GOBJECT_VAR extern __declspec(dllexport)
+ #        else /* !DLL_EXPORT */
+ #          define GOBJECT_VAR extern
+ #        endif /* !DLL_EXPORT */