diff options
| -rw-r--r-- | network/chromium/chromium.SlackBuild | 12 | ||||
| -rw-r--r-- | network/chromium/chromium.info | 10 | ||||
| -rw-r--r-- | network/chromium/gcc45fix.patch | 17 |
3 files changed, 29 insertions, 10 deletions
diff --git a/network/chromium/chromium.SlackBuild b/network/chromium/chromium.SlackBuild index 28dd4634f0..e8de15ecc1 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 <francisco.ambrozio@gmail.com> +# Copyright 2012 Francisco Ambrozio <developer@franciscoambrozio.com> # 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:-19.0.1084.52} +VERSION=${VERSION:-20.0.1132.57} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -78,6 +78,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# https://bugs.webkit.org/show_bug.cgi?id=85781 +patch -p1 -d third_party/WebKit < $CWD/gcc45fix.patch + # Change "-Dproprietary_codecs" to "0" if you don't want to use proprietary codecs SLKCFLAGS="${SLKCFLAGS} -fno-ipa-cp" @@ -118,9 +121,8 @@ cd out/Release/ 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 0644 -D chrome.pak $PKG/usr/lib${LIBDIRSUFFIX}/chromium - install -m 0644 -D resources.pak $PKG/usr/lib${LIBDIRSUFFIX}/chromium 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 cp -a resources/ $PKG/usr/lib${LIBDIRSUFFIX}/chromium find $PKG -name '*.d' -type f -delete @@ -131,8 +133,8 @@ cd out/Release/ cp product_logo_48.png $PKG/usr/share/pixmaps/chromium.png mkdir -p $PKG/usr/share/applications install -m 0644 $CWD/chromium.desktop $PKG/usr/share/applications - cd ../../ + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/ || true diff --git a/network/chromium/chromium.info b/network/chromium/chromium.info index 9c98b06476..2bdfc83f6d 100644 --- a/network/chromium/chromium.info +++ b/network/chromium/chromium.info @@ -1,10 +1,10 @@ PRGNAM="chromium" -VERSION="19.0.1084.52" +VERSION="20.0.1132.57" HOMEPAGE="http://www.chromium.org/" -DOWNLOAD="http://commondatastorage.googleapis.com/chromium-browser-official/chromium-19.0.1084.52.tar.bz2" -MD5SUM="75cc47382ea305dffc13239c3d9ab6fb" +DOWNLOAD="http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.57.tar.bz2" +MD5SUM="cd8e9cf2efe5ff7f1e0d71af3c046fb0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Francisco Ambrozio" -EMAIL="francisco.ambrozio@gmail.com" -APPROVED="dsomero" +EMAIL="developer@franciscoambrozio.com" +APPROVED="Niels Horn" diff --git a/network/chromium/gcc45fix.patch b/network/chromium/gcc45fix.patch new file mode 100644 index 0000000000..99f90667fa --- /dev/null +++ b/network/chromium/gcc45fix.patch @@ -0,0 +1,17 @@ +diff --git a/Source/WebCore/rendering/RenderBlock.h b/Source/WebCore/rendering/RenderBlock.h +index 2f6f4b6..3859442 100644 +--- a/Source/WebCore/rendering/RenderBlock.h ++++ b/Source/WebCore/rendering/RenderBlock.h +@@ -865,7 +865,11 @@ private: + + void setAtBeforeSideOfBlock(bool b) { m_atBeforeSideOfBlock = b; } + void setAtAfterSideOfBlock(bool b) { m_atAfterSideOfBlock = b; } +- void clearMargin() { m_positiveMargin = m_negativeMargin = 0; } ++ void clearMargin() ++ { ++ m_positiveMargin = 0; ++ m_negativeMargin = 0; ++ } + void setMarginBeforeQuirk(bool b) { m_marginBeforeQuirk = b; } + void setMarginAfterQuirk(bool b) { m_marginAfterQuirk = b; } + void setDeterminedMarginBeforeQuirk(bool b) { m_determinedMarginBeforeQuirk = b; }
\ No newline at end of file |