diff options
| -rw-r--r-- | network/chromium/chromium-52.0.2743.116-unset-madv_free.patch | 15 | ||||
| -rw-r--r-- | network/chromium/chromium.SlackBuild | 28 | ||||
| -rw-r--r-- | network/chromium/chromium.info | 6 |
3 files changed, 34 insertions, 15 deletions
diff --git a/network/chromium/chromium-52.0.2743.116-unset-madv_free.patch b/network/chromium/chromium-52.0.2743.116-unset-madv_free.patch new file mode 100644 index 0000000000..2867c79677 --- /dev/null +++ b/network/chromium/chromium-52.0.2743.116-unset-madv_free.patch @@ -0,0 +1,15 @@ +diff -up chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp +--- chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free 2016-08-15 13:07:29.279655676 -0400 ++++ chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-15 13:08:38.447317416 -0400 +@@ -41,6 +41,11 @@ + #include <errno.h> + #include <sys/mman.h> + ++#if OS(LINUX) && defined(MADV_FREE) ++// Added in Linux 4.5, but it breaks the sandbox. ++#undef MADV_FREE ++#endif ++ + #ifndef MADV_FREE + #define MADV_FREE MADV_DONTNEED + #endif diff --git a/network/chromium/chromium.SlackBuild b/network/chromium/chromium.SlackBuild index 25e17a0e83..8dd6fe7cc5 100644 --- a/network/chromium/chromium.SlackBuild +++ b/network/chromium/chromium.SlackBuild @@ -28,13 +28,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=chromium -VERSION=${VERSION:-48.0.2564.97} +VERSION=${VERSION:-53.0.2785.143} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -55,8 +55,8 @@ GOOGLE_API_KEY=AIzaSyBhWJ-j5RXyt5911BMuVen-WuS10mvOnrY GOOGLE_DEFAULT_CLIENT_ID=952820686433-mbp5sv9scfj78siq96jlvrem47qgvbi3.apps.googleusercontent.com GOOGLE_DEFAULT_CLIENT_SECRET=XU4b-j0Ssy-XkTvSVmiFMvNY -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" TARGETARCH="ia32" @@ -92,6 +92,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Disable MADV_FREE (if set by glibc) +# https://bugzilla.redhat.com/show_bug.cgi?id=1361157 +patch -p1 -i $CWD/chromium-52.0.2743.116-unset-madv_free.patch + if [ "$USE_CLANG" = "YES" ]; then CLANG_OPT="-Dclang=1 -Dclang_use_chrome_plugins=0" sed -e '/-Wno-absolute-value/d' -i build/common.gypi @@ -113,7 +117,7 @@ _conf=( -Dgoogle_api_key=$GOOGLE_API_KEY -Dgoogle_default_client_id=$GOOGLE_DEFAULT_CLIENT_ID -Dgoogle_default_client_secret=$GOOGLE_DEFAULT_CLIENT_SECRET - -Dicu_use_data_file_flag=0 + -Dicu_use_data_file_flag=1 -Dlinux_sandbox_path=/usr/lib${LIBDIRSUFFIX}/chromium/chrome_sandbox -Dlinux_strip_binary=1 -Dlinux_use_bundled_binutils=0 @@ -127,24 +131,25 @@ _conf=( -Duse_allocator=none -Duse_gconf=0 -Duse_kerberos=0 - -Duse_pulseaudio=0 + -Duse_sysroot=0 + -Duse_pulseaudio=1 -Duse_system_bzip2=0 - -Duse_system_flac=1 -Duse_system_ffmpeg=0 -Duse_system_harfbuzz=0 -Duse_system_icu=0 - -Duse_system_libevent=1 -Duse_system_libjpeg=0 -Duse_system_libpng=0 -Duse_system_libxml=0 -Duse_system_libxslt=0 - -Duse_system_nspr=1 -Duse_system_opus=0 -Duse_system_snappy=0 + -Duse_system_zlib=0 + -Duse_system_flac=1 + -Duse_system_libevent=1 + -Duse_system_nspr=1 -Duse_system_openssl=1 -Duse_system_xdg_utils=1 -Duse_system_yasm=1 - -Duse_system_zlib=0 -Dwerror= -Drelease_extra_cflags="$CFLAGS" -Dtarget_arch=$TARGETARCH @@ -177,8 +182,7 @@ cp out/Release/lib/libffmpeg.so $PKG/usr/lib${LIBDIRSUFFIX}/chromium/lib cp out/Release/natives_blob.bin $PKG/usr/lib${LIBDIRSUFFIX}/chromium cp out/Release/snapshot_blob.bin $PKG/usr/lib${LIBDIRSUFFIX}/chromium - -cp -a third_party/icu/source/data/in/icudtl.dat $PKG/usr/lib${LIBDIRSUFFIX}/chromium +cp -a out/Release/icudtl.dat $PKG/usr/lib${LIBDIRSUFFIX}/chromium mkdir -p $PKG/usr/man/man1 install -m 0644 -D out/Release/chrome.1 $PKG/usr/man/man1/chromium.1 diff --git a/network/chromium/chromium.info b/network/chromium/chromium.info index 4814163c97..9745783b77 100644 --- a/network/chromium/chromium.info +++ b/network/chromium/chromium.info @@ -1,8 +1,8 @@ PRGNAM="chromium" -VERSION="48.0.2564.97" +VERSION="53.0.2785.143" HOMEPAGE="http://www.chromium.org/" -DOWNLOAD="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-48.0.2564.97.tar.xz" -MD5SUM="1112016e382f2b8226384fe4bf1301e0" +DOWNLOAD="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-53.0.2785.143.tar.xz" +MD5SUM="fdc737af242421b2a9a0bb84f6b17040" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ninja" |