diff options
| -rw-r--r-- | network/chromium/README | 2 | ||||
| -rw-r--r-- | network/chromium/chromium.SlackBuild | 43 | ||||
| -rw-r--r-- | network/chromium/chromium.desktop | 5 | ||||
| -rw-r--r-- | network/chromium/chromium.info | 8 | ||||
| -rw-r--r-- | network/chromium/chromium.patch | 13 |
5 files changed, 32 insertions, 39 deletions
diff --git a/network/chromium/README b/network/chromium/README index 7a3959d3ba..8c736f753b 100644 --- a/network/chromium/README +++ b/network/chromium/README @@ -11,4 +11,4 @@ running the script as: NO_SSE2=1 ./chromium.SlackBuild -This requires libevent and gnome-keyring. +This requires libevent. diff --git a/network/chromium/chromium.SlackBuild b/network/chromium/chromium.SlackBuild index 286e40dae2..8d0fed5fcc 100644 --- a/network/chromium/chromium.SlackBuild +++ b/network/chromium/chromium.SlackBuild @@ -8,6 +8,11 @@ # A special thanks to Niels Horn who helped me fixing some errors on # the script and for testing it. # +# A very special thanks to Gino Bombino (ginolovesyou AT gmail DOT com), who +# contributed with the parameters to disable the need for gnome dependencies +# and PAM, allowing the script to be cleaner and more elegant (no need for a +# a patch to disable PAM). +# # Copyright 2010 Yucatan "Kenjiro" Costa, Alegrete, RS, Brasil # All rights reserved. # @@ -29,7 +34,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=chromium -VERSION=${VERSION:-9.0.597.107} +VERSION=${VERSION:-11.0.696.60} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,15 +66,15 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION -chown -R root:root . +chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ -exec chmod 755 {} \; -o \ @@ -77,36 +82,38 @@ find . \ -exec chmod 644 {} \; # Configure it before compiling - -# # Change "-Dproprietary_codecs" to "0" if you don't want to use proprietary codecs # -build/gyp_chromium -f make build/all.gyp --depth=. \ - -Dgcc_version=44 \ +build/gyp_chromium --depth=. \ + -Dgcc_version=45 \ + -Duse_gconf=0 \ + -Duse_gnome_keyring=0 \ + -Dlinux_link_gnome_keyring=0 \ + -Dremove_webcore_debug_symbols=1 \ + -Dremoting=0 \ + -Dchromeos=0 \ + -Dwerror=0 \ -Dno_strict_aliasing=1 \ -Dwerror= \ - -Dlinux_sandbox_path=/usr/lib${LIBDIRSUFFIX}/chromium/chromium-sandbox \ + -Dlinux_sandbox_path=/usr/lib${LIBDIRSUFFIX}/chromium/chrome_sandbox \ -Dlinux_strip_binary=1 \ - -Dffmpeg_branding=Chrome \ -Dproprietary_codecs=1 \ -Duse_system_libjpeg=1 \ - -Duse_system_libxslt=0 \ - -Duse_system_libxml=0 \ + -Duse_system_libxslt=1 \ + -Duse_system_libxml=1 \ -Duse_system_bzip2=1 \ -Duse_system_zlib=1 \ - -Duse_system_libpng=1 \ - -Duse_system_ffmpeg=0 \ + -Duse_system_libpng=0 \ -Duse_system_yasm=1 \ -Duse_system_libevent=1 \ -Ddisable_sse2=${NO_SSE2:-0} \ + -Dffmpeg_branding=Chrome \ + -Duse_system_ffmpeg=0 \ -Duse_system_ssl=0 + # Compiling... -# ATTENTION ==> the "-fno-ipa-cp" flag is only needed if you intend to build chromium -# on slackware(64)-current (or if you have gcc-4.5.x installed. On slackware(64)-13.1 -# it is not needed -# CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -fno-ipa-cp" \ make chrome chrome_sandbox BUILDTYPE=Release || exit 1 diff --git a/network/chromium/chromium.desktop b/network/chromium/chromium.desktop index c3de9791df..aacf95cba1 100644 --- a/network/chromium/chromium.desktop +++ b/network/chromium/chromium.desktop @@ -1,9 +1,8 @@ [Desktop Entry] -Encoding=UTF-8 Exec=/usr/bin/chrome --enable-plugins %U Icon=/usr/share/pixmaps/chromium.png Type=Application -Categories=Application;Network; +Categories=Network; Name=Chromium GenericName=Web Browser GenericName[af]=Web Blaaier @@ -72,5 +71,5 @@ GenericName[xh]=Umkhangeli zincwadi we Web GenericName[zh_CN]=网页浏览器 GenericName[zh_TW]=網頁瀏覽器 GenericName[zu]=Umcingi we-Web -MimeType=text/html +MimeType=text/html; X-KDE-StartupNotify=true diff --git a/network/chromium/chromium.info b/network/chromium/chromium.info index d09b3f185f..5db1f48209 100644 --- a/network/chromium/chromium.info +++ b/network/chromium/chromium.info @@ -1,10 +1,10 @@ PRGNAM="chromium" -VERSION="9.0.597.107" +VERSION="11.0.696.60" HOMEPAGE="http://www.chromium.org/" -DOWNLOAD="http://build.chromium.org/official/chromium-9.0.597.107.tar.bz2" -MD5SUM="4541f2b84df581618262efe158901b2f" +DOWNLOAD="http://build.chromium.org/buildbot/official/chromium-11.0.696.60.tar.bz2" +MD5SUM="1be655872e8a062d2532b977b333cac3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Yucatan Costa" EMAIL="jedi.kenjiro@gmail.com" -APPROVED="Niels Horn" +APPROVED="dsomero" diff --git a/network/chromium/chromium.patch b/network/chromium/chromium.patch deleted file mode 100644 index 2d0e5b2d35..0000000000 --- a/network/chromium/chromium.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: build/common.gypi -=================================================================== ---- build/common.gypi -+++ build/common.gypi -@@ -124,7 +124,7 @@ - 'use_third_party_translations%': 0, - - # Remoting compilation is enabled by default. Set to 0 to disable. -- 'remoting%': 1, -+ 'remoting%': 0, - - # If this is set, the clang plugins used on the buildbot will be used. - # Run tools/clang/scripts/update.sh to make sure they are compiled. |