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

arekm arekm at pld-linux.org
Wed May 23 08:59:59 CEST 2012


Author: arekm                        Date: 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 @@
 %define		gyp_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.13	Fri 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.000000000 -0400
 +++ chromium-20090827svn24640/src/base/pr_time_unittest.cc	2009-08-27 16:05:17.000000000 -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.1	Sun May 20 14:23:08 2012
+++ packages/chromium-browser/tcmalloc.patch	Wed May 23 08:59:54 2012
@@ -2,12 +2,11 @@
 
 --- chrome/renderer/chrome_render_process_observer.cc.orig	2012-05-16 20:01:13.000000000 +0200
 +++ chrome/renderer/chrome_render_process_observer.cc	2012-05-16 20:01:41.000000000 +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.orig	2012-05-19 13:08:56.000000000 +0200
-+++ content/renderer/render_thread_impl.cc	2012-05-19 13:09:29.000000000 +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.000000000 +0200
-+++ chrome/browser/memory_purger.cc	2012-05-19 16:02:50.000000000 +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 "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
-+#endif
- 
- using content::BrowserContext;
- using content::BrowserThread;
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/chromium-browser/chromium-browser.spec?r1=1.198&r2=1.199
    http://cvs.pld-linux.org/packages/chromium-browser/system-libs.patch?r1=1.13&r2=1.14
    http://cvs.pld-linux.org/packages/chromium-browser/tcmalloc.patch?r1=1.1&r2=1.2



More information about the pld-cvs-commit mailing list