diff --git a/x/lib/xulrunner.xml b/x/lib/xulrunner.xml index 5517862488..f46a9ce967 100644 --- a/x/lib/xulrunner.xml +++ b/x/lib/xulrunner.xml @@ -76,16 +76,6 @@ - Additional Downloads - - - - Required patch if you're using GCC-4.7: - - - - - Xulrunner Dependencies Required @@ -198,13 +188,17 @@ EOF commands: -patch -p1 < ../xulrunner-&xulrunner-version;_gcc-4.7-1.patch && -sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' configure && -if pkg-config --atleast-version &nspr-version; nspr +sed -i '/fcntl.h/a#include <unistd.h>' \ + ipc/chromium/src/base/{file_util_linux,message_pump_libevent}.cc && +sed -i '/sys\/time\.h/a#include <unistd.h>' ipc/chromium/src/base/time_posix.cc && +make -f client.mk + + This package does not come with a test suite. @@ -215,7 +209,7 @@ make -f client.mk make -C xulrunner-build-dir install && -mkdir -p /usr/lib/mozilla && +mkdir -p /usr/lib/mozilla/plugins && rm -rf /usr/lib/xulrunner-&xulrunner-version;/plugins && ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; && chown -Rv root:root /usr/{include,lib,share/idl}/xulrunner-* && @@ -228,15 +222,17 @@ done Command Explanations - sed -i 's#VPX_CODEC_USE_INPUT_PARTITION ...: This fixes - Xulrunner's configure - script to properly detect . It is not needed if - you have libvpx-v0.9.7 or earlier installed or if you've not installed - Libvpx. + sed -i '/fcntl.h/a#include <unistd.h>' + ipc/chromium/src/base/{file_util_linux,message_pump_libevent}.cc + && sed -i '/sys\/time\.h/a#include <unistd.h>' + ipc/chromium/src/base/time_posix.cc: These seds fix bugs that + would otherwise break the build if you're using + GCC 4.7. + make -f client.mk ...: Mozilla products are packaged to @@ -286,7 +282,7 @@ done Installed Directories - xulrunner, and optionally nspr-config + xulrunner Numerous libraries, browser components, plugins, extensions, and helper modules installed in /usr/lib/xulrunner-&xulrunner-version; diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml index 90f814dc50..63e93f100c 100644 --- a/xsoft/graphweb/firefox.xml +++ b/xsoft/graphweb/firefox.xml @@ -73,16 +73,6 @@ - Additional Downloads - - - - Required patch if you're using GCC-4.7: - - - - - Firefox Dependencies Required