[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply              |    3 --
 patches/dev300/win32-interix.diff |   39 --------------------------------------
 2 files changed, 42 deletions(-)

New commits:
commit c12b2c0a666f78978bab5fe27f84d5ca24743ae7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 17:08:01 2011 +0300

    The very minimal win32-interix.diff has been integrated
    
    I did some initial testing of building under Interix some years
    ago. Nothing came out of it, and LibreOffice certainly won't build
    with it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 164df6c..b062932 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1396,9 +1396,6 @@ mingw-thread-wait-instead-of-sleep.diff, i#95200, jholesov
 
 [ Fixes ]
 
-# Experimental support for Interix
-# FIXME dev300-m83 win32-interix.diff, tml
-
 # fix problem with calling private and protected members in layout code
 sfx2-privateprotectedpublic.diff
 
diff --git a/patches/dev300/win32-interix.diff b/patches/dev300/win32-interix.diff
deleted file mode 100644
index 7e357fa..0000000
--- a/patches/dev300/win32-interix.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From 231b238630c887bd81ecd6a0983e5a3894a32b0f Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:05:27 +0200
-Subject: [PATCH 592/768] win32-interix.diff
-
----
- config.guess |    2 +-
- configure.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git config.guess config.guess
-index 8229471..d0d5d63 100755
---- config.guess
-+++ config.guess
-@@ -789,7 +789,7 @@ EOF
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
- 	exit 0 ;;
--    x86:Interix*:[34]*)
-+    x86:Interix*:[3-6]*)
- 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
- 	exit 0 ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-diff --git configure.in configure.in
-index fbe7fd8..321824c 100644
---- configure.in
-+++ configure.in
-@@ -996,7 +996,7 @@ case "$build_os" in
- 		test_cups=no
- 		_os=GNU
- 		;;
--	cygwin*) # Windows
-+    cygwin*|interix*) # Windows
- 		test_cups=no
- 		test_cairo=yes
- 		test_freetype=no
--- 
-1.7.0.1
-