From 56f7023d91ccfc0f8aeaf894f62c421c1c516f34 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Sun, 22 May 2005 21:04:01 +0000 Subject: Update to m105 --- editors/openoffice-2.0-devel/Makefile | 6 +- editors/openoffice-2.0-devel/distinfo | 4 +- ...ridges+source+cpp_uno+gcc3_freebsd_intel+call.s | 270 +++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx | 285 +++++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+makefile.mk | 24 ++ .../files/patch-libxmlsec+xmlsec1-1.2.6.patch | 52 +--- .../files/patch-sndfile+libsndfile-1.0.9.patch | 33 +-- editors/openoffice-2.0-devel/files/patch-solenv | 35 --- editors/openoffice-3-devel/Makefile | 6 +- editors/openoffice-3-devel/distinfo | 4 +- ...ridges+source+cpp_uno+gcc3_freebsd_intel+call.s | 270 +++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx | 285 +++++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+makefile.mk | 24 ++ .../files/patch-libxmlsec+xmlsec1-1.2.6.patch | 52 +--- .../files/patch-sndfile+libsndfile-1.0.9.patch | 33 +-- editors/openoffice-3-devel/files/patch-solenv | 35 --- editors/openoffice-3/Makefile | 6 +- editors/openoffice-3/distinfo | 4 +- ...ridges+source+cpp_uno+gcc3_freebsd_intel+call.s | 270 +++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx | 285 +++++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+makefile.mk | 24 ++ .../files/patch-libxmlsec+xmlsec1-1.2.6.patch | 52 +--- .../files/patch-sndfile+libsndfile-1.0.9.patch | 33 +-- editors/openoffice-3/files/patch-solenv | 35 --- editors/openoffice.org-2-RC/Makefile | 6 +- editors/openoffice.org-2-RC/distinfo | 4 +- ...ridges+source+cpp_uno+gcc3_freebsd_intel+call.s | 270 +++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx | 285 +++++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+makefile.mk | 24 ++ .../files/patch-libxmlsec+xmlsec1-1.2.6.patch | 52 +--- .../files/patch-sndfile+libsndfile-1.0.9.patch | 33 +-- editors/openoffice.org-2-RC/files/patch-solenv | 35 --- editors/openoffice.org-2-devel/Makefile | 6 +- editors/openoffice.org-2-devel/distinfo | 4 +- ...ridges+source+cpp_uno+gcc3_freebsd_intel+call.s | 270 +++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx | 285 +++++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+makefile.mk | 24 ++ .../files/patch-libxmlsec+xmlsec1-1.2.6.patch | 52 +--- .../files/patch-sndfile+libsndfile-1.0.9.patch | 33 +-- editors/openoffice.org-2-devel/files/patch-solenv | 35 --- editors/openoffice.org-2.0-devel/Makefile | 6 +- editors/openoffice.org-2.0-devel/distinfo | 4 +- ...ridges+source+cpp_uno+gcc3_freebsd_intel+call.s | 270 +++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx | 285 +++++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+makefile.mk | 24 ++ .../files/patch-libxmlsec+xmlsec1-1.2.6.patch | 52 +--- .../files/patch-sndfile+libsndfile-1.0.9.patch | 33 +-- .../openoffice.org-2.0-devel/files/patch-solenv | 35 --- editors/openoffice.org-2.0/Makefile | 6 +- editors/openoffice.org-2.0/distinfo | 4 +- ...ridges+source+cpp_uno+gcc3_freebsd_intel+call.s | 270 +++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx | 285 +++++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+makefile.mk | 24 ++ .../files/patch-libxmlsec+xmlsec1-1.2.6.patch | 52 +--- .../files/patch-sndfile+libsndfile-1.0.9.patch | 33 +-- editors/openoffice.org-2.0/files/patch-solenv | 35 --- editors/openoffice.org-2/Makefile | 6 +- editors/openoffice.org-2/distinfo | 4 +- ...ridges+source+cpp_uno+gcc3_freebsd_intel+call.s | 270 +++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx | 285 +++++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+makefile.mk | 24 ++ .../files/patch-libxmlsec+xmlsec1-1.2.6.patch | 52 +--- .../files/patch-sndfile+libsndfile-1.0.9.patch | 33 +-- editors/openoffice.org-2/files/patch-solenv | 35 --- editors/openoffice.org-3-RC/Makefile | 6 +- editors/openoffice.org-3-RC/distinfo | 4 +- ...ridges+source+cpp_uno+gcc3_freebsd_intel+call.s | 270 +++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx | 285 +++++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+makefile.mk | 24 ++ .../files/patch-libxmlsec+xmlsec1-1.2.6.patch | 52 +--- .../files/patch-sndfile+libsndfile-1.0.9.patch | 33 +-- editors/openoffice.org-3-RC/files/patch-solenv | 35 --- editors/openoffice.org-3-devel/Makefile | 6 +- editors/openoffice.org-3-devel/distinfo | 4 +- ...ridges+source+cpp_uno+gcc3_freebsd_intel+call.s | 270 +++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx | 285 +++++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+makefile.mk | 24 ++ .../files/patch-libxmlsec+xmlsec1-1.2.6.patch | 52 +--- .../files/patch-sndfile+libsndfile-1.0.9.patch | 33 +-- editors/openoffice.org-3-devel/files/patch-solenv | 35 --- editors/openoffice.org-3/Makefile | 6 +- editors/openoffice.org-3/distinfo | 4 +- ...ridges+source+cpp_uno+gcc3_freebsd_intel+call.s | 270 +++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx | 285 +++++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+makefile.mk | 24 ++ .../files/patch-libxmlsec+xmlsec1-1.2.6.patch | 52 +--- .../files/patch-sndfile+libsndfile-1.0.9.patch | 33 +-- editors/openoffice.org-3/files/patch-solenv | 35 --- editors/openoffice.org-vcltesttool/Makefile | 6 +- editors/openoffice.org-vcltesttool/distinfo | 4 +- ...ridges+source+cpp_uno+gcc3_freebsd_intel+call.s | 270 +++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx | 285 +++++++++++++++++++++ ...s+source+cpp_uno+gcc3_freebsd_intel+makefile.mk | 24 ++ .../files/patch-libxmlsec+xmlsec1-1.2.6.patch | 52 +--- .../files/patch-sndfile+libsndfile-1.0.9.patch | 33 +-- .../openoffice.org-vcltesttool/files/patch-solenv | 35 --- 96 files changed, 7200 insertions(+), 1308 deletions(-) create mode 100644 editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s create mode 100644 editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx create mode 100644 editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk delete mode 100644 editors/openoffice-2.0-devel/files/patch-solenv create mode 100644 editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s create mode 100644 editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx create mode 100644 editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk delete mode 100644 editors/openoffice-3-devel/files/patch-solenv create mode 100644 editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s create mode 100644 editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx create mode 100644 editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk delete mode 100644 editors/openoffice-3/files/patch-solenv create mode 100644 editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s create mode 100644 editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx create mode 100644 editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk delete mode 100644 editors/openoffice.org-2-RC/files/patch-solenv create mode 100644 editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s create mode 100644 editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx create mode 100644 editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk delete mode 100644 editors/openoffice.org-2-devel/files/patch-solenv create mode 100644 editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s create mode 100644 editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx create mode 100644 editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk delete mode 100644 editors/openoffice.org-2.0-devel/files/patch-solenv create mode 100644 editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s create mode 100644 editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx create mode 100644 editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk delete mode 100644 editors/openoffice.org-2.0/files/patch-solenv create mode 100644 editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s create mode 100644 editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx create mode 100644 editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk delete mode 100644 editors/openoffice.org-2/files/patch-solenv create mode 100644 editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s create mode 100644 editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx create mode 100644 editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk delete mode 100644 editors/openoffice.org-3-RC/files/patch-solenv create mode 100644 editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s create mode 100644 editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx create mode 100644 editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk delete mode 100644 editors/openoffice.org-3-devel/files/patch-solenv create mode 100644 editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s create mode 100644 editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx create mode 100644 editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk delete mode 100644 editors/openoffice.org-3/files/patch-solenv create mode 100644 editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s create mode 100644 editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx create mode 100644 editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk delete mode 100644 editors/openoffice.org-vcltesttool/files/patch-solenv (limited to 'editors') diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index 15fe526efb13..80d5a832f6a2 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -19,8 +19,8 @@ COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(develo NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz MOZILLA_VERSION= 1.7.5 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) DISTFILES+= ${MOZILLA_SOURCE}:mozsrc .endif @@ -48,8 +48,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 103 -SNAPDATE= 20050512 +MILESTONE= 105 +SNAPDATE= 20050521 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo index 9c859bca1d4d..c308f56de99d 100644 --- a/editors/openoffice-2.0-devel/distinfo +++ b/editors/openoffice-2.0-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 65c42ee71a3bca66ef38a332826f2ef7 -SIZE (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 214220004 +MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810 +SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s new file mode 100644 index 000000000000..00bf61a6a587 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s @@ -0,0 +1,270 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s Thu Jan 1 09:00:00 1970 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Fri May 20 11:21:13 2005 +@@ -0,0 +1,262 @@ ++ .text ++ ++.globl privateSnippetExecutorGeneral ++ .type privateSnippetExecutorGeneral,@function ++privateSnippetExecutorGeneral: ++.LFBg: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIg0: ++ movl %esp,%ebp ++.LCFIg1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEg: ++ .size privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral ++ ++.globl privateSnippetExecutorVoid ++ .type privateSnippetExecutorVoid,@function ++privateSnippetExecutorVoid: ++.LFBv: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIv0: ++ movl %esp,%ebp ++.LCFIv1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ leave ++ ret ++.LFEv: ++ .size privateSnippetExecutorVoid,.-privateSnippetExecutorVoid ++ ++.globl privateSnippetExecutorHyper ++ .type privateSnippetExecutorHyper,@function ++privateSnippetExecutorHyper: ++.LFBh: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIh0: ++ movl %esp,%ebp ++.LCFIh1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ movl 16(%esp),%edx # 64 bit nRegReturn, upper half ++ leave ++ ret ++.LFEh: ++ .size privateSnippetExecutorHyper,.-privateSnippetExecutorHyper ++ ++.globl privateSnippetExecutorFloat ++ .type privateSnippetExecutorFloat,@function ++privateSnippetExecutorFloat: ++.LFBf: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIf0: ++ movl %esp,%ebp ++.LCFIf1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ flds 12(%esp) # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEf: ++ .size privateSnippetExecutorFloat,.-privateSnippetExecutorFloat ++ ++.globl privateSnippetExecutorDouble ++ .type privateSnippetExecutorDouble,@function ++privateSnippetExecutorDouble: ++.LFBd: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFId0: ++ movl %esp,%ebp ++.LCFId1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ fldl 12(%esp) # 64 bit nRegReturn ++ leave ++ ret ++.LFEd: ++ .size privateSnippetExecutorDouble,.-privateSnippetExecutorDouble ++ ++.globl privateSnippetExecutorClass ++ .type privateSnippetExecutorClass,@function ++privateSnippetExecutorClass: ++.LFBc: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIc0: ++ movl %esp,%ebp ++.LCFIc1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret $4 ++.LFEc: ++ .size privateSnippetExecutorClass,.-privateSnippetExecutorClass ++ ++ .section .eh_frame,"a",@progbits ++.Lframe1: ++ .long .LECIE1-.LSCIE1 # length ++.LSCIE1: ++ .long 0 # CIE_ID ++ .byte 1 # version ++ .string "zR" # augmentation ++ .uleb128 1 # code_alignment_factor ++ .sleb128 -4 # data_alignment_factor ++ .byte 8 # return_address_register ++ .uleb128 1 # augmentation size 1: ++ .byte 0x1B # FDE Encoding (pcrel sdata4) ++ # initial_instructions: ++ .byte 0x0C # DW_CFA_def_cfa %esp, 4 ++ .uleb128 4 ++ .uleb128 4 ++ .byte 0x88 # DW_CFA_offset ret, 1 ++ .uleb128 1 ++ .align 4 ++.LECIE1: ++.LSFDEg: ++ .long .LEFDEg-.LASFDEg # length ++.LASFDEg: ++ .long .LASFDEg-.Lframe1 # CIE_pointer ++ .long .LFBg-. # initial_location ++ .long .LFEg-.LFBg # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg0-.LFBg ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg1-.LCFIg0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEg: ++.LSFDEv: ++ .long .LEFDEv-.LASFDEv # length ++.LASFDEv: ++ .long .LASFDEv-.Lframe1 # CIE_pointer ++ .long .LFBv-. # initial_location ++ .long .LFEv-.LFBv # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv0-.LFBv ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv1-.LCFIv0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEv: ++.LSFDEh: ++ .long .LEFDEh-.LASFDEh # length ++.LASFDEh: ++ .long .LASFDEh-.Lframe1 # CIE_pointer ++ .long .LFBh-. # initial_location ++ .long .LFEh-.LFBh # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh0-.LFBh ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh1-.LCFIh0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEh: ++.LSFDEf: ++ .long .LEFDEf-.LASFDEf # length ++.LASFDEf: ++ .long .LASFDEf-.Lframe1 # CIE_pointer ++ .long .LFBf-. # initial_location ++ .long .LFEf-.LFBf # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf0-.LFBf ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf1-.LCFIf0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEf: ++.LSFDEd: ++ .long .LEFDEd-.LASFDEd # length ++.LASFDEd: ++ .long .LASFDEd-.Lframe1 # CIE_pointer ++ .long .LFBd-. # initial_location ++ .long .LFEd-.LFBd # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId0-.LFBd ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId1-.LCFId0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEd: ++.LSFDEc: ++ .long .LEFDEc-.LASFDEc # length ++.LASFDEc: ++ .long .LASFDEc-.Lframe1 # CIE_pointer ++ .long .LFBc-. # initial_location ++ .long .LFEc-.LFBc # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc0-.LFBc ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc1-.LCFIc0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEc: diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx new file mode 100644 index 000000000000..e6e306b99efd --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx @@ -0,0 +1,285 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Jan 19 00:06:09 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Feb 21 21:13:28 2005 +@@ -77,7 +77,7 @@ + { + + //================================================================================================== +-static typelib_TypeClass cpp2uno_call( ++void cpp2uno_call( + bridges::cpp_uno::shared::CppInterfaceProxy * pThis, + const typelib_TypeDescription * pMemberTypeDescr, + typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return +@@ -209,8 +209,6 @@ + CPPU_CURRENT_NAMESPACE::raiseException( + &aUnoExc, pThis->getBridge()->getUno2Cpp() ); + // has to destruct the any +- // is here for dummy +- return typelib_TypeClass_VOID; + } + else // else no exception occured... + { +@@ -247,22 +245,16 @@ + } + if (pReturnTypeDescr) + { +- typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; + TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); +- return eRet; + } +- else +- return typelib_TypeClass_VOID; + } + } + + + //================================================================================================== +-static typelib_TypeClass cpp_mediate( +- sal_Int32 nFunctionIndex, +- sal_Int32 nVtableOffset, +- void ** pCallStack, +- sal_Int64 * pRegisterReturn /* space for register return */ ) ++extern "C" void cpp_vtable_call( ++ int nFunctionIndex, int nVtableOffset, void** pCallStack, ++ sal_Int64 nRegReturn ) + { + OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); + +@@ -298,7 +290,6 @@ + + TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); + +- typelib_TypeClass eRet; + switch (aMemberDescr.get()->eTypeClass) + { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: +@@ -306,11 +297,11 @@ + if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex) + { + // is GET method +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, + 0, 0, // no params +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + else + { +@@ -321,11 +312,11 @@ + aParam.bIn = sal_True; + aParam.bOut = sal_False; + +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + 0, // indicates void return + 1, &aParam, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -336,11 +327,9 @@ + { + case 1: // acquire() + pCppI->acquireProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 2: // release() + pCppI->releaseProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 0: // queryInterface() opt + { +@@ -361,20 +350,19 @@ + &pInterface, pTD, cpp_acquire ); + pInterface->release(); + TYPELIB_DANGER_RELEASE( pTD ); +- *(void **)pRegisterReturn = pCallStack[1]; +- eRet = typelib_TypeClass_ANY; ++ *(void **)&nRegReturn = pCallStack[1]; + break; + } + TYPELIB_DANGER_RELEASE( pTD ); + } + } // else perform queryInterface() + default: +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -383,72 +371,55 @@ + throw RuntimeException( + rtl::OUString::createFromAscii("no member description found!"), + (XInterface *)pThis ); +- // is here for dummy +- eRet = typelib_TypeClass_VOID; + } + } +- +- return eRet; + } + + //================================================================================================== +-/** +- * is called on incoming vtable calls +- * (called by asm snippets) +- */ +-static void cpp_vtable_call( +- int nFunctionIndex, int nVtableOffset, void** pCallStack ) +- __attribute__((regparm(3))); +- +-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack ) +-{ +- volatile long nRegReturn[2]; +- typelib_TypeClass aType = cpp_mediate( +- nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn ); +- +- switch( aType ) +- { +- case typelib_TypeClass_HYPER: +- case typelib_TypeClass_UNSIGNED_HYPER: +- __asm__( "movl %1, %%edx\n\t" +- "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); +- break; +- case typelib_TypeClass_FLOAT: +- __asm__( "flds %0\n\t" +- "fstp %%st(0)\n\t" +- "flds %0\n" +- : : "m"(*(float *)nRegReturn) ); +- break; +- case typelib_TypeClass_DOUBLE: +- __asm__( "fldl %0\n\t" +- "fstp %%st(0)\n\t" +- "fldl %0\n" +- : : "m"(*(double *)nRegReturn) ); +- break; +-// case typelib_TypeClass_UNSIGNED_SHORT: +-// case typelib_TypeClass_SHORT: +-// __asm__( "movswl %0, %%eax\n" +-// : : "m"(nRegReturn) ); +-// break; +- default: +- __asm__( "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]) ); +- break; +- } +-} +- ++extern "C" void privateSnippetExecutorGeneral(); ++extern "C" void privateSnippetExecutorVoid(); ++extern "C" void privateSnippetExecutorHyper(); ++extern "C" void privateSnippetExecutorFloat(); ++extern "C" void privateSnippetExecutorDouble(); ++extern "C" void privateSnippetExecutorClass(); ++extern "C" typedef void (*PrivateSnippetExecutor)(); + +-//================================================================================================== +-int const codeSnippetSize = 20; ++int const codeSnippetSize = 16; + + unsigned char * codeSnippet( + unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, +- bool simpleRetType) ++ typelib_TypeClass returnTypeClass) + { +- if (!simpleRetType) { ++ if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { + functionIndex |= 0x80000000; + } ++ PrivateSnippetExecutor exec; ++ switch (returnTypeClass) { ++ case typelib_TypeClass_VOID: ++ exec = privateSnippetExecutorVoid; ++ break; ++ case typelib_TypeClass_HYPER: ++ case typelib_TypeClass_UNSIGNED_HYPER: ++ exec = privateSnippetExecutorHyper; ++ break; ++ case typelib_TypeClass_FLOAT: ++ exec = privateSnippetExecutorFloat; ++ break; ++ case typelib_TypeClass_DOUBLE: ++ exec = privateSnippetExecutorDouble; ++ break; ++ case typelib_TypeClass_STRING: ++ case typelib_TypeClass_TYPE: ++ case typelib_TypeClass_ANY: ++ case typelib_TypeClass_SEQUENCE: ++ case typelib_TypeClass_STRUCT: ++ case typelib_TypeClass_INTERFACE: ++ exec = privateSnippetExecutorClass; ++ break; ++ default: ++ exec = privateSnippetExecutorGeneral; ++ break; ++ } + unsigned char * p = code; + OSL_ASSERT(sizeof (sal_Int32) == 4); + // mov function_index, %eax: +@@ -459,13 +430,10 @@ + *p++ = 0xBA; + *reinterpret_cast< sal_Int32 * >(p) = vtableOffset; + p += sizeof (sal_Int32); +- // mov %esp, %ecx: +- *p++ = 0x89; +- *p++ = 0xE1; +- // jmp cpp_vtable_call: ++ // jmp privateSnippetExecutor: + *p++ = 0xE9; + *reinterpret_cast< sal_Int32 * >(p) +- = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32); ++ = ((unsigned char *) exec) - p - sizeof (sal_Int32); + p += sizeof (sal_Int32); + OSL_ASSERT(p - code <= codeSnippetSize); + return code + codeSnippetSize; +@@ -504,17 +472,17 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceAttributeTypeDescription * >( +- member)->pAttributeTypeRef)); ++ reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( ++ member)->pAttributeTypeRef->eTypeClass); + // Setter: + if (!reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { + *slots++ = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ code = codeSnippet( ++ code, functionOffset++, vtableOffset, ++ typelib_TypeClass_VOID); + } + break; + +@@ -522,10 +490,8 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceMethodTypeDescription * >( +- member)->pReturnTypeRef)); ++ reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( ++ member)->pReturnTypeRef->eTypeClass); + break; + + default: diff --git a/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..6f6a3a0f3e13 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk @@ -0,0 +1,24 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk Fri May 20 11:14:36 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Fri May 20 11:16:09 2005 +@@ -87,7 +87,8 @@ + SLOFILES= \ + $(SLO)$/except.obj \ + $(SLO)$/cpp2uno.obj \ +- $(SLO)$/uno2cpp.obj ++ $(SLO)$/uno2cpp.obj \ ++ $(SLO)$/call.obj + + SHL1TARGET= $(TARGET) + +@@ -108,3 +109,6 @@ + + .INCLUDE : target.mk + ++$(SLO)$/%.obj: %.s ++ $(CC) -c -o $(SLO)$/$(@:b).o $< ++ touch $@ diff --git a/editors/openoffice-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch index 7cf03a50d0a5..ba324bf13dd3 100644 --- a/editors/openoffice-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch +++ b/editors/openoffice-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch @@ -3,47 +3,17 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct version number of resultant shared lib -Index: libxmlsec/xmlsec1-1.2.6.patch +Index: xmlsec1-1.2.6.patch =================================================================== RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v -retrieving revision 1.3 -diff -u -r1.3 xmlsec1-1.2.6.patch ---- libxmlsec/xmlsec1-1.2.6.patch 29 Mar 2005 11:45:08 -0000 1.3 -+++ libxmlsec/xmlsec1-1.2.6.patch 6 Apr 2005 04:46:13 -0000 -@@ -13957,3 +13957,61 @@ - XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib - - XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib -+*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 -+--- misc/build/xmlsec1-1.2.6/ltmain.sh Wed Apr 6 13:32:04 2005 -+*************** -+*** 2918,2929 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2918,2929 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +retrieving revision 1.5 +diff -u -r1.5 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 18 May 2005 10:11:24 -0000 1.5 ++++ libxmlsec/xmlsec1-1.2.6.patch 22 May 2005 01:43:49 -0000 +@@ -756,6 +756,35 @@ + *** misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 + --- misc/build/xmlsec1-1.2.6/ltmain.sh 2005-05-09 19:55:51.745319024 +0200 + *************** +*** 2994,3006 **** + ;; + @@ -72,3 +42,7 @@ diff -u -r1.3 xmlsec1-1.2.6.patch + ;; + + irix | nonstopux) ++*************** + *** 3564,3570 **** + fi + else diff --git a/editors/openoffice-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch index 91d4cf4ce4b1..ea2d00a49c68 100644 --- a/editors/openoffice-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch +++ b/editors/openoffice-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch @@ -3,47 +3,20 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct shared lib number -Index: sndfile/libsndfile-1.0.9.patch +Index: libsndfile-1.0.9.patch =================================================================== RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v retrieving revision 1.1 diff -u -r1.1 libsndfile-1.0.9.patch --- sndfile/libsndfile-1.0.9.patch 6 Oct 2004 11:49:36 -0000 1.1 -+++ sndfile/libsndfile-1.0.9.patch 28 Mar 2005 07:59:15 -0000 -@@ -231,3 +231,51 @@ ++++ sndfile/libsndfile-1.0.9.patch 22 May 2005 02:01:17 -0000 +@@ -231,3 +231,24 @@ #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL +*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 13:02:07 2004 +--- misc/build/libsndfile-1.0.9/ltmain.sh Mon Mar 28 16:37:47 2005 +*************** -+*** 2899,2910 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2899,2910 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +*** 2980,2987 **** + ;; + diff --git a/editors/openoffice-2.0-devel/files/patch-solenv b/editors/openoffice-2.0-devel/files/patch-solenv deleted file mode 100644 index b1e86cebebdd..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-solenv +++ /dev/null @@ -1,35 +0,0 @@ -Issutracker : #i48304# -CWS : N/A -Author : NAKATA Maho (JCA) -Description : getuid.so is not req'ed for FreeBSD - -Index: bin/modules/installer/download.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/download.pm,v -retrieving revision 1.13 -diff -u -r1.13 download.pm ---- solenv/bin/modules/installer/download.pm 25 Apr 2005 11:55:33 -0000 1.13 -+++ solenv/bin/modules/installer/download.pm 28 Apr 2005 00:11:54 -0000 -@@ -189,9 +189,10 @@ - # my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |"; - - # $ENV{'LD_PRELOAD'} = $getuidlibrary; --# my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; -+#getuid.so is req'ed for Linux/Solaris? FreeBSD/MacOSX don't need it. -+ my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; - -- my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; -+# my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; - - my $sumoutput = ""; - -@@ -228,7 +229,8 @@ - - my $getuidlibraryname = "getuid.so"; - my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0); -- if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } -+# ad hock prohibiting error -+# if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } - - return $$getuidlibraryref; - } diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 15fe526efb13..80d5a832f6a2 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -19,8 +19,8 @@ COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(develo NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz MOZILLA_VERSION= 1.7.5 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) DISTFILES+= ${MOZILLA_SOURCE}:mozsrc .endif @@ -48,8 +48,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 103 -SNAPDATE= 20050512 +MILESTONE= 105 +SNAPDATE= 20050521 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index 9c859bca1d4d..c308f56de99d 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 65c42ee71a3bca66ef38a332826f2ef7 -SIZE (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 214220004 +MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810 +SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 diff --git a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s new file mode 100644 index 000000000000..00bf61a6a587 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s @@ -0,0 +1,270 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s Thu Jan 1 09:00:00 1970 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Fri May 20 11:21:13 2005 +@@ -0,0 +1,262 @@ ++ .text ++ ++.globl privateSnippetExecutorGeneral ++ .type privateSnippetExecutorGeneral,@function ++privateSnippetExecutorGeneral: ++.LFBg: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIg0: ++ movl %esp,%ebp ++.LCFIg1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEg: ++ .size privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral ++ ++.globl privateSnippetExecutorVoid ++ .type privateSnippetExecutorVoid,@function ++privateSnippetExecutorVoid: ++.LFBv: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIv0: ++ movl %esp,%ebp ++.LCFIv1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ leave ++ ret ++.LFEv: ++ .size privateSnippetExecutorVoid,.-privateSnippetExecutorVoid ++ ++.globl privateSnippetExecutorHyper ++ .type privateSnippetExecutorHyper,@function ++privateSnippetExecutorHyper: ++.LFBh: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIh0: ++ movl %esp,%ebp ++.LCFIh1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ movl 16(%esp),%edx # 64 bit nRegReturn, upper half ++ leave ++ ret ++.LFEh: ++ .size privateSnippetExecutorHyper,.-privateSnippetExecutorHyper ++ ++.globl privateSnippetExecutorFloat ++ .type privateSnippetExecutorFloat,@function ++privateSnippetExecutorFloat: ++.LFBf: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIf0: ++ movl %esp,%ebp ++.LCFIf1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ flds 12(%esp) # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEf: ++ .size privateSnippetExecutorFloat,.-privateSnippetExecutorFloat ++ ++.globl privateSnippetExecutorDouble ++ .type privateSnippetExecutorDouble,@function ++privateSnippetExecutorDouble: ++.LFBd: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFId0: ++ movl %esp,%ebp ++.LCFId1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ fldl 12(%esp) # 64 bit nRegReturn ++ leave ++ ret ++.LFEd: ++ .size privateSnippetExecutorDouble,.-privateSnippetExecutorDouble ++ ++.globl privateSnippetExecutorClass ++ .type privateSnippetExecutorClass,@function ++privateSnippetExecutorClass: ++.LFBc: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIc0: ++ movl %esp,%ebp ++.LCFIc1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret $4 ++.LFEc: ++ .size privateSnippetExecutorClass,.-privateSnippetExecutorClass ++ ++ .section .eh_frame,"a",@progbits ++.Lframe1: ++ .long .LECIE1-.LSCIE1 # length ++.LSCIE1: ++ .long 0 # CIE_ID ++ .byte 1 # version ++ .string "zR" # augmentation ++ .uleb128 1 # code_alignment_factor ++ .sleb128 -4 # data_alignment_factor ++ .byte 8 # return_address_register ++ .uleb128 1 # augmentation size 1: ++ .byte 0x1B # FDE Encoding (pcrel sdata4) ++ # initial_instructions: ++ .byte 0x0C # DW_CFA_def_cfa %esp, 4 ++ .uleb128 4 ++ .uleb128 4 ++ .byte 0x88 # DW_CFA_offset ret, 1 ++ .uleb128 1 ++ .align 4 ++.LECIE1: ++.LSFDEg: ++ .long .LEFDEg-.LASFDEg # length ++.LASFDEg: ++ .long .LASFDEg-.Lframe1 # CIE_pointer ++ .long .LFBg-. # initial_location ++ .long .LFEg-.LFBg # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg0-.LFBg ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg1-.LCFIg0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEg: ++.LSFDEv: ++ .long .LEFDEv-.LASFDEv # length ++.LASFDEv: ++ .long .LASFDEv-.Lframe1 # CIE_pointer ++ .long .LFBv-. # initial_location ++ .long .LFEv-.LFBv # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv0-.LFBv ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv1-.LCFIv0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEv: ++.LSFDEh: ++ .long .LEFDEh-.LASFDEh # length ++.LASFDEh: ++ .long .LASFDEh-.Lframe1 # CIE_pointer ++ .long .LFBh-. # initial_location ++ .long .LFEh-.LFBh # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh0-.LFBh ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh1-.LCFIh0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEh: ++.LSFDEf: ++ .long .LEFDEf-.LASFDEf # length ++.LASFDEf: ++ .long .LASFDEf-.Lframe1 # CIE_pointer ++ .long .LFBf-. # initial_location ++ .long .LFEf-.LFBf # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf0-.LFBf ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf1-.LCFIf0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEf: ++.LSFDEd: ++ .long .LEFDEd-.LASFDEd # length ++.LASFDEd: ++ .long .LASFDEd-.Lframe1 # CIE_pointer ++ .long .LFBd-. # initial_location ++ .long .LFEd-.LFBd # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId0-.LFBd ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId1-.LCFId0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEd: ++.LSFDEc: ++ .long .LEFDEc-.LASFDEc # length ++.LASFDEc: ++ .long .LASFDEc-.Lframe1 # CIE_pointer ++ .long .LFBc-. # initial_location ++ .long .LFEc-.LFBc # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc0-.LFBc ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc1-.LCFIc0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEc: diff --git a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx new file mode 100644 index 000000000000..e6e306b99efd --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx @@ -0,0 +1,285 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Jan 19 00:06:09 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Feb 21 21:13:28 2005 +@@ -77,7 +77,7 @@ + { + + //================================================================================================== +-static typelib_TypeClass cpp2uno_call( ++void cpp2uno_call( + bridges::cpp_uno::shared::CppInterfaceProxy * pThis, + const typelib_TypeDescription * pMemberTypeDescr, + typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return +@@ -209,8 +209,6 @@ + CPPU_CURRENT_NAMESPACE::raiseException( + &aUnoExc, pThis->getBridge()->getUno2Cpp() ); + // has to destruct the any +- // is here for dummy +- return typelib_TypeClass_VOID; + } + else // else no exception occured... + { +@@ -247,22 +245,16 @@ + } + if (pReturnTypeDescr) + { +- typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; + TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); +- return eRet; + } +- else +- return typelib_TypeClass_VOID; + } + } + + + //================================================================================================== +-static typelib_TypeClass cpp_mediate( +- sal_Int32 nFunctionIndex, +- sal_Int32 nVtableOffset, +- void ** pCallStack, +- sal_Int64 * pRegisterReturn /* space for register return */ ) ++extern "C" void cpp_vtable_call( ++ int nFunctionIndex, int nVtableOffset, void** pCallStack, ++ sal_Int64 nRegReturn ) + { + OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); + +@@ -298,7 +290,6 @@ + + TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); + +- typelib_TypeClass eRet; + switch (aMemberDescr.get()->eTypeClass) + { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: +@@ -306,11 +297,11 @@ + if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex) + { + // is GET method +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, + 0, 0, // no params +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + else + { +@@ -321,11 +312,11 @@ + aParam.bIn = sal_True; + aParam.bOut = sal_False; + +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + 0, // indicates void return + 1, &aParam, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -336,11 +327,9 @@ + { + case 1: // acquire() + pCppI->acquireProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 2: // release() + pCppI->releaseProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 0: // queryInterface() opt + { +@@ -361,20 +350,19 @@ + &pInterface, pTD, cpp_acquire ); + pInterface->release(); + TYPELIB_DANGER_RELEASE( pTD ); +- *(void **)pRegisterReturn = pCallStack[1]; +- eRet = typelib_TypeClass_ANY; ++ *(void **)&nRegReturn = pCallStack[1]; + break; + } + TYPELIB_DANGER_RELEASE( pTD ); + } + } // else perform queryInterface() + default: +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -383,72 +371,55 @@ + throw RuntimeException( + rtl::OUString::createFromAscii("no member description found!"), + (XInterface *)pThis ); +- // is here for dummy +- eRet = typelib_TypeClass_VOID; + } + } +- +- return eRet; + } + + //================================================================================================== +-/** +- * is called on incoming vtable calls +- * (called by asm snippets) +- */ +-static void cpp_vtable_call( +- int nFunctionIndex, int nVtableOffset, void** pCallStack ) +- __attribute__((regparm(3))); +- +-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack ) +-{ +- volatile long nRegReturn[2]; +- typelib_TypeClass aType = cpp_mediate( +- nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn ); +- +- switch( aType ) +- { +- case typelib_TypeClass_HYPER: +- case typelib_TypeClass_UNSIGNED_HYPER: +- __asm__( "movl %1, %%edx\n\t" +- "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); +- break; +- case typelib_TypeClass_FLOAT: +- __asm__( "flds %0\n\t" +- "fstp %%st(0)\n\t" +- "flds %0\n" +- : : "m"(*(float *)nRegReturn) ); +- break; +- case typelib_TypeClass_DOUBLE: +- __asm__( "fldl %0\n\t" +- "fstp %%st(0)\n\t" +- "fldl %0\n" +- : : "m"(*(double *)nRegReturn) ); +- break; +-// case typelib_TypeClass_UNSIGNED_SHORT: +-// case typelib_TypeClass_SHORT: +-// __asm__( "movswl %0, %%eax\n" +-// : : "m"(nRegReturn) ); +-// break; +- default: +- __asm__( "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]) ); +- break; +- } +-} +- ++extern "C" void privateSnippetExecutorGeneral(); ++extern "C" void privateSnippetExecutorVoid(); ++extern "C" void privateSnippetExecutorHyper(); ++extern "C" void privateSnippetExecutorFloat(); ++extern "C" void privateSnippetExecutorDouble(); ++extern "C" void privateSnippetExecutorClass(); ++extern "C" typedef void (*PrivateSnippetExecutor)(); + +-//================================================================================================== +-int const codeSnippetSize = 20; ++int const codeSnippetSize = 16; + + unsigned char * codeSnippet( + unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, +- bool simpleRetType) ++ typelib_TypeClass returnTypeClass) + { +- if (!simpleRetType) { ++ if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { + functionIndex |= 0x80000000; + } ++ PrivateSnippetExecutor exec; ++ switch (returnTypeClass) { ++ case typelib_TypeClass_VOID: ++ exec = privateSnippetExecutorVoid; ++ break; ++ case typelib_TypeClass_HYPER: ++ case typelib_TypeClass_UNSIGNED_HYPER: ++ exec = privateSnippetExecutorHyper; ++ break; ++ case typelib_TypeClass_FLOAT: ++ exec = privateSnippetExecutorFloat; ++ break; ++ case typelib_TypeClass_DOUBLE: ++ exec = privateSnippetExecutorDouble; ++ break; ++ case typelib_TypeClass_STRING: ++ case typelib_TypeClass_TYPE: ++ case typelib_TypeClass_ANY: ++ case typelib_TypeClass_SEQUENCE: ++ case typelib_TypeClass_STRUCT: ++ case typelib_TypeClass_INTERFACE: ++ exec = privateSnippetExecutorClass; ++ break; ++ default: ++ exec = privateSnippetExecutorGeneral; ++ break; ++ } + unsigned char * p = code; + OSL_ASSERT(sizeof (sal_Int32) == 4); + // mov function_index, %eax: +@@ -459,13 +430,10 @@ + *p++ = 0xBA; + *reinterpret_cast< sal_Int32 * >(p) = vtableOffset; + p += sizeof (sal_Int32); +- // mov %esp, %ecx: +- *p++ = 0x89; +- *p++ = 0xE1; +- // jmp cpp_vtable_call: ++ // jmp privateSnippetExecutor: + *p++ = 0xE9; + *reinterpret_cast< sal_Int32 * >(p) +- = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32); ++ = ((unsigned char *) exec) - p - sizeof (sal_Int32); + p += sizeof (sal_Int32); + OSL_ASSERT(p - code <= codeSnippetSize); + return code + codeSnippetSize; +@@ -504,17 +472,17 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceAttributeTypeDescription * >( +- member)->pAttributeTypeRef)); ++ reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( ++ member)->pAttributeTypeRef->eTypeClass); + // Setter: + if (!reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { + *slots++ = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ code = codeSnippet( ++ code, functionOffset++, vtableOffset, ++ typelib_TypeClass_VOID); + } + break; + +@@ -522,10 +490,8 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceMethodTypeDescription * >( +- member)->pReturnTypeRef)); ++ reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( ++ member)->pReturnTypeRef->eTypeClass); + break; + + default: diff --git a/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..6f6a3a0f3e13 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk @@ -0,0 +1,24 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk Fri May 20 11:14:36 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Fri May 20 11:16:09 2005 +@@ -87,7 +87,8 @@ + SLOFILES= \ + $(SLO)$/except.obj \ + $(SLO)$/cpp2uno.obj \ +- $(SLO)$/uno2cpp.obj ++ $(SLO)$/uno2cpp.obj \ ++ $(SLO)$/call.obj + + SHL1TARGET= $(TARGET) + +@@ -108,3 +109,6 @@ + + .INCLUDE : target.mk + ++$(SLO)$/%.obj: %.s ++ $(CC) -c -o $(SLO)$/$(@:b).o $< ++ touch $@ diff --git a/editors/openoffice-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch index 7cf03a50d0a5..ba324bf13dd3 100644 --- a/editors/openoffice-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch +++ b/editors/openoffice-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch @@ -3,47 +3,17 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct version number of resultant shared lib -Index: libxmlsec/xmlsec1-1.2.6.patch +Index: xmlsec1-1.2.6.patch =================================================================== RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v -retrieving revision 1.3 -diff -u -r1.3 xmlsec1-1.2.6.patch ---- libxmlsec/xmlsec1-1.2.6.patch 29 Mar 2005 11:45:08 -0000 1.3 -+++ libxmlsec/xmlsec1-1.2.6.patch 6 Apr 2005 04:46:13 -0000 -@@ -13957,3 +13957,61 @@ - XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib - - XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib -+*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 -+--- misc/build/xmlsec1-1.2.6/ltmain.sh Wed Apr 6 13:32:04 2005 -+*************** -+*** 2918,2929 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2918,2929 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +retrieving revision 1.5 +diff -u -r1.5 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 18 May 2005 10:11:24 -0000 1.5 ++++ libxmlsec/xmlsec1-1.2.6.patch 22 May 2005 01:43:49 -0000 +@@ -756,6 +756,35 @@ + *** misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 + --- misc/build/xmlsec1-1.2.6/ltmain.sh 2005-05-09 19:55:51.745319024 +0200 + *************** +*** 2994,3006 **** + ;; + @@ -72,3 +42,7 @@ diff -u -r1.3 xmlsec1-1.2.6.patch + ;; + + irix | nonstopux) ++*************** + *** 3564,3570 **** + fi + else diff --git a/editors/openoffice-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch index 91d4cf4ce4b1..ea2d00a49c68 100644 --- a/editors/openoffice-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch +++ b/editors/openoffice-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch @@ -3,47 +3,20 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct shared lib number -Index: sndfile/libsndfile-1.0.9.patch +Index: libsndfile-1.0.9.patch =================================================================== RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v retrieving revision 1.1 diff -u -r1.1 libsndfile-1.0.9.patch --- sndfile/libsndfile-1.0.9.patch 6 Oct 2004 11:49:36 -0000 1.1 -+++ sndfile/libsndfile-1.0.9.patch 28 Mar 2005 07:59:15 -0000 -@@ -231,3 +231,51 @@ ++++ sndfile/libsndfile-1.0.9.patch 22 May 2005 02:01:17 -0000 +@@ -231,3 +231,24 @@ #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL +*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 13:02:07 2004 +--- misc/build/libsndfile-1.0.9/ltmain.sh Mon Mar 28 16:37:47 2005 +*************** -+*** 2899,2910 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2899,2910 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +*** 2980,2987 **** + ;; + diff --git a/editors/openoffice-3-devel/files/patch-solenv b/editors/openoffice-3-devel/files/patch-solenv deleted file mode 100644 index b1e86cebebdd..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv +++ /dev/null @@ -1,35 +0,0 @@ -Issutracker : #i48304# -CWS : N/A -Author : NAKATA Maho (JCA) -Description : getuid.so is not req'ed for FreeBSD - -Index: bin/modules/installer/download.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/download.pm,v -retrieving revision 1.13 -diff -u -r1.13 download.pm ---- solenv/bin/modules/installer/download.pm 25 Apr 2005 11:55:33 -0000 1.13 -+++ solenv/bin/modules/installer/download.pm 28 Apr 2005 00:11:54 -0000 -@@ -189,9 +189,10 @@ - # my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |"; - - # $ENV{'LD_PRELOAD'} = $getuidlibrary; --# my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; -+#getuid.so is req'ed for Linux/Solaris? FreeBSD/MacOSX don't need it. -+ my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; - -- my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; -+# my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; - - my $sumoutput = ""; - -@@ -228,7 +229,8 @@ - - my $getuidlibraryname = "getuid.so"; - my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0); -- if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } -+# ad hock prohibiting error -+# if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } - - return $$getuidlibraryref; - } diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 15fe526efb13..80d5a832f6a2 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -19,8 +19,8 @@ COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(develo NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz MOZILLA_VERSION= 1.7.5 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) DISTFILES+= ${MOZILLA_SOURCE}:mozsrc .endif @@ -48,8 +48,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 103 -SNAPDATE= 20050512 +MILESTONE= 105 +SNAPDATE= 20050521 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo index 9c859bca1d4d..c308f56de99d 100644 --- a/editors/openoffice-3/distinfo +++ b/editors/openoffice-3/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 65c42ee71a3bca66ef38a332826f2ef7 -SIZE (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 214220004 +MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810 +SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 diff --git a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s new file mode 100644 index 000000000000..00bf61a6a587 --- /dev/null +++ b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s @@ -0,0 +1,270 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s Thu Jan 1 09:00:00 1970 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Fri May 20 11:21:13 2005 +@@ -0,0 +1,262 @@ ++ .text ++ ++.globl privateSnippetExecutorGeneral ++ .type privateSnippetExecutorGeneral,@function ++privateSnippetExecutorGeneral: ++.LFBg: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIg0: ++ movl %esp,%ebp ++.LCFIg1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEg: ++ .size privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral ++ ++.globl privateSnippetExecutorVoid ++ .type privateSnippetExecutorVoid,@function ++privateSnippetExecutorVoid: ++.LFBv: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIv0: ++ movl %esp,%ebp ++.LCFIv1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ leave ++ ret ++.LFEv: ++ .size privateSnippetExecutorVoid,.-privateSnippetExecutorVoid ++ ++.globl privateSnippetExecutorHyper ++ .type privateSnippetExecutorHyper,@function ++privateSnippetExecutorHyper: ++.LFBh: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIh0: ++ movl %esp,%ebp ++.LCFIh1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ movl 16(%esp),%edx # 64 bit nRegReturn, upper half ++ leave ++ ret ++.LFEh: ++ .size privateSnippetExecutorHyper,.-privateSnippetExecutorHyper ++ ++.globl privateSnippetExecutorFloat ++ .type privateSnippetExecutorFloat,@function ++privateSnippetExecutorFloat: ++.LFBf: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIf0: ++ movl %esp,%ebp ++.LCFIf1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ flds 12(%esp) # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEf: ++ .size privateSnippetExecutorFloat,.-privateSnippetExecutorFloat ++ ++.globl privateSnippetExecutorDouble ++ .type privateSnippetExecutorDouble,@function ++privateSnippetExecutorDouble: ++.LFBd: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFId0: ++ movl %esp,%ebp ++.LCFId1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ fldl 12(%esp) # 64 bit nRegReturn ++ leave ++ ret ++.LFEd: ++ .size privateSnippetExecutorDouble,.-privateSnippetExecutorDouble ++ ++.globl privateSnippetExecutorClass ++ .type privateSnippetExecutorClass,@function ++privateSnippetExecutorClass: ++.LFBc: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIc0: ++ movl %esp,%ebp ++.LCFIc1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret $4 ++.LFEc: ++ .size privateSnippetExecutorClass,.-privateSnippetExecutorClass ++ ++ .section .eh_frame,"a",@progbits ++.Lframe1: ++ .long .LECIE1-.LSCIE1 # length ++.LSCIE1: ++ .long 0 # CIE_ID ++ .byte 1 # version ++ .string "zR" # augmentation ++ .uleb128 1 # code_alignment_factor ++ .sleb128 -4 # data_alignment_factor ++ .byte 8 # return_address_register ++ .uleb128 1 # augmentation size 1: ++ .byte 0x1B # FDE Encoding (pcrel sdata4) ++ # initial_instructions: ++ .byte 0x0C # DW_CFA_def_cfa %esp, 4 ++ .uleb128 4 ++ .uleb128 4 ++ .byte 0x88 # DW_CFA_offset ret, 1 ++ .uleb128 1 ++ .align 4 ++.LECIE1: ++.LSFDEg: ++ .long .LEFDEg-.LASFDEg # length ++.LASFDEg: ++ .long .LASFDEg-.Lframe1 # CIE_pointer ++ .long .LFBg-. # initial_location ++ .long .LFEg-.LFBg # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg0-.LFBg ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg1-.LCFIg0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEg: ++.LSFDEv: ++ .long .LEFDEv-.LASFDEv # length ++.LASFDEv: ++ .long .LASFDEv-.Lframe1 # CIE_pointer ++ .long .LFBv-. # initial_location ++ .long .LFEv-.LFBv # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv0-.LFBv ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv1-.LCFIv0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEv: ++.LSFDEh: ++ .long .LEFDEh-.LASFDEh # length ++.LASFDEh: ++ .long .LASFDEh-.Lframe1 # CIE_pointer ++ .long .LFBh-. # initial_location ++ .long .LFEh-.LFBh # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh0-.LFBh ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh1-.LCFIh0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEh: ++.LSFDEf: ++ .long .LEFDEf-.LASFDEf # length ++.LASFDEf: ++ .long .LASFDEf-.Lframe1 # CIE_pointer ++ .long .LFBf-. # initial_location ++ .long .LFEf-.LFBf # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf0-.LFBf ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf1-.LCFIf0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEf: ++.LSFDEd: ++ .long .LEFDEd-.LASFDEd # length ++.LASFDEd: ++ .long .LASFDEd-.Lframe1 # CIE_pointer ++ .long .LFBd-. # initial_location ++ .long .LFEd-.LFBd # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId0-.LFBd ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId1-.LCFId0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEd: ++.LSFDEc: ++ .long .LEFDEc-.LASFDEc # length ++.LASFDEc: ++ .long .LASFDEc-.Lframe1 # CIE_pointer ++ .long .LFBc-. # initial_location ++ .long .LFEc-.LFBc # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc0-.LFBc ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc1-.LCFIc0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEc: diff --git a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx new file mode 100644 index 000000000000..e6e306b99efd --- /dev/null +++ b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx @@ -0,0 +1,285 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Jan 19 00:06:09 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Feb 21 21:13:28 2005 +@@ -77,7 +77,7 @@ + { + + //================================================================================================== +-static typelib_TypeClass cpp2uno_call( ++void cpp2uno_call( + bridges::cpp_uno::shared::CppInterfaceProxy * pThis, + const typelib_TypeDescription * pMemberTypeDescr, + typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return +@@ -209,8 +209,6 @@ + CPPU_CURRENT_NAMESPACE::raiseException( + &aUnoExc, pThis->getBridge()->getUno2Cpp() ); + // has to destruct the any +- // is here for dummy +- return typelib_TypeClass_VOID; + } + else // else no exception occured... + { +@@ -247,22 +245,16 @@ + } + if (pReturnTypeDescr) + { +- typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; + TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); +- return eRet; + } +- else +- return typelib_TypeClass_VOID; + } + } + + + //================================================================================================== +-static typelib_TypeClass cpp_mediate( +- sal_Int32 nFunctionIndex, +- sal_Int32 nVtableOffset, +- void ** pCallStack, +- sal_Int64 * pRegisterReturn /* space for register return */ ) ++extern "C" void cpp_vtable_call( ++ int nFunctionIndex, int nVtableOffset, void** pCallStack, ++ sal_Int64 nRegReturn ) + { + OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); + +@@ -298,7 +290,6 @@ + + TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); + +- typelib_TypeClass eRet; + switch (aMemberDescr.get()->eTypeClass) + { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: +@@ -306,11 +297,11 @@ + if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex) + { + // is GET method +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, + 0, 0, // no params +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + else + { +@@ -321,11 +312,11 @@ + aParam.bIn = sal_True; + aParam.bOut = sal_False; + +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + 0, // indicates void return + 1, &aParam, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -336,11 +327,9 @@ + { + case 1: // acquire() + pCppI->acquireProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 2: // release() + pCppI->releaseProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 0: // queryInterface() opt + { +@@ -361,20 +350,19 @@ + &pInterface, pTD, cpp_acquire ); + pInterface->release(); + TYPELIB_DANGER_RELEASE( pTD ); +- *(void **)pRegisterReturn = pCallStack[1]; +- eRet = typelib_TypeClass_ANY; ++ *(void **)&nRegReturn = pCallStack[1]; + break; + } + TYPELIB_DANGER_RELEASE( pTD ); + } + } // else perform queryInterface() + default: +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -383,72 +371,55 @@ + throw RuntimeException( + rtl::OUString::createFromAscii("no member description found!"), + (XInterface *)pThis ); +- // is here for dummy +- eRet = typelib_TypeClass_VOID; + } + } +- +- return eRet; + } + + //================================================================================================== +-/** +- * is called on incoming vtable calls +- * (called by asm snippets) +- */ +-static void cpp_vtable_call( +- int nFunctionIndex, int nVtableOffset, void** pCallStack ) +- __attribute__((regparm(3))); +- +-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack ) +-{ +- volatile long nRegReturn[2]; +- typelib_TypeClass aType = cpp_mediate( +- nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn ); +- +- switch( aType ) +- { +- case typelib_TypeClass_HYPER: +- case typelib_TypeClass_UNSIGNED_HYPER: +- __asm__( "movl %1, %%edx\n\t" +- "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); +- break; +- case typelib_TypeClass_FLOAT: +- __asm__( "flds %0\n\t" +- "fstp %%st(0)\n\t" +- "flds %0\n" +- : : "m"(*(float *)nRegReturn) ); +- break; +- case typelib_TypeClass_DOUBLE: +- __asm__( "fldl %0\n\t" +- "fstp %%st(0)\n\t" +- "fldl %0\n" +- : : "m"(*(double *)nRegReturn) ); +- break; +-// case typelib_TypeClass_UNSIGNED_SHORT: +-// case typelib_TypeClass_SHORT: +-// __asm__( "movswl %0, %%eax\n" +-// : : "m"(nRegReturn) ); +-// break; +- default: +- __asm__( "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]) ); +- break; +- } +-} +- ++extern "C" void privateSnippetExecutorGeneral(); ++extern "C" void privateSnippetExecutorVoid(); ++extern "C" void privateSnippetExecutorHyper(); ++extern "C" void privateSnippetExecutorFloat(); ++extern "C" void privateSnippetExecutorDouble(); ++extern "C" void privateSnippetExecutorClass(); ++extern "C" typedef void (*PrivateSnippetExecutor)(); + +-//================================================================================================== +-int const codeSnippetSize = 20; ++int const codeSnippetSize = 16; + + unsigned char * codeSnippet( + unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, +- bool simpleRetType) ++ typelib_TypeClass returnTypeClass) + { +- if (!simpleRetType) { ++ if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { + functionIndex |= 0x80000000; + } ++ PrivateSnippetExecutor exec; ++ switch (returnTypeClass) { ++ case typelib_TypeClass_VOID: ++ exec = privateSnippetExecutorVoid; ++ break; ++ case typelib_TypeClass_HYPER: ++ case typelib_TypeClass_UNSIGNED_HYPER: ++ exec = privateSnippetExecutorHyper; ++ break; ++ case typelib_TypeClass_FLOAT: ++ exec = privateSnippetExecutorFloat; ++ break; ++ case typelib_TypeClass_DOUBLE: ++ exec = privateSnippetExecutorDouble; ++ break; ++ case typelib_TypeClass_STRING: ++ case typelib_TypeClass_TYPE: ++ case typelib_TypeClass_ANY: ++ case typelib_TypeClass_SEQUENCE: ++ case typelib_TypeClass_STRUCT: ++ case typelib_TypeClass_INTERFACE: ++ exec = privateSnippetExecutorClass; ++ break; ++ default: ++ exec = privateSnippetExecutorGeneral; ++ break; ++ } + unsigned char * p = code; + OSL_ASSERT(sizeof (sal_Int32) == 4); + // mov function_index, %eax: +@@ -459,13 +430,10 @@ + *p++ = 0xBA; + *reinterpret_cast< sal_Int32 * >(p) = vtableOffset; + p += sizeof (sal_Int32); +- // mov %esp, %ecx: +- *p++ = 0x89; +- *p++ = 0xE1; +- // jmp cpp_vtable_call: ++ // jmp privateSnippetExecutor: + *p++ = 0xE9; + *reinterpret_cast< sal_Int32 * >(p) +- = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32); ++ = ((unsigned char *) exec) - p - sizeof (sal_Int32); + p += sizeof (sal_Int32); + OSL_ASSERT(p - code <= codeSnippetSize); + return code + codeSnippetSize; +@@ -504,17 +472,17 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceAttributeTypeDescription * >( +- member)->pAttributeTypeRef)); ++ reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( ++ member)->pAttributeTypeRef->eTypeClass); + // Setter: + if (!reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { + *slots++ = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ code = codeSnippet( ++ code, functionOffset++, vtableOffset, ++ typelib_TypeClass_VOID); + } + break; + +@@ -522,10 +490,8 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceMethodTypeDescription * >( +- member)->pReturnTypeRef)); ++ reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( ++ member)->pReturnTypeRef->eTypeClass); + break; + + default: diff --git a/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..6f6a3a0f3e13 --- /dev/null +++ b/editors/openoffice-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk @@ -0,0 +1,24 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk Fri May 20 11:14:36 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Fri May 20 11:16:09 2005 +@@ -87,7 +87,8 @@ + SLOFILES= \ + $(SLO)$/except.obj \ + $(SLO)$/cpp2uno.obj \ +- $(SLO)$/uno2cpp.obj ++ $(SLO)$/uno2cpp.obj \ ++ $(SLO)$/call.obj + + SHL1TARGET= $(TARGET) + +@@ -108,3 +109,6 @@ + + .INCLUDE : target.mk + ++$(SLO)$/%.obj: %.s ++ $(CC) -c -o $(SLO)$/$(@:b).o $< ++ touch $@ diff --git a/editors/openoffice-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch index 7cf03a50d0a5..ba324bf13dd3 100644 --- a/editors/openoffice-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch +++ b/editors/openoffice-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch @@ -3,47 +3,17 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct version number of resultant shared lib -Index: libxmlsec/xmlsec1-1.2.6.patch +Index: xmlsec1-1.2.6.patch =================================================================== RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v -retrieving revision 1.3 -diff -u -r1.3 xmlsec1-1.2.6.patch ---- libxmlsec/xmlsec1-1.2.6.patch 29 Mar 2005 11:45:08 -0000 1.3 -+++ libxmlsec/xmlsec1-1.2.6.patch 6 Apr 2005 04:46:13 -0000 -@@ -13957,3 +13957,61 @@ - XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib - - XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib -+*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 -+--- misc/build/xmlsec1-1.2.6/ltmain.sh Wed Apr 6 13:32:04 2005 -+*************** -+*** 2918,2929 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2918,2929 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +retrieving revision 1.5 +diff -u -r1.5 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 18 May 2005 10:11:24 -0000 1.5 ++++ libxmlsec/xmlsec1-1.2.6.patch 22 May 2005 01:43:49 -0000 +@@ -756,6 +756,35 @@ + *** misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 + --- misc/build/xmlsec1-1.2.6/ltmain.sh 2005-05-09 19:55:51.745319024 +0200 + *************** +*** 2994,3006 **** + ;; + @@ -72,3 +42,7 @@ diff -u -r1.3 xmlsec1-1.2.6.patch + ;; + + irix | nonstopux) ++*************** + *** 3564,3570 **** + fi + else diff --git a/editors/openoffice-3/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice-3/files/patch-sndfile+libsndfile-1.0.9.patch index 91d4cf4ce4b1..ea2d00a49c68 100644 --- a/editors/openoffice-3/files/patch-sndfile+libsndfile-1.0.9.patch +++ b/editors/openoffice-3/files/patch-sndfile+libsndfile-1.0.9.patch @@ -3,47 +3,20 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct shared lib number -Index: sndfile/libsndfile-1.0.9.patch +Index: libsndfile-1.0.9.patch =================================================================== RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v retrieving revision 1.1 diff -u -r1.1 libsndfile-1.0.9.patch --- sndfile/libsndfile-1.0.9.patch 6 Oct 2004 11:49:36 -0000 1.1 -+++ sndfile/libsndfile-1.0.9.patch 28 Mar 2005 07:59:15 -0000 -@@ -231,3 +231,51 @@ ++++ sndfile/libsndfile-1.0.9.patch 22 May 2005 02:01:17 -0000 +@@ -231,3 +231,24 @@ #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL +*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 13:02:07 2004 +--- misc/build/libsndfile-1.0.9/ltmain.sh Mon Mar 28 16:37:47 2005 +*************** -+*** 2899,2910 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2899,2910 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +*** 2980,2987 **** + ;; + diff --git a/editors/openoffice-3/files/patch-solenv b/editors/openoffice-3/files/patch-solenv deleted file mode 100644 index b1e86cebebdd..000000000000 --- a/editors/openoffice-3/files/patch-solenv +++ /dev/null @@ -1,35 +0,0 @@ -Issutracker : #i48304# -CWS : N/A -Author : NAKATA Maho (JCA) -Description : getuid.so is not req'ed for FreeBSD - -Index: bin/modules/installer/download.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/download.pm,v -retrieving revision 1.13 -diff -u -r1.13 download.pm ---- solenv/bin/modules/installer/download.pm 25 Apr 2005 11:55:33 -0000 1.13 -+++ solenv/bin/modules/installer/download.pm 28 Apr 2005 00:11:54 -0000 -@@ -189,9 +189,10 @@ - # my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |"; - - # $ENV{'LD_PRELOAD'} = $getuidlibrary; --# my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; -+#getuid.so is req'ed for Linux/Solaris? FreeBSD/MacOSX don't need it. -+ my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; - -- my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; -+# my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; - - my $sumoutput = ""; - -@@ -228,7 +229,8 @@ - - my $getuidlibraryname = "getuid.so"; - my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0); -- if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } -+# ad hock prohibiting error -+# if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } - - return $$getuidlibraryref; - } diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 15fe526efb13..80d5a832f6a2 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -19,8 +19,8 @@ COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(develo NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz MOZILLA_VERSION= 1.7.5 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) DISTFILES+= ${MOZILLA_SOURCE}:mozsrc .endif @@ -48,8 +48,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 103 -SNAPDATE= 20050512 +MILESTONE= 105 +SNAPDATE= 20050521 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo index 9c859bca1d4d..c308f56de99d 100644 --- a/editors/openoffice.org-2-RC/distinfo +++ b/editors/openoffice.org-2-RC/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 65c42ee71a3bca66ef38a332826f2ef7 -SIZE (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 214220004 +MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810 +SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s new file mode 100644 index 000000000000..00bf61a6a587 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s @@ -0,0 +1,270 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s Thu Jan 1 09:00:00 1970 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Fri May 20 11:21:13 2005 +@@ -0,0 +1,262 @@ ++ .text ++ ++.globl privateSnippetExecutorGeneral ++ .type privateSnippetExecutorGeneral,@function ++privateSnippetExecutorGeneral: ++.LFBg: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIg0: ++ movl %esp,%ebp ++.LCFIg1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEg: ++ .size privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral ++ ++.globl privateSnippetExecutorVoid ++ .type privateSnippetExecutorVoid,@function ++privateSnippetExecutorVoid: ++.LFBv: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIv0: ++ movl %esp,%ebp ++.LCFIv1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ leave ++ ret ++.LFEv: ++ .size privateSnippetExecutorVoid,.-privateSnippetExecutorVoid ++ ++.globl privateSnippetExecutorHyper ++ .type privateSnippetExecutorHyper,@function ++privateSnippetExecutorHyper: ++.LFBh: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIh0: ++ movl %esp,%ebp ++.LCFIh1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ movl 16(%esp),%edx # 64 bit nRegReturn, upper half ++ leave ++ ret ++.LFEh: ++ .size privateSnippetExecutorHyper,.-privateSnippetExecutorHyper ++ ++.globl privateSnippetExecutorFloat ++ .type privateSnippetExecutorFloat,@function ++privateSnippetExecutorFloat: ++.LFBf: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIf0: ++ movl %esp,%ebp ++.LCFIf1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ flds 12(%esp) # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEf: ++ .size privateSnippetExecutorFloat,.-privateSnippetExecutorFloat ++ ++.globl privateSnippetExecutorDouble ++ .type privateSnippetExecutorDouble,@function ++privateSnippetExecutorDouble: ++.LFBd: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFId0: ++ movl %esp,%ebp ++.LCFId1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ fldl 12(%esp) # 64 bit nRegReturn ++ leave ++ ret ++.LFEd: ++ .size privateSnippetExecutorDouble,.-privateSnippetExecutorDouble ++ ++.globl privateSnippetExecutorClass ++ .type privateSnippetExecutorClass,@function ++privateSnippetExecutorClass: ++.LFBc: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIc0: ++ movl %esp,%ebp ++.LCFIc1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret $4 ++.LFEc: ++ .size privateSnippetExecutorClass,.-privateSnippetExecutorClass ++ ++ .section .eh_frame,"a",@progbits ++.Lframe1: ++ .long .LECIE1-.LSCIE1 # length ++.LSCIE1: ++ .long 0 # CIE_ID ++ .byte 1 # version ++ .string "zR" # augmentation ++ .uleb128 1 # code_alignment_factor ++ .sleb128 -4 # data_alignment_factor ++ .byte 8 # return_address_register ++ .uleb128 1 # augmentation size 1: ++ .byte 0x1B # FDE Encoding (pcrel sdata4) ++ # initial_instructions: ++ .byte 0x0C # DW_CFA_def_cfa %esp, 4 ++ .uleb128 4 ++ .uleb128 4 ++ .byte 0x88 # DW_CFA_offset ret, 1 ++ .uleb128 1 ++ .align 4 ++.LECIE1: ++.LSFDEg: ++ .long .LEFDEg-.LASFDEg # length ++.LASFDEg: ++ .long .LASFDEg-.Lframe1 # CIE_pointer ++ .long .LFBg-. # initial_location ++ .long .LFEg-.LFBg # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg0-.LFBg ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg1-.LCFIg0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEg: ++.LSFDEv: ++ .long .LEFDEv-.LASFDEv # length ++.LASFDEv: ++ .long .LASFDEv-.Lframe1 # CIE_pointer ++ .long .LFBv-. # initial_location ++ .long .LFEv-.LFBv # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv0-.LFBv ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv1-.LCFIv0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEv: ++.LSFDEh: ++ .long .LEFDEh-.LASFDEh # length ++.LASFDEh: ++ .long .LASFDEh-.Lframe1 # CIE_pointer ++ .long .LFBh-. # initial_location ++ .long .LFEh-.LFBh # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh0-.LFBh ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh1-.LCFIh0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEh: ++.LSFDEf: ++ .long .LEFDEf-.LASFDEf # length ++.LASFDEf: ++ .long .LASFDEf-.Lframe1 # CIE_pointer ++ .long .LFBf-. # initial_location ++ .long .LFEf-.LFBf # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf0-.LFBf ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf1-.LCFIf0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEf: ++.LSFDEd: ++ .long .LEFDEd-.LASFDEd # length ++.LASFDEd: ++ .long .LASFDEd-.Lframe1 # CIE_pointer ++ .long .LFBd-. # initial_location ++ .long .LFEd-.LFBd # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId0-.LFBd ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId1-.LCFId0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEd: ++.LSFDEc: ++ .long .LEFDEc-.LASFDEc # length ++.LASFDEc: ++ .long .LASFDEc-.Lframe1 # CIE_pointer ++ .long .LFBc-. # initial_location ++ .long .LFEc-.LFBc # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc0-.LFBc ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc1-.LCFIc0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEc: diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx new file mode 100644 index 000000000000..e6e306b99efd --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx @@ -0,0 +1,285 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Jan 19 00:06:09 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Feb 21 21:13:28 2005 +@@ -77,7 +77,7 @@ + { + + //================================================================================================== +-static typelib_TypeClass cpp2uno_call( ++void cpp2uno_call( + bridges::cpp_uno::shared::CppInterfaceProxy * pThis, + const typelib_TypeDescription * pMemberTypeDescr, + typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return +@@ -209,8 +209,6 @@ + CPPU_CURRENT_NAMESPACE::raiseException( + &aUnoExc, pThis->getBridge()->getUno2Cpp() ); + // has to destruct the any +- // is here for dummy +- return typelib_TypeClass_VOID; + } + else // else no exception occured... + { +@@ -247,22 +245,16 @@ + } + if (pReturnTypeDescr) + { +- typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; + TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); +- return eRet; + } +- else +- return typelib_TypeClass_VOID; + } + } + + + //================================================================================================== +-static typelib_TypeClass cpp_mediate( +- sal_Int32 nFunctionIndex, +- sal_Int32 nVtableOffset, +- void ** pCallStack, +- sal_Int64 * pRegisterReturn /* space for register return */ ) ++extern "C" void cpp_vtable_call( ++ int nFunctionIndex, int nVtableOffset, void** pCallStack, ++ sal_Int64 nRegReturn ) + { + OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); + +@@ -298,7 +290,6 @@ + + TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); + +- typelib_TypeClass eRet; + switch (aMemberDescr.get()->eTypeClass) + { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: +@@ -306,11 +297,11 @@ + if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex) + { + // is GET method +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, + 0, 0, // no params +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + else + { +@@ -321,11 +312,11 @@ + aParam.bIn = sal_True; + aParam.bOut = sal_False; + +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + 0, // indicates void return + 1, &aParam, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -336,11 +327,9 @@ + { + case 1: // acquire() + pCppI->acquireProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 2: // release() + pCppI->releaseProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 0: // queryInterface() opt + { +@@ -361,20 +350,19 @@ + &pInterface, pTD, cpp_acquire ); + pInterface->release(); + TYPELIB_DANGER_RELEASE( pTD ); +- *(void **)pRegisterReturn = pCallStack[1]; +- eRet = typelib_TypeClass_ANY; ++ *(void **)&nRegReturn = pCallStack[1]; + break; + } + TYPELIB_DANGER_RELEASE( pTD ); + } + } // else perform queryInterface() + default: +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -383,72 +371,55 @@ + throw RuntimeException( + rtl::OUString::createFromAscii("no member description found!"), + (XInterface *)pThis ); +- // is here for dummy +- eRet = typelib_TypeClass_VOID; + } + } +- +- return eRet; + } + + //================================================================================================== +-/** +- * is called on incoming vtable calls +- * (called by asm snippets) +- */ +-static void cpp_vtable_call( +- int nFunctionIndex, int nVtableOffset, void** pCallStack ) +- __attribute__((regparm(3))); +- +-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack ) +-{ +- volatile long nRegReturn[2]; +- typelib_TypeClass aType = cpp_mediate( +- nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn ); +- +- switch( aType ) +- { +- case typelib_TypeClass_HYPER: +- case typelib_TypeClass_UNSIGNED_HYPER: +- __asm__( "movl %1, %%edx\n\t" +- "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); +- break; +- case typelib_TypeClass_FLOAT: +- __asm__( "flds %0\n\t" +- "fstp %%st(0)\n\t" +- "flds %0\n" +- : : "m"(*(float *)nRegReturn) ); +- break; +- case typelib_TypeClass_DOUBLE: +- __asm__( "fldl %0\n\t" +- "fstp %%st(0)\n\t" +- "fldl %0\n" +- : : "m"(*(double *)nRegReturn) ); +- break; +-// case typelib_TypeClass_UNSIGNED_SHORT: +-// case typelib_TypeClass_SHORT: +-// __asm__( "movswl %0, %%eax\n" +-// : : "m"(nRegReturn) ); +-// break; +- default: +- __asm__( "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]) ); +- break; +- } +-} +- ++extern "C" void privateSnippetExecutorGeneral(); ++extern "C" void privateSnippetExecutorVoid(); ++extern "C" void privateSnippetExecutorHyper(); ++extern "C" void privateSnippetExecutorFloat(); ++extern "C" void privateSnippetExecutorDouble(); ++extern "C" void privateSnippetExecutorClass(); ++extern "C" typedef void (*PrivateSnippetExecutor)(); + +-//================================================================================================== +-int const codeSnippetSize = 20; ++int const codeSnippetSize = 16; + + unsigned char * codeSnippet( + unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, +- bool simpleRetType) ++ typelib_TypeClass returnTypeClass) + { +- if (!simpleRetType) { ++ if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { + functionIndex |= 0x80000000; + } ++ PrivateSnippetExecutor exec; ++ switch (returnTypeClass) { ++ case typelib_TypeClass_VOID: ++ exec = privateSnippetExecutorVoid; ++ break; ++ case typelib_TypeClass_HYPER: ++ case typelib_TypeClass_UNSIGNED_HYPER: ++ exec = privateSnippetExecutorHyper; ++ break; ++ case typelib_TypeClass_FLOAT: ++ exec = privateSnippetExecutorFloat; ++ break; ++ case typelib_TypeClass_DOUBLE: ++ exec = privateSnippetExecutorDouble; ++ break; ++ case typelib_TypeClass_STRING: ++ case typelib_TypeClass_TYPE: ++ case typelib_TypeClass_ANY: ++ case typelib_TypeClass_SEQUENCE: ++ case typelib_TypeClass_STRUCT: ++ case typelib_TypeClass_INTERFACE: ++ exec = privateSnippetExecutorClass; ++ break; ++ default: ++ exec = privateSnippetExecutorGeneral; ++ break; ++ } + unsigned char * p = code; + OSL_ASSERT(sizeof (sal_Int32) == 4); + // mov function_index, %eax: +@@ -459,13 +430,10 @@ + *p++ = 0xBA; + *reinterpret_cast< sal_Int32 * >(p) = vtableOffset; + p += sizeof (sal_Int32); +- // mov %esp, %ecx: +- *p++ = 0x89; +- *p++ = 0xE1; +- // jmp cpp_vtable_call: ++ // jmp privateSnippetExecutor: + *p++ = 0xE9; + *reinterpret_cast< sal_Int32 * >(p) +- = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32); ++ = ((unsigned char *) exec) - p - sizeof (sal_Int32); + p += sizeof (sal_Int32); + OSL_ASSERT(p - code <= codeSnippetSize); + return code + codeSnippetSize; +@@ -504,17 +472,17 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceAttributeTypeDescription * >( +- member)->pAttributeTypeRef)); ++ reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( ++ member)->pAttributeTypeRef->eTypeClass); + // Setter: + if (!reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { + *slots++ = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ code = codeSnippet( ++ code, functionOffset++, vtableOffset, ++ typelib_TypeClass_VOID); + } + break; + +@@ -522,10 +490,8 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceMethodTypeDescription * >( +- member)->pReturnTypeRef)); ++ reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( ++ member)->pReturnTypeRef->eTypeClass); + break; + + default: diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..6f6a3a0f3e13 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk @@ -0,0 +1,24 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk Fri May 20 11:14:36 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Fri May 20 11:16:09 2005 +@@ -87,7 +87,8 @@ + SLOFILES= \ + $(SLO)$/except.obj \ + $(SLO)$/cpp2uno.obj \ +- $(SLO)$/uno2cpp.obj ++ $(SLO)$/uno2cpp.obj \ ++ $(SLO)$/call.obj + + SHL1TARGET= $(TARGET) + +@@ -108,3 +109,6 @@ + + .INCLUDE : target.mk + ++$(SLO)$/%.obj: %.s ++ $(CC) -c -o $(SLO)$/$(@:b).o $< ++ touch $@ diff --git a/editors/openoffice.org-2-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch index 7cf03a50d0a5..ba324bf13dd3 100644 --- a/editors/openoffice.org-2-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch +++ b/editors/openoffice.org-2-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch @@ -3,47 +3,17 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct version number of resultant shared lib -Index: libxmlsec/xmlsec1-1.2.6.patch +Index: xmlsec1-1.2.6.patch =================================================================== RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v -retrieving revision 1.3 -diff -u -r1.3 xmlsec1-1.2.6.patch ---- libxmlsec/xmlsec1-1.2.6.patch 29 Mar 2005 11:45:08 -0000 1.3 -+++ libxmlsec/xmlsec1-1.2.6.patch 6 Apr 2005 04:46:13 -0000 -@@ -13957,3 +13957,61 @@ - XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib - - XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib -+*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 -+--- misc/build/xmlsec1-1.2.6/ltmain.sh Wed Apr 6 13:32:04 2005 -+*************** -+*** 2918,2929 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2918,2929 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +retrieving revision 1.5 +diff -u -r1.5 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 18 May 2005 10:11:24 -0000 1.5 ++++ libxmlsec/xmlsec1-1.2.6.patch 22 May 2005 01:43:49 -0000 +@@ -756,6 +756,35 @@ + *** misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 + --- misc/build/xmlsec1-1.2.6/ltmain.sh 2005-05-09 19:55:51.745319024 +0200 + *************** +*** 2994,3006 **** + ;; + @@ -72,3 +42,7 @@ diff -u -r1.3 xmlsec1-1.2.6.patch + ;; + + irix | nonstopux) ++*************** + *** 3564,3570 **** + fi + else diff --git a/editors/openoffice.org-2-RC/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2-RC/files/patch-sndfile+libsndfile-1.0.9.patch index 91d4cf4ce4b1..ea2d00a49c68 100644 --- a/editors/openoffice.org-2-RC/files/patch-sndfile+libsndfile-1.0.9.patch +++ b/editors/openoffice.org-2-RC/files/patch-sndfile+libsndfile-1.0.9.patch @@ -3,47 +3,20 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct shared lib number -Index: sndfile/libsndfile-1.0.9.patch +Index: libsndfile-1.0.9.patch =================================================================== RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v retrieving revision 1.1 diff -u -r1.1 libsndfile-1.0.9.patch --- sndfile/libsndfile-1.0.9.patch 6 Oct 2004 11:49:36 -0000 1.1 -+++ sndfile/libsndfile-1.0.9.patch 28 Mar 2005 07:59:15 -0000 -@@ -231,3 +231,51 @@ ++++ sndfile/libsndfile-1.0.9.patch 22 May 2005 02:01:17 -0000 +@@ -231,3 +231,24 @@ #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL +*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 13:02:07 2004 +--- misc/build/libsndfile-1.0.9/ltmain.sh Mon Mar 28 16:37:47 2005 +*************** -+*** 2899,2910 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2899,2910 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +*** 2980,2987 **** + ;; + diff --git a/editors/openoffice.org-2-RC/files/patch-solenv b/editors/openoffice.org-2-RC/files/patch-solenv deleted file mode 100644 index b1e86cebebdd..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-solenv +++ /dev/null @@ -1,35 +0,0 @@ -Issutracker : #i48304# -CWS : N/A -Author : NAKATA Maho (JCA) -Description : getuid.so is not req'ed for FreeBSD - -Index: bin/modules/installer/download.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/download.pm,v -retrieving revision 1.13 -diff -u -r1.13 download.pm ---- solenv/bin/modules/installer/download.pm 25 Apr 2005 11:55:33 -0000 1.13 -+++ solenv/bin/modules/installer/download.pm 28 Apr 2005 00:11:54 -0000 -@@ -189,9 +189,10 @@ - # my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |"; - - # $ENV{'LD_PRELOAD'} = $getuidlibrary; --# my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; -+#getuid.so is req'ed for Linux/Solaris? FreeBSD/MacOSX don't need it. -+ my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; - -- my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; -+# my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; - - my $sumoutput = ""; - -@@ -228,7 +229,8 @@ - - my $getuidlibraryname = "getuid.so"; - my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0); -- if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } -+# ad hock prohibiting error -+# if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } - - return $$getuidlibraryref; - } diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 15fe526efb13..80d5a832f6a2 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -19,8 +19,8 @@ COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(develo NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz MOZILLA_VERSION= 1.7.5 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) DISTFILES+= ${MOZILLA_SOURCE}:mozsrc .endif @@ -48,8 +48,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 103 -SNAPDATE= 20050512 +MILESTONE= 105 +SNAPDATE= 20050521 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo index 9c859bca1d4d..c308f56de99d 100644 --- a/editors/openoffice.org-2-devel/distinfo +++ b/editors/openoffice.org-2-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 65c42ee71a3bca66ef38a332826f2ef7 -SIZE (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 214220004 +MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810 +SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s new file mode 100644 index 000000000000..00bf61a6a587 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s @@ -0,0 +1,270 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s Thu Jan 1 09:00:00 1970 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Fri May 20 11:21:13 2005 +@@ -0,0 +1,262 @@ ++ .text ++ ++.globl privateSnippetExecutorGeneral ++ .type privateSnippetExecutorGeneral,@function ++privateSnippetExecutorGeneral: ++.LFBg: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIg0: ++ movl %esp,%ebp ++.LCFIg1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEg: ++ .size privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral ++ ++.globl privateSnippetExecutorVoid ++ .type privateSnippetExecutorVoid,@function ++privateSnippetExecutorVoid: ++.LFBv: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIv0: ++ movl %esp,%ebp ++.LCFIv1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ leave ++ ret ++.LFEv: ++ .size privateSnippetExecutorVoid,.-privateSnippetExecutorVoid ++ ++.globl privateSnippetExecutorHyper ++ .type privateSnippetExecutorHyper,@function ++privateSnippetExecutorHyper: ++.LFBh: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIh0: ++ movl %esp,%ebp ++.LCFIh1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ movl 16(%esp),%edx # 64 bit nRegReturn, upper half ++ leave ++ ret ++.LFEh: ++ .size privateSnippetExecutorHyper,.-privateSnippetExecutorHyper ++ ++.globl privateSnippetExecutorFloat ++ .type privateSnippetExecutorFloat,@function ++privateSnippetExecutorFloat: ++.LFBf: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIf0: ++ movl %esp,%ebp ++.LCFIf1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ flds 12(%esp) # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEf: ++ .size privateSnippetExecutorFloat,.-privateSnippetExecutorFloat ++ ++.globl privateSnippetExecutorDouble ++ .type privateSnippetExecutorDouble,@function ++privateSnippetExecutorDouble: ++.LFBd: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFId0: ++ movl %esp,%ebp ++.LCFId1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ fldl 12(%esp) # 64 bit nRegReturn ++ leave ++ ret ++.LFEd: ++ .size privateSnippetExecutorDouble,.-privateSnippetExecutorDouble ++ ++.globl privateSnippetExecutorClass ++ .type privateSnippetExecutorClass,@function ++privateSnippetExecutorClass: ++.LFBc: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIc0: ++ movl %esp,%ebp ++.LCFIc1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret $4 ++.LFEc: ++ .size privateSnippetExecutorClass,.-privateSnippetExecutorClass ++ ++ .section .eh_frame,"a",@progbits ++.Lframe1: ++ .long .LECIE1-.LSCIE1 # length ++.LSCIE1: ++ .long 0 # CIE_ID ++ .byte 1 # version ++ .string "zR" # augmentation ++ .uleb128 1 # code_alignment_factor ++ .sleb128 -4 # data_alignment_factor ++ .byte 8 # return_address_register ++ .uleb128 1 # augmentation size 1: ++ .byte 0x1B # FDE Encoding (pcrel sdata4) ++ # initial_instructions: ++ .byte 0x0C # DW_CFA_def_cfa %esp, 4 ++ .uleb128 4 ++ .uleb128 4 ++ .byte 0x88 # DW_CFA_offset ret, 1 ++ .uleb128 1 ++ .align 4 ++.LECIE1: ++.LSFDEg: ++ .long .LEFDEg-.LASFDEg # length ++.LASFDEg: ++ .long .LASFDEg-.Lframe1 # CIE_pointer ++ .long .LFBg-. # initial_location ++ .long .LFEg-.LFBg # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg0-.LFBg ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg1-.LCFIg0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEg: ++.LSFDEv: ++ .long .LEFDEv-.LASFDEv # length ++.LASFDEv: ++ .long .LASFDEv-.Lframe1 # CIE_pointer ++ .long .LFBv-. # initial_location ++ .long .LFEv-.LFBv # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv0-.LFBv ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv1-.LCFIv0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEv: ++.LSFDEh: ++ .long .LEFDEh-.LASFDEh # length ++.LASFDEh: ++ .long .LASFDEh-.Lframe1 # CIE_pointer ++ .long .LFBh-. # initial_location ++ .long .LFEh-.LFBh # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh0-.LFBh ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh1-.LCFIh0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEh: ++.LSFDEf: ++ .long .LEFDEf-.LASFDEf # length ++.LASFDEf: ++ .long .LASFDEf-.Lframe1 # CIE_pointer ++ .long .LFBf-. # initial_location ++ .long .LFEf-.LFBf # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf0-.LFBf ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf1-.LCFIf0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEf: ++.LSFDEd: ++ .long .LEFDEd-.LASFDEd # length ++.LASFDEd: ++ .long .LASFDEd-.Lframe1 # CIE_pointer ++ .long .LFBd-. # initial_location ++ .long .LFEd-.LFBd # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId0-.LFBd ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId1-.LCFId0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEd: ++.LSFDEc: ++ .long .LEFDEc-.LASFDEc # length ++.LASFDEc: ++ .long .LASFDEc-.Lframe1 # CIE_pointer ++ .long .LFBc-. # initial_location ++ .long .LFEc-.LFBc # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc0-.LFBc ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc1-.LCFIc0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEc: diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx new file mode 100644 index 000000000000..e6e306b99efd --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx @@ -0,0 +1,285 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Jan 19 00:06:09 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Feb 21 21:13:28 2005 +@@ -77,7 +77,7 @@ + { + + //================================================================================================== +-static typelib_TypeClass cpp2uno_call( ++void cpp2uno_call( + bridges::cpp_uno::shared::CppInterfaceProxy * pThis, + const typelib_TypeDescription * pMemberTypeDescr, + typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return +@@ -209,8 +209,6 @@ + CPPU_CURRENT_NAMESPACE::raiseException( + &aUnoExc, pThis->getBridge()->getUno2Cpp() ); + // has to destruct the any +- // is here for dummy +- return typelib_TypeClass_VOID; + } + else // else no exception occured... + { +@@ -247,22 +245,16 @@ + } + if (pReturnTypeDescr) + { +- typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; + TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); +- return eRet; + } +- else +- return typelib_TypeClass_VOID; + } + } + + + //================================================================================================== +-static typelib_TypeClass cpp_mediate( +- sal_Int32 nFunctionIndex, +- sal_Int32 nVtableOffset, +- void ** pCallStack, +- sal_Int64 * pRegisterReturn /* space for register return */ ) ++extern "C" void cpp_vtable_call( ++ int nFunctionIndex, int nVtableOffset, void** pCallStack, ++ sal_Int64 nRegReturn ) + { + OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); + +@@ -298,7 +290,6 @@ + + TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); + +- typelib_TypeClass eRet; + switch (aMemberDescr.get()->eTypeClass) + { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: +@@ -306,11 +297,11 @@ + if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex) + { + // is GET method +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, + 0, 0, // no params +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + else + { +@@ -321,11 +312,11 @@ + aParam.bIn = sal_True; + aParam.bOut = sal_False; + +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + 0, // indicates void return + 1, &aParam, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -336,11 +327,9 @@ + { + case 1: // acquire() + pCppI->acquireProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 2: // release() + pCppI->releaseProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 0: // queryInterface() opt + { +@@ -361,20 +350,19 @@ + &pInterface, pTD, cpp_acquire ); + pInterface->release(); + TYPELIB_DANGER_RELEASE( pTD ); +- *(void **)pRegisterReturn = pCallStack[1]; +- eRet = typelib_TypeClass_ANY; ++ *(void **)&nRegReturn = pCallStack[1]; + break; + } + TYPELIB_DANGER_RELEASE( pTD ); + } + } // else perform queryInterface() + default: +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -383,72 +371,55 @@ + throw RuntimeException( + rtl::OUString::createFromAscii("no member description found!"), + (XInterface *)pThis ); +- // is here for dummy +- eRet = typelib_TypeClass_VOID; + } + } +- +- return eRet; + } + + //================================================================================================== +-/** +- * is called on incoming vtable calls +- * (called by asm snippets) +- */ +-static void cpp_vtable_call( +- int nFunctionIndex, int nVtableOffset, void** pCallStack ) +- __attribute__((regparm(3))); +- +-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack ) +-{ +- volatile long nRegReturn[2]; +- typelib_TypeClass aType = cpp_mediate( +- nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn ); +- +- switch( aType ) +- { +- case typelib_TypeClass_HYPER: +- case typelib_TypeClass_UNSIGNED_HYPER: +- __asm__( "movl %1, %%edx\n\t" +- "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); +- break; +- case typelib_TypeClass_FLOAT: +- __asm__( "flds %0\n\t" +- "fstp %%st(0)\n\t" +- "flds %0\n" +- : : "m"(*(float *)nRegReturn) ); +- break; +- case typelib_TypeClass_DOUBLE: +- __asm__( "fldl %0\n\t" +- "fstp %%st(0)\n\t" +- "fldl %0\n" +- : : "m"(*(double *)nRegReturn) ); +- break; +-// case typelib_TypeClass_UNSIGNED_SHORT: +-// case typelib_TypeClass_SHORT: +-// __asm__( "movswl %0, %%eax\n" +-// : : "m"(nRegReturn) ); +-// break; +- default: +- __asm__( "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]) ); +- break; +- } +-} +- ++extern "C" void privateSnippetExecutorGeneral(); ++extern "C" void privateSnippetExecutorVoid(); ++extern "C" void privateSnippetExecutorHyper(); ++extern "C" void privateSnippetExecutorFloat(); ++extern "C" void privateSnippetExecutorDouble(); ++extern "C" void privateSnippetExecutorClass(); ++extern "C" typedef void (*PrivateSnippetExecutor)(); + +-//================================================================================================== +-int const codeSnippetSize = 20; ++int const codeSnippetSize = 16; + + unsigned char * codeSnippet( + unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, +- bool simpleRetType) ++ typelib_TypeClass returnTypeClass) + { +- if (!simpleRetType) { ++ if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { + functionIndex |= 0x80000000; + } ++ PrivateSnippetExecutor exec; ++ switch (returnTypeClass) { ++ case typelib_TypeClass_VOID: ++ exec = privateSnippetExecutorVoid; ++ break; ++ case typelib_TypeClass_HYPER: ++ case typelib_TypeClass_UNSIGNED_HYPER: ++ exec = privateSnippetExecutorHyper; ++ break; ++ case typelib_TypeClass_FLOAT: ++ exec = privateSnippetExecutorFloat; ++ break; ++ case typelib_TypeClass_DOUBLE: ++ exec = privateSnippetExecutorDouble; ++ break; ++ case typelib_TypeClass_STRING: ++ case typelib_TypeClass_TYPE: ++ case typelib_TypeClass_ANY: ++ case typelib_TypeClass_SEQUENCE: ++ case typelib_TypeClass_STRUCT: ++ case typelib_TypeClass_INTERFACE: ++ exec = privateSnippetExecutorClass; ++ break; ++ default: ++ exec = privateSnippetExecutorGeneral; ++ break; ++ } + unsigned char * p = code; + OSL_ASSERT(sizeof (sal_Int32) == 4); + // mov function_index, %eax: +@@ -459,13 +430,10 @@ + *p++ = 0xBA; + *reinterpret_cast< sal_Int32 * >(p) = vtableOffset; + p += sizeof (sal_Int32); +- // mov %esp, %ecx: +- *p++ = 0x89; +- *p++ = 0xE1; +- // jmp cpp_vtable_call: ++ // jmp privateSnippetExecutor: + *p++ = 0xE9; + *reinterpret_cast< sal_Int32 * >(p) +- = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32); ++ = ((unsigned char *) exec) - p - sizeof (sal_Int32); + p += sizeof (sal_Int32); + OSL_ASSERT(p - code <= codeSnippetSize); + return code + codeSnippetSize; +@@ -504,17 +472,17 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceAttributeTypeDescription * >( +- member)->pAttributeTypeRef)); ++ reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( ++ member)->pAttributeTypeRef->eTypeClass); + // Setter: + if (!reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { + *slots++ = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ code = codeSnippet( ++ code, functionOffset++, vtableOffset, ++ typelib_TypeClass_VOID); + } + break; + +@@ -522,10 +490,8 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceMethodTypeDescription * >( +- member)->pReturnTypeRef)); ++ reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( ++ member)->pReturnTypeRef->eTypeClass); + break; + + default: diff --git a/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..6f6a3a0f3e13 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk @@ -0,0 +1,24 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk Fri May 20 11:14:36 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Fri May 20 11:16:09 2005 +@@ -87,7 +87,8 @@ + SLOFILES= \ + $(SLO)$/except.obj \ + $(SLO)$/cpp2uno.obj \ +- $(SLO)$/uno2cpp.obj ++ $(SLO)$/uno2cpp.obj \ ++ $(SLO)$/call.obj + + SHL1TARGET= $(TARGET) + +@@ -108,3 +109,6 @@ + + .INCLUDE : target.mk + ++$(SLO)$/%.obj: %.s ++ $(CC) -c -o $(SLO)$/$(@:b).o $< ++ touch $@ diff --git a/editors/openoffice.org-2-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch index 7cf03a50d0a5..ba324bf13dd3 100644 --- a/editors/openoffice.org-2-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch +++ b/editors/openoffice.org-2-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch @@ -3,47 +3,17 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct version number of resultant shared lib -Index: libxmlsec/xmlsec1-1.2.6.patch +Index: xmlsec1-1.2.6.patch =================================================================== RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v -retrieving revision 1.3 -diff -u -r1.3 xmlsec1-1.2.6.patch ---- libxmlsec/xmlsec1-1.2.6.patch 29 Mar 2005 11:45:08 -0000 1.3 -+++ libxmlsec/xmlsec1-1.2.6.patch 6 Apr 2005 04:46:13 -0000 -@@ -13957,3 +13957,61 @@ - XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib - - XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib -+*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 -+--- misc/build/xmlsec1-1.2.6/ltmain.sh Wed Apr 6 13:32:04 2005 -+*************** -+*** 2918,2929 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2918,2929 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +retrieving revision 1.5 +diff -u -r1.5 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 18 May 2005 10:11:24 -0000 1.5 ++++ libxmlsec/xmlsec1-1.2.6.patch 22 May 2005 01:43:49 -0000 +@@ -756,6 +756,35 @@ + *** misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 + --- misc/build/xmlsec1-1.2.6/ltmain.sh 2005-05-09 19:55:51.745319024 +0200 + *************** +*** 2994,3006 **** + ;; + @@ -72,3 +42,7 @@ diff -u -r1.3 xmlsec1-1.2.6.patch + ;; + + irix | nonstopux) ++*************** + *** 3564,3570 **** + fi + else diff --git a/editors/openoffice.org-2-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2-devel/files/patch-sndfile+libsndfile-1.0.9.patch index 91d4cf4ce4b1..ea2d00a49c68 100644 --- a/editors/openoffice.org-2-devel/files/patch-sndfile+libsndfile-1.0.9.patch +++ b/editors/openoffice.org-2-devel/files/patch-sndfile+libsndfile-1.0.9.patch @@ -3,47 +3,20 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct shared lib number -Index: sndfile/libsndfile-1.0.9.patch +Index: libsndfile-1.0.9.patch =================================================================== RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v retrieving revision 1.1 diff -u -r1.1 libsndfile-1.0.9.patch --- sndfile/libsndfile-1.0.9.patch 6 Oct 2004 11:49:36 -0000 1.1 -+++ sndfile/libsndfile-1.0.9.patch 28 Mar 2005 07:59:15 -0000 -@@ -231,3 +231,51 @@ ++++ sndfile/libsndfile-1.0.9.patch 22 May 2005 02:01:17 -0000 +@@ -231,3 +231,24 @@ #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL +*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 13:02:07 2004 +--- misc/build/libsndfile-1.0.9/ltmain.sh Mon Mar 28 16:37:47 2005 +*************** -+*** 2899,2910 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2899,2910 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +*** 2980,2987 **** + ;; + diff --git a/editors/openoffice.org-2-devel/files/patch-solenv b/editors/openoffice.org-2-devel/files/patch-solenv deleted file mode 100644 index b1e86cebebdd..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-solenv +++ /dev/null @@ -1,35 +0,0 @@ -Issutracker : #i48304# -CWS : N/A -Author : NAKATA Maho (JCA) -Description : getuid.so is not req'ed for FreeBSD - -Index: bin/modules/installer/download.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/download.pm,v -retrieving revision 1.13 -diff -u -r1.13 download.pm ---- solenv/bin/modules/installer/download.pm 25 Apr 2005 11:55:33 -0000 1.13 -+++ solenv/bin/modules/installer/download.pm 28 Apr 2005 00:11:54 -0000 -@@ -189,9 +189,10 @@ - # my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |"; - - # $ENV{'LD_PRELOAD'} = $getuidlibrary; --# my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; -+#getuid.so is req'ed for Linux/Solaris? FreeBSD/MacOSX don't need it. -+ my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; - -- my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; -+# my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; - - my $sumoutput = ""; - -@@ -228,7 +229,8 @@ - - my $getuidlibraryname = "getuid.so"; - my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0); -- if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } -+# ad hock prohibiting error -+# if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } - - return $$getuidlibraryref; - } diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index 15fe526efb13..80d5a832f6a2 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -19,8 +19,8 @@ COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(develo NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz MOZILLA_VERSION= 1.7.5 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) DISTFILES+= ${MOZILLA_SOURCE}:mozsrc .endif @@ -48,8 +48,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 103 -SNAPDATE= 20050512 +MILESTONE= 105 +SNAPDATE= 20050521 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo index 9c859bca1d4d..c308f56de99d 100644 --- a/editors/openoffice.org-2.0-devel/distinfo +++ b/editors/openoffice.org-2.0-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 65c42ee71a3bca66ef38a332826f2ef7 -SIZE (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 214220004 +MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810 +SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s new file mode 100644 index 000000000000..00bf61a6a587 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s @@ -0,0 +1,270 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s Thu Jan 1 09:00:00 1970 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Fri May 20 11:21:13 2005 +@@ -0,0 +1,262 @@ ++ .text ++ ++.globl privateSnippetExecutorGeneral ++ .type privateSnippetExecutorGeneral,@function ++privateSnippetExecutorGeneral: ++.LFBg: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIg0: ++ movl %esp,%ebp ++.LCFIg1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEg: ++ .size privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral ++ ++.globl privateSnippetExecutorVoid ++ .type privateSnippetExecutorVoid,@function ++privateSnippetExecutorVoid: ++.LFBv: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIv0: ++ movl %esp,%ebp ++.LCFIv1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ leave ++ ret ++.LFEv: ++ .size privateSnippetExecutorVoid,.-privateSnippetExecutorVoid ++ ++.globl privateSnippetExecutorHyper ++ .type privateSnippetExecutorHyper,@function ++privateSnippetExecutorHyper: ++.LFBh: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIh0: ++ movl %esp,%ebp ++.LCFIh1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ movl 16(%esp),%edx # 64 bit nRegReturn, upper half ++ leave ++ ret ++.LFEh: ++ .size privateSnippetExecutorHyper,.-privateSnippetExecutorHyper ++ ++.globl privateSnippetExecutorFloat ++ .type privateSnippetExecutorFloat,@function ++privateSnippetExecutorFloat: ++.LFBf: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIf0: ++ movl %esp,%ebp ++.LCFIf1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ flds 12(%esp) # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEf: ++ .size privateSnippetExecutorFloat,.-privateSnippetExecutorFloat ++ ++.globl privateSnippetExecutorDouble ++ .type privateSnippetExecutorDouble,@function ++privateSnippetExecutorDouble: ++.LFBd: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFId0: ++ movl %esp,%ebp ++.LCFId1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ fldl 12(%esp) # 64 bit nRegReturn ++ leave ++ ret ++.LFEd: ++ .size privateSnippetExecutorDouble,.-privateSnippetExecutorDouble ++ ++.globl privateSnippetExecutorClass ++ .type privateSnippetExecutorClass,@function ++privateSnippetExecutorClass: ++.LFBc: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIc0: ++ movl %esp,%ebp ++.LCFIc1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret $4 ++.LFEc: ++ .size privateSnippetExecutorClass,.-privateSnippetExecutorClass ++ ++ .section .eh_frame,"a",@progbits ++.Lframe1: ++ .long .LECIE1-.LSCIE1 # length ++.LSCIE1: ++ .long 0 # CIE_ID ++ .byte 1 # version ++ .string "zR" # augmentation ++ .uleb128 1 # code_alignment_factor ++ .sleb128 -4 # data_alignment_factor ++ .byte 8 # return_address_register ++ .uleb128 1 # augmentation size 1: ++ .byte 0x1B # FDE Encoding (pcrel sdata4) ++ # initial_instructions: ++ .byte 0x0C # DW_CFA_def_cfa %esp, 4 ++ .uleb128 4 ++ .uleb128 4 ++ .byte 0x88 # DW_CFA_offset ret, 1 ++ .uleb128 1 ++ .align 4 ++.LECIE1: ++.LSFDEg: ++ .long .LEFDEg-.LASFDEg # length ++.LASFDEg: ++ .long .LASFDEg-.Lframe1 # CIE_pointer ++ .long .LFBg-. # initial_location ++ .long .LFEg-.LFBg # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg0-.LFBg ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg1-.LCFIg0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEg: ++.LSFDEv: ++ .long .LEFDEv-.LASFDEv # length ++.LASFDEv: ++ .long .LASFDEv-.Lframe1 # CIE_pointer ++ .long .LFBv-. # initial_location ++ .long .LFEv-.LFBv # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv0-.LFBv ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv1-.LCFIv0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEv: ++.LSFDEh: ++ .long .LEFDEh-.LASFDEh # length ++.LASFDEh: ++ .long .LASFDEh-.Lframe1 # CIE_pointer ++ .long .LFBh-. # initial_location ++ .long .LFEh-.LFBh # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh0-.LFBh ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh1-.LCFIh0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEh: ++.LSFDEf: ++ .long .LEFDEf-.LASFDEf # length ++.LASFDEf: ++ .long .LASFDEf-.Lframe1 # CIE_pointer ++ .long .LFBf-. # initial_location ++ .long .LFEf-.LFBf # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf0-.LFBf ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf1-.LCFIf0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEf: ++.LSFDEd: ++ .long .LEFDEd-.LASFDEd # length ++.LASFDEd: ++ .long .LASFDEd-.Lframe1 # CIE_pointer ++ .long .LFBd-. # initial_location ++ .long .LFEd-.LFBd # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId0-.LFBd ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId1-.LCFId0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEd: ++.LSFDEc: ++ .long .LEFDEc-.LASFDEc # length ++.LASFDEc: ++ .long .LASFDEc-.Lframe1 # CIE_pointer ++ .long .LFBc-. # initial_location ++ .long .LFEc-.LFBc # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc0-.LFBc ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc1-.LCFIc0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEc: diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx new file mode 100644 index 000000000000..e6e306b99efd --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx @@ -0,0 +1,285 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Jan 19 00:06:09 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Feb 21 21:13:28 2005 +@@ -77,7 +77,7 @@ + { + + //================================================================================================== +-static typelib_TypeClass cpp2uno_call( ++void cpp2uno_call( + bridges::cpp_uno::shared::CppInterfaceProxy * pThis, + const typelib_TypeDescription * pMemberTypeDescr, + typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return +@@ -209,8 +209,6 @@ + CPPU_CURRENT_NAMESPACE::raiseException( + &aUnoExc, pThis->getBridge()->getUno2Cpp() ); + // has to destruct the any +- // is here for dummy +- return typelib_TypeClass_VOID; + } + else // else no exception occured... + { +@@ -247,22 +245,16 @@ + } + if (pReturnTypeDescr) + { +- typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; + TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); +- return eRet; + } +- else +- return typelib_TypeClass_VOID; + } + } + + + //================================================================================================== +-static typelib_TypeClass cpp_mediate( +- sal_Int32 nFunctionIndex, +- sal_Int32 nVtableOffset, +- void ** pCallStack, +- sal_Int64 * pRegisterReturn /* space for register return */ ) ++extern "C" void cpp_vtable_call( ++ int nFunctionIndex, int nVtableOffset, void** pCallStack, ++ sal_Int64 nRegReturn ) + { + OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); + +@@ -298,7 +290,6 @@ + + TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); + +- typelib_TypeClass eRet; + switch (aMemberDescr.get()->eTypeClass) + { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: +@@ -306,11 +297,11 @@ + if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex) + { + // is GET method +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, + 0, 0, // no params +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + else + { +@@ -321,11 +312,11 @@ + aParam.bIn = sal_True; + aParam.bOut = sal_False; + +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + 0, // indicates void return + 1, &aParam, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -336,11 +327,9 @@ + { + case 1: // acquire() + pCppI->acquireProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 2: // release() + pCppI->releaseProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 0: // queryInterface() opt + { +@@ -361,20 +350,19 @@ + &pInterface, pTD, cpp_acquire ); + pInterface->release(); + TYPELIB_DANGER_RELEASE( pTD ); +- *(void **)pRegisterReturn = pCallStack[1]; +- eRet = typelib_TypeClass_ANY; ++ *(void **)&nRegReturn = pCallStack[1]; + break; + } + TYPELIB_DANGER_RELEASE( pTD ); + } + } // else perform queryInterface() + default: +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -383,72 +371,55 @@ + throw RuntimeException( + rtl::OUString::createFromAscii("no member description found!"), + (XInterface *)pThis ); +- // is here for dummy +- eRet = typelib_TypeClass_VOID; + } + } +- +- return eRet; + } + + //================================================================================================== +-/** +- * is called on incoming vtable calls +- * (called by asm snippets) +- */ +-static void cpp_vtable_call( +- int nFunctionIndex, int nVtableOffset, void** pCallStack ) +- __attribute__((regparm(3))); +- +-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack ) +-{ +- volatile long nRegReturn[2]; +- typelib_TypeClass aType = cpp_mediate( +- nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn ); +- +- switch( aType ) +- { +- case typelib_TypeClass_HYPER: +- case typelib_TypeClass_UNSIGNED_HYPER: +- __asm__( "movl %1, %%edx\n\t" +- "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); +- break; +- case typelib_TypeClass_FLOAT: +- __asm__( "flds %0\n\t" +- "fstp %%st(0)\n\t" +- "flds %0\n" +- : : "m"(*(float *)nRegReturn) ); +- break; +- case typelib_TypeClass_DOUBLE: +- __asm__( "fldl %0\n\t" +- "fstp %%st(0)\n\t" +- "fldl %0\n" +- : : "m"(*(double *)nRegReturn) ); +- break; +-// case typelib_TypeClass_UNSIGNED_SHORT: +-// case typelib_TypeClass_SHORT: +-// __asm__( "movswl %0, %%eax\n" +-// : : "m"(nRegReturn) ); +-// break; +- default: +- __asm__( "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]) ); +- break; +- } +-} +- ++extern "C" void privateSnippetExecutorGeneral(); ++extern "C" void privateSnippetExecutorVoid(); ++extern "C" void privateSnippetExecutorHyper(); ++extern "C" void privateSnippetExecutorFloat(); ++extern "C" void privateSnippetExecutorDouble(); ++extern "C" void privateSnippetExecutorClass(); ++extern "C" typedef void (*PrivateSnippetExecutor)(); + +-//================================================================================================== +-int const codeSnippetSize = 20; ++int const codeSnippetSize = 16; + + unsigned char * codeSnippet( + unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, +- bool simpleRetType) ++ typelib_TypeClass returnTypeClass) + { +- if (!simpleRetType) { ++ if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { + functionIndex |= 0x80000000; + } ++ PrivateSnippetExecutor exec; ++ switch (returnTypeClass) { ++ case typelib_TypeClass_VOID: ++ exec = privateSnippetExecutorVoid; ++ break; ++ case typelib_TypeClass_HYPER: ++ case typelib_TypeClass_UNSIGNED_HYPER: ++ exec = privateSnippetExecutorHyper; ++ break; ++ case typelib_TypeClass_FLOAT: ++ exec = privateSnippetExecutorFloat; ++ break; ++ case typelib_TypeClass_DOUBLE: ++ exec = privateSnippetExecutorDouble; ++ break; ++ case typelib_TypeClass_STRING: ++ case typelib_TypeClass_TYPE: ++ case typelib_TypeClass_ANY: ++ case typelib_TypeClass_SEQUENCE: ++ case typelib_TypeClass_STRUCT: ++ case typelib_TypeClass_INTERFACE: ++ exec = privateSnippetExecutorClass; ++ break; ++ default: ++ exec = privateSnippetExecutorGeneral; ++ break; ++ } + unsigned char * p = code; + OSL_ASSERT(sizeof (sal_Int32) == 4); + // mov function_index, %eax: +@@ -459,13 +430,10 @@ + *p++ = 0xBA; + *reinterpret_cast< sal_Int32 * >(p) = vtableOffset; + p += sizeof (sal_Int32); +- // mov %esp, %ecx: +- *p++ = 0x89; +- *p++ = 0xE1; +- // jmp cpp_vtable_call: ++ // jmp privateSnippetExecutor: + *p++ = 0xE9; + *reinterpret_cast< sal_Int32 * >(p) +- = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32); ++ = ((unsigned char *) exec) - p - sizeof (sal_Int32); + p += sizeof (sal_Int32); + OSL_ASSERT(p - code <= codeSnippetSize); + return code + codeSnippetSize; +@@ -504,17 +472,17 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceAttributeTypeDescription * >( +- member)->pAttributeTypeRef)); ++ reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( ++ member)->pAttributeTypeRef->eTypeClass); + // Setter: + if (!reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { + *slots++ = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ code = codeSnippet( ++ code, functionOffset++, vtableOffset, ++ typelib_TypeClass_VOID); + } + break; + +@@ -522,10 +490,8 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceMethodTypeDescription * >( +- member)->pReturnTypeRef)); ++ reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( ++ member)->pReturnTypeRef->eTypeClass); + break; + + default: diff --git a/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..6f6a3a0f3e13 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk @@ -0,0 +1,24 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk Fri May 20 11:14:36 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Fri May 20 11:16:09 2005 +@@ -87,7 +87,8 @@ + SLOFILES= \ + $(SLO)$/except.obj \ + $(SLO)$/cpp2uno.obj \ +- $(SLO)$/uno2cpp.obj ++ $(SLO)$/uno2cpp.obj \ ++ $(SLO)$/call.obj + + SHL1TARGET= $(TARGET) + +@@ -108,3 +109,6 @@ + + .INCLUDE : target.mk + ++$(SLO)$/%.obj: %.s ++ $(CC) -c -o $(SLO)$/$(@:b).o $< ++ touch $@ diff --git a/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch index 7cf03a50d0a5..ba324bf13dd3 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch +++ b/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch @@ -3,47 +3,17 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct version number of resultant shared lib -Index: libxmlsec/xmlsec1-1.2.6.patch +Index: xmlsec1-1.2.6.patch =================================================================== RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v -retrieving revision 1.3 -diff -u -r1.3 xmlsec1-1.2.6.patch ---- libxmlsec/xmlsec1-1.2.6.patch 29 Mar 2005 11:45:08 -0000 1.3 -+++ libxmlsec/xmlsec1-1.2.6.patch 6 Apr 2005 04:46:13 -0000 -@@ -13957,3 +13957,61 @@ - XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib - - XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib -+*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 -+--- misc/build/xmlsec1-1.2.6/ltmain.sh Wed Apr 6 13:32:04 2005 -+*************** -+*** 2918,2929 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2918,2929 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +retrieving revision 1.5 +diff -u -r1.5 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 18 May 2005 10:11:24 -0000 1.5 ++++ libxmlsec/xmlsec1-1.2.6.patch 22 May 2005 01:43:49 -0000 +@@ -756,6 +756,35 @@ + *** misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 + --- misc/build/xmlsec1-1.2.6/ltmain.sh 2005-05-09 19:55:51.745319024 +0200 + *************** +*** 2994,3006 **** + ;; + @@ -72,3 +42,7 @@ diff -u -r1.3 xmlsec1-1.2.6.patch + ;; + + irix | nonstopux) ++*************** + *** 3564,3570 **** + fi + else diff --git a/editors/openoffice.org-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch index 91d4cf4ce4b1..ea2d00a49c68 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch +++ b/editors/openoffice.org-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch @@ -3,47 +3,20 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct shared lib number -Index: sndfile/libsndfile-1.0.9.patch +Index: libsndfile-1.0.9.patch =================================================================== RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v retrieving revision 1.1 diff -u -r1.1 libsndfile-1.0.9.patch --- sndfile/libsndfile-1.0.9.patch 6 Oct 2004 11:49:36 -0000 1.1 -+++ sndfile/libsndfile-1.0.9.patch 28 Mar 2005 07:59:15 -0000 -@@ -231,3 +231,51 @@ ++++ sndfile/libsndfile-1.0.9.patch 22 May 2005 02:01:17 -0000 +@@ -231,3 +231,24 @@ #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL +*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 13:02:07 2004 +--- misc/build/libsndfile-1.0.9/ltmain.sh Mon Mar 28 16:37:47 2005 +*************** -+*** 2899,2910 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2899,2910 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +*** 2980,2987 **** + ;; + diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv b/editors/openoffice.org-2.0-devel/files/patch-solenv deleted file mode 100644 index b1e86cebebdd..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-solenv +++ /dev/null @@ -1,35 +0,0 @@ -Issutracker : #i48304# -CWS : N/A -Author : NAKATA Maho (JCA) -Description : getuid.so is not req'ed for FreeBSD - -Index: bin/modules/installer/download.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/download.pm,v -retrieving revision 1.13 -diff -u -r1.13 download.pm ---- solenv/bin/modules/installer/download.pm 25 Apr 2005 11:55:33 -0000 1.13 -+++ solenv/bin/modules/installer/download.pm 28 Apr 2005 00:11:54 -0000 -@@ -189,9 +189,10 @@ - # my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |"; - - # $ENV{'LD_PRELOAD'} = $getuidlibrary; --# my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; -+#getuid.so is req'ed for Linux/Solaris? FreeBSD/MacOSX don't need it. -+ my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; - -- my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; -+# my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; - - my $sumoutput = ""; - -@@ -228,7 +229,8 @@ - - my $getuidlibraryname = "getuid.so"; - my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0); -- if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } -+# ad hock prohibiting error -+# if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } - - return $$getuidlibraryref; - } diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index 15fe526efb13..80d5a832f6a2 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -19,8 +19,8 @@ COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(develo NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz MOZILLA_VERSION= 1.7.5 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) DISTFILES+= ${MOZILLA_SOURCE}:mozsrc .endif @@ -48,8 +48,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 103 -SNAPDATE= 20050512 +MILESTONE= 105 +SNAPDATE= 20050521 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo index 9c859bca1d4d..c308f56de99d 100644 --- a/editors/openoffice.org-2.0/distinfo +++ b/editors/openoffice.org-2.0/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 65c42ee71a3bca66ef38a332826f2ef7 -SIZE (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 214220004 +MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810 +SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 diff --git a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s new file mode 100644 index 000000000000..00bf61a6a587 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s @@ -0,0 +1,270 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s Thu Jan 1 09:00:00 1970 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Fri May 20 11:21:13 2005 +@@ -0,0 +1,262 @@ ++ .text ++ ++.globl privateSnippetExecutorGeneral ++ .type privateSnippetExecutorGeneral,@function ++privateSnippetExecutorGeneral: ++.LFBg: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIg0: ++ movl %esp,%ebp ++.LCFIg1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEg: ++ .size privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral ++ ++.globl privateSnippetExecutorVoid ++ .type privateSnippetExecutorVoid,@function ++privateSnippetExecutorVoid: ++.LFBv: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIv0: ++ movl %esp,%ebp ++.LCFIv1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ leave ++ ret ++.LFEv: ++ .size privateSnippetExecutorVoid,.-privateSnippetExecutorVoid ++ ++.globl privateSnippetExecutorHyper ++ .type privateSnippetExecutorHyper,@function ++privateSnippetExecutorHyper: ++.LFBh: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIh0: ++ movl %esp,%ebp ++.LCFIh1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ movl 16(%esp),%edx # 64 bit nRegReturn, upper half ++ leave ++ ret ++.LFEh: ++ .size privateSnippetExecutorHyper,.-privateSnippetExecutorHyper ++ ++.globl privateSnippetExecutorFloat ++ .type privateSnippetExecutorFloat,@function ++privateSnippetExecutorFloat: ++.LFBf: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIf0: ++ movl %esp,%ebp ++.LCFIf1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ flds 12(%esp) # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEf: ++ .size privateSnippetExecutorFloat,.-privateSnippetExecutorFloat ++ ++.globl privateSnippetExecutorDouble ++ .type privateSnippetExecutorDouble,@function ++privateSnippetExecutorDouble: ++.LFBd: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFId0: ++ movl %esp,%ebp ++.LCFId1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ fldl 12(%esp) # 64 bit nRegReturn ++ leave ++ ret ++.LFEd: ++ .size privateSnippetExecutorDouble,.-privateSnippetExecutorDouble ++ ++.globl privateSnippetExecutorClass ++ .type privateSnippetExecutorClass,@function ++privateSnippetExecutorClass: ++.LFBc: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIc0: ++ movl %esp,%ebp ++.LCFIc1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret $4 ++.LFEc: ++ .size privateSnippetExecutorClass,.-privateSnippetExecutorClass ++ ++ .section .eh_frame,"a",@progbits ++.Lframe1: ++ .long .LECIE1-.LSCIE1 # length ++.LSCIE1: ++ .long 0 # CIE_ID ++ .byte 1 # version ++ .string "zR" # augmentation ++ .uleb128 1 # code_alignment_factor ++ .sleb128 -4 # data_alignment_factor ++ .byte 8 # return_address_register ++ .uleb128 1 # augmentation size 1: ++ .byte 0x1B # FDE Encoding (pcrel sdata4) ++ # initial_instructions: ++ .byte 0x0C # DW_CFA_def_cfa %esp, 4 ++ .uleb128 4 ++ .uleb128 4 ++ .byte 0x88 # DW_CFA_offset ret, 1 ++ .uleb128 1 ++ .align 4 ++.LECIE1: ++.LSFDEg: ++ .long .LEFDEg-.LASFDEg # length ++.LASFDEg: ++ .long .LASFDEg-.Lframe1 # CIE_pointer ++ .long .LFBg-. # initial_location ++ .long .LFEg-.LFBg # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg0-.LFBg ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg1-.LCFIg0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEg: ++.LSFDEv: ++ .long .LEFDEv-.LASFDEv # length ++.LASFDEv: ++ .long .LASFDEv-.Lframe1 # CIE_pointer ++ .long .LFBv-. # initial_location ++ .long .LFEv-.LFBv # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv0-.LFBv ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv1-.LCFIv0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEv: ++.LSFDEh: ++ .long .LEFDEh-.LASFDEh # length ++.LASFDEh: ++ .long .LASFDEh-.Lframe1 # CIE_pointer ++ .long .LFBh-. # initial_location ++ .long .LFEh-.LFBh # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh0-.LFBh ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh1-.LCFIh0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEh: ++.LSFDEf: ++ .long .LEFDEf-.LASFDEf # length ++.LASFDEf: ++ .long .LASFDEf-.Lframe1 # CIE_pointer ++ .long .LFBf-. # initial_location ++ .long .LFEf-.LFBf # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf0-.LFBf ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf1-.LCFIf0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEf: ++.LSFDEd: ++ .long .LEFDEd-.LASFDEd # length ++.LASFDEd: ++ .long .LASFDEd-.Lframe1 # CIE_pointer ++ .long .LFBd-. # initial_location ++ .long .LFEd-.LFBd # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId0-.LFBd ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId1-.LCFId0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEd: ++.LSFDEc: ++ .long .LEFDEc-.LASFDEc # length ++.LASFDEc: ++ .long .LASFDEc-.Lframe1 # CIE_pointer ++ .long .LFBc-. # initial_location ++ .long .LFEc-.LFBc # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc0-.LFBc ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc1-.LCFIc0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEc: diff --git a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx new file mode 100644 index 000000000000..e6e306b99efd --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx @@ -0,0 +1,285 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Jan 19 00:06:09 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Feb 21 21:13:28 2005 +@@ -77,7 +77,7 @@ + { + + //================================================================================================== +-static typelib_TypeClass cpp2uno_call( ++void cpp2uno_call( + bridges::cpp_uno::shared::CppInterfaceProxy * pThis, + const typelib_TypeDescription * pMemberTypeDescr, + typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return +@@ -209,8 +209,6 @@ + CPPU_CURRENT_NAMESPACE::raiseException( + &aUnoExc, pThis->getBridge()->getUno2Cpp() ); + // has to destruct the any +- // is here for dummy +- return typelib_TypeClass_VOID; + } + else // else no exception occured... + { +@@ -247,22 +245,16 @@ + } + if (pReturnTypeDescr) + { +- typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; + TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); +- return eRet; + } +- else +- return typelib_TypeClass_VOID; + } + } + + + //================================================================================================== +-static typelib_TypeClass cpp_mediate( +- sal_Int32 nFunctionIndex, +- sal_Int32 nVtableOffset, +- void ** pCallStack, +- sal_Int64 * pRegisterReturn /* space for register return */ ) ++extern "C" void cpp_vtable_call( ++ int nFunctionIndex, int nVtableOffset, void** pCallStack, ++ sal_Int64 nRegReturn ) + { + OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); + +@@ -298,7 +290,6 @@ + + TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); + +- typelib_TypeClass eRet; + switch (aMemberDescr.get()->eTypeClass) + { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: +@@ -306,11 +297,11 @@ + if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex) + { + // is GET method +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, + 0, 0, // no params +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + else + { +@@ -321,11 +312,11 @@ + aParam.bIn = sal_True; + aParam.bOut = sal_False; + +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + 0, // indicates void return + 1, &aParam, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -336,11 +327,9 @@ + { + case 1: // acquire() + pCppI->acquireProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 2: // release() + pCppI->releaseProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 0: // queryInterface() opt + { +@@ -361,20 +350,19 @@ + &pInterface, pTD, cpp_acquire ); + pInterface->release(); + TYPELIB_DANGER_RELEASE( pTD ); +- *(void **)pRegisterReturn = pCallStack[1]; +- eRet = typelib_TypeClass_ANY; ++ *(void **)&nRegReturn = pCallStack[1]; + break; + } + TYPELIB_DANGER_RELEASE( pTD ); + } + } // else perform queryInterface() + default: +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -383,72 +371,55 @@ + throw RuntimeException( + rtl::OUString::createFromAscii("no member description found!"), + (XInterface *)pThis ); +- // is here for dummy +- eRet = typelib_TypeClass_VOID; + } + } +- +- return eRet; + } + + //================================================================================================== +-/** +- * is called on incoming vtable calls +- * (called by asm snippets) +- */ +-static void cpp_vtable_call( +- int nFunctionIndex, int nVtableOffset, void** pCallStack ) +- __attribute__((regparm(3))); +- +-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack ) +-{ +- volatile long nRegReturn[2]; +- typelib_TypeClass aType = cpp_mediate( +- nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn ); +- +- switch( aType ) +- { +- case typelib_TypeClass_HYPER: +- case typelib_TypeClass_UNSIGNED_HYPER: +- __asm__( "movl %1, %%edx\n\t" +- "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); +- break; +- case typelib_TypeClass_FLOAT: +- __asm__( "flds %0\n\t" +- "fstp %%st(0)\n\t" +- "flds %0\n" +- : : "m"(*(float *)nRegReturn) ); +- break; +- case typelib_TypeClass_DOUBLE: +- __asm__( "fldl %0\n\t" +- "fstp %%st(0)\n\t" +- "fldl %0\n" +- : : "m"(*(double *)nRegReturn) ); +- break; +-// case typelib_TypeClass_UNSIGNED_SHORT: +-// case typelib_TypeClass_SHORT: +-// __asm__( "movswl %0, %%eax\n" +-// : : "m"(nRegReturn) ); +-// break; +- default: +- __asm__( "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]) ); +- break; +- } +-} +- ++extern "C" void privateSnippetExecutorGeneral(); ++extern "C" void privateSnippetExecutorVoid(); ++extern "C" void privateSnippetExecutorHyper(); ++extern "C" void privateSnippetExecutorFloat(); ++extern "C" void privateSnippetExecutorDouble(); ++extern "C" void privateSnippetExecutorClass(); ++extern "C" typedef void (*PrivateSnippetExecutor)(); + +-//================================================================================================== +-int const codeSnippetSize = 20; ++int const codeSnippetSize = 16; + + unsigned char * codeSnippet( + unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, +- bool simpleRetType) ++ typelib_TypeClass returnTypeClass) + { +- if (!simpleRetType) { ++ if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { + functionIndex |= 0x80000000; + } ++ PrivateSnippetExecutor exec; ++ switch (returnTypeClass) { ++ case typelib_TypeClass_VOID: ++ exec = privateSnippetExecutorVoid; ++ break; ++ case typelib_TypeClass_HYPER: ++ case typelib_TypeClass_UNSIGNED_HYPER: ++ exec = privateSnippetExecutorHyper; ++ break; ++ case typelib_TypeClass_FLOAT: ++ exec = privateSnippetExecutorFloat; ++ break; ++ case typelib_TypeClass_DOUBLE: ++ exec = privateSnippetExecutorDouble; ++ break; ++ case typelib_TypeClass_STRING: ++ case typelib_TypeClass_TYPE: ++ case typelib_TypeClass_ANY: ++ case typelib_TypeClass_SEQUENCE: ++ case typelib_TypeClass_STRUCT: ++ case typelib_TypeClass_INTERFACE: ++ exec = privateSnippetExecutorClass; ++ break; ++ default: ++ exec = privateSnippetExecutorGeneral; ++ break; ++ } + unsigned char * p = code; + OSL_ASSERT(sizeof (sal_Int32) == 4); + // mov function_index, %eax: +@@ -459,13 +430,10 @@ + *p++ = 0xBA; + *reinterpret_cast< sal_Int32 * >(p) = vtableOffset; + p += sizeof (sal_Int32); +- // mov %esp, %ecx: +- *p++ = 0x89; +- *p++ = 0xE1; +- // jmp cpp_vtable_call: ++ // jmp privateSnippetExecutor: + *p++ = 0xE9; + *reinterpret_cast< sal_Int32 * >(p) +- = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32); ++ = ((unsigned char *) exec) - p - sizeof (sal_Int32); + p += sizeof (sal_Int32); + OSL_ASSERT(p - code <= codeSnippetSize); + return code + codeSnippetSize; +@@ -504,17 +472,17 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceAttributeTypeDescription * >( +- member)->pAttributeTypeRef)); ++ reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( ++ member)->pAttributeTypeRef->eTypeClass); + // Setter: + if (!reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { + *slots++ = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ code = codeSnippet( ++ code, functionOffset++, vtableOffset, ++ typelib_TypeClass_VOID); + } + break; + +@@ -522,10 +490,8 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceMethodTypeDescription * >( +- member)->pReturnTypeRef)); ++ reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( ++ member)->pReturnTypeRef->eTypeClass); + break; + + default: diff --git a/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..6f6a3a0f3e13 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk @@ -0,0 +1,24 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk Fri May 20 11:14:36 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Fri May 20 11:16:09 2005 +@@ -87,7 +87,8 @@ + SLOFILES= \ + $(SLO)$/except.obj \ + $(SLO)$/cpp2uno.obj \ +- $(SLO)$/uno2cpp.obj ++ $(SLO)$/uno2cpp.obj \ ++ $(SLO)$/call.obj + + SHL1TARGET= $(TARGET) + +@@ -108,3 +109,6 @@ + + .INCLUDE : target.mk + ++$(SLO)$/%.obj: %.s ++ $(CC) -c -o $(SLO)$/$(@:b).o $< ++ touch $@ diff --git a/editors/openoffice.org-2.0/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2.0/files/patch-libxmlsec+xmlsec1-1.2.6.patch index 7cf03a50d0a5..ba324bf13dd3 100644 --- a/editors/openoffice.org-2.0/files/patch-libxmlsec+xmlsec1-1.2.6.patch +++ b/editors/openoffice.org-2.0/files/patch-libxmlsec+xmlsec1-1.2.6.patch @@ -3,47 +3,17 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct version number of resultant shared lib -Index: libxmlsec/xmlsec1-1.2.6.patch +Index: xmlsec1-1.2.6.patch =================================================================== RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v -retrieving revision 1.3 -diff -u -r1.3 xmlsec1-1.2.6.patch ---- libxmlsec/xmlsec1-1.2.6.patch 29 Mar 2005 11:45:08 -0000 1.3 -+++ libxmlsec/xmlsec1-1.2.6.patch 6 Apr 2005 04:46:13 -0000 -@@ -13957,3 +13957,61 @@ - XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib - - XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib -+*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 -+--- misc/build/xmlsec1-1.2.6/ltmain.sh Wed Apr 6 13:32:04 2005 -+*************** -+*** 2918,2929 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2918,2929 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +retrieving revision 1.5 +diff -u -r1.5 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 18 May 2005 10:11:24 -0000 1.5 ++++ libxmlsec/xmlsec1-1.2.6.patch 22 May 2005 01:43:49 -0000 +@@ -756,6 +756,35 @@ + *** misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 + --- misc/build/xmlsec1-1.2.6/ltmain.sh 2005-05-09 19:55:51.745319024 +0200 + *************** +*** 2994,3006 **** + ;; + @@ -72,3 +42,7 @@ diff -u -r1.3 xmlsec1-1.2.6.patch + ;; + + irix | nonstopux) ++*************** + *** 3564,3570 **** + fi + else diff --git a/editors/openoffice.org-2.0/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2.0/files/patch-sndfile+libsndfile-1.0.9.patch index 91d4cf4ce4b1..ea2d00a49c68 100644 --- a/editors/openoffice.org-2.0/files/patch-sndfile+libsndfile-1.0.9.patch +++ b/editors/openoffice.org-2.0/files/patch-sndfile+libsndfile-1.0.9.patch @@ -3,47 +3,20 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct shared lib number -Index: sndfile/libsndfile-1.0.9.patch +Index: libsndfile-1.0.9.patch =================================================================== RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v retrieving revision 1.1 diff -u -r1.1 libsndfile-1.0.9.patch --- sndfile/libsndfile-1.0.9.patch 6 Oct 2004 11:49:36 -0000 1.1 -+++ sndfile/libsndfile-1.0.9.patch 28 Mar 2005 07:59:15 -0000 -@@ -231,3 +231,51 @@ ++++ sndfile/libsndfile-1.0.9.patch 22 May 2005 02:01:17 -0000 +@@ -231,3 +231,24 @@ #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL +*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 13:02:07 2004 +--- misc/build/libsndfile-1.0.9/ltmain.sh Mon Mar 28 16:37:47 2005 +*************** -+*** 2899,2910 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2899,2910 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +*** 2980,2987 **** + ;; + diff --git a/editors/openoffice.org-2.0/files/patch-solenv b/editors/openoffice.org-2.0/files/patch-solenv deleted file mode 100644 index b1e86cebebdd..000000000000 --- a/editors/openoffice.org-2.0/files/patch-solenv +++ /dev/null @@ -1,35 +0,0 @@ -Issutracker : #i48304# -CWS : N/A -Author : NAKATA Maho (JCA) -Description : getuid.so is not req'ed for FreeBSD - -Index: bin/modules/installer/download.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/download.pm,v -retrieving revision 1.13 -diff -u -r1.13 download.pm ---- solenv/bin/modules/installer/download.pm 25 Apr 2005 11:55:33 -0000 1.13 -+++ solenv/bin/modules/installer/download.pm 28 Apr 2005 00:11:54 -0000 -@@ -189,9 +189,10 @@ - # my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |"; - - # $ENV{'LD_PRELOAD'} = $getuidlibrary; --# my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; -+#getuid.so is req'ed for Linux/Solaris? FreeBSD/MacOSX don't need it. -+ my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; - -- my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; -+# my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; - - my $sumoutput = ""; - -@@ -228,7 +229,8 @@ - - my $getuidlibraryname = "getuid.so"; - my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0); -- if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } -+# ad hock prohibiting error -+# if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } - - return $$getuidlibraryref; - } diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 15fe526efb13..80d5a832f6a2 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -19,8 +19,8 @@ COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(develo NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz MOZILLA_VERSION= 1.7.5 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) DISTFILES+= ${MOZILLA_SOURCE}:mozsrc .endif @@ -48,8 +48,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 103 -SNAPDATE= 20050512 +MILESTONE= 105 +SNAPDATE= 20050521 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo index 9c859bca1d4d..c308f56de99d 100644 --- a/editors/openoffice.org-2/distinfo +++ b/editors/openoffice.org-2/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 65c42ee71a3bca66ef38a332826f2ef7 -SIZE (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 214220004 +MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810 +SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 diff --git a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s new file mode 100644 index 000000000000..00bf61a6a587 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s @@ -0,0 +1,270 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s Thu Jan 1 09:00:00 1970 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Fri May 20 11:21:13 2005 +@@ -0,0 +1,262 @@ ++ .text ++ ++.globl privateSnippetExecutorGeneral ++ .type privateSnippetExecutorGeneral,@function ++privateSnippetExecutorGeneral: ++.LFBg: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIg0: ++ movl %esp,%ebp ++.LCFIg1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEg: ++ .size privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral ++ ++.globl privateSnippetExecutorVoid ++ .type privateSnippetExecutorVoid,@function ++privateSnippetExecutorVoid: ++.LFBv: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIv0: ++ movl %esp,%ebp ++.LCFIv1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ leave ++ ret ++.LFEv: ++ .size privateSnippetExecutorVoid,.-privateSnippetExecutorVoid ++ ++.globl privateSnippetExecutorHyper ++ .type privateSnippetExecutorHyper,@function ++privateSnippetExecutorHyper: ++.LFBh: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIh0: ++ movl %esp,%ebp ++.LCFIh1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ movl 16(%esp),%edx # 64 bit nRegReturn, upper half ++ leave ++ ret ++.LFEh: ++ .size privateSnippetExecutorHyper,.-privateSnippetExecutorHyper ++ ++.globl privateSnippetExecutorFloat ++ .type privateSnippetExecutorFloat,@function ++privateSnippetExecutorFloat: ++.LFBf: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIf0: ++ movl %esp,%ebp ++.LCFIf1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ flds 12(%esp) # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEf: ++ .size privateSnippetExecutorFloat,.-privateSnippetExecutorFloat ++ ++.globl privateSnippetExecutorDouble ++ .type privateSnippetExecutorDouble,@function ++privateSnippetExecutorDouble: ++.LFBd: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFId0: ++ movl %esp,%ebp ++.LCFId1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ fldl 12(%esp) # 64 bit nRegReturn ++ leave ++ ret ++.LFEd: ++ .size privateSnippetExecutorDouble,.-privateSnippetExecutorDouble ++ ++.globl privateSnippetExecutorClass ++ .type privateSnippetExecutorClass,@function ++privateSnippetExecutorClass: ++.LFBc: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIc0: ++ movl %esp,%ebp ++.LCFIc1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret $4 ++.LFEc: ++ .size privateSnippetExecutorClass,.-privateSnippetExecutorClass ++ ++ .section .eh_frame,"a",@progbits ++.Lframe1: ++ .long .LECIE1-.LSCIE1 # length ++.LSCIE1: ++ .long 0 # CIE_ID ++ .byte 1 # version ++ .string "zR" # augmentation ++ .uleb128 1 # code_alignment_factor ++ .sleb128 -4 # data_alignment_factor ++ .byte 8 # return_address_register ++ .uleb128 1 # augmentation size 1: ++ .byte 0x1B # FDE Encoding (pcrel sdata4) ++ # initial_instructions: ++ .byte 0x0C # DW_CFA_def_cfa %esp, 4 ++ .uleb128 4 ++ .uleb128 4 ++ .byte 0x88 # DW_CFA_offset ret, 1 ++ .uleb128 1 ++ .align 4 ++.LECIE1: ++.LSFDEg: ++ .long .LEFDEg-.LASFDEg # length ++.LASFDEg: ++ .long .LASFDEg-.Lframe1 # CIE_pointer ++ .long .LFBg-. # initial_location ++ .long .LFEg-.LFBg # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg0-.LFBg ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg1-.LCFIg0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEg: ++.LSFDEv: ++ .long .LEFDEv-.LASFDEv # length ++.LASFDEv: ++ .long .LASFDEv-.Lframe1 # CIE_pointer ++ .long .LFBv-. # initial_location ++ .long .LFEv-.LFBv # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv0-.LFBv ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv1-.LCFIv0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEv: ++.LSFDEh: ++ .long .LEFDEh-.LASFDEh # length ++.LASFDEh: ++ .long .LASFDEh-.Lframe1 # CIE_pointer ++ .long .LFBh-. # initial_location ++ .long .LFEh-.LFBh # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh0-.LFBh ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh1-.LCFIh0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEh: ++.LSFDEf: ++ .long .LEFDEf-.LASFDEf # length ++.LASFDEf: ++ .long .LASFDEf-.Lframe1 # CIE_pointer ++ .long .LFBf-. # initial_location ++ .long .LFEf-.LFBf # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf0-.LFBf ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf1-.LCFIf0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEf: ++.LSFDEd: ++ .long .LEFDEd-.LASFDEd # length ++.LASFDEd: ++ .long .LASFDEd-.Lframe1 # CIE_pointer ++ .long .LFBd-. # initial_location ++ .long .LFEd-.LFBd # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId0-.LFBd ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId1-.LCFId0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEd: ++.LSFDEc: ++ .long .LEFDEc-.LASFDEc # length ++.LASFDEc: ++ .long .LASFDEc-.Lframe1 # CIE_pointer ++ .long .LFBc-. # initial_location ++ .long .LFEc-.LFBc # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc0-.LFBc ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc1-.LCFIc0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEc: diff --git a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx new file mode 100644 index 000000000000..e6e306b99efd --- /dev/null +++ b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx @@ -0,0 +1,285 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Jan 19 00:06:09 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Feb 21 21:13:28 2005 +@@ -77,7 +77,7 @@ + { + + //================================================================================================== +-static typelib_TypeClass cpp2uno_call( ++void cpp2uno_call( + bridges::cpp_uno::shared::CppInterfaceProxy * pThis, + const typelib_TypeDescription * pMemberTypeDescr, + typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return +@@ -209,8 +209,6 @@ + CPPU_CURRENT_NAMESPACE::raiseException( + &aUnoExc, pThis->getBridge()->getUno2Cpp() ); + // has to destruct the any +- // is here for dummy +- return typelib_TypeClass_VOID; + } + else // else no exception occured... + { +@@ -247,22 +245,16 @@ + } + if (pReturnTypeDescr) + { +- typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; + TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); +- return eRet; + } +- else +- return typelib_TypeClass_VOID; + } + } + + + //================================================================================================== +-static typelib_TypeClass cpp_mediate( +- sal_Int32 nFunctionIndex, +- sal_Int32 nVtableOffset, +- void ** pCallStack, +- sal_Int64 * pRegisterReturn /* space for register return */ ) ++extern "C" void cpp_vtable_call( ++ int nFunctionIndex, int nVtableOffset, void** pCallStack, ++ sal_Int64 nRegReturn ) + { + OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); + +@@ -298,7 +290,6 @@ + + TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); + +- typelib_TypeClass eRet; + switch (aMemberDescr.get()->eTypeClass) + { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: +@@ -306,11 +297,11 @@ + if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex) + { + // is GET method +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, + 0, 0, // no params +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + else + { +@@ -321,11 +312,11 @@ + aParam.bIn = sal_True; + aParam.bOut = sal_False; + +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + 0, // indicates void return + 1, &aParam, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -336,11 +327,9 @@ + { + case 1: // acquire() + pCppI->acquireProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 2: // release() + pCppI->releaseProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 0: // queryInterface() opt + { +@@ -361,20 +350,19 @@ + &pInterface, pTD, cpp_acquire ); + pInterface->release(); + TYPELIB_DANGER_RELEASE( pTD ); +- *(void **)pRegisterReturn = pCallStack[1]; +- eRet = typelib_TypeClass_ANY; ++ *(void **)&nRegReturn = pCallStack[1]; + break; + } + TYPELIB_DANGER_RELEASE( pTD ); + } + } // else perform queryInterface() + default: +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -383,72 +371,55 @@ + throw RuntimeException( + rtl::OUString::createFromAscii("no member description found!"), + (XInterface *)pThis ); +- // is here for dummy +- eRet = typelib_TypeClass_VOID; + } + } +- +- return eRet; + } + + //================================================================================================== +-/** +- * is called on incoming vtable calls +- * (called by asm snippets) +- */ +-static void cpp_vtable_call( +- int nFunctionIndex, int nVtableOffset, void** pCallStack ) +- __attribute__((regparm(3))); +- +-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack ) +-{ +- volatile long nRegReturn[2]; +- typelib_TypeClass aType = cpp_mediate( +- nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn ); +- +- switch( aType ) +- { +- case typelib_TypeClass_HYPER: +- case typelib_TypeClass_UNSIGNED_HYPER: +- __asm__( "movl %1, %%edx\n\t" +- "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); +- break; +- case typelib_TypeClass_FLOAT: +- __asm__( "flds %0\n\t" +- "fstp %%st(0)\n\t" +- "flds %0\n" +- : : "m"(*(float *)nRegReturn) ); +- break; +- case typelib_TypeClass_DOUBLE: +- __asm__( "fldl %0\n\t" +- "fstp %%st(0)\n\t" +- "fldl %0\n" +- : : "m"(*(double *)nRegReturn) ); +- break; +-// case typelib_TypeClass_UNSIGNED_SHORT: +-// case typelib_TypeClass_SHORT: +-// __asm__( "movswl %0, %%eax\n" +-// : : "m"(nRegReturn) ); +-// break; +- default: +- __asm__( "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]) ); +- break; +- } +-} +- ++extern "C" void privateSnippetExecutorGeneral(); ++extern "C" void privateSnippetExecutorVoid(); ++extern "C" void privateSnippetExecutorHyper(); ++extern "C" void privateSnippetExecutorFloat(); ++extern "C" void privateSnippetExecutorDouble(); ++extern "C" void privateSnippetExecutorClass(); ++extern "C" typedef void (*PrivateSnippetExecutor)(); + +-//================================================================================================== +-int const codeSnippetSize = 20; ++int const codeSnippetSize = 16; + + unsigned char * codeSnippet( + unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, +- bool simpleRetType) ++ typelib_TypeClass returnTypeClass) + { +- if (!simpleRetType) { ++ if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { + functionIndex |= 0x80000000; + } ++ PrivateSnippetExecutor exec; ++ switch (returnTypeClass) { ++ case typelib_TypeClass_VOID: ++ exec = privateSnippetExecutorVoid; ++ break; ++ case typelib_TypeClass_HYPER: ++ case typelib_TypeClass_UNSIGNED_HYPER: ++ exec = privateSnippetExecutorHyper; ++ break; ++ case typelib_TypeClass_FLOAT: ++ exec = privateSnippetExecutorFloat; ++ break; ++ case typelib_TypeClass_DOUBLE: ++ exec = privateSnippetExecutorDouble; ++ break; ++ case typelib_TypeClass_STRING: ++ case typelib_TypeClass_TYPE: ++ case typelib_TypeClass_ANY: ++ case typelib_TypeClass_SEQUENCE: ++ case typelib_TypeClass_STRUCT: ++ case typelib_TypeClass_INTERFACE: ++ exec = privateSnippetExecutorClass; ++ break; ++ default: ++ exec = privateSnippetExecutorGeneral; ++ break; ++ } + unsigned char * p = code; + OSL_ASSERT(sizeof (sal_Int32) == 4); + // mov function_index, %eax: +@@ -459,13 +430,10 @@ + *p++ = 0xBA; + *reinterpret_cast< sal_Int32 * >(p) = vtableOffset; + p += sizeof (sal_Int32); +- // mov %esp, %ecx: +- *p++ = 0x89; +- *p++ = 0xE1; +- // jmp cpp_vtable_call: ++ // jmp privateSnippetExecutor: + *p++ = 0xE9; + *reinterpret_cast< sal_Int32 * >(p) +- = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32); ++ = ((unsigned char *) exec) - p - sizeof (sal_Int32); + p += sizeof (sal_Int32); + OSL_ASSERT(p - code <= codeSnippetSize); + return code + codeSnippetSize; +@@ -504,17 +472,17 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceAttributeTypeDescription * >( +- member)->pAttributeTypeRef)); ++ reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( ++ member)->pAttributeTypeRef->eTypeClass); + // Setter: + if (!reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { + *slots++ = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ code = codeSnippet( ++ code, functionOffset++, vtableOffset, ++ typelib_TypeClass_VOID); + } + break; + +@@ -522,10 +490,8 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceMethodTypeDescription * >( +- member)->pReturnTypeRef)); ++ reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( ++ member)->pReturnTypeRef->eTypeClass); + break; + + default: diff --git a/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..6f6a3a0f3e13 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk @@ -0,0 +1,24 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk Fri May 20 11:14:36 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Fri May 20 11:16:09 2005 +@@ -87,7 +87,8 @@ + SLOFILES= \ + $(SLO)$/except.obj \ + $(SLO)$/cpp2uno.obj \ +- $(SLO)$/uno2cpp.obj ++ $(SLO)$/uno2cpp.obj \ ++ $(SLO)$/call.obj + + SHL1TARGET= $(TARGET) + +@@ -108,3 +109,6 @@ + + .INCLUDE : target.mk + ++$(SLO)$/%.obj: %.s ++ $(CC) -c -o $(SLO)$/$(@:b).o $< ++ touch $@ diff --git a/editors/openoffice.org-2/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2/files/patch-libxmlsec+xmlsec1-1.2.6.patch index 7cf03a50d0a5..ba324bf13dd3 100644 --- a/editors/openoffice.org-2/files/patch-libxmlsec+xmlsec1-1.2.6.patch +++ b/editors/openoffice.org-2/files/patch-libxmlsec+xmlsec1-1.2.6.patch @@ -3,47 +3,17 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct version number of resultant shared lib -Index: libxmlsec/xmlsec1-1.2.6.patch +Index: xmlsec1-1.2.6.patch =================================================================== RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v -retrieving revision 1.3 -diff -u -r1.3 xmlsec1-1.2.6.patch ---- libxmlsec/xmlsec1-1.2.6.patch 29 Mar 2005 11:45:08 -0000 1.3 -+++ libxmlsec/xmlsec1-1.2.6.patch 6 Apr 2005 04:46:13 -0000 -@@ -13957,3 +13957,61 @@ - XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib - - XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib -+*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 -+--- misc/build/xmlsec1-1.2.6/ltmain.sh Wed Apr 6 13:32:04 2005 -+*************** -+*** 2918,2929 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2918,2929 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +retrieving revision 1.5 +diff -u -r1.5 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 18 May 2005 10:11:24 -0000 1.5 ++++ libxmlsec/xmlsec1-1.2.6.patch 22 May 2005 01:43:49 -0000 +@@ -756,6 +756,35 @@ + *** misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 + --- misc/build/xmlsec1-1.2.6/ltmain.sh 2005-05-09 19:55:51.745319024 +0200 + *************** +*** 2994,3006 **** + ;; + @@ -72,3 +42,7 @@ diff -u -r1.3 xmlsec1-1.2.6.patch + ;; + + irix | nonstopux) ++*************** + *** 3564,3570 **** + fi + else diff --git a/editors/openoffice.org-2/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2/files/patch-sndfile+libsndfile-1.0.9.patch index 91d4cf4ce4b1..ea2d00a49c68 100644 --- a/editors/openoffice.org-2/files/patch-sndfile+libsndfile-1.0.9.patch +++ b/editors/openoffice.org-2/files/patch-sndfile+libsndfile-1.0.9.patch @@ -3,47 +3,20 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct shared lib number -Index: sndfile/libsndfile-1.0.9.patch +Index: libsndfile-1.0.9.patch =================================================================== RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v retrieving revision 1.1 diff -u -r1.1 libsndfile-1.0.9.patch --- sndfile/libsndfile-1.0.9.patch 6 Oct 2004 11:49:36 -0000 1.1 -+++ sndfile/libsndfile-1.0.9.patch 28 Mar 2005 07:59:15 -0000 -@@ -231,3 +231,51 @@ ++++ sndfile/libsndfile-1.0.9.patch 22 May 2005 02:01:17 -0000 +@@ -231,3 +231,24 @@ #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL +*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 13:02:07 2004 +--- misc/build/libsndfile-1.0.9/ltmain.sh Mon Mar 28 16:37:47 2005 +*************** -+*** 2899,2910 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2899,2910 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +*** 2980,2987 **** + ;; + diff --git a/editors/openoffice.org-2/files/patch-solenv b/editors/openoffice.org-2/files/patch-solenv deleted file mode 100644 index b1e86cebebdd..000000000000 --- a/editors/openoffice.org-2/files/patch-solenv +++ /dev/null @@ -1,35 +0,0 @@ -Issutracker : #i48304# -CWS : N/A -Author : NAKATA Maho (JCA) -Description : getuid.so is not req'ed for FreeBSD - -Index: bin/modules/installer/download.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/download.pm,v -retrieving revision 1.13 -diff -u -r1.13 download.pm ---- solenv/bin/modules/installer/download.pm 25 Apr 2005 11:55:33 -0000 1.13 -+++ solenv/bin/modules/installer/download.pm 28 Apr 2005 00:11:54 -0000 -@@ -189,9 +189,10 @@ - # my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |"; - - # $ENV{'LD_PRELOAD'} = $getuidlibrary; --# my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; -+#getuid.so is req'ed for Linux/Solaris? FreeBSD/MacOSX don't need it. -+ my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; - -- my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; -+# my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; - - my $sumoutput = ""; - -@@ -228,7 +229,8 @@ - - my $getuidlibraryname = "getuid.so"; - my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0); -- if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } -+# ad hock prohibiting error -+# if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } - - return $$getuidlibraryref; - } diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 15fe526efb13..80d5a832f6a2 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -19,8 +19,8 @@ COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(develo NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz MOZILLA_VERSION= 1.7.5 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) DISTFILES+= ${MOZILLA_SOURCE}:mozsrc .endif @@ -48,8 +48,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 103 -SNAPDATE= 20050512 +MILESTONE= 105 +SNAPDATE= 20050521 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo index 9c859bca1d4d..c308f56de99d 100644 --- a/editors/openoffice.org-3-RC/distinfo +++ b/editors/openoffice.org-3-RC/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 65c42ee71a3bca66ef38a332826f2ef7 -SIZE (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 214220004 +MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810 +SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s new file mode 100644 index 000000000000..00bf61a6a587 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s @@ -0,0 +1,270 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s Thu Jan 1 09:00:00 1970 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Fri May 20 11:21:13 2005 +@@ -0,0 +1,262 @@ ++ .text ++ ++.globl privateSnippetExecutorGeneral ++ .type privateSnippetExecutorGeneral,@function ++privateSnippetExecutorGeneral: ++.LFBg: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIg0: ++ movl %esp,%ebp ++.LCFIg1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEg: ++ .size privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral ++ ++.globl privateSnippetExecutorVoid ++ .type privateSnippetExecutorVoid,@function ++privateSnippetExecutorVoid: ++.LFBv: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIv0: ++ movl %esp,%ebp ++.LCFIv1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ leave ++ ret ++.LFEv: ++ .size privateSnippetExecutorVoid,.-privateSnippetExecutorVoid ++ ++.globl privateSnippetExecutorHyper ++ .type privateSnippetExecutorHyper,@function ++privateSnippetExecutorHyper: ++.LFBh: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIh0: ++ movl %esp,%ebp ++.LCFIh1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ movl 16(%esp),%edx # 64 bit nRegReturn, upper half ++ leave ++ ret ++.LFEh: ++ .size privateSnippetExecutorHyper,.-privateSnippetExecutorHyper ++ ++.globl privateSnippetExecutorFloat ++ .type privateSnippetExecutorFloat,@function ++privateSnippetExecutorFloat: ++.LFBf: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIf0: ++ movl %esp,%ebp ++.LCFIf1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ flds 12(%esp) # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEf: ++ .size privateSnippetExecutorFloat,.-privateSnippetExecutorFloat ++ ++.globl privateSnippetExecutorDouble ++ .type privateSnippetExecutorDouble,@function ++privateSnippetExecutorDouble: ++.LFBd: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFId0: ++ movl %esp,%ebp ++.LCFId1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ fldl 12(%esp) # 64 bit nRegReturn ++ leave ++ ret ++.LFEd: ++ .size privateSnippetExecutorDouble,.-privateSnippetExecutorDouble ++ ++.globl privateSnippetExecutorClass ++ .type privateSnippetExecutorClass,@function ++privateSnippetExecutorClass: ++.LFBc: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIc0: ++ movl %esp,%ebp ++.LCFIc1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret $4 ++.LFEc: ++ .size privateSnippetExecutorClass,.-privateSnippetExecutorClass ++ ++ .section .eh_frame,"a",@progbits ++.Lframe1: ++ .long .LECIE1-.LSCIE1 # length ++.LSCIE1: ++ .long 0 # CIE_ID ++ .byte 1 # version ++ .string "zR" # augmentation ++ .uleb128 1 # code_alignment_factor ++ .sleb128 -4 # data_alignment_factor ++ .byte 8 # return_address_register ++ .uleb128 1 # augmentation size 1: ++ .byte 0x1B # FDE Encoding (pcrel sdata4) ++ # initial_instructions: ++ .byte 0x0C # DW_CFA_def_cfa %esp, 4 ++ .uleb128 4 ++ .uleb128 4 ++ .byte 0x88 # DW_CFA_offset ret, 1 ++ .uleb128 1 ++ .align 4 ++.LECIE1: ++.LSFDEg: ++ .long .LEFDEg-.LASFDEg # length ++.LASFDEg: ++ .long .LASFDEg-.Lframe1 # CIE_pointer ++ .long .LFBg-. # initial_location ++ .long .LFEg-.LFBg # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg0-.LFBg ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg1-.LCFIg0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEg: ++.LSFDEv: ++ .long .LEFDEv-.LASFDEv # length ++.LASFDEv: ++ .long .LASFDEv-.Lframe1 # CIE_pointer ++ .long .LFBv-. # initial_location ++ .long .LFEv-.LFBv # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv0-.LFBv ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv1-.LCFIv0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEv: ++.LSFDEh: ++ .long .LEFDEh-.LASFDEh # length ++.LASFDEh: ++ .long .LASFDEh-.Lframe1 # CIE_pointer ++ .long .LFBh-. # initial_location ++ .long .LFEh-.LFBh # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh0-.LFBh ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh1-.LCFIh0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEh: ++.LSFDEf: ++ .long .LEFDEf-.LASFDEf # length ++.LASFDEf: ++ .long .LASFDEf-.Lframe1 # CIE_pointer ++ .long .LFBf-. # initial_location ++ .long .LFEf-.LFBf # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf0-.LFBf ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf1-.LCFIf0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEf: ++.LSFDEd: ++ .long .LEFDEd-.LASFDEd # length ++.LASFDEd: ++ .long .LASFDEd-.Lframe1 # CIE_pointer ++ .long .LFBd-. # initial_location ++ .long .LFEd-.LFBd # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId0-.LFBd ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId1-.LCFId0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEd: ++.LSFDEc: ++ .long .LEFDEc-.LASFDEc # length ++.LASFDEc: ++ .long .LASFDEc-.Lframe1 # CIE_pointer ++ .long .LFBc-. # initial_location ++ .long .LFEc-.LFBc # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc0-.LFBc ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc1-.LCFIc0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEc: diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx new file mode 100644 index 000000000000..e6e306b99efd --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx @@ -0,0 +1,285 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Jan 19 00:06:09 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Feb 21 21:13:28 2005 +@@ -77,7 +77,7 @@ + { + + //================================================================================================== +-static typelib_TypeClass cpp2uno_call( ++void cpp2uno_call( + bridges::cpp_uno::shared::CppInterfaceProxy * pThis, + const typelib_TypeDescription * pMemberTypeDescr, + typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return +@@ -209,8 +209,6 @@ + CPPU_CURRENT_NAMESPACE::raiseException( + &aUnoExc, pThis->getBridge()->getUno2Cpp() ); + // has to destruct the any +- // is here for dummy +- return typelib_TypeClass_VOID; + } + else // else no exception occured... + { +@@ -247,22 +245,16 @@ + } + if (pReturnTypeDescr) + { +- typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; + TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); +- return eRet; + } +- else +- return typelib_TypeClass_VOID; + } + } + + + //================================================================================================== +-static typelib_TypeClass cpp_mediate( +- sal_Int32 nFunctionIndex, +- sal_Int32 nVtableOffset, +- void ** pCallStack, +- sal_Int64 * pRegisterReturn /* space for register return */ ) ++extern "C" void cpp_vtable_call( ++ int nFunctionIndex, int nVtableOffset, void** pCallStack, ++ sal_Int64 nRegReturn ) + { + OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); + +@@ -298,7 +290,6 @@ + + TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); + +- typelib_TypeClass eRet; + switch (aMemberDescr.get()->eTypeClass) + { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: +@@ -306,11 +297,11 @@ + if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex) + { + // is GET method +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, + 0, 0, // no params +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + else + { +@@ -321,11 +312,11 @@ + aParam.bIn = sal_True; + aParam.bOut = sal_False; + +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + 0, // indicates void return + 1, &aParam, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -336,11 +327,9 @@ + { + case 1: // acquire() + pCppI->acquireProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 2: // release() + pCppI->releaseProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 0: // queryInterface() opt + { +@@ -361,20 +350,19 @@ + &pInterface, pTD, cpp_acquire ); + pInterface->release(); + TYPELIB_DANGER_RELEASE( pTD ); +- *(void **)pRegisterReturn = pCallStack[1]; +- eRet = typelib_TypeClass_ANY; ++ *(void **)&nRegReturn = pCallStack[1]; + break; + } + TYPELIB_DANGER_RELEASE( pTD ); + } + } // else perform queryInterface() + default: +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -383,72 +371,55 @@ + throw RuntimeException( + rtl::OUString::createFromAscii("no member description found!"), + (XInterface *)pThis ); +- // is here for dummy +- eRet = typelib_TypeClass_VOID; + } + } +- +- return eRet; + } + + //================================================================================================== +-/** +- * is called on incoming vtable calls +- * (called by asm snippets) +- */ +-static void cpp_vtable_call( +- int nFunctionIndex, int nVtableOffset, void** pCallStack ) +- __attribute__((regparm(3))); +- +-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack ) +-{ +- volatile long nRegReturn[2]; +- typelib_TypeClass aType = cpp_mediate( +- nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn ); +- +- switch( aType ) +- { +- case typelib_TypeClass_HYPER: +- case typelib_TypeClass_UNSIGNED_HYPER: +- __asm__( "movl %1, %%edx\n\t" +- "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); +- break; +- case typelib_TypeClass_FLOAT: +- __asm__( "flds %0\n\t" +- "fstp %%st(0)\n\t" +- "flds %0\n" +- : : "m"(*(float *)nRegReturn) ); +- break; +- case typelib_TypeClass_DOUBLE: +- __asm__( "fldl %0\n\t" +- "fstp %%st(0)\n\t" +- "fldl %0\n" +- : : "m"(*(double *)nRegReturn) ); +- break; +-// case typelib_TypeClass_UNSIGNED_SHORT: +-// case typelib_TypeClass_SHORT: +-// __asm__( "movswl %0, %%eax\n" +-// : : "m"(nRegReturn) ); +-// break; +- default: +- __asm__( "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]) ); +- break; +- } +-} +- ++extern "C" void privateSnippetExecutorGeneral(); ++extern "C" void privateSnippetExecutorVoid(); ++extern "C" void privateSnippetExecutorHyper(); ++extern "C" void privateSnippetExecutorFloat(); ++extern "C" void privateSnippetExecutorDouble(); ++extern "C" void privateSnippetExecutorClass(); ++extern "C" typedef void (*PrivateSnippetExecutor)(); + +-//================================================================================================== +-int const codeSnippetSize = 20; ++int const codeSnippetSize = 16; + + unsigned char * codeSnippet( + unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, +- bool simpleRetType) ++ typelib_TypeClass returnTypeClass) + { +- if (!simpleRetType) { ++ if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { + functionIndex |= 0x80000000; + } ++ PrivateSnippetExecutor exec; ++ switch (returnTypeClass) { ++ case typelib_TypeClass_VOID: ++ exec = privateSnippetExecutorVoid; ++ break; ++ case typelib_TypeClass_HYPER: ++ case typelib_TypeClass_UNSIGNED_HYPER: ++ exec = privateSnippetExecutorHyper; ++ break; ++ case typelib_TypeClass_FLOAT: ++ exec = privateSnippetExecutorFloat; ++ break; ++ case typelib_TypeClass_DOUBLE: ++ exec = privateSnippetExecutorDouble; ++ break; ++ case typelib_TypeClass_STRING: ++ case typelib_TypeClass_TYPE: ++ case typelib_TypeClass_ANY: ++ case typelib_TypeClass_SEQUENCE: ++ case typelib_TypeClass_STRUCT: ++ case typelib_TypeClass_INTERFACE: ++ exec = privateSnippetExecutorClass; ++ break; ++ default: ++ exec = privateSnippetExecutorGeneral; ++ break; ++ } + unsigned char * p = code; + OSL_ASSERT(sizeof (sal_Int32) == 4); + // mov function_index, %eax: +@@ -459,13 +430,10 @@ + *p++ = 0xBA; + *reinterpret_cast< sal_Int32 * >(p) = vtableOffset; + p += sizeof (sal_Int32); +- // mov %esp, %ecx: +- *p++ = 0x89; +- *p++ = 0xE1; +- // jmp cpp_vtable_call: ++ // jmp privateSnippetExecutor: + *p++ = 0xE9; + *reinterpret_cast< sal_Int32 * >(p) +- = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32); ++ = ((unsigned char *) exec) - p - sizeof (sal_Int32); + p += sizeof (sal_Int32); + OSL_ASSERT(p - code <= codeSnippetSize); + return code + codeSnippetSize; +@@ -504,17 +472,17 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceAttributeTypeDescription * >( +- member)->pAttributeTypeRef)); ++ reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( ++ member)->pAttributeTypeRef->eTypeClass); + // Setter: + if (!reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { + *slots++ = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ code = codeSnippet( ++ code, functionOffset++, vtableOffset, ++ typelib_TypeClass_VOID); + } + break; + +@@ -522,10 +490,8 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceMethodTypeDescription * >( +- member)->pReturnTypeRef)); ++ reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( ++ member)->pReturnTypeRef->eTypeClass); + break; + + default: diff --git a/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..6f6a3a0f3e13 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk @@ -0,0 +1,24 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk Fri May 20 11:14:36 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Fri May 20 11:16:09 2005 +@@ -87,7 +87,8 @@ + SLOFILES= \ + $(SLO)$/except.obj \ + $(SLO)$/cpp2uno.obj \ +- $(SLO)$/uno2cpp.obj ++ $(SLO)$/uno2cpp.obj \ ++ $(SLO)$/call.obj + + SHL1TARGET= $(TARGET) + +@@ -108,3 +109,6 @@ + + .INCLUDE : target.mk + ++$(SLO)$/%.obj: %.s ++ $(CC) -c -o $(SLO)$/$(@:b).o $< ++ touch $@ diff --git a/editors/openoffice.org-3-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-3-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch index 7cf03a50d0a5..ba324bf13dd3 100644 --- a/editors/openoffice.org-3-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch +++ b/editors/openoffice.org-3-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch @@ -3,47 +3,17 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct version number of resultant shared lib -Index: libxmlsec/xmlsec1-1.2.6.patch +Index: xmlsec1-1.2.6.patch =================================================================== RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v -retrieving revision 1.3 -diff -u -r1.3 xmlsec1-1.2.6.patch ---- libxmlsec/xmlsec1-1.2.6.patch 29 Mar 2005 11:45:08 -0000 1.3 -+++ libxmlsec/xmlsec1-1.2.6.patch 6 Apr 2005 04:46:13 -0000 -@@ -13957,3 +13957,61 @@ - XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib - - XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib -+*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 -+--- misc/build/xmlsec1-1.2.6/ltmain.sh Wed Apr 6 13:32:04 2005 -+*************** -+*** 2918,2929 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2918,2929 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +retrieving revision 1.5 +diff -u -r1.5 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 18 May 2005 10:11:24 -0000 1.5 ++++ libxmlsec/xmlsec1-1.2.6.patch 22 May 2005 01:43:49 -0000 +@@ -756,6 +756,35 @@ + *** misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 + --- misc/build/xmlsec1-1.2.6/ltmain.sh 2005-05-09 19:55:51.745319024 +0200 + *************** +*** 2994,3006 **** + ;; + @@ -72,3 +42,7 @@ diff -u -r1.3 xmlsec1-1.2.6.patch + ;; + + irix | nonstopux) ++*************** + *** 3564,3570 **** + fi + else diff --git a/editors/openoffice.org-3-RC/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-3-RC/files/patch-sndfile+libsndfile-1.0.9.patch index 91d4cf4ce4b1..ea2d00a49c68 100644 --- a/editors/openoffice.org-3-RC/files/patch-sndfile+libsndfile-1.0.9.patch +++ b/editors/openoffice.org-3-RC/files/patch-sndfile+libsndfile-1.0.9.patch @@ -3,47 +3,20 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct shared lib number -Index: sndfile/libsndfile-1.0.9.patch +Index: libsndfile-1.0.9.patch =================================================================== RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v retrieving revision 1.1 diff -u -r1.1 libsndfile-1.0.9.patch --- sndfile/libsndfile-1.0.9.patch 6 Oct 2004 11:49:36 -0000 1.1 -+++ sndfile/libsndfile-1.0.9.patch 28 Mar 2005 07:59:15 -0000 -@@ -231,3 +231,51 @@ ++++ sndfile/libsndfile-1.0.9.patch 22 May 2005 02:01:17 -0000 +@@ -231,3 +231,24 @@ #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL +*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 13:02:07 2004 +--- misc/build/libsndfile-1.0.9/ltmain.sh Mon Mar 28 16:37:47 2005 +*************** -+*** 2899,2910 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2899,2910 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +*** 2980,2987 **** + ;; + diff --git a/editors/openoffice.org-3-RC/files/patch-solenv b/editors/openoffice.org-3-RC/files/patch-solenv deleted file mode 100644 index b1e86cebebdd..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv +++ /dev/null @@ -1,35 +0,0 @@ -Issutracker : #i48304# -CWS : N/A -Author : NAKATA Maho (JCA) -Description : getuid.so is not req'ed for FreeBSD - -Index: bin/modules/installer/download.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/download.pm,v -retrieving revision 1.13 -diff -u -r1.13 download.pm ---- solenv/bin/modules/installer/download.pm 25 Apr 2005 11:55:33 -0000 1.13 -+++ solenv/bin/modules/installer/download.pm 28 Apr 2005 00:11:54 -0000 -@@ -189,9 +189,10 @@ - # my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |"; - - # $ENV{'LD_PRELOAD'} = $getuidlibrary; --# my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; -+#getuid.so is req'ed for Linux/Solaris? FreeBSD/MacOSX don't need it. -+ my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; - -- my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; -+# my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; - - my $sumoutput = ""; - -@@ -228,7 +229,8 @@ - - my $getuidlibraryname = "getuid.so"; - my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0); -- if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } -+# ad hock prohibiting error -+# if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } - - return $$getuidlibraryref; - } diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 15fe526efb13..80d5a832f6a2 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -19,8 +19,8 @@ COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(develo NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz MOZILLA_VERSION= 1.7.5 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) DISTFILES+= ${MOZILLA_SOURCE}:mozsrc .endif @@ -48,8 +48,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 103 -SNAPDATE= 20050512 +MILESTONE= 105 +SNAPDATE= 20050521 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index 9c859bca1d4d..c308f56de99d 100644 --- a/editors/openoffice.org-3-devel/distinfo +++ b/editors/openoffice.org-3-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 65c42ee71a3bca66ef38a332826f2ef7 -SIZE (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 214220004 +MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810 +SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s new file mode 100644 index 000000000000..00bf61a6a587 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s @@ -0,0 +1,270 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s Thu Jan 1 09:00:00 1970 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Fri May 20 11:21:13 2005 +@@ -0,0 +1,262 @@ ++ .text ++ ++.globl privateSnippetExecutorGeneral ++ .type privateSnippetExecutorGeneral,@function ++privateSnippetExecutorGeneral: ++.LFBg: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIg0: ++ movl %esp,%ebp ++.LCFIg1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEg: ++ .size privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral ++ ++.globl privateSnippetExecutorVoid ++ .type privateSnippetExecutorVoid,@function ++privateSnippetExecutorVoid: ++.LFBv: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIv0: ++ movl %esp,%ebp ++.LCFIv1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ leave ++ ret ++.LFEv: ++ .size privateSnippetExecutorVoid,.-privateSnippetExecutorVoid ++ ++.globl privateSnippetExecutorHyper ++ .type privateSnippetExecutorHyper,@function ++privateSnippetExecutorHyper: ++.LFBh: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIh0: ++ movl %esp,%ebp ++.LCFIh1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ movl 16(%esp),%edx # 64 bit nRegReturn, upper half ++ leave ++ ret ++.LFEh: ++ .size privateSnippetExecutorHyper,.-privateSnippetExecutorHyper ++ ++.globl privateSnippetExecutorFloat ++ .type privateSnippetExecutorFloat,@function ++privateSnippetExecutorFloat: ++.LFBf: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIf0: ++ movl %esp,%ebp ++.LCFIf1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ flds 12(%esp) # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEf: ++ .size privateSnippetExecutorFloat,.-privateSnippetExecutorFloat ++ ++.globl privateSnippetExecutorDouble ++ .type privateSnippetExecutorDouble,@function ++privateSnippetExecutorDouble: ++.LFBd: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFId0: ++ movl %esp,%ebp ++.LCFId1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ fldl 12(%esp) # 64 bit nRegReturn ++ leave ++ ret ++.LFEd: ++ .size privateSnippetExecutorDouble,.-privateSnippetExecutorDouble ++ ++.globl privateSnippetExecutorClass ++ .type privateSnippetExecutorClass,@function ++privateSnippetExecutorClass: ++.LFBc: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIc0: ++ movl %esp,%ebp ++.LCFIc1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret $4 ++.LFEc: ++ .size privateSnippetExecutorClass,.-privateSnippetExecutorClass ++ ++ .section .eh_frame,"a",@progbits ++.Lframe1: ++ .long .LECIE1-.LSCIE1 # length ++.LSCIE1: ++ .long 0 # CIE_ID ++ .byte 1 # version ++ .string "zR" # augmentation ++ .uleb128 1 # code_alignment_factor ++ .sleb128 -4 # data_alignment_factor ++ .byte 8 # return_address_register ++ .uleb128 1 # augmentation size 1: ++ .byte 0x1B # FDE Encoding (pcrel sdata4) ++ # initial_instructions: ++ .byte 0x0C # DW_CFA_def_cfa %esp, 4 ++ .uleb128 4 ++ .uleb128 4 ++ .byte 0x88 # DW_CFA_offset ret, 1 ++ .uleb128 1 ++ .align 4 ++.LECIE1: ++.LSFDEg: ++ .long .LEFDEg-.LASFDEg # length ++.LASFDEg: ++ .long .LASFDEg-.Lframe1 # CIE_pointer ++ .long .LFBg-. # initial_location ++ .long .LFEg-.LFBg # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg0-.LFBg ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg1-.LCFIg0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEg: ++.LSFDEv: ++ .long .LEFDEv-.LASFDEv # length ++.LASFDEv: ++ .long .LASFDEv-.Lframe1 # CIE_pointer ++ .long .LFBv-. # initial_location ++ .long .LFEv-.LFBv # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv0-.LFBv ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv1-.LCFIv0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEv: ++.LSFDEh: ++ .long .LEFDEh-.LASFDEh # length ++.LASFDEh: ++ .long .LASFDEh-.Lframe1 # CIE_pointer ++ .long .LFBh-. # initial_location ++ .long .LFEh-.LFBh # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh0-.LFBh ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh1-.LCFIh0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEh: ++.LSFDEf: ++ .long .LEFDEf-.LASFDEf # length ++.LASFDEf: ++ .long .LASFDEf-.Lframe1 # CIE_pointer ++ .long .LFBf-. # initial_location ++ .long .LFEf-.LFBf # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf0-.LFBf ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf1-.LCFIf0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEf: ++.LSFDEd: ++ .long .LEFDEd-.LASFDEd # length ++.LASFDEd: ++ .long .LASFDEd-.Lframe1 # CIE_pointer ++ .long .LFBd-. # initial_location ++ .long .LFEd-.LFBd # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId0-.LFBd ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId1-.LCFId0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEd: ++.LSFDEc: ++ .long .LEFDEc-.LASFDEc # length ++.LASFDEc: ++ .long .LASFDEc-.Lframe1 # CIE_pointer ++ .long .LFBc-. # initial_location ++ .long .LFEc-.LFBc # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc0-.LFBc ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc1-.LCFIc0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEc: diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx new file mode 100644 index 000000000000..e6e306b99efd --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx @@ -0,0 +1,285 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Jan 19 00:06:09 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Feb 21 21:13:28 2005 +@@ -77,7 +77,7 @@ + { + + //================================================================================================== +-static typelib_TypeClass cpp2uno_call( ++void cpp2uno_call( + bridges::cpp_uno::shared::CppInterfaceProxy * pThis, + const typelib_TypeDescription * pMemberTypeDescr, + typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return +@@ -209,8 +209,6 @@ + CPPU_CURRENT_NAMESPACE::raiseException( + &aUnoExc, pThis->getBridge()->getUno2Cpp() ); + // has to destruct the any +- // is here for dummy +- return typelib_TypeClass_VOID; + } + else // else no exception occured... + { +@@ -247,22 +245,16 @@ + } + if (pReturnTypeDescr) + { +- typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; + TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); +- return eRet; + } +- else +- return typelib_TypeClass_VOID; + } + } + + + //================================================================================================== +-static typelib_TypeClass cpp_mediate( +- sal_Int32 nFunctionIndex, +- sal_Int32 nVtableOffset, +- void ** pCallStack, +- sal_Int64 * pRegisterReturn /* space for register return */ ) ++extern "C" void cpp_vtable_call( ++ int nFunctionIndex, int nVtableOffset, void** pCallStack, ++ sal_Int64 nRegReturn ) + { + OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); + +@@ -298,7 +290,6 @@ + + TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); + +- typelib_TypeClass eRet; + switch (aMemberDescr.get()->eTypeClass) + { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: +@@ -306,11 +297,11 @@ + if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex) + { + // is GET method +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, + 0, 0, // no params +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + else + { +@@ -321,11 +312,11 @@ + aParam.bIn = sal_True; + aParam.bOut = sal_False; + +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + 0, // indicates void return + 1, &aParam, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -336,11 +327,9 @@ + { + case 1: // acquire() + pCppI->acquireProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 2: // release() + pCppI->releaseProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 0: // queryInterface() opt + { +@@ -361,20 +350,19 @@ + &pInterface, pTD, cpp_acquire ); + pInterface->release(); + TYPELIB_DANGER_RELEASE( pTD ); +- *(void **)pRegisterReturn = pCallStack[1]; +- eRet = typelib_TypeClass_ANY; ++ *(void **)&nRegReturn = pCallStack[1]; + break; + } + TYPELIB_DANGER_RELEASE( pTD ); + } + } // else perform queryInterface() + default: +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -383,72 +371,55 @@ + throw RuntimeException( + rtl::OUString::createFromAscii("no member description found!"), + (XInterface *)pThis ); +- // is here for dummy +- eRet = typelib_TypeClass_VOID; + } + } +- +- return eRet; + } + + //================================================================================================== +-/** +- * is called on incoming vtable calls +- * (called by asm snippets) +- */ +-static void cpp_vtable_call( +- int nFunctionIndex, int nVtableOffset, void** pCallStack ) +- __attribute__((regparm(3))); +- +-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack ) +-{ +- volatile long nRegReturn[2]; +- typelib_TypeClass aType = cpp_mediate( +- nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn ); +- +- switch( aType ) +- { +- case typelib_TypeClass_HYPER: +- case typelib_TypeClass_UNSIGNED_HYPER: +- __asm__( "movl %1, %%edx\n\t" +- "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); +- break; +- case typelib_TypeClass_FLOAT: +- __asm__( "flds %0\n\t" +- "fstp %%st(0)\n\t" +- "flds %0\n" +- : : "m"(*(float *)nRegReturn) ); +- break; +- case typelib_TypeClass_DOUBLE: +- __asm__( "fldl %0\n\t" +- "fstp %%st(0)\n\t" +- "fldl %0\n" +- : : "m"(*(double *)nRegReturn) ); +- break; +-// case typelib_TypeClass_UNSIGNED_SHORT: +-// case typelib_TypeClass_SHORT: +-// __asm__( "movswl %0, %%eax\n" +-// : : "m"(nRegReturn) ); +-// break; +- default: +- __asm__( "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]) ); +- break; +- } +-} +- ++extern "C" void privateSnippetExecutorGeneral(); ++extern "C" void privateSnippetExecutorVoid(); ++extern "C" void privateSnippetExecutorHyper(); ++extern "C" void privateSnippetExecutorFloat(); ++extern "C" void privateSnippetExecutorDouble(); ++extern "C" void privateSnippetExecutorClass(); ++extern "C" typedef void (*PrivateSnippetExecutor)(); + +-//================================================================================================== +-int const codeSnippetSize = 20; ++int const codeSnippetSize = 16; + + unsigned char * codeSnippet( + unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, +- bool simpleRetType) ++ typelib_TypeClass returnTypeClass) + { +- if (!simpleRetType) { ++ if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { + functionIndex |= 0x80000000; + } ++ PrivateSnippetExecutor exec; ++ switch (returnTypeClass) { ++ case typelib_TypeClass_VOID: ++ exec = privateSnippetExecutorVoid; ++ break; ++ case typelib_TypeClass_HYPER: ++ case typelib_TypeClass_UNSIGNED_HYPER: ++ exec = privateSnippetExecutorHyper; ++ break; ++ case typelib_TypeClass_FLOAT: ++ exec = privateSnippetExecutorFloat; ++ break; ++ case typelib_TypeClass_DOUBLE: ++ exec = privateSnippetExecutorDouble; ++ break; ++ case typelib_TypeClass_STRING: ++ case typelib_TypeClass_TYPE: ++ case typelib_TypeClass_ANY: ++ case typelib_TypeClass_SEQUENCE: ++ case typelib_TypeClass_STRUCT: ++ case typelib_TypeClass_INTERFACE: ++ exec = privateSnippetExecutorClass; ++ break; ++ default: ++ exec = privateSnippetExecutorGeneral; ++ break; ++ } + unsigned char * p = code; + OSL_ASSERT(sizeof (sal_Int32) == 4); + // mov function_index, %eax: +@@ -459,13 +430,10 @@ + *p++ = 0xBA; + *reinterpret_cast< sal_Int32 * >(p) = vtableOffset; + p += sizeof (sal_Int32); +- // mov %esp, %ecx: +- *p++ = 0x89; +- *p++ = 0xE1; +- // jmp cpp_vtable_call: ++ // jmp privateSnippetExecutor: + *p++ = 0xE9; + *reinterpret_cast< sal_Int32 * >(p) +- = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32); ++ = ((unsigned char *) exec) - p - sizeof (sal_Int32); + p += sizeof (sal_Int32); + OSL_ASSERT(p - code <= codeSnippetSize); + return code + codeSnippetSize; +@@ -504,17 +472,17 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceAttributeTypeDescription * >( +- member)->pAttributeTypeRef)); ++ reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( ++ member)->pAttributeTypeRef->eTypeClass); + // Setter: + if (!reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { + *slots++ = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ code = codeSnippet( ++ code, functionOffset++, vtableOffset, ++ typelib_TypeClass_VOID); + } + break; + +@@ -522,10 +490,8 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceMethodTypeDescription * >( +- member)->pReturnTypeRef)); ++ reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( ++ member)->pReturnTypeRef->eTypeClass); + break; + + default: diff --git a/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..6f6a3a0f3e13 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk @@ -0,0 +1,24 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk Fri May 20 11:14:36 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Fri May 20 11:16:09 2005 +@@ -87,7 +87,8 @@ + SLOFILES= \ + $(SLO)$/except.obj \ + $(SLO)$/cpp2uno.obj \ +- $(SLO)$/uno2cpp.obj ++ $(SLO)$/uno2cpp.obj \ ++ $(SLO)$/call.obj + + SHL1TARGET= $(TARGET) + +@@ -108,3 +109,6 @@ + + .INCLUDE : target.mk + ++$(SLO)$/%.obj: %.s ++ $(CC) -c -o $(SLO)$/$(@:b).o $< ++ touch $@ diff --git a/editors/openoffice.org-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch index 7cf03a50d0a5..ba324bf13dd3 100644 --- a/editors/openoffice.org-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch +++ b/editors/openoffice.org-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch @@ -3,47 +3,17 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct version number of resultant shared lib -Index: libxmlsec/xmlsec1-1.2.6.patch +Index: xmlsec1-1.2.6.patch =================================================================== RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v -retrieving revision 1.3 -diff -u -r1.3 xmlsec1-1.2.6.patch ---- libxmlsec/xmlsec1-1.2.6.patch 29 Mar 2005 11:45:08 -0000 1.3 -+++ libxmlsec/xmlsec1-1.2.6.patch 6 Apr 2005 04:46:13 -0000 -@@ -13957,3 +13957,61 @@ - XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib - - XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib -+*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 -+--- misc/build/xmlsec1-1.2.6/ltmain.sh Wed Apr 6 13:32:04 2005 -+*************** -+*** 2918,2929 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2918,2929 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +retrieving revision 1.5 +diff -u -r1.5 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 18 May 2005 10:11:24 -0000 1.5 ++++ libxmlsec/xmlsec1-1.2.6.patch 22 May 2005 01:43:49 -0000 +@@ -756,6 +756,35 @@ + *** misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 + --- misc/build/xmlsec1-1.2.6/ltmain.sh 2005-05-09 19:55:51.745319024 +0200 + *************** +*** 2994,3006 **** + ;; + @@ -72,3 +42,7 @@ diff -u -r1.3 xmlsec1-1.2.6.patch + ;; + + irix | nonstopux) ++*************** + *** 3564,3570 **** + fi + else diff --git a/editors/openoffice.org-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch index 91d4cf4ce4b1..ea2d00a49c68 100644 --- a/editors/openoffice.org-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch +++ b/editors/openoffice.org-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch @@ -3,47 +3,20 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct shared lib number -Index: sndfile/libsndfile-1.0.9.patch +Index: libsndfile-1.0.9.patch =================================================================== RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v retrieving revision 1.1 diff -u -r1.1 libsndfile-1.0.9.patch --- sndfile/libsndfile-1.0.9.patch 6 Oct 2004 11:49:36 -0000 1.1 -+++ sndfile/libsndfile-1.0.9.patch 28 Mar 2005 07:59:15 -0000 -@@ -231,3 +231,51 @@ ++++ sndfile/libsndfile-1.0.9.patch 22 May 2005 02:01:17 -0000 +@@ -231,3 +231,24 @@ #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL +*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 13:02:07 2004 +--- misc/build/libsndfile-1.0.9/ltmain.sh Mon Mar 28 16:37:47 2005 +*************** -+*** 2899,2910 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2899,2910 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +*** 2980,2987 **** + ;; + diff --git a/editors/openoffice.org-3-devel/files/patch-solenv b/editors/openoffice.org-3-devel/files/patch-solenv deleted file mode 100644 index b1e86cebebdd..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-solenv +++ /dev/null @@ -1,35 +0,0 @@ -Issutracker : #i48304# -CWS : N/A -Author : NAKATA Maho (JCA) -Description : getuid.so is not req'ed for FreeBSD - -Index: bin/modules/installer/download.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/download.pm,v -retrieving revision 1.13 -diff -u -r1.13 download.pm ---- solenv/bin/modules/installer/download.pm 25 Apr 2005 11:55:33 -0000 1.13 -+++ solenv/bin/modules/installer/download.pm 28 Apr 2005 00:11:54 -0000 -@@ -189,9 +189,10 @@ - # my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |"; - - # $ENV{'LD_PRELOAD'} = $getuidlibrary; --# my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; -+#getuid.so is req'ed for Linux/Solaris? FreeBSD/MacOSX don't need it. -+ my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; - -- my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; -+# my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; - - my $sumoutput = ""; - -@@ -228,7 +229,8 @@ - - my $getuidlibraryname = "getuid.so"; - my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0); -- if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } -+# ad hock prohibiting error -+# if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } - - return $$getuidlibraryref; - } diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 15fe526efb13..80d5a832f6a2 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -19,8 +19,8 @@ COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(develo NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz MOZILLA_VERSION= 1.7.5 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) DISTFILES+= ${MOZILLA_SOURCE}:mozsrc .endif @@ -48,8 +48,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 103 -SNAPDATE= 20050512 +MILESTONE= 105 +SNAPDATE= 20050521 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo index 9c859bca1d4d..c308f56de99d 100644 --- a/editors/openoffice.org-3/distinfo +++ b/editors/openoffice.org-3/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 65c42ee71a3bca66ef38a332826f2ef7 -SIZE (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 214220004 +MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810 +SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 diff --git a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s new file mode 100644 index 000000000000..00bf61a6a587 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s @@ -0,0 +1,270 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s Thu Jan 1 09:00:00 1970 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Fri May 20 11:21:13 2005 +@@ -0,0 +1,262 @@ ++ .text ++ ++.globl privateSnippetExecutorGeneral ++ .type privateSnippetExecutorGeneral,@function ++privateSnippetExecutorGeneral: ++.LFBg: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIg0: ++ movl %esp,%ebp ++.LCFIg1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEg: ++ .size privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral ++ ++.globl privateSnippetExecutorVoid ++ .type privateSnippetExecutorVoid,@function ++privateSnippetExecutorVoid: ++.LFBv: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIv0: ++ movl %esp,%ebp ++.LCFIv1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ leave ++ ret ++.LFEv: ++ .size privateSnippetExecutorVoid,.-privateSnippetExecutorVoid ++ ++.globl privateSnippetExecutorHyper ++ .type privateSnippetExecutorHyper,@function ++privateSnippetExecutorHyper: ++.LFBh: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIh0: ++ movl %esp,%ebp ++.LCFIh1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ movl 16(%esp),%edx # 64 bit nRegReturn, upper half ++ leave ++ ret ++.LFEh: ++ .size privateSnippetExecutorHyper,.-privateSnippetExecutorHyper ++ ++.globl privateSnippetExecutorFloat ++ .type privateSnippetExecutorFloat,@function ++privateSnippetExecutorFloat: ++.LFBf: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIf0: ++ movl %esp,%ebp ++.LCFIf1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ flds 12(%esp) # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEf: ++ .size privateSnippetExecutorFloat,.-privateSnippetExecutorFloat ++ ++.globl privateSnippetExecutorDouble ++ .type privateSnippetExecutorDouble,@function ++privateSnippetExecutorDouble: ++.LFBd: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFId0: ++ movl %esp,%ebp ++.LCFId1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ fldl 12(%esp) # 64 bit nRegReturn ++ leave ++ ret ++.LFEd: ++ .size privateSnippetExecutorDouble,.-privateSnippetExecutorDouble ++ ++.globl privateSnippetExecutorClass ++ .type privateSnippetExecutorClass,@function ++privateSnippetExecutorClass: ++.LFBc: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIc0: ++ movl %esp,%ebp ++.LCFIc1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret $4 ++.LFEc: ++ .size privateSnippetExecutorClass,.-privateSnippetExecutorClass ++ ++ .section .eh_frame,"a",@progbits ++.Lframe1: ++ .long .LECIE1-.LSCIE1 # length ++.LSCIE1: ++ .long 0 # CIE_ID ++ .byte 1 # version ++ .string "zR" # augmentation ++ .uleb128 1 # code_alignment_factor ++ .sleb128 -4 # data_alignment_factor ++ .byte 8 # return_address_register ++ .uleb128 1 # augmentation size 1: ++ .byte 0x1B # FDE Encoding (pcrel sdata4) ++ # initial_instructions: ++ .byte 0x0C # DW_CFA_def_cfa %esp, 4 ++ .uleb128 4 ++ .uleb128 4 ++ .byte 0x88 # DW_CFA_offset ret, 1 ++ .uleb128 1 ++ .align 4 ++.LECIE1: ++.LSFDEg: ++ .long .LEFDEg-.LASFDEg # length ++.LASFDEg: ++ .long .LASFDEg-.Lframe1 # CIE_pointer ++ .long .LFBg-. # initial_location ++ .long .LFEg-.LFBg # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg0-.LFBg ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg1-.LCFIg0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEg: ++.LSFDEv: ++ .long .LEFDEv-.LASFDEv # length ++.LASFDEv: ++ .long .LASFDEv-.Lframe1 # CIE_pointer ++ .long .LFBv-. # initial_location ++ .long .LFEv-.LFBv # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv0-.LFBv ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv1-.LCFIv0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEv: ++.LSFDEh: ++ .long .LEFDEh-.LASFDEh # length ++.LASFDEh: ++ .long .LASFDEh-.Lframe1 # CIE_pointer ++ .long .LFBh-. # initial_location ++ .long .LFEh-.LFBh # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh0-.LFBh ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh1-.LCFIh0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEh: ++.LSFDEf: ++ .long .LEFDEf-.LASFDEf # length ++.LASFDEf: ++ .long .LASFDEf-.Lframe1 # CIE_pointer ++ .long .LFBf-. # initial_location ++ .long .LFEf-.LFBf # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf0-.LFBf ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf1-.LCFIf0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEf: ++.LSFDEd: ++ .long .LEFDEd-.LASFDEd # length ++.LASFDEd: ++ .long .LASFDEd-.Lframe1 # CIE_pointer ++ .long .LFBd-. # initial_location ++ .long .LFEd-.LFBd # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId0-.LFBd ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId1-.LCFId0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEd: ++.LSFDEc: ++ .long .LEFDEc-.LASFDEc # length ++.LASFDEc: ++ .long .LASFDEc-.Lframe1 # CIE_pointer ++ .long .LFBc-. # initial_location ++ .long .LFEc-.LFBc # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc0-.LFBc ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc1-.LCFIc0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEc: diff --git a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx new file mode 100644 index 000000000000..e6e306b99efd --- /dev/null +++ b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx @@ -0,0 +1,285 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Jan 19 00:06:09 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Feb 21 21:13:28 2005 +@@ -77,7 +77,7 @@ + { + + //================================================================================================== +-static typelib_TypeClass cpp2uno_call( ++void cpp2uno_call( + bridges::cpp_uno::shared::CppInterfaceProxy * pThis, + const typelib_TypeDescription * pMemberTypeDescr, + typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return +@@ -209,8 +209,6 @@ + CPPU_CURRENT_NAMESPACE::raiseException( + &aUnoExc, pThis->getBridge()->getUno2Cpp() ); + // has to destruct the any +- // is here for dummy +- return typelib_TypeClass_VOID; + } + else // else no exception occured... + { +@@ -247,22 +245,16 @@ + } + if (pReturnTypeDescr) + { +- typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; + TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); +- return eRet; + } +- else +- return typelib_TypeClass_VOID; + } + } + + + //================================================================================================== +-static typelib_TypeClass cpp_mediate( +- sal_Int32 nFunctionIndex, +- sal_Int32 nVtableOffset, +- void ** pCallStack, +- sal_Int64 * pRegisterReturn /* space for register return */ ) ++extern "C" void cpp_vtable_call( ++ int nFunctionIndex, int nVtableOffset, void** pCallStack, ++ sal_Int64 nRegReturn ) + { + OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); + +@@ -298,7 +290,6 @@ + + TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); + +- typelib_TypeClass eRet; + switch (aMemberDescr.get()->eTypeClass) + { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: +@@ -306,11 +297,11 @@ + if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex) + { + // is GET method +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, + 0, 0, // no params +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + else + { +@@ -321,11 +312,11 @@ + aParam.bIn = sal_True; + aParam.bOut = sal_False; + +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + 0, // indicates void return + 1, &aParam, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -336,11 +327,9 @@ + { + case 1: // acquire() + pCppI->acquireProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 2: // release() + pCppI->releaseProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 0: // queryInterface() opt + { +@@ -361,20 +350,19 @@ + &pInterface, pTD, cpp_acquire ); + pInterface->release(); + TYPELIB_DANGER_RELEASE( pTD ); +- *(void **)pRegisterReturn = pCallStack[1]; +- eRet = typelib_TypeClass_ANY; ++ *(void **)&nRegReturn = pCallStack[1]; + break; + } + TYPELIB_DANGER_RELEASE( pTD ); + } + } // else perform queryInterface() + default: +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -383,72 +371,55 @@ + throw RuntimeException( + rtl::OUString::createFromAscii("no member description found!"), + (XInterface *)pThis ); +- // is here for dummy +- eRet = typelib_TypeClass_VOID; + } + } +- +- return eRet; + } + + //================================================================================================== +-/** +- * is called on incoming vtable calls +- * (called by asm snippets) +- */ +-static void cpp_vtable_call( +- int nFunctionIndex, int nVtableOffset, void** pCallStack ) +- __attribute__((regparm(3))); +- +-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack ) +-{ +- volatile long nRegReturn[2]; +- typelib_TypeClass aType = cpp_mediate( +- nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn ); +- +- switch( aType ) +- { +- case typelib_TypeClass_HYPER: +- case typelib_TypeClass_UNSIGNED_HYPER: +- __asm__( "movl %1, %%edx\n\t" +- "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); +- break; +- case typelib_TypeClass_FLOAT: +- __asm__( "flds %0\n\t" +- "fstp %%st(0)\n\t" +- "flds %0\n" +- : : "m"(*(float *)nRegReturn) ); +- break; +- case typelib_TypeClass_DOUBLE: +- __asm__( "fldl %0\n\t" +- "fstp %%st(0)\n\t" +- "fldl %0\n" +- : : "m"(*(double *)nRegReturn) ); +- break; +-// case typelib_TypeClass_UNSIGNED_SHORT: +-// case typelib_TypeClass_SHORT: +-// __asm__( "movswl %0, %%eax\n" +-// : : "m"(nRegReturn) ); +-// break; +- default: +- __asm__( "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]) ); +- break; +- } +-} +- ++extern "C" void privateSnippetExecutorGeneral(); ++extern "C" void privateSnippetExecutorVoid(); ++extern "C" void privateSnippetExecutorHyper(); ++extern "C" void privateSnippetExecutorFloat(); ++extern "C" void privateSnippetExecutorDouble(); ++extern "C" void privateSnippetExecutorClass(); ++extern "C" typedef void (*PrivateSnippetExecutor)(); + +-//================================================================================================== +-int const codeSnippetSize = 20; ++int const codeSnippetSize = 16; + + unsigned char * codeSnippet( + unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, +- bool simpleRetType) ++ typelib_TypeClass returnTypeClass) + { +- if (!simpleRetType) { ++ if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { + functionIndex |= 0x80000000; + } ++ PrivateSnippetExecutor exec; ++ switch (returnTypeClass) { ++ case typelib_TypeClass_VOID: ++ exec = privateSnippetExecutorVoid; ++ break; ++ case typelib_TypeClass_HYPER: ++ case typelib_TypeClass_UNSIGNED_HYPER: ++ exec = privateSnippetExecutorHyper; ++ break; ++ case typelib_TypeClass_FLOAT: ++ exec = privateSnippetExecutorFloat; ++ break; ++ case typelib_TypeClass_DOUBLE: ++ exec = privateSnippetExecutorDouble; ++ break; ++ case typelib_TypeClass_STRING: ++ case typelib_TypeClass_TYPE: ++ case typelib_TypeClass_ANY: ++ case typelib_TypeClass_SEQUENCE: ++ case typelib_TypeClass_STRUCT: ++ case typelib_TypeClass_INTERFACE: ++ exec = privateSnippetExecutorClass; ++ break; ++ default: ++ exec = privateSnippetExecutorGeneral; ++ break; ++ } + unsigned char * p = code; + OSL_ASSERT(sizeof (sal_Int32) == 4); + // mov function_index, %eax: +@@ -459,13 +430,10 @@ + *p++ = 0xBA; + *reinterpret_cast< sal_Int32 * >(p) = vtableOffset; + p += sizeof (sal_Int32); +- // mov %esp, %ecx: +- *p++ = 0x89; +- *p++ = 0xE1; +- // jmp cpp_vtable_call: ++ // jmp privateSnippetExecutor: + *p++ = 0xE9; + *reinterpret_cast< sal_Int32 * >(p) +- = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32); ++ = ((unsigned char *) exec) - p - sizeof (sal_Int32); + p += sizeof (sal_Int32); + OSL_ASSERT(p - code <= codeSnippetSize); + return code + codeSnippetSize; +@@ -504,17 +472,17 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceAttributeTypeDescription * >( +- member)->pAttributeTypeRef)); ++ reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( ++ member)->pAttributeTypeRef->eTypeClass); + // Setter: + if (!reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { + *slots++ = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ code = codeSnippet( ++ code, functionOffset++, vtableOffset, ++ typelib_TypeClass_VOID); + } + break; + +@@ -522,10 +490,8 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceMethodTypeDescription * >( +- member)->pReturnTypeRef)); ++ reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( ++ member)->pReturnTypeRef->eTypeClass); + break; + + default: diff --git a/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..6f6a3a0f3e13 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk @@ -0,0 +1,24 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk Fri May 20 11:14:36 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Fri May 20 11:16:09 2005 +@@ -87,7 +87,8 @@ + SLOFILES= \ + $(SLO)$/except.obj \ + $(SLO)$/cpp2uno.obj \ +- $(SLO)$/uno2cpp.obj ++ $(SLO)$/uno2cpp.obj \ ++ $(SLO)$/call.obj + + SHL1TARGET= $(TARGET) + +@@ -108,3 +109,6 @@ + + .INCLUDE : target.mk + ++$(SLO)$/%.obj: %.s ++ $(CC) -c -o $(SLO)$/$(@:b).o $< ++ touch $@ diff --git a/editors/openoffice.org-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch index 7cf03a50d0a5..ba324bf13dd3 100644 --- a/editors/openoffice.org-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch +++ b/editors/openoffice.org-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch @@ -3,47 +3,17 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct version number of resultant shared lib -Index: libxmlsec/xmlsec1-1.2.6.patch +Index: xmlsec1-1.2.6.patch =================================================================== RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v -retrieving revision 1.3 -diff -u -r1.3 xmlsec1-1.2.6.patch ---- libxmlsec/xmlsec1-1.2.6.patch 29 Mar 2005 11:45:08 -0000 1.3 -+++ libxmlsec/xmlsec1-1.2.6.patch 6 Apr 2005 04:46:13 -0000 -@@ -13957,3 +13957,61 @@ - XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib - - XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib -+*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 -+--- misc/build/xmlsec1-1.2.6/ltmain.sh Wed Apr 6 13:32:04 2005 -+*************** -+*** 2918,2929 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2918,2929 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +retrieving revision 1.5 +diff -u -r1.5 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 18 May 2005 10:11:24 -0000 1.5 ++++ libxmlsec/xmlsec1-1.2.6.patch 22 May 2005 01:43:49 -0000 +@@ -756,6 +756,35 @@ + *** misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 + --- misc/build/xmlsec1-1.2.6/ltmain.sh 2005-05-09 19:55:51.745319024 +0200 + *************** +*** 2994,3006 **** + ;; + @@ -72,3 +42,7 @@ diff -u -r1.3 xmlsec1-1.2.6.patch + ;; + + irix | nonstopux) ++*************** + *** 3564,3570 **** + fi + else diff --git a/editors/openoffice.org-3/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-3/files/patch-sndfile+libsndfile-1.0.9.patch index 91d4cf4ce4b1..ea2d00a49c68 100644 --- a/editors/openoffice.org-3/files/patch-sndfile+libsndfile-1.0.9.patch +++ b/editors/openoffice.org-3/files/patch-sndfile+libsndfile-1.0.9.patch @@ -3,47 +3,20 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct shared lib number -Index: sndfile/libsndfile-1.0.9.patch +Index: libsndfile-1.0.9.patch =================================================================== RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v retrieving revision 1.1 diff -u -r1.1 libsndfile-1.0.9.patch --- sndfile/libsndfile-1.0.9.patch 6 Oct 2004 11:49:36 -0000 1.1 -+++ sndfile/libsndfile-1.0.9.patch 28 Mar 2005 07:59:15 -0000 -@@ -231,3 +231,51 @@ ++++ sndfile/libsndfile-1.0.9.patch 22 May 2005 02:01:17 -0000 +@@ -231,3 +231,24 @@ #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL +*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 13:02:07 2004 +--- misc/build/libsndfile-1.0.9/ltmain.sh Mon Mar 28 16:37:47 2005 +*************** -+*** 2899,2910 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2899,2910 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +*** 2980,2987 **** + ;; + diff --git a/editors/openoffice.org-3/files/patch-solenv b/editors/openoffice.org-3/files/patch-solenv deleted file mode 100644 index b1e86cebebdd..000000000000 --- a/editors/openoffice.org-3/files/patch-solenv +++ /dev/null @@ -1,35 +0,0 @@ -Issutracker : #i48304# -CWS : N/A -Author : NAKATA Maho (JCA) -Description : getuid.so is not req'ed for FreeBSD - -Index: bin/modules/installer/download.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/download.pm,v -retrieving revision 1.13 -diff -u -r1.13 download.pm ---- solenv/bin/modules/installer/download.pm 25 Apr 2005 11:55:33 -0000 1.13 -+++ solenv/bin/modules/installer/download.pm 28 Apr 2005 00:11:54 -0000 -@@ -189,9 +189,10 @@ - # my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |"; - - # $ENV{'LD_PRELOAD'} = $getuidlibrary; --# my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; -+#getuid.so is req'ed for Linux/Solaris? FreeBSD/MacOSX don't need it. -+ my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; - -- my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; -+# my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; - - my $sumoutput = ""; - -@@ -228,7 +229,8 @@ - - my $getuidlibraryname = "getuid.so"; - my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0); -- if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } -+# ad hock prohibiting error -+# if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } - - return $$getuidlibraryref; - } diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 15fe526efb13..80d5a832f6a2 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -19,8 +19,8 @@ COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(develo NO_LATEST_LINK= yes USE_GNOME= gtk20 gnomevfs2 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz MOZILLA_VERSION= 1.7.5 +MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz .if !defined(WITHOUT_MOZILLA) DISTFILES+= ${MOZILLA_SOURCE}:mozsrc .endif @@ -48,8 +48,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 103 -SNAPDATE= 20050512 +MILESTONE= 105 +SNAPDATE= 20050521 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo index 9c859bca1d4d..c308f56de99d 100644 --- a/editors/openoffice.org-vcltesttool/distinfo +++ b/editors/openoffice.org-vcltesttool/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 65c42ee71a3bca66ef38a332826f2ef7 -SIZE (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 214220004 +MD5 (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 014ee2d80ceeefdb4fe6eb40cc401810 +SIZE (openoffice.org2.0/OOo_1.9m105_source.tar.bz2) = 212606617 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s new file mode 100644 index 000000000000..00bf61a6a587 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+call.s @@ -0,0 +1,270 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/call.s Thu Jan 1 09:00:00 1970 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Fri May 20 11:21:13 2005 +@@ -0,0 +1,262 @@ ++ .text ++ ++.globl privateSnippetExecutorGeneral ++ .type privateSnippetExecutorGeneral,@function ++privateSnippetExecutorGeneral: ++.LFBg: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIg0: ++ movl %esp,%ebp ++.LCFIg1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEg: ++ .size privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral ++ ++.globl privateSnippetExecutorVoid ++ .type privateSnippetExecutorVoid,@function ++privateSnippetExecutorVoid: ++.LFBv: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIv0: ++ movl %esp,%ebp ++.LCFIv1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ leave ++ ret ++.LFEv: ++ .size privateSnippetExecutorVoid,.-privateSnippetExecutorVoid ++ ++.globl privateSnippetExecutorHyper ++ .type privateSnippetExecutorHyper,@function ++privateSnippetExecutorHyper: ++.LFBh: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIh0: ++ movl %esp,%ebp ++.LCFIh1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ movl 16(%esp),%edx # 64 bit nRegReturn, upper half ++ leave ++ ret ++.LFEh: ++ .size privateSnippetExecutorHyper,.-privateSnippetExecutorHyper ++ ++.globl privateSnippetExecutorFloat ++ .type privateSnippetExecutorFloat,@function ++privateSnippetExecutorFloat: ++.LFBf: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIf0: ++ movl %esp,%ebp ++.LCFIf1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ flds 12(%esp) # 64 bit nRegReturn, lower half ++ leave ++ ret ++.LFEf: ++ .size privateSnippetExecutorFloat,.-privateSnippetExecutorFloat ++ ++.globl privateSnippetExecutorDouble ++ .type privateSnippetExecutorDouble,@function ++privateSnippetExecutorDouble: ++.LFBd: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFId0: ++ movl %esp,%ebp ++.LCFId1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ fldl 12(%esp) # 64 bit nRegReturn ++ leave ++ ret ++.LFEd: ++ .size privateSnippetExecutorDouble,.-privateSnippetExecutorDouble ++ ++.globl privateSnippetExecutorClass ++ .type privateSnippetExecutorClass,@function ++privateSnippetExecutorClass: ++.LFBc: ++ movl %esp,%ecx ++ pushl %ebp # proper stack frame needed for exception handling ++.LCFIc0: ++ movl %esp,%ebp ++.LCFIc1: ++ subl $0x8,%esp # 64bit nRegReturn ++ pushl %ecx # 32bit pCallStack ++ pushl %edx # 32bit nVtableOffset ++ pushl %eax # 32bit nFunctionIndex ++ call cpp_vtable_call ++ movl 12(%esp),%eax # 64 bit nRegReturn, lower half ++ leave ++ ret $4 ++.LFEc: ++ .size privateSnippetExecutorClass,.-privateSnippetExecutorClass ++ ++ .section .eh_frame,"a",@progbits ++.Lframe1: ++ .long .LECIE1-.LSCIE1 # length ++.LSCIE1: ++ .long 0 # CIE_ID ++ .byte 1 # version ++ .string "zR" # augmentation ++ .uleb128 1 # code_alignment_factor ++ .sleb128 -4 # data_alignment_factor ++ .byte 8 # return_address_register ++ .uleb128 1 # augmentation size 1: ++ .byte 0x1B # FDE Encoding (pcrel sdata4) ++ # initial_instructions: ++ .byte 0x0C # DW_CFA_def_cfa %esp, 4 ++ .uleb128 4 ++ .uleb128 4 ++ .byte 0x88 # DW_CFA_offset ret, 1 ++ .uleb128 1 ++ .align 4 ++.LECIE1: ++.LSFDEg: ++ .long .LEFDEg-.LASFDEg # length ++.LASFDEg: ++ .long .LASFDEg-.Lframe1 # CIE_pointer ++ .long .LFBg-. # initial_location ++ .long .LFEg-.LFBg # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg0-.LFBg ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIg1-.LCFIg0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEg: ++.LSFDEv: ++ .long .LEFDEv-.LASFDEv # length ++.LASFDEv: ++ .long .LASFDEv-.Lframe1 # CIE_pointer ++ .long .LFBv-. # initial_location ++ .long .LFEv-.LFBv # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv0-.LFBv ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIv1-.LCFIv0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEv: ++.LSFDEh: ++ .long .LEFDEh-.LASFDEh # length ++.LASFDEh: ++ .long .LASFDEh-.Lframe1 # CIE_pointer ++ .long .LFBh-. # initial_location ++ .long .LFEh-.LFBh # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh0-.LFBh ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIh1-.LCFIh0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEh: ++.LSFDEf: ++ .long .LEFDEf-.LASFDEf # length ++.LASFDEf: ++ .long .LASFDEf-.Lframe1 # CIE_pointer ++ .long .LFBf-. # initial_location ++ .long .LFEf-.LFBf # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf0-.LFBf ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIf1-.LCFIf0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEf: ++.LSFDEd: ++ .long .LEFDEd-.LASFDEd # length ++.LASFDEd: ++ .long .LASFDEd-.Lframe1 # CIE_pointer ++ .long .LFBd-. # initial_location ++ .long .LFEd-.LFBd # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId0-.LFBd ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFId1-.LCFId0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEd: ++.LSFDEc: ++ .long .LEFDEc-.LASFDEc # length ++.LASFDEc: ++ .long .LASFDEc-.Lframe1 # CIE_pointer ++ .long .LFBc-. # initial_location ++ .long .LFEc-.LFBc # address_range ++ .uleb128 0 # augmentation size 0 ++ # instructions: ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc0-.LFBc ++ .byte 0x0E # DW_CFA_def_cfa_offset 8 ++ .uleb128 8 ++ .byte 0x85 # DW_CFA_offset %ebp, 2 ++ .uleb128 2 ++ .byte 0x04 # DW_CFA_advance_loc4 ++ .long .LCFIc1-.LCFIc0 ++ .byte 0x0D # DW_CFA_def_cfa_register %ebp ++ .uleb128 5 ++ .align 4 ++.LEFDEc: diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx new file mode 100644 index 000000000000..e6e306b99efd --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+cpp2uno.cxx @@ -0,0 +1,285 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Jan 19 00:06:09 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Feb 21 21:13:28 2005 +@@ -77,7 +77,7 @@ + { + + //================================================================================================== +-static typelib_TypeClass cpp2uno_call( ++void cpp2uno_call( + bridges::cpp_uno::shared::CppInterfaceProxy * pThis, + const typelib_TypeDescription * pMemberTypeDescr, + typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return +@@ -209,8 +209,6 @@ + CPPU_CURRENT_NAMESPACE::raiseException( + &aUnoExc, pThis->getBridge()->getUno2Cpp() ); + // has to destruct the any +- // is here for dummy +- return typelib_TypeClass_VOID; + } + else // else no exception occured... + { +@@ -247,22 +245,16 @@ + } + if (pReturnTypeDescr) + { +- typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; + TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); +- return eRet; + } +- else +- return typelib_TypeClass_VOID; + } + } + + + //================================================================================================== +-static typelib_TypeClass cpp_mediate( +- sal_Int32 nFunctionIndex, +- sal_Int32 nVtableOffset, +- void ** pCallStack, +- sal_Int64 * pRegisterReturn /* space for register return */ ) ++extern "C" void cpp_vtable_call( ++ int nFunctionIndex, int nVtableOffset, void** pCallStack, ++ sal_Int64 nRegReturn ) + { + OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); + +@@ -298,7 +290,6 @@ + + TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); + +- typelib_TypeClass eRet; + switch (aMemberDescr.get()->eTypeClass) + { + case typelib_TypeClass_INTERFACE_ATTRIBUTE: +@@ -306,11 +297,11 @@ + if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex) + { + // is GET method +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, + 0, 0, // no params +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + else + { +@@ -321,11 +312,11 @@ + aParam.bIn = sal_True; + aParam.bOut = sal_False; + +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + 0, // indicates void return + 1, &aParam, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -336,11 +327,9 @@ + { + case 1: // acquire() + pCppI->acquireProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 2: // release() + pCppI->releaseProxy(); // non virtual call! +- eRet = typelib_TypeClass_VOID; + break; + case 0: // queryInterface() opt + { +@@ -361,20 +350,19 @@ + &pInterface, pTD, cpp_acquire ); + pInterface->release(); + TYPELIB_DANGER_RELEASE( pTD ); +- *(void **)pRegisterReturn = pCallStack[1]; +- eRet = typelib_TypeClass_ANY; ++ *(void **)&nRegReturn = pCallStack[1]; + break; + } + TYPELIB_DANGER_RELEASE( pTD ); + } + } // else perform queryInterface() + default: +- eRet = cpp2uno_call( ++ cpp2uno_call( + pCppI, aMemberDescr.get(), + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, + ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, +- pCallStack, pRegisterReturn ); ++ pCallStack, &nRegReturn ); + } + break; + } +@@ -383,72 +371,55 @@ + throw RuntimeException( + rtl::OUString::createFromAscii("no member description found!"), + (XInterface *)pThis ); +- // is here for dummy +- eRet = typelib_TypeClass_VOID; + } + } +- +- return eRet; + } + + //================================================================================================== +-/** +- * is called on incoming vtable calls +- * (called by asm snippets) +- */ +-static void cpp_vtable_call( +- int nFunctionIndex, int nVtableOffset, void** pCallStack ) +- __attribute__((regparm(3))); +- +-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack ) +-{ +- volatile long nRegReturn[2]; +- typelib_TypeClass aType = cpp_mediate( +- nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn ); +- +- switch( aType ) +- { +- case typelib_TypeClass_HYPER: +- case typelib_TypeClass_UNSIGNED_HYPER: +- __asm__( "movl %1, %%edx\n\t" +- "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); +- break; +- case typelib_TypeClass_FLOAT: +- __asm__( "flds %0\n\t" +- "fstp %%st(0)\n\t" +- "flds %0\n" +- : : "m"(*(float *)nRegReturn) ); +- break; +- case typelib_TypeClass_DOUBLE: +- __asm__( "fldl %0\n\t" +- "fstp %%st(0)\n\t" +- "fldl %0\n" +- : : "m"(*(double *)nRegReturn) ); +- break; +-// case typelib_TypeClass_UNSIGNED_SHORT: +-// case typelib_TypeClass_SHORT: +-// __asm__( "movswl %0, %%eax\n" +-// : : "m"(nRegReturn) ); +-// break; +- default: +- __asm__( "movl %0, %%eax\n" +- : : "m"(nRegReturn[0]) ); +- break; +- } +-} +- ++extern "C" void privateSnippetExecutorGeneral(); ++extern "C" void privateSnippetExecutorVoid(); ++extern "C" void privateSnippetExecutorHyper(); ++extern "C" void privateSnippetExecutorFloat(); ++extern "C" void privateSnippetExecutorDouble(); ++extern "C" void privateSnippetExecutorClass(); ++extern "C" typedef void (*PrivateSnippetExecutor)(); + +-//================================================================================================== +-int const codeSnippetSize = 20; ++int const codeSnippetSize = 16; + + unsigned char * codeSnippet( + unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, +- bool simpleRetType) ++ typelib_TypeClass returnTypeClass) + { +- if (!simpleRetType) { ++ if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { + functionIndex |= 0x80000000; + } ++ PrivateSnippetExecutor exec; ++ switch (returnTypeClass) { ++ case typelib_TypeClass_VOID: ++ exec = privateSnippetExecutorVoid; ++ break; ++ case typelib_TypeClass_HYPER: ++ case typelib_TypeClass_UNSIGNED_HYPER: ++ exec = privateSnippetExecutorHyper; ++ break; ++ case typelib_TypeClass_FLOAT: ++ exec = privateSnippetExecutorFloat; ++ break; ++ case typelib_TypeClass_DOUBLE: ++ exec = privateSnippetExecutorDouble; ++ break; ++ case typelib_TypeClass_STRING: ++ case typelib_TypeClass_TYPE: ++ case typelib_TypeClass_ANY: ++ case typelib_TypeClass_SEQUENCE: ++ case typelib_TypeClass_STRUCT: ++ case typelib_TypeClass_INTERFACE: ++ exec = privateSnippetExecutorClass; ++ break; ++ default: ++ exec = privateSnippetExecutorGeneral; ++ break; ++ } + unsigned char * p = code; + OSL_ASSERT(sizeof (sal_Int32) == 4); + // mov function_index, %eax: +@@ -459,13 +430,10 @@ + *p++ = 0xBA; + *reinterpret_cast< sal_Int32 * >(p) = vtableOffset; + p += sizeof (sal_Int32); +- // mov %esp, %ecx: +- *p++ = 0x89; +- *p++ = 0xE1; +- // jmp cpp_vtable_call: ++ // jmp privateSnippetExecutor: + *p++ = 0xE9; + *reinterpret_cast< sal_Int32 * >(p) +- = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32); ++ = ((unsigned char *) exec) - p - sizeof (sal_Int32); + p += sizeof (sal_Int32); + OSL_ASSERT(p - code <= codeSnippetSize); + return code + codeSnippetSize; +@@ -504,17 +472,17 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceAttributeTypeDescription * >( +- member)->pAttributeTypeRef)); ++ reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( ++ member)->pAttributeTypeRef->eTypeClass); + // Setter: + if (!reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { + *slots++ = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ code = codeSnippet( ++ code, functionOffset++, vtableOffset, ++ typelib_TypeClass_VOID); + } + break; + +@@ -522,10 +490,8 @@ + *slots++ = code; + code = codeSnippet( + code, functionOffset++, vtableOffset, +- bridges::cpp_uno::shared::isSimpleType( +- reinterpret_cast< +- typelib_InterfaceMethodTypeDescription * >( +- member)->pReturnTypeRef)); ++ reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( ++ member)->pReturnTypeRef->eTypeClass); + break; + + default: diff --git a/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk new file mode 100644 index 000000000000..6f6a3a0f3e13 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+makefile.mk @@ -0,0 +1,24 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author : NAKATA Maho (JCA) +Description : catch up recent version of cpp_uno + +--- bridges/source/cpp_uno/gcc3_freebsd_intel.old/makefile.mk Fri May 20 11:14:36 2005 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Fri May 20 11:16:09 2005 +@@ -87,7 +87,8 @@ + SLOFILES= \ + $(SLO)$/except.obj \ + $(SLO)$/cpp2uno.obj \ +- $(SLO)$/uno2cpp.obj ++ $(SLO)$/uno2cpp.obj \ ++ $(SLO)$/call.obj + + SHL1TARGET= $(TARGET) + +@@ -108,3 +109,6 @@ + + .INCLUDE : target.mk + ++$(SLO)$/%.obj: %.s ++ $(CC) -c -o $(SLO)$/$(@:b).o $< ++ touch $@ diff --git a/editors/openoffice.org-vcltesttool/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-vcltesttool/files/patch-libxmlsec+xmlsec1-1.2.6.patch index 7cf03a50d0a5..ba324bf13dd3 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-libxmlsec+xmlsec1-1.2.6.patch +++ b/editors/openoffice.org-vcltesttool/files/patch-libxmlsec+xmlsec1-1.2.6.patch @@ -3,47 +3,17 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct version number of resultant shared lib -Index: libxmlsec/xmlsec1-1.2.6.patch +Index: xmlsec1-1.2.6.patch =================================================================== RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v -retrieving revision 1.3 -diff -u -r1.3 xmlsec1-1.2.6.patch ---- libxmlsec/xmlsec1-1.2.6.patch 29 Mar 2005 11:45:08 -0000 1.3 -+++ libxmlsec/xmlsec1-1.2.6.patch 6 Apr 2005 04:46:13 -0000 -@@ -13957,3 +13957,61 @@ - XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib - - XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib -+*** misc/xmlsec1-1.2.6/ltmain.sh Thu Aug 26 15:00:15 2004 -+--- misc/build/xmlsec1-1.2.6/ltmain.sh Wed Apr 6 13:32:04 2005 -+*************** -+*** 2918,2929 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2918,2929 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +retrieving revision 1.5 +diff -u -r1.5 xmlsec1-1.2.6.patch +--- libxmlsec/xmlsec1-1.2.6.patch 18 May 2005 10:11:24 -0000 1.5 ++++ libxmlsec/xmlsec1-1.2.6.patch 22 May 2005 01:43:49 -0000 +@@ -756,6 +756,35 @@ + *** misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 + --- misc/build/xmlsec1-1.2.6/ltmain.sh 2005-05-09 19:55:51.745319024 +0200 + *************** +*** 2994,3006 **** + ;; + @@ -72,3 +42,7 @@ diff -u -r1.3 xmlsec1-1.2.6.patch + ;; + + irix | nonstopux) ++*************** + *** 3564,3570 **** + fi + else diff --git a/editors/openoffice.org-vcltesttool/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-vcltesttool/files/patch-sndfile+libsndfile-1.0.9.patch index 91d4cf4ce4b1..ea2d00a49c68 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-sndfile+libsndfile-1.0.9.patch +++ b/editors/openoffice.org-vcltesttool/files/patch-sndfile+libsndfile-1.0.9.patch @@ -3,47 +3,20 @@ CWS : N/A Author : NAKATA Maho (JCA) Description : correct shared lib number -Index: sndfile/libsndfile-1.0.9.patch +Index: libsndfile-1.0.9.patch =================================================================== RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v retrieving revision 1.1 diff -u -r1.1 libsndfile-1.0.9.patch --- sndfile/libsndfile-1.0.9.patch 6 Oct 2004 11:49:36 -0000 1.1 -+++ sndfile/libsndfile-1.0.9.patch 28 Mar 2005 07:59:15 -0000 -@@ -231,3 +231,51 @@ ++++ sndfile/libsndfile-1.0.9.patch 22 May 2005 02:01:17 -0000 +@@ -231,3 +231,24 @@ #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL +*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 13:02:07 2004 +--- misc/build/libsndfile-1.0.9/ltmain.sh Mon Mar 28 16:37:47 2005 +*************** -+*** 2899,2910 **** -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+--- 2899,2910 ---- -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+! darwin|linux|osf|windows|freebsd-aout|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+! sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+*************** +*** 2980,2987 **** + ;; + diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv b/editors/openoffice.org-vcltesttool/files/patch-solenv deleted file mode 100644 index b1e86cebebdd..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-solenv +++ /dev/null @@ -1,35 +0,0 @@ -Issutracker : #i48304# -CWS : N/A -Author : NAKATA Maho (JCA) -Description : getuid.so is not req'ed for FreeBSD - -Index: bin/modules/installer/download.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/download.pm,v -retrieving revision 1.13 -diff -u -r1.13 download.pm ---- solenv/bin/modules/installer/download.pm 25 Apr 2005 11:55:33 -0000 1.13 -+++ solenv/bin/modules/installer/download.pm 28 Apr 2005 00:11:54 -0000 -@@ -189,9 +189,10 @@ - # my $systemcall = "cd $installdir; tar $ownerstring -cf - * | /usr/bin/sum |"; - - # $ENV{'LD_PRELOAD'} = $getuidlibrary; --# my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; -+#getuid.so is req'ed for Linux/Solaris? FreeBSD/MacOSX don't need it. -+ my $systemcall = "cd $installdir; tar -cf - * | /usr/bin/sum |"; - -- my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; -+# my $systemcall = "cd $installdir; LD_PRELOAD=$getuidlibrary tar -cf - * | /usr/bin/sum |"; - - my $sumoutput = ""; - -@@ -228,7 +229,8 @@ - - my $getuidlibraryname = "getuid.so"; - my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0); -- if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } -+# ad hock prohibiting error -+# if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); } - - return $$getuidlibraryref; - } -- cgit v1.2.3