drop outdated options-support.patch

diff --git a/chromium-browser.spec b/chromium-browser.spec
index a835570a3b461154e7206bc5ca6da5e1aa09096f..05db5a6e0be9094d3d2ebc7c54ba1532195c706b 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -86,7 +86,6 @@ Patch1:               plugin-searchdirs.patch
 #Patch2:               system-nspr.patch
 Patch3:                disable_dlog_and_dcheck_in_release_builds.patch
 Patch4:                path-libpdf.patch
-Patch5:                options-support.patch
 Patch6:                get-webkit_revision.patch
 Patch7:                dlopen_sonamed_gl.patch
 Patch8:                chromium_useragent.patch.in
@@ -251,7 +250,6 @@ ln -s %{SOURCE7} src
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch15 -p1

diff --git a/options-support.patch b/options-support.patch
deleted file mode 100644 (file)
index 6f0cb29..0000000
--- a/options-support.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- chromium-browser-7.0.505.0~svn20100825r57278/src/build/common.gypi~        2010-08-25 10:57:49.000000000 +0300
-+++ chromium-browser-7.0.505.0~svn20100825r57278/src/build/common.gypi 2010-08-25 10:59:07.552987859 +0300
-@@ -249,6 +249,18 @@
-     # Set this to true to enable SELinux support.
-     'selinux%': 0,
- 
-+    # Use system libpng
-+    'use_system_libpng%': 1,
-+
-+    # Use system bzip2
-+    'use_system_bzip2%': 1,
-+
-+    # Use system libjpeg
-+    'use_system_libjpeg%': 1,
-+
-+    # Use system zlib
-+    'use_system_zlib%': 1,
-+
-     # Override whether we should use Breakpad on Linux. I.e. for Chrome bot.
-     'linux_breakpad%': 0,
-     # And if we want to dump symbols for Breakpad-enabled builds.
-@@ -215,6 +227,18 @@
-       ['selinux==1', {
-         'defines': ['CHROMIUM_SELINUX=1'],
-       }],
-+      ['use_system_libpng==1', {
-+        'defines': ['USE_SYSTEM_LIBPNG=1'],
-+      }],
-+      ['use_system_bzip2==1', {
-+        'defines': ['USE_SYSTEM_LIBBZ2=1'],
-+      }],
-+      ['use_system_libjpeg==1', {
-+        'defines': ['USE_SYSTEM_LIBJPEG=1'],
-+      }],
-+      ['use_system_zlib==1', {
-+        'defines': ['USE_SYSTEM_ZLIB=1'],
-+      }],
-       ['coverage!=0', {
-         'conditions': [
-           ['OS=="mac"', {