Ertuğrul Erata
@@ -60,7 +60,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="24">
|
||||
<Date>2016-01-13</Date>
|
||||
<Date>2016-01-31</Date>
|
||||
<Version>15.12.1</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Yusuf Aydemir</Name>
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="19">
|
||||
<Date>2016-01-31</Date>
|
||||
<Date>2016-02-02</Date>
|
||||
<Version>48.0.2564.97</Version>
|
||||
<Comment>This version contains a number of security updates and stability fixes.</Comment>
|
||||
<Name>Vedat Demir</Name>
|
||||
|
||||
@@ -1,119 +0,0 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||
|
||||
from pisi.actionsapi import get
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
|
||||
def setup():
|
||||
|
||||
shelltools.export("LC_ALL", "C")
|
||||
shelltools.system("sed -i 's|icu)|icu-i18n)|g' build/linux/system.gyp")
|
||||
shelltools.system("export -n CFLAGS CXXFLAGS")
|
||||
shelltools.touch(get.workDIR() + "/chromium-48.0.2564.97/chrome/test/data/webui/i18n_process_css_test.html")
|
||||
|
||||
options = "\
|
||||
-Duse_system_expat=1 \
|
||||
-Duse_system_flac=1 \
|
||||
-Duse_system_harfbuzz=1 \
|
||||
-Duse_system_icu=0 \
|
||||
-Duse_system_jsoncpp=1 \
|
||||
-Duse_system_libevent=1 \
|
||||
-Duse_system_libjpeg=1 \
|
||||
-Duse_system_libpng=1 \
|
||||
-Duse_system_libvpx=0 \
|
||||
-Duse_system_libwebp=1 \
|
||||
-Duse_system_opus=1 \
|
||||
-Duse_system_snappy=1 \
|
||||
-Duse_system_speex=1 \
|
||||
-Duse_system_zlib=1 \
|
||||
-Duse_system_bzip2=1 \
|
||||
-Dicu_use_data_file_flag=0 \
|
||||
-Duse_gconf=0 \
|
||||
-Dclang=0 \
|
||||
-Dlinux_use_bundled_gold=0 \
|
||||
-Dlinux_use_bundled_binutils=0 \
|
||||
-Dlinux_use_gold_flags=0 \
|
||||
-Dhost_clang=0 \
|
||||
-Dclang_use_chrome_plugins=0 \
|
||||
-Dlinux_link_gsettings=1 \
|
||||
-Dlinux_link_kerberos=1 \
|
||||
-Dlinux_link_libbrlapi=1 \
|
||||
-Dlinux_link_libgps=1 \
|
||||
-Dlinux_link_libpci=1 \
|
||||
-Dlinux_link_libspeechd=1 \
|
||||
-Dlinux_link_pulseaudio=1 \
|
||||
-Dlibspeechd_h_prefix=speech-dispatcher/ \
|
||||
-Dwerror= \
|
||||
-Ddisable_fatal_linker_warnings=1 \
|
||||
-Ddisable_nacl=1 \
|
||||
-Ddisable_newlib_untar=1 \
|
||||
-Ddisable_pnacl=1 \
|
||||
-Ddisable_sse2=1 \
|
||||
-Ddisable_glibc=1 \
|
||||
-Dtarget_arch=x64 \
|
||||
-Dffmpeg_branding=Chromium \
|
||||
-Dproprietary_codecs=1 \
|
||||
-Dpython_arch=x64 \
|
||||
-Dlogging_like_official_build=1 \
|
||||
-Dlinux_sandbox_chrome_path=/usr/lib/chromium-browser/chromium-browser \
|
||||
-Dlinux_sandbox_path=/usr/lib/chromium-browser/chromium-sandbox \
|
||||
-Dgoogle_api_key=AIzaSyBINKL31ZYd8W5byPuwTXYK6cEyoceGh6Y \
|
||||
-Dgoogle_default_client_id=879512332529.apps.googleusercontent.com \
|
||||
-Dgoogle_default_client_secret=RmQPJJeL1cNJ8iETnoVD4X17 "
|
||||
|
||||
shelltools.system("build/linux/unbundle/replace_gyp_files.py %s" % options)
|
||||
|
||||
shelltools.export("GYP_GENERATORS","ninja")
|
||||
shelltools.system("build/gyp_chromium build/all.gyp --depth=. %s" % options)
|
||||
|
||||
|
||||
def build():
|
||||
|
||||
shelltools.system("ninja -C out/Release chrome")
|
||||
shelltools.system("ninja -C out/Release chrome_sandbox")
|
||||
shelltools.system("ninja -C out/Release chromedriver")
|
||||
|
||||
def install():
|
||||
|
||||
shelltools.cd("out/Release")
|
||||
|
||||
shelltools.makedirs("%s/usr/lib/chromium-browser" % get.installDIR())
|
||||
|
||||
binaries_for_inst=["chrome", "chrome_sandbox", "chromedriver", "natives_blob.bin", "snapshot_blob.bin"]
|
||||
#libraries_for_inst=["libffmpegsumo.so", "icudtl.dat"]
|
||||
|
||||
|
||||
# install and strip binaries
|
||||
for mybin in binaries_for_inst:
|
||||
pisitools.insinto("/usr/lib/chromium-browser", mybin)
|
||||
|
||||
# install and strip shared libs
|
||||
# for mylib in libraries_for_inst:
|
||||
# pisitools.insinto("/usr/lib/chromium-browser", mylib)
|
||||
|
||||
pisitools.dosym("/usr/lib/chromium-browser/chrome", "/usr/lib/chromium-browser/chromium-browser")
|
||||
pisitools.rename("/usr/lib/chromium-browser/chrome_sandbox", "chrome-sandbox")
|
||||
shelltools.chmod("%s/usr/lib/chromium-browser/chrome-sandbox" % get.installDIR(), 04755)
|
||||
|
||||
# install rest of needed files
|
||||
pisitools.insinto("/usr/lib/chromium-browser", "*.pak")
|
||||
pisitools.insinto("/usr/lib/chromium-browser", "locales")
|
||||
pisitools.insinto("/usr/lib/chromium-browser", "resources")
|
||||
|
||||
pisitools.newman("chrome.1", "chromium-browser.1")
|
||||
|
||||
shelltools.cd("../..")
|
||||
for size in ["22", "24", "48", "64", "128", "256"]:
|
||||
pisitools.insinto("/usr/share/icons/hicolor/%sx%s/apps" %(size, size), "chrome/app/theme/chromium/product_logo_%s.png" % size, "chromium-browser.png")
|
||||
|
||||
pisitools.dosym("/usr/share/icons/hicolor/256x256/apps/chromium-browser.png", "/usr/share/pixmaps/chromium-browser.png")
|
||||
|
||||
pisitools.dodoc("LICENSE")
|
||||
|
||||
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
diff --git a/Source/platform/fonts/shaping/HarfBuzzShaper.cpp b/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
|
||||
index 87441d9..a90b925 100644
|
||||
--- third_party/WebKit//Source/platform/fonts/shaping/HarfBuzzShaper.cpp
|
||||
+++ third_party/WebKit//Source/platform/fonts/shaping/HarfBuzzShaper.cpp
|
||||
@@ -702,7 +702,7 @@ static inline void resolveRunBasedOnScriptValue(Vector<CandidateRun>& runs,
|
||||
|
||||
static inline bool resolveCandidateRuns(Vector<CandidateRun>& runs)
|
||||
{
|
||||
- UScriptCode scriptExtensions[8];
|
||||
+ UScriptCode scriptExtensions[USCRIPT_CODE_LIMIT];
|
||||
UErrorCode errorCode = U_ZERO_ERROR;
|
||||
size_t length = runs.size();
|
||||
size_t nextResolvedRun = 0;
|
||||
@@ -714,7 +714,8 @@ static inline bool resolveCandidateRuns(Vector<CandidateRun>& runs)
|
||||
run.script = i > 0 ? runs[i - 1].script : USCRIPT_COMMON;
|
||||
|
||||
int extensionsLength = uscript_getScriptExtensions(run.character,
|
||||
- scriptExtensions, sizeof(scriptExtensions), &errorCode);
|
||||
+ scriptExtensions, sizeof(scriptExtensions) / sizeof(scriptExtensions[0]),
|
||||
+ &errorCode);
|
||||
if (U_FAILURE(errorCode))
|
||||
return false;
|
||||
|
||||
|
||||
@@ -1,113 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Encoding=UTF-8
|
||||
Name=Chromium Browser
|
||||
GenericName=Web Browser
|
||||
GenericName[ar]=متصفح الشبكة
|
||||
GenericName[bg]=Уеб браузър
|
||||
GenericName[ca]=Navegador web
|
||||
GenericName[cs]=WWW prohlížeč
|
||||
GenericName[da]=Browser
|
||||
GenericName[de]=Web-Browser
|
||||
GenericName[el]=Περιηγητής ιστού
|
||||
GenericName[en_GB]=Web Browser
|
||||
GenericName[es]=Navegador web
|
||||
GenericName[et]=Veebibrauser
|
||||
GenericName[fi]=WWW-selain
|
||||
GenericName[fr]=Navigateur Web
|
||||
GenericName[gu]=વેબ બ્રાઉઝર
|
||||
GenericName[he]=דפדפן אינטרנט
|
||||
GenericName[hi]=वेब ब्राउज़र
|
||||
GenericName[hu]=Webböngésző
|
||||
GenericName[it]=Browser Web
|
||||
GenericName[ja]=ウェブブラウザ
|
||||
GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
|
||||
GenericName[ko]=웹 브라우저
|
||||
GenericName[lt]=Žiniatinklio naršyklė
|
||||
GenericName[lv]=Tīmekļa pārlūks
|
||||
GenericName[ml]=വെബ് ബ്രൌസര്
|
||||
GenericName[mr]=वेब ब्राऊजर
|
||||
GenericName[nb]=Nettleser
|
||||
GenericName[nl]=Webbrowser
|
||||
GenericName[pl]=Przeglądarka WWW
|
||||
GenericName[pt]=Navegador Web
|
||||
GenericName[pt_BR]=Navegador da Internet
|
||||
GenericName[ro]=Navigator de Internet
|
||||
GenericName[ru]=Веб-браузер
|
||||
GenericName[sl]=Spletni brskalnik
|
||||
GenericName[sv]=Webbläsare
|
||||
GenericName[ta]=இணைய உலாவி
|
||||
GenericName[th]=เว็บเบราว์เซอร์
|
||||
GenericName[tr]=Web Tarayıcı
|
||||
GenericName[uk]=Навігатор Тенет
|
||||
GenericName[zh_CN]=网页浏览器
|
||||
GenericName[zh_HK]=網頁瀏覽器
|
||||
GenericName[zh_TW]=網頁瀏覽器
|
||||
GenericName[bn]=ওয়েব ব্রাউজার
|
||||
GenericName[fil]=Web Browser
|
||||
GenericName[hr]=Web preglednik
|
||||
GenericName[id]=Browser Web
|
||||
GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
|
||||
GenericName[sk]=WWW prehliadač
|
||||
GenericName[sr]=Интернет прегледник
|
||||
GenericName[te]=మహాతల అన్వేషి
|
||||
GenericName[vi]=Bộ duyệt Web
|
||||
Comment=Access the Internet
|
||||
Comment[ar]=الدخول إلى الإنترنت
|
||||
Comment[bg]=Достъп до интернет
|
||||
Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
|
||||
Comment[ca]=Accedeix a Internet
|
||||
Comment[cs]=Přístup k internetu
|
||||
Comment[da]=Få adgang til internettet
|
||||
Comment[de]=Internetzugriff
|
||||
Comment[el]=Πρόσβαση στο Διαδίκτυο
|
||||
Comment[en_GB]=Access the Internet
|
||||
Comment[es]=Accede a Internet.
|
||||
Comment[et]=Pääs Internetti
|
||||
Comment[fi]=Käytä internetiä
|
||||
Comment[fil]=I-access ang Internet
|
||||
Comment[fr]=Accéder à Internet
|
||||
Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
|
||||
Comment[he]=גישה אל האינטרנט
|
||||
Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
|
||||
Comment[hr]=Pristup Internetu
|
||||
Comment[hu]=Internetelérés
|
||||
Comment[id]=Akses Internet
|
||||
Comment[it]=Accesso a Internet
|
||||
Comment[ja]=インターネットにアクセス
|
||||
Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
|
||||
Comment[ko]=인터넷 연결
|
||||
Comment[lt]=Interneto prieiga
|
||||
Comment[lv]=Piekļūt internetam
|
||||
Comment[ml]=ഇന്റര്നെറ്റ് ആക്സസ് ചെയ്യുക
|
||||
Comment[mr]=इंटरनेटमध्ये प्रवेश करा
|
||||
Comment[nb]=Gå til Internett
|
||||
Comment[nl]=Verbinding maken met internet
|
||||
Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
|
||||
Comment[pl]=Skorzystaj z internetu
|
||||
Comment[pt]=Aceder à Internet
|
||||
Comment[pt_BR]=Acessar a internet
|
||||
Comment[ro]=Accesaţi Internetul
|
||||
Comment[ru]=Доступ в Интернет
|
||||
Comment[sk]=Prístup do siete Internet
|
||||
Comment[sl]=Dostop do interneta
|
||||
Comment[sr]=Приступите Интернету
|
||||
Comment[sv]=Gå ut på Internet
|
||||
Comment[ta]=இணையத்தை அணுகுதல்
|
||||
Comment[te]=ఇంటర్నెట్ను ఆక్సెస్ చెయ్యండి
|
||||
Comment[th]=เข้าถึงอินเทอร์เน็ต
|
||||
Comment[tr]=İnternet'e erişin
|
||||
Comment[uk]=Доступ до Інтернету
|
||||
Comment[vi]=Truy cập Internet
|
||||
Comment[zh_CN]=访问互联网
|
||||
Comment[zh_HK]=連線到網際網路
|
||||
Comment[zh_TW]=連線到網際網路
|
||||
Exec=chromium-browser %U --ppapi-flash-path=/usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so --ppapi-flash-version=18.0.0.233
|
||||
Terminal=false
|
||||
Icon=chromium-browser
|
||||
Type=Application
|
||||
Categories=Application;Network;
|
||||
MimeType=text/html;text/xml;application/xhtml_xml;
|
||||
StartupWMClass=Chromium
|
||||
StartupNotify=true
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/bin/sh
|
||||
export CHROME_WRAPPER=/usr/lib/chromium-browser/chromium-browser
|
||||
export CHROME_DESKTOP=chromium-browser.desktop
|
||||
exec /usr/lib/chromium-browser/chromium-browser "$@"
|
||||
@@ -1,11 +0,0 @@
|
||||
diff -up chromium-46.0.2490.80/chrome/test/data/webui_test_resources.grd.542819fix chromium-46.0.2490.80/chrome/test/data/webui_test_resources.grd
|
||||
--- chromium-46.0.2490.80/chrome/test/data/webui_test_resources.grd.542819fix 2015-10-14 10:47:17.568757249 -0400
|
||||
+++ chromium-46.0.2490.80/chrome/test/data/webui_test_resources.grd 2015-10-14 10:48:01.196466805 -0400
|
||||
@@ -8,7 +8,6 @@
|
||||
</outputs>
|
||||
<release seq="1">
|
||||
<includes>
|
||||
- <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST" file="webui/i18n_process_css_test.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
|
||||
</includes>
|
||||
</release>
|
||||
</grit>
|
||||
@@ -1,71 +0,0 @@
|
||||
Index: printing/backend/print_backend.h
|
||||
diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
|
||||
index e03ef42e37cf0785ba735f4a241310f70125a6e7..a8123325a613f527ba4e91a412ba09cd3225c8ec 100644
|
||||
--- a/printing/backend/print_backend.h
|
||||
+++ b/printing/backend/print_backend.h
|
||||
@@ -111,7 +111,6 @@ class PRINTING_EXPORT PrintBackend
|
||||
|
||||
// Allocate a print backend. If |print_backend_settings| is NULL, default
|
||||
// settings will be used.
|
||||
- // Return NULL if no print backend available.
|
||||
static scoped_refptr<PrintBackend> CreateInstance(
|
||||
const base::DictionaryValue* print_backend_settings);
|
||||
|
||||
Index: printing/backend/print_backend_dummy.cc
|
||||
diff --git a/printing/backend/print_backend_dummy.cc b/printing/backend/print_backend_dummy.cc
|
||||
index c73e5370720eda7a2f989401f37dc62c5e438e24..db269a75920d3c44381c87d67b91d923f0bfd8dc 100644
|
||||
--- a/printing/backend/print_backend_dummy.cc
|
||||
+++ b/printing/backend/print_backend_dummy.cc
|
||||
@@ -13,10 +13,49 @@
|
||||
|
||||
namespace printing {
|
||||
|
||||
+class DummyPrintBackend : public PrintBackend {
|
||||
+ public:
|
||||
+ DummyPrintBackend() {
|
||||
+ }
|
||||
+
|
||||
+ bool EnumeratePrinters(PrinterList* printer_list) override {
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ std::string GetDefaultPrinterName() override {
|
||||
+ return std::string();
|
||||
+ }
|
||||
+
|
||||
+ bool GetPrinterSemanticCapsAndDefaults(
|
||||
+ const std::string& printer_name,
|
||||
+ PrinterSemanticCapsAndDefaults* printer_info) override {
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ bool GetPrinterCapsAndDefaults(
|
||||
+ const std::string& printer_name,
|
||||
+ PrinterCapsAndDefaults* printer_info) override {
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ std::string GetPrinterDriverInfo(
|
||||
+ const std::string& printer_name) override {
|
||||
+ return std::string();
|
||||
+ }
|
||||
+
|
||||
+ bool IsValidPrinter(const std::string& printer_name) override {
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ private:
|
||||
+ ~DummyPrintBackend() {}
|
||||
+
|
||||
+ DISALLOW_COPY_AND_ASSIGN(DummyPrintBackend);
|
||||
+};
|
||||
+
|
||||
scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
|
||||
const base::DictionaryValue* print_backend_settings) {
|
||||
- NOTREACHED();
|
||||
- return NULL;
|
||||
+ return new DummyPrintBackend();
|
||||
}
|
||||
|
||||
} // namespace printing
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
--- mojo/public/c/system/macros.h.orig 2014-09-03 14:48:42.963665035 +0000
|
||||
+++ mojo/public/c/system/macros.h 2014-09-03 14:49:12.180255593 +0000
|
||||
@@ -76,7 +76,8 @@
|
||||
// Unlike the C++11 |alignas()|, |alignment| must be an integer. It may not be a
|
||||
// type, nor can it be an expression like |MOJO_ALIGNOF(type)| (due to the
|
||||
// non-C++11 MSVS version).
|
||||
-#if __cplusplus >= 201103L
|
||||
+#if __cplusplus >= 201103L && \
|
||||
+ (defined(__clang__) || (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 >= 40800))
|
||||
#define MOJO_ALIGNAS(alignment) alignas(alignment)
|
||||
#elif defined(__GNUC__)
|
||||
#define MOJO_ALIGNAS(alignment) __attribute__((aligned(alignment)))
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
Index: ui/accessibility/platform/atk_util_auralinux.cc
|
||||
diff --git a/ui/accessibility/platform/atk_util_auralinux.cc b/ui/accessibility/platform/atk_util_auralinux.cc
|
||||
index a15df08137d874609305f90a6bca6e5c15e5c213..7fcaf219351289fe7eba1f670d7a6743a8b40ddc 100644
|
||||
--- a/ui/accessibility/platform/atk_util_auralinux.cc
|
||||
+++ b/ui/accessibility/platform/atk_util_auralinux.cc
|
||||
@@ -3,7 +3,9 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include <atk/atk.h>
|
||||
+#if defined(USE_GCONF)
|
||||
#include <gconf/gconf-client.h>
|
||||
+#endif
|
||||
#include <glib-2.0/gmodule.h>
|
||||
|
||||
#include "base/files/file_path.h"
|
||||
@@ -14,6 +16,8 @@
|
||||
|
||||
namespace {
|
||||
|
||||
+#if defined(USE_GCONF)
|
||||
+
|
||||
const char kGnomeAccessibilityEnabledKey[] =
|
||||
"/desktop/gnome/interface/accessibility";
|
||||
|
||||
@@ -39,6 +43,15 @@ bool ShouldEnableAccessibility() {
|
||||
return value;
|
||||
}
|
||||
|
||||
+#else // !defined(USE_GCONF)
|
||||
+
|
||||
+bool ShouldEnableAccessibility() {
|
||||
+ // TODO(k.czech): implement this for non-GNOME desktops.
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+#endif // defined(USE_GCONF)
|
||||
+
|
||||
} // namespace
|
||||
|
||||
G_BEGIN_DECLS
|
||||
@@ -1,146 +0,0 @@
|
||||
From c2a0c6df7d468da9864c56f2099aa947b07e2535 Mon Sep 17 00:00:00 2001
|
||||
From: amistry <amistry@chromium.org>
|
||||
Date: Tue, 9 Jun 2015 12:18:39 -0700
|
||||
Subject: [PATCH] Add build flag to disable hotwording.
|
||||
|
||||
Hotwording downloads a shared module from the web store containing a NaCl module. There is a desire to build and distribute Chromium without this happening. This change adds an "enable_hotwording" build flag that is enabled by default, but can be disabled at compile time.
|
||||
|
||||
BUG=491435
|
||||
|
||||
Review URL: https://codereview.chromium.org/1160243004
|
||||
|
||||
Cr-Commit-Position: refs/heads/master@{#333548}
|
||||
|
||||
Conflicts:
|
||||
chrome/browser/search/hotword_service.cc
|
||||
---
|
||||
build/common.gypi | 4 ++++
|
||||
chrome/browser/BUILD.gn | 9 +++++++++
|
||||
chrome/browser/search/hotword_service.cc | 4 ++++
|
||||
chrome/browser/search/hotword_service_unittest.cc | 4 ++++
|
||||
chrome/chrome_browser.gypi | 3 +++
|
||||
5 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/build/common.gypi b/build/common.gypi
|
||||
index 339cc75..ddb075c 100644
|
||||
--- a/build/common.gypi
|
||||
+++ b/build/common.gypi
|
||||
@@ -381,6 +381,9 @@
|
||||
# Web speech is enabled by default. Set to 0 to disable.
|
||||
'enable_web_speech%': 1,
|
||||
|
||||
+ # 'Ok Google' hotwording is enabled by default. Set to 0 to disable.
|
||||
+ 'enable_hotwording%': 1,
|
||||
+
|
||||
# Notifications are compiled in by default. Set to 0 to disable.
|
||||
'notifications%' : 1,
|
||||
|
||||
@@ -1134,6 +1137,7 @@
|
||||
'configuration_policy%': '<(configuration_policy)',
|
||||
'safe_browsing%': '<(safe_browsing)',
|
||||
'enable_web_speech%': '<(enable_web_speech)',
|
||||
+ 'enable_hotwording%': '<(enable_hotwording)',
|
||||
'notifications%': '<(notifications)',
|
||||
'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
|
||||
'mac_want_real_dsym%': '<(mac_want_real_dsym)',
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
index 5152d83..6ccb079 100644
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -18,6 +18,11 @@ if (is_desktop_linux) {
|
||||
import("//build/config/linux/pkg_config.gni")
|
||||
}
|
||||
|
||||
+declare_args() {
|
||||
+ # 'Ok Google' hotwording is enabled.
|
||||
+ enable_hotwording = true
|
||||
+}
|
||||
+
|
||||
about_credits_file = "$target_gen_dir/about_credits.html"
|
||||
additional_modules_list_file =
|
||||
"$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
|
||||
@@ -455,6 +460,10 @@ source_set("browser") {
|
||||
}
|
||||
}
|
||||
|
||||
+ if (enable_hotwording) {
|
||||
+ defines += [ "ENABLE_HOTWORDING" ]
|
||||
+ }
|
||||
+
|
||||
if (is_linux) {
|
||||
deps += [
|
||||
"//device/media_transfer_protocol",
|
||||
diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc
|
||||
index 0cf3c60..e93789b 100644
|
||||
--- a/chrome/browser/search/hotword_service.cc
|
||||
+++ b/chrome/browser/search/hotword_service.cc
|
||||
@@ -642,6 +642,7 @@ bool HotwordService::IsServiceAvailable() {
|
||||
}
|
||||
|
||||
bool HotwordService::IsHotwordAllowed() {
|
||||
+#if defined(ENABLE_HOTWORDING)
|
||||
std::string group = base::FieldTrialList::FindFullName(
|
||||
hotword_internal::kHotwordFieldTrialName);
|
||||
// Allow hotwording by default, and only disable if the field trial has been
|
||||
@@ -650,6 +651,9 @@ bool HotwordService::IsHotwordAllowed() {
|
||||
return false;
|
||||
|
||||
return DoesHotwordSupportLanguage(profile_);
|
||||
+#else
|
||||
+ return false;
|
||||
+#endif
|
||||
}
|
||||
|
||||
bool HotwordService::IsOptedIntoAudioLogging() {
|
||||
diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc
|
||||
index a3aef47..b0b5927 100644
|
||||
--- a/chrome/browser/search/hotword_service_unittest.cc
|
||||
+++ b/chrome/browser/search/hotword_service_unittest.cc
|
||||
@@ -216,6 +216,7 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedInvalidFieldTrial) {
|
||||
}
|
||||
|
||||
TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
|
||||
+#if defined(ENABLE_HOTWORDING)
|
||||
TestingProfile::Builder profile_builder;
|
||||
scoped_ptr<TestingProfile> profile = profile_builder.Build();
|
||||
|
||||
@@ -246,6 +247,7 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
|
||||
Profile* otr_profile = profile->GetOffTheRecordProfile();
|
||||
SetApplicationLocale(otr_profile, "en");
|
||||
EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(otr_profile));
|
||||
+#endif // defined(ENABLE_HOTWORDING)
|
||||
}
|
||||
|
||||
TEST_P(HotwordServiceTest, ShouldReinstallExtension) {
|
||||
@@ -302,6 +304,7 @@ TEST_P(HotwordServiceTest, PreviousLanguageSetOnInstall) {
|
||||
}
|
||||
|
||||
TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
|
||||
+#if defined(ENABLE_HOTWORDING)
|
||||
InitializeEmptyExtensionService();
|
||||
service_->Init();
|
||||
|
||||
@@ -372,6 +375,7 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
|
||||
EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile()));
|
||||
EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension());
|
||||
EXPECT_EQ(1, hotword_service->uninstall_count()); // no change
|
||||
+#endif // defined(ENABLE_HOTWORDING)
|
||||
}
|
||||
|
||||
TEST_P(HotwordServiceTest, DisableAlwaysOnOnLanguageChange) {
|
||||
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
|
||||
index 6d323eb..1aaedba 100644
|
||||
--- a/chrome/chrome_browser.gypi
|
||||
+++ b/chrome/chrome_browser.gypi
|
||||
@@ -3529,6 +3529,9 @@
|
||||
['enable_session_service==1', {
|
||||
'sources': [ '<@(chrome_browser_session_service_sources)' ],
|
||||
}],
|
||||
+ ['enable_hotwording==1', {
|
||||
+ 'defines': [ 'ENABLE_HOTWORDING' ],
|
||||
+ }],
|
||||
['OS!="android" and OS!="ios" and chromeos==0', {
|
||||
'sources': [ '<@(chrome_browser_desktop_sources)' ],
|
||||
}],
|
||||
--
|
||||
2.4.4
|
||||
@@ -1,15 +0,0 @@
|
||||
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
|
||||
index af7c775..e32fd13 100644
|
||||
--- a/chrome/chrome_browser.gypi
|
||||
+++ b/chrome/chrome_browser.gypi
|
||||
@@ -3246,6 +3246,9 @@
|
||||
'defines': [
|
||||
'USE_LIBSECRET',
|
||||
],
|
||||
+ 'cflags': [
|
||||
+ '<!@(pkg-config --cflags libsecret-1)',
|
||||
+ ],
|
||||
}],
|
||||
['use_aura==1', {
|
||||
'sources': [ '<@(chrome_browser_aura_sources)' ],
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
--- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000
|
||||
+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000
|
||||
@@ -54,7 +54,6 @@
|
||||
'actions': [{
|
||||
'action_name': 'cache_jinja_templates',
|
||||
'inputs': [
|
||||
- '<@(jinja_module_files)',
|
||||
'code_generator_v8.py',
|
||||
'<@(code_generator_template_files)',
|
||||
],
|
||||
--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000
|
||||
+++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000
|
||||
@@ -2,10 +2,6 @@
|
||||
{
|
||||
'variables': {
|
||||
'scripts_for_in_files': [
|
||||
- # jinja2/__init__.py contains version string, so sufficient as
|
||||
- # dependency for whole jinja2 package
|
||||
- '<(DEPTH)/third_party/jinja2/__init__.py',
|
||||
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
|
||||
'hasher.py',
|
||||
'in_file.py',
|
||||
'in_generator.py',
|
||||
--- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000
|
||||
+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000
|
||||
@@ -12,9 +12,6 @@
|
||||
'<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
|
||||
],
|
||||
'idl_lexer_parser_files': [
|
||||
- # PLY (Python Lex-Yacc)
|
||||
- '<(DEPTH)/third_party/ply/lex.py',
|
||||
- '<(DEPTH)/third_party/ply/yacc.py',
|
||||
# Web IDL lexer/parser (base parser)
|
||||
'<(DEPTH)/tools/idl_parser/idl_lexer.py',
|
||||
'<(DEPTH)/tools/idl_parser/idl_node.py',
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
--- build/linux/unbundle/libvpx.gyp.orig 2015-04-08 09:25:29.605925761 +0000
|
||||
+++ build/linux/unbundle/libvpx.gyp 2015-04-08 09:27:19.932142216 +0000
|
||||
@@ -24,6 +24,7 @@
|
||||
'vpx/vpx_integer.h',
|
||||
'vpx/vp8dx.h',
|
||||
'vpx/vpx_encoder.h',
|
||||
+ 'vpx/vpx_frame_buffer.h',
|
||||
],
|
||||
},
|
||||
'includes': [
|
||||
@@ -1,31 +0,0 @@
|
||||
--- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h.orig 2014-12-10 05:36:13.000000000 +0100
|
||||
+++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h 2014-12-28 20:47:39.080795240 +0100
|
||||
@@ -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").
|
||||
|
||||
+#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_
|
||||
--- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp.orig 2014-12-10 05:54:35.000000000 +0100
|
||||
+++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp 2014-12-28 20:50:48.163269989 +0100
|
||||
@@ -7,7 +7,7 @@
|
||||
'widevine_cdm_version_h_file%': 'widevine_cdm_version.h',
|
||||
'widevine_cdm_binary_files%': [],
|
||||
'conditions': [
|
||||
- [ 'branding == "Chrome"', {
|
||||
+ [ 'branding == "Chromium"', {
|
||||
'conditions': [
|
||||
[ 'chromeos == 1', {
|
||||
'widevine_cdm_version_h_file%':
|
||||
@@ -54,7 +54,7 @@
|
||||
'target_name': 'widevinecdmadapter',
|
||||
'type': 'none',
|
||||
'conditions': [
|
||||
- [ 'branding == "Chrome" and enable_pepper_cdms==1', {
|
||||
+ [ 'branding == "Chromium" and enable_pepper_cdms==1', {
|
||||
'dependencies': [
|
||||
'<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
|
||||
'<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',
|
||||
@@ -1,24 +0,0 @@
|
||||
{
|
||||
"homepage" : "http://www.google.com.tr",
|
||||
"homepage_is_newtabpage" : false,
|
||||
"browser" : {
|
||||
"show_home_button" : true,
|
||||
"custom_chrome_frame" : true
|
||||
},
|
||||
"bookmark_bar" : {
|
||||
"show_on_all_tabs" : true
|
||||
},
|
||||
"distribution" : {
|
||||
"skip_first_run_ui" : true,
|
||||
"show_welcome_page" : true,
|
||||
"import_search_engine" : true,
|
||||
"import_history" : false,
|
||||
"create_all_shortcuts" : true,
|
||||
"make_chrome_default" : false
|
||||
},
|
||||
"first_run_tabs" : [
|
||||
"http://www.pisilinux.org",
|
||||
"welcome_page",
|
||||
"new_tab_page"
|
||||
]
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
33a38183e0f94df38e14b6ecff545d89fbc5fc26
|
||||
@@ -1,17 +0,0 @@
|
||||
--- chrome/chrome_exe.gypi.ldflags 2012-06-28 09:02:24.000000000 -0400
|
||||
+++ chrome/chrome_exe.gypi 2012-07-06 15:46:13.008003437 -0400
|
||||
@@ -25,6 +25,14 @@
|
||||
'<(DEPTH)/content/app/startup_helper_win.cc',
|
||||
'<(DEPTH)/content/public/common/content_switches.cc',
|
||||
],
|
||||
+ # Hey, I know what would be an awesome idea.
|
||||
+ # Let us statically compile EVERYTHING into one giant
|
||||
+ # freaking executable. Too bad this means we can't build
|
||||
+ # natively on an IA32 machine. If only someone would
|
||||
+ # invent shared library objects. Idiots.
|
||||
+ 'ldflags': [
|
||||
+ '-Wl,--no-keep-memory'
|
||||
+ ],
|
||||
'mac_bundle_resources': [
|
||||
'app/app-Info.plist',
|
||||
],
|
||||
@@ -1,25 +0,0 @@
|
||||
Index: chromium/src/base/debug/stack_trace.h
|
||||
===================================================================
|
||||
--- base/debug/stack_trace.h
|
||||
+++ base/debug/stack_trace.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef BASE_DEBUG_STACK_TRACE_H_
|
||||
#define BASE_DEBUG_STACK_TRACE_H_
|
||||
|
||||
+#include <stdint.h>
|
||||
#include <iosfwd>
|
||||
#include <string>
|
||||
|
||||
Index: chromium/src/third_party/skia/src/ports/SkFontHost_fontconfig.cpp
|
||||
===================================================================
|
||||
--- third_party/skia/src/ports/SkFontHost_fontconfig.cpp
|
||||
+++ third_party/skia/src/ports/SkFontHost_fontconfig.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
#include "SkStream.h"
|
||||
#include "SkTypeface.h"
|
||||
#include "SkTypefaceCache.h"
|
||||
+#include <unistd.h>
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
Index: chromium/src/chrome/browser/first_run/first_run_linux.cc
|
||||
===================================================================
|
||||
--- chrome/browser/first_run/first_run_internal_linux.cc
|
||||
+++ chrome/browser/first_run/first_run_internal_linux.cc
|
||||
@@ -22,8 +22,7 @@
|
||||
base::FilePath MasterPrefsPath() {
|
||||
// The standard location of the master prefs is next to the chrome binary.
|
||||
base::FilePath master_prefs;
|
||||
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
|
||||
- return base::FilePath();
|
||||
+ master_prefs = base::FilePath("/etc/chromium");
|
||||
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
|
||||
}
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
Index: src/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
|
||||
===================================================================
|
||||
--- third_party/WebKit/Source/wtf/text/TextCodecICU.cpp (revision 101168)
|
||||
+++ third_party/WebKit/Source/wtf/text/TextCodecICU.cpp (working copy)
|
||||
@@ -203,7 +203,11 @@
|
||||
registrar("iso_8859-6", "ISO-8859-6");
|
||||
registrar("iso_8859-7", "ISO-8859-7");
|
||||
registrar("iso_8859-8", "ISO-8859-8");
|
||||
+ registrar("ISO_8859-8-I", "ISO-8859-8-I");
|
||||
registrar("iso_8859-9", "windows-1254");
|
||||
+ registrar("ISO_8859-10", "ISO-8859-10");
|
||||
+ registrar("ISO_8859-13", "ISO-8859-13");
|
||||
+ registrar("ISO_8859-14", "ISO-8859-14");
|
||||
registrar("iso_8859-15", "ISO-8859-15");
|
||||
registrar("koi8_r", "KOI8-R");
|
||||
registrar("x-cp1253", "windows-1253");
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
--- sandbox/linux/sandbox_linux.gypi 2011-11-15 19:35:11.119851877 +0100
|
||||
+++ sandbox/linux/sandbox_linux.gypi 2012-01-25 23:24:53.914568688 +0100
|
||||
@@ -85,7 +85,10 @@
|
||||
],
|
||||
'cflags': [
|
||||
# For ULLONG_MAX
|
||||
- '-std=gnu99',
|
||||
+ '-std=gnu99 -fPIE',
|
||||
+ ],
|
||||
+ 'ldflags': [
|
||||
+ '-pie',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../..',
|
||||
@@ -1,10 +0,0 @@
|
||||
--- net/base/mime_util.cc 2013-08-25 10:12:05.428599992 +0200
|
||||
+++ net/base/mime_util.cc 2013-08-25 10:12:05.428599992 +0200
|
||||
@@ -376,6 +376,7 @@
|
||||
"text/x-csv",
|
||||
"text/x-vcf",
|
||||
"text/rtf",
|
||||
+ "text/x-pisi-ymp",
|
||||
"text/comma-separated-values",
|
||||
"text/csv",
|
||||
"text/tab-separated-values",
|
||||
@@ -1,20 +0,0 @@
|
||||
--- build/common.gypi 2014-08-29 13:04:19.000000000 +0200
|
||||
+++ build/common.gypi 2014-08-29 13:04:19.000000000 +0200
|
||||
@@ -2440,7 +2440,7 @@
|
||||
}],
|
||||
],
|
||||
'clang_warning_flags': [
|
||||
- '-Wheader-hygiene',
|
||||
+ # '-Wheader-hygiene',
|
||||
|
||||
# Don't die on dtoa code that uses a char as an array index.
|
||||
# This is required solely for base/third_party/dmg_fp/dtoa.cc.
|
||||
@@ -2456,7 +2456,7 @@
|
||||
'-Wno-covered-switch-default',
|
||||
|
||||
# Warns when a const char[] is converted to bool.
|
||||
- '-Wstring-conversion',
|
||||
+ # '-Wstring-conversion',
|
||||
|
||||
# C++11-related flags:
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
--- chromium-browser-42.0.2311.82/third_party/angle/src/angle.gyp~ 2015-04-09 00:14:43.000000000 +0300
|
||||
+++ chromium-browser-42.0.2311.82/third_party/angle/src/angle.gyp 2015-04-21 22:02:35.668680845 +0300
|
||||
@@ -104,8 +104,7 @@
|
||||
{
|
||||
'action_name': 'Generate ANGLE Commit ID Header',
|
||||
'message': 'Generating ANGLE Commit ID',
|
||||
- # reference the git index as an input, so we rebuild on changes to the index
|
||||
- 'inputs': [ '<(angle_id_script)', '<(angle_path)/.git/index' ],
|
||||
+ 'inputs': [ '<(angle_id_script)' ],
|
||||
'outputs': [ '<(angle_id_header)' ],
|
||||
'msvs_cygwin_shell': 0,
|
||||
'action':
|
||||
@@ -1,11 +0,0 @@
|
||||
--- chromium-browser-38.0.2125.111/media/cast/logging/encoding_event_subscriber.cc~ 2014-10-02 19:39:47.000000000 +0200
|
||||
+++ chromium-browser-38.0.2125.111/media/cast/logging/encoding_event_subscriber.cc 2014-11-05 06:35:45.611057986 +0100
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
#include <cstring>
|
||||
#include <utility>
|
||||
+#include <algorithm>
|
||||
|
||||
#include "base/logging.h"
|
||||
#include "media/cast/logging/proto/proto_utils.h"
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
dlopen the sonamed libs directly, like it has already been done for libGL.so.1,
|
||||
as we don't want to Depend on the -devel packages for the .so files:
|
||||
- libOSMesa.so.8: Mesa-libOSMesa-9.2.0-2
|
||||
- libGLESv2.so.2: Mesa-libGLES-9.2.0-2
|
||||
- libEGL.so.1: Mesa-libEGL-9.2.0-2
|
||||
--- chromium-browser-36.0.1985.143/ui/gl/gl_implementation_osmesa.cc~ 2014-08-12 22:02:27.000000000 +0300
|
||||
+++ chromium-browser-36.0.1985.143/ui/gl/gl_implementation_osmesa.cc 2014-08-18 23:09:25.208179075 +0300
|
||||
@@ -37,7 +37,7 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
- base::FilePath library_path = module_path.Append("libosmesa.so");
|
||||
+ base::FilePath library_path = module_path.Append("libOSMesa.so.8");
|
||||
base::NativeLibrary library = LoadLibraryAndPrintError(library_path);
|
||||
if (!library)
|
||||
return false;
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
fix error reporting:
|
||||
|
||||
...
|
||||
File "chromium/scripts/generate_gyp.py", line 757, in GetIncludedSources
|
||||
exit('Failed to find file', include_file_path)
|
||||
TypeError: __call__() takes at most 2 arguments (3 given)
|
||||
|
||||
--- ./third_party/ffmpeg/chromium/scripts/generate_gyp.py~ 2015-07-27 07:15:51.000000000 +0300
|
||||
+++ ./third_party/ffmpeg/chromium/scripts/generate_gyp.py 2015-07-27 07:15:55.928135410 +0300
|
||||
@@ -79,6 +79,7 @@
|
||||
import string
|
||||
import subprocess
|
||||
import shutil
|
||||
+import sys
|
||||
|
||||
COPYRIGHT = """# Copyright %d The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
@@ -149,6 +150,9 @@
|
||||
# Mac doesn't have any platform specific files, so just use linux and win.
|
||||
SUPPORTED_PLATFORMS = ['linux', 'win']
|
||||
|
||||
+def die(error):
|
||||
+ print >> sys.stderr, error
|
||||
+ sys.exit(1)
|
||||
|
||||
def NormalizeFilename(name):
|
||||
""" Removes leading path separators in an attempt to normalize paths."""
|
||||
@@ -753,7 +757,7 @@
|
||||
elif include_file_path in IGNORED_INCLUDE_FILES:
|
||||
continue
|
||||
else:
|
||||
- exit('Failed to find file', include_file_path)
|
||||
+ die('Failed to find file: ' + include_file_path)
|
||||
|
||||
# At this point we've found the file. Check if its in our ignore list which
|
||||
# means that the list should be updated to no longer mention this file.
|
||||
@@ -772,7 +776,7 @@
|
||||
licensecheck_path = os.path.abspath(os.path.join(
|
||||
source_root, 'third_party', 'devscripts', 'licensecheck.pl'));
|
||||
if not os.path.exists(licensecheck_path):
|
||||
- exit('Could not find licensecheck.pl: ' + str(licensecheck_path))
|
||||
+ die('Could not find licensecheck.pl: ' + str(licensecheck_path))
|
||||
|
||||
check_process = subprocess.Popen([licensecheck_path,
|
||||
'-l', '100',
|
||||
@@ -838,7 +842,7 @@
|
||||
|
||||
# Sanity check: source set should not have any renames prior to this step.
|
||||
if RENAME_PREFIX in basename:
|
||||
- exit('Found unexpected renamed file in SourceSet: %s' % basename)
|
||||
+ die('Found unexpected renamed file in SourceSet: %s' % basename)
|
||||
|
||||
# Craft a new unique basename from the path of the colliding file
|
||||
if basename in known_basenames:
|
||||
@@ -896,7 +900,7 @@
|
||||
sets = CreatePairwiseDisjointSets(sets)
|
||||
|
||||
if not sets:
|
||||
- exit('ERROR: failed to find any source sets. ' +
|
||||
+ die('ERROR: failed to find any source sets. ' +
|
||||
'Are build_dir (%s) and/or source_dir (%s) options correct?' %
|
||||
(options.build_dir, options.source_dir))
|
||||
|
||||
@@ -904,7 +908,7 @@
|
||||
|
||||
if not CheckLicensesForStaticLinking(sets, source_dir,
|
||||
options.print_licenses):
|
||||
- exit ('GENERATE FAILED: invalid licenses detected.')
|
||||
+ die('GENERATE FAILED: invalid licenses detected.')
|
||||
print 'License checks passed.'
|
||||
|
||||
# Open for writing.
|
||||
@@ -1,22 +0,0 @@
|
||||
--- chromium-browser-44.0.2403.107/third_party/ffmpeg/chromium/scripts/generate_gyp.py~ 2015-07-27 07:21:59.000000000 +0300
|
||||
+++ chromium-browser-44.0.2403.107/third_party/ffmpeg/chromium/scripts/generate_gyp.py 2015-07-27 07:22:03.210572817 +0300
|
||||
@@ -757,7 +757,8 @@
|
||||
elif include_file_path in IGNORED_INCLUDE_FILES:
|
||||
continue
|
||||
else:
|
||||
- die('Failed to find file: ' + include_file_path)
|
||||
+ print('Failed to find file: ' + include_file_path)
|
||||
+ continue
|
||||
|
||||
# At this point we've found the file. Check if its in our ignore list which
|
||||
# means that the list should be updated to no longer mention this file.
|
||||
@@ -776,7 +777,8 @@
|
||||
licensecheck_path = os.path.abspath(os.path.join(
|
||||
source_root, 'third_party', 'devscripts', 'licensecheck.pl'));
|
||||
if not os.path.exists(licensecheck_path):
|
||||
- die('Could not find licensecheck.pl: ' + str(licensecheck_path))
|
||||
+ print('Could not find licensecheck.pl: ' + str(licensecheck_path))
|
||||
+ return True
|
||||
|
||||
check_process = subprocess.Popen([licensecheck_path,
|
||||
'-l', '100',
|
||||
@@ -1,19 +0,0 @@
|
||||
In PLD Linux, browser-plugins framework symlinks enabled plugins to plugins/ dir
|
||||
access directly from there, instead of symlinking in google-chrome.spec
|
||||
|
||||
--- chromium-browser-20.0.1132.57/./src/chrome/common/chrome_paths.cc~ 2012-07-13 21:13:51.000000000 +0300
|
||||
+++ chromium-browser-20.0.1132.57/./src/chrome/common/chrome_paths.cc 2012-07-13 21:14:41.799431216 +0300
|
||||
@@ -255,9 +255,11 @@
|
||||
cur = cur.Append(chrome::kPepperFlashPluginFilename);
|
||||
break;
|
||||
case chrome::FILE_PDF_PLUGIN:
|
||||
- if (!GetInternalPluginsDirectory(&cur))
|
||||
+ if (!PathService::Get(base::DIR_MODULE, &cur))
|
||||
return false;
|
||||
- cur = cur.Append(kInternalPDFPluginFileName);
|
||||
+
|
||||
+ cur = cur.Append(FILE_PATH_LITERAL("plugins"))
|
||||
+ .Append(kInternalPDFPluginFileName);
|
||||
break;
|
||||
case chrome::FILE_NACL_PLUGIN:
|
||||
if (!GetInternalPluginsDirectory(&cur))
|
||||
@@ -1,29 +0,0 @@
|
||||
--- chromium-browser-31.0.1650.57/build/linux/unbundle/remove_bundled_libraries.py 2013-11-16 22:18:32.618209221 +0200
|
||||
+++ chromium-browser-31.0.1650.57/build/linux/unbundle/remove_bundled_libraries.py 2013-11-16 23:34:12.718095629 +0200
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
parser = optparse.OptionParser()
|
||||
parser.add_option('--do-remove', action='store_true')
|
||||
+ parser.add_option('--do-print', action='store_true')
|
||||
|
||||
options, args = parser.parse_args(argv)
|
||||
|
||||
@@ -62,6 +63,8 @@
|
||||
|
||||
if options.do_remove:
|
||||
# Delete the file - best way to ensure it's not used during build.
|
||||
+ if options.do_print:
|
||||
+ print relpath
|
||||
os.remove(path)
|
||||
else:
|
||||
# By default just print paths that would be removed.
|
||||
@@ -74,7 +77,7 @@
|
||||
for exclusion, used in exclusion_used.iteritems():
|
||||
if not used:
|
||||
print '%s does not exist' % exclusion
|
||||
- exit_code = 1
|
||||
+ exit_code = 0
|
||||
|
||||
if not options.do_remove:
|
||||
print ('To actually remove files printed above, please pass ' +
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
in PLD Linux, windows includes are not packaged
|
||||
http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2013-February/023459.html
|
||||
|
||||
--- chromium-browser-42.0.2311.82/ui/gl/generate_bindings.py~ 2015-04-09 00:14:31.000000000 +0300
|
||||
+++ chromium-browser-42.0.2311.82/ui/gl/generate_bindings.py 2015-04-19 23:32:27.601618454 +0300
|
||||
@@ -1616,7 +1616,7 @@
|
||||
'EGL_ANGLE_surface_d3d_texture_2d_share_handle',
|
||||
],
|
||||
],
|
||||
- [WGL_FUNCTIONS, 'wgl', ['noninclude/GL/wglext.h'], []],
|
||||
+# [WGL_FUNCTIONS, 'wgl', ['noninclude/GL/wglext.h'], []],
|
||||
[GLX_FUNCTIONS, 'glx', ['GL/glx.h', 'noninclude/GL/glxext.h'], []],
|
||||
]
|
||||
|
||||
@@ -1,300 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>chromium-browser</Name>
|
||||
<Homepage>http://code.google.com/chromium</Homepage>
|
||||
<Packager>
|
||||
<Name>Pisi Linux Admins</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>GPLv2</License>
|
||||
<Icon>chromium-browser</Icon>
|
||||
<IsA>app:gui</IsA>
|
||||
<Summary>A WebKit powered web browser</Summary>
|
||||
<Description>Chromium-browser is an open-source web browser, powered by WebKit.</Description>
|
||||
<Archive sha1sum="51cb1e76e5b46c2cb2b04f6f0dbaeb807c53cec0" type="tarxz">http://gsdview.appspot.com/chromium-browser-official/chromium-48.0.2564.97.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>alsa-lib-devel</Dependency>
|
||||
<Dependency>at-spi2-atk-devel</Dependency>
|
||||
<Dependency>atk-devel</Dependency>
|
||||
<Dependency>cairo-devel</Dependency>
|
||||
<Dependency>cups-devel</Dependency>
|
||||
<Dependency>desktop-file-utils</Dependency>
|
||||
<Dependency>faac-devel</Dependency>
|
||||
<Dependency>ffmpeg-devel</Dependency>
|
||||
<Dependency>flac-devel</Dependency>
|
||||
<Dependency>pciutils-devel</Dependency>
|
||||
<Dependency>fontconfig-devel</Dependency>
|
||||
<Dependency>dbus-devel</Dependency>
|
||||
<Dependency>gperf</Dependency>
|
||||
<Dependency>jack-audio-connection-kit-devel</Dependency>
|
||||
<Dependency>libavc1394-devel</Dependency>
|
||||
<Dependency>libgnome-keyring-devel</Dependency>
|
||||
<Dependency>speech-dispatcher-devel</Dependency>
|
||||
<Dependency>gdk-pixbuf-devel</Dependency>
|
||||
<Dependency>gsm-devel</Dependency>
|
||||
<Dependency>gtk2-devel</Dependency>
|
||||
<Dependency>harfbuzz-devel</Dependency>
|
||||
<Dependency>hunspell-devel</Dependency>
|
||||
<Dependency>icu4c-devel</Dependency>
|
||||
<Dependency>imlib2-devel</Dependency>
|
||||
<Dependency>lame-devel</Dependency>
|
||||
<Dependency>libdc1394-devel</Dependency>
|
||||
<Dependency>libdrm-devel</Dependency>
|
||||
<Dependency>libevent-devel</Dependency>
|
||||
<Dependency>libexif-devel</Dependency>
|
||||
<Dependency>libjpeg-turbo-devel</Dependency>
|
||||
<Dependency>libmtp-devel</Dependency>
|
||||
<Dependency>libogg-devel</Dependency>
|
||||
<Dependency>libopus-devel</Dependency>
|
||||
<Dependency>libsecret-devel</Dependency>
|
||||
<Dependency>libtheora-devel</Dependency>
|
||||
<Dependency>libvdpau-devel</Dependency>
|
||||
<Dependency>libvorbis-devel</Dependency>
|
||||
<Dependency>libvpx-devel</Dependency>
|
||||
<Dependency>libXcomposite-devel</Dependency>
|
||||
<Dependency>libXcursor-devel</Dependency>
|
||||
<Dependency>libXdamage-devel</Dependency>
|
||||
<Dependency>libXext-devel</Dependency>
|
||||
<Dependency>libXfixes-devel</Dependency>
|
||||
<Dependency>libXi-devel</Dependency>
|
||||
<Dependency>libXrandr-devel</Dependency>
|
||||
<Dependency>libXrender-devel</Dependency>
|
||||
<Dependency>libXScrnSaver-devel</Dependency>
|
||||
<Dependency>libXtst-devel</Dependency>
|
||||
<Dependency>minizip-devel</Dependency>
|
||||
<Dependency>mit-kerberos</Dependency>
|
||||
<Dependency>nss-devel</Dependency>
|
||||
<Dependency>opencore-amr-devel</Dependency>
|
||||
<Dependency>pango-devel</Dependency>
|
||||
<Dependency>pulseaudio-libs-devel</Dependency>
|
||||
<Dependency>python-lxml</Dependency>
|
||||
<Dependency>schroedinger-devel</Dependency>
|
||||
<Dependency>snappy-devel</Dependency>
|
||||
<Dependency>speex-devel</Dependency>
|
||||
<Dependency>valgrind</Dependency>
|
||||
<Dependency>webp-devel</Dependency>
|
||||
<Dependency>x264-devel</Dependency>
|
||||
<Dependency>xdg-utils</Dependency>
|
||||
<Dependency>xvid-devel</Dependency>
|
||||
<Dependency>ninja</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch>gentoo/chromium-libsecret-r0.patch</Patch>
|
||||
<Patch>gentoo/chromium-system-jinja-r7.patch</Patch>
|
||||
<Patch>opensuse/chromium-gcc-fixes.patch</Patch>
|
||||
<Patch>opensuse/chromium-master-prefs-path.patch</Patch>
|
||||
<Patch>opensuse/chromium-more-codec-aliases.patch</Patch>
|
||||
<Patch>opensuse/no-clang-on-packman.diff</Patch>
|
||||
<Patch>opensuse/adjust-ldflags-no-keep-memory.patch</Patch>
|
||||
<Patch>opensuse/chromium-sandbox-pie.patch</Patch>
|
||||
<Patch>pld-linux/dlopen_sonamed_gl.patch</Patch>
|
||||
<Patch>pld-linux/remove_bundled_libraries-stale.patch</Patch>
|
||||
<Patch>pld-linux/chromium-browser-build.patch</Patch>
|
||||
<Patch>pld-linux/angle.patch</Patch>
|
||||
<Patch>pld-linux/system-mesa.patch</Patch>
|
||||
<!--<Patch>pld-linux/ffmpeg-generate-errors.patch</Patch>
|
||||
<Patch>fedora/webui-error.patch</Patch>-->
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>chromium-browser</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>alsa-lib</Dependency>
|
||||
<Dependency>dbus</Dependency>
|
||||
<Dependency>atk</Dependency>
|
||||
<Dependency>cairo</Dependency>
|
||||
<Dependency>cups</Dependency>
|
||||
<Dependency>flac</Dependency>
|
||||
<Dependency>fontconfig</Dependency>
|
||||
<Dependency>gdk-pixbuf</Dependency>
|
||||
<Dependency>gtk2</Dependency>
|
||||
<Dependency>libevent</Dependency>
|
||||
<Dependency>libjpeg-turbo</Dependency>
|
||||
<Dependency>libopus</Dependency>
|
||||
<Dependency>libXcomposite</Dependency>
|
||||
<Dependency>libXcursor</Dependency>
|
||||
<Dependency>libXdamage</Dependency>
|
||||
<Dependency>libXext</Dependency>
|
||||
<Dependency>libXfixes</Dependency>
|
||||
<Dependency>libXi</Dependency>
|
||||
<Dependency>libXrandr</Dependency>
|
||||
<Dependency>libXrender</Dependency>
|
||||
<Dependency>libXScrnSaver</Dependency>
|
||||
<Dependency>libXtst</Dependency>
|
||||
<Dependency>minizip</Dependency>
|
||||
<Dependency>mit-kerberos</Dependency>
|
||||
<Dependency>nss</Dependency>
|
||||
<Dependency>pango</Dependency>
|
||||
<Dependency>pepperflash</Dependency> <!-- no remove -->
|
||||
<Dependency>pulseaudio-libs</Dependency>
|
||||
<Dependency>speech-dispatcher</Dependency>
|
||||
<Dependency>speex</Dependency>
|
||||
<Dependency>webp</Dependency>
|
||||
<Dependency>pciutils</Dependency>
|
||||
<Dependency>nspr</Dependency>
|
||||
<Dependency>zlib</Dependency>
|
||||
<Dependency>expat</Dependency>
|
||||
<Dependency>glib2</Dependency>
|
||||
<Dependency>libX11</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency>libpng</Dependency>
|
||||
<Dependency>snappy</Dependency>
|
||||
<Dependency>freetype</Dependency>
|
||||
<Dependency>harfbuzz</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="config">/etc</Path>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="man">/usr/share/man</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
<Path fileType="data">/usr/share/icons</Path>
|
||||
<Path fileType="data">/usr/share/pixmaps</Path>
|
||||
<Path fileType="data">/usr/share/applications</Path>
|
||||
</Files>
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile owner="root" permission="0644" target="/usr/lib/chromium-browser/master_preferences" >master_preferences</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/usr/share/applications/chromium-browser.desktop" >chromium-browser.desktop</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0755" target="/usr/bin/chromium-browser">chromium-browser.sh</AdditionalFile>
|
||||
</AdditionalFiles>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="19">
|
||||
<Date>2016-01-31</Date>
|
||||
<Version>48.0.2564.97</Version>
|
||||
<Comment>This version contains a number of security updates and stability fixes.</Comment>
|
||||
<Name>Vedat Demir</Name>
|
||||
<Email>vedat@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="18">
|
||||
<Date>2015-10-23</Date>
|
||||
<Version>46.0.2490.80</Version>
|
||||
<Comment>This version contains a number of security updates and stability fixes.</Comment>
|
||||
<Name>Vedat Demir</Name>
|
||||
<Email>vedat@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="17">
|
||||
<Date>2015-08-23</Date>
|
||||
<Version>45.0.2454.85</Version>
|
||||
<Comment>This version contains a number of security updates and stability fixes.</Comment>
|
||||
<Name>Vedat Demir</Name>
|
||||
<Email>vedat@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="16">
|
||||
<Date>2015-08-03</Date>
|
||||
<Version>44.0.2403.155</Version>
|
||||
<Comment>This version contains a number of security updates and stability fixes.</Comment>
|
||||
<Name>Vedat Demir</Name>
|
||||
<Email>vedat@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="15">
|
||||
<Date>2015-06-23</Date>
|
||||
<Version>43.0.2357.132</Version>
|
||||
<Comment>This version contains a number of security updates and stability fixes.</Comment>
|
||||
<Name>Vedat Demir</Name>
|
||||
<Email>vedat@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="14">
|
||||
<Date>2015-05-23</Date>
|
||||
<Version>42.0.2311.135</Version>
|
||||
<Comment>This version contains a number of security updates and stability fixes.</Comment>
|
||||
<Name>Vedat Demir</Name>
|
||||
<Email>vedat@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="13">
|
||||
<Date>2015-04-23</Date>
|
||||
<Version>42.0.2311.90</Version>
|
||||
<Comment>This version contains a number of security updates and stability fixes.</Comment>
|
||||
<Name>Vedat Demir</Name>
|
||||
<Email>vedat@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="12">
|
||||
<Date>2015-02-17</Date>
|
||||
<Version>40.0.2214.114</Version>
|
||||
<Comment>This version contains a number of security updates and stability fixes.</Comment>
|
||||
<Name>Vedat Demir</Name>
|
||||
<Email>vedat@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="11">
|
||||
<Date>2015-02-07</Date>
|
||||
<Version>40.0.2214.94</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Vedat Demir</Name>
|
||||
<Email>vedat@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="10">
|
||||
<Date>2014-04-07</Date>
|
||||
<Version>33.0.1750.152</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Serdar Soytetir</Name>
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="9">
|
||||
<Date>2014-02-24</Date>
|
||||
<Version>33.0.1750.117</Version>
|
||||
<Comment>Version bump, switch bootstrapping NaCl.</Comment>
|
||||
<Name>Serdar Soytetir</Name>
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="8">
|
||||
<Date>2013-11-25</Date>
|
||||
<Version>33.0.1707.0</Version>
|
||||
<Comment>Fix dep.</Comment>
|
||||
<Name>Kamil Atlı</Name>
|
||||
<Email>suvarice@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="7">
|
||||
<Date>2013-11-18</Date>
|
||||
<Version>33.0.1707.0</Version>
|
||||
<Comment>Fix dep.</Comment>
|
||||
<Name>Richard de Bruin</Name>
|
||||
<Email>richdb@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="6">
|
||||
<Date>2013-11-13</Date>
|
||||
<Version>33.0.1707.0</Version>
|
||||
<Comment>V.Bump</Comment>
|
||||
<Name>Osman Erkan</Name>
|
||||
<Email>osman.erkan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="5">
|
||||
<Date>2013-07-07</Date>
|
||||
<Version>29.0.1547.0</Version>
|
||||
<Comment>V.Bump</Comment>
|
||||
<Name>Osman Erkan</Name>
|
||||
<Email>osman.erkan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2013-03-27</Date>
|
||||
<Version>27.0.1425.0</Version>
|
||||
<Comment>V.Bump</Comment>
|
||||
<Name>Osman Erkan</Name>
|
||||
<Email>osman.erkan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2013-01-22</Date>
|
||||
<Version>27.0.1418.2</Version>
|
||||
<Comment>V.Bump</Comment>
|
||||
<Name>Osman Erkan</Name>
|
||||
<Email>osman.erkan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2013-01-22</Date>
|
||||
<Version>26.0.1390.0</Version>
|
||||
<Comment>Güncellendi.</Comment>
|
||||
<Name>Osman Erkan</Name>
|
||||
<Email>osman.erkan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2012-12-25</Date>
|
||||
<Version>26.0.1370.0</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Osman Erkan</Name>
|
||||
<Email>osman.erkan@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>chromium-browser</Name>
|
||||
<Summary xml:lang="tr">Webkit tabanlı ağ tarayıcı</Summary>
|
||||
<Description xml:lang="tr">Chromium, açık kaynak kodlu Webkit tabanlı bir ağ tarayıcıdır.</Description>
|
||||
<Summary xml:lang="es">Navegador web basado en Webkit</Summary>
|
||||
<Description xml:lang="es">Chromium, navegador web de código abierto basado en Webkit.</Description>
|
||||
</Source>
|
||||
</PISI>
|
||||
Reference in New Issue
Block a user