[arch-commits] CVS update of unstable/office/openoffice-base-devel (2 files)

[andyrtr at archlinux.org]

    Date: Thursday, November 8, 2007 @ 07:08:52
  Author: andyrtr
    Path: /home/cvs-unstable/unstable/office/openoffice-base-devel

 Removed: buildfix-agg_2_5_oog680_m3.diff (1.1)
          ooo82608.vcl.gtkbadfree_oog_m5.diff (1.1)

removed 2 patches


-------------------------------------+
 buildfix-agg_2_5_oog680_m3.diff     |   14 --------------
 ooo82608.vcl.gtkbadfree_oog_m5.diff |   31 -------------------------------
 2 files changed, 45 deletions(-)


Index: unstable/office/openoffice-base-devel/buildfix-agg_2_5_oog680_m3.diff
diff -u unstable/office/openoffice-base-devel/buildfix-agg_2_5_oog680_m3.diff:1.1 unstable/office/openoffice-base-devel/buildfix-agg_2_5_oog680_m3.diff:removed
--- unstable/office/openoffice-base-devel/buildfix-agg_2_5_oog680_m3.diff:1.1	Sun Oct 14 20:53:39 2007
+++ unstable/office/openoffice-base-devel/buildfix-agg_2_5_oog680_m3.diff	Thu Nov  8 07:08:52 2007
@@ -1,14 +0,0 @@
---- config_office/configure.in
-+++ config_office/configure.in
-@@ -4072,7 +4072,10 @@
-             AGG_INCDIR="`echo $AGG_CFLAGS | $SED -e s/-I//`"
-          fi
-          # we could have used pkg-config --modversion but 2.4's libagg.pc.in still contains 2.3 :/
--         if $GREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
-+         if echo Detected agg version is `pkg-config --modversion libagg` | grep 2.5.0
-+         then AGG_VERSION=2500
-+         AC_MSG_RESULT([2.5])
-+         elif $GREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
-             AC_MSG_RESULT([2.4])
-             AGG_VERSION=2400
-          else
Index: unstable/office/openoffice-base-devel/ooo82608.vcl.gtkbadfree_oog_m5.diff
diff -u unstable/office/openoffice-base-devel/ooo82608.vcl.gtkbadfree_oog_m5.diff:1.1 unstable/office/openoffice-base-devel/ooo82608.vcl.gtkbadfree_oog_m5.diff:removed
--- unstable/office/openoffice-base-devel/ooo82608.vcl.gtkbadfree_oog_m5.diff:1.1	Thu Nov  1 01:03:12 2007
+++ unstable/office/openoffice-base-devel/ooo82608.vcl.gtkbadfree_oog_m5.diff	Thu Nov  8 07:08:52 2007
@@ -1,31 +0,0 @@
-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 );
- }