Added new pre-configure hook: rename-nsWildCard

diff --git a/Makefile b/Makefile
index 97f86e8e457acdb07294311ec8b5b607a057ac39..963d1cc57da2e078467e9e2c1ae6e284598641d8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,16 @@ stage-package:
        cp ${WRKSRC}/dist/firefox/components/browser.xpt \
           ${WRKSRC}/dist/bin/components/browser.xpt
 
+# Both libjar and filepicker has nsWildCard.cpp. This leads to a
+# linkage error on Darwin.
+.PHONY: rename-nsWildCard
+pre-configure: rename-nsWildCard
+rename-nsWildCard:
+       cp -f ${WRKSRC}/xpfe/components/filepicker/src/nsWildCard.cpp \
+               ${WRKSRC}/xpfe/components/filepicker/src/nsWildCard_filepicker.cpp
+       ${SED} -e 's!nsWildCard!nsWildCard_filepicker!g' -i .orig \
+               ${WRKSRC}/xpfe/components/filepicker/src/Makefile.in
+
 .if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
 PLIST_SUBST+=          JEMALLOC=
 SCRIPTS_ENV+=          JEMALLOC=