packages: chromium-browser/chromium-browser.spec, chromium-browser/disable_...

[glen]

Author: glen                         Date: Fri Mar  4 16:02:35 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't create .patch in debian dir, patch the actual source

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.103 -> 1.104) , disable_dlog_and_dcheck_in_release_builds.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.103 packages/chromium-browser/chromium-browser.spec:1.104
--- packages/chromium-browser/chromium-browser.spec:1.103	Fri Mar  4 16:41:50 2011
+++ packages/chromium-browser/chromium-browser.spec	Fri Mar  4 17:02:26 2011
@@ -48,7 +48,7 @@
 Patch0:		system-libs.patch
 Patch1:		plugin-searchdirs.patch
 Patch2:		gyp-system-minizip.patch
-Patch3:		disable_dlog_and_dcheck_in_release_builds.patch.diff
+Patch3:		disable_dlog_and_dcheck_in_release_builds.patch
 # http://aur.archlinux.org/packages/chromium-browser-svn/chromium-browser-svn/search-workaround.patch
 Patch4:		search-workaround.patch
 Patch5:		options-support.patch
@@ -172,7 +172,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p0
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -325,6 +325,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.104  2011/03/04 16:02:26  glen
+- don't create .patch in debian dir, patch the actual source
+
 Revision 1.103  2011/03/04 15:41:50  glen
 - up to 11.0.691.0, r76865, system vpx patch upstream
 

================================================================
Index: packages/chromium-browser/disable_dlog_and_dcheck_in_release_builds.patch
diff -u packages/chromium-browser/disable_dlog_and_dcheck_in_release_builds.patch:1.1 packages/chromium-browser/disable_dlog_and_dcheck_in_release_builds.patch:1.2
--- packages/chromium-browser/disable_dlog_and_dcheck_in_release_builds.patch:1.1	Tue Jun  1 10:37:13 2010
+++ packages/chromium-browser/disable_dlog_and_dcheck_in_release_builds.patch	Fri Mar  4 17:02:26 2011
@@ -1,30 +1,27 @@
---- chromium-browser-6.0.423.0~svn20100601r48614.orig/debian/patches/disable_dlog_and_dcheck_in_release_builds.patch
-+++ chromium-browser-6.0.423.0~svn20100601r48614/debian/patches/disable_dlog_and_dcheck_in_release_builds.patch
-@@ -0,0 +1,27 @@
-+---
-+ base/logging.h |    2 +-
-+ 1 file changed, 1 insertion(+), 1 deletion(-)
-+
-+Index: src/base/logging.h
-+===================================================================
-+--- src.orig/base/logging.h
-++++ src/base/logging.h
-+@@ -382,17 +382,17 @@
-+ //   #ifndef NDEBUG
-+ //     foo.CheckThatFoo();
-+ //   #endif
-+ 
-+ // http://crbug.com/16512 is open for a real fix for this.  For now, Windows
-+ // uses OFFICIAL_BUILD and other platforms use the branding flag when NDEBUG is
-+ // defined.
-+ #if ( defined(OS_WIN) && defined(OFFICIAL_BUILD)) || \
-+-    (!defined(OS_WIN) && defined(NDEBUG) && defined(GOOGLE_CHROME_BUILD))
-++    (!defined(OS_WIN) && defined(NDEBUG))
-+ // In order to have optimized code for official builds, remove DLOGs and
-+ // DCHECKs.
-+ #define OMIT_DLOG_AND_DCHECK 1
-+ #endif
-+ 
-+ #ifdef OMIT_DLOG_AND_DCHECK
-+ 
-+ #define DLOG(severity) \
+---
+ base/logging.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: src/base/logging.h
+===================================================================
+--- ./src.orig/base/logging.h
++++ ./src/base/logging.h
+@@ -495,17 +495,17 @@
+ #define CHECK_LT(val1, val2) CHECK_OP(LT, < , val1, val2)
+ #define CHECK_GE(val1, val2) CHECK_OP(GE, >=, val1, val2)
+ #define CHECK_GT(val1, val2) CHECK_OP(GT, > , val1, val2)
+ 
+ // http://crbug.com/16512 is open for a real fix for this.  For now, Windows
+ // uses OFFICIAL_BUILD and other platforms use the branding flag when NDEBUG is
+ // defined.
+ #if ( defined(OS_WIN) && defined(OFFICIAL_BUILD)) || \
+-    (!defined(OS_WIN) && defined(NDEBUG) && defined(GOOGLE_CHROME_BUILD))
++    (!defined(OS_WIN) && defined(NDEBUG))
+ // Used by unit tests.
+ #define LOGGING_IS_OFFICIAL_BUILD
+ 
+ // In order to have optimized code for official builds, remove DLOGs and
+ // DCHECKs.
+ #define ENABLE_DLOG 0
+ #define ENABLE_DCHECK 0
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.103&r2=1.104&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/disable_dlog_and_dcheck_in_release_builds.patch?r1=1.1&r2=1.2&f=u