From 1187d3d977450a8367b3c60deda3859e2ae90521 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 9 May 2012 19:22:12 +0200 Subject: [PATCH] chromium: update to 18.0.1025.168. --- srcpkgs/chromium/chromium.rshlibs | 3 +- srcpkgs/chromium/files/gcc-4.6.patch | 99 ------------------- srcpkgs/chromium/patches/chromium-gcc47.patch | 52 ++++++++++ ....3-fix-out-of-scope-memory-reference.patch | 26 +++++ srcpkgs/chromium/template | 40 ++++---- 5 files changed, 98 insertions(+), 122 deletions(-) delete mode 100644 srcpkgs/chromium/files/gcc-4.6.patch create mode 100644 srcpkgs/chromium/patches/chromium-gcc47.patch create mode 100644 srcpkgs/chromium/patches/sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch diff --git a/srcpkgs/chromium/chromium.rshlibs b/srcpkgs/chromium/chromium.rshlibs index b9d8f3680cc..b5136b50eb3 100644 --- a/srcpkgs/chromium/chromium.rshlibs +++ b/srcpkgs/chromium/chromium.rshlibs @@ -25,7 +25,6 @@ libpthread.so.0 libz.so.1 libicui18n.so.46 libicuuc.so.46 -libresolv.so.2 libpng14.so.14 libjpeg.so.8 libxml2.so.2 @@ -35,7 +34,6 @@ libm.so.6 libwebp.so.2 libbz2.so.1 libexpat.so.1 -libFLAC.so.8 libspeex.so.1 libdbus-1.so.3 libstdc++.so.6 @@ -43,3 +41,4 @@ libgcc_s.so.1 libc.so.6 libXfixes.so.3 ld-linux-x86-64.so.2 +libudev.so.0 diff --git a/srcpkgs/chromium/files/gcc-4.6.patch b/srcpkgs/chromium/files/gcc-4.6.patch deleted file mode 100644 index b5e61dc3084..00000000000 --- a/srcpkgs/chromium/files/gcc-4.6.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -u -r chrome/browser/search_engines/template_url_prepopulate_data.h chrome/browser/search_engines/template_url_prepopulate_data.h ---- chrome/browser/search_engines/template_url_prepopulate_data.h 2011-04-13 13:23:41.000000000 +0400 -+++ chrome/browser/search_engines/template_url_prepopulate_data.h 2011-04-20 19:32:58.000000000 +0400 -@@ -7,6 +7,7 @@ - #pragma once - - #include -+#include - - class GURL; - class PrefService; -diff -u -r gpu/command_buffer/common/types.h gpu/command_buffer/common/types.h ---- gpu/command_buffer/common/types.h 2011-04-13 13:22:57.000000000 +0400 -+++ gpu/command_buffer/common/types.h 2011-04-20 19:32:58.000000000 +0400 -@@ -11,6 +11,7 @@ - #include - #endif - #include -+#include - - typedef signed char schar; - typedef signed char int8; -diff -u -r ppapi/cpp/paint_aggregator.h ppapi/cpp/paint_aggregator.h ---- ppapi/cpp/paint_aggregator.h 2011-04-13 13:22:58.000000000 +0400 -+++ ppapi/cpp/paint_aggregator.h 2011-04-20 20:11:44.000000000 +0400 -@@ -9,6 +9,7 @@ - - #include "ppapi/cpp/point.h" - #include "ppapi/cpp/rect.h" -+#include - - namespace pp { - -diff -u -r third_party/ots/src/os2.cc third_party/ots/src/os2.cc ---- third_party/ots/src/os2.cc 2011-04-13 13:24:06.000000000 +0400 -+++ third_party/ots/src/os2.cc 2011-04-20 19:45:44.000000000 +0400 -@@ -5,6 +5,7 @@ - #include "os2.h" - - #include "head.h" -+#include - - // OS/2 - OS/2 and Windows Metrics - // http://www.microsoft.com/opentype/otspec/os2.htm -diff -u -r third_party/tcmalloc/chromium/src/base/stl_allocator.h third_party/tcmalloc/chromium/src/base/stl_allocator.h ---- third_party/tcmalloc/chromium/src/base/stl_allocator.h 2011-04-13 13:23:04.000000000 +0400 -+++ third_party/tcmalloc/chromium/src/base/stl_allocator.h 2011-04-20 19:32:58.000000000 +0400 -@@ -38,6 +38,7 @@ - #include - - #include -+#include - - #include "base/basictypes.h" - #include "base/logging.h" -diff -u -r third_party/tcmalloc/chromium/src/base/vdso_support.h third_party/tcmalloc/chromium/src/base/vdso_support.h ---- third_party/tcmalloc/chromium/src/base/vdso_support.h 2011-04-13 13:23:04.000000000 +0400 -+++ third_party/tcmalloc/chromium/src/base/vdso_support.h 2011-04-20 19:32:58.000000000 +0400 -@@ -37,6 +37,7 @@ - - #define HAVE_VDSO_SUPPORT 1 - -+#include - #include // for NULL - #include // for ElfW - #include "base/basictypes.h" -diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chromium/src/common.cc ---- third_party/tcmalloc/chromium/src/common.cc 2011-04-13 13:23:04.000000000 +0400 -+++ third_party/tcmalloc/chromium/src/common.cc 2011-04-20 19:32:58.000000000 +0400 -@@ -34,6 +34,7 @@ - #include "config.h" - #include "common.h" - #include "system-alloc.h" -+#include - - namespace tcmalloc { - -diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/chromium/src/symbolize.h ---- third_party/tcmalloc/chromium/src/symbolize.h 2011-04-13 13:23:04.000000000 +0400 -+++ third_party/tcmalloc/chromium/src/symbolize.h 2011-04-20 19:32:58.000000000 +0400 -@@ -38,6 +38,7 @@ - #include // for uintptr_t - #endif - #include -+#include - - using std::map; - -diff -u -r ui/gfx/codec/jpeg_codec.h ui/gfx/codec/jpeg_codec.h ---- ui/gfx/codec/jpeg_codec.h 2011-04-13 13:23:45.000000000 +0400 -+++ ui/gfx/codec/jpeg_codec.h 2011-04-20 19:32:58.000000000 +0400 -@@ -7,6 +7,7 @@ - #pragma once - - #include -+#include - - class SkBitmap; - diff --git a/srcpkgs/chromium/patches/chromium-gcc47.patch b/srcpkgs/chromium/patches/chromium-gcc47.patch new file mode 100644 index 00000000000..4f8f69bef93 --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-gcc47.patch @@ -0,0 +1,52 @@ +--- chromium-18.0.1025.168/base/message_pump_libevent.cc.gcc47 2012-02-17 14:52:00.527217354 -0500 ++++ chromium-18.0.1025.168/base/message_pump_libevent.cc 2012-02-17 14:52:10.172135400 -0500 +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + #include "base/auto_reset.h" + #include "base/compiler_specific.h" +--- chromium-18.0.1025.168/chrome/browser/policy/policy_path_parser_linux.cc.gcc47 2012-02-17 15:26:32.086746278 -0500 ++++ chromium-18.0.1025.168/chrome/browser/policy/policy_path_parser_linux.cc 2012-02-17 15:26:53.039544290 -0500 +@@ -3,6 +3,7 @@ + // found in the LICENSE file. + + #include ++#include + + #include "chrome/browser/policy/policy_path_parser.h" + +--- chromium-18.0.1025.168/ipc/ipc_channel.h.gcc47 2012-01-27 03:02:07.000000000 -0500 ++++ chromium-18.0.1025.168/ipc/ipc_channel.h 2012-02-17 14:46:31.821010460 -0500 +@@ -9,6 +9,7 @@ + #include "base/process.h" + #include "ipc/ipc_channel_handle.h" + #include "ipc/ipc_message.h" ++#include + + namespace IPC { + +--- chromium-18.0.1025.168/ipc/ipc_platform_file.cc.gcc47 2012-01-27 03:02:07.000000000 -0500 ++++ chromium-18.0.1025.168/ipc/ipc_platform_file.cc 2012-02-17 14:46:31.824010435 -0500 +@@ -3,10 +3,7 @@ + // found in the LICENSE file. + + #include "ipc/ipc_platform_file.h" +- +-#if defined(OS_ANDROID) + #include +-#endif + + namespace IPC { + +--- chromium-18.0.1025.168/seccompsandbox/library.h.gcc47 2012-01-27 03:03:35.000000000 -0500 ++++ chromium-18.0.1025.168/seccompsandbox/library.h 2012-02-17 14:46:31.826010418 -0500 +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + #include "maps.h" diff --git a/srcpkgs/chromium/patches/sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch b/srcpkgs/chromium/patches/sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch new file mode 100644 index 00000000000..d1e57fd67d4 --- /dev/null +++ b/srcpkgs/chromium/patches/sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch @@ -0,0 +1,26 @@ +--- chromium-18.0.1025.168/third_party/sqlite/src/ext/fts3/fts3_write.c.orig 2012-05-08 21:05:03.000000000 +0300 ++++ chromium-18.0.1025.168/third_party/sqlite/src/ext/fts3/fts3_write.c 2012-05-08 21:07:08.000000000 +0300 +@@ -1238,13 +1238,13 @@ int sqlite3Fts3SegReaderPending( + Fts3SegReader **ppReader /* OUT: SegReader for pending-terms */ + ){ + Fts3SegReader *pReader = 0; /* Fts3SegReader object to return */ ++ Fts3HashElem *pE; /* Iterator variable */ + Fts3HashElem **aElem = 0; /* Array of term hash entries to scan */ + int nElem = 0; /* Size of array at aElem */ + int rc = SQLITE_OK; /* Return Code */ + + if( isPrefix ){ + int nAlloc = 0; /* Size of allocated array at aElem */ +- Fts3HashElem *pE = 0; /* Iterator variable */ + + for(pE=fts3HashFirst(&p->pendingTerms); pE; pE=fts3HashNext(pE)){ + char *zKey = (char *)fts3HashKey(pE); +@@ -1276,7 +1276,7 @@ int sqlite3Fts3SegReaderPending( + } + + }else{ +- Fts3HashElem *pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm); ++ pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm); + if( pE ){ + aElem = &pE; + nElem = 1; diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 689b06db89c..0c3efa9de0d 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,18 +1,19 @@ # Template file for 'chromium' pkgname=chromium -version=17.0.963.78 +version=18.0.1025.168 wrksrc=$pkgname create_wrksrc=yes +build_wrksrc=${pkgname}-${version} distfiles=" http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$version.tar.bz2 -http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip" +http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/$version/naclsdk_linux.bz2" short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="Juan RP " homepage="http://www.chromium.org/" license="BSD" checksum=" -2956cfeab05def5ab9b21c05a3a49e5d8efadadd4f27c212dd1c185ef05518c9 -964fe3a5ec56f2505649aba00f900abe4205674b7fdaa16772647d347173bb01" +1f1fc7bd8066835844a465f9d60c49c21173ff559c40e5d113fe9c4627fc18b9 +f9c5bc8ef4e251769a0609cbca1692682140dc93364c2558aaade3c404f3d987" long_desc=" Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all Internet users to experience the web. @@ -25,9 +26,6 @@ long_desc=" gtk_iconcache_dirs="/usr/share/icons/hicolor" -Add_dependency run desktop-file-utils -Add_dependency run hicolor-icon-theme - Add_dependency build pkg-config Add_dependency build which Add_dependency build unzip @@ -49,7 +47,6 @@ Add_dependency build icu-devel Add_dependency build nss-devel Add_dependency build libxslt-devel Add_dependency build alsa-lib-devel -Add_dependency build libflac-devel Add_dependency build dbus-glib-devel Add_dependency build libXdamage-devel Add_dependency build libXtst-devel @@ -64,21 +61,26 @@ if [ "$XBPS_MACHINE" = "x86_64" ]; then Add_dependency build libstdc++32 fi +Add_dependency run desktop-file-utils +Add_dependency run hicolor-icon-theme + pre_configure() { - # Build NaCL. - cd $wrksrc/nacl_sdk - ./naclsdk update pepper_16 + # Add missing include that defines OS_POSIX + sed -i '1 i\ + #include "build/build_config.h"' \ + chrome/browser/diagnostics/diagnostics_main.cc - ln -s $wrksrc/nacl_sdk/pepper_16/toolchain/linux_x86_newlib \ - $wrksrc/$pkgname-$version/native_client/toolchain/linux_x86_newlib + # http://code.google.com/p/chromium/issues/detail?id=109527 + sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc - cd $wrksrc/$pkgname-$version - patch -Np0 -i ${FILESDIR}/gcc-4.6.patch + # Unpack nacl, file is a real POSIX tar archive compressed with bzip2. + tar xf $wrksrc/naclsdk_linux -C $wrksrc + + ln -s $wrksrc/pepper_${version%%.*}/toolchain/linux_x86_newlib \ + native_client/toolchain/linux_x86_newlib } do_configure() { - cd $wrksrc/$pkgname-$version - # We need to disable system_ssl until "next protocol negotiation" support is # available in our nss package. # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312) @@ -100,7 +102,6 @@ do_configure() { -Duse_system_yasm=1 \ -Duse_system_libevent=1 \ -Duse_system_ssl=0 \ - -Duse_system_flac=1 \ -Duse_system_icu=1 \ -Duse_system_xdg_utils=1 \ -Duse_system_vpx=1 \ @@ -111,13 +112,10 @@ do_configure() { } do_build() { - cd $wrksrc/$pkgname-$version make BUILDTYPE=Release ${makejobs} chrome chrome_sandbox } do_install() { - cd $wrksrc/$pkgname-$version - vinstall out/Release/chrome 755 usr/lib/${pkgname} ${pkgname} vinstall out/Release/chrome_sandbox 4755 usr/lib/${pkgname} ${pkgname}-sandbox vinstall out/Release/chrome.pak 644 usr/lib/${pkgname}