mirror of
https://gitdl.cn/https://github.com/chakralinux/gtk.git
synced 2025-01-24 09:52:13 +08:00
chromium 28.0.1500.52, now use system icu
This commit is contained in:
AlmAck
parent
5b50bce1c8
commit
e6470eb7e0
@ -3,15 +3,15 @@
|
||||
#
|
||||
|
||||
pkgname=chromium
|
||||
pkgver=27.0.1453.93
|
||||
pkgver=28.0.1500.52
|
||||
pkgrel=1
|
||||
_verbld=${pkgver}-200836 # used for libpdf and pepper-flash
|
||||
_pepperflashver=11.7.700.202
|
||||
_verbld=${pkgver}-207119 # used for libpdf and pepper-flash
|
||||
_pepperflashver=11.7.700.203
|
||||
pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser. Include PepperFlash and libpdf plugins"
|
||||
arch=('x86_64')
|
||||
url="http://www.chromium.org/"
|
||||
license=('BSD')
|
||||
depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'libgcrypt' 'ttf-dejavu' 'dbus' 'desktop-file-utils' 'hicolor-icon-theme' 'systemd' 'speech-dispatcher' 'flac' 'opus' 'libxml2' 'libpulse' 'filesystem-extra')
|
||||
depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'libgcrypt' 'ttf-dejavu' 'dbus' 'desktop-file-utils' 'hicolor-icon-theme' 'systemd' 'speech-dispatcher' 'flac' 'opus' 'libxml2' 'libpulse' 'icu' 'filesystem-extra')
|
||||
makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' 'elfutils' 'subversion' 'ninja')
|
||||
install=chromium.install
|
||||
source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
|
||||
@ -22,20 +22,16 @@ source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgna
|
||||
chromium.default
|
||||
template_url_prepopulate_data.diff
|
||||
search_engine_type.diff
|
||||
prepopulated_engines_json.diff
|
||||
system-libpng.patch
|
||||
chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch)
|
||||
sha1sums=('0779e5dc73cee50ca2797c6ea4fc515c31bad0aa'
|
||||
'a8e6ec7fcbce370337571e8220bc82b5b14409bc'
|
||||
prepopulated_engines_json.diff)
|
||||
sha1sums=('ea2497fd447726593fc6fe55d31e4f1b3c69f3bb'
|
||||
'2fe457c3f92889d2051d7bf452214b80fced6c52'
|
||||
'cdda47faa791d56089f92854957070b1ec135c2e'
|
||||
'd02e7eaaa5de9407d8744a03a1306c117b659098'
|
||||
'fa93e2d3d4d52a1a29a1c446092a158f05751fcc'
|
||||
'3d9663f614113c137016fadb963e150f11f17402'
|
||||
'90619af5afa000b47ac03ab01b7cba8b6d16daa1'
|
||||
'f7a705d539361d63fa0e3fe0e276341c87d484fc'
|
||||
'4ac33284c534b5117741b551cc531589cfa08d75'
|
||||
'bfb59a53456272c901b8e4eb872069ff99a2cbeb'
|
||||
'73fc081513282ae94fe7a050f3636f8d3056b49e')
|
||||
'4ac33284c534b5117741b551cc531589cfa08d75')
|
||||
|
||||
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
|
||||
# Note: These are for Chakra Linux use ONLY. For your own distribution, please
|
||||
@ -48,8 +44,6 @@ _google_default_client_secret=TPvjII_2SwZn_9Ic0kRKqjtG
|
||||
build() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
|
||||
#patch -p1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch"
|
||||
|
||||
# Set DDG as default search
|
||||
patch -p1 -i "$srcdir/template_url_prepopulate_data.diff"
|
||||
patch -p1 -i "$srcdir/search_engine_type.diff"
|
||||
@ -69,11 +63,13 @@ build() {
|
||||
-Dlinux_use_gold_flags=0 \
|
||||
-Dlinux_link_pulseaudio=1 \
|
||||
-Drelease_extra_cflags="$CFLAGS" \
|
||||
-Dlibspeechd_h_prefix=speech-dispatcher/ \
|
||||
-Dffmpeg_branding=Chrome \
|
||||
-Dproprietary_codecs=1 \
|
||||
-Duse_system_bzip2=1 \
|
||||
-Duse_system_flac=1 \
|
||||
-Duse_system_ffmpeg=0 \
|
||||
-Duse_system_icu=1 \
|
||||
-Duse_system_libevent=1 \
|
||||
-Duse_system_libjpeg=1 \
|
||||
-Duse_system_libpng=1 \
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
|
||||
--- chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300
|
||||
+++ chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300
|
||||
@@ -243,14 +243,13 @@ struct kernel_rusage {
|
||||
long ru_nivcsw;
|
||||
};
|
||||
|
||||
-struct siginfo;
|
||||
#if defined(__i386__) || defined(__arm__) || defined(__PPC__)
|
||||
|
||||
/* include/asm-{arm,i386,mips,ppc}/signal.h */
|
||||
struct kernel_old_sigaction {
|
||||
union {
|
||||
void (*sa_handler_)(int);
|
||||
- void (*sa_sigaction_)(int, struct siginfo *, void *);
|
||||
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
|
||||
};
|
||||
unsigned long sa_mask;
|
||||
unsigned long sa_flags;
|
||||
@@ -287,13 +286,13 @@ struct kernel_sigaction {
|
||||
unsigned long sa_flags;
|
||||
union {
|
||||
void (*sa_handler_)(int);
|
||||
- void (*sa_sigaction_)(int, struct siginfo *, void *);
|
||||
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
|
||||
};
|
||||
struct kernel_sigset_t sa_mask;
|
||||
#else
|
||||
union {
|
||||
void (*sa_handler_)(int);
|
||||
- void (*sa_sigaction_)(int, struct siginfo *, void *);
|
||||
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
|
||||
};
|
||||
unsigned long sa_flags;
|
||||
void (*sa_restorer)(void);
|
||||
@ -1,11 +0,0 @@
|
||||
--- chromium-browser-26.0.1410.19/src/build/linux/system.gyp~ 2013-03-04 00:04:06.000000000 +0200
|
||||
+++ chromium-browser-26.0.1410.19/src/build/linux/system.gyp 2013-03-04 13:45:31.822101677 +0200
|
||||
@@ -494,7 +494,7 @@
|
||||
'--name', 'LibSpeechdLoader',
|
||||
'--output-h', '<(output_h)',
|
||||
'--output-cc', '<(output_cc)',
|
||||
- '--header', '<libspeechd.h>',
|
||||
+ '--header', '<speech-dispatcher/libspeechd.h>',
|
||||
'--link-directly=<(linux_link_libspeechd)',
|
||||
'spd_open',
|
||||
'spd_say',
|
||||
@ -1,11 +0,0 @@
|
||||
--- build/shim_headers.gypi.orig 2012-12-20 02:51:12.000000000 +0100
|
||||
+++ build/shim_headers.gypi 2012-12-20 02:51:40.000000000 +0100
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
{
|
||||
'variables': {
|
||||
- 'shim_headers_path': '<(INTERMEDIATE_DIR)/shim_headers',
|
||||
+ 'shim_headers_path': '<(SHARED_INTERMEDIATE_DIR)/shim_headers/<(_target_name)',
|
||||
},
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs+': [
|
||||
Loading…
Reference in New Issue
Block a user