jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

chromium: update to 48.0.2564.116.

Browse source
This commit is contained in:
Juan RP 2016-02-21 09:56:28 +01:00
parent 3a8b090b27
commit ddd57c4511
6 changed files with 70 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/chromium/files/musl-patches/musl-fixes.patch
View file

@ -94,17 +94,6 @@
// This adjusts /proc/process/oom_score_adj so the Linux OOM killer
// will prefer certain process types over others. The range for the
// adjustment is [-1000, 1000], with [0, 1000] being user accessible.
--- ./net/base/dns_reloader.cc.orig
+++ ./net/base/dns_reloader.cc
@@ -5,7 +5,7 @@
#include "net/base/dns_reloader.h"
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID)
+ !defined(OS_ANDROID) && !defined(_GNU_SOURCE)
#include <resolv.h>
--- ./net/dns/dns_config_service_posix.cc.orig
+++ ./net/dns/dns_config_service_posix.cc
@@ -116,7 +116,7 @@

12
srcpkgs/chromium/files/musl-patches/resolver.patch
View file

@ -22,15 +22,3 @@
DnsReloaderMaybeReload();
#endif
int err = getaddrinfo(host.c_str(), NULL, &hints, &ai);
--- net/base/dns_reloader.cc.orig 2015-12-04 10:26:16.536715844 +0100
+++ net/base/dns_reloader.cc 2015-12-04 10:37:09.473510098 +0100
@@ -4,8 +4,7 @@
#include "net/base/dns_reloader.h"
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID) && !defined(_GNU_SOURCE)
+#if defined(__GLIBC__)
#include <resolv.h>

11
srcpkgs/chromium/patches/chromium-use-non-versioned-icu-namespace.patch Normal file
View file

@ -0,0 +1,11 @@
--- ./components/autofill/core/common/autofill_l10n_util.cc
+++ ./components/autofill/core/common/autofill_l10n_util.cc
@@ -22,7 +22,7 @@ CaseInsensitiveCompare::CaseInsensitiveCompare(const icu::Locale& locale) {
// library. This could be due to a device-specific issue (has been seen in
// the wild on Android devices). In the failure case, |collator_| will be
// null. See http://crbug.com/558625.
- icu_54::UnicodeString name;
+ icu::UnicodeString name;
std::string locale_name;
locale.getDisplayName(name).toUTF8String(locale_name);
LOG(ERROR) << "Failed to initialize the ICU Collator for "

53
srcpkgs/chromium/patches/chromium-widevine.patch
View file

@ -1,12 +1,49 @@
diff -upr third_party/widevine/cdm/widevine_cdm_version.h.orig third_party/widevine/cdm/widevine_cdm_version.h
--- third_party/widevine/cdm/widevine_cdm_version.h.orig 2015-04-15 01:18:59.000000000 +0300
+++ third_party/widevine/cdm/widevine_cdm_version.h 2015-04-15 09:09:49.157260050 +0300
@@ -14,4 +14,8 @@
// - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
// as a string, e.g., "1.0.123.456").
--- chrome/common/chrome_content_client.cc 2016-01-20 22:01:20.000000000 +0200
+++ chrome/common/chrome_content_client.cc 2016-01-21 20:02:02.788936626 +0200
@@ -158,7 +158,12 @@ void ComputeBuiltInPlugins(std::vector<c
#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
!defined(WIDEVINE_CDM_IS_COMPONENT)
static bool skip_widevine_cdm_file_check = false;
- if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
+ bool widevine_cdm_present =
+ skip_widevine_cdm_file_check ||
+ (PathService::Get(chrome::FILE_WIDEVINE_CDM, &path) &&
+ base::PathExists(path));
+ if (widevine_cdm_present &&
+ PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
if (skip_widevine_cdm_file_check || base::PathExists(path)) {
content::PepperPluginInfo widevine_cdm;
widevine_cdm.is_out_of_process = true;
--- chrome/common/chrome_paths.cc 2016-01-20 22:01:20.000000000 +0200
+++ chrome/common/chrome_paths.cc 2016-01-21 19:18:51.287978456 +0200
@@ -375,6 +375,11 @@ bool PathProvider(int key, base::FilePat
return false;
cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
break;
+ case chrome::FILE_WIDEVINE_CDM:
+ if (!GetInternalPluginsDirectory(&cur))
+ return false;
+ cur = cur.AppendASCII(kWidevineCdmFileName);
+ break;
#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
case chrome::FILE_RESOURCES_PACK:
#if defined(OS_MACOSX) && !defined(OS_IOS)
--- chrome/common/chrome_paths.h 2016-01-14 03:49:22.000000000 +0200
+++ chrome/common/chrome_paths.h 2016-01-21 19:18:51.287978456 +0200
@@ -99,6 +99,7 @@ enum {
DIR_COMPONENT_WIDEVINE_CDM, // Directory that contains component-updated
// Widevine CDM files.
FILE_WIDEVINE_CDM_ADAPTER, // Full path to the Widevine CDM adapter file.
+ FILE_WIDEVINE_CDM, // Full path to the Widevine CDM file.
FILE_RESOURCES_PACK, // Full path to the .pak file containing
// binary data (e.g., html files and images
// used by internal pages).
--- third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-14 01:05:17.000000000 +0200
+++ third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-21 19:18:51.287978456 +0200
@@ -12,4 +12,6 @@
#define WIDEVINE_CDM_AVAILABLE
+#include "third_party/widevine/cdm/widevine_cdm_common.h"
+#define WIDEVINE_CDM_AVAILABLE
+#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
+
#endif // WIDEVINE_CDM_VERSION_H_

18
srcpkgs/chromium/patches/no-mallinfo.patch
View file

@ -9,21 +9,3 @@
size_t GetMemoryUsageKB() {
struct mallinfo minfo = mallinfo();
uint64_t mem_usage =
--- ./base/trace_event/malloc_dump_provider.cc
+++ ./base/trace_event/malloc_dump_provider.cc
@@ -30,6 +30,7 @@
// the current process.
bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
ProcessMemoryDump* pmd) {
+#if defined(__GLIBC__)
struct mallinfo info = mallinfo();
DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
@@ -47,6 +48,7 @@
MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects);
inner_dump->AddScalar(MemoryAllocatorDump::kNameSize,
MemoryAllocatorDump::kUnitsBytes, info.uordblks);
+#endif
return true;
}

26
srcpkgs/chromium/template
View file

@ -1,23 +1,19 @@
# Template file for 'chromium'
pkgname=chromium
# See http://www.chromium.org/developers/calendar for the latest version
version=47.0.2526.73
revision=2
version=48.0.2564.116
revision=1
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.chromium.org/"
license="BSD"
distfiles="https://commondatastorage.googleapis.com/${pkgname}-browser-official/${pkgname}-${version}.tar.xz"
checksum=6d66d01c8ddff6562ff13d30ed65ef0cdc2888d9e4924be615d576b7eb15f4f5
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
checksum=6a1eb9b4c853f15eeec0a55af7ac3b41835f0fc592ba6c0a500873cb12a84d0f
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
only_for_archs="i686 x86_64"
lib32disabled=yes
nodebug=yes
case "$XBPS_TARGET_MACHINE" in
i686) broken=http://build.voidlinux.eu/builders/i686_builder/builds/18981/steps/shell_3/logs/stdio
esac
hostmakedepends="yasm python pkg-config perl gperf bison ninja hwids icu-devel"
makedepends="libpng-devel gtk+-devel nss-devel pciutils-devel
libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
@ -122,11 +118,12 @@ do_configure() {
-Duse_system_icu=1
-Duse_system_libvpx=0
-Duse_cups=1
-Dlinux_link_cups=1
-Duse_pulseaudio=1
-Dlinux_link_pulseaudio=1
-Duse_mojo=0
-Duse_gconf=0"
-Duse_gconf=0
-Denable_widevine=1
-Denable_hangout_services_extension=1"
if [ "$CROSS_BUILD" ]; then
conf+=" -Denable_webrtc=0"
conf+=" -Duse_system_libwebp=0"
@ -136,6 +133,8 @@ do_configure() {
# Use explicit library dependencies instead of dlopen.
conf+="
-Dlinux_link_cups=1
-Dlinux_link_pulseaudio=1
-Dlinux_link_gsettings=1
-Dlinux_link_libpci=1
-Dlinux_link_libspeechd=1
@ -172,6 +171,9 @@ do_configure() {
conf+=" -Ddisable_nacl=1 -Ddisable_pnacl=1"
conf+=" -Duse_allocator=none -Dtarget_arch=ia32"
;;
i686)
conf+=" -Ddisable_nacl=1 -Ddisable_pnacl=1"
;;
arm*)
conf+=" -Ddisable_nacl=1 -Ddisable_pnacl=1"
conf+=" -Dtarget_arch=arm -Dv8_use_arm_eabi_hardfloat=true"