diff -u openoffice.org-2.3.0/ooo-build/patches/src680/apply openoffice.org-2.3.0/ooo-build/patches/src680/apply --- openoffice.org-2.3.0/ooo-build/patches/src680/apply +++ openoffice.org-2.3.0/ooo-build/patches/src680/apply @@ -107,6 +107,9 @@ [ TemporaryHacks ] +# fix for https://launchpad.net/bugs/131526 +openoffice.org.ooo82608.vcl.gtkbadfree.diff + # add idl target to toplevel makefile makefile-idl-build.diff, noelpwer diff -u openoffice.org-2.3.0/debian/changelog openoffice.org-2.3.0/debian/changelog --- openoffice.org-2.3.0/debian/changelog +++ openoffice.org-2.3.0/debian/changelog @@ -1,3 +1,9 @@ +openoffice.org (1:2.3.0-1ubuntu6) hardy; urgency=low + + * Fix OpenOffice crashes/hangs on errors in current gtk theme (LP: #131526) + + -- dAniel hAhler Thu, 25 Oct 2007 22:47:00 +0200 + openoffice.org (1:2.3.0-1ubuntu5) gutsy; urgency=low * Fix build failure in lpsolve on sparc. only in patch2: unchanged: --- openoffice.org-2.3.0.orig/ooo-build/patches/src680/openoffice.org.ooo82608.vcl.gtkbadfree.diff +++ openoffice.org-2.3.0/ooo-build/patches/src680/openoffice.org.ooo82608.vcl.gtkbadfree.diff @@ -0,0 +1,31 @@ +Index: unx/gtk/gdi/salnativewidgets-gtk.cxx +=================================================================== +RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v +retrieving revision 1.39 +diff -u -r1.39 salnativewidgets-gtk.cxx +--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 3 Jul 2007 14:06:42 -0000 1.39 ++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 19 Oct 2007 08:46:59 -0000 +@@ -2898,9 +2899,9 @@ + aPartRect = Rectangle( aPartPos, aPartSize ); + + if ( pIndicatorSize ) +- g_free( pIndicatorSize ); ++ gtk_requisition_free( pIndicatorSize ); + if ( pIndicatorSpacing ) +- g_free( pIndicatorSpacing ); ++ gtk_border_free( pIndicatorSpacing ); + + return( aPartRect ); + } +@@ -2947,9 +2948,9 @@ + aIndicatorRect.Move( 0, 1 ); + + if ( pIndicatorSize ) +- g_free( pIndicatorSize ); ++ gtk_requisition_free( pIndicatorSize ); + if ( pIndicatorSpacing ) +- g_free( pIndicatorSpacing ); ++ gtk_border_free( pIndicatorSpacing ); + + return( aIndicatorRect ); + }