./packages/openofficeorg/3.2/unstable r1874: update cws-linuxaxp01.diff
------------------------------------------------------------
revno: 1874
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Mon 2010-03-22 00:25:04 +0100
message:
update cws-linuxaxp01.diff
modified:
patches/cws-linuxaxp01.diff
=== modified file 'patches/cws-linuxaxp01.diff'
--- a/patches/cws-linuxaxp01.diff 2010-03-19 17:23:06 +0000
+++ b/patches/cws-linuxaxp01.diff 2010-03-21 23:25:04 +0000
@@ -36,7 +36,7 @@
libwpd-testing.diff
--- /dev/null 2010-02-27 12:54:19.449251469 +0100
+++ openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/cws-linuxaxp01.diff 2010-03-18 17:45:45.000000000 +0100
-@@ -0,0 +1,1884 @@
+@@ -0,0 +1,1916 @@
+diff -r f387649cb501 automation/source/testtool/objtest.cxx
+--- automation/source/testtool/objtest.cxx Fri Mar 12 15:32:45 2010 +0100
++++ automation/source/testtool/objtest.cxx Mon Mar 15 16:00:09 2010 +0000
@@ -1921,3 +1921,35 @@
+ #elif defined LINUX
+ #error unknown plattform
+ #elif defined FREEBSD && defined X86
++
++# HG changeset patch
++# User Caolán McNamara <cmc@openoffice.org>
++# Date 1269009889 0
++# Node ID 33875dd3d07bb185d0d8d6cb570ecc8f4241d53c
++# Parent ec31c94b80f964365b6d9e1f63e9bdac1d88c9b1
++linuxaxp01: #i110145# yet another hard-coded list to fall over
++
++diff -r ec31c94b80f9 -r 33875dd3d07b desktop/source/deployment/misc/dp_platform.cxx
++--- desktop/source/deployment/misc/dp_platform.cxx Thu Mar 18 11:03:29 2010 +0000
+++++ desktop/source/deployment/misc/dp_platform.cxx Fri Mar 19 14:44:49 2010 +0000
++@@ -49,6 +49,8 @@
++ #define PLATFORM_LINUX_IA64 "linux_ia64"
++ #define PLATFORM_LINUX_S390 "linux_s390"
++ #define PLATFORM_LINUX_S390x "linux_s390x"
+++#define PLATFORM_LINUX_HPPA "linux_hppa"
+++#define PLATFORM_LINUX_ALPHA "linux_alpha"
++
++
++
++@@ -146,6 +148,10 @@
++ ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390"));
++ else if (token.equals(OUSTR(PLATFORM_LINUX_S390x)))
++ ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390x"));
+++ else if (token.equals(OUSTR(PLATFORM_LINUX_HPPA)))
+++ ret = checkOSandCPU(OUSTR("Linux"), OUSTR("HPPA"));
+++ else if (token.equals(OUSTR(PLATFORM_LINUX_ALPHA)))
+++ ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ALPHA"));
++ else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC)))
++ ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC"));
++ else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC64)))
++
Reply to: