From 068d1d1d077cef6158be6b1d0176de47ecc97f21 Mon Sep 17 00:00:00 2001 From: davehome Date: Mon, 19 Dec 2011 11:14:33 -0700 Subject: [PATCH] chromium-unstable: update to version 18.0.974.0, use more system libs (ie. v8) --- .../chromium-unstable.rshlibs | 6 +- .../patches/printing_fix.patch | 40 ------- srcpkgs/chromium-unstable/template | 106 +++++++++++++----- 3 files changed, 81 insertions(+), 71 deletions(-) delete mode 100644 srcpkgs/chromium-unstable/patches/printing_fix.patch diff --git a/srcpkgs/chromium-unstable/chromium-unstable.rshlibs b/srcpkgs/chromium-unstable/chromium-unstable.rshlibs index dbb9a81100..412f04bc27 100644 --- a/srcpkgs/chromium-unstable/chromium-unstable.rshlibs +++ b/srcpkgs/chromium-unstable/chromium-unstable.rshlibs @@ -28,7 +28,6 @@ libnspr4.so libz.so.1 libicui18n.so.46 libicuuc.so.46 -libresolv.so.2 libpng14.so.14 libjpeg.so.8 libxml2.so.2 @@ -41,3 +40,8 @@ libFLAC.so.8 libspeex.so.1 libdbus-1.so.3 libstdc++.so.6 +libv8.so +libgconf-2.so.4 +libXfixes.so.3 +libpulse.so.0 +libgnome-keyring.so.0 diff --git a/srcpkgs/chromium-unstable/patches/printing_fix.patch b/srcpkgs/chromium-unstable/patches/printing_fix.patch deleted file mode 100644 index 392f43bd0e..0000000000 --- a/srcpkgs/chromium-unstable/patches/printing_fix.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- chrome/browser/printing/print_dialog_gtk.cc 2011-10-14 08:27:56.000000000 +0000 -+++ chrome/browser/printing/print_dialog_gtk.cc 2011-10-13 10:13:12.000000000 +0000 -@@ -28,6 +28,12 @@ - - namespace { - -+// CUPS ColorModel attribute and values. -+const char kCMYK[] = "CMYK"; -+const char kCUPSColorModel[] = "cups-ColorModel"; -+const char kColor[] = "Color"; -+const char kGrayscale[] = "Grayscale"; -+ - // CUPS Duplex attribute and values. - const char kCUPSDuplex[] = "cups-Duplex"; - const char kDuplexNone[] = "None"; -@@ -187,11 +193,19 @@ - gtk_print_settings_set_n_copies(gtk_settings_, copies); - gtk_print_settings_set_collate(gtk_settings_, collate); - -- std::string color_value; -- std::string color_setting_name; -- printing::GetColorModelForMode(color, &color_setting_name, &color_value); -- gtk_print_settings_set(gtk_settings_, color_setting_name.c_str(), -- color_value.c_str()); -+ const char* color_mode; -+ switch (color) { -+ case printing::COLOR: -+ color_mode = kColor; -+ break; -+ case printing::CMYK: -+ color_mode = kCMYK; -+ break; -+ default: -+ color_mode = kGrayscale; -+ break; -+ } -+ gtk_print_settings_set(gtk_settings_, kCUPSColorModel, color_mode); - - if (duplex_mode != printing::UNKNOWN_DUPLEX_MODE) { - const char* cups_duplex_mode = NULL; diff --git a/srcpkgs/chromium-unstable/template b/srcpkgs/chromium-unstable/template index 00992914e6..e6ff523726 100644 --- a/srcpkgs/chromium-unstable/template +++ b/srcpkgs/chromium-unstable/template @@ -1,14 +1,13 @@ # Template file for 'chromium-unstable' __pkgname=chromium pkgname=${__pkgname}-unstable -version=17.0.916.0 -revision=5 -distfiles="http://build.chromium.org/official/${__pkgname}-$version.tar.bz2" +version=18.0.974.0 +distfiles="http://commondatastorage.googleapis.com/chromium-browser-official/${__pkgname}-$version.tar.bz2" short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="davehome " homepage="http://www.chromium.org/" license="BSD" -checksum=8c4b1c3746ac4283b2dbf7b2e51247baada6371d6c97f2b6db13185724fb4f86 +checksum=0da98a2980acdc0d8a858cb9011035b3b1ca7d039250d2fa8cb342671db68a77 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. @@ -45,14 +44,44 @@ Add_dependency build dbus-glib-devel Add_dependency build libXdamage-devel Add_dependency build libXtst-devel Add_dependency build pam-devel +Add_dependency build GConf-devel Add_dependency build libgnome-keyring-devel Add_dependency build libvpx-devel Add_dependency build speex-devel Add_dependency build libwebp-devel Add_dependency build pulseaudio-devel +Add_dependency build ffmpeg-devel +Add_dependency build v8-devel +Add_dependency build libxml2-devel +Add_dependency build bzip2-devel +Add_dependency build zlib-devel +Add_dependency build expat-devel +Add_dependency build libpng-devel +Add_dependency build jpeg-devel +Add_dependency build mit-krb5-devel + +Add_dependency full xdg-utils wrksrc=chromium-$version +pre_configure() +{ + # Use external V8 + find v8 -type f \! -iname '*.gyp*' -delete + rmdir v8/include + ln -s /usr/include v8/include + + # zlib-1.2.5.1-r1 renames the OF macro in zconf.h + # bug #383371 (Gentoo). + sed -i '1i#define OF(x) x' \ + third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \ + chrome/common/zip*.cc + + # Don't use type 'settings' in gyp files: http://crbug.com/96629 + find third_party -type f -path '*.gyp' -print0 | \ + xargs -0 sed -i "s|'type': 'settings',|'type': 'none',|g" +} + do_configure() { # We need to disable system_ssl until "next protocol negotiation" support is @@ -60,35 +89,52 @@ do_configure() # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312) # # XXX: Disable CUPS until a package exists. - build/gyp_chromium --depth=. -fmake build/all.gyp \ - -Dwerror= \ - -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ - -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_flac=1 \ - -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 \ - -Ddisable_nacl=1 + GYP_DEFINES="\ + gcc_version=46 \ + werror= \ + no_strict_aliasing=1 \ + linux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ + linux_sandbox_chrome_path=/usr/lib/chromium/chromium \ + release_extra_cflags="-fno-ipa-cp" \ + "${use_system_ffmpeg}" \ + use_system_ffmpeg=1 \ + _build_ffmpegsumo=0 \ + ffmpeg_branding=Chrome \ + proprietary_codecs=1 \ + use_system_vpx=1 \ + use_system_speex=1 \ + use_system_flac=1 \ + use_system_libwebp=1 \ + use_system_libxslt=1 \ + use_system_libxml=1 \ + use_system_bzip2=1 \ + use_system_zlib=1 \ + use_system_libexpat=1 \ + use_system_v8=1 \ + use_system_sqlite=0 \ + use_system_libpng=1 \ + use_system_libjpeg=1 \ + use_system_yasm=1 \ + use_system_libevent=1 \ + use_system_icu=1 \ + use_system_xdg_utils=1 \ + use_system_ssl=0 \ + use_system_hunspell=0 \ + use_pulseaudio=1 \ + use_gconf=1 \ + use_cups=0 \ + use_gnome_keyring=1 \ + linux_link_gnome_keyring=1 \ + disable_nacl=1 \ + linux_strip_binary=1 \ + remove_webcore_debug_symbols=1 " + export GYP_DEFINES + python build/gyp_chromium -f make --depth=. build/all.gyp } do_build() { - make BUILDTYPE=Release ${makejobs} chrome chrome_sandbox + make ${makejobs} BUILDTYPE=Release chrome chrome_sandbox } do_install() @@ -97,7 +143,7 @@ do_install() vinstall out/Release/chrome_sandbox 4755 usr/lib/${__pkgname} ${__pkgname}-sandbox vinstall out/Release/chrome.pak 644 usr/lib/${__pkgname} vinstall out/Release/resources.pak 644 usr/lib/${__pkgname} - vinstall out/Release/libffmpegsumo.so 755 usr/lib/${__pkgname} + #vinstall out/Release/libffmpegsumo.so 755 usr/lib/${__pkgname} #vinstall out/Release/libppGoogleNaClPluginChrome.so 755 usr/lib/${__pkgname} #vcopy "out/Release/nacl_irt_x86_*.nexe" usr/lib/${__pkgname}