Author: glen Date: Wed Sep 1 19:44:10 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 7.0.512.0, r58107
---- Files affected: packages/chromium-browser: chromium-browser.spec (1.75 -> 1.76) , search-workaround.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.75 packages/chromium-browser/chromium-browser.spec:1.76 --- packages/chromium-browser/chromium-browser.spec:1.75 Mon Aug 30 15:15:30 2010 +++ packages/chromium-browser/chromium-browser.spec Wed Sep 1 21:44:04 2010 @@ -22,18 +22,18 @@ # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites # - to look for new tarball, use update-source.sh script -%define svndate 20100830 -%define svnver 57827 +%define svndate 20100901 +%define svnver 58107 %define rel 2 Summary: A WebKit powered web browser Name: chromium-browser -Version: 7.0.509.0 +Version: 7.0.512.0 Release: %{svnver}.%{rel} License: BSD, LGPL v2+ (ffmpeg) Group: X11/Applications/Networking Source0: http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz -# Source0-md5: ed7b1abde3ae08b18a7ab190b5066400 +# Source0-md5: d1fb96874588536ce3e1a58461cce35c Source2: %{name}.sh Source3: %{name}.desktop Source4: find-lang.sh @@ -320,6 +320,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.76 2010/09/01 19:44:04 glen +- up to 7.0.512.0, r58107 + Revision 1.75 2010/08/30 13:15:30 glen - up to 7.0.509.0, r57827 ================================================================ Index: packages/chromium-browser/search-workaround.patch diff -u packages/chromium-browser/search-workaround.patch:1.2 packages/chromium-browser/search-workaround.patch:1.3 --- packages/chromium-browser/search-workaround.patch:1.2 Tue Jul 13 13:36:19 2010 +++ packages/chromium-browser/search-workaround.patch Wed Sep 1 21:44:04 2010 @@ -1,6 +1,6 @@ ---- chromium-browser-6.0.464.0~svn20100713r52155/src/chrome/browser/search_engines/template_url.cc~ 2010-06-30 05:01:32.000000000 +0300 -+++ chromium-browser-6.0.464.0~svn20100713r52155/src/chrome/browser/search_engines/template_url.cc 2010-07-13 11:25:51.194829863 +0300 -@@ -309,27 +309,28 @@ +--- chromium-browser-7.0.510.0~svn20100831r57933/src/chrome/browser/search_engines/template_url.cc~ 2010-08-31 17:24:46.000000000 +0300 ++++ chromium-browser-7.0.510.0~svn20100831r57933/src/chrome/browser/search_engines/template_url.cc 2010-09-01 22:28:29.663788855 +0300 +@@ -337,27 +337,28 @@ i != replacements_.rend(); ++i) { switch (i->type) { case ENCODING: @@ -19,13 +19,13 @@ break; case GOOGLE_BASE_URL: -- url.insert(i->index, GoogleBaseURLValue()); -+ url.replace(i->index, 0, GoogleBaseURLValue()); +- url.insert(i->index, search_terms_data.GoogleBaseURLValue()); ++ url.replace(i->index, 0, search_terms_data.GoogleBaseURLValue()); break; case GOOGLE_BASE_SUGGEST_URL: -- url.insert(i->index, GoogleBaseSuggestURLValue()); -+ url.replace(i->index, 0, GoogleBaseSuggestURLValue()); +- url.insert(i->index, search_terms_data.GoogleBaseSuggestURLValue()); ++ url.replace(i->index, 0, search_terms_data.GoogleBaseSuggestURLValue()); break; case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION: @@ -35,16 +35,7 @@ "&"); break; -@@ -343,7 +344,7 @@ - RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz_string); - if (!rlz_string.empty()) { - rlz_string = L"rlz=" + rlz_string + L"&"; -- url.insert(i->index, WideToUTF8(rlz_string)); -+ url.replace(i->index, 0, WideToUTF8(rlz_string)); - } - #endif - break; -@@ -354,17 +355,17 @@ +@@ -381,17 +382,17 @@ base::WideToCodepage(terms, input_encoding.c_str(), base::OnStringConversionError::SKIP, &unescaped_terms); @@ -55,8 +46,8 @@ } case LANGUAGE: -- url.insert(i->index, g_browser_process->GetApplicationLocale()); -+ url.replace(i->index, 0, g_browser_process->GetApplicationLocale()); +- url.insert(i->index, search_terms_data.GetApplicationLocale()); ++ url.replace(i->index, 0, search_terms_data.GetApplicationLocale()); break; case SEARCH_TERMS: ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.75&r2=1.76&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/search-workaround.patch?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
