packages: chromium-browser/chromium-browser.spec, chromium-browser/search-w...
arekm
arekm at pld-linux.org
Tue Jun 1 10:03:55 CEST 2010
Author: arekm Date: Tue Jun 1 08:03:55 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 6.0.423.0; disable debug logs; add search workaround; -Dno_strict_aliasing=1 -Dgcc_version=44 are workaround for gcc 4.4.x series bug only; pass rpmcppflags
---- Files affected:
packages/chromium-browser:
chromium-browser.spec (1.59 -> 1.60) , search-workaround.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.59 packages/chromium-browser/chromium-browser.spec:1.60
--- packages/chromium-browser/chromium-browser.spec:1.59 Mon May 31 15:55:30 2010
+++ packages/chromium-browser/chromium-browser.spec Tue Jun 1 10:03:47 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 20100529
-%define svnver 48550
+%define svndate 20100601
+%define svnver 48614
%define rel 1
Summary: A WebKit powered web browser
Name: chromium-browser
-Version: 6.0.420.0
+Version: 6.0.423.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: 2cdccd5693ba1f1efc79042e90c179fd
+# Source0-md5: bbb7289f2d8e52c9e16d992233d620f6
Source2: %{name}.sh
Source3: %{name}.desktop
Source4: find-lang.sh
@@ -41,6 +41,9 @@
Patch0: system-libs.patch
Patch1: plugin-searchdirs.patch
Patch2: gyp-system-minizip.patch
+Patch3: disable_dlog_and_dcheck_in_release_builds.patch.diff
+# 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
URL: http://code.google.com/chromium/
@@ -158,6 +161,8 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p0
+%patch4 -p0
%patch5 -p1
%patch11 -p1
@@ -170,8 +175,8 @@
%ifarch %{x8664}
-Dtarget_arch=x64 \
%endif
-%if "%{cc_version}" >= "4.4.0"
- -Dno_strict_aliasing=1 -Dgcc_version=$(echo %{cc_version} | cut -d. -f1-2 | tr -d .) \
+%if "%{cc_version}" >= "4.4.0" && "%{cc_version}" < "4.5.0"
+ -Dno_strict_aliasing=1 -Dgcc_version=44 \
%endif
%if %{with sandboxing}
-Dlinux_sandbox_path=%{_libdir}/%{name}/chromium-sandbox \
@@ -204,8 +209,8 @@
CXX="%{__cxx}" \
CC.host="%{__cc}" \
CXX.host="%{__cxx}" \
- CFLAGS="%{rpmcflags}" \
- CXXFLAGS="%{rpmcxxflags}"
+ CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+ CXXFLAGS="%{rpmcxxflags} %{rpmcppflags}"
%install
rm -rf $RPM_BUILD_ROOT
@@ -293,6 +298,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.60 2010/06/01 08:03:47 arekm
+- up to 6.0.423.0; disable debug logs; add search workaround; -Dno_strict_aliasing=1 -Dgcc_version=44 are workaround for gcc 4.4.x series bug only; pass rpmcppflags
+
Revision 1.59 2010/05/31 13:55:30 sparky
- BR: cups-devel, which
================================================================
Index: packages/chromium-browser/search-workaround.patch
diff -u /dev/null packages/chromium-browser/search-workaround.patch:1.1
--- /dev/null Tue Jun 1 10:03:55 2010
+++ packages/chromium-browser/search-workaround.patch Tue Jun 1 10:03:47 2010
@@ -0,0 +1,70 @@
+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 @@
+ i != replacements_.rend(); ++i) {
+ switch (i->type) {
+ case ENCODING:
+- url.insert(i->index, input_encoding);
++ /* Temporary workaround according to http://crbug.com/41887 */
++ url.replace(i->index, 0, input_encoding);
+ break;
+
+ 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&");
+ 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));
+ break;
+
+ case GOOGLE_BASE_URL:
+- url.insert(i->index, GoogleBaseURLValue());
++ url.replace(i->index, 0, GoogleBaseURLValue());
+ break;
+
+ case GOOGLE_BASE_SUGGEST_URL:
+- url.insert(i->index, GoogleBaseSuggestURLValue());
++ url.replace(i->index, 0, GoogleBaseSuggestURLValue());
+ break;
+
+ 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"&");
+ break;
+
+@@ -347,7 +348,7 @@
+ RLZTracker::GetAccessPointRlz(RLZTracker::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);
+ }
+ #endif
+ break;
+@@ -358,18 +359,18 @@
+ base::WideToCodepage(terms, WideToASCII(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()));
+ break;
+ }
+
+ case LANGUAGE:
+- url.insert(i->index,
++ url.replace(i->index, 0,
+ ASCIIToWide(g_browser_process->GetApplicationLocale()));
+ break;
+
+ case SEARCH_TERMS:
+- url.insert(i->index, UTF16ToWideHack(encoded_terms));
++ url.replace(i->index, 0, UTF16ToWideHack(encoded_terms));
+ break;
+
+ default:
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.59&r2=1.60&f=u
More information about the pld-cvs-commit
mailing list