Commit ae3806f0 authored by B Stack's avatar B Stack

Merge branch 'waterfox-bump' into 'master'

waterfox 56.2.5

See merge request !13
parents 4f39f966 5c88a7ee
# HG changeset patch
# User A. Wilcox <AWilcox@Wilcox-Tech.com>
# Date 1539547360 0
# Sun Oct 14 20:02:40 2018 +0000
# Node ID e2e56a6a68b281301932f4fbf30cea6f7499ec41
# Parent ddb031ea38070f454bdc89429c501ec1ff9c54d4
Bug 1494037 - Fix Cairo build bustage on PowerPC platforms.
diff -r ddb031ea3807 -r e2e56a6a68b2 gfx/cairo/libpixman/src/pixman-vmx.c
--- a/gfx/cairo/libpixman/src/pixman-vmx.c Sun Oct 14 20:00:46 2018 +0000
+++ b/gfx/cairo/libpixman/src/pixman-vmx.c Sun Oct 14 20:02:40 2018 +0000
@@ -25,7 +25,9 @@
* Based on fbmmx.c by Owen Taylor, Søren Sandmann and Nicholas Miell
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "pixman-private.h"
#include "pixman-combine32.h"
#include <altivec.h>
......@@ -26,6 +26,10 @@ ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
export MOZ_GECKO_PROFILER=
export MOZ_ENABLE_PROFILER_SPS=
export MOZ_PROFILING=
ac_add_options --disable-crashreporter
ac_add_options --disable-js-shell
ac_add_options --disable-maintenance-service
......
%global commit 9c2c0e0c5593abb40b6093d9b2a28b294b2b0ce9
%global commit 475fed0269120a3673ac55d8384022dc7f44eacf
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global date 20181008
%global date 20181030
%global with_snapshot 1
%global freebsd_rev 480450
......@@ -123,7 +123,7 @@
Summary: Waterfox Web browser
Name: waterfox
Version: 56.2.4
Version: 56.2.5
Release: 2%{?gver}%{?dist}
URL: https://www.waterfoxproject.org
License: MPLv1.1 or GPLv2+ or LGPLv2+
......@@ -136,7 +136,7 @@ Source0: https://github.com/MrAlex94/%{name}/archive/%{version}.tar.gz#/%
# FreeBSD patches
# https://www.freshports.org/www/waterfox
# rev=revision ./waterfox-FreeBSD-patches-snapshot.sh
Source600: http://dl.bintray.com/phantomx/tarballs/%{freebsd_root}.tar.xz
Source600: https://dl.bintray.com/phantomx/tarballs/%{freebsd_root}.tar.xz
Source10: waterfox-mozconfig
Source12: waterfox-chinfo-default-prefs.js
......@@ -164,6 +164,7 @@ Patch36: build-missing-xlocale-h.patch
Patch37: build-jit-atomic-always-lucky.patch
# Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x)
Patch38: build-cacheFlush-missing.patch
Patch39: mozilla-1494037.patch
# Fedora specific patches
Patch215: firefox-enable-addons.patch
......@@ -188,6 +189,8 @@ Patch417: mozilla-1436242.patch
%global wf_url https://github.com/MrAlex94/Waterfox
#Patch???: %%{wf_url}/commit/commit.patch#/wf-commit.patch
# Revert this until figure out
Patch490: %{wf_url}/commit/a89c49043079c720ea09ea3c7c523a5ef5db00e5.patch#/wf-a89c49043079c720ea09ea3c7c523a5ef5db00e5.patch
# Debian patches
Patch500: mozilla-440908.patch
......@@ -344,6 +347,7 @@ This package contains results of tests executed during build.
%patch35 -p1 -b .ppc-jit
%endif
%patch37 -p1 -b .jit-atomic-lucky
%patch39 -p1 -b .1494037
%patch3 -p1 -b .arm
......@@ -371,6 +375,8 @@ This package contains results of tests executed during build.
%patch416 -p1 -b .bug1375074-save-restore-x28
%patch417 -p1 -b .mozilla-1436242
%patch490 -p1 -R -b .1420171
# Debian extension patch
%patch500 -p1 -b .440908
......@@ -903,6 +909,9 @@ fi
#---------------------------------------------------------------------
%changelog
* Tue Oct 30 2018 Phantom X <megaphantomx at bol dot com dot br> - 56.2.5-1.20181030git475fed0
- New release/snapshot
* Sun Oct 14 2018 Phantom X <megaphantomx at bol dot com dot br> - 56.2.4-1.20181008git9c2c0e0
- New release/snapshot
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment