Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hi there,

I've got a fresh clone of bootstrap and now compilation of libpr0n in
libs-extern-sys/moz fails due to an syntax error in a Makefile. I
attached the fix and the build log to the mail.

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

Should I file a bug for this?

Best Regards
 Thomas


From 421383d395a0530c4f02ac7a3440943ba4e70c49 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Wed, 19 Jan 2011 05:22:18 +0100
Subject: [PATCH] Fix libpr0n Makefile.

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

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; \
-- 
1.7.3.5



Attachment: build.log.bz2
Description: application/bzip


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.