Author: glen Date: Fri Mar 4 16:53:46 2011 GMT Module: packages Tag: HEAD ---- Log message: - add chromium and pld to useragent (patch from unbuntu)
---- Files affected: packages/chromium-browser: chromium-browser.spec (1.105 -> 1.106) , chromium_useragent.patch.in (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.105 packages/chromium-browser/chromium-browser.spec:1.106 --- packages/chromium-browser/chromium-browser.spec:1.105 Fri Mar 4 17:20:54 2011 +++ packages/chromium-browser/chromium-browser.spec Fri Mar 4 17:53:41 2011 @@ -54,6 +54,7 @@ Patch5: options-support.patch Patch6: get-webkit_revision.patch Patch7: dlopen_sonamed_gl.patch +Patch8: chromium_useragent.patch.in URL: http://code.google.com/chromium/ BuildRequires: GConf2-devel BuildRequires: OpenGL-GLU-devel @@ -86,6 +87,7 @@ BuildRequires: perl-modules BuildRequires: pkgconfig BuildRequires: python +BuildRequires: rpm >= 4.4.9-56 # grep googlecode_url.*gyp src/DEPS |cut -d'"' -f6 | cut -d@ -f2 BuildRequires: python-gyp >= 1-840 BuildRequires: python-modules @@ -168,6 +170,13 @@ # Populate the LASTCHANGE file template as we no longer have the VCS files at this point echo "%{svnver}" > src/build/LASTCHANGE.in +# add chromium and pld to useragent +%define pld_version %(echo %{pld_release} | sed -e 'y/[at]/[AT]/') +sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \ + -e 's/@BUILD_DIST_NAME@/PLD/g' \ + -e 's/@BUILD_DIST_VERSION@/%{pld_version}/g' \ + < %{PATCH8} | %{__patch} -p0 + %{__sed} -e 's,@localedir@,%{_libdir}/%{name},' %{SOURCE4} > find-lang.sh %patch0 -p1 @@ -327,6 +336,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.106 2011/03/04 16:53:41 glen +- add chromium and pld to useragent (patch from unbuntu) + Revision 1.105 2011/03/04 16:20:54 glen - dlopen gl libs by proper soname ================================================================ Index: packages/chromium-browser/chromium_useragent.patch.in diff -u /dev/null packages/chromium-browser/chromium_useragent.patch.in:1.1 --- /dev/null Fri Mar 4 17:53:46 2011 +++ packages/chromium-browser/chromium_useragent.patch.in Fri Mar 4 17:53:41 2011 @@ -0,0 +1,41 @@ +--- + webkit/glue/user_agent.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +Index: src/webkit/glue/user_agent.cc +=================================================================== +--- src.orig/webkit/glue/user_agent.cc ++++ src/webkit/glue/user_agent.cc +@@ -97,24 +97,31 @@ + "?"; + #endif + + // Get the product name and version, and replace Safari's Version/X string + // with it. This is done to expose our product name in a manner that is + // maximally compatible with Safari, we hope!! + std::string product = GetProductVersion(); + ++ // We want to also add Chromium ++ std::string realproduct = product.c_str(); ++ size_t pos; ++ if ((pos = realproduct.find("/")) != std::string::npos) ++ realproduct.replace(0, pos, "Chromium"); ++ + // Derived from Safari's UA string. + base::StringAppendF( + result, + "Mozilla/5.0 (%s; %s) AppleWebKit/%d.%d" +- " (KHTML, like Gecko) %s Safari/%d.%d", ++ " (KHTML, like Gecko) @BUILD_DIST_NAME@/@BUILD_DIST_VERSION@ %s %s Safari/%d.%d", + mimic_windows ? "Windows" : kUserAgentPlatform, + ((mimic_windows ? "Windows " : "") + BuildOSCpuInfo()).c_str(), + WEBKIT_VERSION_MAJOR, + WEBKIT_VERSION_MINOR, ++ realproduct.c_str(), + product.c_str(), + WEBKIT_VERSION_MAJOR, + WEBKIT_VERSION_MINOR); + } + + } // namespace webkit_glue + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.105&r2=1.106&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
