Author: glen Date: Tue Jul 13 11:36:25 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 6.0.464.0 r52155
---- Files affected: packages/chromium-browser: chromium-browser.spec (1.67 -> 1.68) , search-workaround.patch (1.1 -> 1.2) , gcc45.patch (NONE -> 1.1) (NEW), memory_details-iceweasel.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.67 packages/chromium-browser/chromium-browser.spec:1.68 --- packages/chromium-browser/chromium-browser.spec:1.67 Sun Jun 13 14:30:08 2010 +++ packages/chromium-browser/chromium-browser.spec Tue Jul 13 13:36:19 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 20100613 -%define svnver 49638 +%define svndate 20100713 +%define svnver 52155 %define rel 1 Summary: A WebKit powered web browser Name: chromium-browser -Version: 6.0.434.0 +Version: 6.0.464.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: bfc9f9fe855660c6ee28b1e46d352f32 +# Source0-md5: 3611abf4e0a29e2fbc2c7a0510056b29 Source2: %{name}.sh Source3: %{name}.desktop Source4: find-lang.sh @@ -45,7 +45,7 @@ # http://aur.archlinux.org/packages/chromium-browser-svn/chromium-browser-svn/search-workaround.patch Patch4: search-workaround.patch Patch5: options-support.patch -Patch11: memory_details-iceweasel.patch +Patch6: gcc45.patch URL: http://code.google.com/chromium/ BuildRequires: GConf2-devel BuildRequires: OpenGL-GLU-devel @@ -163,18 +163,19 @@ %patch1 -p1 %patch2 -p1 %patch3 -p0 -%patch4 -p0 +%patch4 -p1 %patch5 -p1 -%patch11 -p1 +%patch6 -p1 # drop bundled libs, from gentoo remove_bundled_lib() { - echo "Removing bundled library $1 ..." - local out - out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" - if [ -z "$out" ]; then - echo "no files matched when removing bundled library $1" >&2 && exit 1 - fi + echo "Removing bundled library $1 ..." + local out + out=$(find $1 -mindepth 1 ! -iname '*.gyp' -print -delete) + if [ -z "$out" ]; then + echo >&2 "No files matched when removing bundled library $1" + exit 1 + fi } cd src @@ -240,9 +241,7 @@ install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name} %{__sed} -i -e 's,@libdir@,%{_libdir}/%{name},' $RPM_BUILD_ROOT%{_bindir}/%{name} -cp -a chrome.pak $RPM_BUILD_ROOT%{_libdir}/%{name} -cp -a locales/*.pak $RPM_BUILD_ROOT%{_libdir}/%{name}/locales -cp -a resources/* $RPM_BUILD_ROOT%{_libdir}/%{name}/resources +cp -a *.pak locales resources $RPM_BUILD_ROOT%{_libdir}/%{name} cp -a chrome.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 cp -a product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png install -p chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name} @@ -282,6 +281,7 @@ %{_desktopdir}/*.desktop %dir %{_libdir}/%{name} %{_libdir}/%{name}/chrome.pak +%{_libdir}/%{name}/resources.pak %dir %{_libdir}/%{name}/locales %{_libdir}/%{name}/locales/en-US.pak %dir %{_libdir}/%{name}/resources @@ -298,12 +298,9 @@ # bundle this copy until xdg-utils will have this itself %attr(755,root,root) %{_libdir}/%{name}/xdg-settings -%{_libdir}/%{name}/resources/bookmark_manager %{_libdir}/%{name}/resources/calendar_app %{_libdir}/%{name}/resources/docs_app %{_libdir}/%{name}/resources/gmail_app -%{_libdir}/%{name}/resources/net_internals -%{_libdir}/%{name}/resources/shared %files inspector %defattr(644,root,root,755) @@ -318,6 +315,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.68 2010/07/13 11:36:19 glen +- up to 6.0.464.0 r52155 + Revision 1.67 2010/06/13 12:30:08 arekm - bundled zlib also not needed. ================================================================ Index: packages/chromium-browser/search-workaround.patch diff -u packages/chromium-browser/search-workaround.patch:1.1 packages/chromium-browser/search-workaround.patch:1.2 --- packages/chromium-browser/search-workaround.patch:1.1 Tue Jun 1 10:03:47 2010 +++ packages/chromium-browser/search-workaround.patch Tue Jul 13 13:36:19 2010 @@ -1,8 +1,6 @@ -Index: src/chrome/browser/search_engines/template_url.cc -=================================================================== ---- src/chrome/browser/search_engines/template_url.cc (revision 46737) -+++ src/chrome/browser/search_engines/template_url.cc (working copy) -@@ -313,27 +313,28 @@ +--- 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 @@ i != replacements_.rend(); ++i) { switch (i->type) { case ENCODING: @@ -13,11 +11,11 @@ case GOOGLE_ACCEPTED_SUGGESTION: if (accepted_suggestion == NO_SUGGESTION_CHOSEN) -- url.insert(i->index, L"aq=f&"); -+ url.replace(i->index, 0, L"aq=f&"); +- 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(L"aq=%d&", accepted_suggestion)); -+ url.replace(i->index, 0, StringPrintf(L"aq=%d&", accepted_suggestion)); +- url.insert(i->index, StringPrintf("aq=%d&", accepted_suggestion)); ++ url.replace(i->index, 0, StringPrintf("aq=%d&", accepted_suggestion)); break; case GOOGLE_BASE_URL: @@ -32,39 +30,38 @@ case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION: if (accepted_suggestion >= 0) -- url.insert(i->index, L"oq=" + -+ url.replace(i->index, 0, L"oq=" + - UTF16ToWideHack(encoded_original_query) + L"&"); +- url.insert(i->index, "oq=" + UTF16ToUTF8(encoded_original_query) + ++ url.replace(i->index, 0, "oq=" +UTF16ToUTF8(encoded_original_query) + + "&"); break; -@@ -347,7 +348,7 @@ - RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, &rlz_string); +@@ -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, rlz_string); -+ url.replace(i->index, 0, rlz_string); +- url.insert(i->index, WideToUTF8(rlz_string)); ++ url.replace(i->index, 0, WideToUTF8(rlz_string)); } #endif break; -@@ -358,18 +359,18 @@ - base::WideToCodepage(terms, WideToASCII(input_encoding).c_str(), +@@ -354,17 +355,17 @@ + base::WideToCodepage(terms, input_encoding.c_str(), base::OnStringConversionError::SKIP, &unescaped_terms); -- url.insert(i->index, std::wstring(unescaped_terms.begin(), -+ url.replace(i->index, 0, std::wstring(unescaped_terms.begin(), - unescaped_terms.end())); +- url.insert(i->index, std::string(unescaped_terms.begin(), ++ url.replace(i->index, 0, std::string(unescaped_terms.begin(), + unescaped_terms.end())); break; } case LANGUAGE: -- url.insert(i->index, -+ url.replace(i->index, 0, - ASCIIToWide(g_browser_process->GetApplicationLocale())); +- url.insert(i->index, g_browser_process->GetApplicationLocale()); ++ url.replace(i->index, 0, g_browser_process->GetApplicationLocale()); break; case SEARCH_TERMS: -- url.insert(i->index, UTF16ToWideHack(encoded_terms)); -+ url.replace(i->index, 0, UTF16ToWideHack(encoded_terms)); +- url.insert(i->index, UTF16ToUTF8(encoded_terms)); ++ url.replace(i->index, 0, UTF16ToUTF8(encoded_terms)); break; default: ================================================================ Index: packages/chromium-browser/gcc45.patch diff -u /dev/null packages/chromium-browser/gcc45.patch:1.1 --- /dev/null Tue Jul 13 13:36:25 2010 +++ packages/chromium-browser/gcc45.patch Tue Jul 13 13:36:19 2010 @@ -0,0 +1,11 @@ +--- chromium-browser-6.0.464.0~svn20100713r52155/src/base/watchdog_unittest.cc~ 2010-06-03 05:04:36.000000000 +0300 ++++ chromium-browser-6.0.464.0~svn20100713r52155/src/base/watchdog_unittest.cc 2010-07-13 12:41:18.035417689 +0300 +@@ -83,7 +83,7 @@ + + // Make sure a basic alarm fires when the time has expired. + TEST_F(WatchdogTest, AlarmPriorTimeTest) { +- WatchdogCounter watchdog(TimeDelta::TimeDelta(), "Enabled2", true); ++ WatchdogCounter watchdog(TimeDelta(), "Enabled2", true); + // Set a time in the past. + watchdog.ArmSomeTimeDeltaAgo(TimeDelta::FromSeconds(2)); + // It should instantly go off, but certainly in less than 5 minutes. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.67&r2=1.68&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/search-workaround.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
