summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--build-big-endian.patch78
-rw-r--r--firefox.spec6
-rw-r--r--sources4
4 files changed, 61 insertions, 29 deletions
diff --git a/.gitignore b/.gitignore
index efea97f..6afab43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -288,3 +288,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-59.0.2-20180327.tar.xz
/firefox-60.0b13.source.tar.xz
/firefox-langpacks-60.0b13-20180418.tar.xz
+/firefox-60.0b15.source.tar.xz
+/firefox-langpacks-60.0b15-20180426.tar.xz
diff --git a/build-big-endian.patch b/build-big-endian.patch
index 111bd6a..e8ec439 100644
--- a/build-big-endian.patch
+++ b/build-big-endian.patch
@@ -1,21 +1,44 @@
diff -up firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h
+--- firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian 2018-04-09 22:50:48.000000000 +0200
++++ firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h 2018-04-18 11:51:38.748680174 +0200
+@@ -54,18 +54,19 @@ static inline U8CPU SkUnitScalarClampToB
+ *
+ * Here we enforce this constraint.
+ */
+-
++/*
+ #ifdef SK_CPU_BENDIAN
+ #define SK_RGBA_R32_SHIFT 24
+ #define SK_RGBA_G32_SHIFT 16
+ #define SK_RGBA_B32_SHIFT 8
+ #define SK_RGBA_A32_SHIFT 0
+ #else
++*/
+ #define SK_RGBA_R32_SHIFT 0
+ #define SK_RGBA_G32_SHIFT 8
+ #define SK_RGBA_B32_SHIFT 16
+ #define SK_RGBA_A32_SHIFT 24
+-#endif
++/*#endif*/
+
+ #define SkGetPackedA32(packed) ((uint32_t)((packed) << (24 - SK_A32_SHIFT)) >> 24)
+ #define SkGetPackedR32(packed) ((uint32_t)((packed) << (24 - SK_R32_SHIFT)) >> 24)
diff -up firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h
---- firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian 2018-04-25 10:28:21.367480569 +0200
-+++ firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h 2018-04-25 10:34:58.240051062 +0200
-@@ -83,8 +83,8 @@ enum SkColorType {
- kN32_SkColorType = kBGRA_8888_SkColorType,
+--- firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian 2018-04-09 22:50:48.000000000 +0200
++++ firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h 2018-04-18 11:51:38.748680174 +0200
+@@ -84,7 +84,8 @@ enum SkColorType {
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
kN32_SkColorType = kRGBA_8888_SkColorType,
--#else
+ #else
- #error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
-+#else
++ //#error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
+ kN32_SkColorType = kBGRA_8888_SkColorType
#endif
};
diff -up firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h
---- firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian 2018-04-25 10:28:21.367480569 +0200
-+++ firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h 2018-04-25 10:31:41.692759011 +0200
+--- firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian 2018-04-09 22:50:48.000000000 +0200
++++ firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h 2018-04-18 11:51:38.748680174 +0200
@@ -344,15 +344,13 @@ enum GrPixelConfig {
static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
@@ -34,21 +57,28 @@ diff -up firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-60.
#endif
/**
-diff -up firefox-60.0/gfx/skia/skia/include/private/GrColor.h.big-endian firefox-60.0/gfx/skia/skia/include/private/GrColor.h
---- firefox-60.0/gfx/skia/skia/include/private/GrColor.h.big-endian 2018-04-16 22:05:28.000000000 +0200
-+++ firefox-60.0/gfx/skia/skia/include/private/GrColor.h 2018-04-25 10:28:21.367480569 +0200
-@@ -74,8 +74,13 @@ static inline GrColor GrColorPackA4(unsi
- * Since premultiplied means that alpha >= color, we construct a color with
- * each component==255 and alpha == 0 to be "illegal"
+diff -up firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian firefox-60.0/gfx/skia/skia/src/core/SkColorData.h
+--- firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian 2018-04-18 13:42:06.980476156 +0200
++++ firefox-60.0/gfx/skia/skia/src/core/SkColorData.h 2018-04-18 13:42:50.493520552 +0200
+@@ -31,18 +31,19 @@
+ *
+ * Here we enforce this constraint.
*/
--#define GrColor_ILLEGAL (~(0xFF << GrColor_SHIFT_A))
-+//Just for big endian platforms, little has: (~(0xFF << GrColor_SHIFT_A))
-+#ifdef SK_CPU_BENDIAN
-+#define GrColor_ILLEGAL 0xFFFFFF00
-+#else
-+#define GrColor_ILLEGAL (~(0xFF << GrColor_SHIFT_A))
-
-+#endif
- #define GrColor_WHITE 0xFFFFFFFF
- #define GrColor_TRANSPARENT_BLACK 0x0
+-
++/*
+ #ifdef SK_CPU_BENDIAN
+ #define SK_BGRA_B32_SHIFT 24
+ #define SK_BGRA_G32_SHIFT 16
+ #define SK_BGRA_R32_SHIFT 8
+ #define SK_BGRA_A32_SHIFT 0
+ #else
++*/
+ #define SK_BGRA_B32_SHIFT 0
+ #define SK_BGRA_G32_SHIFT 8
+ #define SK_BGRA_R32_SHIFT 16
+ #define SK_BGRA_A32_SHIFT 24
+-#endif
++//#endif
+ #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
+ #error "can't define PMCOLOR to be RGBA and BGRA"
diff --git a/firefox.spec b/firefox.spec
index bae0e83..46b55e9 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -84,7 +84,7 @@
%global official_branding 1
%global build_langpacks 1
-%global pre_version b13
+%global pre_version b15
%global enable_mozilla_crashreporter 0
%if !%{debug_build}
@@ -101,7 +101,7 @@ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks}
-Source1: firefox-langpacks-%{version}%{?pre_version}-20180418.tar.xz
+Source1: firefox-langpacks-%{version}%{?pre_version}-20180426.tar.xz
%endif
Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js
@@ -844,7 +844,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Tue Apr 24 2018 Martin Stransky <stransky@redhat.com> - 60.0-0.1
-- Update to 60.0 Beta 14
+- Update to 60.0 Beta 15
* Tue Mar 27 2018 Jan Horak <jhorak@redhat.com> - 59.0.2-1
- Update to 59.0.2
diff --git a/sources b/sources
index 868b464..a8f50ab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (firefox-60.0b13.source.tar.xz) = 687c70f379a5c4991993bf840f87bd6ffafbf6e5fb8c0fe10655048a54c810870c3306a480aa75b18250d29350d4a1ecfbfe867a1173b4c4e5b2e447bf369f82
-SHA512 (firefox-langpacks-60.0b13-20180418.tar.xz) = dce66d5d3a85208691f801ec8780921154b3fab813f3a51cc02d6fdbc7ef1e18cd87dfc2757dd8b7edc3d505b39bad2c39d6cb7c4a6714b77c291a5fef75618f
+SHA512 (firefox-60.0b15.source.tar.xz) = 5b7db3692638c23da79d6b3f9b68f4efe655fd105a448e749adefca018eff9beab603219096095d312d4eedf95de326558087fba90716366dc843f7f50d406a9
+SHA512 (firefox-langpacks-60.0b15-20180426.tar.xz) = 16c2f681094616d1b544aec3b38423c376ff8f95a9723af05c171dc5b42d19e3e27c429eef210d0495adfe2e30c29a38d3458331971afd8c738db61d75aea5d4
bgstack15