d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

various packages: manually convert *-1-fixes.patch to format-patch style

This commit is contained in:
Tony Theodore 2017-11-18 21:51:26 +11:00
parent cd1655c9ef
commit 9373aaee94
15 changed files with 4191 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/bzip2-1-fixes.patch
View File

@ -1,8 +1,17 @@
This file is part of MXE. See LICENSE.md for licensing information.
diff -uNr bzip2-1.0.6.orig/bzip2.c bzip2-1.0.6/bzip2.c
--- bzip2-1.0.6.orig/bzip2.c 2010-09-11 01:04:53.000000000 +0200
+++ bzip2-1.0.6/bzip2.c 2013-01-30 16:24:00.170396872 +0100
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 20:31:24 +1100
Subject: [PATCH] fixes
diff --git a/bzip2.c b/bzip2.c
index 1111111..2222222 100644
--- a/bzip2.c
+++ b/bzip2.c
@@ -128,7 +128,7 @@
#if BZ_LCCWIN32
# include <io.h>
@ -12,10 +21,11 @@ diff -uNr bzip2-1.0.6.orig/bzip2.c bzip2-1.0.6/bzip2.c
# define NORETURN /**/
# define PATH_SEP '\\'
diff -uNr bzip2-1.0.6.orig/bzlib.h bzip2-1.0.6/bzlib.h
--- bzip2-1.0.6.orig/bzlib.h 2010-09-11 01:08:42.000000000 +0200
+++ bzip2-1.0.6/bzlib.h 2013-01-30 16:22:10.514401460 +0100
@@ -75,7 +75,7 @@
diff --git a/bzlib.h b/bzlib.h
index 1111111..2222222 100644
--- a/bzlib.h
+++ b/bzlib.h
@@ -75,7 +75,7 @@ typedef
#include <stdio.h>
#endif
@ -24,7 +34,7 @@ diff -uNr bzip2-1.0.6.orig/bzlib.h bzip2-1.0.6/bzlib.h
# include <windows.h>
# ifdef small
/* windows.h define small to char */
@@ -116,7 +116,7 @@
@@ -116,7 +116,7 @@ BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) (
BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) (
bz_stream *strm,
int verbosity,
@ -33,7 +43,7 @@ diff -uNr bzip2-1.0.6.orig/bzlib.h bzip2-1.0.6/bzlib.h
);
BZ_EXTERN int BZ_API(BZ2_bzDecompress) (
@@ -140,7 +140,7 @@
@@ -140,7 +140,7 @@ BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) (
int* bzerror,
FILE* f,
int verbosity,
@ -42,7 +52,7 @@ diff -uNr bzip2-1.0.6.orig/bzlib.h bzip2-1.0.6/bzlib.h
void* unused,
int nUnused
);
@@ -216,7 +216,7 @@
@@ -216,7 +216,7 @@ BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) (
unsigned int* destLen,
char* source,
unsigned int sourceLen,

3908
src/coin-1-fixes.patch
View File

File diff suppressed because it is too large Load Diff

15
src/coin-2-gcc-4.7.patch
View File

@ -1,15 +0,0 @@
This file is part of MXE. See LICENSE.md for licensing information.
This patch was taken from Gentoo:
https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch?id=17d7c853393ff83e3422e48e9ad2810f23889bbf
--- coin3-3.1.3.orig/include/Inventor/SbBasic.h
+++ coin3-3.1.3/include/Inventor/SbBasic.h
@@ -24,6 +24,7 @@
*
\**************************************************************************/
+#include <Inventor/C/errors/debugerror.h>
#include <Inventor/C/basic.h>
/* ********************************************************************** */

18
src/cryptopp-1-fixes.patch
View File

@ -1,11 +1,19 @@
This file is part of MXE. See LICENSE.md for licensing information.
Fix broken Makefile, add relevant object files and don't use -DCRYPTOPP_EXPORTS
Contains ad hoc patches for cross building.
diff -ur a/GNUmakefile b/GNUmakefile
--- a/GNUmakefile 2015-11-22 22:17:59.000000000 +0100
+++ b/GNUmakefile 2015-11-29 13:04:15.587252779 +0100
@@ -255,8 +255,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 20:50:55 +1100
Subject: [PATCH] Fix broken Makefile, add relevant object files and don't use
-DCRYPTOPP_EXPORTS
diff --git a/GNUmakefile b/GNUmakefile
index 1111111..2222222 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -255,8 +255,7 @@ TESTOBJS := bench.o bench2.o test.o validat1.o validat2.o validat3.o adhoc.o dat
LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS))
# List cryptlib.cpp first in an attempt to tame C++ static initialization problems

4
src/gdal-1-fixes.patch
View File

@ -23,7 +23,7 @@ index 1111111..2222222 100644
if test "${HAVE_PG}" = "yes" ; then
LIBS=-L`$PG_CONFIG --libdir`" -lpq $LIBS"
@@ -3532,16 +3544,21 @@ AC_ARG_WITH(spatialite-soname,
@@ -3544,16 +3544,21 @@ AC_ARG_WITH(spatialite-soname,
HAVE_SPATIALITE=no
SPATIALITE_AMALGAMATION=no
@ -71,10 +71,12 @@ index 1111111..2222222 100644
AC_CHECK_LIB([geos_c],
[GEOSversion],
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Luke Potgieter <fried.roadkill+ght@gmail.com>
Date: Tue, 26 Sep 2017 14:56:19 +0200
Subject: [PATCH] Use the new proj dll version number for the latest proj.
diff --git a/ogr/ogrct.cpp b/ogr/ogrct.cpp
index 1111111..2222222 100644
--- a/ogr/ogrct.cpp

12
src/libdnet-1-fixes.patch
View File

@ -1,5 +1,12 @@
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: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 20:58:20 +1100
Subject: [PATCH] fixes
Patch taken from http://sourceforge.net/mailarchive/message.php?msg_id=27995461
mingwrt 3.20 provides ssize_t and defines _SSIZE_T_. This patch
@ -7,7 +14,7 @@ allows libdnet to use this ssize_t instead of defining its
own which causes build failure. Applies to libdnet 1.11.
diff --git a/include/dnet/os.h b/include/dnet/os.h
index c12c7b2..9e8bdd2 100644
index 1111111..2222222 100644
--- a/include/dnet/os.h
+++ b/include/dnet/os.h
@@ -23,8 +23,10 @@
@ -21,6 +28,3 @@ index c12c7b2..9e8bdd2 100644
#else
# include <sys/param.h>
# include <sys/types.h>
--
1.7.6

2
src/libmms-1-fixes.patch
View File

@ -7,6 +7,7 @@ From: John Lindgren <john.lindgren@aol.com>
Date: Thu, 29 May 2014 22:42:53 -0400
Subject: [PATCH] Remove "Requires: glib-2.0" since libmms no longer depends on
GLib.
https://sourceforge.net/p/libmms/code/ci/b9bbe17c08e5dcbe3ce841e6bed52ce8d8b10f9e/
diff --git a/pkgconfig/libmms.pc.in b/pkgconfig/libmms.pc.in
@ -28,6 +29,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: John Lindgren <john.lindgren@tds.net>
Date: Thu, 19 Nov 2015 13:39:27 +0100
Subject: [PATCH] Fix build if strndup() is missing
https://sourceforge.net/p/libmms/code/ci/67d54003b8075b8ea8102bc4a808df4543ab113a/
diff --git a/configure.in b/configure.in

8
src/libwebp-1-fixes.patch
View File

@ -2,8 +2,14 @@ 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: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 21:36:24 +1100
Subject: [PATCH] fixes
diff --git a/src/dec/webp.c b/src/dec/webp.c
index 59e21a9..074f04c 100644
index 1111111..2222222 100644
--- a/src/dec/webp.c
+++ b/src/dec/webp.c
@@ -451,7 +451,7 @@ void WebPResetDecParams(WebPDecParams* const params) {

5
src/muparser-1-fixes.patch
View File

@ -1,13 +1,14 @@
This file is part of MXE. See LICENSE.md for licensing information.
Taken from:
https://github.com/beltoforion/muparser/pull/17
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 21 Nov 2015 15:38:02 +1100
Subject: [PATCH] fix dll install directory
Taken from:
https://github.com/beltoforion/muparser/pull/17
diff --git a/Makefile.in b/Makefile.in
index 1111111..2222222 100644

24
src/opencsg-1-fixes.patch
View File

@ -2,9 +2,16 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
diff -ur OpenCSG-1.4.1.orig/example/example.pro OpenCSG-1.4.1/example/example.pro
--- OpenCSG-1.4.1.orig/example/example.pro 2016-09-08 23:08:33.000000000 +0200
+++ OpenCSG-1.4.1/example/example.pro 2016-09-11 14:24:18.839741352 +0200
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 21:39:30 +1100
Subject: [PATCH] fixes
diff --git a/example/example.pro b/example/example.pro
index 1111111..2222222 100644
--- a/example/example.pro
+++ b/example/example.pro
@@ -1,10 +1,10 @@
TEMPLATE = app
TARGET = opencsgexample
@ -18,7 +25,7 @@ diff -ur OpenCSG-1.4.1.orig/example/example.pro OpenCSG-1.4.1/example/example.pr
INSTALLDIR = /usr/local
INSTALLS += target
@@ -15,7 +15,8 @@
@@ -15,7 +15,8 @@ macx {
LIBS += -framework GLUT -L/opt/local/lib
}
else {
@ -28,10 +35,11 @@ diff -ur OpenCSG-1.4.1.orig/example/example.pro OpenCSG-1.4.1/example/example.pr
}
HEADERS = displaylistPrimitive.h
diff -ur OpenCSG-1.4.1.orig/src/src.pro OpenCSG-1.4.1/src/src.pro
--- OpenCSG-1.4.1.orig/src/src.pro 2016-09-08 23:08:33.000000000 +0200
+++ OpenCSG-1.4.1/src/src.pro 2016-09-11 14:25:15.833496135 +0200
@@ -6,10 +6,11 @@
diff --git a/src/src.pro b/src/src.pro
index 1111111..2222222 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -6,10 +6,11 @@ isEmpty(INSTALLDIR) {
INSTALLDIR = /usr/local
}

88
src/qjson-1-fixes.patch
View File

@ -1,9 +1,18 @@
This file is part of MXE. See LICENSE.md for licensing information.
diff -Naur qjson-0.8.1.orig/CMakeLists.txt qjson-0.8.1/CMakeLists.txt
--- qjson-0.8.1.orig/CMakeLists.txt 2012-11-27 14:06:57.000000000 +0400
+++ qjson-0.8.1/CMakeLists.txt 2016-02-13 03:00:18.725982532 +0300
@@ -56,13 +56,13 @@
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 21:41:08 +1100
Subject: [PATCH] fixes
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1111111..2222222 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,13 +56,13 @@ set(QJSON_LIB_VERSION_STRING "${QJSON_LIB_MAJOR_VERSION}.${QJSON_LIB_MINOR_VERSI
set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" )
# pkg-config
@ -19,3 +28,74 @@ diff -Naur qjson-0.8.1.orig/CMakeLists.txt qjson-0.8.1/CMakeLists.txt
# Subdirs
ADD_SUBDIRECTORY(src)
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 18 Nov 2017 21:42:43 +1100
Subject: [PATCH] build as static lib
taken from:
http://sourceforge.net/mailarchive/forum.php?thread_name=4E1DBC0D.10000%40jrit.at&forum_name=qjson-devel
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1111111..2222222 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,13 @@ SET(FRAMEWORK_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/Library/Frameworks"
# (This will have no effect with CMake < 2.8)
SET(QT_USE_IMPORTED_TARGETS TRUE)
+# For Static builds
+IF(LIBTYPE STREQUAL "STATIC")
+ ADD_DEFINITIONS("-DQJSON_STATIC")
+ ADD_DEFINITIONS("-DQT_NODLL")
+ SET(PKG_CONFIG_CFLAGS -DQJSON_STATIC ${PKG_CONFIG_CFLAGS})
+endif()
+
# Find Qt4
FIND_PACKAGE( Qt4 REQUIRED )
diff --git a/QJson.pc.in b/QJson.pc.in
index 1111111..2222222 100644
--- a/QJson.pc.in
+++ b/QJson.pc.in
@@ -8,4 +8,4 @@ Description: QJson is a qt-based library that maps JSON data to QVariant objects
Version: @QJSON_LIB_MAJOR_VERSION@.@QJSON_LIB_MINOR_VERSION@.@QJSON_LIB_PATCH_VERSION@
Requires: QtCore
Libs: -L${libdir} -lqjson
-Cflags: -I${includedir}
\ No newline at end of file
+Cflags: -I${includedir} @PKG_CONFIG_CFLAGS@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1111111..2222222 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,7 +15,12 @@ qt4_wrap_cpp(qjson_MOC_SRCS ${qjson_MOC_HDRS})
set (qjson_SRCS parser.cpp qobjecthelper.cpp json_scanner.cpp json_parser.cc parserrunnable.cpp serializer.cpp serializerrunnable.cpp)
set (qjson_HEADERS parser.h parserrunnable.h qobjecthelper.h serializer.h serializerrunnable.h qjson_export.h)
-add_library (qjson SHARED ${qjson_SRCS} ${qjson_MOC_SRCS} ${qjson_HEADERS})
+IF(LIBTYPE STREQUAL "STATIC")
+ add_library (qjson STATIC ${qjson_SRCS} ${qjson_MOC_SRCS} ${qjson_HEADERS})
+else()
+ add_library (qjson SHARED ${qjson_SRCS} ${qjson_MOC_SRCS} ${qjson_HEADERS})
+endif()
+
target_link_libraries( qjson ${QT_LIBRARIES})
if(NOT android)
diff --git a/src/qjson_export.h b/src/qjson_export.h
index 1111111..2222222 100644
--- a/src/qjson_export.h
+++ b/src/qjson_export.h
@@ -23,7 +23,9 @@
#include <QtCore/qglobal.h>
#ifndef QJSON_EXPORT
-# if defined(QJSON_MAKEDLL)
+# ifdef QJSON_STATIC
+# define QJSON_EXPORT
+# elif defined(QJSON_MAKEDLL)
/* We are building this library */
# define QJSON_EXPORT Q_DECL_EXPORT
# else

75
src/qjson-1-static.patch
View File

@ -1,75 +0,0 @@
This file is part of MXE. See LICENSE.md for licensing information.
From d456ebfe73b1a06beb8423c94f3b01edb6bc7507 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 23 Nov 2012 08:41:43 +0100
Subject: [PATCH] build as static lib
taken from:
http://sourceforge.net/mailarchive/forum.php?thread_name=4E1DBC0D.10000%40jrit.at&forum_name=qjson-devel
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13e65f1..99fd8e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,13 @@ SET(FRAMEWORK_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/Library/Frameworks"
# (This will have no effect with CMake < 2.8)
SET(QT_USE_IMPORTED_TARGETS TRUE)
+# For Static builds
+IF(LIBTYPE STREQUAL "STATIC")
+ ADD_DEFINITIONS("-DQJSON_STATIC")
+ ADD_DEFINITIONS("-DQT_NODLL")
+ SET(PKG_CONFIG_CFLAGS -DQJSON_STATIC ${PKG_CONFIG_CFLAGS})
+endif()
+
# Find Qt4
FIND_PACKAGE( Qt4 REQUIRED )
diff --git a/QJson.pc.in b/QJson.pc.in
index e4704bd..bf5fd01 100644
--- a/QJson.pc.in
+++ b/QJson.pc.in
@@ -8,4 +8,4 @@ Description: QJson is a qt-based library that maps JSON data to QVariant objects
Version: @QJSON_LIB_MAJOR_VERSION@.@QJSON_LIB_MINOR_VERSION@.@QJSON_LIB_PATCH_VERSION@
Requires: QtCore
Libs: -L${libdir} -lqjson
-Cflags: -I${includedir}
\ No newline at end of file
+Cflags: -I${includedir} @PKG_CONFIG_CFLAGS@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e2e8a13..c164b04 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,7 +15,12 @@ qt4_wrap_cpp(qjson_MOC_SRCS ${qjson_MOC_HDRS})
set (qjson_SRCS parser.cpp qobjecthelper.cpp json_scanner.cpp json_parser.cc parserrunnable.cpp serializer.cpp serializerrunnable.cpp)
set (qjson_HEADERS parser.h parserrunnable.h qobjecthelper.h serializer.h serializerrunnable.h qjson_export.h)
-add_library (qjson SHARED ${qjson_SRCS} ${qjson_MOC_SRCS} ${qjson_HEADERS})
+IF(LIBTYPE STREQUAL "STATIC")
+ add_library (qjson STATIC ${qjson_SRCS} ${qjson_MOC_SRCS} ${qjson_HEADERS})
+else()
+ add_library (qjson SHARED ${qjson_SRCS} ${qjson_MOC_SRCS} ${qjson_HEADERS})
+endif()
+
target_link_libraries( qjson ${QT_LIBRARIES})
if(NOT android)
diff --git a/src/qjson_export.h b/src/qjson_export.h
index 9a807b9..7e6646a 100644
--- a/src/qjson_export.h
+++ b/src/qjson_export.h
@@ -23,7 +23,9 @@
#include <QtCore/qglobal.h>
#ifndef QJSON_EXPORT
-# if defined(QJSON_MAKEDLL)
+# ifdef QJSON_STATIC
+# define QJSON_EXPORT
+# elif defined(QJSON_MAKEDLL)
/* We are building this library */
# define QJSON_EXPORT Q_DECL_EXPORT
# else
--
1.7.10.4

111
src/subversion-1-fixes.patch
View File

@ -1,6 +1,44 @@
--- subversion-1.9.2/configure.ac 2015-07-27 01:03:10.000000000 +0200
+++ subversion-1.9.2.new/configure.ac 2015-12-09 13:58:49.000000000 +0100
@@ -467,9 +467,6 @@
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: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 21:45:25 +1100
Subject: [PATCH] fixes
diff --git a/build/generator/gen_make.py b/build/generator/gen_make.py
index 1111111..2222222 100644
--- a/build/generator/gen_make.py
+++ b/build/generator/gen_make.py
@@ -633,7 +633,7 @@ DIR=`pwd`
lib_required_private=[],
)
# libsvn_foo -> -lsvn_foo
- data.lib_deps.append('-l%s' % lib_name.replace('lib', '', 1))
+ data.lib_deps.append('-l%s-1' % lib_name.replace('lib', '', 1))
for lib_dep in lib_deps.split():
if lib_dep == 'apriconv':
# apriconv is part of apr-util, skip it
diff --git a/build/generator/templates/pkg-config.in.ezt b/build/generator/templates/pkg-config.in.ezt
index 1111111..2222222 100644
--- a/build/generator/templates/pkg-config.in.ezt
+++ b/build/generator/templates/pkg-config.in.ezt
@@ -1,7 +1,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/subversion-1
Name: [lib_name]
Description: [lib_desc]
diff --git a/configure.ac b/configure.ac
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -467,9 +467,6 @@ fi
dnl Mac OS specific features -------------------
@ -10,7 +48,7 @@
dnl APR_HAS_DSO -------------------
@@ -1271,7 +1268,6 @@
@@ -1271,7 +1268,6 @@ AS_HELP_STRING([--enable-gprof],
# Python: Used for testsuite, and bindings
@ -18,9 +56,10 @@
if test -z "$PYTHON"; then
AC_MSG_WARN([Python 2.7 or later is required to run the testsuite])
AC_MSG_WARN([or to use the Subversion Python bindings])
--- subversion-1.9.2/subversion/libsvn_subr/config_win.c 2015-04-17 06:00:18.000000000 +0200
+++ subversion-1.9.2.new/subversion/libsvn_subr/config_win.c 2015-12-10 09:49:11.645120955 +0100
diff --git a/subversion/libsvn_subr/config_win.c b/subversion/libsvn_subr/config_win.c
index 1111111..2222222 100644
--- a/subversion/libsvn_subr/config_win.c
+++ b/subversion/libsvn_subr/config_win.c
@@ -34,7 +34,7 @@
#define WIN32_LEAN_AND_MEAN
/* winsock2.h includes windows.h */
@ -30,9 +69,24 @@
#include <shlobj.h>
--- subversion-1.9.2/subversion/libsvn_subr/win32_xlate.c 2015-02-03 13:56:57.000000000 +0100
+++ subversion-1.9.2.new/subversion/libsvn_subr/win32_xlate.c 2015-12-10 09:48:56.725192873 +0100
@@ -36,7 +36,7 @@
diff --git a/subversion/libsvn_subr/io.c b/subversion/libsvn_subr/io.c
index 1111111..2222222 100644
--- a/subversion/libsvn_subr/io.c
+++ b/subversion/libsvn_subr/io.c
@@ -1789,7 +1789,7 @@ svn_io__utf8_to_unicode_longpath(const WCHAR **result,
}
}
- SVN_ERR(svn_utf__win32_utf8_to_utf16(&(const WCHAR*)buffer, source,
+ SVN_ERR(svn_utf__win32_utf8_to_utf16((const WCHAR**)&buffer, source,
prefix, result_pool));
/* Convert slashes to backslashes because the \\?\ path format
diff --git a/subversion/libsvn_subr/win32_xlate.c b/subversion/libsvn_subr/win32_xlate.c
index 1111111..2222222 100644
--- a/subversion/libsvn_subr/win32_xlate.c
+++ b/subversion/libsvn_subr/win32_xlate.c
@@ -36,7 +36,7 @@ typedef int win32_xlate__dummy;
/* winsock2.h includes windows.h */
#include <winsock2.h>
@ -41,7 +95,7 @@
#include <mlang.h>
#include <apr.h>
@@ -53,6 +53,8 @@
@@ -53,6 +53,8 @@ typedef int win32_xlate__dummy;
#include "svn_private_config.h"
@ -50,7 +104,7 @@
static svn_atomic_t com_initialized = 0;
/* Initializes COM and keeps COM available until process exit.
@@ -139,10 +139,12 @@
@@ -138,10 +140,12 @@ get_page_id_from_name(UINT *page_id_p, const char *page_name, apr_pool_t *pool)
return saved; /* probably SVN_ERR_ATOMIC_INIT_FAILURE */
}
@ -63,36 +117,3 @@
return APR_EGENERAL;
/* Convert page name to wide string. */
--- subversion-1.9.2/subversion/libsvn_subr/io.c 2015-09-11 06:00:13.000000000 +0200
+++ subversion-1.9.2.new/subversion/libsvn_subr/io.c 2015-12-10 10:21:22.272463424 +0100
@@ -1789,7 +1789,7 @@
}
}
- SVN_ERR(svn_utf__win32_utf8_to_utf16(&(const WCHAR*)buffer, source,
+ SVN_ERR(svn_utf__win32_utf8_to_utf16((const WCHAR**)&buffer, source,
prefix, result_pool));
/* Convert slashes to backslashes because the \\?\ path format
--- subversion-1.9.2/build/generator/gen_make.py 2015-07-27 01:03:10.000000000 +0200
+++ subversion-1.9.2.new/build/generator/gen_make.py 2015-12-09 13:58:49.000000000 +0100
@@ -633,7 +633,7 @@
lib_required_private=[],
)
# libsvn_foo -> -lsvn_foo
- data.lib_deps.append('-l%s' % lib_name.replace('lib', '', 1))
+ data.lib_deps.append('-l%s-1' % lib_name.replace('lib', '', 1))
for lib_dep in lib_deps.split():
if lib_dep == 'apriconv':
# apriconv is part of apr-util, skip it
--- subversion-1.9.2/build/generator/templates/pkg-config.in.ezt 2016-02-11 15:48:52.204400231 +0100
+++ subversion-1.9.2.new/build/generator/templates/pkg-config.in.ezt 2014-05-05 17:04:00.000000000 +0200
@@ -1,7 +1,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/subversion-1
Name: [lib_name]
Description: [lib_desc]

18
src/widl-1-fixes.patch
View File

@ -1,9 +1,18 @@
This file is part of MXE. See LICENSE.md for licensing information.
diff -ur mingw-w64-v3.3.0.orig/mingw-w64-tools/widl/include/windef.h mingw-w64-v3.3.0/mingw-w64-tools/widl/include/windef.h
--- mingw-w64-v3.3.0.orig/mingw-w64-tools/widl/include/windef.h 2014-10-29 20:53:30.000000000 +1100
+++ mingw-w64-v3.3.0/mingw-w64-tools/widl/include/windef.h 2014-10-29 20:54:09.000000000 +1100
@@ -85,7 +85,7 @@
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 21:47:35 +1100
Subject: [PATCH] fixes
diff --git a/mingw-w64-tools/widl/include/windef.h b/mingw-w64-tools/widl/include/windef.h
index 1111111..2222222 100644
--- a/mingw-w64-tools/widl/include/windef.h
+++ b/mingw-w64-tools/widl/include/windef.h
@@ -85,7 +85,7 @@ extern "C" {
#endif /* __cdecl */
#ifndef __ms_va_list
@ -12,4 +21,3 @@ diff -ur mingw-w64-v3.3.0.orig/mingw-w64-tools/widl/include/windef.h mingw-w64-v
# define __ms_va_list __builtin_ms_va_list
# define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg)
# define __ms_va_end(list) __builtin_ms_va_end(list)

105
src/winpcap-1-fixes.patch
View File

@ -2,46 +2,55 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
diff -ur winpcap/packetNtx/Dll/Packet32-Int.h winpcap.new/packetNtx/Dll/Packet32-Int.h
--- winpcap/packetNtx/Dll/Packet32-Int.h 2010-10-14 08:16:46.000000000 +1100
+++ winpcap.new/packetNtx/Dll/Packet32-Int.h 2014-10-03 00:37:40.000000000 +1000
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 21:48:44 +1100
Subject: [PATCH] fixes
diff --git a/packetNtx/Dll/Packet32-Int.h b/packetNtx/Dll/Packet32-Int.h
index 1111111..2222222 100644
--- a/packetNtx/Dll/Packet32-Int.h
+++ b/packetNtx/Dll/Packet32-Int.h
@@ -43,7 +43,7 @@
#endif //HAVE_NPFIM_API
#ifdef __MINGW32__
-#ifdef __MINGW64__
+#ifdef __MINGW64_VERSION_MAJOR
#include <ntddndis.h>
#else /*__MINGW64__*/
#include <ddk/ntddndis.h>
diff -ur winpcap/wpcap/PRJ/GNUmakefile winpcap.new/wpcap/PRJ/GNUmakefile
--- winpcap/wpcap/PRJ/GNUmakefile 2010-10-18 13:00:36.000000000 +1100
+++ winpcap.new/wpcap/PRJ/GNUmakefile 2014-10-03 00:35:44.000000000 +1000
@@ -32,12 +32,12 @@
-DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG_LONG=8 -DWPCAP -D'_U_=' \
-DHAVE_SNPRINTF -DHAVE_VSNPRINTF \
-DSIZEOF_LONG_LONG=8 \
- -DHAVE_REMOTE -DHAVE_AIRPCAP_API \
+ -DHAVE_REMOTE \
-DHAVE_TC_API \
-DHAVE_ADDRINFO \
-DHAVE_LIMITS_H \
-DYY_NO_UNISTD_H \
- -mno-cygwin -shared ${OPTFLAGS}
+ -shared ${OPTFLAGS}
LDFLAGS = -Wl,--out-implib,../lib/libwpcap.a
LIBS = -L ../../${PACKET_DIR}/Dll/Project -lpacket -lws2_32
OBJS = ../libpcap/bpf/net/bpf_filter.o \
@@ -93,3 +93,6 @@
${FLEX} ${LFLAGS} -t $< >$*.c
.c.o:
${CC} ${CFLAGS} -o $*.o -c $<
+libwpcap.a: ${OBJS}
+ ${AR} rc $@ ${OBJS}
+ ${RANLIB} $@
diff -ur winpcap/wpcap/libpcap/Win32/Src/gai_strerror.c winpcap.new/wpcap/libpcap/Win32/Src/gai_strerror.c
--- winpcap/wpcap/libpcap/Win32/Src/gai_strerror.c 2009-10-07 00:19:58.000000000 +1100
+++ winpcap.new/wpcap/libpcap/Win32/Src/gai_strerror.c 2014-10-03 00:35:44.000000000 +1000
#endif //HAVE_NPFIM_API
#ifdef __MINGW32__
-#ifdef __MINGW64__
+#ifdef __MINGW64_VERSION_MAJOR
#include <ntddndis.h>
#else /*__MINGW64__*/
#include <ddk/ntddndis.h>
diff --git a/wpcap/PRJ/GNUmakefile b/wpcap/PRJ/GNUmakefile
index 1111111..2222222 100644
--- a/wpcap/PRJ/GNUmakefile
+++ b/wpcap/PRJ/GNUmakefile
@@ -32,12 +32,12 @@ CFLAGS = -I ../libpcap -I ../libpcap/bpf -I ../libpcap/lbl \
-DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG_LONG=8 -DWPCAP -D'_U_=' \
-DHAVE_SNPRINTF -DHAVE_VSNPRINTF \
-DSIZEOF_LONG_LONG=8 \
- -DHAVE_REMOTE -DHAVE_AIRPCAP_API \
+ -DHAVE_REMOTE \
-DHAVE_TC_API \
-DHAVE_ADDRINFO \
-DHAVE_LIMITS_H \
-DYY_NO_UNISTD_H \
- -mno-cygwin -shared ${OPTFLAGS}
+ -shared ${OPTFLAGS}
LDFLAGS = -Wl,--out-implib,../lib/libwpcap.a
LIBS = -L ../../${PACKET_DIR}/Dll/Project -lpacket -lws2_32
OBJS = ../libpcap/bpf/net/bpf_filter.o \
@@ -93,3 +93,6 @@ clean:
${FLEX} ${LFLAGS} -t $< >$*.c
.c.o:
${CC} ${CFLAGS} -o $*.o -c $<
+libwpcap.a: ${OBJS}
+ ${AR} rc $@ ${OBJS}
+ ${RANLIB} $@
diff --git a/wpcap/libpcap/Win32/Src/gai_strerror.c b/wpcap/libpcap/Win32/Src/gai_strerror.c
index 1111111..2222222 100644
--- a/wpcap/libpcap/Win32/Src/gai_strerror.c
+++ b/wpcap/libpcap/Win32/Src/gai_strerror.c
@@ -1,83 +1 @@
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -128,10 +137,11 @@ diff -ur winpcap/wpcap/libpcap/Win32/Src/gai_strerror.c winpcap.new/wpcap/libpca
-#endif /* gai_strerror */
\ No newline at end of file
+/* already handled by <ws2tcpip.h> */
diff -ur winpcap/wpcap/libpcap/inet.c winpcap.new/wpcap/libpcap/inet.c
--- winpcap/wpcap/libpcap/inet.c 2009-10-07 00:20:04.000000000 +1100
+++ winpcap.new/wpcap/libpcap/inet.c 2014-10-03 00:35:44.000000000 +1000
@@ -804,7 +804,7 @@
diff --git a/wpcap/libpcap/inet.c b/wpcap/libpcap/inet.c
index 1111111..2222222 100644
--- a/wpcap/libpcap/inet.c
+++ b/wpcap/libpcap/inet.c
@@ -804,7 +804,7 @@ pcap_lookupdev(errbuf)
while(NAdapts--)
{
strcpy((char*)tUstr, tAstr);
@ -140,10 +150,11 @@ diff -ur winpcap/wpcap/libpcap/inet.c winpcap.new/wpcap/libpcap/inet.c
tAstr += strlen(tAstr) + 1;
}
diff -ur winpcap/wpcap/libpcap/pcap-win32.c winpcap.new/wpcap/libpcap/pcap-win32.c
--- winpcap/wpcap/libpcap/pcap-win32.c 2013-02-28 17:22:00.000000000 +1100
+++ winpcap.new/wpcap/libpcap/pcap-win32.c 2014-10-03 00:37:02.000000000 +1000
@@ -38,7 +38,7 @@
diff --git a/wpcap/libpcap/pcap-win32.c b/wpcap/libpcap/pcap-win32.c
index 1111111..2222222 100644
--- a/wpcap/libpcap/pcap-win32.c
+++ b/wpcap/libpcap/pcap-win32.c
@@ -38,7 +38,7 @@ static const char rcsid[] _U_ =
#include <pcap-int.h>
#include <Packet32.h>