From 42ed3387ba51a57ed74bf5b7ce4e1a4c7591cd14 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 12 Dec 2017 09:59:11 -0500 Subject: [PATCH 1/9] fix aarch64 patch --- chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch | 12 ++++++++++++ chromium.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch diff --git a/chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch b/chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch new file mode 100644 index 00000000..469d6800 --- /dev/null +++ b/chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch @@ -0,0 +1,12 @@ +diff -up chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.aarch64glibc chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +--- chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.aarch64glibc 2017-12-12 09:56:24.469343868 -0500 ++++ chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2017-12-12 09:56:38.468071095 -0500 +@@ -461,7 +461,7 @@ bool ExceptionHandler::HandleSignal(int + #if defined(__aarch64__) + ucontext_t* uc_ptr = (ucontext_t*)uc; + struct fpsimd_context* fp_ptr = +- (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; ++ (struct fpsimd_context*)&uc_ptr->uc_mcontext.__glibc_reserved1; + if (fp_ptr->head.magic == FPSIMD_MAGIC) { + memcpy(&g_crash_context_.float_state, fp_ptr, + sizeof(g_crash_context_.float_state)); diff --git a/chromium.spec b/chromium.spec index f9ee0098..d422b33d 100644 --- a/chromium.spec +++ b/chromium.spec @@ -196,7 +196,7 @@ Patch50: chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch # from gentoo Patch53: chromium-61.0.3163.79-gcc-no-opt-safe-math.patch # Only needed when glibc 2.26.90 or later is used -Patch57: chromium-61.0.3163.79-aarch64-glibc-2.26.90.patch +Patch57: chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch # More gcc fixes for epel Patch58: chromium-62.0.3202.62-dde535-gcc-fix.patch Patch59: chromium-62.0.3202.62-gcc-nc.patch From b18325ee01005888523fc777b6e8ad82a11c1816 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 12 Dec 2017 11:44:08 -0500 Subject: [PATCH 2/9] new sources for aarch64 --- clean_ffmpeg.sh | 3 ++- sources | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh index d448da38..1f0b1ee2 100755 --- a/clean_ffmpeg.sh +++ b/clean_ffmpeg.sh @@ -238,7 +238,8 @@ manual_files=" libavcodec/aarch64/fft_neon.S \ libavutil/x86/x86inc.asm \ libavutil/x86/x86util.asm " -mp3_files=" libavcodec/aarch64/mpegaudiodsp_init.c \ +mp3_files=" libavcodec/aarch64/aacpsdsp_init_aarch64.c \ + libavcodec/aarch64/mpegaudiodsp_init.c \ libavcodec/aarch64/mpegaudiodsp_neon.S \ libavcodec/aac_ac3_parser.c \ libavcodec/aac_parser.c \ diff --git a/sources b/sources index ec0668d4..a02c98cb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03 -SHA512 (chromium-63.0.3239.84-clean.tar.xz) = 1b2551b8dcaf8eecd0a5fb69a458034f30a73bb22f8c7521cbac14d9c2621c9468a7b7f6cb17b2715adee491d10510958bf08f8aa6277d8829e149906903b7be +SHA512 (chromium-63.0.3239.84-clean.tar.xz) = 710ef4c71b96ce5934c5d4382c55f76b34e5d1338c783d99fd3341ae3c955ef476bcbb6ef2c7d5ae477e92ba048558e9cf5085f7585b8b34e7d10b07d5f6cae7 From 70ab91a31213a4b0e62359df87977e7dfe1a309a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 12 Dec 2017 13:03:57 -0500 Subject: [PATCH 3/9] moar aarch64 files --- clean_ffmpeg.sh | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh index 1f0b1ee2..e801901d 100755 --- a/clean_ffmpeg.sh +++ b/clean_ffmpeg.sh @@ -241,6 +241,7 @@ manual_files=" libavcodec/aarch64/fft_neon.S \ mp3_files=" libavcodec/aarch64/aacpsdsp_init_aarch64.c \ libavcodec/aarch64/mpegaudiodsp_init.c \ libavcodec/aarch64/mpegaudiodsp_neon.S \ + libavcodec/aarch64/sbrdsp_init_aarch64.c \ libavcodec/aac_ac3_parser.c \ libavcodec/aac_parser.c \ libavcodec/aacadtsdec.c \ diff --git a/sources b/sources index a02c98cb..695a1c61 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03 -SHA512 (chromium-63.0.3239.84-clean.tar.xz) = 710ef4c71b96ce5934c5d4382c55f76b34e5d1338c783d99fd3341ae3c955ef476bcbb6ef2c7d5ae477e92ba048558e9cf5085f7585b8b34e7d10b07d5f6cae7 +SHA512 (chromium-63.0.3239.84-clean.tar.xz) = 7deff8fc3997f416de47d2f4c560539fc87e59b478a8b337edfba8bc659740d9c9d9e32a90ff0aded27d4f5bcabbeb9bfa0469f78feb59f773e247d3d0faa816 From b9fa76f1dcd1935e6edb40d2c58bf5d24b6e8304 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 12 Dec 2017 15:39:16 -0500 Subject: [PATCH 4/9] moar moar aarch64 files --- clean_ffmpeg.sh | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh index e801901d..e1d56d4d 100755 --- a/clean_ffmpeg.sh +++ b/clean_ffmpeg.sh @@ -239,6 +239,7 @@ manual_files=" libavcodec/aarch64/fft_neon.S \ libavutil/x86/x86util.asm " mp3_files=" libavcodec/aarch64/aacpsdsp_init_aarch64.c \ + libavcodec/aarch64/autorename_libavcodec_aarch64_aacpsdsp_neon.S \ libavcodec/aarch64/mpegaudiodsp_init.c \ libavcodec/aarch64/mpegaudiodsp_neon.S \ libavcodec/aarch64/sbrdsp_init_aarch64.c \ diff --git a/sources b/sources index 695a1c61..fd826248 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03 SHA512 (chromium-63.0.3239.84-clean.tar.xz) = 7deff8fc3997f416de47d2f4c560539fc87e59b478a8b337edfba8bc659740d9c9d9e32a90ff0aded27d4f5bcabbeb9bfa0469f78feb59f773e247d3d0faa816 +SHA512 (chromium-63.0.3239.84-clean.tar.xz) = 47799417f4b1db6e8b540cba6e30f26c4fa047d06abc1514ce84649568bf0e6e6a1795609b55b5b18be538f089843b18b92fb1e809cdb2584e0a3a58ff80cdbb From 3698ffd61464a4eacb1c9ebaec85bb018d268a9a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 12 Dec 2017 15:39:55 -0500 Subject: [PATCH 5/9] moar moar aarch64 files --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index fd826248..aa5539ed 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03 -SHA512 (chromium-63.0.3239.84-clean.tar.xz) = 7deff8fc3997f416de47d2f4c560539fc87e59b478a8b337edfba8bc659740d9c9d9e32a90ff0aded27d4f5bcabbeb9bfa0469f78feb59f773e247d3d0faa816 SHA512 (chromium-63.0.3239.84-clean.tar.xz) = 47799417f4b1db6e8b540cba6e30f26c4fa047d06abc1514ce84649568bf0e6e6a1795609b55b5b18be538f089843b18b92fb1e809cdb2584e0a3a58ff80cdbb From eac1e3983c8b82df515266bf06daada87b817c51 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 12 Dec 2017 16:14:12 -0500 Subject: [PATCH 6/9] moar moar moar aarch64 files --- clean_ffmpeg.sh | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh index e1d56d4d..daa5538a 100755 --- a/clean_ffmpeg.sh +++ b/clean_ffmpeg.sh @@ -240,6 +240,7 @@ manual_files=" libavcodec/aarch64/fft_neon.S \ mp3_files=" libavcodec/aarch64/aacpsdsp_init_aarch64.c \ libavcodec/aarch64/autorename_libavcodec_aarch64_aacpsdsp_neon.S \ + libavcodec/aarch64/autorename_libavcodec_aarch64_sbrdsp_neon.S \ libavcodec/aarch64/mpegaudiodsp_init.c \ libavcodec/aarch64/mpegaudiodsp_neon.S \ libavcodec/aarch64/sbrdsp_init_aarch64.c \ diff --git a/sources b/sources index aa5539ed..c3f64e19 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03 -SHA512 (chromium-63.0.3239.84-clean.tar.xz) = 47799417f4b1db6e8b540cba6e30f26c4fa047d06abc1514ce84649568bf0e6e6a1795609b55b5b18be538f089843b18b92fb1e809cdb2584e0a3a58ff80cdbb +SHA512 (chromium-63.0.3239.84-clean.tar.xz) = fbe7e2f2afc50119687c09feb52ae7855a5ee5dd7b37889b18d5bec230faeb3b70181080d0197689ba016cd3bae195b6217d28e249c3ede94efedc8ca9c97e17 From 7bb0a21760b69f8f2af3386e1489d6768c16a491 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 14 Dec 2017 11:57:05 +0100 Subject: [PATCH 7/9] Don't require libcanberra-gtk2 GTK+ 3 build is enabled But require libcanberra-gtk3. Also remove provides for bundled gtk3 as it's not bundling one. --- chromium.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/chromium.spec b/chromium.spec index d422b33d..15f464e5 100644 --- a/chromium.spec +++ b/chromium.spec @@ -254,9 +254,6 @@ BuildRequires: fontconfig-devel BuildRequires: GConf2-devel BuildRequires: glib2-devel BuildRequires: gnome-keyring-devel -BuildRequires: gtk2-devel -# Yes. This too. -# BuildRequires: gtk3-devel BuildRequires: glibc-devel BuildRequires: gperf BuildRequires: libatomic @@ -353,6 +350,8 @@ BuildRequires: opus-devel BuildRequires: perl(Switch) %if 0%{gtk3} BuildRequires: pkgconfig(gtk+-3.0) +%else +BuildRequires: pkgconfig(gtk+-2.0) %endif BuildRequires: pulseaudio-libs-devel BuildRequires: python-beautifulsoup4 @@ -386,7 +385,11 @@ Requires: nss%{_isa} >= 3.26 Requires: nss-mdns%{_isa} # GTK modules it expects to find for some reason. +%if 0%{gtk3} +Requires: libcanberra-gtk3%{_isa} +%else Requires: libcanberra-gtk2%{_isa} +%endif %if 0%{?fedora} # This enables support for u2f tokens @@ -438,7 +441,6 @@ Provides: bundled(ffmpeg) = 3.2git Provides: bundled(fips181) = 2.2.3 Provides: bundled(fontconfig) = 2.11.0 Provides: bundled(gperftools) = svn144 -Provides: bundled(gtk3) = 3.1.4 %if 0%{?bundleharfbuzz} Provides: bundled(harfbuzz) = 1.4.2 %endif From 7d49b3d7e2f181e909b6bde9e4bd4fbe7f152b1d Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 14 Dec 2017 15:50:23 +0100 Subject: [PATCH 8/9] Add missing ffmpeg files on aarch64 --- clean_ffmpeg.sh | 2 ++ sources | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh index daa5538a..984a1a39 100755 --- a/clean_ffmpeg.sh +++ b/clean_ffmpeg.sh @@ -239,11 +239,13 @@ manual_files=" libavcodec/aarch64/fft_neon.S \ libavutil/x86/x86util.asm " mp3_files=" libavcodec/aarch64/aacpsdsp_init_aarch64.c \ + libavcodec/aarch64/aacpsdsp_neon.S \ libavcodec/aarch64/autorename_libavcodec_aarch64_aacpsdsp_neon.S \ libavcodec/aarch64/autorename_libavcodec_aarch64_sbrdsp_neon.S \ libavcodec/aarch64/mpegaudiodsp_init.c \ libavcodec/aarch64/mpegaudiodsp_neon.S \ libavcodec/aarch64/sbrdsp_init_aarch64.c \ + libavcodec/aarch64/sbrdsp_neon.S \ libavcodec/aac_ac3_parser.c \ libavcodec/aac_parser.c \ libavcodec/aacadtsdec.c \ diff --git a/sources b/sources index c3f64e19..6f9d15bb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03 -SHA512 (chromium-63.0.3239.84-clean.tar.xz) = fbe7e2f2afc50119687c09feb52ae7855a5ee5dd7b37889b18d5bec230faeb3b70181080d0197689ba016cd3bae195b6217d28e249c3ede94efedc8ca9c97e17 +SHA512 (chromium-63.0.3239.84-clean.tar.xz) = b3cfc3e057ce0e182151fef6950b2d203720cee6b3557b8db780bf95e48a23f040f10ed30fe3384321e960f2adbe36b4e47f45144fea5800ddce1ebeca8085c8 From 41a88702e4b9228facf32ecd190afa4daf4908c7 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 15 Dec 2017 09:40:28 +0100 Subject: [PATCH 9/9] Update to 63.0.3239.108 --- .gitignore | 1 + chromium.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f261d90b..2e1d151b 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /chromium-62.0.3202.75-clean.tar.xz /chromium-62.0.3202.89-clean.tar.xz /chromium-63.0.3239.84-clean.tar.xz +/chromium-63.0.3239.108-clean.tar.xz diff --git a/chromium.spec b/chromium.spec index 15f464e5..971cdb65 100644 --- a/chromium.spec +++ b/chromium.spec @@ -116,7 +116,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.3239.84 +Version: %{majorversion}.0.3239.108 Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser Url: http://www.chromium.org/Home @@ -1510,6 +1510,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Fri Dec 15 2017 Tomas Popela 63.0.3239.108-1 +- Update to 63.0.3239.108 + * Thu Dec 7 2017 Tom Callaway 63.0.3239.84-1 - update to 63.0.3239.84 diff --git a/sources b/sources index 6f9d15bb..e9f4e809 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03 -SHA512 (chromium-63.0.3239.84-clean.tar.xz) = b3cfc3e057ce0e182151fef6950b2d203720cee6b3557b8db780bf95e48a23f040f10ed30fe3384321e960f2adbe36b4e47f45144fea5800ddce1ebeca8085c8 +SHA512 (chromium-63.0.3239.108-clean.tar.xz) = 565c0e6c94ceae506a69d7d14b2ebbffcab72635b4168e35a433dcc726ab768a46667705b9e25c02500e3b5a1aa11e19730ae4985b1ef292e8ff976286c5094a