# This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # editors/openoffice.org-3/files/patch-zzi22253-regressed090307 # editors/openoffice.org-3-RC/files/patch-zzi22253-regressed090307 # echo x - editors/openoffice.org-3/files/patch-zzi22253-regressed090307 sed 's/^X//' >editors/openoffice.org-3/files/patch-zzi22253-regressed090307 << '1ea23787cfe1e0db7c520bc30b490511' X--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx.orig 2008-04-11 06:22:43.000000000 -0400 X+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-03-07 08:30:51.000000000 -0500 X@@ -121,11 +121,7 @@ X }; X //__________________________________________________________________________________________________ X RTTI::RTTI() SAL_THROW( () ) X-#if __FreeBSD_version < 602103 X : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) X-#else X- : m_hApp( dlopen( 0, RTLD_LAZY ) ) X-#endif X { X } X //__________________________________________________________________________________________________ X@@ -160,11 +156,7 @@ X buf.append( 'E' ); X X OString symName( buf.makeStringAndClear() ); X-#if __FreeBSD_version < 602103 /* #i22253# */ X rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); X-#else X- rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); X-#endif X X if (rtti) X { X--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx.orig2 2009-03-07 08:26:55.000000000 -0500 X+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-03-07 08:32:33.000000000 -0500 X@@ -121,11 +121,7 @@ X }; X //__________________________________________________________________________________________________ X RTTI::RTTI() SAL_THROW( () ) X-#if __FreeBSD_version < 602103 X : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) X-#else X- : m_hApp( dlopen( 0, RTLD_LAZY ) ) X-#endif X { X } X //__________________________________________________________________________________________________ X@@ -160,11 +156,7 @@ X buf.append( 'E' ); X X OString symName( buf.makeStringAndClear() ); X-#if __FreeBSD_version < 602103 /* #i22253# */ X rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); X-#else X- rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); X-#endif X X if (rtti) X { 1ea23787cfe1e0db7c520bc30b490511 echo x - editors/openoffice.org-3-RC/files/patch-zzi22253-regressed090307 sed 's/^X//' >editors/openoffice.org-3-RC/files/patch-zzi22253-regressed090307 << 'd05a0c8571bf73c2dc1c13b60840bb94' X--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx.orig 2009-03-04 17:07:31.000000000 -0500 X+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-03-07 08:02:46.000000000 -0500 X@@ -121,11 +121,7 @@ X }; X //__________________________________________________________________________________________________ X RTTI::RTTI() SAL_THROW( () ) X-#if __FreeBSD_version < 602103 X : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) X-#else X- : m_hApp( dlopen( 0, RTLD_LAZY ) ) X-#endif X { X } X //__________________________________________________________________________________________________ X@@ -160,11 +156,7 @@ X buf.append( 'E' ); X X OString symName( buf.makeStringAndClear() ); X-#if __FreeBSD_version < 602103 /* #i22253# */ X rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); X-#else X- rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); X-#endif X X if (rtti) X { X--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx.orig2 2009-03-07 07:55:23.000000000 -0500 X+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-03-07 08:03:43.000000000 -0500 X@@ -121,11 +121,7 @@ X }; X //__________________________________________________________________________________________________ X RTTI::RTTI() SAL_THROW( () ) X-#if __FreeBSD_version < 602103 X : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) X-#else X- : m_hApp( dlopen( 0, RTLD_LAZY ) ) X-#endif X { X } X //__________________________________________________________________________________________________ X@@ -160,11 +156,7 @@ X buf.append( 'E' ); X X OString symName( buf.makeStringAndClear() ); X-#if __FreeBSD_version < 602103 /* #i22253# */ X rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); X-#else X- rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); X-#endif X X if (rtti) X { d05a0c8571bf73c2dc1c13b60840bb94 exit