Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=94a1f82fe9d9b2cfc07f9401cf13dc87182bd534

commit 94a1f82fe9d9b2cfc07f9401cf13dc87182bd534
Author: DeX77 <de...@frugalware.org>
Date:   Tue Sep 20 18:18:46 2016 +0200

chromium-browser-53.0.2785.116-2-x86_64

* fix for NaCL

diff --git a/source/xapps-extra/chromium-browser/FrugalBuild 
b/source/xapps-extra/chromium-browser/FrugalBuild
index eb4c61c..2d57067 100644
--- a/source/xapps-extra/chromium-browser/FrugalBuild
+++ b/source/xapps-extra/chromium-browser/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=chromium-browser
pkgver=53.0.2785.116
-pkgrel=1
+pkgrel=2
pkgdesc='An open-source browser project that aims to build a safer, faster, and 
more stable way for all users to experience the web'
url='http://www.chromium.org/'
depends=('libevent>=2.0.22-3' 'nss>=3.21-3' 'libxscrnsaver>=1.2.2-2' 
'libpulse>=7.1-4' 'snappy>=1.1.3-2' 'libcups' \
@@ -16,6 +16,7 @@ archs=('i686' 'x86_64')
_F_gnome_iconcache="y"
Finclude gnome-scriptlet
_F_archive_name="chromium"
+options+=('nostrip')
up2date="lynx -dump -useragent='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_0) 
AppleWebKit/537.1 (KHTML, like Gecko) Chrome/21.0.1180.79 Safari/537.1' \
'http://chromium.woolyss.com/#stable-chromium-version' | \
egrep -o '([0123456789.]*)/DEPS' | \
@@ -29,6 +30,7 @@ 
source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
chromium-52.0.2743.82-widevinefix.patch \
chromium-46.0.2490.86-use_system_opus.patch \
chromium-52.0.2723.2-use_system_harfbuzz.patch \
+       chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch \
chromium-52.0.2743.82-cups22.patch )

sha1sums=('9f20ac0a5d1720bc932ed85779112d164390327f' \
@@ -40,6 +42,7 @@ sha1sums=('9f20ac0a5d1720bc932ed85779112d164390327f' \
'452ca515e91ff27957ee1b5dfd975f2daabc5b64' \
'd6d09996ff5ff4d796cf26f239eb2b688e017d25' \
'4ac2af324c6927507d214ba3b6512ad1a879a2ff' \
+          'af663b4b7a7a9e6f0075c4f60f0b4310a77d2d89' \
'281ef7c51b733765b741d69b78e7d74ec6cb328a')

CXXFLAGS="$CXXFLAGS -fpermissive"
@@ -170,11 +173,6 @@ build() {
strip -s out/Release/chrome_sandbox
strip -s out/Release/lib/*.so

-       if [ ! $CARCH = i686 ]; then
-               strip -s out/Release/nacl_helper{,_bootstrap}
-               strip -s out/Release/nacl_irt_*.nexe
-       fi
-
Fmkdir usr/lib/chromium
Fexerel out/Release/chrome usr/lib/chromium/chromium
Finstallrel 4755 out/Release/chrome_sandbox usr/lib/chromium/chrome-sandbox
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
new file mode 100644
index 0000000..c422957
--- /dev/null
+++ 
b/source/xapps-extra/chromium-browser/chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch
@@ -0,0 +1,27 @@
+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) {
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to