[arch-commits] CVS update of extra/office/openoffice-base (3 files)

[andyrtr at archlinux.org]

    Date: Friday, October 19, 2007 @ 17:36:40
  Author: andyrtr
    Path: /home/cvs-extra/extra/office/openoffice-base

   Added: ChangeLog (1.1) ooo82608.vcl.gtkbadfree_oog_m5.diff (1.1)
Modified: PKGBUILD (1.57 -> 1.58)

fixed #8209, removed agg dep, added missing wizard


-------------------------------------+
 ChangeLog                           |    7 +++++++
 PKGBUILD                            |   13 +++++++++----
 ooo82608.vcl.gtkbadfree_oog_m5.diff |   31 +++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 4 deletions(-)


Index: extra/office/openoffice-base/ChangeLog
diff -u /dev/null extra/office/openoffice-base/ChangeLog:1.1
--- /dev/null	Fri Oct 19 17:36:40 2007
+++ extra/office/openoffice-base/ChangeLog	Fri Oct 19 17:36:40 2007
@@ -0,0 +1,7 @@
+openoffice-base 2.3.0-4
+- fixed weird gtk behavior - http://bugs.archlinux.org/task/8209
+- added missing spell wizard
+- removed system agg dependency due to license issues 
+  see http://www.openoffice.org/issues/show_bug.cgi?id=81224
+- removed unneeded provide tag
+- added ChangeLog
\ No newline at end of file
Index: extra/office/openoffice-base/PKGBUILD
diff -u extra/office/openoffice-base/PKGBUILD:1.57 extra/office/openoffice-base/PKGBUILD:1.58
--- extra/office/openoffice-base/PKGBUILD:1.57	Sun Oct  7 08:08:20 2007
+++ extra/office/openoffice-base/PKGBUILD	Fri Oct 19 17:36:40 2007
@@ -3,7 +3,7 @@
 
 pkgname=openoffice-base
 pkgver=2.3.0
-pkgrel=3
+pkgrel=4
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
 #_OO_milestone=oog680-m5
@@ -14,7 +14,7 @@
 depends=('ttf-dejavu' 'curl' 'desktop-file-utils' 'fontconfig>=2.4' 'gtk2>=2.10.11'
          'hunspell>=1.1.5' "icu>=3.8" 'perl' 'python>=2.5' 'libwpd' 'libsndfile'
          'startup-notification>=0.9' 'xalan-java' 'libxaw' 'libcups' 'hsqldb-java'
-         'gstreamer0.10-base' 'neon>=0.27.0' 'agg' 'dbus-glib' 'nss') # 'xmlsec' - broken
+         'gstreamer0.10-base' 'neon>=0.27.0' 'dbus-glib' 'nss') # 'xmlsec' - broken
 # for gnu java/ecj
 makedepends=('bison' 'ccache' 'cvs' 'curl' 'findutils'
              'flex' 'gawk' 'gcc-libs' 'kdelibs' 'libart-lgpl' 'pam' 'sane' 'zip'
@@ -25,7 +25,6 @@
 #             'flex' 'gawk' 'gcc-libs' 'kdelibs' 'libart-lgpl' 'pam' 'sane' 'zip'
 #             'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.8.1.3'
 #             'jdk' 'apache-ant' 'cairo')
-provides=('openoffice-base')
 
 MIRROR="ftp://ftp.gwdg.de/pub/openoffice/" # has all late but is fast
 #MIRROR=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/
@@ -61,6 +60,7 @@
 	libxmlsec-system-nss_oog_m5.diff
 	libxmlsec-findcerts_oog_m5.diff
 	soffice-detect-mozilla-certificates_oog_m5.diff
+	ooo82608.vcl.gtkbadfree_oog_m5.diff
 	#http://oooconv.free.fr/fontooo/FontOOo.sxw
 	FontOOo_1.7.1.sxw # from http://www.openoffice.org/issues/show_bug.cgi?id=81102
 	awt_x86_64.diff)
@@ -86,6 +86,7 @@
          '3353d801d4f3560ed1f5707ab5f02e49'
          'a8b96e9d0ce92a8f6690f277b1cfacc9'
          '4271702d6e9e912b663d3e2d9b8a17e8'
+         '1cc4e58f28093f179378dc3bd69986af'
          '1fc1ca5205730655eab2d2e119aa06fe'
          '83bb5e235c4e4062eed404829d760c14')
 
@@ -129,6 +130,8 @@
 	# important bugfixes
 	# fix for invisible text with gcc 4.2 http://www.openoffice.org/issues/show_bug.cgi?id=78417
 	patch -Np0 -i ../fix-invisible-text.diff || return 1
+	# fix a crash related to new gtk - fixes http://bugs.archlinux.org/task/8209
+	patch -Np0 -i ../ooo82608.vcl.gtkbadfree_oog_m5.diff || return 1
 
 	# fix font hinting
 	patch -Np0 -i ../fix-font-hinting_oog680_m2.diff || return 1
@@ -188,7 +191,6 @@
 	--enable-libsn\
 	--enable-vba\
 	--with-package-format=native\
-	--with-system-agg\
 	--with-system-db\
 	--with-system-cairo\
 	--with-system-curl\
@@ -322,6 +324,9 @@
 	# fix font wizard not installed by default (from http://qa.openoffice.org/issues/show_bug.cgi?id=81102)
 	install -D -m644 $startdir/src/FontOOo_1.7.1.sxw $startdir/pkg/opt/openoffice/share/dict/ooo/FontOOo.sxw
 
+	# add missing spell wizard
+	install -D -m644 $startdir/src/${_OO_milestone}/dictionaries/diclst/DicOOo.sxw $startdir/pkg/opt/openoffice/share/dict/ooo/DicOOo.sxw
+
 	# link the mozilla-plugin
 	mkdir -p $startdir/pkg/opt/mozilla/lib/plugins/
 	cd $startdir/pkg/opt/mozilla/lib/plugins/
Index: extra/office/openoffice-base/ooo82608.vcl.gtkbadfree_oog_m5.diff
diff -u /dev/null extra/office/openoffice-base/ooo82608.vcl.gtkbadfree_oog_m5.diff:1.1
--- /dev/null	Fri Oct 19 17:36:40 2007
+++ extra/office/openoffice-base/ooo82608.vcl.gtkbadfree_oog_m5.diff	Fri Oct 19 17:36:40 2007
@@ -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 );
+ }