diff -u openoffice.org2-2.0.1/ooo-build/patches/src680/apply openoffice.org2-2.0.1/ooo-build/patches/src680/apply --- openoffice.org2-2.0.1/ooo-build/patches/src680/apply +++ openoffice.org2-2.0.1/ooo-build/patches/src680/apply @@ -611,6 +611,9 @@ # fix sparc build cws-unxlngs04.diff +# fix g++ 4.0 build -- do not use fvisibility=hidden +disable-visibility-feature.diff + [ ArkOnly ] system-db-4.3-use-lpthread.diff # FIXME this is generally useful -- currently applied here only because diff -u openoffice.org2-2.0.1/debian/changelog openoffice.org2-2.0.1/debian/changelog --- openoffice.org2-2.0.1/debian/changelog +++ openoffice.org2-2.0.1/debian/changelog @@ -1,3 +1,9 @@ +openoffice.org2 (2.0.1-0ubuntu4ja1) dapper; urgency=low + + * Disable gcc -fvisibility=hidden option. + + -- Jun Kobayashi Thu, 9 Feb 2006 13:17:30 +0900 + openoffice.org2 (2.0.1-0ubuntu4) dapper; urgency=low * Rebuild using internal neon. only in patch2: unchanged: --- openoffice.org2-2.0.1.orig/ooo-build/patches/src680/disable-visibility-feature.diff +++ openoffice.org2-2.0.1/ooo-build/patches/src680/disable-visibility-feature.diff @@ -0,0 +1,33 @@ +--- config_office/configure.in.ORG 2006-01-11 14:26:23.015610008 +0900 ++++ config_office/configure.in 2006-01-11 14:26:55.673766908 +0900 +@@ -1099,18 +1099,18 @@ + fi + AC_SUBST(GCCVER) + +-if test "$GCC" = "yes"; then +- AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden]) +- save_CFLAGS=$CFLAGS +- CFLAGS="$CFLAGS -fvisibility=hidden" +- AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_VISIBILITY_FEATURE=TRUE ], []) +- CFLAGS=$save_CFLAGS +- if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- fi +-fi ++#if test "$GCC" = "yes"; then ++# AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden]) ++# save_CFLAGS=$CFLAGS ++# CFLAGS="$CFLAGS -fvisibility=hidden" ++# AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_VISIBILITY_FEATURE=TRUE ], []) ++# CFLAGS=$save_CFLAGS ++# if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then ++# AC_MSG_RESULT([yes]) ++# else ++# AC_MSG_RESULT([no]) ++# fi ++#fi + AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE) + + if test "$GCC" = "yes"; then