summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2017-01-16 14:37:59 +0100
committerMartin Stransky <stransky@redhat.com>2017-01-16 14:37:59 +0100
commit248f1795984c0fb3cef46418923ab2548887bc3d (patch)
tree139c96175150df21a6dfbda8b5d8b1dc1719b38c
parentAdded patch for nss 3.28.1 (mozbz#1290037) (diff)
downloadlibrewolf-fedora-ff-248f1795984c0fb3cef46418923ab2548887bc3d.tar.gz
librewolf-fedora-ff-248f1795984c0fb3cef46418923ab2548887bc3d.tar.bz2
librewolf-fedora-ff-248f1795984c0fb3cef46418923ab2548887bc3d.zip
build fix - mozbz#1329272
-rw-r--r--firefox.spec2
-rw-r--r--mozilla-1329272.patch29
2 files changed, 31 insertions, 0 deletions
diff --git a/firefox.spec b/firefox.spec
index 4a6c8b3..8ed119e 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -139,6 +139,7 @@ Patch406: mozilla-256180.patch
# fix various rendering problems
Patch407: widget-rebase.patch
Patch408: mozilla-1290037.patch
+Patch409: mozilla-1329272.patch
# Debian patches
Patch500: mozilla-440908.patch
@@ -282,6 +283,7 @@ cd %{tarballdir}
# fix various rendering problems
%patch407 -p1 -b .widget-rebase
%patch408 -p1 -b .1290037
+%patch409 -p1 -b .1329272
# Debian extension patch
%patch500 -p1 -b .440908
diff --git a/mozilla-1329272.patch b/mozilla-1329272.patch
new file mode 100644
index 0000000..ab0b26b
--- /dev/null
+++ b/mozilla-1329272.patch
@@ -0,0 +1,29 @@
+From 66fc64a75617ffc68f16780f60e39c1f368dfd41 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 9 Jan 2017 14:37:33 +0100
+Subject: [PATCH] bug 1329272: add bracket for sed 4.3 compliance, r=glandium
+
+---
+ build/autoconf/icu.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
+index 4f46345f435a..794ddcdf4e52 100644
+--- a/build/autoconf/icu.m4
++++ b/build/autoconf/icu.m4
+@@ -67,11 +67,11 @@ if test -n "$USE_ICU"; then
+ if test ! -d "$icudir"; then
+ AC_MSG_ERROR([Cannot find the ICU directory])
+ fi
+ fi
+
+- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
++ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
+ if test x"$version" = x; then
+ AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
+ fi
+ MOZ_ICU_VERSION="$version"
+
+--
+2.11.0
+
bgstack15