pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

firefox-hg: fix build based on suggestion by ryoon@NetBSD



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Apr 29 13:14:52 2016 +0200
Changeset:	2002046b55916d58b95cd736549e16082d161bcb

Modified Files:
	firefox-hg/Makefile
	firefox-hg/distinfo
Added Files:
	firefox-hg/patches/patch-config_system-headers
Removed Files:
	firefox-hg/TODO

Log Message:
firefox-hg: fix build based on suggestion by ryoon@NetBSD

Installation currently broken because it installs into ${DESTDIR}/usr/local
instead of ${DESTDIR}${PREFIX}.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2002046b55916d58b95cd736549e16082d161bcb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 firefox-hg/Makefile                            |  2 +-
 firefox-hg/TODO                                | 15 ---------------
 firefox-hg/distinfo                            |  1 +
 firefox-hg/patches/patch-config_system-headers | 12 ++++++++++++
 4 files changed, 14 insertions(+), 16 deletions(-)

diffs:
diff --git a/firefox-hg/Makefile b/firefox-hg/Makefile
index 9befa63..83a0e42 100644
--- a/firefox-hg/Makefile
+++ b/firefox-hg/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.9 2015/08/17 07:30:47 thomasklausner Exp $
 
-MOZ_BRANCH=	46.0a1
+MOZ_BRANCH=	49.0a1
 
 .include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/firefox-hg/TODO b/firefox-hg/TODO
deleted file mode 100644
index e25b99f..0000000
--- a/firefox-hg/TODO
+++ /dev/null
@@ -1,15 +0,0 @@
-Currently fails to build with
-
-../../dom/media/webaudio/Unified_cpp_dom_media_webaudio1.o: In function `mozilla::FFTBlock::InterpolateFrequencyComponents(mozilla::FFTBlock const&, mozilla::FFTBlock const&, double)':
-Unified_cpp_dom_media_webaudio1.cpp:(.text+0x2238): undefined reference to `__c99_cabs'
-Unified_cpp_dom_media_webaudio1.cpp:(.text+0x224d): undefined reference to `__c99_cabs'
-../../dom/media/webaudio/Unified_cpp_dom_media_webaudio1.o: In function `mozilla::FFTBlock::AddConstantGroupDelay(double)':
-Unified_cpp_dom_media_webaudio1.cpp:(.text+0x2562): undefined reference to `__c99_cabs'
-../../dom/media/webaudio/Unified_cpp_dom_media_webaudio1.o: In function `mozilla::FFTBlock::ExtractAverageGroupDelay()':
-Unified_cpp_dom_media_webaudio1.cpp:(.text+0x26b9): undefined reference to `__c99_cabs'
-../../dom/media/webaudio/blink/Unified_cpp_webaudio_blink0.o: In function `WebCore::Biquad::setZeroPolePairs(std::complex<double> const&, std::complex<double> const&)':
-Unified_cpp_webaudio_blink0.cpp:(.text+0x1261): undefined reference to `__c99_cabs'
-../../dom/media/webaudio/blink/Unified_cpp_webaudio_blink0.o:Unified_cpp_webaudio_blink0.cpp:(.text+0x1292): more undefined references to `__c99_cabs' follow
-/scratch/wip/firefox-hg/work/mozilla/config/rules.mk:809: recipe for target 'libxul.so' failed
-
-NetBSD-7.99.26/amd64/20160321
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index 52ddbcb..f5c7b89 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -12,6 +12,7 @@ SHA1 (patch-build_autoconf_nss.m4) = 53e8c6844fc0095237ee07df3ab3791edd248fc2
 SHA1 (patch-build_gyp.mozbuild) = 2842da0783d344dd12e86adde447f7cda6191518
 SHA1 (patch-config_Makefile.in) = 34af9523b3bab1a31392772ed852a6d937be1e70
 SHA1 (patch-config_rules.mk) = debd5acd52f4f7593ea4e54dd0fdad91eeb46839
+SHA1 (patch-config_system-headers) = 7f0d7a4bd721507315cb4ab9cced97a09b2f1441
 SHA1 (patch-dom_base_moz.build) = c0d68528c487a9f06fed2a886ceafd7d904cc8a5
 SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 939f25f70f81eb86757696269c7e87c11a789c87
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e104bea7922dac0ce441bca4ba7a6f9b2379d17a
diff --git a/firefox-hg/patches/patch-config_system-headers b/firefox-hg/patches/patch-config_system-headers
new file mode 100644
index 0000000..761e832
--- /dev/null
+++ b/firefox-hg/patches/patch-config_system-headers
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- config/system-headers.orig	2016-04-29 09:24:33.807103859 +0000
++++ config/system-headers
+@@ -256,6 +256,7 @@ cairo-xlib-xrender.h
+ cairo-directfb.h
+ cairo-qpainter.h
+ cairo-qt.h
++complex
+ dfiff.h
+ exception
+ ffi.h


Home | Main Index | Thread Index | Old Index