Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2de971696b6b832ddb6b027ecda60c99ff44d85b
commit 2de971696b6b832ddb6b027ecda60c99ff44d85b Author: DeX77 <[email protected]> Date: Thu Oct 19 22:33:36 2017 +0200 chromium-browser-62.0.3202.62-2-x86_64 * fix on non intel gpu hardware. See: https://bugs.chromium.org/p/chromium/issues/detail?id=776359 diff --git a/source/xapps-extra/chromium-browser/FrugalBuild b/source/xapps-extra/chromium-browser/FrugalBuild index 011b269..7fe5671 100644 --- a/source/xapps-extra/chromium-browser/FrugalBuild +++ b/source/xapps-extra/chromium-browser/FrugalBuild @@ -3,11 +3,11 @@ pkgname=chromium-browser pkgver=62.0.3202.62 -pkgrel=1 +pkgrel=2 pkgdesc='Development version of Chromium browser' url='http://www.chromium.org/' depends=('nss>=3.21-3' 'libxscrnsaver>=1.2.2-2' 'libpulse>=7.1-4' 'snappy>=1.1.6' 'libcups' \ - 'speech-dispatcher>=0.7.1-4' 'libxtst>=1.2.2-2' 'pango' 'atk' 'libxkbcommon' \ + 'speech-dispatcher>=0.7.1-4' 'libxtst>=1.2.2-2' 'pango' 'atk' 'libxkbcommon' 'libxml2' \ 'libatomic' 'pciutils>=3.5' 'gtk+3' 'libxslt' 'icu4c>=58.1' 'libwebp>=0.6.0-3' 'libdrm') #using the built in ones for now #depends+=('libevent>=2.0.22-3' 'libjpeg>=9a') @@ -26,23 +26,15 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom $pkgname.desktop \ $pkgname.sh \ chromium-gn-bootstrap-r17.patch \ - chromium-gcc-r1.patch \ chromium-last-commit-position-r1.patch \ - gcc6-no-delete-null-pointer-checks.patch \ - chromium-46.0.2490.86-use_system_opus.patch \ - chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch \ - chromium-58.0.3029.81-use_system_harfbuzz.patch \ + disable-tid-cache.patch \ chromium-widevine.patch ) sha1sums=('71fe9b80df83fb80190f87d8356d2a70f42f7fba' \ '264b8e7c4e3273263d504e041e5e4d152677922c' \ '4c41d59b4d85a9f0443d6ca1dec456e50059dab5' \ 'b786274d1601b57d7d4337a376bd04e430bdb98e' \ - '4cd123747db9ebb678221345da3028798ea2deb5' \ 'd03e6465cd5a84580f9dad5d45f24ccd42bb71e6' \ - '0fa01f6ac92d4616cdc74073952ada2259be1d70' \ - 'd6d09996ff5ff4d796cf26f239eb2b688e017d25' \ - 'af663b4b7a7a9e6f0075c4f60f0b4310a77d2d89' \ - '38b79bdb506d7b186b1c909ffd9f7366e1f56cd7' \ + '1aaafb6da4603ae778085f9064a6f47f18624371' \ 'c5719d06e0b39dfd3ca74f9f42684f4ee7584ade') chromium_path="chromium" @@ -140,7 +132,7 @@ build() { 'third_party/libudev' \ 'third_party/libusb' \ 'third_party/libwebm' \ - 'third_party/libxml' \ + 'third_party/libxml/chromium' \ 'third_party/libyuv' \ 'third_party/lss' \ 'third_party/lzma_sdk' \ @@ -223,6 +215,7 @@ build() { libxslt snappy yasm + libxml zlib" Fexec build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || Fdie @@ -260,6 +253,8 @@ build() { myconf_gn+=" enable_remoting=true " myconf_gn+=" use_system_libjpeg=false " myconf_gn+=" use_custom_libcxx=false " + myconf_gn+=" exclude_unwind_tables=true " + myconf_gn+=" enable_swiftshader=false " myconf_gn+=" ffmpeg_branding=\"Chrome\"" diff --git a/source/xapps-extra/chromium-browser/chromium-46.0.2490.86-use_system_opus.patch b/source/xapps-extra/chromium-browser/chromium-46.0.2490.86-use_system_opus.patch deleted file mode 100644 index d54938b..0000000 --- a/source/xapps-extra/chromium-browser/chromium-46.0.2490.86-use_system_opus.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc.use_system_opus chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc ---- chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc.use_system_opus 2015-10-07 04:42:12.000000000 +0200 -+++ chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc 2015-11-11 16:11:13.535250609 +0100 -@@ -13,7 +13,7 @@ - #include "media/cast/test/utility/audio_utility.h" - #include "media/cast/test/utility/standalone_cast_environment.h" - #include "testing/gtest/include/gtest/gtest.h" --#include "third_party/opus/src/include/opus.h" -+#include <opus/opus.h> - - namespace media { - namespace cast { diff --git a/source/xapps-extra/chromium-browser/chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch b/source/xapps-extra/chromium-browser/chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch deleted file mode 100644 index c422957..0000000 --- a/source/xapps-extra/chromium-browser/chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up chromium-47.0.2526.80/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc.ignore-fd-count chromium-47.0.2526.80/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc ---- chromium-47.0.2526.80/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc.ignore-fd-count 2015-12-15 14:48:07.119011866 -0500 -+++ chromium-47.0.2526.80/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc 2015-12-15 14:48:14.151850055 -0500 -@@ -153,6 +153,14 @@ void NaClSandbox::InitializeLayerOneSand - } - - void NaClSandbox::CheckForExpectedNumberOfOpenFds() { -+ // Whatever logic this code is using is wrong more often than it is right. -+ // If you set expected_num_fds to 6, it finds 7. -+ // If you set expected_num_fds to 7, it finds 6. -+ // Code like this makes a packager drink. And not the good stuff either. -+ // Instead, we're just going to smile and tell it to never care about the -+ // number of FDs open. Stupid code. We hates it. -+ -+#if 0 - // We expect to have the following FDs open: - // 1-3) stdin, stdout, stderr. - // 4) The /dev/urandom FD used by base::GetUrandomFD(). -@@ -171,6 +179,8 @@ void NaClSandbox::CheckForExpectedNumber - } - - CHECK_EQ(expected_num_fds, sandbox::ProcUtil::CountOpenFds(proc_fd_.get())); -+#endif -+ - } - - void NaClSandbox::InitializeLayerTwoSandbox(bool uses_nonsfi_mode) { diff --git a/source/xapps-extra/chromium-browser/chromium-58.0.3029.81-use_system_harfbuzz.patch b/source/xapps-extra/chromium-browser/chromium-58.0.3029.81-use_system_harfbuzz.patch deleted file mode 100644 index 6f82463..0000000 --- a/source/xapps-extra/chromium-browser/chromium-58.0.3029.81-use_system_harfbuzz.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h 2017-04-19 21:06:54.000000000 +0200 -+++ chromium-58.0.3029.81.new/ui/gfx/render_text_harfbuzz.h 2017-04-20 10:51:36.000000000 +0200 -@@ -12,7 +12,7 @@ - #include <vector> - - #include "base/macros.h" --#include "third_party/harfbuzz-ng/src/hb.h" -+#include <harfbuzz/hb.h> - #include "third_party/icu/source/common/unicode/ubidi.h" - #include "third_party/icu/source/common/unicode/uscript.h" - #include "ui/gfx/render_text.h" diff --git a/source/xapps-extra/chromium-browser/chromium-gcc-r1.patch b/source/xapps-extra/chromium-browser/chromium-gcc-r1.patch deleted file mode 100644 index 2acd11e..0000000 --- a/source/xapps-extra/chromium-browser/chromium-gcc-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h -index 99f230ce7e9a..de2415d402f5 100644 ---- a/base/numerics/safe_math_shared_impl.h -+++ b/base/numerics/safe_math_shared_impl.h -@@ -21,8 +21,7 @@ - #if !defined(__native_client__) && \ - ((defined(__clang__) && \ - ((__clang_major__ > 3) || \ -- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ -- (defined(__GNUC__) && __GNUC__ >= 5)) -+ (__clang_major__ == 3 && __clang_minor__ >= 4)))) - #include "base/numerics/safe_math_clang_gcc_impl.h" - #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) - #else diff --git a/source/xapps-extra/chromium-browser/disable-tid-cache.patch b/source/xapps-extra/chromium-browser/disable-tid-cache.patch new file mode 100644 index 0000000..ba0bf45 --- /dev/null +++ b/source/xapps-extra/chromium-browser/disable-tid-cache.patch @@ -0,0 +1,75 @@ +--- chromium-62.0.3202.62/sandbox/linux/services/namespace_sandbox.cc 2017-10-17 21:10:48.000000000 +0200 ++++ chromium-62.0.3202.62.new/sandbox/linux/services/namespace_sandbox.cc 2017-10-19 22:18:27.001856169 +0200 +@@ -23,7 +23,6 @@ + #include "base/posix/eintr_wrapper.h" + #include "base/process/launch.h" + #include "base/process/process.h" +-#include "build/build_config.h" + #include "sandbox/linux/services/credentials.h" + #include "sandbox/linux/services/namespace_utils.h" + #include "sandbox/linux/services/syscall_wrappers.h" +@@ -85,54 +84,6 @@ + _exit(NamespaceSandbox::SignalExitCode(sig)); + } + +-#if defined(LIBC_GLIBC) +-// The first few fields of glibc's struct pthread. The full +-// definition is in: +-// https://sourceware.org/git/?p=glibc.git;a=blob;f=nptl/descr.h;hb=95a73392580761abc62fc9b1386d232cd55878e9#l121 +-struct glibc_pthread { +- union { +-#if defined(ARCH_CPU_X86_64) +- // On x86_64, sizeof(tcbhead_t) > sizeof(void*)*24. +- // https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/x86_64/nptl/tls.h;hb=95a73392580761abc62fc9b1386d232cd55878e9#l65 +- // For all other architectures, sizeof(tcbhead_t) <= sizeof(void*)*24. +- // https://sourceware.org/git/?p=glibc.git&a=search&h=HEAD&st=grep&s=%7D+tcbhead_t +- char header[704]; +-#endif +- void* padding[24]; +- } header; +- void* list[2]; +- pid_t tid; +-}; +- +-pid_t GetGlibcCachedTid() { +- pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; +- CHECK_EQ(0, pthread_mutex_init(&lock, nullptr)); +- CHECK_EQ(0, pthread_mutex_lock(&lock)); +- pid_t tid = lock.__data.__owner; +- CHECK_EQ(0, pthread_mutex_unlock(&lock)); +- CHECK_EQ(0, pthread_mutex_destroy(&lock)); +- return tid; +-} +- +-void MaybeUpdateGlibcTidCache() { +- // After the below CL, glibc does not does not reset the cached +- // TID/PID on clone(), but pthread depends on it being up-to-date. +- // This CL was introduced in glibc 2.25, and backported to 2.24 on +- // at least Debian and Fedora. This is a workaround that updates +- // the cache manually. +- // https://sourceware.org/git/?p=glibc.git;a=commit;h=c579f48edba88380635ab98cb612030e3ed8691e +- pid_t real_tid = sys_gettid(); +- pid_t cached_tid = GetGlibcCachedTid(); +- if (cached_tid != real_tid) { +- pid_t* cached_tid_location = +- &reinterpret_cast<struct glibc_pthread*>(pthread_self())->tid; +- CHECK_EQ(cached_tid, *cached_tid_location); +- *cached_tid_location = real_tid; +- CHECK_EQ(real_tid, GetGlibcCachedTid()); +- } +-} +-#endif // defined(LIBC_GLIBC) +- + } // namespace + + #if !defined(OS_NACL_NONSFI) +@@ -226,9 +177,6 @@ + // Since we just forked, we are single-threaded, so this should be safe. + CHECK(Credentials::DropAllCapabilitiesOnCurrentThread()); + } +-#if defined(LIBC_GLIBC) +- MaybeUpdateGlibcTidCache(); +-#endif + return 0; + } + diff --git a/source/xapps-extra/chromium-browser/gcc6-no-delete-null-pointer-checks.patch b/source/xapps-extra/chromium-browser/gcc6-no-delete-null-pointer-checks.patch deleted file mode 100644 index f97f77d..0000000 --- a/source/xapps-extra/chromium-browser/gcc6-no-delete-null-pointer-checks.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur chromium-53.0.2785.116/v8/gypfiles/toolchain.gypi chromium-53.0.2785.116-gcc6/v8/gypfiles/toolchain.gypi ---- chromium-53.0.2785.116/v8/gypfiles/toolchain.gypi 2016-09-15 03:06:53.000000000 +0200 -+++ chromium-53.0.2785.116-gcc6/v8/gypfiles/toolchain.gypi 2016-09-22 13:24:44.246588268 +0200 -@@ -74,6 +74,10 @@ - # Some versions of GCC 4.5 seem to need -fno-strict-aliasing. - 'v8_no_strict_aliasing%': 0, - -+ # V8 needs support for illegal null this pointers, and must disable -+ # optimizations in GCC 6 that relies on correct behavior. -+ 'v8_no_delete_null_pointer_checks%': 0, -+ - # Chrome needs this definition unconditionally. For standalone V8 builds, - # it's handled in gypfiles/standalone.gypi. - 'want_separate_host_toolset%': 1, -@@ -1074,6 +1078,10 @@ - [ 'v8_no_strict_aliasing==1', { - 'cflags': [ '-fno-strict-aliasing' ], - }], -+ [ 'v8_no_delete_null_pointer_checks==1', { -+ 'cflags_cc': [ '-fno-delete-null-pointer-checks' ], -+ }], -+ - ], # conditions - }], - ['OS=="solaris"', { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
