diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-07 17:18:09 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-07 17:18:09 +0100 |
| commit | 237345323af9aa759b1dee8cc5496c1ef30c3f2c (patch) | |
| tree | ae174041bf93d0afb6565723f64b468a12f9305f /package/firefox | |
| parent | 53860da0df531e9f3c105f1c00a6134b88932cb3 (diff) | |
| parent | 6426f942fc4421403927daa6cf2e6c26e99d978b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/firefox')
| -rw-r--r-- | package/firefox/Makefile | 2 | ||||
| -rw-r--r-- | package/firefox/patches/patch-configure | 30 | ||||
| -rw-r--r-- | package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp | 10 |
3 files changed, 41 insertions, 1 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile index f1764e14f..229b09dea 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= firefox PKG_VERSION:= 26.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 91ce51cc6474f1269484e5327643a59c PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure new file mode 100644 index 000000000..884cea4dd --- /dev/null +++ b/package/firefox/patches/patch-configure @@ -0,0 +1,30 @@ +--- mozilla-release.orig/configure 2013-12-05 17:08:46.000000000 +0100 ++++ mozilla-release/configure 2014-01-06 18:17:43.008094174 +0100 +@@ -9787,27 +9787,6 @@ if test -z "$GNU_CC"; then + esac + fi + +-if test "$GNU_CC" -a -n "$DEVELOPER_OPTIONS"; then +- if $CC -Wl,--version 2>&1 | grep -q "GNU ld"; then +- GOLD=$($CC -print-prog-name=ld.gold) +- case "$GOLD" in +- /*) +- ;; +- *) +- GOLD=$(which $GOLD) +- ;; +- esac +- if test -n "$GOLD"; then +- mkdir -p $_objdir/build/unix/gold +- ln -s "$GOLD" $_objdir/build/unix/gold/ld +- if $CC -B $_objdir/build/unix/gold -Wl,--version 2>&1 | grep -q "GNU gold"; then +- LDFLAGS="$LDFLAGS -B $_objdir/build/unix/gold" +- else +- rm -rf $_objdir/build/unix/gold +- fi +- fi +- fi +-fi + + if test "$GNU_CC"; then + if test -z "$DEVELOPER_OPTIONS"; then diff --git a/package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp b/package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp new file mode 100644 index 000000000..0a96d2259 --- /dev/null +++ b/package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp @@ -0,0 +1,10 @@ +--- mozilla-release.orig/gfx/layers/BufferUnrotate.cpp 2013-12-05 17:07:31.000000000 +0100 ++++ mozilla-release/gfx/layers/BufferUnrotate.cpp 2014-01-06 21:27:39.000000000 +0100 +@@ -8,6 +8,7 @@ + #include <stdint.h> + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + + void BufferUnrotate(uint8_t* aBuffer, int aByteWidth, int aHeight, + int aByteStride, int aXBoundary, int aYBoundary) |