[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300
Thorsten Behrens
thorsten at kemper.freedesktop.org
Fri May 14 05:46:44 PDT 2010
patches/dev300/apple-remote-update.diff | 67 -----------------------------
patches/dev300/apply | 4 -
patches/dev300/transogl-crossplatform.diff | 54 +++++------------------
3 files changed, 14 insertions(+), 111 deletions(-)
New commits:
commit 12071dc0341f24d661fd71c8a82df5ed7dbd8a3e
Author: Thorsten <thb at thorstens-computer.local>
Date: Fri May 14 14:35:21 2010 +0200
Fix mac build
D patches/dev300/apple-remote-update.diff: patch is upstream
M patches/dev300/apply: removed apple-remote fix
M patches/dev300/transogl-crossplatform.diff: adapted to
copyright header changes
diff --git a/patches/dev300/apple-remote-update.diff b/patches/dev300/apple-remote-update.diff
deleted file mode 100644
index 8cb566f..0000000
--- a/patches/dev300/apple-remote-update.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -r 5c6b8c37653f apple_remote/AppleRemote.m
---- apple_remote/AppleRemote.m Tue Dec 15 14:27:37 2009 +0100
-+++ apple_remote/AppleRemote.m Tue Dec 15 19:18:56 2009 +0100
-@@ -43,6 +43,10 @@
- #define NSAppKitVersionNumber10_4 824
- #endif
-
-+#ifndef NSAppKitVersionNumber10_5
-+ #define NSAppKitVersionNumber10_5 949
-+#endif
-+
- @implementation AppleRemote
-
- + (const char*) remoteControlDeviceName {
-@@ -52,7 +56,12 @@
- - (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping {
-
- // TODO : avoid such magics
-- if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
-+ if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4)
-+ {
-+ #ifdef DEBUG
-+ NSLog( @"setting 10.4 cookies" );
-+ #endif
-+
- // 10.4.x Tiger
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"14_12_11_6_"];
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"14_13_11_6_"];
-@@ -65,7 +74,12 @@
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"14_6_14_6_"];
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"18_14_6_18_14_6_"];
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
-- } else {
-+ }
-+ else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 )
-+ {
-+ #ifdef DEBUG
-+ NSLog( @"setting 10.5 cookies" );
-+ #endif
- // 10.5.x Leopard
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"31_29_28_19_18_"];
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"31_30_28_19_18_"];
-@@ -78,6 +92,24 @@
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"31_19_18_31_19_18_"];
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"35_31_19_18_35_31_19_18_"];
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
-+ }
-+ else
-+ {
-+ #ifdef DEBUG
-+ NSLog( @"setting 10.6 cookies" );
-+ #endif
-+ // 10.6.x Snow Leopard
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"33_31_30_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"33_32_30_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"33_22_21_20_2_33_22_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"33_23_21_20_2_33_23_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"33_24_21_20_2_33_24_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"33_25_21_20_2_33_25_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"33_21_20_14_12_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"33_21_20_13_12_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"33_21_20_2_33_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"37_33_21_20_2_37_33_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
- }
- }
-
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1871f55..6e62ab9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1250,7 +1250,7 @@ transex3-localize-gsicheck-path.diff, i#109378, pmladek
[ Fixes < dev300-m66 ]
armeabi-softfp-buildfix.diff, i#105302, doko
-[ Fixes and not Win32Only ]
+[ Fixes and not Win32Only and not MacOSXOnly ]
# fix ARM bridges
fix-arm-eabi-bridge.diff, i#105359, cmc
@@ -2559,8 +2559,6 @@ novell-win32-msi-patchability.diff, tml
[ MacOSXOnly ]
SectionOwner => thorsten
-# backport from 3.3, enables apple remote for newer systems
-apple-remote-update.diff, i#107648, thorsten
sfx2-global-scope-fix.diff, thorsten
cws-kohei03-sc-macfix.diff, thorsten
diff --git a/patches/dev300/transogl-crossplatform.diff b/patches/dev300/transogl-crossplatform.diff
index 0c9ebe3..5e76c70 100644
--- a/patches/dev300/transogl-crossplatform.diff
+++ b/patches/dev300/transogl-crossplatform.diff
@@ -98,17 +98,8 @@ index fbbb575..e2cb301 100644
mkdir: %_DEST%\inc%_EXT%\boost\mpl
mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_
mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\config
-@@ -83,6 +90,8 @@ mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail
- mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot
- mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
- mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple
-+mkdir: %_DEST%\inc%_EXT%\boost\range
-+mkdir: %_DEST%\inc%_EXT%\boost\range\detail
- mkdir: %_DEST%\inc%_EXT%\boost\spirit
- mkdir: %_DEST%\inc%_EXT%\boost\spirit\actor
- mkdir: %_DEST%\inc%_EXT%\boost\spirit\attribute
@@ -306,8 +315,18 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
- ..\%__SRC%\inc\boost\utility\* %_DEST%\inc%_EXT%\boost\utility
+ ..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail
..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant
..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail
+..\%__SRC%\misc\build\boost_1_39_0\boost\algorithm\string\* %_DEST%\inc%_EXT%\boost\algorithm\string\
@@ -266,18 +257,15 @@ deleted file mode 100644
index a144790..0000000
--- slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx
+++ /dev/null
-@@ -1,143 +0,0 @@
+@@ -1,140 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-- * Copyright 2008 by Sun Microsystems, Inc.
+- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: $
-- * $Revision: $
-- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -415,18 +403,15 @@ deleted file mode 100644
index 049c71f..0000000
--- slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx
+++ /dev/null
-@@ -1,71 +0,0 @@
+@@ -1,68 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-- * Copyright 2008 by Sun Microsystems, Inc.
+- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: $
-- * $Revision: $
-- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -492,18 +477,15 @@ deleted file mode 100644
index de63a1b..0000000
--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx
+++ /dev/null
-@@ -1,1318 +0,0 @@
+@@ -1,1315 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-- * Copyright 2008 by Sun Microsystems, Inc.
+- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: OGLTrans_TransitionImpl.cxx,v $
-- * $Revision: 1.5 $
-- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1816,18 +1798,15 @@ deleted file mode 100644
index 2aa0529..0000000
--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx
+++ /dev/null
-@@ -1,509 +0,0 @@
+@@ -1,506 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-- * Copyright 2008 by Sun Microsystems, Inc.
+- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: OGLTrans_TransitionImpl.hxx,v $
-- * $Revision: 1.5 $
-- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2331,18 +2310,15 @@ deleted file mode 100644
index 01d513c..0000000
--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
+++ /dev/null
-@@ -1,1487 +0,0 @@
+@@ -1,1484 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-- * Copyright 2008 by Sun Microsystems, Inc.
+- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: OGLTrans_TransitionerImpl.cxx,v $
-- * $Revision: 1.6 $
-- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -7487,19 +7463,15 @@ deleted file mode 100644
index 6353b2d..0000000
--- slideshow/source/engine/OGLTrans/makefile.mk
+++ /dev/null
-@@ -1,84 +0,0 @@
+@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
--# Copyright 2008 by Sun Microsystems, Inc.
+-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
--# $RCSfile: makefile.mk,v $
--#
--# $Revision: 1.5 $
--#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
More information about the ooo-build-commit
mailing list