diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2009-06-14 20:30:38 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2009-06-14 20:30:38 +0000 |
| commit | b8aa0e612143938c3ba7cece545ed299b9404fd2 (patch) | |
| tree | d4658f73b604b513d2d849a9624459f926fb74a2 /editors/openoffice.org-vcltesttool/files | |
| parent | - Don't hardcore prefix in RC script. (diff) | |
Fix bad transfer url when tries to add extension.
PR: 127946
see also
http://www.openoffice.org/issues/show_bug.cgi?id=98781
http://www.openoffice.org/issues/show_bug.cgi?id=82690
http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
Submitted by : many
Notes
Notes:
svn path=/head/; revision=235820
Diffstat (limited to 'editors/openoffice.org-vcltesttool/files')
| -rw-r--r-- | editors/openoffice.org-vcltesttool/files/patch-i85126 | 26 | ||||
| -rw-r--r-- | editors/openoffice.org-vcltesttool/files/patch-i98781 | 24 |
2 files changed, 50 insertions, 0 deletions
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i85126 b/editors/openoffice.org-vcltesttool/files/patch-i85126 index f70616a998e1..c6bb6410bcb4 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-i85126 +++ b/editors/openoffice.org-vcltesttool/files/patch-i85126 @@ -1,4 +1,8 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free) +also fixes +http://www.openoffice.org/issues/show_bug.cgi?id=98781 +http://www.openoffice.org/issues/show_bug.cgi?id=82690 +http://www.freebsd.org/cgi/query-pr.cgi?pr=127946 --- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 16 Sep 2006 15:46:23 -0000 1.3 +++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 8 Jan 2008 16:57:00 -0000 @@ -117,3 +121,25 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free) VtableSlot aVtableSlot( getVtableSlot( reinterpret_cast< + + +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2008-02-04 22:43:50.000000000 +0900 ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 21:41:29.000000000 +0900 +@@ -126,7 +126,7 @@ + }; + //__________________________________________________________________________________________________ + RTTI::RTTI() SAL_THROW( () ) +-#if __FreeBSD_version < 602103 ++#ifdef FREEBSD /* #i22253# */ + : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) + #else + : m_hApp( dlopen( 0, RTLD_LAZY ) ) +@@ -165,7 +165,7 @@ + buf.append( 'E' ); + + OString symName( buf.makeStringAndClear() ); +-#if __FreeBSD_version < 602103 /* #i22253# */ ++#ifdef FREEBSD /* #i22253# */ + rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); + #else + rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); diff --git a/editors/openoffice.org-vcltesttool/files/patch-i98781 b/editors/openoffice.org-vcltesttool/files/patch-i98781 new file mode 100644 index 000000000000..90f951045aa8 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-i98781 @@ -0,0 +1,24 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=98781 +http://www.openoffice.org/issues/show_bug.cgi?id=82690 +http://www.freebsd.org/cgi/query-pr.cgi?pr=127946 + +--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:53:52.000000000 +0900 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:56:37.000000000 +0900 +@@ -126,7 +126,7 @@ + }; + //__________________________________________________________________________________________________ + RTTI::RTTI() SAL_THROW( () ) +-#if __FreeBSD_version < 602103 ++#ifdef FREEBSD /* #i22253# */ + : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) + #else + : m_hApp( dlopen( 0, RTLD_LAZY ) ) +@@ -165,7 +165,7 @@ + buf.append( 'E' ); + + OString symName( buf.makeStringAndClear() ); +-#if __FreeBSD_version < 602103 /* #i22253# */ ++#ifdef FREEBSD /* #i22253# */ + rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); + #else + rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); |