starius

This file is part of MXE. See LICENSE.md for licensing information.

Contains ad hoc patches for cross building.

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 23 Sep 2010 21:42:46 +0200
Subject: [PATCH] fix tool paths

starius

/home/bnagaev/mxe/usr/i686-w64-mingw32.static/lib/libgobject-2.0.a(libgobject_2_0_la-gtype
.o): In function `DllMain@12':
/home/bnagaev/mxe/tmp-glib-i686-w64-mingw32.static/glib-2.50.2/gobject/gtype.c:4463: multi
ple definition of `DllMain@12'
../../../gst/.libs/libgstreamer-1.0.a(libgstreamer_1.0_la-gst.o):/home/bnagaev/mxe/tmp-gst
reamer-i686-w64-mingw32.static/gstreamer-1.6.2/gst/gst.c:210: first defined here
collect2: error: ld returned 1 exit status

starius

diff --git a/src/gcc.mk b/src/gcc.mk
index be4ebfd..e352d44 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -78,6 +78,7 @@ define $(PKG)_BUILD_mingw-w64
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-sdk=all \
         --enable-idl \
+        --enable-secure-api \
         $(mingw-w64-headers_CONFIGURE_OPTS)

starius

diff --git a/src/gcc.mk b/src/gcc.mk
index be4ebfd..e352d44 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -78,6 +78,7 @@ define $(PKG)_BUILD_mingw-w64
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-sdk=all \
         --enable-idl \
+        --enable-secure-api \
         $(mingw-w64-headers_CONFIGURE_OPTS)

starius

diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch
index 428cc6a..2ebea03 100644
--- a/src/glib-1-fixes.patch
+++ b/src/glib-1-fixes.patch
@@ -36,7 +36,7 @@ diff --git a/gio/giomodule.c b/gio/giomodule.c
 index 1111111..2222222 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -918,14 +918,12 @@ extern GType g_gtk_notification_backend_get_type (void);
+@@ -928,14 +928,12 @@ extern GType g_cocoa_notification_backend_get_type (void);

starius

diff --git a/src/gtk3-1-fixes.patch b/src/gtk3-1-fixes.patch
index 91ff9a5..77b03b4 100644
--- a/src/gtk3-1-fixes.patch
+++ b/src/gtk3-1-fixes.patch
@@ -62,69 +62,6 @@ These were adapted from the gtk2 patchset.
 +Libs: -L${libdir} -lgtk-3 @GTK_DEP_LIBS@ -lwinspool -lcomctl32 -lcomdlg32
  Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@
 ---
-Here there were two problems, one is that util/extract-strings.exe
-was being cross-built while it should be built locally, the other is

starius

diff --git a/src/gtk3-1-fixes.patch b/src/gtk3-1-fixes.patch
index 91ff9a5..a7966d1 100644
--- a/src/gtk3-1-fixes.patch
+++ b/src/gtk3-1-fixes.patch
@@ -62,54 +62,6 @@ These were adapted from the gtk2 patchset.
 +Libs: -L${libdir} -lgtk-3 @GTK_DEP_LIBS@ -lwinspool -lcomctl32 -lcomdlg32
  Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@
 ---
-Here there were two problems, one is that util/extract-strings.exe
-was being cross-built while it should be built locally, the other is

starius

make[1]: Entering directory `/home/mxe/mxe-gcc5-gcc4'
uname -a
Linux sd-68075 3.2.0-4-amd64 #1 SMP Debian 3.2.68-1+deb7u4 x86_64 GNU/Linux
git log --pretty=tformat:"%H - %s [%ar] [%d]" -1
a1e058188fd375b5bb9e814b1a3d9d775f6836cf - hyperscan: fix build with gcc54 on darwin [2 days ago] [ (HEAD, master)]
lsb_release -a 2>/dev/null || sw_vers 2>/dev/null || true
Distributor ID:	Debian
Description:	Debian GNU/Linux 7.11 (wheezy)
Release:	7.11
Codename:	wheezy

starius

local lpeg = require 'lpeg'
local lpeg2c = require 'lpeg2c'

-- based on lpeg/test.lua, lines 152-163, LPeg 1.0.1

local upper = lpeg.S"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
local lower = lpeg.S"abcdefghijklmnopqrstuvwxyz"
local letter = lpeg.S"" + upper + lower

local function basiclookfor(p)

starius

make[1]: Entering directory `/home/mxe/mxe-gcc5-b'
uname -a
Linux sd-68075 3.2.0-4-amd64 #1 SMP Debian 3.2.68-1+deb7u4 x86_64 GNU/Linux
git log --pretty=tformat:"%H - %s [%ar] [%d]" -1
237b08ab89543a8f96f74e80d77d82d7bef278cf - add gcc4 plugin [27 hours ago] [ (HEAD, master)]
lsb_release -a 2>/dev/null || sw_vers 2>/dev/null || true
Distributor ID:	Debian
Description:	Debian GNU/Linux 7.11 (wheezy)
Release:	7.11
Codename:	wheezy