mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

Now (For __FreeBSD_version >= 702104)

Browse Source 
bridge part should work in the original form.

Bump portrevision for openoffice.org-2 and -3 ports.
This commit is contained in:
Maho Nakata 2009-07-15 12:10:36 +00:00
parent b911bf5e12
commit dbad8cd18f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=237869
21 changed files with 53 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editors/openoffice-3-devel/files/patch-i85126
View File

@ -142,7 +142,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
reinterpret_cast<
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 15:39:58.000000000 +0900
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 15:42:43.000000000 +0900
@@ -32,10 +32,10 @@
@@ -32,6 +32,7 @@
#include "precompiled_bridges.hxx"
#include <stdio.h>
@ -150,16 +150,12 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
-#include <sys/param.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -121,7 +121,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -168,7 +164,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

14
editors/openoffice-3-devel/files/patch-i98781
View File

@ -84,7 +84,7 @@ in files/patches-i85126
--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 14:17:39.000000000 +0900
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 15:14:24.000000000 +0900
@@ -32,10 +32,10 @@
@@ -32,6 +32,7 @@
#include "precompiled_bridges.hxx"
#include <stdio.h>
@ -92,25 +92,21 @@ in files/patches-i85126
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
-#include <sys/param.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -121,7 +121,7 @@
@@ -121,7 +122,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -160,7 +160,7 @@
@@ -160,7 +161,7 @@
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

2
editors/openoffice-3/Makefile
View File

@ -8,7 +8,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \

10
editors/openoffice-3/files/patch-i85126
View File

@ -142,7 +142,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
reinterpret_cast<
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 15:39:58.000000000 +0900
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 15:42:43.000000000 +0900
@@ -32,10 +32,10 @@
@@ -32,6 +32,7 @@
#include "precompiled_bridges.hxx"
#include <stdio.h>
@ -150,16 +150,12 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
-#include <sys/param.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -121,7 +121,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -168,7 +164,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

10
editors/openoffice-3/files/patch-i98781
View File

@ -84,7 +84,7 @@ in files/patches-i85126
--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 14:17:39.000000000 +0900
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 15:14:24.000000000 +0900
@@ -32,10 +32,10 @@
@@ -32,6 +32,7 @@
#include "precompiled_bridges.hxx"
#include <stdio.h>
@ -92,16 +92,12 @@ in files/patches-i85126
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
-#include <sys/param.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -121,7 +121,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -110,7 +106,7 @@ in files/patches-i85126
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

4
editors/openoffice.org-2-RC/files/patch-i85126
View File

@ -130,7 +130,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -139,7 +139,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

4
editors/openoffice.org-2-RC/files/patch-i98781
View File

@ -9,7 +9,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -18,7 +18,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

4
editors/openoffice.org-2-devel/files/patch-i85126
View File

@ -130,7 +130,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -139,7 +139,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

4
editors/openoffice.org-2-devel/files/patch-i98781
View File

@ -9,7 +9,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -18,7 +18,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

2
editors/openoffice.org-2/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION}
PORTREVISION?= 2
PORTREVISION?= 3
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \

4
editors/openoffice.org-2/files/patch-i85126
View File

@ -130,7 +130,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -139,7 +139,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

4
editors/openoffice.org-2/files/patch-i98781
View File

@ -9,7 +9,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -18,7 +18,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

10
editors/openoffice.org-3-RC/files/patch-i85126
View File

@ -142,7 +142,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
reinterpret_cast<
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 15:39:58.000000000 +0900
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 15:42:43.000000000 +0900
@@ -32,10 +32,10 @@
@@ -32,6 +32,7 @@
#include "precompiled_bridges.hxx"
#include <stdio.h>
@ -150,16 +150,12 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
-#include <sys/param.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -121,7 +121,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -168,7 +164,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

10
editors/openoffice.org-3-RC/files/patch-i98781
View File

@ -84,7 +84,7 @@ in files/patches-i85126
--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 14:17:39.000000000 +0900
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 15:14:24.000000000 +0900
@@ -32,10 +32,10 @@
@@ -32,6 +32,7 @@
#include "precompiled_bridges.hxx"
#include <stdio.h>
@ -92,16 +92,12 @@ in files/patches-i85126
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
-#include <sys/param.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -121,7 +121,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -110,7 +106,7 @@ in files/patches-i85126
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

10
editors/openoffice.org-3-devel/files/patch-i85126
View File

@ -142,7 +142,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
reinterpret_cast<
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 15:39:58.000000000 +0900
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 15:42:43.000000000 +0900
@@ -32,10 +32,10 @@
@@ -32,6 +32,7 @@
#include "precompiled_bridges.hxx"
#include <stdio.h>
@ -150,16 +150,12 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
-#include <sys/param.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -121,7 +121,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -168,7 +164,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

14
editors/openoffice.org-3-devel/files/patch-i98781
View File

@ -84,7 +84,7 @@ in files/patches-i85126
--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 14:17:39.000000000 +0900
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 15:14:24.000000000 +0900
@@ -32,10 +32,10 @@
@@ -32,6 +32,7 @@
#include "precompiled_bridges.hxx"
#include <stdio.h>
@ -92,25 +92,21 @@ in files/patches-i85126
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
-#include <sys/param.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -121,7 +121,7 @@
@@ -121,7 +122,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@@ -160,7 +160,7 @@
@@ -160,7 +161,7 @@
buf.append( 'E' );
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

2
editors/openoffice.org-3/Makefile
View File

@ -8,7 +8,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \

10
editors/openoffice.org-3/files/patch-i85126
View File

@ -142,7 +142,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
reinterpret_cast<
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 15:39:58.000000000 +0900
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 15:42:43.000000000 +0900
@@ -32,10 +32,10 @@
@@ -32,6 +32,7 @@
#include "precompiled_bridges.hxx"
#include <stdio.h>
@ -150,16 +150,12 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
-#include <sys/param.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -121,7 +121,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -168,7 +164,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=97320
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

10
editors/openoffice.org-3/files/patch-i98781
View File

@ -84,7 +84,7 @@ in files/patches-i85126
--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 14:17:39.000000000 +0900
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 15:14:24.000000000 +0900
@@ -32,10 +32,10 @@
@@ -32,6 +32,7 @@
#include "precompiled_bridges.hxx"
#include <stdio.h>
@ -92,16 +92,12 @@ in files/patches-i85126
#include <dlfcn.h>
#include <cxxabi.h>
#include <hash_map>
-#include <sys/param.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -121,7 +121,7 @@
};
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -110,7 +106,7 @@ in files/patches-i85126
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

4
editors/openoffice.org-vcltesttool/files/patch-i85126
View File

@ -130,7 +130,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -139,7 +139,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );

4
editors/openoffice.org-vcltesttool/files/patch-i98781
View File

@ -9,7 +9,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
//__________________________________________________________________________________________________
RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
#else
: m_hApp( dlopen( 0, RTLD_LAZY ) )
@ -18,7 +18,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
+#ifdef FREEBSD /* #i22253# */
+#if __FreeBSD_version < 702104 /* #i22253# */
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
#else
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );