Author: charles Date: Fri May 13 21:21:05 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 13.0.764.0 (r85235) - use system icu
---- Files affected: packages/chromium-browser: chromium-browser.spec (1.112 -> 1.113) , search-workaround.patch (1.4 -> 1.5) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.112 packages/chromium-browser/chromium-browser.spec:1.113 --- packages/chromium-browser/chromium-browser.spec:1.112 Wed Apr 20 06:59:45 2011 +++ packages/chromium-browser/chromium-browser.spec Fri May 13 23:21:00 2011 @@ -30,13 +30,13 @@ # or: # http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf -%define svndate 20110419 -%define svnver 82076 +%define svndate 20110513 +%define svnver 85235 %define rel 1 Summary: A WebKit powered web browser Name: chromium-browser -Version: 12.0.741.0 +Version: 13.0.764.0 Release: 0.%{svnver}.%{rel} License: BSD, LGPL v2+ (ffmpeg) Group: X11/Applications/Networking @@ -72,6 +72,7 @@ BuildRequires: gtk+2-devel BuildRequires: libevent-devel %{?with_keyring:BuildRequires: libgnome-keyring-devel} +BuildRequires: libicu-devel >= 4.6 BuildRequires: libjpeg-devel BuildRequires: libpng-devel %{?with_selinux:BuildRequires: libselinux-devel} @@ -202,6 +203,7 @@ cd src remove_bundled_lib "third_party/bzip2" +remove_bundled_lib "third_party/icu" remove_bundled_lib "third_party/libevent" remove_bundled_lib "third_party/libjpeg" remove_bundled_lib "third_party/libpng" @@ -233,6 +235,7 @@ -Djavascript_engine=%{?with_system_v8:system-v8}%{!?with_system_v8:v8} \ -Dbuild_ffmpegsumo=%{?with_ffmpegsumo:1}%{!?with_ffmpegsumo:0} \ -Duse_system_bzip2=1 \ + -Duse_system_icu=1 \ -Duse_system_libevent=1 \ -Duse_system_libjpeg=1 \ -Duse_system_libpng=1 \ @@ -343,6 +346,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.113 2011/05/13 21:21:00 charles +- updated to 13.0.764.0 (r85235) +- use system icu + Revision 1.112 2011/04/20 04:59:45 glen - up to 12.0.741.0 (r82076) ================================================================ Index: packages/chromium-browser/search-workaround.patch diff -u packages/chromium-browser/search-workaround.patch:1.4 packages/chromium-browser/search-workaround.patch:1.5 --- packages/chromium-browser/search-workaround.patch:1.4 Sun Jan 23 18:35:10 2011 +++ packages/chromium-browser/search-workaround.patch Fri May 13 23:21:00 2011 @@ -1,6 +1,6 @@ ---- chromium-browser-10.0.647.0~svn20110123r72286/src/chrome/browser/search_engines/template_url.cc.orig 2011-01-22 04:01:50.000000000 +0100 -+++ chromium-browser-10.0.647.0~svn20110123r72286/src/chrome/browser/search_engines/template_url.cc 2011-01-23 13:22:52.878238576 +0100 -@@ -341,27 +341,28 @@ +--- chromium-browser-13.0.763.0~svn20110512r85088/src/chrome/browser/search_engines/template_url.cc.orig 2011-05-12 04:00:22.000000000 +0200 ++++ chromium-browser-13.0.763.0~svn20110512r85088/src/chrome/browser/search_engines/template_url.cc 2011-05-12 18:20:21.260874114 +0200 +@@ -347,28 +347,28 @@ i != replacements_.rend(); ++i) { switch (i->type) { case ENCODING: @@ -14,8 +14,9 @@ - url.insert(i->index, "aq=f&"); + url.replace(i->index, 0, "aq=f&"); else if (accepted_suggestion != NO_SUGGESTIONS_AVAILABLE) -- url.insert(i->index, StringPrintf("aq=%d&", accepted_suggestion)); -+ url.replace(i->index, 0, StringPrintf("aq=%d&", accepted_suggestion)); +- url.insert(i->index, +- base::StringPrintf("aq=%d&", accepted_suggestion)); ++ url.replace(i->index, 0, base::StringPrintf("aq=%d&", accepted_suggestion)); break; case GOOGLE_BASE_URL: @@ -35,7 +36,7 @@ "&"); break; -@@ -385,17 +386,17 @@ +@@ -392,17 +392,17 @@ base::UTF16ToCodepage(terms, input_encoding.c_str(), base::OnStringConversionError::SKIP, &unescaped_terms); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.112&r2=1.113&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/search-workaround.patch?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
