rpms/abiword/devel abiword-2.3.4-pangographics.patch, 1.1, 1.2 abiword.spec, 1.13, 1.14

[Marc Maurer (uwog)]

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18619

Modified Files:
	abiword-2.3.4-pangographics.patch abiword.spec 
Log Message:
Disable more pango code



abiword-2.3.4-pangographics.patch:

Index: abiword-2.3.4-pangographics.patch
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword-2.3.4-pangographics.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- abiword-2.3.4-pangographics.patch	19 Aug 2005 13:25:08 -0000	1.1
+++ abiword-2.3.4-pangographics.patch	19 Aug 2005 14:08:16 -0000	1.2
@@ -1,5 +1,5 @@
-diff --recursive -Nau abiword-2.3.4.org/abi/src/af/gr/unix/GNUmakefile.am abiword-2.3.4/abi/src/af/gr/unix/GNUmakefile.am
---- abiword-2.3.4.org/abi/src/af/gr/unix/GNUmakefile.am	2005-03-20 18:41:14.000000000 +0100
+diff --recursive -Nau abiword-2.3.4.orig/abi/src/af/gr/unix/GNUmakefile.am abiword-2.3.4/abi/src/af/gr/unix/GNUmakefile.am
+--- abiword-2.3.4.orig/abi/src/af/gr/unix/GNUmakefile.am	2005-03-20 18:41:14.000000000 +0100
 +++ abiword-2.3.4/abi/src/af/gr/unix/GNUmakefile.am	2005-08-19 15:20:28.000000000 +0200
 @@ -24,6 +24,5 @@
  
@@ -9,3 +9,15 @@
 -	gr_UnixPangoGraphics.cpp
 +	gr_UnixImage.cpp
  
+diff --recursive -Nau abiword-2.3.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.3.4/abi/src/af/xap/unix/xap_UnixApp.cpp
+--- abiword-2.3.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp	2005-07-05 16:08:20.000000000 +0200
++++ abiword-2.3.4/abi/src/af/xap/unix/xap_UnixApp.cpp	2005-08-19 16:04:00.000000000 +0200
+@@ -107,7 +107,7 @@
+ 
+ 		
+ 		UT_ASSERT( bSuccess );
+-#if 1
++#if 0
+ 		bSuccess = pGF->registerClass(GR_UnixPangoGraphics::graphicsAllocator,
+ 									  GR_UnixPangoGraphics::graphicsDescriptor,
+ 									  GR_UnixPangoGraphics::s_getClassId());


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- abiword.spec	19 Aug 2005 13:46:40 -0000	1.13
+++ abiword.spec	19 Aug 2005 14:08:16 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.3.4
-Release: 3
+Release: 4
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -132,6 +132,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Fri Aug 19 2005 Marc Maurer <uwog at abisource.com> - 1:2.3.4-4
+- Update the pango patch to disable more pango code
+
 * Fri Aug 19 2005 Marc Maurer <uwog at abisource.com> - 1:2.3.4-3
 - Fix the build after applying the pango disabling patch by 
   rerunning autogen.sh