[Libreoffice-commits] .: patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Jun 22 11:31:55 PDT 2011
patches/dev300/apply | 20 -
patches/dev300/crosswin32-accessibility-nojava.diff | 17
patches/dev300/crosswin32-basegfx-no-cppunit.diff | 8
patches/dev300/crosswin32-config_office-cross.diff | 202 -----------
patches/dev300/crosswin32-config_office-mingw.diff | 72 ----
patches/dev300/crosswin32-cppunit-mingw.diff | 36 --
patches/dev300/crosswin32-desktop-mingw-res.diff | 346 --------------------
patches/dev300/crosswin32-embedserv-mingw.diff | 23 -
patches/dev300/crosswin32-funit-char-line.diff | 23 -
patches/dev300/crosswin32-goodies-mingw.diff | 11
patches/dev300/crosswin32-hyphen-mingw.diff | 11
patches/dev300/crosswin32-lingucomponent-mingw.diff | 11
patches/dev300/crosswin32-o3tl-no-cppunit.diff | 8
patches/dev300/crosswin32-sal-cross.diff | 16
patches/dev300/crosswin32-solenv-cross.diff | 208 ------------
patches/dev300/crosswin32-solenv-mingw-res.diff | 115 ------
patches/dev300/crosswin32-solenv.diff | 11
patches/dev300/crosswin32-soltools-cross.diff | 13
patches/dev300/crosswin32-tools-mingw.diff | 36 --
patches/dev300/crosswin32-unixodbc-disable.diff | 13
patches/dev300/crosswin32-writerperfect-cross.diff | 11
21 files changed, 1211 deletions(-)
New commits:
commit f945d306d96f69c078335dc96653cfebbab240ad
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Jun 22 21:28:29 2011 +0300
Bin those crosswin32 patches that are clearly irrelevant by now
Bin those where the corresponding changes have already been done in
the repository. Keep those that need to be looked at more closely for
inspiration and hints in the MinGW cross-compilation effort. Note that
not many of them apply as such currently.
M patches/dev300/apply
D patches/dev300/crosswin32-accessibility-nojava.diff
D patches/dev300/crosswin32-basegfx-no-cppunit.diff
D patches/dev300/crosswin32-config_office-cross.diff
D patches/dev300/crosswin32-config_office-mingw.diff
D patches/dev300/crosswin32-cppunit-mingw.diff
D patches/dev300/crosswin32-desktop-mingw-res.diff
D patches/dev300/crosswin32-embedserv-mingw.diff
D patches/dev300/crosswin32-funit-char-line.diff
D patches/dev300/crosswin32-goodies-mingw.diff
D patches/dev300/crosswin32-hyphen-mingw.diff
D patches/dev300/crosswin32-lingucomponent-mingw.diff
D patches/dev300/crosswin32-o3tl-no-cppunit.diff
D patches/dev300/crosswin32-sal-cross.diff
D patches/dev300/crosswin32-solenv-cross.diff
D patches/dev300/crosswin32-solenv-mingw-res.diff
D patches/dev300/crosswin32-solenv.diff
D patches/dev300/crosswin32-soltools-cross.diff
D patches/dev300/crosswin32-tools-mingw.diff
D patches/dev300/crosswin32-trans-mingw.diff
D patches/dev300/crosswin32-unixodbc-disable.diff
D patches/dev300/crosswin32-writerperfect-cross.diff
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7f35e59..80b16f0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1587,58 +1587,38 @@ piece-reportbuilder.diff
[ CrossWin32Patches ]
# Experimental patches to crosscompile OOo for Win32
-crosswin32-accessibility-nojava.diff
-crosswin32-basegfx-no-cppunit.diff
-crosswin32-config_office-cross.diff
-crosswin32-config_office-mingw.diff
crosswin32-connectivity-mingw.diff
crosswin32-cppuhelper-mingw.diff
-crosswin32-cppunit-mingw.diff
crosswin32-dbaccess-mingw.diff
crosswin32-desktop-mingw.diff
-crosswin32-desktop-mingw-res.diff
crosswin32-dtrans-mingw.diff
crosswin32-embeddedobj-mingw.diff
-#crosswin32-embedserv-mingw.diff
crosswin32-extensions-mingw.diff
crosswin32-external-mingwheaders.diff
crosswin32-fpicker-mingw.diff
-crosswin32-funit-char-line.diff
-#crosswin32-goodies-mingw.diff
#crosswin32-helpcontent2-mingw.diff
-crosswin32-hyphen-mingw.diff
#crosswin32-i18npool-cross.diff
crosswin32-i18npool-mingw.diff
#crosswin32-icc-cross.diff
crosswin32-instsetoo_native-mingw.diff
-crosswin32-lingucomponent-mingw.diff
crosswin32-o3tl-no-cppunit.diff
-#crosswin32-unixodbc-disable.diff
#crosswin32-odk-cross.diff
crosswin32-postprocess-mingw.diff
#crosswin32-pyuno-mingw.diff
-crosswin32-sal-cross.diff
crosswin32-sal-mingw-c.diff
crosswin32-sal-mingw.diff
crosswin32-sccomp-mingw.diff
#crosswin32-scp2-mingw.diff
crosswin32-setup_native-mingw.diff
#crosswin32-shell-mingw.diff
-#crosswin32-solenv-cross.diff
#crosswin32-solenv-mingw-installer.diff
#crosswin32-solenv-mingw.diff
-#crosswin32-solenv-mingw-res.diff
-crosswin32-solenv.diff
-#crosswin32-soltools-cross.diff
#crosswin32-store-core.diff
crosswin32-store-registry.diff
#crosswin32-svx-mingw.diff
crosswin32-sysui-mingw.diff
-crosswin32-tools-mingw.diff
-crosswin32-trans-mingw.diff
crosswin32-unotools-mingw.diff
#crosswin32-vcl-mingw.diff
-crosswin32-writerperfect-cross.diff
# things to fix later
#crosswin32-ugly-hacks.diff
diff --git a/patches/dev300/crosswin32-accessibility-nojava.diff b/patches/dev300/crosswin32-accessibility-nojava.diff
deleted file mode 100644
index e5015e7..0000000
--- a/patches/dev300/crosswin32-accessibility-nojava.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- accessibility/bridge/source/java/makefile.mk.pristine 2009-04-05 11:23:45.847495404 +0200
-+++ accessibility/bridge/source/java/makefile.mk 2009-04-05 11:26:04.051493710 +0200
-@@ -43,6 +43,7 @@ VERSIONOBJ=
-
- # --- Files --------------------------------------------------------
-
-+.IF "$(SOLAR_JAVA)"!=""
- .IF "$(GUI)"=="WNT"
-
- SLOFILES= $(SLO)$/WindowsAccessBridgeAdapter.obj
-@@ -72,3 +73,6 @@ $(SHL1HEADER) :
- javah -classpath $(OUT)$/class -o $(SHL1HEADER) org.openoffice.accessibility.WindowsAccessBridgeAdapter
-
- .ENDIF # "$(GUI)"=="WNT"
-+.ELSE # "$(SOLAR_JAVA)"==""
-+ALLTAR:
-+.ENDIF # "$(SOLAR_JAVA)"==""
diff --git a/patches/dev300/crosswin32-basegfx-no-cppunit.diff b/patches/dev300/crosswin32-basegfx-no-cppunit.diff
deleted file mode 100644
index 76eab43..0000000
--- a/patches/dev300/crosswin32-basegfx-no-cppunit.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- basegfx/prj/build.lst.pristine 2009-04-06 10:18:35.000000000 +0200
-+++ basegfx/prj/build.lst 2009-04-06 10:18:39.000000000 +0200
-@@ -15,4 +15,4 @@ fx basegfx\source\color nmake - all
- fx basegfx\source\pixel nmake - all fx_pixel fx_inc NULL
- fx basegfx\source\raster nmake - all fx_raster fx_inc NULL
- fx basegfx\util nmake - all fx_util fx_curve fx_matrix fx_numeric fx_point fx_polygon fx_range fx_tuple fx_tools fx_vector fx_color fx_pixel fx_raster NULL
--fx basegfx\test nmake - all fx_tests fx_util NULL
-+#fx basegfx\test nmake - all fx_tests fx_util NULL
diff --git a/patches/dev300/crosswin32-config_office-cross.diff b/patches/dev300/crosswin32-config_office-cross.diff
deleted file mode 100644
index e38a04f..0000000
--- a/patches/dev300/crosswin32-config_office-cross.diff
+++ /dev/null
@@ -1,202 +0,0 @@
---- configure.in.orig 2008-10-19 21:05:46.000000000 +0200
-+++ configure.in 2008-10-19 21:27:16.000000000 +0200
-@@ -794,6 +794,11 @@ AC_ARG_ENABLE(verbose,
- [ --enable-verbose Increase build verbosity.
- --disable-verbose Decrease build verbosity.
- ],,)
-+AC_ARG_WITH(tools-dir,
-+[ --with-tools-dir When cross compiling, specify solar tools
-+ directory.
-+],[TOOLS_DIR=$withval],[TOOLS_DIR='$(SOLARBINDIR)'])
-+AC_SUBST(TOOLS_DIR)
-
- BUILD_TYPE="OOo"
-
-@@ -1035,6 +1035,21 @@ AC_SUBST(OSVERSION)
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
-
-+case "$target_os" in
-+ linux-gnu*)
-+ t_os=Linux
-+ ;;
-+ mingw32*)
-+ t_os=MinGW
-+ ;;
-+ solaris*)
-+ t_os=SunOS
-+ ;;
-+ *)
-+ t_os=$_os
-+ ;;
-+esac
-+
- dnl ===================================================================
- dnl Set the ENABLE_CRASHDUMP variable.
- dnl ===================================================================
-@@ -1649,6 +1651,27 @@ if test "$_os" = "OSF1"; then
- fi
- fi
-
-+AC_CHECK_TOOL([AR], [ar], [:])
-+AC_CHECK_TOOL([AS], [as], [:])
-+AC_CHECK_TOOL([DLLTOOL], [dlltool], [:])
-+AC_CHECK_TOOL([LD], [ld], [:])
-+AC_CHECK_TOOL([NM], [nm], [:])
-+AC_CHECK_TOOL([RANLIB], [ranlib], [:])
-+AC_CHECK_TOOL([WINDRES], [windres], [:])
-+
-+BUILD_OS=$_os
-+TARGET_OS=$t_os
-+CROSS_COMPILING=$cross_compiling
-+CC_FOR_BUILD=${CC_FOR_BUILD-cc}
-+CCLD_FOR_BUILD=${CCLD_FOR_BUILD-${CC_FOR_BUILD}}
-+LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-}
-+AC_SUBST(BUILD_OS)
-+AC_SUBST(TARGET_OS)
-+AC_SUBST(CROSS_COMPILING)
-+AC_SUBST(CC_FOR_BUILD)
-+AC_SUBST(CCLD_FOR_BUILD)
-+AC_SUBST(LDFLAGS_FOR_BUILD)
-+
- dnl ===================================================================
- dnl Check whether there's a Perl version available.
- dnl ===================================================================
-@@ -3735,14 +3740,11 @@ if test -n "$with_system_python" -o -n "
- AC_MSG_RESULT([external])
- AM_PATH_PYTHON([2.2])
-
-- python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
-- python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
-- PYTHON_CFLAGS="-I$python_include"
-+ PYTHON_CFLAGS=`python-config --cflags`
-+ PYTHON_LIBS=`python-config --libs`
-
- if test "$_os" = "Darwin"; then
- PYTHON_LIBS="-framework Python"
-- else
-- PYTHON_LIBS="-lpython$python_version"
- fi
-
- dnl check if the headers really work:
-@@ -3798,7 +3800,7 @@ int main(int argc, char **argv) {
- if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0;
- else return 1;
- }
-- ], [DB_VERSION_MINOR=$v], [])
-+ ], [DB_VERSION_MINOR=$v], [], [DB_VERSION_MINOR=$ac_cv_db_version_minor])
- done
- if test "$DB_VERSION_MINOR" -gt "1"; then
- AC_MSG_RESULT([OK])
-@@ -4396,7 +4398,7 @@ int main(int argc, char **argv) {
- else
- return 0;
- }
-- ], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])])
-+ ], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])], [AC_MSG_RESULT($ac_cv_icu_version)])
- AC_LANG_POP([C++])
- else
- AC_MSG_RESULT([internal])
-@@ -4519,7 +4521,7 @@ int main(int argc, char **argv) {
- if(FC_MAJOR > 2 || (FC_MAJOR == 2 && FC_MINOR >= 2)) return 0;
- else return 1;
- }
--], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no, fontconfig >= 2.2.0 needed])])
-+], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no, fontconfig >= 2.2.0 needed])], [AC_MSG_RESULT(possibly - should use pkg-config instead of home-brew checks)])
- fi
-
- dnl ===================================================================
-@@ -4638,7 +4638,7 @@ AC_SUBST(SYSTEM_LPSOLVE)
- dnl ***************************************
- dnl testing libc version for Linux...
- dnl ***************************************
--if test "$_os" = "Linux"; then
-+if test "$_os" = "Linux" -a "$cross_compiling" = "no"; then
- AC_MSG_CHECKING([whether libc is >= 2.1.1])
- exec 6>/dev/null # no output
- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
---- acinclude.m4.orig 2008-10-19 21:29:43.000000000 +0200
-+++ acinclude.m4 2008-10-19 21:29:51.000000000 +0200
-@@ -136,3 +136,24 @@ AC_DEFUN([PKG_CHECK_MODULES_MACHACK],
- PKG_CHECK_MODULES($1, $3, $4, $5, $6)
- fi
- ])
-+
-+## ------------------------------------- ##
-+## Checking for the existence of files. ##
-+## ------------------------------------- ##
-+
-+# AC_CHECK_FILE_CROSS(FILE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+# -------------------------------------------------------------
-+#
-+# Check for the existence of FILE; remove assertion on not cross-compiliing
-+AC_DEFUN([AC_CHECK_FILE_CROSS],
-+[
-+AS_VAR_PUSHDEF([ac_File], [ac_cv_file_$1])dnl
-+AC_CACHE_CHECK([for $1], [ac_File],
-+if test -r "$1"; then
-+ AS_VAR_SET([ac_File], [yes])
-+else
-+ AS_VAR_SET([ac_File], [no])
-+fi)
-+AS_IF([test AS_VAR_GET([ac_File]) = yes], [$2], [$3])[]dnl
-+AS_VAR_POPDEF([ac_File])dnl
-+])# AC_CHECK_FILE_CROSS
---- bootstrap.1.orig 2008-10-19 23:24:01.000000000 +0200
-+++ bootstrap.1 2008-10-19 23:22:49.000000000 +0200
-@@ -1,7 +1,7 @@
-
- # executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
- # Use spawn instead of fork when building dmake on cygwin.
--if test "$GUI" = "WNT"; then
-+if test "$GUI" = "WNT" -a "$CROSS_COMPILING" != "yes"; then
- EXEEXT=".exe"
- DMAKE_CONF="--enable-spawn"
- else
-@@ -36,6 +36,14 @@ if test "$BUILD_DMAKE" != "NO"; then
- $GNUMAKE distclean || exit
- fi
-
-+ # When cross compiling, use native compiler
-+ if test -n "$CC_FOR_BUILD"; then
-+ CC=$CC_FOR_BUILD
-+ export CC
-+ LDFLAGS=$LDFLAGS_FOR_BUILD
-+ export LDFLAGS
-+ fi
-+
- ./configure $DMAKE_CONF || exit
-
- ## invoke the gnu make command set by configure.
-@@ -62,7 +70,7 @@ if test "$BUILD_DMAKE" != "NO"; then
- echo "dmake copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
- fi
-
--if test "$GUI" = "WNT" -a ! -x "$SOLARENV/$OUTPATH/bin/guw$EXEEXT"; then
-+if test "$GUI" = "WNT" -a ! -x "$SOLARENV/$OUTPATH/bin/guw$EXEEXT" -a "$CROSS_COMPILING" != "yes"; then
- echo ""
- echo "Calling $GNUMAKE in guw"
- cd "$SRC_ROOT/config_office/guw" || exit
---- set_soenv.in.orig 2008-10-20 19:52:27.000000000 +0200
-+++ set_soenv.in 2008-10-20 21:38:02.000000000 +0200
-@@ -1847,6 +1847,20 @@ ToFile( "SOLAR_JAVA", $SOLAR_JAVA
- ToFile( "BIG_SVX", $BIG_SVX, "e" );
- ToFile( "COM", $COM, "e" );
- ToFile( "COMPATH", $COMPATH, "e" );
-+ToFile( "BUILD_OS", "@BUILD_OS@", "e" );
-+ToFile( "TARGET_OS", "@TARGET_OS@", "e" );
-+ToFile( "CROSS_COMPILING", "@CROSS_COMPILING@", "e" );
-+ToFile( "CC_FOR_BUILD", "@CC_FOR_BUILD@", "e" );
-+ToFile( "CCLD_FOR_BUILD", "@CCLD_FOR_BUILD@", "e" );
-+ToFile( "LDFLAGS_FOR_BUILD", "@LDFLAGS_FOR_BUILD@", "e" );
-+ToFile( "AR", "@AR@", "e" );
-+ToFile( "AS", "@AS@", "e" );
-+ToFile( "DLLTOOL", "@DLLTOOL@", "e" );
-+ToFile( "LD", "@LD@", "e" );
-+ToFile( "NM", "@NM@", "e" );
-+ToFile( "RANLIB", "@RANLIB@", "e" );
-+ToFile( "WINDRES", "@WINDRES@", "e" );
-+ToFile( "TOOLS_DIR", "@TOOLS_DIR@", "e" );
- ToFile( "CPU", $CPU, "e" );
- ToFile( "CPUNAME", $CPUNAME, "e" );
- ToFile( "CVER", $CVER, "e" );
diff --git a/patches/dev300/crosswin32-config_office-mingw.diff b/patches/dev300/crosswin32-config_office-mingw.diff
deleted file mode 100644
index f548783..0000000
--- a/patches/dev300/crosswin32-config_office-mingw.diff
+++ /dev/null
@@ -1,72 +0,0 @@
---- configure.in.orig 2008-10-19 22:03:22.000000000 +0200
-+++ configure.in 2008-10-19 22:17:08.000000000 +0200
-@@ -1059,7 +1079,7 @@
- fi
- AC_SUBST(ENABLE_CRASHDUMP)
-
--if test "$_os" = "WINNT"; then
-+if test "$_os" = "WINNT" -o "$t_os" = "MinGW"; then
- BUILD_TYPE="$BUILD_TYPE TWAIN"
- fi
-
-@@ -4265,7 +4262,7 @@ elif test "$_os" = "OS2" ; then
- echo "Do Nothing for _os = OS2. Don't check for X11."
- dnl OS/2 uses native graphics. Don't check for X11.
- :
--elif test "$_os" != "WINNT" ; then
-+elif test "$_os" != "WINNT" -a "$t_os" != "MinGW" ; then
- AC_PATH_X
- AC_PATH_XTRA
- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-@@ -4526,7 +4564,7 @@ fi
- AC_SUBST(XLIB)
- AC_SUBST(XAU_LIBS)
-
--if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
-+if test "$_os" != "WINNT" -a "$t_os" != "MinGW" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
- dnl ===================================================================
- dnl Check for using Xaw
- dnl ===================================================================
-@@ -5371,7 +5409,7 @@ dnl ====================================
-
- ENABLE_GCONF=""
- AC_MSG_CHECKING([whether to enable GConf support])
--if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then
-+if test "$_os" != "WINNT" -a "$t_os" != "MinGW" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then
- ENABLE_GCONF="TRUE"
- AC_MSG_RESULT([yes])
- PKG_CHECK_MODULES( GCONF, gconf-2.0 )
-@@ -5387,7 +5425,7 @@ dnl ====================================
- ENABLE_GNOMEVFS=""
- GNOMEVFS_HAS_LOCKING=""
- AC_MSG_CHECKING([whether to enable GNOME VFS support])
--if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then
-+if test "$_os" != "WINNT" -a "$t_os" != "MinGW" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then
- ENABLE_GNOMEVFS="TRUE"
- AC_MSG_RESULT([yes])
- PKG_CHECK_MODULES( GNOMEVFS, gnome-vfs-2.0 >= 2.6.0 )
---- set_soenv.in.orig 2008-10-20 19:52:27.000000000 +0200
-+++ set_soenv.in 2008-10-20 20:22:58.000000000 +0200
-@@ -593,6 +593,22 @@ elsif ( $platform =~ m/linux/ )
- $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt";
- }
-
-+ if ( "@TARGET_OS@" == "MinGW" )
-+ {
-+ print "Setting build=Linux -> target,host=MinGW specific values... ";
-+ $COM = "GCC";
-+ $CVER = "C341";
-+ $OUTPATH = "wntgcci";
-+ $CPUNAME = "INTEL";
-+ $CPU = "I";
-+ $GUI = "WNT";
-+ $GUIBASE = "WIN";
-+ $GVER = "NT351";
-+ $OS = "WNT";
-+ $DYNAMIC_CRT = "TRUE";
-+ $SET_EXCEPTIONS = "TRUE";
-+ $use_shl_versions = "TRUE";
-+ }
-
- $INPATH = $OUTPATH.$PROEXT;
- }
diff --git a/patches/dev300/crosswin32-cppunit-mingw.diff b/patches/dev300/crosswin32-cppunit-mingw.diff
deleted file mode 100644
index 29e6957..0000000
--- a/patches/dev300/crosswin32-cppunit-mingw.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- cppunit/cppunit-1.8.0-r1.patch.pristine 2009-04-04 15:33:44.231998652 +0200
-+++ cppunit/cppunit-1.8.0-r1.patch 2009-04-04 15:34:27.616002193 +0200
-@@ -9610,7 +9610,7 @@ Nur in misc/build/cppunit-1.8.0/src/resu
- Nur in misc/build/cppunit-1.8.0/src/result: treswrapper.cxx.dummy.
- --- misc/cppunit-1.8.0/src/win32/makefile.mk 2008-12-10 20:46:10.024158685 +0100
- +++ misc/build/cppunit-1.8.0/src/win32/makefile.mk 2008-12-10 19:45:23.000000000 +0100
--@@ -1 +1,67 @@
-+@@ -1 +1,68 @@
- -dummy
- +#*************************************************************************
- +#
-@@ -9663,6 +9663,7 @@ Nur in misc/build/cppunit-1.8.0/src/resu
- +#-------------------------------------------------------------------------------
- +# This is a static lib
- +LIB1TARGET= $(LB)$/$(TARGET).lib
-++LIB1ARCHIV= $(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
- +LIB1OBJFILES= \
- + $(SLOFILES)
- +
-@@ -9682,7 +9683,7 @@ Nur in misc/build/cppunit-1.8.0/src/resu
- Nur in misc/build/cppunit-1.8.0/src/win32: makefile.mk.dummy.
- --- misc/cppunit-1.8.0/src/win32/winstuff.cxx 2008-12-10 20:46:10.106772548 +0100
- +++ misc/build/cppunit-1.8.0/src/win32/winstuff.cxx 2008-12-10 20:42:44.000000000 +0100
--@@ -1 +1,143 @@
-+@@ -1 +1,142 @@
- -dummy
- +/*************************************************************************
- + *
-@@ -9727,7 +9728,6 @@ Nur in misc/build/cppunit-1.8.0/src/win3
- +#if defined _MSC_VER
- +#pragma warning(pop)
- +#endif
--+#include <MAPIWin.h>
- +
- +void WinDebugBreak()
- +{
diff --git a/patches/dev300/crosswin32-desktop-mingw-res.diff b/patches/dev300/crosswin32-desktop-mingw-res.diff
deleted file mode 100644
index 8ad322c..0000000
--- a/patches/dev300/crosswin32-desktop-mingw-res.diff
+++ /dev/null
@@ -1,346 +0,0 @@
---- desktop/util/verinfo.rc.~1.19.12.1.~ 2008-09-19 09:30:39.000000000 +0200
-+++ desktop/util/verinfo.rc 2008-11-05 15:04:37.000000000 +0100
-@@ -38,16 +38,16 @@
- // version information
- // -----------------------------------------------------------------------
-
--VS_VERSION_INFO versioninfo
-+VS_VERSION_INFO VERSIONINFO
- #ifndef SUBVERSION
-- fileversion VERSION, 0, VERVARIANT, VER_COUNT
-- productversion VERSION, 0, VERVARIANT, VER_COUNT
-+ FILEVERSION VERSION, 0, VERVARIANT, VER_COUNT
-+ PRODUCTVERSION VERSION, 0, VERVARIANT, VER_COUNT
- #else
-- fileversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-- productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-+ FILEVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-+ PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
- #endif
-- fileflagsmask 0x3F
-- fileflags
-+ FILEFLAGSMASK 0x3F
-+ FILEFLAGS
- #if defined(DEBUG)
- VS_FF_DEBUG |
- #endif
-@@ -56,87 +56,87 @@
- #endif
- 0
- #ifndef WIN32
-- fileos VOS_DOS_WINDOWS16
-+ FILEOS VOS_DOS_WINDOWS16
- #else
-- fileos VOS_NT_WINDOWS32
-+ FILEOS VOS_NT_WINDOWS32
- #endif
-- filetype VFT_APP
-+ FILETYPE VFT_APP
- {
-- block "StringFileInfo"
-+ BLOCK "StringFileInfo"
- {
- #ifdef LG_D
-- block "040704E4"
-+ BLOCK "040704E4"
- {
- // German StringTable
-- value "CompanyName", "Sun Microsystems, Inc.\0"
-- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-- value "FileVersion", PPS(VER_LEVEL) "\0"
-- value "ProductVersion", PPS(VER_LEVEL) "\0"
-- value "OriginalFilename", "SOFFICE.EXE\0"
-- value "InternalName", "SOFFICE\0"
-- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
-+ VALUE "CompanyName", "Sun Microsystems, Inc.\0"
-+ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "OriginalFilename", "SOFFICE.EXE\0"
-+ VALUE "InternalName", "SOFFICE\0"
-+ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
- }
- #else
-- block "040904E4"
-+ BLOCK "040904E4"
- {
- // International StringTable
-- value "CompanyName", "Sun Microsystems, Inc.\0"
-- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-- value "FileVersion", PPS(VER_LEVEL) "\0"
-- value "ProductVersion", PPS(VER_LEVEL) "\0"
-- value "OriginalFilename", "SOFFICE.EXE\0"
-- value "InternalName", "SOFFICE\0"
-- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
-+ VALUE "CompanyName", "Sun Microsystems, Inc.\0"
-+ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "OriginalFilename", "SOFFICE.EXE\0"
-+ VALUE "InternalName", "SOFFICE\0"
-+ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
- }
- #endif
- }
-
-- block "VarFileInfo"
-+ BLOCK "VarFileInfo"
- {
- #ifdef LG_D
-- value "Translation", 0x0407, 1252
-+ VALUE "Translation", 0x0407, 1252
- #else
-- value "Translation", 0x0409, 1252
-+ VALUE "Translation", 0x0409, 1252
- #endif
- }
- }
-
--2 ICON "icons\\oasis-text.ico"
--3 ICON "icons\\oasis-text-template.ico"
--4 ICON "icons\\oasis-spreadsheet.ico"
--5 ICON "icons\\oasis-spreadsheet-template.ico"
--6 ICON "icons\\oasis-drawing.ico"
--7 ICON "icons\\oasis-drawing-template.ico"
--8 ICON "icons\\oasis-presentation.ico"
--9 ICON "icons\\oasis-presentation-template.ico"
--10 ICON "icons\\oasis-presentation-template.ico"
--11 ICON "icons\\oasis-master-document.ico"
--12 ICON "icons\\oasis-web-template.ico"
--13 ICON "icons\\oasis-empty-document.ico"
--14 ICON "icons\\oasis-database.ico"
--15 ICON "icons\\oasis-formula.ico"
--16 ICON "icons\\empty-template.ico"
--17 ICON "icons\\empty-document.ico"
--18 ICON "icons\\so8-configuration.ico"
--19 ICON "icons\\so8-open.ico"
--20 ICON "icons\\empty-document.ico"
--21 ICON "icons\\so9_writer_app.ico"
--22 ICON "icons\\so9_calc_app.ico"
--23 ICON "icons\\so9_draw_app.ico"
--24 ICON "icons\\so9_impress_app.ico"
--25 ICON "icons\\so9_math_app.ico"
--26 ICON "icons\\so9_base_app.ico"
--27 ICON "icons\\oasis-empty-document.ico"
--28 ICON "icons\\text.ico"
--29 ICON "icons\\text-template.ico"
--30 ICON "icons\\spreadsheet.ico"
--31 ICON "icons\\spreadsheet-template.ico"
--32 ICON "icons\\drawing.ico"
--33 ICON "icons\\drawing-template.ico"
--34 ICON "icons\\presentation.ico"
--35 ICON "icons\\presentation-template.ico"
--36 ICON "icons\\master-document.ico"
--37 ICON "icons\\empty-document.ico"
--38 ICON "icons\\database.ico"
--39 ICON "icons\\formula.ico"
--40 ICON "icons\\oxt-extension.ico"
-+2 ICON "icons/oasis-text.ico"
-+3 ICON "icons/oasis-text-template.ico"
-+4 ICON "icons/oasis-spreadsheet.ico"
-+5 ICON "icons/oasis-spreadsheet-template.ico"
-+6 ICON "icons/oasis-drawing.ico"
-+7 ICON "icons/oasis-drawing-template.ico"
-+8 ICON "icons/oasis-presentation.ico"
-+9 ICON "icons/oasis-presentation-template.ico"
-+10 ICON "icons/oasis-presentation-template.ico"
-+11 ICON "icons/oasis-master-document.ico"
-+12 ICON "icons/oasis-web-template.ico"
-+13 ICON "icons/oasis-empty-document.ico"
-+14 ICON "icons/oasis-database.ico"
-+15 ICON "icons/oasis-formula.ico"
-+16 ICON "icons/empty-template.ico"
-+17 ICON "icons/empty-document.ico"
-+18 ICON "icons/so8-configuration.ico"
-+19 ICON "icons/so8-open.ico"
-+20 ICON "icons/empty-document.ico"
-+21 ICON "icons/so9_writer_app.ico"
-+22 ICON "icons/so9_calc_app.ico"
-+23 ICON "icons/so9_draw_app.ico"
-+24 ICON "icons/so9_impress_app.ico"
-+25 ICON "icons/so9_math_app.ico"
-+26 ICON "icons/so9_base_app.ico"
-+27 ICON "icons/oasis-empty-document.ico"
-+28 ICON "icons/text.ico"
-+29 ICON "icons/text-template.ico"
-+30 ICON "icons/spreadsheet.ico"
-+31 ICON "icons/spreadsheet-template.ico"
-+32 ICON "icons/drawing.ico"
-+33 ICON "icons/drawing-template.ico"
-+34 ICON "icons/presentation.ico"
-+35 ICON "icons/presentation-template.ico"
-+36 ICON "icons/master-document.ico"
-+37 ICON "icons/empty-document.ico"
-+38 ICON "icons/database.ico"
-+39 ICON "icons/formula.ico"
-+40 ICON "icons/oxt-extension.ico"
---- desktop/util/ooverinfo.rc.orig 2009-07-07 16:49:16.000000000 +0200
-+++ desktop/util/ooverinfo.rc 2009-07-07 16:54:34.000000000 +0200
-@@ -38,11 +38,11 @@
- // version information
- // -----------------------------------------------------------------------
-
--VS_VERSION_INFO versioninfo
-- fileversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-- productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-- fileflagsmask 0x3F
-- fileflags
-+VS_VERSION_INFO VERSIONINFO
-+ FILEVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-+ PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-+ FILEFLAGSMASK 0x3F
-+ FILEFLAGS
- #if defined(DEBUG)
- VS_FF_DEBUG |
- #endif
-@@ -51,89 +51,89 @@
- #endif
- 0
- #ifndef WIN32
-- fileos VOS_DOS_WINDOWS16
-+ FILEOS VOS_DOS_WINDOWS16
- #else
-- fileos VOS_NT_WINDOWS32
-+ FILEOS VOS_NT_WINDOWS32
- #endif
- filetype VFT_APP
- {
-- block "StringFileInfo"
-+ BLOCK "StringFileInfo"
- {
- #ifdef LG_D
-- block "040704E4"
-+ BLOCK "040704E4"
- {
- // German StringTable
-- value "CompanyName", "OpenOffice.org\0"
-- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-- value "FileVersion", PPS(VER_LEVEL) "\0"
-- value "ProductVersion", PPS(VER_LEVEL) "\0"
-- value "OriginalFilename", "SOFFICE.EXE\0"
-- value "InternalName", "SOFFICE\0"
-- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
-+ VALUE "CompanyName", "OpenOffice.org\0"
-+ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "OriginalFilename", "SOFFICE.EXE\0"
-+ VALUE "InternalName", "SOFFICE\0"
-+ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
- }
- #else
-- block "040904E4"
-+ BLOCK "040904E4"
- {
- // International StringTable
-- value "CompanyName", "OpenOffice.org\0"
-- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-- value "FileVersion", PPS(VER_LEVEL) "\0"
-- value "ProductVersion", PPS(VER_LEVEL) "\0"
-- value "OriginalFilename", "SOFFICE.EXE\0"
-- value "InternalName", "SOFFICE\0"
-- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
-+ VALUE "CompanyName", "OpenOffice.org\0"
-+ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "OriginalFilename", "SOFFICE.EXE\0"
-+ VALUE "InternalName", "SOFFICE\0"
-+ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
- }
- #endif
- }
-
-- block "VarFileInfo"
-+ BLOCK "VarFileInfo"
- {
- #ifdef LG_D
-- value "Translation", 0x0407, 1252
-+ VALUE "Translation", 0x0407, 1252
- #else
-- value "Translation", 0x0409, 1252
-+ VALUE "Translation", 0x0409, 1252
- #endif
- }
- }
-
-
--2 ICON "icons\\ooo3_writer_doc.ico"
--3 ICON "icons\\ooo3_writer_tem.ico"
--4 ICON "icons\\ooo3_calc_doc.ico"
--5 ICON "icons\\ooo3_calc_tem.ico"
--6 ICON "icons\\ooo3_draw_doc.ico"
--7 ICON "icons\\ooo3_draw_tem.ico"
--8 ICON "icons\\ooo3_impress_doc.ico"
--9 ICON "icons\\ooo3_impress_tem.ico"
--10 ICON "icons\\ooo3_impress_doc.ico"
--11 ICON "icons\\ooo3_global_doc.ico"
--12 ICON "icons\\ooo3_html_doc.ico"
--13 ICON "icons\\ooo3_chart_doc.ico"
--14 ICON "icons\\ooo3_base_doc.ico"
--15 ICON "icons\\ooo3_math_doc.ico"
--16 ICON "icons\\ooo3_empty_tem.ico"
--17 ICON "icons\\ooo3_macro_doc.ico"
--18 ICON "icons\\ooo-configuration.ico"
--19 ICON "icons\\ooo-open.ico"
--20 ICON "icons\\ooo-image-doc.ico"
--21 ICON "icons\\ooo3_writer_app.ico"
--22 ICON "icons\\ooo3_calc_app.ico"
--23 ICON "icons\\ooo3_draw_app.ico"
--24 ICON "icons\\ooo3_impress_app.ico"
--25 ICON "icons\\ooo3_math_app.ico"
--26 ICON "icons\\ooo3_base_app.ico"
--27 ICON "icons\\ooo3_empty_doc.ico"
--28 ICON "icons\\ooo11-writer-doc.ico"
--29 ICON "icons\\ooo11-writer-tem.ico"
--30 ICON "icons\\ooo11-calc-doc.ico"
--31 ICON "icons\\ooo11-calc-tem.ico"
--32 ICON "icons\\ooo11-draw-doc.ico"
--33 ICON "icons\\ooo11-draw-tem.ico"
--34 ICON "icons\\ooo11-impress-doc.ico"
--35 ICON "icons\\ooo11-impress-tem.ico"
--36 ICON "icons\\ooo11-master-doc.ico"
--37 ICON "icons\\ooo11-chart-doc.ico"
--38 ICON "icons\\ooo11-base-doc.ico"
--39 ICON "icons\\ooo11-math-doc.ico"
--40 ICON "icons\\oxt-extension.ico"
-+2 ICON "icons/ooo3_writer_doc.ico"
-+3 ICON "icons/ooo3_writer_tem.ico"
-+4 ICON "icons/ooo3_calc_doc.ico"
-+5 ICON "icons/ooo3_calc_tem.ico"
-+6 ICON "icons/ooo3_draw_doc.ico"
-+7 ICON "icons/ooo3_draw_tem.ico"
-+8 ICON "icons/ooo3_impress_doc.ico"
-+9 ICON "icons/ooo3_impress_tem.ico"
-+10 ICON "icons/ooo3_impress_doc.ico"
-+11 ICON "icons/ooo3_global_doc.ico"
-+12 ICON "icons/ooo3_html_doc.ico"
-+13 ICON "icons/ooo3_chart_doc.ico"
-+14 ICON "icons/ooo3_base_doc.ico"
-+15 ICON "icons/ooo3_math_doc.ico"
-+16 ICON "icons/ooo3_empty_tem.ico"
-+17 ICON "icons/ooo3_macro_doc.ico"
-+18 ICON "icons/ooo-configuration.ico"
-+19 ICON "icons/ooo-open.ico"
-+20 ICON "icons/ooo-image-doc.ico"
-+21 ICON "icons/ooo3_writer_app.ico"
-+22 ICON "icons/ooo3_calc_app.ico"
-+23 ICON "icons/ooo3_draw_app.ico"
-+24 ICON "icons/ooo3_impress_app.ico"
-+25 ICON "icons/ooo3_math_app.ico"
-+26 ICON "icons/ooo3_base_app.ico"
-+27 ICON "icons/ooo3_empty_doc.ico"
-+28 ICON "icons/ooo11-writer-doc.ico"
-+29 ICON "icons/ooo11-writer-tem.ico"
-+30 ICON "icons/ooo11-calc-doc.ico"
-+31 ICON "icons/ooo11-calc-tem.ico"
-+32 ICON "icons/ooo11-draw-doc.ico"
-+33 ICON "icons/ooo11-draw-tem.ico"
-+34 ICON "icons/ooo11-impress-doc.ico"
-+35 ICON "icons/ooo11-impress-tem.ico"
-+36 ICON "icons/ooo11-master-doc.ico"
-+37 ICON "icons/ooo11-chart-doc.ico"
-+38 ICON "icons/ooo11-base-doc.ico"
-+39 ICON "icons/ooo11-math-doc.ico"
-+40 ICON "icons/oxt-extension.ico"
-
diff --git a/patches/dev300/crosswin32-embedserv-mingw.diff b/patches/dev300/crosswin32-embedserv-mingw.diff
deleted file mode 100644
index 900e449..0000000
--- a/patches/dev300/crosswin32-embedserv-mingw.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- embedserv/source/inprocserv/makefile.mk.orig 2009-06-30 17:42:56.000000000 +0200
-+++ embedserv/source/inprocserv/makefile.mk 2009-06-30 17:46:33.000000000 +0200
-@@ -57,12 +57,19 @@
- $(SLO)$/inprocembobj.obj
-
- SHL1TARGET=$(TARGET)
-+.IF "$(COM)"=="GCC"
-+SHL1STDLIBS=\
-+ -luuid\
-+ -lole32\
-+ -lgdi32\
-+ -ladvapi32
-+.ELSE
- SHL1STDLIBS=\
- uuid.lib\
- ole32.lib\
- gdi32.lib\
- advapi32.lib
--
-+.ENDIF
- SHL1OBJS=$(SLOFILES)
-
- SHL1DEF=$(MISC)$/$(TARGET).def
diff --git a/patches/dev300/crosswin32-funit-char-line.diff b/patches/dev300/crosswin32-funit-char-line.diff
deleted file mode 100644
index 9b0ad11..0000000
--- a/patches/dev300/crosswin32-funit-char-line.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./rsc/inc/vclrsc.hxx.old 2009-04-02 10:44:31.000000000 +0000
-+++ ./rsc/inc/vclrsc.hxx 2009-04-06 16:41:41.000000000 +0000
-@@ -176,7 +176,7 @@ typedef sal_Int64 WinBits;
- // from vcl/inc/fldunit.hxx
- enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
- FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
-- FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CUSTOM,
-+ FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CHAR, FUNIT_LINE, FUNIT_CUSTOM,
- FUNIT_PERCENT, FUNIT_100TH_MM };
-
-
---- ./rsc/source/parser/rscibas.cxx.old 2009-04-02 10:44:31.000000000 +0000
-+++ ./rsc/source/parser/rscibas.cxx 2009-04-06 16:41:41.000000000 +0000
-@@ -240,6 +240,9 @@ RscEnum * RscTypCont::InitFieldUnitsType
- SETCONST( pFieldUnits, "FUNIT_FOOT", FUNIT_FOOT );
- SETCONST( pFieldUnits, "FUNIT_MILE", FUNIT_MILE );
- SETCONST( pFieldUnits, "FUNIT_CUSTOM", FUNIT_CUSTOM );
-+ // Amelia : adds two units ,"char" and "line"
-+ SETCONST( pFieldUnits, "FUNIT_CHAR", FUNIT_CHAR );
-+ SETCONST( pFieldUnits, "FUNIT_LINE", FUNIT_LINE );
- SETCONST( pFieldUnits, "FUNIT_PERCENT", FUNIT_PERCENT );
-
- return pFieldUnits;
diff --git a/patches/dev300/crosswin32-goodies-mingw.diff b/patches/dev300/crosswin32-goodies-mingw.diff
deleted file mode 100644
index 3366c21..0000000
--- a/patches/dev300/crosswin32-goodies-mingw.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- goodies/source/inv/makefile.mk.~1.21.~ 2008-07-22 19:45:33.000000000 +0200
-+++ goodies/source/inv/makefile.mk 2009-02-15 21:35:25.000000000 +0100
-@@ -114,7 +114,7 @@ $(BIN)$/applicat.rdb : makefile.mk $(SOL
- rm -f $@
- $(GNUCOPY) $(SOLARBINDIR)$/types.rdb $@
- cd $(BIN) && \
-- regcomp -register -r applicat.rdb \
-+ $(REGCOMP) -register -r applicat.rdb \
- -c i18npool.uno$(DLLPOST)
-
- # --- Def-File ---
diff --git a/patches/dev300/crosswin32-hyphen-mingw.diff b/patches/dev300/crosswin32-hyphen-mingw.diff
deleted file mode 100644
index fdc1f95..0000000
--- a/patches/dev300/crosswin32-hyphen-mingw.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- hyphen/makefile.mk.orig 2009-06-27 18:06:28.000000000 +0200
-+++ hyphen/makefile.mk 2009-06-27 18:10:45.000000000 +0200
-@@ -84,7 +84,7 @@
-
- .IF "$(GUI)"=="WNT"
- .IF "$(COM)"=="GCC"
--CONFIGURE_ACTION=configure
-+CONFIGURE_ACTION=mingw32-configure
- CONFIGURE_FLAGS= --disable-shared --with-pic
-
- BUILD_ACTION=make
diff --git a/patches/dev300/crosswin32-lingucomponent-mingw.diff b/patches/dev300/crosswin32-lingucomponent-mingw.diff
deleted file mode 100644
index 92bc977..0000000
--- a/patches/dev300/crosswin32-lingucomponent-mingw.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- lingucomponent/source/lingutil/lingutil.cxx.~1.4.~ 2008-06-13 16:02:52.000000000 +0200
-+++ lingucomponent/source/lingutil/lingutil.cxx 2008-11-06 14:14:09.000000000 +0100
-@@ -36,7 +36,7 @@
- #endif
-
- #if defined(WNT)
--#include <Windows.h>
-+#include <windows.h>
- #endif
-
- #if defined(WNT)
diff --git a/patches/dev300/crosswin32-o3tl-no-cppunit.diff b/patches/dev300/crosswin32-o3tl-no-cppunit.diff
deleted file mode 100644
index c26eb99..0000000
--- a/patches/dev300/crosswin32-o3tl-no-cppunit.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- o3tl/prj/build.lst.pristine 2009-04-06 09:29:17.000000000 +0200
-+++ o3tl/prj/build.lst 2009-04-06 09:29:23.000000000 +0200
-@@ -2,4 +2,4 @@ ot o3tl : sal testshl2 BOOST:boost NULL
- ot o3tl usr1 - all ot_mkout NULL
- ot o3tl\inc get - all ot_inc NULL
- ot o3tl\prj get - all ot_prj NULL
--ot o3tl\qa nmake - all ot_qa NULL
-+#ot o3tl\qa nmake - all ot_qa NULL
diff --git a/patches/dev300/crosswin32-sal-cross.diff b/patches/dev300/crosswin32-sal-cross.diff
deleted file mode 100644
index f3b9146..0000000
--- a/patches/dev300/crosswin32-sal-cross.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- sal/rtl/source/makefile.mk.orig 2008-10-21 15:08:00.000000000 +0200
-+++ sal/rtl/source/makefile.mk 2008-10-21 15:09:56.000000000 +0200
-@@ -196,6 +196,12 @@ $(ALWAYSDBGFILES):
-
- ALLTAR : $(BOOTSTRAPMK)
-
--$(BOOTSTRAPMK) : $(APP1TARGETN)
-+.IF "$(CROSS_COMPILING)" == "no"
-+GEN_MAKEFILE = $(APP1TARGETN)
-+.ELSE # "$(CROSS_COMPILING)" == "yes"
-+GEN_MAKEFILE = $(TOOLS_DIR)/gen_makefile
-+.ENDIF # "$(CROSS_COMPILING)" == "yes"
-+
-+$(BOOTSTRAPMK) : $(GEN_MAKEFILE)
- $(AUGMENT_LIBRARY_PATH) $< > $@
-
diff --git a/patches/dev300/crosswin32-solenv-cross.diff b/patches/dev300/crosswin32-solenv-cross.diff
deleted file mode 100644
index 74f586a..0000000
--- a/patches/dev300/crosswin32-solenv-cross.diff
+++ /dev/null
@@ -1,208 +0,0 @@
---- solenv/inc/startup/startup.mk.orig 2008-10-21 09:41:14.000000000 +0200
-+++ solenv/inc/startup/startup.mk 2008-10-21 09:52:19.000000000 +0200
-@@ -40,9 +40,20 @@ CALLTARGETS=$(MAKETARGETS)
- OS_variable_needed
- .ENDIF
-
--# Customize macro definitions based on seting of OS.
--# This must come before the default macro definitions which follow.
--.INCLUDE .NOINFER : $(INCFILENAME:d)$(OS)$/macros.mk
-+# Customize macro definitions based on seting of BUILD_OS, after
-+# translation into a third naming scheme (1. config.guess,
-+# 2. configure.in) devised in 3. set_soenv.in: $B_OS.
-+.IF "$(CROSS_COMPILING)" == "no"
-+B_OS = $(OS)
-+.ELSE # "$(CROSS_COMPILING)" == "yes"
-+.IF "$(BUILD_OS)" == "Linux"
-+B_OS = LINUX
-+.ELSE # "$(BUILD_OS)" != "Linux"
-+.ERROR : ; @echo Work in progress: cross compiling only on Linux
-+.ENDIF
-+.ENDIF # "$(CROSS_COMPILING)" != "yes"
-+
-+.INCLUDE .NOINFER : $(INCFILENAME:d)$(B_OS)$/macros.mk
-
- # ----------------- Default Control Macro definitions -----------------------
- # Select appropriate defaults for basic macros
---- solenv/bin/build.pl.orig 2008-07-22 18:46:59.000000000 +0200
-+++ solenv/bin/build.pl 2008-10-21 10:58:44.000000000 +0200
-@@ -61,7 +61,7 @@
- my $enable_multiprocessing = 1;
- my $cygwin = 0;
- $cygwin++ if ($^O eq 'cygwin');
-- if ($ENV{GUI} eq 'WNT' && !$cygwin) {
-+ if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) {
- eval { require Win32::Process; import Win32::Process; };
- $enable_multiprocessing = 0 if ($@);
- };
-@@ -812,7 +838,7 @@ sub CorrectPath {
- sub check_dmake {
- #print "Checking dmake...";
- # my $dmake_batch = CorrectPath("$tmp_dir/dmake.bat");
-- if ($QuantityToBuild && ($ENV{GUI} eq 'WNT') && ($ENV{USE_SHELL} eq '4nt')) {
-+ if ($QuantityToBuild && ($ENV{BUILD_OS} eq 'WNT') && ($ENV{USE_SHELL} eq '4nt')) {
- if (open(DMAKEVERSION, "where dmake |")) {
- my @output = <DMAKEVERSION>;
- close DMAKEVERSION;
-@@ -857,7 +883,7 @@ sub get_commands {
- while ($arg = pop(@dmake_args)) {
- $dmake .= ' '.$arg;
- };
--# if (($ENV{GUI} eq 'WNT') && $QuantityToBuild) {
-+# if (($ENV{BUILD_OS} eq 'WNT') && $QuantityToBuild) {
- # print_error("There is no such executable $_4nt_exe") if (!-e $_4nt_exe);
- # $dmake_batch = generate_4nt_batch();
- # };
-@@ -873,7 +899,7 @@ sub get_commands {
- # ($ENV{GUI} eq 'MACOSX')) &&
- # ($Dir eq '/')) {
- # return 1;
--# } elsif ( (($ENV{GUI} eq 'WNT') ||
-+# } elsif ( (($ENV{BUILD_OS} eq 'WNT') ||
- # ($ENV{GUI} eq 'WIN') ||
- # ($ENV{GUI} eq 'OS2')) &&
- # ($Dir =~ /\S:\/$/)) {
-@@ -933,7 +959,7 @@ sub CheckPlatform {
- return 1 if (($ENV{GUI} eq 'WIN') && ($Platform eq 'w'));
- return 1 if (($ENV{GUI} eq 'UNX') && ($Platform eq 'u'));
- return 1 if (($ENV{GUI} eq 'OS2') && ($Platform eq 'p'));
-- return 1 if (($ENV{GUI} eq 'WNT') &&
-+ return 1 if ((($ENV{TARGET_OS} eq 'WNT') || ($ENV{TARGET_OS} eq 'MinGW')) &&
- (($Platform eq 'w') || ($Platform eq 'n')));
- return 0;
- };
-@@ -1378,7 +1409,7 @@ sub cancel_build {
- };
- print "\nAttention: if you build and deliver the above module(s) you may prolongue your the build issuing command \"build --from @broken_modules_names\"\n";
- } else {
--# if ($ENV{GUI} eq 'WNT') {
-+# if ($ENV{BUILD_OS} eq 'WNT') {
- while (children_number()) {
- handle_dead_children(1);
- }
-@@ -1400,7 +1431,7 @@ sub store_error {
- my ($pid, $error_code) = @_;
- return 0 if (!$error_code);
- my $child_nick = $processes_hash{$pid};
-- if ($ENV{GUI} eq 'WNT') {
-+ if ($ENV{BUILD_OS} eq 'WNT') {
- if (!defined $had_error{$child_nick}) {
- $had_error{$child_nick}++;
- return 1;
-@@ -1429,7 +1460,7 @@ sub handle_dead_children {
- my $try_once_more = 0;
- do {
- my $pid = 0;
-- if ($ENV{GUI} eq 'WNT' && !$cygwin) {
-+ if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) {
- foreach $pid (keys %processes_hash) {
- my $exit_code = undef;
- my $proc_obj = $windows_procs{$pid};
-@@ -1552,7 +1583,7 @@ sub start_child {
- # html_store_job_info($dependencies_hash, $job_dir, $error_code);
- # if ($error_code) {
- # # give windows (4nt) one more chance
--# if ($ENV{GUI} eq 'WNT' && !$cygwin) {
-+# if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) {
- # $error_code = do_post_job($`, $post_job, $dependencies_hash);
- # };
- # if ($error_code) {
-@@ -1569,7 +1600,7 @@ sub start_child {
- my $children_running;
- my $oldfh = select STDOUT;
- $| = 1;
-- if ($ENV{GUI} eq 'WNT' && !$cygwin) {
-+ if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) {
- print "$job_dir\n";
- my $process_obj = undef;
- my $rc = Win32::Process::Create($process_obj, $dmake_bin,
-@@ -1725,7 +1756,7 @@ sub do_custom_job {
- $error_code = run_job($job, CorrectPath($StandDir.$module), $module_job);
- if ($error_code) {
- # give windows (4nt) one more chance
-- if ($ENV{GUI} eq 'WNT' && !$cygwin) {
-+ if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) {
- $error_code = run_job($job, CorrectPath($StandDir.$module), $module_job);
- };
- };
-@@ -3180,7 +3211,7 @@ sub html_store_job_info {
-
- sub start_server_on_port {
- my $port = shift;
-- if ($ENV{GUI} eq 'WNT') {
-+ if ($ENV{BUILD_OS} eq 'WNT') {
- $socket_obj = new IO::Socket::INET (#LocalAddr => hostname(),
- LocalPort => $port,
- Proto => 'tcp',
---- solenv/bin/deliver.pl.orig 2008-10-21 10:52:30.000000000 +0200
-+++ solenv/bin/deliver.pl 2008-10-21 10:58:49.000000000 +0200
-@@ -140,7 +140,7 @@ parse_options();
- print "$script_name -- version: $script_rev\n" if !$opt_silent;
-
- if ( ! $opt_delete ) {
-- if ( $ENV{GUI} eq 'WNT' ) {
-+ if ( $ENV{BUILD_OS} eq 'WNT' ) {
- if ($ENV{COM} eq 'GCC') {
- initialize_strip() ;
- };
-@@ -411,7 +411,7 @@ sub parse_options
- $arg =~ /^-delete$/ and $opt_delete = 1 and next;
- $arg =~ /^-dontdeletecommon$/ and $dontdeletecommon = 1 and next;
- $arg =~ /^-help$/ and $opt_help = 1 and $arg = '';
-- $arg =~ /^-link$/ and $ENV{GUI} ne 'WNT' and $opt_link = 1 and next;
-+ $arg =~ /^-link$/ and $ENV{BUILD_OS} ne 'WNT' and $opt_link = 1 and next;
- $arg =~ /^-deloutput$/ and $opt_deloutput = 1 and next;
- $arg =~ /^-debug$/ and $is_debug = 1 and next;
- $arg =~ /^-checkdlst$/ and $opt_checkdlst = 1 and next;
-@@ -711,7 +711,7 @@ sub is_unstripped {
- # OS X file command doesn't know if a file is stripped or not
- if (($file_type =~ /not stripped/o) || ($file_type =~ /Mach-O/o) ||
- (($file_type =~ /PE/o) && ($ENV{GUI} eq 'WNT') &&
-- ($nm_output = `nm $file_name 2>&1`) && $nm_output &&
-+ ($nm_output = `$(NM) $file_name 2>&1`) && $nm_output &&
- !($nm_output =~ /no symbols/i) && !($nm_output =~ /not recognized/i))) {
- return '1' if ($file_name =~ /\.bin$/o);
- return '1' if ($file_name =~ /\.so\.*/o);
-@@ -1485,7 +1485,7 @@ sub usage
- print STDERR " -force copy even if not newer\n";
- print STDERR " -dontdeletecommon do not delete common files (for -delete option)\n";
- print STDERR " -help print this message\n";
-- if ( !defined($ENV{GUI}) || $ENV{GUI} ne 'WNT' ) {
-+ if ( !defined($ENV{BUILD_OS}) || $ENV{BUILD_OS} ne 'WNT' ) {
- print STDERR " -link hard link files into the solver to save disk space\n";
- }
- print STDERR " -minor deliver into minor (milestone)\n";
---- solenv/inc/unitools.mk.pristine 2008-10-21 11:31:04.000000000 +0200
-+++ solenv/inc/unitools.mk 2008-10-21 13:54:42.000000000 +0200
-@@ -39,7 +39,7 @@ XSLTPROC*=xsltproc
-
- ULFCONV*=ulfconv
-
--MAKEDEPEND*=$(SOLARBINDIR)$/makedepend
-+MAKEDEPEND*=$(TOOLS_DIR)/makedepend
-
- SCP_CHECK_TOOL:=checkscp$E
-
---- solenv/inc/settings.mk.pristine 2008-10-29 08:42:08.000000000 +0100
-+++ solenv/inc/settings.mk 2008-10-30 10:01:59.000000000 +0100
-@@ -752,7 +752,7 @@ COMMONBIN=$(LOCAL_COMMON_OUT)$/bin
- INC=$(PRJ)$/inc
- INCPCH=$(PRJ)$/inc$/pch
- INCLOCAL=..$/inc
--INCGUI=$(PRJ)$/$(GUIBASE)$/inc
-+INCGUI=$(PRJ)$/$(GUIBASE:l)$/inc
- INCCOM=$(OUT)$/inc
- INCCOMX=$(OUT)$/inc
- INCUNOIDL=$(INCCOM)$/$(PRJNAME)
-@@ -1050,7 +1050,11 @@ JAVA*:=$(JAVAINTERPRETER)
- SCPCOMP=$(PERL) $(SOLARENV)$/bin$/pre2par.pl
- SCPLINK=$(PERL) $(SOLARENV)$/bin$/par2script.pl
- LZIP*=lzip
-+.IF "$(GUI)" == "UNX" || "$(BUILD_OS)" != "WNT"
-+CPPLCC*=cpp.lcc
-+.ELSE
- CPPLCC*=cpplcc
-+.ENDIF
-
- .IF "$(DISABLE_ENHANCED_COMID)"==""
- .INCLUDE : tg_compv.mk
diff --git a/patches/dev300/crosswin32-solenv-mingw-res.diff b/patches/dev300/crosswin32-solenv-mingw-res.diff
deleted file mode 100644
index 5034444..0000000
--- a/patches/dev300/crosswin32-solenv-mingw-res.diff
+++ /dev/null
@@ -1,115 +0,0 @@
---- solenv/inc/shlinfo.rc.pristine 2008-10-29 09:33:25.000000000 +0100
-+++ solenv/inc/shlinfo.rc 2008-10-29 09:33:33.000000000 +0100
-@@ -29,8 +29,9 @@
- ************************************************************************/
-
- #define VERSION 3
--#define SUBVERSION 1
--#define VERVARIANT 0
-+#if !defined(VERVARIANT)
-+ #define VERVARIANT 0
-+#endif
-
- // .0 + VER_CONCEPT
- // .100 + VER_ALPHA
-@@ -90,16 +91,16 @@
- // version information
- // -----------------------------------------------------------------------
-
--VS_VERSION_INFO versioninfo
-+VS_VERSION_INFO VERSIONINFO
- #ifndef SUBVERSION
-- fileversion VERSION, 0, 0, VERVARIANT
-- productversion VERSION, 0, 0, VERVARIANT
-+ FILEVERSION VERSION, 0, 0, VERVARIANT
-+ PRODUCTVERSION VERSION, 0, 0, VERVARIANT
- #else
-- fileversion VERSION, VERVARIANT, VER_COUNT
-- productversion VERSION, VERVARIANT, VER_COUNT
-+ FILEVERSION VERSION, VERVARIANT, VER_COUNT
-+ PRODUCTVERSION VERSION, VERVARIANT, VER_COUNT
- #endif
-- fileflagsmask 0x3F
-- fileflags
-+ FILEFLAGSMASK 0x3F
-+ FILEFLAGS
- #if defined(DEBUG)
- VS_FF_DEBUG |
- #endif
-@@ -108,36 +109,36 @@
- #endif
- 0
- #ifndef WIN32
-- fileos VOS_DOS_WINDOWS16
-+ FILEOS VOS_DOS_WINDOWS16
- #else
-- fileos VOS_NT_WINDOWS32
-+ FILEOS VOS_NT_WINDOWS32
- #endif
-- filetype VFT_APP
-+ FILETYPE VFT_APP
- {
-- block "StringFileInfo"
-+ BLOCK "StringFileInfo"
- {
- #ifdef LG_D
-- block "040704E4"
-+ BLOCK "040704E4"
- {
- // German StringTable
-- value "CompanyName", "Sun Microsystems, Inc.\0"
-- value "FileVersion", PPS(VER_LEVEL) "\0"
-- value "OriginalFilename", PPS(ORG_NAME) "\0"
-- value "InternalName", PPS(INTERNAL_NAME) "\0"
-- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
-+ VALUE "CompanyName", "Sun Microsystems, Inc.\0"
-+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "OriginalFilename", PPS(ORG_NAME) "\0"
-+ VALUE "InternalName", PPS(INTERNAL_NAME) "\0"
-+ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
- ADDITIONAL_VERINFO1
- ADDITIONAL_VERINFO2
- ADDITIONAL_VERINFO3
- }
- #else
-- block "040904E4"
-+ BLOCK "040904E4"
- {
- // International StringTable
-- value "CompanyName", "Sun Microsystems, Inc.\0"
-- value "FileVersion", PPS(VER_LEVEL) "\0"
-- value "OriginalFilename", PPS(ORG_NAME) "\0"
-- value "InternalName", PPS(INTERNAL_NAME) "\0"
-- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
-+ VALUE "CompanyName", "Sun Microsystems, Inc.\0"
-+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "OriginalFilename", PPS(ORG_NAME) "\0"
-+ VALUE "InternalName", PPS(INTERNAL_NAME) "\0"
-+ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
- ADDITIONAL_VERINFO1
- ADDITIONAL_VERINFO2
- ADDITIONAL_VERINFO3
-@@ -145,12 +146,12 @@
- #endif
- }
-
-- block "VarFileInfo"
-+ BLOCK "VarFileInfo"
- {
- #ifdef LG_D
-- value "Translation", 0x0407, 1252
-+ VALUE "Translation", 0x0407, 1252
- #else
-- value "Translation", 0x0409, 1252
-+ VALUE "Translation", 0x0409, 1252
- #endif
- }
- }
-@@ -160,6 +161,6 @@
- {
- 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
- VERSION, VERVARIANT, VER_COUNT
--};
-+}
-
- #endif // OS2
diff --git a/patches/dev300/crosswin32-solenv.diff b/patches/dev300/crosswin32-solenv.diff
deleted file mode 100644
index ad1f87f..0000000
--- a/patches/dev300/crosswin32-solenv.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- solenv/bin/build.pl.orig 2008-07-22 18:46:59.000000000 +0200
-+++ solenv/bin/build.pl 2008-10-21 11:18:41.000000000 +0200
-@@ -419,7 +419,7 @@ sub BuildAll {
- while ($Prj = PickPrjToBuild(\%global_deps_hash)) {
- if (!defined $dead_parents{$Prj}) {
- if (scalar keys %broken_build) {
-- print $echo . "Skipping project $Prj because of error(s)\n";
-+ print $echo . "Skipping project $Prj: error:" . $broken_build{$Prj} . "\n";
- RemoveFromDependencies($Prj, \%global_deps_hash);
- $build_is_finished{$Prj}++;
- next;
diff --git a/patches/dev300/crosswin32-soltools-cross.diff b/patches/dev300/crosswin32-soltools-cross.diff
deleted file mode 100644
index 1e15193..0000000
--- a/patches/dev300/crosswin32-soltools-cross.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- soltools/util/makefile.pmk.~1.7.~~ 2008-04-10 20:11:03.000000000 +0200
-+++ soltools/util/makefile.pmk 2008-10-21 16:07:21.000000000 +0200
-@@ -29,8 +29,10 @@
- #
- #*************************************************************************
-
-+.IF "$(CROSS_COMPILING)" == "no"
- # find 'makedepend' in own output tree
- MAKEDEPEND=$(WRAPCMD) $(BIN)$/makedepend
-
- # find 'adjustvisibility' in own output tree
- ADJUSTVISIBILITY=$(WRAPCMD) $(BIN)$/adjustvisibility
-+.ENDIF # "$(CROSS_COMPILING)" == "no"
diff --git a/patches/dev300/crosswin32-tools-mingw.diff b/patches/dev300/crosswin32-tools-mingw.diff
deleted file mode 100644
index c233366..0000000
--- a/patches/dev300/crosswin32-tools-mingw.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- tools/source/fsys/wntmsc.hxx.pristine 2008-10-29 23:44:36.000000000 +0100
-+++ tools/source/fsys/wntmsc.hxx 2008-10-28 19:13:59.000000000 +0100
-@@ -36,8 +36,8 @@
- #ifndef ICC
- #include <io.h>
- #endif
--#include <sys\types.h>
--#include <sys\stat.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <direct.h>
-
- #include <tools/svwin.h>
---- tools/inc/tools/solar.h.pristine 2008-10-29 23:44:36.000000000 +0100
-+++ tools/inc/tools/solar.h 2008-10-31 12:54:34.000000000 +0100
-@@ -57,7 +57,9 @@
- /* Previous typedefs from before sal convergence are in comments */
- /* to the right of the new types. */
-
-+#ifndef __MINGW32_UNDEF_CONFLICT_TYPES__
- typedef sal_Bool BOOL; /* typedef unsigned char BOOL; */
-+#endif // __MINGW32_UNDEF_CONFLICT_TYPES__
- typedef sal_uInt8 BYTE; /* typedef unsigned char BYTE; */
- typedef sal_uInt16 USHORT; /* typedef unsigned short USHORT; */
- typedef sal_uIntPtr ULONG; /* typedef unsigned long ULONG; */
-@@ -81,8 +83,10 @@
- /* types with exact defined size (not just the minimum size) */
- typedef sal_Int64 INT64; /* typedef long INT64; previously "void" on Windows */
- typedef sal_uInt64 UINT64; /* typedef unsigned long UINT64; previously "void" on Windows */
-+#ifndef __MINGW32_UNDEF_CONFLICT_TYPES__
- typedef sal_Int32 INT32; /* typedef int INT32; previously "long" on Windows */
- typedef sal_uInt32 UINT32; /* typedef unsigned int UINT32; previously "unsigned long" on Windows */
-+#endif // __MINGW32_UNDEF_CONFLICT_TYPES__
- #endif /* _SOLAR_NOUINT */
- #endif
-
diff --git a/patches/dev300/crosswin32-trans-mingw.diff b/patches/dev300/crosswin32-trans-mingw.diff
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/dev300/crosswin32-unixodbc-disable.diff b/patches/dev300/crosswin32-unixodbc-disable.diff
deleted file mode 100644
index b6508b9..0000000
--- a/patches/dev300/crosswin32-unixodbc-disable.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- unixODBC/prj/d.lst.orig 2009-07-07 15:05:07.000000000 +0200
-+++ unixODBC/prj/d.lst 2009-07-07 15:05:21.000000000 +0200
-@@ -1,5 +1,5 @@
--mkdir: %_DEST%\inc%_EXT%\external
--mkdir: %_DEST%\inc%_EXT%\external\odbc
--..\inc\sql.h %_DEST%\inc%_EXT%\external\odbc\sql.h
--..\inc\sqlext.h %_DEST%\inc%_EXT%\external\odbc\sqlext.h
--..\inc\sqltypes.h %_DEST%\inc%_EXT%\external\odbc\sqltypes.h
-+#mkdir: %_DEST%\inc%_EXT%\external
-+#mkdir: %_DEST%\inc%_EXT%\external\odbc
-+#..\inc\sql.h %_DEST%\inc%_EXT%\external\odbc\sql.h
-+#..\inc\sqlext.h %_DEST%\inc%_EXT%\external\odbc\sqlext.h
-+#..\inc\sqltypes.h %_DEST%\inc%_EXT%\external\odbc\sqltypes.h
diff --git a/patches/dev300/crosswin32-writerperfect-cross.diff b/patches/dev300/crosswin32-writerperfect-cross.diff
deleted file mode 100644
index 6144f61..0000000
--- a/patches/dev300/crosswin32-writerperfect-cross.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- writerperfect/util/makefile.mk.orig 2009-07-07 00:57:12.000000000 +0200
-+++ writerperfect/util/makefile.mk 2009-07-07 01:05:50.000000000 +0200
-@@ -12,7 +12,7 @@
- .ENDIF
- .ELSE
- .IF "$(GUI)$(COM)"=="WNTGCC"
--LIBWPD=-lwpdlib
-+LIBWPD=-lwpd-0.8
- .ELSE
- LIBWPD=$(LIBPRE) wpdlib.lib
- .ENDIF
More information about the Libreoffice-commits
mailing list