[Libreoffice-commits] .: moz/makefile.mk moz/patches

[Tor Lillqvist]

 moz/makefile.mk                     |    3 ++-
 moz/patches/libpr0n_build_fix.patch |   14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 254535bea9010a21d214588fa0ade1042779ba1d
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Thu Jan 20 13:02:11 2011 +0200

    Fix libpr0n Makefile
    
    Bug is discussed here:
    http://permalink.gmane.org/gmane.linux.mandrake.cooker.devel/304002
    
    Fix:
    http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/songbird/current/SOURCES/Songbird1.4.3-fix-build.patch?revision=537683&view=markup
    
    Signed-off-by: Tor Lillqvist <tlillqvist at novell.com>

diff --git a/moz/makefile.mk b/moz/makefile.mk
index 49e9b41..aefd5b8 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -93,7 +93,8 @@ PATCH_FILES = \
     patches/arm_build_fix.patch \
     patches/link_fontconfig.patch \
     patches/brokenmakefile.patch \
-    patches/aix_build_fix.patch
+    patches/aix_build_fix.patch \
+    patches/libpr0n_build_fix.patch
 
 # This file is needed for the W32 build when BUILD_MOZAB is set
 # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
diff --git a/moz/patches/libpr0n_build_fix.patch b/moz/patches/libpr0n_build_fix.patch
new file mode 100644
index 0000000..083e493
--- /dev/null
+++ b/moz/patches/libpr0n_build_fix.patch
@@ -0,0 +1,14 @@
+--- misc/mozilla/modules/libpr0n/build/Makefile.in	2006-05-20 19:20:48.000000000 +0200
++++ misc/build/mozilla/modules/libpr0n/build/Makefile.in	2011-01-19 05:18:01.318000024 +0100
+@@ -106,9 +106,9 @@
+ export::
+ 	@{ \
+ 	$(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
+-		echo "#define IMG_BUILD_DECODER_${d}";) \
++		echo "#define IMG_BUILD_DECODER_${d}" ; ) \
+ 	$(foreach d,$(MOZ_IMG_ENCODERS), \
+-		echo "#define IMG_BUILD_ENCODER_${d}";) \
++		echo "#define IMG_BUILD_ENCODER_${d}" ; ) \
+ 	} > nsImgBuildDefines.tmp
+ 	@if `cmp -s nsImgBuildDefines.h nsImgBuildDefines.tmp`; then \
+ 		rm -f nsImgBuildDefines.tmp; \