summaryrefslogtreecommitdiff
path: root/moz
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-01-20 13:02:11 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-01-20 13:02:11 +0200
commit5c145d3cfc47be75c3b8d8b27eb28301f06ffec7 (patch)
tree09ba396c6592dd3d2ca3f7144e45307723adae01 /moz
parent09b6be8237a3a39dc8def7b348a7008bd23951f1 (diff)
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@novell.com>
Diffstat (limited to 'moz')
-rw-r--r--moz/makefile.mk3
-rw-r--r--moz/patches/libpr0n_build_fix.patch14
2 files changed, 16 insertions, 1 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 49e9b41010ea..aefd5b8c3a87 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 000000000000..083e493fe782
--- /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; \