- up

[packages/libreoffice.git] / openoffice-missing.patch

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/ooo-build/ChangeLog,v
retrieving revision 1.908
retrieving revision 1.909
diff -u -u -r1.908 -r1.909
--- ooo-build/ChangeLog	26 Jun 2004 18:52:22 -0000	1.908
+++ ChangeLog	27 Jun 2004 17:07:46 -0000	1.909
@@ -1,3 +1,8 @@
+2004-06-27  Rene Engelhard  <rene@debian.org>
+
+	* patches/OOO_1_1/print-fonconfig.diff: doh, hunk for
+	  psprint/util/makefile.mk got lost, readd
+
 2004-06-26  Michael Meeks  <michael@ximian.com>
 
 	* Version 1.1.60
Index: patches/OOO_1_1/print-fontconfig.diff
===================================================================
RCS file: /cvs/gnome/ooo-build/patches/OOO_1_1/print-fontconfig.diff,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- ooo-build/patches/OOO_1_1/print-fontconfig.diff	12 Jun 2004 18:28:43 -0000	1.13
+++ ooo-build/patches/OOO_1_1/print-fontconfig.diff	27 Jun 2004 17:07:46 -0000	1.14
@@ -861,3 +861,16 @@
  SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
  
  DEF1NAME    =$(SHL1TARGET)
+--- psprint/util/makefile.mk-old	2004-06-27 18:48:42.000000000 +0200
++++ psprint/util/makefile.mk	2004-06-27 18:48:12.000000000 +0200
+@@ -105,6 +105,10 @@
+ 			$(SALLIB)			\
+ 			-lX11
+ 
++.IF "$(FONTCONFIG_FONTS)" == "YES"
++SHL1STDLIBS+=$(FONTCONFIG_LIBS)
++.ENDIF
++
+ .IF "$(SOLAR_JAVA)"!=""
+ SHL1STDLIBS+=$(JVMACCESSLIB)
+ .ENDIF