rpms
/
chromium
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into f25

This commit is contained in:
Tom Callaway 2017-03-30 14:21:43 -04:00
parent 84d38d9c65 3b749ca7b4
commit f3715e384b
5 changed files with 215 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -17,3 +17,4 @@
/chromium-55.0.2883.87-clean.tar.xz
/chromium-56.0.2924.87-clean.tar.xz
/chromium-57.0.2987.110-clean.tar.xz
/chromium-57.0.2987.133-clean.tar.xz

12
chromium-57.0.2987.110-gtk_ui-gcc-fix.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc.b95cf28 chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc
--- chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc.b95cf28 2017-03-28 11:42:53.308857207 -0400
+++ chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc 2017-03-28 11:43:04.172579015 -0400
@@ -676,7 +676,7 @@ std::unique_ptr<views::Border> GtkUi::Cr
: nullptr);
}
- return gtk_border;
+ return std::move(gtk_border);
}
void GtkUi::AddWindowButtonOrderObserver(

38
chromium.spec
View File

@ -96,8 +96,8 @@ BuildRequires: libicu-devel >= 5.4
%global majorversion 57
Name: chromium%{chromium_channel}
Version: %{majorversion}.0.2987.110
Release: 3%{?dist}
Version: %{majorversion}.0.2987.133
Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@ -160,6 +160,9 @@ Patch32: chromium-56.0.2924.87-unique-ptr-fix.patch
Patch33: chromium-56.0.2924.87-gcc7.patch
# Enable mp3 support
Patch34: chromium-57.0.2987.110-enable-mp3.patch
# Fix issue in gtk_ui.cc
# https://chromium.googlesource.com/chromium/src.git/+/b95cf280873664a44297368676ff589721ddb6f2%5E%21/#F5
Patch35: chromium-57.0.2987.110-gtk_ui-gcc-fix.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@ -195,7 +198,11 @@ Source10: https://dl.google.com/dl/edgedl/chrome/policy/policy_templates.zip
Source11: chrome-remote-desktop.service
Source12: chromium-browser.appdata.xml
Source13: master_preferences
# Only needed for platforms where gcc doesn't have stdatomic.h
# RHEL 7 or older
# Taken from https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/compat/atomics/gcc/stdatomic.h
# on 2017-03-26
Source14: stdatomic.h
# We can assume gcc and binutils.
BuildRequires: gcc-c++
@ -539,19 +546,19 @@ members of the Chromium and WebDriver teams.
%patch31 -p1 -b .permissive
%patch32 -p1 -b .unique-ptr-fix
%patch33 -p1 -b .gcc7
# RHEL 7 compiler is too old
# does not have stdatomic.h
# In file included from ../../third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c:2:0:
# ../../third_party/ffmpeg/libavutil/cpu.c:24:23: fatal error: stdatomic.h: No such file or directory
# #include <stdatomic.h>
%if 0%{?fedora}
%patch34 -p1 -b .mp3
%endif
%patch35 -p1 -b .gtkuifix
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus
%patch101 -p1 -b .use_system_harfbuzz
%if 0%{?fedora} >= 24
# Do nothing. We're modern enough to not need it.
%else
cp -a %{SOURCE14} third_party/ffmpeg/
%endif
%if 0%{?asan}
export CC="clang"
export CXX="clang++"
@ -986,6 +993,10 @@ GOOGLE_CLIENT_ID_REMOTING_IDENTITY_API=%{chromoting_client_id} ../../depot_tools
%endif
popd
# Nuke nacl/pnacl bits at the end of the build
rm -rf out/Release/gen/sdk
rm -rf native_client/toolchain
rm -rf third_party/llvm-build/*
%install
rm -rf %{buildroot}
@ -1582,6 +1593,13 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
* Thu Mar 30 2017 Tom Callaway <spot@fedoraproject.org> 57.0.2987.133-1
- update to 57.0.2987.133
* Sun Mar 26 2017 Tom Callaway <spot@fedoraproject.org> 57.0.2987.110-4
- copy compat stdatomic.h in for RHEL. Re-enable mp3 enablement.
- fix issue in gtk_ui.cc revealed by RHEL build
* Sun Mar 26 2017 Tom Callaway <spot@fedoraproject.org> 57.0.2987.110-3
- fix mp3 enablement
- disable mp3 enablement on RHEL (compiler too old)

2
sources
View File

@ -1,3 +1,3 @@
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
SHA512 (policy_templates.zip) = 6a0564da805ee8d290453c9e46550fa8eed42d0fbd51a90eda566d888d9d7cf35ec9bb39f2340ec1ed98e7e813815eceb1f11cd202746815a7c8f8ecbef73a85
SHA512 (chromium-57.0.2987.110-clean.tar.xz) = 9ea6a1ef5a553f9a51470248b8c0bb52ba8ff157aa6bc12515d8e589eff5e9dcaa55e37f5de4241bac96694c9b41ea260f827425ce1f07d5244369249373d4fc
SHA512 (chromium-57.0.2987.133-clean.tar.xz) = 5b5b3b9b8da008c04a8519eee1199e042bd1ee022e3eeb22eb10c075aeac64abe9312350cb867ab17854815d2aaf91fb6387b45f41f475fd854ee20e47d49ef8

173
stdatomic.h Normal file
View File

@ -0,0 +1,173 @@
/*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/*
* based on vlc_atomic.h from VLC
* Copyright (C) 2010 Rémi Denis-Courmont
*/
#ifndef COMPAT_ATOMICS_GCC_STDATOMIC_H
#define COMPAT_ATOMICS_GCC_STDATOMIC_H
#include <stddef.h>
#include <stdint.h>
#define ATOMIC_FLAG_INIT 0
#define ATOMIC_VAR_INIT(value) (value)
#define atomic_init(obj, value) \
do { \
*(obj) = (value); \
} while(0)
#define kill_dependency(y) ((void)0)
#define atomic_thread_fence(order) \
__sync_synchronize()
#define atomic_signal_fence(order) \
((void)0)
#define atomic_is_lock_free(obj) 0
typedef _Bool atomic_flag;
typedef _Bool atomic_bool;
typedef char atomic_char;
typedef signed char atomic_schar;
typedef unsigned char atomic_uchar;
typedef short atomic_short;
typedef unsigned short atomic_ushort;
typedef int atomic_int;
typedef unsigned int atomic_uint;
typedef long atomic_long;
typedef unsigned long atomic_ulong;
typedef long long atomic_llong;
typedef unsigned long long atomic_ullong;
typedef wchar_t atomic_wchar_t;
typedef int_least8_t atomic_int_least8_t;
typedef uint_least8_t atomic_uint_least8_t;
typedef int_least16_t atomic_int_least16_t;
typedef uint_least16_t atomic_uint_least16_t;
typedef int_least32_t atomic_int_least32_t;
typedef uint_least32_t atomic_uint_least32_t;
typedef int_least64_t atomic_int_least64_t;
typedef uint_least64_t atomic_uint_least64_t;
typedef int_fast8_t atomic_int_fast8_t;
typedef uint_fast8_t atomic_uint_fast8_t;
typedef int_fast16_t atomic_int_fast16_t;
typedef uint_fast16_t atomic_uint_fast16_t;
typedef int_fast32_t atomic_int_fast32_t;
typedef uint_fast32_t atomic_uint_fast32_t;
typedef int_fast64_t atomic_int_fast64_t;
typedef uint_fast64_t atomic_uint_fast64_t;
typedef intptr_t atomic_intptr_t;
typedef uintptr_t atomic_uintptr_t;
typedef size_t atomic_size_t;
typedef ptrdiff_t atomic_ptrdiff_t;
typedef intmax_t atomic_intmax_t;
typedef uintmax_t atomic_uintmax_t;
#define atomic_store(object, desired) \
do { \
*(object) = (desired); \
__sync_synchronize(); \
} while (0)
#define atomic_store_explicit(object, desired, order) \
atomic_store(object, desired)
#define atomic_load(object) \
(__sync_synchronize(), *(object))
#define atomic_load_explicit(object, order) \
atomic_load(object)
#define atomic_exchange(object, desired) \
({ \
__typeof__(object) _obj = (object); \
__typeof__(*object) _old; \
do \
_old = atomic_load(_obj); \
while (!__sync_bool_compare_and_swap(_obj, _old, (desired))); \
_old; \
})
#define atomic_exchange_explicit(object, desired, order) \
atomic_exchange(object, desired)
#define atomic_compare_exchange_strong(object, expected, desired) \
({ \
__typeof__(object) _exp = (expected); \
__typeof__(*object) _old = *_exp; \
*_exp = __sync_val_compare_and_swap((object), _old, (desired)); \
*_exp == _old; \
})
#define atomic_compare_exchange_strong_explicit(object, expected, desired, success, failure) \
atomic_compare_exchange_strong(object, expected, desired)
#define atomic_compare_exchange_weak(object, expected, desired) \
atomic_compare_exchange_strong(object, expected, desired)
#define atomic_compare_exchange_weak_explicit(object, expected, desired, success, failure) \
atomic_compare_exchange_weak(object, expected, desired)
#define atomic_fetch_add(object, operand) \
__sync_fetch_and_add(object, operand)
#define atomic_fetch_add_explicit(object, operand, order) \
atomic_fetch_add(object, operand)
#define atomic_fetch_sub(object, operand) \
__sync_fetch_and_sub(object, operand)
#define atomic_fetch_sub_explicit(object, operand, order) \
atomic_fetch_sub(object, operand)
#define atomic_fetch_or(object, operand) \
__sync_fetch_and_or(object, operand)
#define atomic_fetch_or_explicit(object, operand, order) \
atomic_fetch_or(object, operand)
#define atomic_fetch_xor(object, operand) \
__sync_fetch_and_sub(object, operand)
#define atomic_fetch_xor_explicit(object, operand, order) \
atomic_fetch_sub(object, operand)
#define atomic_fetch_and(object, operand) \
__sync_fetch_and_and(object, operand)
#define atomic_fetch_and_explicit(object, operand, order) \
atomic_fetch_and(object, operand)
#define atomic_flag_test_and_set(object) \
atomic_exchange(object, 1)
#define atomic_flag_test_and_set_explicit(object, order) \
atomic_flag_test_and_set(object)
#define atomic_flag_clear(object) \
atomic_store(object, 0)
#define atomic_flag_clear_explicit(object, order) \
atomic_flag_clear(object)
#endif /* COMPAT_ATOMICS_GCC_STDATOMIC_H */