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

update to 26.0.1410.46

Browse source
This commit is contained in:
Tigro 2013-04-07 00:46:31 +04:00
parent e5acc3f688
commit fe5309e8de
4 changed files with 8 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.abf.yml
View file

@ -3,3 +3,4 @@ sources:
"chromium-24.0.1312.56.tar.xz": b2980655cfd3fd4594da758036d7b46868d82418
"chromium-25.0.1364.160.tar.xz": 45d1e3f2693d8f1f4b05b8310b2ab42fd3d95d0f
chromium-25.0.1364.172.tar.xz: 5f0919f5bc7deda3fdb0f64b3469e28e7f309258
chromium-26.0.1410.46.tar.xz: 973753825d41b8e1e7e7eed6749099bb7be400bc

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

@ -1,43 +0,0 @@
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
View file

@ -1,54 +0,0 @@
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

@ -1,11 +1,11 @@
%define revision 187219
%define revision 190148
%define crname chromium-browser
%define _crdir %{_libdir}/%{crname}
%define _src %{_topdir}/SOURCES
Name: chromium-browser-stable
Version: 25.0.1364.172
Release: 3
Version: 26.0.1410.46
Release: 1
Summary: A fast webkit-based web browser
Group: Networking/WWW
License: BSD, LGPL
@ -17,17 +17,13 @@ Source31: default_bookmarks.html
Source2: chromium-browser.desktop
Source100: icons.tar.bz2
Patch0: chromium-21.0.1171.0-remove-inline.patch
Patch4: chromium-20.0.1132.47-master-prefs-path.patch
Patch4: chromium-26.0.1410.46-master-prefs-path.patch
Patch5: chromium-browser-big-icon.patch
# (cjw) fix "Uncaught exception" in 2 calls to webkitTransform (hack, need to test if this is still needed)
# http://code.google.com/p/chromium/issues/detail?id=152407
Patch6: chromium-25-webkitTransform-exception.patch
# (cjw) fix "Unable to set period time" alsa error, taken from chromiumOS
# 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
@ -104,8 +100,6 @@ members of the Chromium and WebDriver teams.
%patch5 -p1 -b .big-icon
%patch6 -p2 -b .webkitTransform-exception
%patch10 -p1
%patch11 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
@ -270,6 +264,9 @@ rm -rf %{buildroot}
%changelog
* Sun Apr 7 2013 Arkady L. Shane <arkady.shane@rosalab.ru> 26.0.1410.46-1
- update to 26.0.1410.46
* Mon Mar 25 2013 Arkady L. Shane <arkady.shane@rosalab.ru> 25.0.1364.172-3
- apply many openSUSE patches and fix webm/html5 playing (in youtube)
- build with system libbz2