From b10689fd39a2618b46e29af2ca4eb1d6c48b08df Mon Sep 17 00:00:00 2001 From: Francisco Ambrozio Date: Thu, 21 Nov 2013 19:34:25 +0100 Subject: network/chromium: Updated for version 31.0.1650.57. Signed-off-by: Matteo Bernardini --- network/chromium/README | 6 ++++ network/chromium/chromium-header.patch | 10 ------ network/chromium/chromium.SlackBuild | 60 ++++++++++++++++++---------------- network/chromium/chromium.desktop | 2 +- network/chromium/chromium.info | 9 +++-- 5 files changed, 43 insertions(+), 44 deletions(-) delete mode 100644 network/chromium/chromium-header.patch diff --git a/network/chromium/README b/network/chromium/README index 43038957d2..4d9741b273 100644 --- a/network/chromium/README +++ b/network/chromium/README @@ -1,2 +1,8 @@ Google Chromium is a browser that combines a minimal design with sophisticated technology to make the web faster, safer, and easier. + +The Google API keys provided in the SlackBuild are for this build +use ONLY. If you intend to use this build script for your own +distribution, please get your own set of keys. +Feel free to contact the maintainer of this SlackBuild for more +informations. diff --git a/network/chromium/chromium-header.patch b/network/chromium/chromium-header.patch deleted file mode 100644 index e6c7de9faf..0000000000 --- a/network/chromium/chromium-header.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- chromium-21.0.1168.0/chrome/browser/memory_details_linux.cc.orig 2012-09-25 10:48:48.208739739 +0700 -+++ chromium-21.0.1168.0/chrome/browser/memory_details_linux.cc 2012-09-25 10:49:19.195357731 +0700 -@@ -14,6 +14,7 @@ - #include "chrome/common/chrome_constants.h" - #include "content/public/browser/browser_thread.h" - #include "content/public/common/process_type.h" -+#include - - using base::ProcessEntry; - using content::BrowserThread; \ No newline at end of file diff --git a/network/chromium/chromium.SlackBuild b/network/chromium/chromium.SlackBuild index 52bfbc11c3..425a8e500b 100644 --- a/network/chromium/chromium.SlackBuild +++ b/network/chromium/chromium.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for Google Chromium # # Copyright 2010 Yucatan "Kenjiro" Costa, Alegrete, RS, Brasil -# Copyright 2012 Francisco Ambrozio +# Copyright 2013 Francisco Ambrozio # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=chromium -VERSION=${VERSION:-24.0.1312.52} +VERSION=${VERSION:-31.0.1650.57} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -41,26 +41,29 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +DDSSE=" -Ddisable_sse2=1 " + +# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) +# Here we following the same way of Arch Linux and Gentoo. +# Note: These are for this build use ONLY. For your own distribution, please +# get your own set of keys. Feel free to contact me for more information. +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" LIBDIRSUFFIX="" - DTARGETARCH=" -Dtarget_arch=ia32 " - DDSSE=" -Ddisable_sse2=1 " elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" - DTARGETARCH=" -Dtarget_arch=ia32 " - DDSSE=" -Ddisable_sse2=1 " elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" - DTARGETARCH=" -Dtarget_arch=x64 " DDSSE="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" - DTARGETARCH=" -Dtarget_arch=ia32 " - DDSSE=" -Ddisable_sse2=1 " fi set -e @@ -69,26 +72,26 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -patch -p1 < $CWD/chromium-header.patch +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Change "-Dproprietary_codecs" to "0" if you don't want to use proprietary codecs -#SLKCFLAGS="${SLKCFLAGS} -fno-ipa-cp" +SLKCFLAGS="${SLKCFLAGS} -Wno-unused-local-typedefs" export -n CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" build/gyp_chromium -f make build/all.gyp --depth=. \ - $DTARGETARCH \ + -Dgoogle_api_key=$GOOGLE_API_KEY \ + -Dgoogle_default_client_id=$GOOGLE_DEFAULT_CLIENT_ID \ + -Dgoogle_default_client_secret=$GOOGLE_DEFAULT_CLIENT_SECRET \ -Dwerror= \ -Dlinux_link_gnome_keyring=0 \ - -Dlinux_sandbox_path=/usr/lib${LIBDIRSUFFIX}/chromium/chrome_sandbox \ + -Dlinux_sandbox_path=/usr/lib${LIBDIRSUFFIX}/chromium/chrome-sandbox \ -Dlinux_strip_binary=1 \ -Dlinux_use_gold_binary=0 \ -Dlinux_use_gold_flags=0 \ @@ -98,15 +101,16 @@ build/gyp_chromium -f make build/all.gyp --depth=. \ -Duse_gconf=0 \ -Duse_gnome_keyring=0 \ -Duse_kerberos=0 \ + -Duse_pulseaudio=0 \ -Duse_system_bzip2=1 \ -Duse_system_ffmpeg=0 \ -Duse_system_libevent=1 \ - -Duse_system_libpng=0 \ + -Duse_system_libpng=1 \ -Duse_system_libjpeg=1 \ -Duse_system_libxslt=1 \ -Duse_system_libxml=1 \ -Duse_system_ssl=0 \ - -Duse_system_zlib=0 \ + -Duse_system_zlib=1 \ -Duse_system_yasm=1 \ -Ddisable_nacl=1 \ -Drelease_extra_cflags="$CFLAGS" \ @@ -118,8 +122,8 @@ make chrome chrome_sandbox BUILDTYPE=Release V=1 cd out/Release/ mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/chromium mkdir -p $PKG/usr/bin - install -m 0755 -D chrome $PKG/usr/lib${LIBDIRSUFFIX}/chromium - install -m 4555 -o root -g root -D chrome_sandbox $PKG/usr/lib${LIBDIRSUFFIX}/chromium + install -m 0755 -D chrome $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromium + install -m 4755 -o root -g root -D chrome_sandbox $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chrome-sandbox install -m 0755 -D libffmpegsumo.so $PKG/usr/lib${LIBDIRSUFFIX}/chromium cp *.pak $PKG/usr/lib${LIBDIRSUFFIX}/chromium cp -a locales/ $PKG/usr/lib${LIBDIRSUFFIX}/chromium @@ -127,7 +131,7 @@ cd out/Release/ find $PKG -name '*.d' -type f -delete mkdir -p $PKG/usr/man/man1 - install -m 0644 -D chrome.1 $PKG/usr/man/man1/ + install -m 0644 -D chrome.1 $PKG/usr/man/man1/chromium.1 mkdir -p $PKG/usr/share/pixmaps cp product_logo_48.png $PKG/usr/share/pixmaps/chromium.png mkdir -p $PKG/usr/share/applications @@ -137,15 +141,15 @@ cd ../../ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/ || true -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done cd $PKG - ln -s /usr/lib${LIBDIRSUFFIX}/chromium/chrome $PKG/usr/bin/chrome - ln -s /usr/lib${LIBDIRSUFFIX}/chromium/chrome_sandbox $PKG/usr/bin/chrome_sandbox + ln -s /usr/lib${LIBDIRSUFFIX}/chromium/chromium $PKG/usr/bin/chromium + ln -s /usr/lib${LIBDIRSUFFIX}/chromium/chrome-sandbox $PKG/usr/bin/chrome-sandbox cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/chromium/chromium.desktop b/network/chromium/chromium.desktop index 84c5de81e1..847b631bcc 100644 --- a/network/chromium/chromium.desktop +++ b/network/chromium/chromium.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=/usr/bin/chrome --enable-plugins %U +Exec=/usr/bin/chromium %U Icon=/usr/share/pixmaps/chromium.png Type=Application Categories=Network; diff --git a/network/chromium/chromium.info b/network/chromium/chromium.info index 4caa4892f4..71c5764d01 100644 --- a/network/chromium/chromium.info +++ b/network/chromium/chromium.info @@ -1,10 +1,9 @@ PRGNAM="chromium" -VERSION="24.0.1312.52" +VERSION="31.0.1650.57" HOMEPAGE="http://www.chromium.org/" -DOWNLOAD="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2" -MD5SUM="ed027b16b20e673af6dcf1831a6d8652" +DOWNLOAD="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1650.57.tar.xz" +MD5SUM="80bca9ce0d419ac1f7ff8621d8534fc8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" MAINTAINER="Francisco Ambrozio" -EMAIL="developer@franciscoambrozio.com" +EMAIL="sbo@franciscoambrozio.com" -- cgit v1.2.3