diff --git a/chromium-25.0.1364.172-no-courgette.patch b/chromium-25.0.1364.172-no-courgette.patch new file mode 100644 index 0000000..657a424 --- /dev/null +++ b/chromium-25.0.1364.172-no-courgette.patch @@ -0,0 +1,11 @@ +diff -urN chromium-25.0.1364.172.orig/build/all.gyp chromium-25.0.1364.172/build/all.gyp +--- chromium-25.0.1364.172.orig/build/all.gyp 2013-03-25 00:02:19.000000000 +0400 ++++ chromium-25.0.1364.172/build/all.gyp 2013-03-25 00:04:49.007497074 +0400 +@@ -88,7 +88,6 @@ + }], + ['OS=="linux"', { + 'dependencies': [ +- '../courgette/courgette.gyp:*', + '../dbus/dbus.gyp:*', + '../sandbox/sandbox.gyp:*', + ], diff --git a/chromium-25.0.1364.172-sandbox-pie.patch b/chromium-25.0.1364.172-sandbox-pie.patch new file mode 100644 index 0000000..25c7578 --- /dev/null +++ b/chromium-25.0.1364.172-sandbox-pie.patch @@ -0,0 +1,15 @@ +diff -urN chromium-25.0.1364.172.orig/sandbox/linux/sandbox_linux.gypi chromium-25.0.1364.172/sandbox/linux/sandbox_linux.gypi +--- chromium-25.0.1364.172.orig/sandbox/linux/sandbox_linux.gypi 2013-03-24 23:58:19.000000000 +0400 ++++ chromium-25.0.1364.172/sandbox/linux/sandbox_linux.gypi 2013-03-25 00:05:45.874570662 +0400 +@@ -109,7 +109,10 @@ + ], + 'cflags': [ + # For ULLONG_MAX +- '-std=gnu99', ++ '-std=gnu99 -fPIE', ++ ], ++ 'ldflags': [ ++ '-pie', + ], + 'include_dirs': [ + '../..', diff --git a/chromium-25.0.1364.172-system-glew.patch b/chromium-25.0.1364.172-system-glew.patch new file mode 100644 index 0000000..9e8851d --- /dev/null +++ b/chromium-25.0.1364.172-system-glew.patch @@ -0,0 +1,46 @@ +diff -urN chromium-25.0.1364.172.orig/build/linux/system.gyp chromium-25.0.1364.172/build/linux/system.gyp +--- chromium-25.0.1364.172.orig/build/linux/system.gyp 2013-03-25 00:02:19.000000000 +0400 ++++ chromium-25.0.1364.172/build/linux/system.gyp 2013-03-25 00:03:46.757371517 +0400 +@@ -383,6 +383,42 @@ + ], + }, + { ++ 'target_name': 'icu', ++ 'type': 'none', ++ 'conditions': [ ++ ['_toolset=="target"', { ++ 'direct_dependent_settings': { ++ 'cflags': [ ++ '-Wno-unused-function', ++ # TODO(port): fix ICU to not depend on this flag. ++ '-fno-strict-aliasing', ++ ], ++ }, ++ 'link_settings': { ++ 'ldflags': [ ++ '', ++ ], ++ 'libraries': [ ++ '-licui18n', ++ ], ++ }, ++ }]] ++ }, ++ { ++ 'target_name': 'glew', ++ 'type': 'none', ++ 'conditions': [ ++ ['_toolset=="target"', { ++ 'link_settings': { ++ 'libraries': [ ++ '-lGLEW', ++ '-lGL', ++ '-lX11', ++ ], ++ }, ++ }]] ++ }, ++ { + 'target_name': 'x11', + 'type': 'none', + 'toolsets': ['host', 'target'], diff --git a/chromium-25.0.1364.172-system-libvpx.patch b/chromium-25.0.1364.172-system-libvpx.patch new file mode 100644 index 0000000..838d0b0 --- /dev/null +++ b/chromium-25.0.1364.172-system-libvpx.patch @@ -0,0 +1,43 @@ +diff -urN chromium-25.0.1364.172.orig/build/linux/system.gyp chromium-25.0.1364.172/build/linux/system.gyp +--- chromium-25.0.1364.172.orig/build/linux/system.gyp 2013-03-24 23:58:51.000000000 +0400 ++++ chromium-25.0.1364.172/build/linux/system.gyp 2013-03-25 00:01:06.699630371 +0400 +@@ -512,6 +512,26 @@ + }]] + }, + { ++ 'target_name': 'vpx', ++ 'type': 'none', ++ 'conditions': [ ++ ['_toolset=="target"', { ++ 'direct_dependent_settings': { ++ 'cflags': [ ++ '-I/usr/include/vpx', ++ ], ++ }, ++ 'link_settings': { ++ 'ldflags': [ ++ '', ++ ], ++ 'libraries': [ ++ '-lvpx', ++ ], ++ }, ++ }]] ++ }, ++ { + 'target_name': 'gnome_keyring', + 'type': 'none', + 'conditions': [ +diff -urN chromium-25.0.1364.172.orig/third_party/ffmpeg/ffmpeg.gyp chromium-25.0.1364.172/third_party/ffmpeg/ffmpeg.gyp +--- chromium-25.0.1364.172.orig/third_party/ffmpeg/ffmpeg.gyp 2013-03-24 23:58:07.000000000 +0400 ++++ chromium-25.0.1364.172/third_party/ffmpeg/ffmpeg.gyp 2013-03-25 00:01:06.709413295 +0400 +@@ -488,6 +488,9 @@ + # Required for the logging done in the stubs generator. + '../../base/base.gyp:base', + ], ++ 'dependencies': [ ++ '../../build/linux/system.gyp:vpx', ++ ], + 'direct_dependent_settings': { + 'defines': [ + '__STDC_CONSTANT_MACROS', # FFmpeg uses INT64_C. diff --git a/chromium-25.0.1364.172-system-speex.patch b/chromium-25.0.1364.172-system-speex.patch new file mode 100644 index 0000000..bfc31f1 --- /dev/null +++ b/chromium-25.0.1364.172-system-speex.patch @@ -0,0 +1,54 @@ +diff -urN chromium-25.0.1364.172.orig/build/linux/system.gyp chromium-25.0.1364.172/build/linux/system.gyp +--- chromium-25.0.1364.172.orig/build/linux/system.gyp 2013-03-24 22:56:57.452586326 +0400 ++++ chromium-25.0.1364.172/build/linux/system.gyp 2013-03-24 23:32:25.910385479 +0400 +@@ -492,6 +492,26 @@ + ], + }, + { ++ 'target_name': 'speex', ++ 'type': 'none', ++ 'conditions': [ ++ ['_toolset=="target"', { ++ 'direct_dependent_settings': { ++ 'cflags': [ ++ ' build/LASTCHANGE.in # Hard code extra version