aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/chromium/chromium-header.patch10
-rw-r--r--network/chromium/chromium.SlackBuild6
-rw-r--r--network/chromium/chromium.info6
-rw-r--r--network/chromium/gcc45fix.patch17
4 files changed, 15 insertions, 24 deletions
diff --git a/network/chromium/chromium-header.patch b/network/chromium/chromium-header.patch
new file mode 100644
index 0000000000000..e6c7de9fafc94
--- /dev/null
+++ b/network/chromium/chromium-header.patch
@@ -0,0 +1,10 @@
+--- 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 <unistd.h>
+
+ 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 e8de15ecc1bb2..08d694d810f14 100644
--- a/network/chromium/chromium.SlackBuild
+++ b/network/chromium/chromium.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=chromium
-VERSION=${VERSION:-20.0.1132.57}
+VERSION=${VERSION:-21.0.1180.90}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -78,9 +78,7 @@ 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
-
+patch -p1 < $CWD/chromium-header.patch
# Change "-Dproprietary_codecs" to "0" if you don't want to use proprietary codecs
SLKCFLAGS="${SLKCFLAGS} -fno-ipa-cp"
diff --git a/network/chromium/chromium.info b/network/chromium/chromium.info
index 96f6e7b779f01..5dcdf1ab4ed95 100644
--- a/network/chromium/chromium.info
+++ b/network/chromium/chromium.info
@@ -1,8 +1,8 @@
PRGNAM="chromium"
-VERSION="20.0.1132.57"
+VERSION="21.0.1180.90"
HOMEPAGE="http://www.chromium.org/"
-DOWNLOAD="http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.57.tar.bz2"
-MD5SUM="cd8e9cf2efe5ff7f1e0d71af3c046fb0"
+DOWNLOAD="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.90.tar.bz2"
+MD5SUM="a5001d694f2f932a51701d436f80d46e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libevent"
diff --git a/network/chromium/gcc45fix.patch b/network/chromium/gcc45fix.patch
deleted file mode 100644
index 99f90667fa87a..0000000000000
--- a/network/chromium/gcc45fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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