[ooo-build-commit] 2 commits - bin/unpack patches/dev300
Thorsten Behrens
thorsten at kemper.freedesktop.org
Tue Jan 5 07:12:55 PST 2010
bin/unpack | 9 +++-
patches/dev300/apple-remote-update.diff | 67 ++++++++++++++++++++++++++++++
patches/dev300/apply | 5 +-
patches/dev300/sfx2-global-scope-fix.diff | 28 ++++++++++++
4 files changed, 106 insertions(+), 3 deletions(-)
New commits:
commit 1dacf528fd6bdf1b25dbd3097c2586f24b63c357
Author: Thorsten Behrens <thb at openoffice.org>
Date: Tue Jan 5 16:08:43 2010 +0100
Backport of apple remote fix; build fix for sfx2 layout stuff
* patches/dev300/apple-remote-update.diff: backport from i#107648
* patches/dev300/apply: added patches, macosx only
* patches/dev300/sfx2-global-scope-fix.diff: fix mac build breakage
related to layout namespace scoping
diff --git a/patches/dev300/apple-remote-update.diff b/patches/dev300/apple-remote-update.diff
new file mode 100644
index 0000000..8cb566f
--- /dev/null
+++ b/patches/dev300/apple-remote-update.diff
@@ -0,0 +1,67 @@
+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 28400c0..7116156 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2335,7 +2335,10 @@ svg-import-opacity-fix.diff, thorsten
novell-win32-msi-patchability.diff, tml
[ MacOSXOnly ]
-SectionOwner => pluby
+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
[ PardusOnly ]
pardus-default-ExternalMailer.diff
diff --git a/patches/dev300/sfx2-global-scope-fix.diff b/patches/dev300/sfx2-global-scope-fix.diff
new file mode 100644
index 0000000..9c69c01
--- /dev/null
+++ b/patches/dev300/sfx2-global-scope-fix.diff
@@ -0,0 +1,28 @@
+Fix SfxTabPage scope - force global namespace
+
+This was a build breaker on macos
+---
+
+ sfx2/inc/sfx2/tabdlg.hxx | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+
+diff --git sfx2/inc/sfx2/tabdlg.hxx sfx2/inc/sfx2/tabdlg.hxx
+index 64186d6..4976abd 100644
+--- sfx2/inc/sfx2/tabdlg.hxx
++++ sfx2/inc/sfx2/tabdlg.hxx
+@@ -134,12 +134,12 @@ protected:
+ virtual SfxItemSet* CreateInputItemSet( USHORT nId );
+ // wird *nicht* im Sfx gel"oscht!
+ virtual const SfxItemSet* GetRefreshedSet();
+- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
++ virtual void PageCreated( USHORT nId, ::SfxTabPage &rPage );
+ virtual long Notify( NotifyEvent& rNEvt );
+
+ SfxItemSet* pExampleSet;
+ SfxItemSet* GetInputSetImpl();
+- SfxTabPage* GetTabPage( USHORT nPageId ) const;
++ ::SfxTabPage* GetTabPage( USHORT nPageId ) const;
+
+ BOOL IsInOK() const;
+ /** prepare to leace the current page. Calls the DeactivatePage method of the current page, (if necessary),
commit f7433f90a542fb9eb8763828fd82a918da9146c3
Author: Thorsten Behrens <thb at openoffice.org>
Date: Tue Jan 5 16:07:11 2010 +0100
Disabling flock of upstream repos for MacOS
* bin/unpack: sadly mac is teh suckage & does not have useful utils
diff --git a/bin/unpack b/bin/unpack
index 1d7a4e7..782a0a4 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -15,6 +15,9 @@ else
echo_n=echo echo_c='\c'
fi
+# mac does not ship flock binary
+test "z`uname -s`" = "zDarwin" || use_flock=true
+
#"# don't confuse vim's syntax highlighting ;-)
check_tarball()
@@ -277,7 +280,9 @@ else
mkdir $OOBUILDDIR
for pkg in $CORE_PKGS; do
export pkg
- flock $SRCDIR/clone/$pkg-lock -c '
+ (
+ test -z $use_flock || flock 200
+ test -z $use_flock && echo "Warning: potential race, make sure you have exclusive access to upstream src tree $Ãpkg"
tree=$SRCDIR/clone/$pkg
echo "* checking out $CVSTAG in $pkg..."
(
@@ -290,7 +295,7 @@ else
) || exit 1
echo "* copying it into place..."
rsync -a --exclude .git $tree/* $OOBUILDDIR/
- '
+ ) 200>$SRCDIR/clone/$pkg-lock
unset pkg
done
fi
More information about the ooo-build-commit
mailing list