[packages/chromium-browser/dev-27] allow setting sync client name via SYNC_SESSION_NAME env. crbug.com/123827

glen glen at pld-linux.org
Sat May 4 16:21:29 CEST 2013


commit 06e6d11b3365d5eaae1ad6ecd1eb4984f5ae9cf4
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat May 4 17:20:12 2013 +0300

    allow setting sync client name via SYNC_SESSION_NAME env. crbug.com/123827

 chromium-browser.spec   |  4 +++-
 sync-session-name.patch | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 9d865b2..b0a9702 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -69,7 +69,7 @@ Version:	%{branch}.%{patchver}
 %else
 Version:	%{branch}.%{basever}
 %endif
-Release:	0.7
+Release:	0.10
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{branch}.%{basever}.tar.gz
@@ -106,6 +106,7 @@ Patch26:	master-prefs-path.patch
 Patch28:	system-mesa.patch
 Patch29:	speechd-0.8.patch
 Patch30:	no-pnacl.patch
+Patch31:	sync-session-name.patch
 URL:		http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:	GConf2-devel}
 %{?with_system_mesa:BuildRequires:	Mesa-libGL-devel >= 9.1}
@@ -291,6 +292,7 @@ ln -s %{SOURCE7} .
 %patch26 -p2
 %patch29 -p2
 %patch30 -p0
+%patch31 -p1
 
 sh -x clean-source.sh \
 	%{!?with_nacl:nacl=0} \
diff --git a/sync-session-name.patch b/sync-session-name.patch
new file mode 100644
index 0000000..f23b48c
--- /dev/null
+++ b/sync-session-name.patch
@@ -0,0 +1,17 @@
+https://code.google.com/p/chromium/issues/detail?id=123827
+--- chromium-browser-27.0.1453.73/sync/util/get_session_name.cc~	2013-04-30 10:20:51.000000000 +0300
++++ chromium-browser-27.0.1453.73/sync/util/get_session_name.cc	2013-05-04 16:47:18.472330715 +0300
+@@ -60,7 +60,12 @@
+   // "CHROMEOS_RELEASE_BOARD" line in chrome://system.
+   session_name = board.substr(0, 6) == "stumpy" ? "Chromebox" : "Chromebook";
+ #elif defined(OS_LINUX)
+-  session_name = base::GetLinuxDistro();
++  const char* env_session_name = getenv("SYNC_SESSION_NAME");
++  if (env_session_name && *env_session_name) {
++    session_name = std::string(env_session_name);
++  } else {
++    session_name = base::GetLinuxDistro();
++  }
+ #elif defined(OS_IOS)
+   session_name = internal::GetComputerName();
+ #elif defined(OS_MACOSX)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/06e6d11b3365d5eaae1ad6ecd1eb4984f5ae9cf4



More information about the pld-cvs-commit mailing list