Mercurial > mxe-octave
changeset 2333:f653602a0500
Rebrand to new project name MXE
line wrap: on
line diff
--- a/Makefile Wed Mar 28 00:33:05 2012 +1100 +++ b/Makefile Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. JOBS := 1 @@ -28,7 +28,7 @@ $(MAKE) openssl $(PATCH) $(PERL) pkg-config \ scons $(SED) unzip wget xz yasm -CMAKE_TOOLCHAIN_FILE := $(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake +CMAKE_TOOLCHAIN_FILE := $(PREFIX)/$(TARGET)/share/cmake/mxe-conf.cmake # unexport any environment variables that might cause trouble unexport AR CC CFLAGS C_INCLUDE_PATH CPATH CPLUS_INCLUDE_PATH CPP
--- a/doc/index.html Wed Mar 28 00:33:05 2012 +1100 +++ b/doc/index.html Wed Mar 28 15:46:58 2012 +0200 @@ -4,7 +4,7 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>MinGW cross compiling environment</title> + <title>MXE (M cross environment)</title> <style type="text/css"> body { @@ -92,12 +92,12 @@ padding-right: 1em; padding-top: 1em; padding-bottom: 1em; - width: 12em; + width: 14em; background-color: #afa; } .section { width: 30em; - margin-left: 17em; + margin-left: 19em; margin-bottom: 100%; } } @@ -107,7 +107,7 @@ <body> <div id="navigation"> -<h1>MinGW cross compiling environment</h1> +<h1>MXE (M cross environment)</h1> <ul> <li><a href="#introduction" >Introduction</a></li> @@ -134,9 +134,11 @@ <h2 id="introduction">Introduction</h2> <p> - This Makefile compiles a MinGW cross compiler and cross compiles - many free libraries such as GD, SDL and Qt. Thus, it provides a nice - MinGW cross compiling environment which + MXE (M cross environment) is a Makefile that + compiles a cross compiler and cross compiles + many free libraries such as SDL and Qt. Thus, + it provides a nice cross compiling environment + for various target platforms, which </p> <ul> @@ -175,11 +177,6 @@ whenever possible </li> <li> - creates libraries to be - <a href="http://lists.nongnu.org/archive/html/mingw-cross-env-list/2009-09/msg00025.html">linked statically</a>, - no DLL hell - </li> - <li> is already <a href="#used-by">used by several projects</a> </li> @@ -208,7 +205,7 @@ <p> First, you should ensure that your system meets - mingw-cross-env's + MXE's <a href="#requirements">requirements</a>. You will almost certainly have to install some stuff. </p> @@ -228,7 +225,7 @@ <p> Now you should save any previous installation - of the mingw-cross-env. + of the MXE. Assuming you've installed it under /opt/mxe (any other directory will do as well), you should execute the following commands: @@ -252,11 +249,10 @@ </p> <pre>cd /opt/mxe</pre> - <h3>Step 3: Build mingw-cross-env</h3> + <h3>Step 3: Build MXE</h3> <p> - Enter the directory where you've downloaded the - mingw-cross-env. + Enter the directory where you've downloaded the MXE. Now it depends on what you actually want – or need. </p> @@ -299,14 +295,14 @@ <p> Edit your .bashrc script in order to change $PATH: </p> - <pre>export PATH=/<em>where mingw-cross-env is installed</em>/usr/bin:$PATH</pre> + <pre>export PATH=/<em>where MXE is installed</em>/usr/bin:$PATH</pre> <p> In case you are using custom $PKG_CONFIG_PATH entries, - you can add separate entries for MinGW cross builds: + you can add separate entries for cross builds: </p> <pre>export PKG_CONFIG_PATH="<em>entries for native builds</em>"</pre> - <pre>export PKG_CONFIG_PATH_<span class="target-underscore">i686_pc_mingw32</span>="<em>entries for mingw-cross-env builds</em>"</pre> + <pre>export PKG_CONFIG_PATH_<span class="target-underscore">i686_pc_mingw32</span>="<em>entries for MXE builds</em>"</pre> <p> Remember to use <span class="target">i686-pc-mingw32</span>-pkg-config instead of pkg-config for cross builds. @@ -357,7 +353,7 @@ <a href="http://www.cmake.org/">CMake</a> project, you can use the provided toolchain file: </p> - <pre>cmake ... -DCMAKE_TOOLCHAIN_FILE=/<em>where mingw-cross-env is installed</em>/usr/<span class="target">i686-pc-mingw32</span>/share/cmake/mingw-cross-env-conf.cmake</pre> + <pre>cmake ... -DCMAKE_TOOLCHAIN_FILE=/<em>where MXE is installed</em>/usr/<span class="target">i686-pc-mingw32</span>/share/cmake/mingw-cross-env-conf.cmake</pre> <h3>Step 5c: Cross compile your Project (Qt)</h3> @@ -425,7 +421,7 @@ `i686-pc-mingw32-pkg-config --cflags openscenegraph-osgViewer openscenegraph-osgPlugins` \ `i686-pc-mingw32-pkg-config --libs openscenegraph-osgViewer openscenegraph-osgPlugins`</pre> <p> - The <code>i686-pc-mingw32-pkg-config</code> command from mingw-cross-env will + The <code>i686-pc-mingw32-pkg-config</code> command from MXE will automatically add <code>-DOSG_LIBRARY_STATIC</code> to your compiler flags. </p> @@ -436,7 +432,7 @@ feel free to join the <a href="http://lists.nongnu.org/mailman/listinfo/mingw-cross-env-list">project mailing list</a> where you'll get in touch with - the mingw-cross-env developers + the MXE developers and other users. </p> </div> @@ -449,7 +445,7 @@ <dt>2011-xx-xx – Release <span id="latest-version">2.22</span></dt> <dd> <p> - <a href="http://mingw-cross-env.nongnu.org/#development">Download</a> | + <a href="http://mxe.cc/#development">Download</a> | <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.22">Changelog</a> </p> @@ -793,10 +789,10 @@ </p> <p> Since no other packages depend on it, the remainder of - mingw-cross-env can be successfully built by simply + MXE can be successfully built by simply removing the package: </p> - <pre>rm <em>where mingw-cross-env is downloaded</em>/src/nsis.mk</pre> + <pre>rm <em>where MXE is downloaded</em>/src/nsis.mk</pre> </div> <div class="section"> @@ -932,7 +928,7 @@ BTW, we're always curious about the applications people are porting. We maintain a <a href="#used-by">list of projects</a> - which use mingw-cross-env. + which use MXE. No matter whether your project is free or proprietary – as long as it has its own website, we'd be happy to link to it. @@ -976,7 +972,7 @@ The easiest way to get the dependencies right is to start with a minimal setup. That is, - initialize mingw-cross-env with <code>make gcc</code> only, + initialize MXE with <code>make gcc</code> only, then check whether your package builds successfully. </p> @@ -1006,7 +1002,7 @@ <p> and should start with: </p> - <pre>This file is part of mingw-cross-env. + <pre>This file is part of MXE. See doc/index.html for further information. This patch has been taken from: @@ -1833,7 +1829,7 @@ <ul class="compact-list"> <li> - <a href="http://mingw-cross-env.nongnu.org/">Project website</a> + <a href="http://mxe.cc/">Project website</a> </li> <li> <a href="http://lists.nongnu.org/mailman/listinfo/mingw-cross-env-list">Project mailing list</a> @@ -1920,7 +1916,7 @@ </li> </ul> - <h3 id="used-by">Projects which use mingw-cross-env</h3> + <h3 id="used-by">Projects which use MXE</h3> <ul class="compact-list"> <li>
--- a/src/agg.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/agg.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. PKG := agg
--- a/src/atk.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/atk.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # ATK
--- a/src/atkmm.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/atkmm.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # ATKmm
--- a/src/aubio-1-fix-pkg-config.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/aubio-1-fix-pkg-config.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -urN aubio-0.3.2.orig/configure.ac aubio-0.3.2/configure.ac
--- a/src/aubio.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/aubio.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # aubio
--- a/src/bfd.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/bfd.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Binary File Descriptor library
--- a/src/binutils.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/binutils.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GNU Binutils
--- a/src/blas.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/blas.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # blas
--- a/src/boost-test.cpp Wed Mar 28 00:33:05 2012 +1100 +++ b/src/boost-test.cpp Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <iostream>
--- a/src/boost.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/boost.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Boost C++ Library
--- a/src/bzip2.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/bzip2.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # bzip2
--- a/src/cairo.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/cairo.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # cairo
--- a/src/cairomm.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/cairomm.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # cairomm
--- a/src/cblas.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/cblas.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # cblas
--- a/src/cgal-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/cgal-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From a2df8b5dea68d02643faa69b7119628eb1751d5e Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 21 Oct 2011 23:08:52 +0200 -Subject: [PATCH 1/3] adjustments for mingw-cross-env +Subject: [PATCH 1/3] adjustments for MXE diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -275,7 +275,7 @@ From 7393c43ef7534fc8a9289992cdcb9ebefa293680 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 18 Nov 2011 00:08:25 +0100 Subject: [PATCH 2/3] prevent Qt's moc from choking on BOOST_JOIN @@ -304,7 +304,7 @@ From ac8a99188725f1cb848c6cec3e33c52363754797 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Wed, 28 Mar 2012 00:25:48 +1100 Subject: [PATCH 3/3] Cmake min version 2.8.6 is only for Windows DLLs
--- a/src/cgal.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/cgal.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # cgal
--- a/src/cppunit.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/cppunit.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # CppUnit
--- a/src/cunit.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/cunit.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # cunit
--- a/src/curl-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/curl-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,14 +1,14 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Commits backported (cherry-picked) from upstream. http://github.com/bagder/curl -Also contains mingw-cross-env specific fixes. +Also contains MXE specific fixes. From ee69c33117cf616c19e9cd288f08eb4c91bf190d Mon Sep 17 00:00:00 2001 From: Volker Grabsch <vog@notjusthosting.com> Date: Fri, 28 Oct 2011 13:48:04 +0200 -Subject: [PATCH] static linking for mingw-cross-env +Subject: [PATCH] static linking for MXE --- include/curl/curlbuild.h.in | 3 +++
--- a/src/curl-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/curl-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <curl/curl.h>
--- a/src/curl.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/curl.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # cURL
--- a/src/dbus-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/dbus-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 9c99802fc9d0e3b2c90b00ba877ae8be9bab615f Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Tue, 4 Jan 2011 00:47:49 +0100 -Subject: [PATCH 1/2] always static in mingw-cross-env +Subject: [PATCH 1/2] always static in MXE diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h @@ -26,9 +26,9 @@ From d7bc1aff67132c09d154999c282e1b391bbe7a39 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 23 Sep 2011 16:24:46 +0200 -Subject: [PATCH 2/2] add missing MemoryBarrier (mingw-cross-env specific) +Subject: [PATCH 2/2] add missing MemoryBarrier (MXE specific) Windows API has this, but it's not in MinGW. See http://lists-archives.org/mingw-users/15935-missing-definition-of-memorybarrier.html
--- a/src/dbus.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/dbus.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # dbus
--- a/src/dcmtk-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/dcmtk-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building.
--- a/src/dcmtk.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/dcmtk.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # DCMTK
--- a/src/devil-1-png.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/devil-1-png.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -urN devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c
--- a/src/devil.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/devil.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # DevIL
--- a/src/eigen.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/eigen.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # eigen
--- a/src/exiv2-r2619.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/exiv2-r2619.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/exiv2-r2646.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/exiv2-r2646.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/exiv2-r2650.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/exiv2-r2650.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/exiv2.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/exiv2.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Exiv2
--- a/src/expat.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/expat.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Expat XML Parser
--- a/src/faad2-1-uint.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/faad2-1-uint.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. --- ./frontend/main.c.backup 2010-07-01 16:53:48.563042615 +0200
--- a/src/faad2.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/faad2.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # faad2
--- a/src/ffmpeg-1-pkgconfig.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/ffmpeg-1-pkgconfig.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch adds a libswresample dependency to libavfilter.pc, and a libavfilter
--- a/src/ffmpeg.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/ffmpeg.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # ffmpeg
--- a/src/fftw.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/fftw.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # fftw
--- a/src/file-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/file-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h>
--- a/src/file.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/file.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # file
--- a/src/flac-1-win32.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/flac-1-win32.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -ru flac-1.2.1.orig/include/share/alloc.h flac-1.2.1/include/share/alloc.h
--- a/src/flac-2-lwsock32.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/flac-2-lwsock32.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -urN flac-1.2.1.orig/src/libFLAC/flac.pc.in flac-1.2.1/src/libFLAC/flac.pc.in
--- a/src/flac.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/flac.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # FLAC
--- a/src/fltk-1-darwin-cross-compile.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/fltk-1-darwin-cross-compile.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/fltk-test.cpp Wed Mar 28 00:33:05 2012 +1100 +++ b/src/fltk-test.cpp Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ /* http://www.fltk.org/doc-1.3/basics.html */
--- a/src/fltk.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/fltk.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # FLTK
--- a/src/fontconfig.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/fontconfig.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # fontconfig
--- a/src/freeglut-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/freeglut-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 87a791a05687c7737d1c50381a0de30ba1acf96e Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 24 Oct 2011 09:40:10 +0200 Subject: [PATCH] add pkg-config support
--- a/src/freeglut-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/freeglut-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <GL/glut.h>
--- a/src/freeglut.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/freeglut.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # freeglut
--- a/src/freeimage-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/freeimage-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 7b90b53e9d48aa13aaa42d60b060fb3ff9a5f11c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 20 Feb 2012 09:02:05 +0100 Subject: [PATCH 1/3] add missing header for mingw @@ -34,9 +34,9 @@ 1.7.9.2 From fa251a7e33ac1c73992a5825a1f1f2fa888af93c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 20 Feb 2012 08:58:53 +0100 -Subject: [PATCH 2/3] makefile workarounds (mingw-cross-env) +Subject: [PATCH 2/3] makefile workarounds (MXE) --- FreeImage/Makefile.gnu | 13 ++++--------- @@ -89,9 +89,9 @@ 1.7.9.2 From 5f52e869fdcc5a18592a6b87b83ce1f6c15a3ac0 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 20 Feb 2012 09:47:08 +0100 -Subject: [PATCH 3/3] required win version (mingw-cross-env) +Subject: [PATCH 3/3] required win version (MXE) --- FreeImage/Makefile.gnu | 4 ++--
--- a/src/freeimage.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/freeimage.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # FreeImage
--- a/src/freetds.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/freetds.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # FreeTDS
--- a/src/freetype.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/freetype.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # freetype
--- a/src/fribidi-1-fix-gassert.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/fribidi-1-fix-gassert.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -ru fribidi-0.19.2.orig/lib/fribidi-common.h fribidi-0.19.2/lib/fribidi-common.h
--- a/src/fribidi.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/fribidi.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # FriBidi
--- a/src/ftgl.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/ftgl.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # ftgl
--- a/src/gc.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gc.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gc
--- a/src/gcc-1-mingw-float.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gcc-1-mingw-float.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/gcc-2-darwin-no-pie.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gcc-2-darwin-no-pie.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,7 +1,7 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. -mingw-cross-env specific workaround for OSX Lion's new ASLR +MXE specific workaround for OSX Lion's new ASLR causing problems with pre-compiled headers. 1. more recent native compilers don't solve the problem
--- a/src/gcc-gmp.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gcc-gmp.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GMP for GCC
--- a/src/gcc-mpc.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gcc-mpc.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # MPC for GCC
--- a/src/gcc-mpfr.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gcc-mpfr.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # MPFR for GCC
--- a/src/gcc.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gcc.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GCC
--- a/src/gd-1-libpng15.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gd-1-libpng15.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. This patch has been taken from:
--- a/src/gd-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gd-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ /* modified from /examples/arc.c */
--- a/src/gd.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gd.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GD (without support for xpm)
--- a/src/gdal.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gdal.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GDAL
--- a/src/gdb-1-fix-shell.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gdb-1-fix-shell.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/gdb-2-fix-makeinfo.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gdb-2-fix-makeinfo.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/gdb.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gdb.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gdb
--- a/src/gdk-pixbuf-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gdk-pixbuf-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 74e785e4ee6cf375f1c04d9e57e4b70caec6742c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 23:31:24 +0200 Subject: [PATCH 1/3] s,DllMain,static _disabled_DllMain,
--- a/src/gdk-pixbuf.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gdk-pixbuf.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GDK-pixbuf
--- a/src/geos-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/geos-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdarg.h>
--- a/src/geos.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/geos.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GEOS
--- a/src/gettext.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gettext.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gettext
--- a/src/giflib.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/giflib.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # giflib
--- a/src/glew-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/glew-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h>
--- a/src/glew.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/glew.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GLEW
--- a/src/glib-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/glib-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 4693f62d3f01f7b7d26607e6eed843202cbf90f7 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 23 Sep 2010 21:36:04 +0200 Subject: [PATCH 1/5] no gtk doc check @@ -27,7 +27,7 @@ From 46d0d473e6fb32c5204d063cad5f5073d2a139a5 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 23 Sep 2010 21:41:51 +0200 Subject: [PATCH 2/5] optional gettext @@ -69,7 +69,7 @@ From 3473b5183b2e59d247cd1db053efc6c9ecaf2aab Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 23 Sep 2010 21:42:46 +0200 Subject: [PATCH 3/5] fix tool paths @@ -96,7 +96,7 @@ From 0e57514812500d5d4dee03e1be8059a25876dd99 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 23 Sep 2010 21:45:50 +0200 Subject: [PATCH 4/5] fix dependency libs @@ -130,7 +130,7 @@ From 87931c81f6401fb0c25064ec0ba2edca9ec53924 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sat, 25 Sep 2010 00:07:33 +0200 Subject: [PATCH 5/5] add -ldnsapi to gio-2.0.pc
--- a/src/glib.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/glib.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GLib
--- a/src/glibmm.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/glibmm.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GLibmm
--- a/src/gmp.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gmp.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GMP
--- a/src/gnutls-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gnutls-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 6e89465f1e792f5d527708544cce1ef92ae4669b Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 28 Oct 2011 09:23:41 +0200 Subject: [PATCH 1/2] add missing static library linking @@ -26,9 +26,9 @@ From aa11a6f645ce93f80fbffd7e72c6964bdfd68542 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 24 Nov 2011 15:06:06 +0100 -Subject: [PATCH 2/2] disable doc and test (mingw-cross-env specific) +Subject: [PATCH 2/2] disable doc and test (MXE specific) diff --git a/Makefile.am b/Makefile.am
--- a/src/gnutls-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gnutls-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <gnutls/gnutls.h>
--- a/src/gnutls.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gnutls.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GnuTLS
--- a/src/graphicsmagick-1-fix-xml2-config.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/graphicsmagick-1-fix-xml2-config.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/graphicsmagick-test.cpp Wed Mar 28 00:33:05 2012 +1100 +++ b/src/graphicsmagick-test.cpp Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <Magick++.h>
--- a/src/graphicsmagick.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/graphicsmagick.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GraphicsMagick
--- a/src/gsl-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gsl-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h>
--- a/src/gsl.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gsl.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GSL
--- a/src/gsoap-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gsoap-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building.
--- a/src/gsoap.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gsoap.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gSOAP @@ -55,6 +55,6 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' install # Apparently there is a tradition of compiling gsoap source files into applications. # Since we linked dom.cpp and dom.c into the libraries, this should not be necessary. - # But we bend to tradition and install these sources into mingw-cross-env. + # But we bend to tradition and install these sources into MXE. $(INSTALL) -m644 '$(1)/gsoap/'*.c '$(1)/gsoap/'*.cpp '$(PREFIX)/$(TARGET)/share/gsoap' endef
--- a/src/gst-plugins-base.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gst-plugins-base.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gst-plugins-base
--- a/src/gst-plugins-good.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gst-plugins-good.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gst-plugins-good
--- a/src/gstreamer.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gstreamer.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gstreamer
--- a/src/gta-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gta-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <gta/gta.h>
--- a/src/gta.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gta.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # gta
--- a/src/gtk2-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gtk2-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 2e42ff35296c81959a8fab06aa8d3dacf19632d8 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:43:43 +0200 Subject: [PATCH 01/10] s,DllMain,static _disabled_DllMain, @@ -40,7 +40,7 @@ From 86527a238545e47b4770531c79f5f2ead59aab85 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:46:20 +0200 Subject: [PATCH 02/10] s,__declspec(dllimport),, @@ -102,7 +102,7 @@ From 7277a7022eb4ffb498475d969057d3a57e687222 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 15:03:28 +0200 Subject: [PATCH 03/10] s,__declspec(dllexport),, @@ -164,7 +164,7 @@ From 604fcdb64972a82c6a430c36debc9f66c7f05d90 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:17:22 +0200 Subject: [PATCH 04/10] fix gtk+-2.0.pc.in @@ -185,7 +185,7 @@ From a778e96b43b556389f1e3a6712072eaee9e2adb2 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:48:31 +0200 Subject: [PATCH 05/10] disable gtkbuiltincache @@ -208,7 +208,7 @@ From 58310acc28f8e6994281eacac1989e8e6c51c150 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:49:50 +0200 Subject: [PATCH 06/10] disable test-inline-pixbufs.h @@ -231,7 +231,7 @@ From 7532813f3bfe95fe088c06ce11d31c0d3d66c559 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:51:04 +0200 Subject: [PATCH 07/10] permit static building @@ -332,7 +332,7 @@ From 821882bb862fc86b7152eba82966163d054b488e Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:53:18 +0200 Subject: [PATCH 08/10] no -Wl @@ -355,7 +355,7 @@ From 80745459d75da07c53dbb83c6a79c3d9896e5fd3 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 14:54:15 +0200 Subject: [PATCH 09/10] gio not gio-unix @@ -381,7 +381,7 @@ From 337e54ef8aa5a4d131e9d9007dedcc42b164e68c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 15:30:49 +0200 Subject: [PATCH 10/10] removed duplicate _gtk_marshal_OBJECT__VOID()
--- a/src/gtk2-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gtk2-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <gtk/gtk.h>
--- a/src/gtk2.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gtk2.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GTK+
--- a/src/gtkglext-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gtkglext-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From c79e894db7f1a5cbd6ba57352f79d68595175666 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 14:43:15 +0200 Subject: [PATCH 1/4] remove pangox dependency @@ -35,7 +35,7 @@ From a6894898cad4238a3676cf6fbfe6c378217317ca Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 14:44:37 +0200 Subject: [PATCH 2/4] use correct glib mkenums patch @@ -91,7 +91,7 @@ From 9080ce06af85a0beee38f0d391ee8fab8dc07fdf Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 14:47:30 +0200 Subject: [PATCH 3/4] don't use deprecated functions @@ -181,7 +181,7 @@ From eb64eb053481321cb1b0d3ec9e2fcb46c55c0972 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 14:50:25 +0200 Subject: [PATCH 4/4] removed import declarations
--- a/src/gtkglext-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gtkglext-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <gtk/gtk.h>
--- a/src/gtkglext.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gtkglext.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GtkGLExt
--- a/src/gtkglextmm-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gtkglextmm-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 865936e91293bdc59c2e9c47e5a4b54fb6f1629e Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Wed, 29 Sep 2010 23:08:44 +0200 Subject: [PATCH] allow deprecated GdkSpanFunc
--- a/src/gtkglextmm-test.cpp Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gtkglextmm-test.cpp Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <gtkmm/main.h>
--- a/src/gtkglextmm.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gtkglextmm.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GtkGLExtmm
--- a/src/gtkmm2-test.cpp Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gtkmm2-test.cpp Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <gtkmm/window.h> @@ -9,7 +9,7 @@ Gtk::Main g(argc, argv); Gtk::Window window; - window.set_title("Test App mingw-cross-env"); + window.set_title("Test App MXE"); window.set_default_size(200, 200); window.show_all(); g.run(window);
--- a/src/gtkmm2.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gtkmm2.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GTKMM
--- a/src/gtksourceview.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gtksourceview.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GTKSourceView
--- a/src/gtksourceviewmm2.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/gtksourceviewmm2.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GtkSourceViewmm
--- a/src/guile-1-win32.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/guile-1-win32.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -ruN guile-1.8.7.orig/configure guile-1.8.7/configure
--- a/src/guile-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/guile-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <libguile.h>
--- a/src/guile.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/guile.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GNU Guile
--- a/src/id3lib-1-win32.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/id3lib-1-win32.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -ru id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in
--- a/src/id3lib.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/id3lib.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # id3lib
--- a/src/ilmbase-1-gcc45-include.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/ilmbase-1-gcc45-include.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/ilmbase-2-osx-cxxflags.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/ilmbase-2-osx-cxxflags.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from http://lists.nongnu.org/archive/html/openexr-devel/2010-08/msg00011.html
--- a/src/ilmbase.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/ilmbase.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # IlmBase
--- a/src/imagemagick.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/imagemagick.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # ImageMagick
--- a/src/jasper.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/jasper.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # JasPer
--- a/src/jpeg-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/jpeg-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h>
--- a/src/jpeg.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/jpeg.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # jpeg
--- a/src/json-c.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/json-c.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # json-c
--- a/src/lame.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/lame.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # lame
--- a/src/lapack.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/lapack.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # lapack
--- a/src/lcms-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/lcms-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 664fb3591893facfe280cb930e20b61355e32ac1 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 23 Dec 2011 00:01:31 +0100 Subject: [PATCH] add missing static dependencies to .pc file
--- a/src/lcms.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/lcms.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # lcms
--- a/src/lcms1-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/lcms1-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 6f4063fc97b3acc653605c077c94b862a9808fd4 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 23 Dec 2011 00:07:18 +0100 Subject: [PATCH] add missing static dependencies to .pc file
--- a/src/lcms1.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/lcms1.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # lcms1
--- a/src/libarchive-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libarchive-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 47b80beedcb3d8e6296e2d0b970bb0c82abb4424 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Tue, 14 Feb 2012 12:40:24 +0100 Subject: [PATCH] fix pkg-config
--- a/src/libarchive-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libarchive-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <archive.h>
--- a/src/libarchive.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libarchive.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Libarchive
--- a/src/libass-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libass-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <ass/ass.h>
--- a/src/libass.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libass.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libass
--- a/src/libcroco.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libcroco.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Libcroco
--- a/src/libdnet-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libdnet-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Patch taken from http://sourceforge.net/mailarchive/message.php?msg_id=27995461
--- a/src/libdnet.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libdnet.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libdnet
--- a/src/libevent.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libevent.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libevent
--- a/src/libffi-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libffi-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h>
--- a/src/libffi.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libffi.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libffi
--- a/src/libgcrypt.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libgcrypt.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libgcrypt
--- a/src/libgee.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libgee.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libgee
--- a/src/libgeotiff.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libgeotiff.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GeoTiff
--- a/src/libgnurx-1-build-static-lib.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libgnurx-1-build-static-lib.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,9 +1,9 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. -diff -Nur mingw-libgnurx-2.5.1/Makefile.mingw-cross-env mingw-libgnurx-2.5.1-mingw-cross-env/Makefile.mingw-cross-env ---- mingw-libgnurx-2.5.1/Makefile.mingw-cross-env 1970-01-01 01:00:00.000000000 +0100 -+++ mingw-libgnurx-2.5.1-mingw-cross-env/Makefile.mingw-cross-env 2011-10-23 16:57:18.579312050 +0200 +diff -Nur mingw-libgnurx-2.5.1/Makefile.mxe mingw-libgnurx-2.5.1-mxe/Makefile.mxe +--- mingw-libgnurx-2.5.1/Makefile.mxe 1970-01-01 01:00:00.000000000 +0100 ++++ mingw-libgnurx-2.5.1-mxe/Makefile.mxe 2011-10-23 16:57:18.579312050 +0200 @@ -0,0 +1,11 @@ +include Makefile +
--- a/src/libgnurx.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libgnurx.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This libgnurx is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libgnurx @@ -25,5 +25,5 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1)' -f Makefile.mingw-cross-env -j '$(JOBS)' TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= install-static + $(MAKE) -C '$(1)' -f Makefile.mxe -j '$(JOBS)' TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= install-static endef
--- a/src/libgomp-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libgomp-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <omp.h>
--- a/src/libgomp.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libgomp.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GCC-libgomp
--- a/src/libgpg_error.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libgpg_error.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libgpg-error
--- a/src/libgsasl-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libgsasl-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 1f0955db1bf81de15e1dd04f1fe29f73ef3983c8 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 7 Nov 2011 18:01:56 +0100 Subject: [PATCH] use memxor from nettle
--- a/src/libgsasl-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libgsasl-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <gsasl.h>
--- a/src/libgsasl.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libgsasl.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Libgsasl
--- a/src/libgsf-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libgsf-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 24 Sep 2010 23:34:26 +0200 Subject: [PATCH 1/1] s,DllMain,static _disabled_DllMain,
--- a/src/libgsf.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libgsf.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libgsf
--- a/src/libharu-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libharu-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. From 531d2a9af8c51ad8badc32bc9ba43bb3b87b0e9f Mon Sep 17 00:00:00 2001
--- a/src/libharu.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libharu.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libharu
--- a/src/libiberty-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libiberty-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #define _GNU_SOURCE
--- a/src/libiberty.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libiberty.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libiberty
--- a/src/libical-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libical-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h>
--- a/src/libical.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libical.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libical
--- a/src/libiconv.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libiconv.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libiconv
--- a/src/libidn-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libidn-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 2d8680323de1e709bfec5194db0119a7395ab78a Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 25 Nov 2011 15:58:28 +0100 Subject: [PATCH] fix Libs.private
--- a/src/libidn-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libidn-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdlib.h>
--- a/src/libidn.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libidn.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Libidn
--- a/src/libircclient-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libircclient-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 06b27e262de1d156ea31b52762ed372211b72de9 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 23 Jan 2012 08:26:14 +0100 Subject: [PATCH 1/2] use the proper WIN32 define @@ -66,7 +66,7 @@ From 1a54c4dda67b99c1c0c0c68b45a395b741cb7030 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sun, 22 Jan 2012 22:39:23 +0100 Subject: [PATCH 2/2] fix missing header
--- a/src/libircclient-test.cpp Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libircclient-test.cpp Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <libircclient/libircclient.h>
--- a/src/libircclient.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libircclient.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libircclient
--- a/src/liblo.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/liblo.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # liblo
--- a/src/libmad.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libmad.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libmad
--- a/src/libmikmod-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libmikmod-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From e740945ac2db92c3d1de0e805e0e8ea76f2e1373 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sat, 24 Mar 2012 01:43:51 +0100 Subject: [PATCH] libmikmod-config should include -pthread for static
--- a/src/libmikmod-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libmikmod-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <mikmod.h>
--- a/src/libmikmod.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libmikmod.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libMikMod
--- a/src/libmng-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libmng-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 1a94342a8f86ab72b8d6c24b8ecd974d2821be04 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 3 Nov 2011 14:40:24 +0100 Subject: [PATCH] add pkg-config file
--- a/src/libmng.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libmng.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libmng
--- a/src/libntlm.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libntlm.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Libntlm
--- a/src/liboauth-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/liboauth-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h>
--- a/src/liboauth.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/liboauth.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # liboauth
--- a/src/libodbc++-1-win32.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libodbc++-1-win32.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. --- libodbc++-0.2.5.orig/configure.ac 2009-08-20 23:39:08.000000000 +0200
--- a/src/libodbc++.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libodbc++.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libodbc++
--- a/src/liboil.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/liboil.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # liboil
--- a/src/libpano13.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libpano13.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libpano13
--- a/src/libpaper.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libpaper.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libpaper
--- a/src/libpng-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libpng-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ /* This is a slightly modified version of: */
--- a/src/libpng.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libpng.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libpng
--- a/src/librsvg-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/librsvg-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains an ad hoc patch for cross building. From 1ff5a73bee660f1d61f9cdd7c8d7aff29e959c4c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 27 Sep 2010 12:00:52 +0200 Subject: [PATCH 1/2] fix .pc requirements
--- a/src/librsvg-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/librsvg-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <librsvg/rsvg.h>
--- a/src/librsvg.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/librsvg.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # librsvg
--- a/src/libsamplerate.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libsamplerate.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libsamplerate
--- a/src/libshout-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libshout-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 25255ff19813e122e6442518b29a55c15860d3a3 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 17:20:29 +0200 Subject: [PATCH] mingw fixes
--- a/src/libshout.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libshout.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libshout
--- a/src/libsigc++.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libsigc++.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libsigc++
--- a/src/libsndfile.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libsndfile.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libsndfile
--- a/src/libssh2-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libssh2-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. From b3ade9a63e881e69b4c9cfe7b5dbad78dcc4a0e0 Mon Sep 17 00:00:00 2001
--- a/src/libssh2-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libssh2-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h>
--- a/src/libssh2.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libssh2.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libssh2
--- a/src/libtool.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libtool.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # GNU Libtool
--- a/src/libunistring.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libunistring.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libunistring
--- a/src/libusb.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libusb.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # LibUsb
--- a/src/libvpx-1-config.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libvpx-1-config.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. diff --git a/configure b/configure
--- a/src/libvpx-2-fix-bin-bash.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libvpx-2-fix-bin-bash.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/libvpx.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libvpx.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # vpx
--- a/src/libxml++.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libxml++.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libxml2
--- a/src/libxml2.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libxml2.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libxml2
--- a/src/libxslt.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/libxslt.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # libxslt
--- a/src/llvm.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/llvm.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # llvm
--- a/src/lua-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/lua-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h>
--- a/src/lua.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/lua.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Lua
--- a/src/lzo.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/lzo.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # lzo
--- a/src/matio.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/matio.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # matio
--- a/src/mingw-utils-1-portability-fix.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/mingw-utils-1-portability-fix.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/mingw-utils.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/mingw-utils.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # MinGW Utilities
--- a/src/mingwrt.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/mingwrt.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # MinGW Runtime
--- a/src/mpfr.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/mpfr.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # mpfr
--- a/src/muparser.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/muparser.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # muParser
--- a/src/mxml-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/mxml-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <mxml.h>
--- a/src/mxml.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/mxml.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Mini-XML
--- a/src/nettle.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/nettle.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # nettle
--- a/src/nsis-1-explicit-mingw-cross-prefix.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/nsis-1-explicit-mingw-cross-prefix.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/nsis.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/nsis.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # NSIS
--- a/src/ogg.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/ogg.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # OGG
--- a/src/old.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/old.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # old
--- a/src/openal-1-luuid-pkg-config.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/openal-1-luuid-pkg-config.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/openal-2-guid-static-link.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/openal-2-guid-static-link.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/openal-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/openal-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <AL/alc.h> @@ -18,4 +18,4 @@ alcCloseDevice(dev); return 0; -} \ No newline at end of file +}
--- a/src/openal.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/openal.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # openal
--- a/src/opencore-amr.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/opencore-amr.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # opencore-amr
--- a/src/opencsg-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/opencsg-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 71c4f0a34399fd74d4e39f9985a4c2c56f8b9a43 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sat, 22 Oct 2011 01:29:03 +0200 -Subject: [PATCH] configure for mingw-cross-env +Subject: [PATCH] configure for MXE diff --git a/example/example.pro b/example/example.pro
--- a/src/opencsg.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/opencsg.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # opencsg
--- a/src/openexr-1-disable-zlib_winapi.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/openexr-1-disable-zlib_winapi.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -urN a/IlmImf/ImfPxr24Compressor.cpp b/IlmImf/ImfPxr24Compressor.cpp
--- a/src/openexr.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/openexr.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # OpenEXR
--- a/src/openscenegraph.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/openscenegraph.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # OpenSceneGraph
--- a/src/openssl-1-winsock2.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/openssl-1-winsock2.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/openssl.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/openssl.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # openssl
--- a/src/pango-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/pango-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 987d02305fd8187bd10bfd292db38f7da705a7f3 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Wed, 29 Sep 2010 00:52:59 +0200 Subject: [PATCH 1/4] s,DllMain,static _disabled_DllMain, @@ -33,7 +33,7 @@ From f0c5d358e54fd9d69133eeff972fdb05592789f3 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Wed, 29 Sep 2010 00:55:07 +0200 Subject: [PATCH 2/4] static, not shared @@ -134,7 +134,7 @@ From 08292532296e3a0f135f6bcd683851d2f41836c6 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Wed, 29 Sep 2010 00:57:12 +0200 Subject: [PATCH 3/4] no pango-querymodules @@ -157,7 +157,7 @@ From c646ee7869c20a1e093f63ec8de8e83e7ca88b27 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Wed, 29 Sep 2010 00:50:08 +0200 Subject: [PATCH 4/4] add missing lib to pango.pc for static linking
--- a/src/pango.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/pango.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Pango
--- a/src/pangomm.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/pangomm.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Pangomm
--- a/src/pcre.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/pcre.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # PCRE
--- a/src/pdcurses.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/pdcurses.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # PDcurses
--- a/src/pdflib_lite-1-mingw.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/pdflib_lite-1-mingw.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/pdflib_lite.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/pdflib_lite.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # PDFlib Lite
--- a/src/pfstools.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/pfstools.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # pfstools
--- a/src/physfs-1-fix-gcc46-warnings.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/physfs-1-fix-gcc46-warnings.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/physfs-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/physfs-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ /* modified from test/physfs_test.c */
--- a/src/physfs.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/physfs.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # physfs
--- a/src/pixman.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/pixman.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # pixman
--- a/src/plotmm-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/plotmm-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From cd2b1b4a0ae81dddd3fa70c06528a7024ada7a5f Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Fri, 1 Oct 2010 12:54:06 +0200 Subject: [PATCH] SigC changed to sigc
--- a/src/plotmm.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/plotmm.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # PlotMM
--- a/src/plotutils-2.6-libpng-1.5.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/plotutils-2.6-libpng-1.5.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
--- a/src/plotutils.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/plotutils.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # plotutils
--- a/src/poco-1-fix-mno-cygwin.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/poco-1-fix-mno-cygwin.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. --- a/build/config/MinGW-CrossEnv
--- a/src/poco-test.cpp Wed Mar 28 00:33:05 2012 +1100 +++ b/src/poco-test.cpp Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <iostream>
--- a/src/poco.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/poco.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # POCO C++ Libraries
--- a/src/popt-1-win32.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/popt-1-win32.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -urN a/popt.c b/popt.c
--- a/src/popt.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/popt.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # popt
--- a/src/portaudio-1-win32.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/portaudio-1-win32.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -ru portaudio-orig/configure.in portaudio/configure.in
--- a/src/portaudio-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/portaudio-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <portaudio.h>
--- a/src/portaudio.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/portaudio.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # portaudio
--- a/src/postgresql-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/postgresql-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 7985f049ed030c1f49927828a4b8e3d7552e52a4 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 24 Oct 2011 14:02:33 +0200 -Subject: [PATCH 1/2] use unix style names for openssl on mingw-cross-env +Subject: [PATCH 1/2] use unix style names for openssl on MXE diff --git a/configure.in b/configure.in @@ -34,7 +34,7 @@ From 9471812a4e7021fea291469d636bdeca6078c1e5 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 24 Oct 2011 14:09:38 +0200 Subject: [PATCH 2/2] do not check autoconf version
--- a/src/postgresql.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/postgresql.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # PostgreSQL
--- a/src/proj.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/proj.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # proj
--- a/src/pthreads-1-autostatic.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/pthreads-1-autostatic.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/pthreads-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/pthreads-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <stdio.h>
--- a/src/pthreads.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/pthreads.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Pthreads-w32
--- a/src/qjson-1-static.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/qjson-1-static.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch taken from:
--- a/src/qjson.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/qjson.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. PKG := qjson
--- a/src/qt-1-cherrypicks.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/qt-1-cherrypicks.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,9 +1,9 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Commits backported (cherry-picked) from upstream branch or merge requests. http://qt.gitorious.org/qt -Also contains mingw-cross-env specific fixes. +Also contains MXE specific fixes. From a140e010a213e993f8edf379a7d42c32bc61a672 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> @@ -80757,7 +80757,7 @@ From 6162902afd0bf5f18d87bdbec16b19dc250d1ebc Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 3 Nov 2011 15:10:26 +0100 -Subject: [PATCH 13/19] use pkg-config for libmng (mingw-cross-env specific) +Subject: [PATCH 13/19] use pkg-config for libmng (MXE specific) --- src/gui/image/qmnghandler.pri | 4 +++- @@ -80785,8 +80785,7 @@ From 85c260ba643defd31292d4cc26ee377161d6092a Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 3 Nov 2011 14:11:02 +0100 -Subject: [PATCH 14/19] use pkg-config for libtiff-4 (mingw-cross-env - specific) +Subject: [PATCH 14/19] use pkg-config for libtiff-4 (MXE specific) --- src/gui/image/qtiffhandler.pri | 4 +++- @@ -80815,7 +80814,7 @@ From: Mark Brand <mabrand@mabrand.nl> Date: Sat, 5 Jun 2010 23:41:04 +0200 Subject: [PATCH 15/19] restore support for static linking of QtWebKit - (mingw-cross-env specific) + (MXE specific) Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113. @@ -80942,7 +80941,7 @@ From: Tony Theodore <tonyt@logyst.com> Date: Thu, 1 Sep 2011 13:49:47 +0200 Subject: [PATCH 17/19] fix missing platform when building on GNU/kFreeBSD - (mingw-cross-env specific) + (MXE specific) This patch is inspired by: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt4-x11.git;a=blob;f=debian/rules;h=47e5efbf09f77e6da51a3d719d2f6be47f69d096;hb=HEAD @@ -80973,7 +80972,7 @@ From c309d3adb75c75a2e47ce5fda1ec3016e336b84b Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 1 Sep 2011 13:51:50 +0200 -Subject: [PATCH 18/19] fix building on dragonfly (mingw-cross-env specific) +Subject: [PATCH 18/19] fix building on dragonfly (MXE specific) This patch is inspired by: http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup
--- a/src/qt-test.cpp Wed Mar 28 00:33:05 2012 +1100 +++ b/src/qt-test.cpp Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <QApplication>
--- a/src/qt-test.pro Wed Mar 28 00:33:05 2012 +1100 +++ b/src/qt-test.pro Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. TARGET = test-qt
--- a/src/qt-test.ui Wed Mar 28 00:33:05 2012 +1100 +++ b/src/qt-test.ui Wed Mar 28 15:46:58 2012 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- This file is part of mingw-cross-env. --> +<!-- This file is part of MXE. --> <!-- See doc/index.html for further information. --> <ui version="4.0">
--- a/src/qt.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/qt.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Qt
--- a/src/qwtplot3d-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/qwtplot3d-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 0ee512abc5ac926ebe37ea50ecac9c314efd8f53 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 20 Oct 2011 21:05:36 +0200 Subject: [PATCH 1/4] add missing #include <cstdio> @@ -23,7 +23,7 @@ From 252126201db746fd5772e0ac201d7975aa705236 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 20 Oct 2011 21:06:42 +0200 Subject: [PATCH 2/4] add missing #include <GL/glu.h> @@ -44,9 +44,9 @@ From ac2860d954caeac6ce7701a0ee196e1533bc047e Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 20 Oct 2011 21:22:24 +0200 -Subject: [PATCH 3/4] configure project for mingw-cross-env +Subject: [PATCH 3/4] configure project for MXE diff --git a/qwtplot3d.pro b/qwtplot3d.pro @@ -84,9 +84,9 @@ From 6a316d1844a2634ebc4374e1e9d01502204d8c7e Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Thu, 20 Oct 2011 21:47:18 +0200 -Subject: [PATCH 4/4] fix building examples for mingw-cross-env +Subject: [PATCH 4/4] fix building examples for MXE diff --git a/examples/common.pro b/examples/common.pro
--- a/src/qwtplot3d.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/qwtplot3d.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. PKG := qwtplot3d
--- a/src/readline.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/readline.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Readline
--- a/src/sdl-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <SDL.h>
--- a/src/sdl.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL
--- a/src/sdl_image-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl_image-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <SDL.h>
--- a/src/sdl_image.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl_image.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL_image
--- a/src/sdl_mixer-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl_mixer-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <SDL_mixer.h>
--- a/src/sdl_mixer.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl_mixer.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL_mixer
--- a/src/sdl_net-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl_net-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 50ebb3d0a7e28fa3e85dff386cde7a6315865e76 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 27 Feb 2012 14:41:08 +0100 Subject: [PATCH] add static dependency to .pc file
--- a/src/sdl_net-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl_net-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <SDL_net.h>
--- a/src/sdl_net.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl_net.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL_net
--- a/src/sdl_pango-1-api-adds.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl_pango-1-api-adds.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/sdl_pango-2-static-matrices.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl_pango-2-static-matrices.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. --- SDL_Pango-0.1.2.orig/src/SDL_Pango.h 2010-04-08 11:33:48.000000000 +0200
--- a/src/sdl_pango.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl_pango.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL_Pango
--- a/src/sdl_sound.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl_sound.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL_sound
--- a/src/sdl_ttf.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sdl_ttf.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SDL_ttf
--- a/src/smpeg-test.c Wed Mar 28 00:33:05 2012 +1100 +++ b/src/smpeg-test.c Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <smpeg.h>
--- a/src/smpeg.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/smpeg.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # smpeg
--- a/src/speex.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/speex.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Speex
--- a/src/sqlite.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/sqlite.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SQLite
--- a/src/suitesparse.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/suitesparse.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # SuiteSparse
--- a/src/t4k_common.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/t4k_common.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # t4k_common
--- a/src/taglib-1-static.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/taglib-1-static.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/taglib.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/taglib.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # TagLib
--- a/src/theora.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/theora.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Theora
--- a/src/tiff.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/tiff.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # LibTIFF
--- a/src/tinyxml-test.cpp Wed Mar 28 00:33:05 2012 +1100 +++ b/src/tinyxml-test.cpp Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <iostream>
--- a/src/tinyxml.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/tinyxml.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # tinyxml
--- a/src/tre.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/tre.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # TRE
--- a/src/vigra-test.cpp Wed Mar 28 00:33:05 2012 +1100 +++ b/src/vigra-test.cpp Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <string>
--- a/src/vigra.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/vigra.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # vigra
--- a/src/vmime-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/vmime-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Cherry picked fixes from svn @@ -9,7 +9,7 @@ #!/usr/bin/env bash ( - echo "This file is part of mingw-cross-env." + echo "This file is part of MXE." echo "See doc/index.html for further information." echo echo "Cherry picked fixes from svn" @@ -569,7 +569,7 @@ From 22ca7dc23b6bbbc8cc6aedd569ec938ecae96e92 Mon Sep 17 00:00:00 2001 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009> Date: Sun, 27 Mar 2011 11:26:55 +0000 -Subject: [PATCH 10/27] Allow static linking in mingw-cross-env. Added 'iconv' +Subject: [PATCH 10/27] Allow static linking in MXE. Added 'iconv' and uses 'ws2_32' instead of 'winsock32' (#3213487). git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@585 5301114d-f842-0410-bbdd-996ee0417009
--- a/src/vmime.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/vmime.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # VMime
--- a/src/vorbis.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/vorbis.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Vorbis
--- a/src/vtk-1-tryrun.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/vtk-1-tryrun.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. --- blubb 1970-01-01 01:00:00.000000000 +0100
--- a/src/vtk-2-findfreetype.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/vtk-2-findfreetype.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. This patch has been taken from:
--- a/src/vtk-3-compile-tools.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/vtk-3-compile-tools.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. This patch has been taken from:
--- a/src/vtk-4-native-no-gui.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/vtk-4-native-no-gui.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. diff -r 26cf498f1dac Utilities/CMakeLists.txt
--- a/src/vtk-5-module-path.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/vtk-5-module-path.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. This patch has been taken from:
--- a/src/vtk-6-kfreebsd.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/vtk-6-kfreebsd.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -ur VTK.orig/Utilities/vtkhdf5/src/H5private.h VTK/Utilities/vtkhdf5/src/H5private.h
--- a/src/vtk.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/vtk.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # vtk
--- a/src/w32api-1-dinput-dsound.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/w32api-1-dinput-dsound.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch contains some DirectX additions for MinGW's w32api
--- a/src/w32api-2-directx-additions-for-qt.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/w32api-2-directx-additions-for-qt.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch contains some DirectX additions for MinGW's w32api
--- a/src/w32api.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/w32api.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # MinGW Windows API
--- a/src/winpcap-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/winpcap-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building.
--- a/src/winpcap.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/winpcap.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # WinPcap
--- a/src/wt-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/wt-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. diff -ur a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt
--- a/src/wt.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/wt.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Wt
--- a/src/wxwidgets-test.cpp Wed Mar 28 00:33:05 2012 +1100 +++ b/src/wxwidgets-test.cpp Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <wx/wx.h>
--- a/src/wxwidgets.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/wxwidgets.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # wxWidgets
--- a/src/x264-1-fix-bin-bash.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/x264-1-fix-bin-bash.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. diff -urN x264-snapshot-20100714-2245/configure x264-snapshot-20100714-2245.new/configure
--- a/src/x264.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/x264.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # x264
--- a/src/xerces-1-fix-pkgconfig.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/xerces-1-fix-pkgconfig.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. This patch has been taken from:
--- a/src/xerces-test.cpp Wed Mar 28 00:33:05 2012 +1100 +++ b/src/xerces-test.cpp Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -/* This file is part of mingw-cross-env. */ +/* This file is part of MXE. */ /* See doc/index.html for further information. */ #include <xercesc/parsers/SAXParser.hpp>
--- a/src/xerces.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/xerces.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # Xerces-C++
--- a/src/xine-lib-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/xine-lib-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From 4968ed3c3300976ce8b24c52c729db6bd264057c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sun, 13 Nov 2011 11:48:07 +0100 Subject: [PATCH 1/4] fix-install-def-file @@ -48,7 +48,7 @@ From 86f2d23f9229e17aa4a54ca982b8f95de5ee4644 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sun, 13 Nov 2011 12:05:22 +0100 Subject: [PATCH 2/4] fake missing definitions for WIN32 @@ -83,7 +83,7 @@ From 42946ec1f900d22b62cb28996b9f12d11d7be7a8 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sun, 13 Nov 2011 13:45:21 +0100 Subject: [PATCH 3/4] force graphicsmagick over imagemagick @@ -120,7 +120,7 @@ From f0fa8b5b9570cdf88788067b1a76669c6863ac9f Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 30 Jan 2012 09:21:33 +0100 Subject: [PATCH 4/4] zlib 1.2.6 compatibility
--- a/src/xine-lib.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/xine-lib.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # xine-lib
--- a/src/xmlwrapp.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/xmlwrapp.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # xmlwrapp
--- a/src/xvidcore-1-fixes.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/xvidcore-1-fixes.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,10 +1,10 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From dce4564d204160aee0da5107e69cbdefe2bec921 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Mon, 28 Mar 2011 00:00:51 +0200 Subject: [PATCH] remove obsolete -mno-cygwin
--- a/src/xvidcore.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/xvidcore.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # xvidcore
--- a/src/xz.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/xz.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # XZ
--- a/src/zlib-1-win32-static.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/zlib-1-win32-static.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,12 +1,12 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. Contains ad hoc patches for cross building. From dfe5701faf3683be7ea53885c58d4bd3499c4d1c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env +From: MXE Date: Sun, 29 Jan 2012 21:51:03 +0100 -Subject: [PATCH] workarounds for mingw-cross-env +Subject: [PATCH] workarounds for MXE diff --git a/Makefile.in b/Makefile.in
--- a/src/zlib.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/zlib.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # zlib
--- a/src/zziplib-1-fix-fnmatch.patch Wed Mar 28 00:33:05 2012 +1100 +++ b/src/zziplib-1-fix-fnmatch.patch Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -This file is part of mingw-cross-env. +This file is part of MXE. See doc/index.html for further information. This patch has been taken from:
--- a/src/zziplib.mk Wed Mar 28 00:33:05 2012 +1100 +++ b/src/zziplib.mk Wed Mar 28 15:46:58 2012 +0200 @@ -1,4 +1,4 @@ -# This file is part of mingw-cross-env. +# This file is part of MXE. # See doc/index.html for further information. # ZZIPlib
--- a/tools/patch-tool-mingw Wed Mar 28 00:33:05 2012 +1100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -#!/bin/bash - -# Tool for converting between mingw-cross-env patch files and git repos -# Imports and exports patch files in "git format-patch" format. - -cmd=$1 -pkg=$2 - -# mingw-cross-env directory -mcedir=~/mingw-cross-env - -# directory for unpacked tarballs/git repos -gitsdir=~/gits - - -# John Doe <John Doe@acme.org> -author=`git var GIT_AUTHOR_IDENT | sed 's/^\(.* [<].*[>]\).*$/\1/'` - -pkg_version=`grep '^$(PKG)_VERSION' $mcedir/src/$pkg.mk | \ - sed 's/.*:= \(.*\)/\1/'` - -pkg_short_version=`echo $pkg_version | sed s/'\(.*\)\.[^.]*$'/'\1'/` - -pkg_subdir=`grep '^$(PKG)_SUBDIR' $mcedir/src/$pkg.mk | \ - sed 's/.*:= \(.*\)/\1/' | \ - sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ - sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ - sed s/'$(PKG)'/$pkg/;` - -pkg_file=`grep '^$(PKG)_FILE' $mcedir/src/$pkg.mk | \ - sed 's/.*:= \(.*\)/\1/' | \ - sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ - sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ - sed s/'$($(PKG)_SUBDIR)'/$pkg_subdir/ | \ - sed s/'$(PKG)'/$pkg/;` - -#echo $pkg -#echo $pkg_version -#echo $pkg_subdir -#echo $pkg_file - -# init -function init_git { - cd $gitsdir - echo $pkg_file | grep "\.tar\.gz" >> /dev/null && tar xf $mcedir/pkg/$pkg_file - echo $pkg_file | grep "\.tar\.bz2" >> /dev/null && tar xf $mcedir/pkg/$pkg_file - echo $pkg_file | grep "\.tar\.xz" >> /dev/null && xz -dc $mcedir/pkg/$pkg_file | tar xf - - echo $pkg_file | grep "\.zip" >> /dev/null && unzip $mcedir/pkg/$pkg_file >> /dev/null - cd $gitsdir/$pkg_subdir && \ - (git init; git add -A; git commit -m "init") > /dev/null - git tag dist -} - -function export_patch { - cd $gitsdir/$pkg_subdir && \ - ( - echo 'This file is part of mingw-cross-env.' - echo 'See doc/index.html for further information.' - echo '' - echo 'Contains ad hoc patches for cross building.' - echo '' - git format-patch -p --stdout dist..HEAD | \ - sed 's/^From: .*/From: mingw-cross-env/g;' - ) > $mcedir/src/$pkg-1-fixes.patch -} - -function import_patch { - cd $gitsdir/$pkg_subdir && \ - cat $mcedir/src/$pkg-1-fixes.patch | \ - sed '/^From/,$ !d' | \ - sed s/'^From: .*'/"From: $author"/'g;' | \ - git am --keep-cr -} - -if [ "$cmd" == "init" ]; then - init_git $pkg -elif [ "$cmd" == "import" ]; then - import_patch $pkg -elif [ "$cmd" == "export" ]; then - export_patch $pkg -fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/patch-tool-mxe Wed Mar 28 15:46:58 2012 +0200 @@ -0,0 +1,81 @@ +#!/bin/bash + +# Tool for converting between MXE patch files and git repos +# Imports and exports patch files in "git format-patch" format. + +cmd=$1 +pkg=$2 + +# MXE directory +mxedir=~/mxe + +# directory for unpacked tarballs/git repos +gitsdir=~/gits + + +# John Doe <John Doe@acme.org> +author=`git var GIT_AUTHOR_IDENT | sed 's/^\(.* [<].*[>]\).*$/\1/'` + +pkg_version=`grep '^$(PKG)_VERSION' $mxedir/src/$pkg.mk | \ + sed 's/.*:= \(.*\)/\1/'` + +pkg_short_version=`echo $pkg_version | sed s/'\(.*\)\.[^.]*$'/'\1'/` + +pkg_subdir=`grep '^$(PKG)_SUBDIR' $mxedir/src/$pkg.mk | \ + sed 's/.*:= \(.*\)/\1/' | \ + sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ + sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ + sed s/'$(PKG)'/$pkg/;` + +pkg_file=`grep '^$(PKG)_FILE' $mxedir/src/$pkg.mk | \ + sed 's/.*:= \(.*\)/\1/' | \ + sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ + sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ + sed s/'$($(PKG)_SUBDIR)'/$pkg_subdir/ | \ + sed s/'$(PKG)'/$pkg/;` + +#echo $pkg +#echo $pkg_version +#echo $pkg_subdir +#echo $pkg_file + +# init +function init_git { + cd $gitsdir + echo $pkg_file | grep "\.tar\.gz" >> /dev/null && tar xf $mxedir/pkg/$pkg_file + echo $pkg_file | grep "\.tar\.bz2" >> /dev/null && tar xf $mxedir/pkg/$pkg_file + echo $pkg_file | grep "\.tar\.xz" >> /dev/null && xz -dc $mxedir/pkg/$pkg_file | tar xf - + echo $pkg_file | grep "\.zip" >> /dev/null && unzip $mxedir/pkg/$pkg_file >> /dev/null + cd $gitsdir/$pkg_subdir && \ + (git init; git add -A; git commit -m "init") > /dev/null + git tag dist +} + +function export_patch { + cd $gitsdir/$pkg_subdir && \ + ( + echo 'This file is part of MXE.' + echo 'See doc/index.html for further information.' + echo '' + echo 'Contains ad hoc patches for cross building.' + echo '' + git format-patch -p --stdout dist..HEAD | \ + sed 's/^From: .*/From: MXE/g;' + ) > $mxedir/src/$pkg-1-fixes.patch +} + +function import_patch { + cd $gitsdir/$pkg_subdir && \ + cat $mxedir/src/$pkg-1-fixes.patch | \ + sed '/^From/,$ !d' | \ + sed s/'^From: .*'/"From: $author"/'g;' | \ + git am --keep-cr +} + +if [ "$cmd" == "init" ]; then + init_git $pkg +elif [ "$cmd" == "import" ]; then + import_patch $pkg +elif [ "$cmd" == "export" ]; then + export_patch $pkg +fi