Djam/chromium-browser-stable-test
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable-test.git synced 2025-02-23 17:42:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

apply many openSUSE patches

Browse source
This commit is contained in:
Tigro 2013-03-25 01:01:57 +04:00
parent d7846693f6
commit 4d7ee45d5f
6 changed files with 186 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
chromium-25.0.1364.172-no-courgette.patch Normal file
View file

@ -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:*',
],

15
chromium-25.0.1364.172-sandbox-pie.patch Normal file
View file

@ -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': [
'../..',

46
chromium-25.0.1364.172-system-glew.patch Normal file
View file

@ -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'],

43
chromium-25.0.1364.172-system-libvpx.patch Normal file
View file

@ -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.

54
chromium-25.0.1364.172-system-speex.patch Normal file
View file

@ -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': [
+ '<!@(pkg-config --cflags speex)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other speex)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l speex)',
+ ],
+ },
+ }]]
+ },
+ {
'target_name': 'gnome_keyring',
'type': 'none',
'conditions': [
diff -urN chromium-25.0.1364.172.orig/content/browser/speech/audio_encoder.cc chromium-25.0.1364.172/content/browser/speech/audio_encoder.cc
--- chromium-25.0.1364.172.orig/content/browser/speech/audio_encoder.cc 2013-03-24 22:56:59.928371149 +0400
+++ chromium-25.0.1364.172/content/browser/speech/audio_encoder.cc 2013-03-24 23:32:25.911376376 +0400
@@ -11,7 +11,7 @@
#include "base/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
#include "third_party/flac/flac.h"
-#include "third_party/speex/speex.h"
+#include "speex/speex.h"
namespace content {
namespace {
diff -urN chromium-25.0.1364.172.orig/content/content_browser.gypi chromium-25.0.1364.172/content/content_browser.gypi
--- chromium-25.0.1364.172.orig/content/content_browser.gypi 2013-03-24 22:56:58.147369941 +0400
+++ chromium-25.0.1364.172/content/content_browser.gypi 2013-03-24 23:32:25.919370003 +0400
@@ -1064,7 +1064,7 @@
}, { # OS!="android"
'dependencies': [
'../third_party/flac/flac.gyp:libflac',
- '../third_party/speex/speex.gyp:libspeex',
+ '../build/linux/system.gyp:speex',
],
}],
['OS=="mac"', {

17
chromium-browser-stable.spec
View file

@ -26,6 +26,17 @@ Patch6: chromium-25-webkitTransform-exception.patch
# http://git.chromium.org/gitweb/?p=chromiumos/third_party/autotest.git;a=commitdiff;h=bd9e575ed7c1059b8566b5cbf4b493e5892e6252
Patch7: chromium-25-alsa-period-time.patch
# PATCH-FIX-OPENSUSE patches in system speex library
Patch10: chromium-25.0.1364.172-system-speex.patch
# PATCH-FIX-OPENSUSE patches in the system libvpx library
Patch11: chromium-25.0.1364.172-system-libvpx.patch
# PATCH-FIX-OPENSUSE patches in system glew library
Patch13: chromium-25.0.1364.172-system-glew.patch
# PATCH-FIX-OPENSUSE removes build part for courgette
Patch14: chromium-25.0.1364.172-no-courgette.patch
# PATCH-FIX-OPENSUSE Compile the sandbox with -fPIE settings
Patch15: chromium-25.0.1364.172-sandbox-pie.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Provides: %{crname}
@ -96,6 +107,12 @@ members of the Chromium and WebDriver teams.
%patch6 -p2 -b .webkitTransform-exception
%patch7 -p2 -b .alsa
%patch10 -p1
%patch11 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
echo "%{revision}" > build/LASTCHANGE.in
# Hard code extra version