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

2012-05-23 Thread arekm 
Author: arekmDate: Wed May 23 06:59:59 2012 GMT
Module: packages  Tag: HEAD
 Log message:
- partial 20.0.1132.11; fails to build due to libxml problems

 Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.198 - 1.199) , system-libs.patch (1.13 - 1.14) , 
tcmalloc.patch (1.1 - 1.2) 

 Diffs:


Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.198 
packages/chromium-browser/chromium-browser.spec:1.199
--- packages/chromium-browser/chromium-browser.spec:1.198   Sun May 20 
19:53:49 2012
+++ packages/chromium-browser/chromium-browser.spec Wed May 23 08:59:53 2012
@@ -52,12 +52,12 @@
 %definegyp_rev 1014
 Summary:   A WebKit powered web browser
 Name:  chromium-browser
-Version:   19.0.1084.46
-Release:   1
+Version:   20.0.1132.11
+Release:   0.1
 License:   BSD, LGPL v2+ (ffmpeg)
 Group: X11/Applications/Networking
 Source0:   
http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.xz
-# Source0-md5: 6119a345de59252ba219f8b2ed9d71a4
+# Source0-md5: 42736a90710d0f72dfed676fb4b32723
 Source1:   %{name}.default
 Source2:   %{name}.sh
 Source3:   %{name}.desktop
@@ -402,6 +402,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.199  2012/05/23 06:59:53  arekm
+- partial 20.0.1132.11; fails to build due to libxml problems
+
 Revision 1.198  2012/05/20 17:53:49  glen
 - add way to setup runtime flag options globally (similar to gentoo/debian)
 


Index: packages/chromium-browser/system-libs.patch
diff -u packages/chromium-browser/system-libs.patch:1.13 
packages/chromium-browser/system-libs.patch:1.14
--- packages/chromium-browser/system-libs.patch:1.13Fri Mar 30 00:24:08 2012
+++ packages/chromium-browser/system-libs.patch Wed May 23 08:59:54 2012
@@ -1,9 +1,9 @@
 --- chromium-20090827svn24640/src/base/pr_time_unittest.cc.system-code 
2009-08-27 15:21:27.0 -0400
 +++ chromium-20090827svn24640/src/base/pr_time_unittest.cc 2009-08-27 
16:05:17.0 -0400
-@@ -4,7 +4,7 @@
- 
+@@ -5,7 +5,7 @@
  #include time.h
  
+ #include base/compiler_specific.h
 -#include base/third_party/nspr/prtime.h
 +#include nspr/prtime.h
  #include base/time.h


Index: packages/chromium-browser/tcmalloc.patch
diff -u packages/chromium-browser/tcmalloc.patch:1.1 
packages/chromium-browser/tcmalloc.patch:1.2
--- packages/chromium-browser/tcmalloc.patch:1.1Sun May 20 14:23:08 2012
+++ packages/chromium-browser/tcmalloc.patchWed May 23 08:59:54 2012
@@ -2,12 +2,11 @@
 
 --- chrome/renderer/chrome_render_process_observer.cc.orig 2012-05-16 
20:01:13.0 +0200
 +++ chrome/renderer/chrome_render_process_observer.cc  2012-05-16 
20:01:41.0 +0200
-@@ -32,8 +32,6 @@
+@@ -35,7 +35,6 @@
  #include net/base/net_errors.h
  #include net/base/net_module.h
  #include third_party/sqlite/sqlite3.h
 -#include third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h
--#include third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h
  #include third_party/WebKit/Source/WebKit/chromium/public/WebCache.h
  #include 
third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflightResultCache.h
  #include third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h
@@ -23,37 +22,4 @@
  using WebKit::WebCache;
  using WebKit::WebCrossOriginPreflightResultCache;
  using WebKit::WebFontCache;
 content/renderer/render_thread_impl.cc.orig2012-05-19 
13:08:56.0 +0200
-+++ content/renderer/render_thread_impl.cc 2012-05-19 13:09:29.0 
+0200
-@@ -63,7 +63,6 @@
- #include media/base/media.h
- #include net/base/net_errors.h
- #include net/base/net_util.h
--#include third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h
- #include third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h
- #include third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h
- #include third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h
-@@ -98,6 +97,10 @@
- #include ipc/ipc_channel_posix.h
- #endif
- 
-+#if defined(USE_TCMALLOC)
-+#include third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h
-+#endif
-+
- using WebKit::WebDocument;
- using WebKit::WebFrame;
- using WebKit::WebNetworkStateNotifier;
 chrome/browser/memory_purger.cc.orig   2012-05-19 16:02:27.0 
+0200
-+++ chrome/browser/memory_purger.cc2012-05-19 16:02:50.0 +0200
-@@ -22,7 +22,10 @@
- #include net/proxy/proxy_service.h
- #include net/url_request/url_request_context.h
- #include net/url_request/url_request_context_getter.h
-+
-+#if defined(USE_TCMALLOC)
- #include

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

2011-07-23 Thread charles 
Author: charles  Date: Sat Jul 23 15:17:43 2011 GMT
Module: packages  Tag: HEAD
 Log message:
- updated to 14.0.831.0
- BR: pulseaudio-devel

 Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.123 - 1.124) , system-libs.patch (1.8 - 1.9) 

 Diffs:


Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.123 
packages/chromium-browser/chromium-browser.spec:1.124
--- packages/chromium-browser/chromium-browser.spec:1.123   Mon Jul 11 
13:53:18 2011
+++ packages/chromium-browser/chromium-browser.spec Sat Jul 23 17:17:38 2011
@@ -30,18 +30,18 @@
 # or:
 # 
http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf
 
-%definesvndate 20110711
-%definesvnver  91986
+%definesvndate 20110723
+%definesvnver  93759
 %definerel 1
 
 Summary:   A WebKit powered web browser
 Name:  chromium-browser
-Version:   14.0.817.0
+Version:   14.0.831.0
 Release:   0.%{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: 93063500eacc44bab6ab0b9513fd9409
+# Source0-md5: 3b6acab23dd64b8ad289b83a661a05f7
 Source2:   %{name}.sh
 Source3:   %{name}.desktop
 Source4:   find-lang.sh
@@ -88,6 +88,7 @@
 BuildRequires: pango-devel
 BuildRequires: perl-modules
 BuildRequires: pkgconfig
+BuildRequires: pulseaudio-devel
 BuildRequires: python
 BuildRequires: rpm = 4.4.9-56
 # grep googlecode_url.*gyp src/DEPS |cut -d'' -f6 | cut -d@ -f2
@@ -346,6 +347,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.124  2011/07/23 15:17:38  charles
+- updated to 14.0.831.0
+- BR: pulseaudio-devel
+
 Revision 1.123  2011/07/11 11:53:18  arekm
 - up to 14.0.817.0
 


Index: packages/chromium-browser/system-libs.patch
diff -u packages/chromium-browser/system-libs.patch:1.8 
packages/chromium-browser/system-libs.patch:1.9
--- packages/chromium-browser/system-libs.patch:1.8 Fri Jan  7 21:30:16 2011
+++ packages/chromium-browser/system-libs.patch Sat Jul 23 17:17:38 2011
@@ -55,14 +55,14 @@
  #include base/time.h
  #include base/utf_string_conversions.h
  #include chrome/browser/autocomplete/autocomplete.h
 
chromium-browser-10.0.632.0~svn20110107r70714/src/chrome/common/metrics_helpers.cc~
2010-12-14 04:02:04.0 +0100
-+++ 
chromium-browser-10.0.632.0~svn20110107r70714/src/chrome/common/metrics_helpers.cc
 2011-01-07 18:42:11.020015382 +0100
-@@ -19,7 +19,7 @@
+--- 
chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc.orig
2011-07-19 04:00:59.0 +0200
 
chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc
 2011-07-22 20:43:47.608727449 +0200
+@@ -17,7 +17,7 @@
+ #include base/perftimer.h
  #include base/string_number_conversions.h
  #include base/sys_info.h
- #include base/utf_string_conversions.h
 -#include base/third_party/nspr/prtime.h
 +#include nspr/prtime.h
+ #include base/time.h
+ #include base/utf_string_conversions.h
  #include chrome/common/logging_chrome.h
- #include googleurl/src/gurl.h
- #include libxml/xmlwriter.h


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.123r2=1.124f=u

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/system-libs.patch?r1=1.8r2=1.9f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

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

2010-07-22 Thread glen 
Author: glen Date: Thu Jul 22 14:15:35 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- up to 6.0.474.0, r53294

 Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.68 - 1.69) , system-libs.patch (1.6 - 1.7) 

 Diffs:


Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.68 
packages/chromium-browser/chromium-browser.spec:1.69
--- packages/chromium-browser/chromium-browser.spec:1.68Tue Jul 13 
13:36:19 2010
+++ packages/chromium-browser/chromium-browser.spec Thu Jul 22 16:15:29 2010
@@ -22,18 +22,18 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%definesvndate 20100713
-%definesvnver  52155
+%definesvndate 20100722
+%definesvnver  53294
 %definerel 1
 
 Summary:   A WebKit powered web browser
 Name:  chromium-browser
-Version:   6.0.464.0
+Version:   6.0.474.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: 3611abf4e0a29e2fbc2c7a0510056b29
+# Source0-md5: 6d32faaa7c46f95aac0935cdacb576bb
 Source2:   %{name}.sh
 Source3:   %{name}.desktop
 Source4:   find-lang.sh
@@ -315,6 +315,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.69  2010/07/22 14:15:29  glen
+- up to 6.0.474.0, r53294
+
 Revision 1.68  2010/07/13 11:36:19  glen
 - up to 6.0.464.0 r52155
 


Index: packages/chromium-browser/system-libs.patch
diff -u packages/chromium-browser/system-libs.patch:1.6 
packages/chromium-browser/system-libs.patch:1.7
--- packages/chromium-browser/system-libs.patch:1.6 Sun Apr 25 15:38:33 2010
+++ packages/chromium-browser/system-libs.patch Thu Jul 22 16:15:29 2010
@@ -44,14 +44,14 @@
  
  namespace {
  
 
chromium-browser-5.0.378.0~svn20100415r44604/src/chrome/browser/metrics/metrics_log.cc~
2010-04-14 18:30:23.0 +0300
-+++ 
chromium-browser-5.0.378.0~svn20100415r44604/src/chrome/browser/metrics/metrics_log.cc
 2010-04-15 11:40:36.482149714 +0300
-@@ -14,7 +14,7 @@
+--- 
chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc~
2010-07-21 05:01:25.0 +0300
 
chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc
 2010-07-22 13:58:51.340525649 +0300
+@@ -16,7 +16,7 @@
+ #include base/scoped_ptr.h
  #include base/string_util.h
  #include base/sys_info.h
- #include base/utf_string_conversions.h
 -#include base/third_party/nspr/prtime.h
 +#include nspr/prtime.h
- #include chrome/app/chrome_version_info.h
+ #include base/time.h
+ #include base/utf_string_conversions.h
  #include chrome/browser/autocomplete/autocomplete.h
- #include chrome/browser/browser_process.h


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.68r2=1.69f=u

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/system-libs.patch?r1=1.6r2=1.7f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

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

2010-04-15 Thread glen 
Author: glen Date: Thu Apr 15 09:02:55 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- update to build with 5.0.378.0, r44604

 Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.41 - 1.42) , system-libs.patch (1.4 - 1.5) 

 Diffs:


Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.41 
packages/chromium-browser/chromium-browser.spec:1.42
--- packages/chromium-browser/chromium-browser.spec:1.41Tue Apr  6 
19:25:20 2010
+++ packages/chromium-browser/chromium-browser.spec Thu Apr 15 11:02:47 2010
@@ -24,18 +24,18 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%definesvndate 20100406
-%definesvnver  43687
+%definesvndate 20100415
+%definesvnver  44604
 %definerel 1
 
 Summary:   A WebKit powered web browser
 Name:  chromium-browser
-Version:   5.0.370.0
+Version:   5.0.378.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: d96c4e113b6762cf9db7949b01eef2ec
+# Source0-md5: 6fbd62971a8a20af733a81501555aef6
 Source2:   %{name}.sh
 Source3:   %{name}.desktop
 Source4:   find-lang.sh
@@ -298,6 +298,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.42  2010/04/15 09:02:47  glen
+- update to build with 5.0.378.0, r44604
+
 Revision 1.41  2010/04/06 17:25:20  glen
 - correct: chromium!=chrome
 


Index: packages/chromium-browser/system-libs.patch
diff -u packages/chromium-browser/system-libs.patch:1.4 
packages/chromium-browser/system-libs.patch:1.5
--- packages/chromium-browser/system-libs.patch:1.4 Wed Mar 10 12:32:24 2010
+++ packages/chromium-browser/system-libs.patch Thu Apr 15 11:02:47 2010
@@ -44,14 +44,14 @@
  
  namespace {
  
 
chromium-browser-5.0.350.0~svn20100310r41118/src/chrome/browser/metrics/metrics_log.cc~
2010-03-09 05:04:58.0 +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 @@
+--- 
chromium-browser-5.0.378.0~svn20100415r44604/src/chrome/browser/metrics/metrics_log.cc~
2010-04-14 18:30:23.0 +0300
 
chromium-browser-5.0.378.0~svn20100415r44604/src/chrome/browser/metrics/metrics_log.cc
 2010-04-15 11:40:36.482149714 +0300
+@@ -14,7 +14,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/app/chrome_version_info.h
  #include chrome/browser/autocomplete/autocomplete.h
  #include chrome/browser/browser_process.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.41r2=1.42f=u

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/system-libs.patch?r1=1.4r2=1.5f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

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

2010-03-10 Thread 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.32Wed Mar  3 
10:31:09 2010
+++ packages/chromium-browser/chromium-browser.spec Wed Mar 10 12:32:23 2010
@@ -9,6 +9,7 @@
 %bcond_withsystem_ffmpeg   # with system ffmpeg_mt
 %bcond_without sandboxing  # with sandboxing
 %bcond_withshared_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
 
-%definesvndate 20100303
-%definesvnver  40484
+%definesvndate 20100310
+%definesvnver  41118
 %definerel 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 @@
 
 %definefind_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.0 -0400
 +++ chromium-20090827svn24640/src/base/pr_time_unittest.cc 2009-08-27 
16:05:17.0 -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.0 -0400
 +++ chromium-20090827svn24640/src/base/time.cc 2009-08-27 16:05:17.0 
-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.0 -0400
 +++ chromium-20090827svn24640/src/chrome/common/zip.cc 2009-08-27 
16:05:17.0 -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.0 +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.0 +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

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

2010-02-02 Thread glen 
Author: glen Date: Tue Feb  2 13:01:36 2010 GMT
Module: packages  Tag: HEAD
 Log message:
- up to 5.0.313.0 r37790, using ubuntu ppa as source tarball

 Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.14 - 1.15) , system-libs.patch (1.1 - 1.2) , 
libpng14.patch (NONE - 1.1)  (NEW), plugin-searchdirs.patch (NONE - 1.1)  
(NEW), 64bit-plugin-path.patch (1.1 - NONE)  (REMOVED), 
chromium-daily-tarball.sh (1.4 - NONE)  (REMOVED), debug_util_posix-fix.patch 
(1.1 - NONE)  (REMOVED), gyp-system-icu.patch (1.1 - NONE)  (REMOVED), 
icu-code-changes.patch (1.1 - NONE)  (REMOVED), no-sqlite-debug.patch (1.1 - 
NONE)  (REMOVED), noffmpeg.patch (1.1 - NONE)  (REMOVED), 
system-libs-gyp.patch (1.1 - NONE)  (REMOVED)

 Diffs:


Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.14 
packages/chromium-browser/chromium-browser.spec:1.15
--- packages/chromium-browser/chromium-browser.spec:1.14Wed Sep 23 
13:45:46 2009
+++ packages/chromium-browser/chromium-browser.spec Tue Feb  2 14:01:26 2010
@@ -1,68 +1,87 @@
 # $Revision$, $Date$
 #
 # Conditional build:
+%bcond_withverbose # verbose build (V=1)
 %bcond_withselinux # with SELinux (need policy first)
+%bcond_withsystem_v8   # with system v8
+%bcond_without system_zlib # with system zlib
+%bcond_withsystem_sqlite   # with system sqlite
+%bcond_withsystem_ffmpeg   # with system ffmpeg_mt
+%bcond_without sandboxing  # with sandboxing
+%bcond_withshared_libs # with shared libs
 
 # TODO
-# - optflags and strip (-debuginfo is quite empty)
-# - use tarballs from http://build.chromium.org/buildbot/tarball/
+# - check system sqlite linking problems
 
 # NOTES:
-# - build - bp: ~1.3G GB bc: ~1.5 GB
-# - keep eye on spec from http://spot.fedorapeople.org/chromium/
+# - use nosource until the package is ready to be stbr, no point poisioning 
distfiles
+# - build i686: -bp: ~570MB; bc: ~928MB; -bb: ~1.0GB
+# - build x86_64: -bp: ~570MB; bc: ~990MB; -bb: ~1.0GB
+# - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
+# - lynx -dump 
http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/
 | grep orig.tar.gz
+
+%definesvndate 20100202
+%definesvnver  37790
+%definerel 0.16
 
-%definesvndate 20090916
-%definesvnver  svn26424
 Summary:   A WebKit powered web browser
 Name:  chromium-browser
-Version:   4.0.212.0
-Release:   0.1.%{svndate}%{svnver}%{?dist}
+Version:   5.0.313.0
+Release:   0.%{svnver}.%{rel}
 License:   BSD, LGPL v2+ (ffmpeg)
 Group: X11/Applications/Networking
 Patch0:system-libs.patch
-Patch1:system-libs-gyp.patch
+Patch1:plugin-searchdirs.patch
 Patch2:gyp-system-minizip.patch
-Patch3:noffmpeg.patch
 Patch5:options-support.patch
-Patch6:64bit-plugin-path.patch
-Patch7:gyp-system-icu.patch
-Patch8:icu-code-changes.patch
-Patch9:no-sqlite-debug.patch
-Patch10:   debug_util_posix-fix.patch
 Patch11:   memory_details-iceweasel.patch
-Source0:   chromium-%{svndate}%{svnver}.tar.bz2
-# Source0-md5: 20663b974249b35d7ab655ce21b8f868
-# Custom build tools for chromium, hammer is a fancy front-end for scons
-Source1:   http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz
-# Source1-md5: 1f821101d5a6f26345dc22ae5e0cbe1e
+Patch12:   libpng14.patch
+Source0:   
http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
+# NoSource0-md5:   49d2d8f289facc215566a4f1aec37cb9
+NoSource:  0
 Source2:   %{name}.sh
 Source3:   %{name}.desktop
 Source4:   find-lang.sh
-# We don't actually use this in the build, but it is included so you can make 
the tarball.
-Source5:   chromium-daily-tarball.sh
+URL:   http://code.google.com/chromium/
 BuildRequires: GConf2-devel
+BuildRequires: OpenGL
+BuildRequires: OpenGL-GLU-devel
+BuildRequires: OpenGL-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: atk-devel
 BuildRequires: bison
 BuildRequires: bzip2-devel
 BuildRequires: dbus-devel
-BuildRequires: desktop-file-utils
 BuildRequires: flex
 BuildRequires: fontconfig-devel
+BuildRequires: glib2-devel
 BuildRequires: gperf
 BuildRequires: gtk+2-devel
+BuildRequires: hunspell-devel
 BuildRequires: libevent-devel
 BuildRequires: libicu-devel = 4.2.1-2
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libstdc++-devel
+BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel