From ea82cf95cfa4a14f37ab600e933bd2b2eb8b1045 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 22 May 2012 12:44:51 +0200 Subject: [PATCH] chromium: update to 19.0.1084.46. --- srcpkgs/chromium/chromium.rshlibs | 10 ++-- srcpkgs/chromium/patches/chromium-gcc47.patch | 20 +++---- ....3-fix-out-of-scope-memory-reference.patch | 4 +- srcpkgs/chromium/template | 56 ++++++++----------- 4 files changed, 39 insertions(+), 51 deletions(-) diff --git a/srcpkgs/chromium/chromium.rshlibs b/srcpkgs/chromium/chromium.rshlibs index b5136b50eb..274490d4c9 100644 --- a/srcpkgs/chromium/chromium.rshlibs +++ b/srcpkgs/chromium/chromium.rshlibs @@ -13,7 +13,6 @@ libpango-1.0.so.0 libfreetype.so.6 libfontconfig.so.1 libgobject-2.0.so.0 -libgthread-2.0.so.0 libglib-2.0.so.0 libevent-2.0.so.5 libnss3.so @@ -23,13 +22,9 @@ libplc4.so libnspr4.so libpthread.so.0 libz.so.1 -libicui18n.so.46 -libicuuc.so.46 libpng14.so.14 libjpeg.so.8 -libxml2.so.2 libasound.so.2 -libxslt.so.1 libm.so.6 libwebp.so.2 libbz2.so.1 @@ -42,3 +37,8 @@ libc.so.6 libXfixes.so.3 ld-linux-x86-64.so.2 libudev.so.0 +libresolv.so.2 +libXcomposite.so.1 +libcups.so.2 +libgcrypt.so.11 +libFLAC.so.8 diff --git a/srcpkgs/chromium/patches/chromium-gcc47.patch b/srcpkgs/chromium/patches/chromium-gcc47.patch index 4f8f69bef9..bef455adab 100644 --- a/srcpkgs/chromium/patches/chromium-gcc47.patch +++ b/srcpkgs/chromium/patches/chromium-gcc47.patch @@ -1,5 +1,5 @@ ---- 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 +--- chromium-19.0.1084.46/base/message_pump_libevent.cc.gcc47 2012-02-17 14:52:00.527217354 -0500 ++++ chromium-19.0.1084.46/base/message_pump_libevent.cc 2012-02-17 14:52:10.172135400 -0500 @@ -6,6 +6,7 @@ #include @@ -8,8 +8,8 @@ #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 +--- chromium-19.0.1084.46/chrome/browser/policy/policy_path_parser_linux.cc.gcc47 2012-02-17 15:26:32.086746278 -0500 ++++ chromium-19.0.1084.46/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. @@ -18,8 +18,8 @@ #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 +--- chromium-19.0.1084.46/ipc/ipc_channel.h.gcc47 2012-01-27 03:02:07.000000000 -0500 ++++ chromium-19.0.1084.46/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" @@ -28,8 +28,8 @@ 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 +--- chromium-19.0.1084.46/ipc/ipc_platform_file.cc.gcc47 2012-01-27 03:02:07.000000000 -0500 ++++ chromium-19.0.1084.46/ipc/ipc_platform_file.cc 2012-02-17 14:46:31.824010435 -0500 @@ -3,10 +3,7 @@ // found in the LICENSE file. @@ -41,8 +41,8 @@ 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 +--- chromium-19.0.1084.46/seccompsandbox/library.h.gcc47 2012-01-27 03:03:35.000000000 -0500 ++++ chromium-19.0.1084.46/seccompsandbox/library.h 2012-02-17 14:46:31.826010418 -0500 @@ -12,6 +12,7 @@ #include #include 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 index d1e57fd67d..a47466320b 100644 --- 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 @@ -1,5 +1,5 @@ ---- 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 +--- chromium-19.0.1084.46/third_party/sqlite/src/ext/fts3/fts3_write.c.orig 2012-05-08 21:05:03.000000000 +0300 ++++ chromium-19.0.1084.46/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 */ ){ diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 0c3efa9de0..0417eeb56c 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,8 +1,10 @@ # Template file for 'chromium' pkgname=chromium -version=18.0.1025.168 +version=19.0.1084.46 wrksrc=$pkgname create_wrksrc=yes +create_srcdir=yes +build_requires=27 build_wrksrc=${pkgname}-${version} distfiles=" http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$version.tar.bz2 @@ -12,8 +14,8 @@ maintainer="Juan RP " homepage="http://www.chromium.org/" license="BSD" checksum=" -1f1fc7bd8066835844a465f9d60c49c21173ff559c40e5d113fe9c4627fc18b9 -f9c5bc8ef4e251769a0609cbca1692682140dc93364c2558aaade3c404f3d987" +2fb77e5d155343a828bd04b6b9d4469fce3033dc6b9f8b53e34a9d02c464639f +2256327dc58792309911fe88996527925b79ddc7729ec78548b4adf5e4983d42" 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. @@ -34,6 +36,7 @@ Add_dependency build flex Add_dependency build gperf Add_dependency build perl ">=0" Add_dependency build python ">=0" +Add_dependency build libgcrypt-devel Add_dependency build libelf-devel Add_dependency build mit-krb5-devel Add_dependency build libXrender-devel @@ -43,9 +46,7 @@ Add_dependency build libX11-devel Add_dependency build libXi-devel Add_dependency build gtk+-devel Add_dependency build libevent-devel -Add_dependency build icu-devel Add_dependency build nss-devel -Add_dependency build libxslt-devel Add_dependency build alsa-lib-devel Add_dependency build dbus-glib-devel Add_dependency build libXdamage-devel @@ -56,20 +57,20 @@ Add_dependency build libvpx-devel Add_dependency build speex-devel Add_dependency build libwebp-devel Add_dependency build pulseaudio-devel +Add_dependency build cups-devel +Add_dependency build hunspell-devel +Add_dependency build libflac-devel + if [ "$XBPS_MACHINE" = "x86_64" ]; then Add_dependency build zlib32 Add_dependency build libstdc++32 + Add_dependency build gcc-multilib fi Add_dependency run desktop-file-utils Add_dependency run hicolor-icon-theme pre_configure() { - # Add missing include that defines OS_POSIX - sed -i '1 i\ - #include "build/build_config.h"' \ - chrome/browser/diagnostics/diagnostics_main.cc - # http://code.google.com/p/chromium/issues/detail?id=109527 sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc @@ -84,31 +85,18 @@ do_configure() { # 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) - # - # XXX: Disable CUPS until a package exists. build/gyp_chromium -f make build/all.gyp --depth=. \ - -Dwerror= \ - -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ - -Drelease_extra_cflags="$CFLAGS" \ - -Dffmpeg_branding=Chrome \ - -Dproprietary_codecs=1 \ - -Duse_system_libjpeg=1 \ - -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_yasm=1 \ - -Duse_system_libevent=1 \ - -Duse_system_ssl=0 \ - -Duse_system_icu=1 \ - -Duse_system_xdg_utils=1 \ - -Duse_system_vpx=1 \ - -Duse_system_speex=1 \ - -Duse_system_libwebp=1 \ - -Duse_gconf=0 \ - -Duse_cups=0 + -Dwerror= -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ + -Drelease_extra_cflags="$CFLAGS" -Dlinux_use_gold_binary=0 \ + -Dlinux_use_gold_flags=0 -Dffmpeg_branding=Chrome \ + -Dproprietary_codecs=1 -Duse_system_libjpeg=1 \ + -Duse_system_libxml=0 -Duse_system_bzip2=1 \ + -Duse_system_zlib=1 -Duse_system_libpng=1 \ + -Duse_system_ffmpeg=0 -Duse_system_yasm=1 \ + -Duse_system_libevent=1 -Duse_system_ssl=0 \ + -Duse_system_xdg_utils=1 -Duse_system_vpx=1 \ + -Duse_system_speex=1 -Duse_system_libwebp=1 \ + -Duse_hunspell=1 -Duse_system_flac=1 -Duse_gconf=0 } do_build() {