JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chromium: Update all channels to latest versions.

Browse Source 
This brings in Chromium 27 as the new stable version.

Specific versions of the updated channels:

stable: 26.0.1410.63 -> 27.0.1453.93 (builds fine, tested)
beta:   27.0.1453.81 -> 28.0.1500.20 (builds fine, tested)
dev:    28.0.1500.11 -> 29.0.1516.3  (builds fine, tested)

We now can finally drop the following patches:

 * glibc-2.16-use-siginfo_t.patch
 * pulseaudio_array_bounds.patch

These were for version 26 only and thus are no longer needed.

In addition, we no longer have to use the pre/post attributes, as there is just
_one_ place that uses version specific stuff (path to webcore.gyp).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2013-05-27 05:00:06 +02:00
parent e7a57971c1
commit f966e5268f
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
4 changed files with 14 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -12,12 +12,9 @@
, utillinux, alsaLib
, gcc, bison, gperf
, glib, gtk, dbus_glib
, libXScrnSaver, libXcursor, mesa
, libXScrnSaver, libXcursor, libXtst, mesa
, protobuf, speechd, libXdamage
# dependencies for >= v27
, libXtst
# optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport
@ -81,11 +78,6 @@ let
libusb1 libexif
];
pre27 = versionOlder sourceInfo.version "27.0.0.0";
pre28 = versionOlder sourceInfo.version "28.0.0.0";
post26 = !pre27;
post27 = !pre28;
# build paths and release info
packageName = "chromium";
buildType = "Release";
@ -112,23 +104,20 @@ in stdenv.mkDerivation rec {
gcc bison gperf
krb5
glib gtk dbus_glib
libXScrnSaver libXcursor mesa
libXScrnSaver libXcursor libXtst mesa
pciutils protobuf speechd libXdamage
] ++ optional gnomeKeyringSupport libgnome_keyring
++ optionals gnomeSupport [ gconf libgcrypt ]
++ optional enableSELinux libselinux
++ optional cupsSupport libgcrypt
++ optional pulseSupport pulseaudio
++ optional post26 libXtst;
++ optional pulseSupport pulseaudio;
opensslPatches = optional useOpenSSL openssl.patches;
prePatch = "patchShebangs .";
patches = [ ./sandbox_userns.patch ]
++ optional cupsSupport ./cups_allow_deprecated.patch
++ optional (pulseSupport && pre27) ./pulseaudio_array_bounds.patch
++ optional pre27 ./glibc-2.16-use-siginfo_t.patch;
++ optional cupsSupport ./cups_allow_deprecated.patch;
postPatch = ''
sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
@ -136,7 +125,7 @@ in stdenv.mkDerivation rec {
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
'' + ''
sed -i -e 's|/usr/bin/gcc|gcc|' \
third_party/WebKit/Source/${if post27
third_party/WebKit/Source/${if !versionOlder sourceInfo.version "28.0.0.0"
then "core/core.gypi"
else "WebCore/WebCore.gyp/WebCore.gyp"}
'';

27
pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch
View File

@ -1,27 +0,0 @@
--- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h.orig 2012-12-22 16:01:44.000000000 +0200
+++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-12-23 21:53:26.746069153 +0200
@@ -250,7 +250,7 @@
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 +287,13 @@
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);

12
pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch
View File

@ -1,12 +0,0 @@
diff --git a/media/media.gyp b/media/media.gyp
index 2a8c6c6..66ca767 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -399,6 +399,7 @@
['use_pulseaudio == 1', {
'cflags': [
'<!@(pkg-config --cflags libpulse)',
+ '-Wno-array-bounds',
],
'link_settings': {
'libraries': [

18
pkgs/applications/networking/browsers/chromium/sources.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "28.0.1500.11";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.11.tar.xz";
sha256 = "1gnm803y7da7n4c3awh77vmsb0f4d8czs9svgqvvwk9bb7d1kc65";
version = "29.0.1516.3";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1516.3.tar.xz";
sha256 = "0pdn9c6v0v55d7g4amivxrv132bpj9sfqywk5b8l6kqfjq28mw5k";
};
beta = {
version = "27.0.1453.81";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.81.tar.xz";
sha256 = "1g4gsrcdrp06hqr25fd9l4snjhibp5pi7pc3wv11fp8gd04cpv9w";
version = "28.0.1500.20";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.20.tar.xz";
sha256 = "1q4qsgixh9q5akjnk614k942kxshi81v4xvm40f7rxzns88qbfrz";
};
stable = {
version = "26.0.1410.63";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.63.tar.xz";
sha256 = "0gsb0dgk7p04997wlw7swxnnpf5ix9drn0wn07pgsalr8l3zgy3s";
version = "27.0.1453.93";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.93.tar.xz";
sha256 = "0h5d4v7003y3h6rg48dn6cswp6zzj9zdcci3cl9cbb3j9ldc1n3d";
};
}