packages: chromium-browser/chromium-browser.spec, chromium-browser/system-l...

[glen]

Author: glen                         Date: Wed Mar 10 11:32:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.0.350.0, r41118
- add debuginfo bcond (useful to disable in ~/.bcondrc)

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.32 -> 1.33) , system-libs.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.32 packages/chromium-browser/chromium-browser.spec:1.33
--- packages/chromium-browser/chromium-browser.spec:1.32	Wed Mar  3 10:31:09 2010
+++ packages/chromium-browser/chromium-browser.spec	Wed Mar 10 12:32:23 2010
@@ -9,6 +9,7 @@
 %bcond_with	system_ffmpeg	# with system ffmpeg_mt
 %bcond_without	sandboxing	# with sandboxing
 %bcond_with	shared_libs	# with shared libs
+%bcond_without	debuginfo	# disable debuginfo creation (it is huge)
 
 # TODO
 # - check system sqlite linking problems
@@ -23,18 +24,18 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define		svndate 20100303
-%define		svnver  40484
+%define		svndate 20100310
+%define		svnver  41118
 %define		rel		1
 
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
-Version:	5.0.343.0
+Version:	5.0.350.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:	7c97bc116cb05498e0548c6d3d8c3f48
+# Source0-md5:	af02054b1b94df2e1509af818ff3b921
 Source2:	%{name}.sh
 Source3:	%{name}.desktop
 Source4:	find-lang.sh
@@ -89,6 +90,10 @@
 
 %define		find_lang 	sh find-lang.sh %{buildroot}
 
+%if %{without debuginfo}
+%define		_enable_debug_packages	0
+%endif
+
 %description
 Chromium is an open-source web browser, powered by WebKit.
 
@@ -274,6 +279,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2010/03/10 11:32:23  glen
+- up to 5.0.350.0, r41118
+- add debuginfo bcond (useful to disable in ~/.bcondrc)
+
 Revision 1.32  2010/03/03 09:31:09  glen
 - up to 5.0.343.0, r40484; BR gyp 790
 

================================================================
Index: packages/chromium-browser/system-libs.patch
diff -u packages/chromium-browser/system-libs.patch:1.3 packages/chromium-browser/system-libs.patch:1.4
--- packages/chromium-browser/system-libs.patch:1.3	Fri Feb  5 21:34:49 2010
+++ packages/chromium-browser/system-libs.patch	Wed Mar 10 12:32:24 2010
@@ -1,4 +1,3 @@
-diff -up chromium-20090827svn24640/src/base/pr_time_unittest.cc.system-code chromium-20090827svn24640/src/base/pr_time_unittest.cc
 --- chromium-20090827svn24640/src/base/pr_time_unittest.cc.system-code	2009-08-27 15:21:27.000000000 -0400
 +++ chromium-20090827svn24640/src/base/pr_time_unittest.cc	2009-08-27 16:05:17.000000000 -0400
 @@ -4,7 +4,7 @@
@@ -10,7 +9,6 @@
  #include "base/time.h"
  #include "testing/gtest/include/gtest/gtest.h"
  
-diff -up chromium-20090827svn24640/src/base/time.cc.system-code chromium-20090827svn24640/src/base/time.cc
 --- chromium-20090827svn24640/src/base/time.cc.system-code	2009-08-27 15:21:28.000000000 -0400
 +++ chromium-20090827svn24640/src/base/time.cc	2009-08-27 16:05:17.000000000 -0400
 @@ -5,7 +5,7 @@
@@ -22,7 +20,6 @@
  
  #include "base/logging.h"
  
-diff -up chromium-20090827svn24640/src/chrome/common/zip.cc.system-code chromium-20090827svn24640/src/chrome/common/zip.cc
 --- chromium-20090827svn24640/src/chrome/common/zip.cc.system-code	2009-08-27 15:22:46.000000000 -0400
 +++ chromium-20090827svn24640/src/chrome/common/zip.cc	2009-08-27 16:05:17.000000000 -0400
 @@ -7,8 +7,8 @@
@@ -47,14 +44,14 @@
  
  namespace {
  
---- chromium-browser-5.0.312.0~svn20100201r37680/src/chrome/browser/metrics/metrics_log.cc~	2010-01-20 05:02:33.000000000 +0200
-+++ chromium-browser-5.0.312.0~svn20100201r37680/src/chrome/browser/metrics/metrics_log.cc	2010-02-02 09:17:14.496849280 +0200
-@@ -12,7 +12,7 @@
- #include "base/scoped_ptr.h"
+--- chromium-browser-5.0.350.0~svn20100310r41118/src/chrome/browser/metrics/metrics_log.cc~	2010-03-09 05:04:58.000000000 +0200
++++ chromium-browser-5.0.350.0~svn20100310r41118/src/chrome/browser/metrics/metrics_log.cc	2010-03-10 12:57:56.743925628 +0200
+@@ -13,7 +13,7 @@
  #include "base/string_util.h"
  #include "base/sys_info.h"
+ #include "base/utf_string_conversions.h"
 -#include "base/third_party/nspr/prtime.h"
 +#include <prtime.h>
  #include "chrome/browser/autocomplete/autocomplete.h"
  #include "chrome/browser/browser_process.h"
- #include "chrome/common/logging_chrome.h"
+ #include "chrome/browser/pref_service.h"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.32&r2=1.33&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/system-libs.patch?r1=1.3&r2=1.4&f=u