- don't create .patch in debian dir, patch the actual source

Changed files:
    chromium-browser.spec -> 1.104
    disable_dlog_and_dcheck_in_release_builds.patch -> 1.2

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 62fca45b2c896ac7d72f3f4da653a4666830d3ab..330cfa8af09b591767eef1b87d6e7bdd34e2d58c 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -47,7 +47,7 @@ Source5:      update-source.sh
 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
@@ -171,7 +171,7 @@ echo "%{svnver}" > src/build/LASTCHANGE.in
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p0
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1

diff --git a/disable_dlog_and_dcheck_in_release_builds.patch b/disable_dlog_and_dcheck_in_release_builds.patch
index 033adb9004bf6e56aa03c1cb105fd2a310f34cb3..c6d27119d0cd19fa402514b68d7a74e47b1b0813 100644 (file)
--- a/disable_dlog_and_dcheck_in_release_builds.patch
+++ b/disable_dlog_and_dcheck_in_release_builds.patch
@@ -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
+