From 6e61900f03ff2d8d22fe94a33b12cd753da4a71f Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Mon, 13 Jun 2016 20:18:22 +0300 Subject: [PATCH] chromium-browser:version bump --- network/web/chromium-browser/actions.py | 163 +++++----- .../files/PNGImageDecoder.patch | 11 + .../chromium-webkit-buffer-overflow.patch | 24 -- .../files/chromium-browser.desktop | 3 +- .../files/chromium-browser.sh | 6 +- .../files/chromium-widevine.patch | 53 +++ .../files/fedora/webui-error.patch | 11 - .../files/gentoo/chromium-cups-r0.patch | 71 ---- .../files/gentoo/chromium-gcc-4.7-r0.patch | 13 - .../files/gentoo/chromium-gnome-r0.patch | 40 --- .../gentoo/chromium-hotwording-2403.patch | 146 --------- .../files/gentoo/chromium-libsecret-r0.patch | 15 - .../gentoo/chromium-system-jinja-r7.patch | 36 -- .../gentoo/chromium-system-libvpx-r0.patch | 10 - .../files/gentoo/chromium-widevine.patch | 31 -- .../chromium-browser/files/master_preferences | 0 .../naclsdk_pnacl_translator.tgz.sha1hash | 1 - .../adjust-ldflags-no-keep-memory.patch | 17 - .../files/opensuse/chromium-gcc-fixes.patch | 25 -- .../opensuse/chromium-master-prefs-path.patch | 14 - .../chromium-more-codec-aliases.patch | 17 - .../files/opensuse/chromium-sandbox-pie.patch | 14 - .../files/opensuse/exclude_ymp.diff | 10 - .../files/opensuse/no-clang-on-packman.diff | 20 -- .../pisilinux/fix_build_with_newer_gcc.patch | 57 ++++ .../files/pisilinux/gfx_jpeg_codec.patch | 48 +++ .../files/pld-linux/angle.patch | 12 - .../pld-linux/chromium-browser-build.patch | 11 - .../files/pld-linux/dlopen_sonamed_gl.patch | 17 - .../pld-linux/ffmpeg-generate-errors.patch | 72 ---- .../files/pld-linux/ffmpeg-generate.patch | 22 -- .../files/pld-linux/path-libpdf.patch | 19 -- .../remove_bundled_libraries-stale.patch | 29 -- .../files/pld-linux/system-mesa.patch | 14 - network/web/chromium-browser/files/png.patch | 11 + network/web/chromium-browser/pspec.xml | 49 +-- network/web/chromium-browser/pspec.xml_new | 307 ------------------ network/web/chromium-browser/translations.xml | 2 - 38 files changed, 282 insertions(+), 1139 deletions(-) create mode 100644 network/web/chromium-browser/files/PNGImageDecoder.patch delete mode 100755 network/web/chromium-browser/files/arch/chromium-webkit-buffer-overflow.patch create mode 100644 network/web/chromium-browser/files/chromium-widevine.patch delete mode 100644 network/web/chromium-browser/files/fedora/webui-error.patch delete mode 100755 network/web/chromium-browser/files/gentoo/chromium-cups-r0.patch delete mode 100755 network/web/chromium-browser/files/gentoo/chromium-gcc-4.7-r0.patch delete mode 100755 network/web/chromium-browser/files/gentoo/chromium-gnome-r0.patch delete mode 100755 network/web/chromium-browser/files/gentoo/chromium-hotwording-2403.patch delete mode 100755 network/web/chromium-browser/files/gentoo/chromium-libsecret-r0.patch delete mode 100755 network/web/chromium-browser/files/gentoo/chromium-system-jinja-r7.patch delete mode 100755 network/web/chromium-browser/files/gentoo/chromium-system-libvpx-r0.patch delete mode 100755 network/web/chromium-browser/files/gentoo/chromium-widevine.patch mode change 100755 => 100644 network/web/chromium-browser/files/master_preferences delete mode 100755 network/web/chromium-browser/files/naclsdk_pnacl_translator.tgz.sha1hash delete mode 100755 network/web/chromium-browser/files/opensuse/adjust-ldflags-no-keep-memory.patch delete mode 100755 network/web/chromium-browser/files/opensuse/chromium-gcc-fixes.patch delete mode 100755 network/web/chromium-browser/files/opensuse/chromium-master-prefs-path.patch delete mode 100755 network/web/chromium-browser/files/opensuse/chromium-more-codec-aliases.patch delete mode 100755 network/web/chromium-browser/files/opensuse/chromium-sandbox-pie.patch delete mode 100755 network/web/chromium-browser/files/opensuse/exclude_ymp.diff delete mode 100755 network/web/chromium-browser/files/opensuse/no-clang-on-packman.diff create mode 100644 network/web/chromium-browser/files/pisilinux/fix_build_with_newer_gcc.patch create mode 100644 network/web/chromium-browser/files/pisilinux/gfx_jpeg_codec.patch delete mode 100755 network/web/chromium-browser/files/pld-linux/angle.patch delete mode 100755 network/web/chromium-browser/files/pld-linux/chromium-browser-build.patch delete mode 100755 network/web/chromium-browser/files/pld-linux/dlopen_sonamed_gl.patch delete mode 100755 network/web/chromium-browser/files/pld-linux/ffmpeg-generate-errors.patch delete mode 100755 network/web/chromium-browser/files/pld-linux/ffmpeg-generate.patch delete mode 100755 network/web/chromium-browser/files/pld-linux/path-libpdf.patch delete mode 100755 network/web/chromium-browser/files/pld-linux/remove_bundled_libraries-stale.patch delete mode 100755 network/web/chromium-browser/files/pld-linux/system-mesa.patch create mode 100644 network/web/chromium-browser/files/png.patch delete mode 100755 network/web/chromium-browser/pspec.xml_new mode change 100755 => 100644 network/web/chromium-browser/translations.xml diff --git a/network/web/chromium-browser/actions.py b/network/web/chromium-browser/actions.py index 9f6b1a14e2..80e0961821 100644 --- a/network/web/chromium-browser/actions.py +++ b/network/web/chromium-browser/actions.py @@ -4,106 +4,109 @@ # 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 +from pisi.actionsapi import get + +WorkDir = "chromium-%s" % get.srcVERSION() + +shelltools.export("HOME", get.workDIR()) + +ARCH = "x64" 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") + shelltools.system("sed -i 's|icu)|icu-i18n)|g' build/linux/system.gyp") + shelltools.system("CFLAGS+=' -fno-delete-null-pointer-checks'") + shelltools.touch(get.workDIR() + "/chromium-*/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) + -Dwerror= \ + -Dclang=0 \ + -Dpython_ver=2.7 \ + -Dlinux_link_gsettings=1 \ + -Dlinux_link_libpci=1 \ + -Dlinux_link_libspeechd=1 \ + -Dlinux_link_pulseaudio=1 \ + -Dlinux_strip_binary=1 \ + -Dlinux_use_bundled_binutils=0 \ + -Dlinux_use_bundled_gold=0 \ + -Dlinux_use_gold_flags=0 \ + -Dicu_use_data_file_flag=1 \ + -Dlogging_like_official_build=1 \ + -Dtracing_like_official_build=1 \ + -Dfieldtrial_testing_like_official_build=1 \ + -Dlibspeechd_h_prefix=speech-dispatcher/ \ + -Dffmpeg_branding=Chrome \ + -Dproprietary_codecs=1 \ + -Duse_gnome_keyring=0 \ + -Duse_system_bzip2=1 \ + -Duse_system_flac=1 \ + -Duse_system_ffmpeg=0 \ + -Duse_system_harfbuzz=1 \ + -Duse_system_icu=0 \ + -Duse_system_libevent=1 \ + -Duse_system_libjpeg=1 \ + -Duse_system_libpng=1 \ + -Duse_system_libvpx=1 \ + -Duse_system_libxml=0 \ + -Duse_system_snappy=1 \ + -Duse_system_xdg_utils=1 \ + -Duse_system_yasm=1 \ + -Duse_system_zlib=0 \ + -Dusb_ids_path=/usr/share/kcmusb/usb.ids \ + -Duse_mojo=0 \ + -Duse_gconf=0 \ + -Duse_sysroot=0 \ + -Denable_hangout_services_extension=1 \ + -Denable_widevine=1 \ + -Ddisable_fatal_linker_warnings=1 \ + -Ddisable_glibc=1 \ + -Ddisable_nacl=1 \ + -Ddisable_pnacl=1 \ + -Dlinux_sandbox_path=/usr/lib/chromium-browser/chromium-sandbox \ + -Dlinux_sandbox_chrome_path=/usr/lib/chromium-browser/chromium-browser \ + -Drelease_extra_cflags=-fno-ipa-cp \ + -Dgoogle_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM \ + -Dgoogle_default_client_id=413772536636.apps.googleusercontent.com \ + -Dgoogle_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 " - + shelltools.system("build/linux/unbundle/replace_gyp_files.py %s" % options) + shelltools.system("build/gyp_chromium build/all.gyp --depth=. %s" % options) + shelltools.export("GYP_GENERATORS","ninja") + def build(): + #Sandbox for error must remain separate + 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") + #should be checked should for the missing folder "out/Release" + pisitools.insinto("/usr/lib/chromium-browser", "chrome") + pisitools.insinto("/usr/lib/chromium-browser", "chromedriver") + pisitools.insinto("/usr/lib/chromium-browser", "chrome_sandbox", "chrome-sandbox") pisitools.insinto("/usr/lib/chromium-browser", "locales") pisitools.insinto("/usr/lib/chromium-browser", "resources") + pisitools.insinto("/usr/lib/chromium-browser", "natives_blob.bin") + pisitools.insinto("/usr/lib/chromium-browser", "snapshot_blob.bin") + pisitools.insinto("/usr/lib/chromium-browser", "icudtl.dat") + pisitools.insinto("/usr/lib/chromium-browser", "*.pak") + pisitools.insinto("/usr/lib/chromium-browser", "character_data_generator") + pisitools.insinto("/usr/lib/chromium-browser", "*.json") + pisitools.insinto("/usr/lib/chromium-browser", "mksnapshot") + pisitools.dosym("/usr/lib/chromium-browser/chrome", "/usr/bin/chromium-browser") + + shelltools.system("chmod -v 4755 %s/usr/lib/chromium-browser/chrome-sandbox" %get.installDIR()) + + pisitools.newman("chrome.1", "chromium-browser.1") @@ -115,5 +118,3 @@ def install(): pisitools.dodoc("LICENSE") - - \ No newline at end of file diff --git a/network/web/chromium-browser/files/PNGImageDecoder.patch b/network/web/chromium-browser/files/PNGImageDecoder.patch new file mode 100644 index 0000000000..986e662237 --- /dev/null +++ b/network/web/chromium-browser/files/PNGImageDecoder.patch @@ -0,0 +1,11 @@ +--- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cppg 2016-05-01 15:22:46.103607522 +0800 ++++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp 2016-05-01 15:25:14.459753876 +0800 +@@ -234,7 +234,7 @@ + #endif + png_uint_32 profileLength = 0; + if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) { +- setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */); ++ setColorProfileAndTransform((const char*)profile, profileLength, imageHasAlpha, false /* useSRGB */); + } + } + #endif // PNG_iCCP_SUPPORTED diff --git a/network/web/chromium-browser/files/arch/chromium-webkit-buffer-overflow.patch b/network/web/chromium-browser/files/arch/chromium-webkit-buffer-overflow.patch deleted file mode 100755 index 100ff68a52..0000000000 --- a/network/web/chromium-browser/files/arch/chromium-webkit-buffer-overflow.patch +++ /dev/null @@ -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& runs, - - static inline bool resolveCandidateRuns(Vector& 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& 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; - - diff --git a/network/web/chromium-browser/files/chromium-browser.desktop b/network/web/chromium-browser/files/chromium-browser.desktop index fa2817787b..16859cba13 100755 --- a/network/web/chromium-browser/files/chromium-browser.desktop +++ b/network/web/chromium-browser/files/chromium-browser.desktop @@ -1,3 +1,4 @@ +#!/usr/bin/env xdg-open [Desktop Entry] Version=1.0 Encoding=UTF-8 @@ -102,7 +103,7 @@ 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 +Exec=chromium-browser %U Terminal=false Icon=chromium-browser Type=Application diff --git a/network/web/chromium-browser/files/chromium-browser.sh b/network/web/chromium-browser/files/chromium-browser.sh index d3d165d0af..e1c3388e51 100755 --- a/network/web/chromium-browser/files/chromium-browser.sh +++ b/network/web/chromium-browser/files/chromium-browser.sh @@ -1,4 +1,4 @@ #!/bin/sh -export CHROME_WRAPPER=/usr/lib/chromium-browser/chromium-browser -export CHROME_DESKTOP=chromium-browser.desktop -exec /usr/lib/chromium-browser/chromium-browser "$@" +export CHROME_WRAPPER=/usr/lib/chromium/chromium +export CHROME_DESKTOP=chromium.desktop +exec /usr/lib/chromium/chromium "$@" diff --git a/network/web/chromium-browser/files/chromium-widevine.patch b/network/web/chromium-browser/files/chromium-widevine.patch new file mode 100644 index 0000000000..569ad4c88b --- /dev/null +++ b/network/web/chromium-browser/files/chromium-widevine.patch @@ -0,0 +1,53 @@ +diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc chromium-48.0.2564.82/chrome/common/chrome_content_client.cc +--- chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc 2016-01-20 22:01:20.000000000 +0200 ++++ chromium-48.0.2564.82/chrome/common/chrome_content_client.cc 2016-01-21 20:02:02.788936626 +0200 +@@ -158,7 +158,12 @@ void ComputeBuiltInPlugins(std::vector - - -- - - - diff --git a/network/web/chromium-browser/files/gentoo/chromium-cups-r0.patch b/network/web/chromium-browser/files/gentoo/chromium-cups-r0.patch deleted file mode 100755 index 1cca99fd13..0000000000 --- a/network/web/chromium-browser/files/gentoo/chromium-cups-r0.patch +++ /dev/null @@ -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 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::CreateInstance( - const base::DictionaryValue* print_backend_settings) { -- NOTREACHED(); -- return NULL; -+ return new DummyPrintBackend(); - } - - } // namespace printing - diff --git a/network/web/chromium-browser/files/gentoo/chromium-gcc-4.7-r0.patch b/network/web/chromium-browser/files/gentoo/chromium-gcc-4.7-r0.patch deleted file mode 100755 index 246c431b89..0000000000 --- a/network/web/chromium-browser/files/gentoo/chromium-gcc-4.7-r0.patch +++ /dev/null @@ -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))) - diff --git a/network/web/chromium-browser/files/gentoo/chromium-gnome-r0.patch b/network/web/chromium-browser/files/gentoo/chromium-gnome-r0.patch deleted file mode 100755 index b9112c3f2a..0000000000 --- a/network/web/chromium-browser/files/gentoo/chromium-gnome-r0.patch +++ /dev/null @@ -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 -+#if defined(USE_GCONF) - #include -+#endif - #include - - #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 diff --git a/network/web/chromium-browser/files/gentoo/chromium-hotwording-2403.patch b/network/web/chromium-browser/files/gentoo/chromium-hotwording-2403.patch deleted file mode 100755 index 305591984f..0000000000 --- a/network/web/chromium-browser/files/gentoo/chromium-hotwording-2403.patch +++ /dev/null @@ -1,146 +0,0 @@ -From c2a0c6df7d468da9864c56f2099aa947b07e2535 Mon Sep 17 00:00:00 2001 -From: amistry -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 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 diff --git a/network/web/chromium-browser/files/gentoo/chromium-libsecret-r0.patch b/network/web/chromium-browser/files/gentoo/chromium-libsecret-r0.patch deleted file mode 100755 index 3f15b90669..0000000000 --- a/network/web/chromium-browser/files/gentoo/chromium-libsecret-r0.patch +++ /dev/null @@ -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': [ -+ ' - #include - #include - -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 - - /////////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////// - diff --git a/network/web/chromium-browser/files/opensuse/chromium-master-prefs-path.patch b/network/web/chromium-browser/files/opensuse/chromium-master-prefs-path.patch deleted file mode 100755 index 74b921fabd..0000000000 --- a/network/web/chromium-browser/files/opensuse/chromium-master-prefs-path.patch +++ /dev/null @@ -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); - } - diff --git a/network/web/chromium-browser/files/opensuse/chromium-more-codec-aliases.patch b/network/web/chromium-browser/files/opensuse/chromium-more-codec-aliases.patch deleted file mode 100755 index 8ba230c226..0000000000 --- a/network/web/chromium-browser/files/opensuse/chromium-more-codec-aliases.patch +++ /dev/null @@ -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"); - diff --git a/network/web/chromium-browser/files/opensuse/chromium-sandbox-pie.patch b/network/web/chromium-browser/files/opensuse/chromium-sandbox-pie.patch deleted file mode 100755 index d59d63f4fe..0000000000 --- a/network/web/chromium-browser/files/opensuse/chromium-sandbox-pie.patch +++ /dev/null @@ -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': [ - '../..', diff --git a/network/web/chromium-browser/files/opensuse/exclude_ymp.diff b/network/web/chromium-browser/files/opensuse/exclude_ymp.diff deleted file mode 100755 index 64138ea3f4..0000000000 --- a/network/web/chromium-browser/files/opensuse/exclude_ymp.diff +++ /dev/null @@ -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", diff --git a/network/web/chromium-browser/files/opensuse/no-clang-on-packman.diff b/network/web/chromium-browser/files/opensuse/no-clang-on-packman.diff deleted file mode 100755 index 1527b57f9d..0000000000 --- a/network/web/chromium-browser/files/opensuse/no-clang-on-packman.diff +++ /dev/null @@ -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: - diff --git a/network/web/chromium-browser/files/pisilinux/fix_build_with_newer_gcc.patch b/network/web/chromium-browser/files/pisilinux/fix_build_with_newer_gcc.patch new file mode 100644 index 0000000000..517909f772 --- /dev/null +++ b/network/web/chromium-browser/files/pisilinux/fix_build_with_newer_gcc.patch @@ -0,0 +1,57 @@ + +diff --git a/third_party/WebKit/Source/wtf/dtoa/bignum.cc b/third_party/WebKit/S + index a000b46..6c6d336 100644 + --- a/third_party/WebKit/Source/wtf/dtoa/bignum.cc + +++ b/third_party/WebKit/Source/wtf/dtoa/bignum.cc +-@@ -109,7 +109,10 @@ namespace double_conversion { +- int length = value.length(); +- int pos = 0; +- // Let's just say that each digit needs 4 bits. ++@@ -102,7 +102,10 @@ ++ } ++ ++ + +#pragma GCC diagnostic push + +#pragma GCC diagnostic warning "-Wstrict-overflow" +- while (length >= kMaxUint64DecimalDigits) { ++ void Bignum::AssignDecimalString(Vector value) { + +#pragma GCC diagnostic pop +- uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits); +- pos += kMaxUint64DecimalDigits; +- length -= kMaxUint64DecimalDigits; ++ // 2^64 = 18446744073709551616 > 10^19 ++ const int kMaxUint64DecimalDigits = 19; ++ Zero(); + -- + 1.8.4.5 +- + + +diff --git a/ui/gfx/image/image_util.cc b/ui/gfx/image/image_util.cc + index 89a3f8c..d595da3 100644 + --- a/ui/gfx/image/image_util.cc + +++ b/ui/gfx/image/image_util.cc +-@@ -68,7 +68,10 @@ bool VisibleMargins(const ImageSkia& image, int* leading, int* trailing) { +- int inner_min = bitmap.width(); +- for (int x = 0; x < bitmap.width(); ++x) { +- for (int y = 0; y < bitmap.height(); ++y) { ++@@ -47,7 +47,10 @@ ++ } ++ #endif // !defined(OS_IOS) ++ + +#pragma GCC diagnostic push + +#pragma GCC diagnostic warning "-Wstrict-overflow" +- if (SkColorGetA(bitmap.getColor(x, y)) > kMinimumVisibleOpacity) { ++ bool VisibleMargins(const ImageSkia& image, int* leading, int* trailing) { + +#pragma GCC diagnostic pop +- inner_min = x; +- break; +- } ++ *leading = 0; ++ *trailing = std::max(1, image.width()) - 1; ++ if (!image.HasRepresentation(1.0)) + -- + 1.8.4.5 +- +-- +2.7.1 diff --git a/network/web/chromium-browser/files/pisilinux/gfx_jpeg_codec.patch b/network/web/chromium-browser/files/pisilinux/gfx_jpeg_codec.patch new file mode 100644 index 0000000000..c7107a2460 --- /dev/null +++ b/network/web/chromium-browser/files/pisilinux/gfx_jpeg_codec.patch @@ -0,0 +1,48 @@ +diff -Naur orig/ui/gfx/codec/jpeg_codec.cc patched/ui/gfx/codec/jpeg_codec.cc +--- orig/ui/gfx/codec/jpeg_codec.cc 2016-04-24 21:31:31.000000000 +0200 ++++ patched/ui/gfx/codec/jpeg_codec.cc 2016-06-13 23:43:36.809948082 +0200 +@@ -120,7 +120,7 @@ + // tell libjpeg where to write the next data + cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used]; + cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used; +- return 1; ++ return TRUE; + } + + // Cleans up the JpegEncoderState to prepare for returning in the final form. +@@ -266,7 +266,7 @@ + cinfo.data_precision = 8; + + jpeg_set_defaults(&cinfo); +- jpeg_set_quality(&cinfo, quality, 1); // quality here is 0-100 ++ jpeg_set_quality(&cinfo, quality, TRUE); // quality here is 0-100 + + // set up the destination manager + jpeg_destination_mgr destmgr; +@@ -278,7 +278,7 @@ + JpegEncoderState state(output); + cinfo.client_data = &state; + +- jpeg_start_compress(&cinfo, 1); ++ jpeg_start_compress(&cinfo, TRUE); + + // feed it the rows, doing necessary conversions for the color format + #ifdef JCS_EXTENSIONS +@@ -364,7 +364,7 @@ + // set to a positive value if TRUE is returned. A FALSE return should only + // be used when I/O suspension is desired." + boolean FillInputBuffer(j_decompress_ptr cinfo) { +- return false; ++ return FALSE; + } + + // Skip data in the buffer. Since we have all the data at once, this operation +@@ -496,7 +496,7 @@ + cinfo.client_data = &state; + + // fill the file metadata into our buffer +- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) ++ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) + return false; + + // we want to always get RGB data out diff --git a/network/web/chromium-browser/files/pld-linux/angle.patch b/network/web/chromium-browser/files/pld-linux/angle.patch deleted file mode 100755 index c94133137f..0000000000 --- a/network/web/chromium-browser/files/pld-linux/angle.patch +++ /dev/null @@ -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': diff --git a/network/web/chromium-browser/files/pld-linux/chromium-browser-build.patch b/network/web/chromium-browser/files/pld-linux/chromium-browser-build.patch deleted file mode 100755 index 49675573e6..0000000000 --- a/network/web/chromium-browser/files/pld-linux/chromium-browser-build.patch +++ /dev/null @@ -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 - #include -+#include - - #include "base/logging.h" - #include "media/cast/logging/proto/proto_utils.h" - diff --git a/network/web/chromium-browser/files/pld-linux/dlopen_sonamed_gl.patch b/network/web/chromium-browser/files/pld-linux/dlopen_sonamed_gl.patch deleted file mode 100755 index bdf4ba9b83..0000000000 --- a/network/web/chromium-browser/files/pld-linux/dlopen_sonamed_gl.patch +++ /dev/null @@ -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; - diff --git a/network/web/chromium-browser/files/pld-linux/ffmpeg-generate-errors.patch b/network/web/chromium-browser/files/pld-linux/ffmpeg-generate-errors.patch deleted file mode 100755 index 5fbf20f0be..0000000000 --- a/network/web/chromium-browser/files/pld-linux/ffmpeg-generate-errors.patch +++ /dev/null @@ -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. diff --git a/network/web/chromium-browser/files/pld-linux/ffmpeg-generate.patch b/network/web/chromium-browser/files/pld-linux/ffmpeg-generate.patch deleted file mode 100755 index f43ee19c1f..0000000000 --- a/network/web/chromium-browser/files/pld-linux/ffmpeg-generate.patch +++ /dev/null @@ -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', diff --git a/network/web/chromium-browser/files/pld-linux/path-libpdf.patch b/network/web/chromium-browser/files/pld-linux/path-libpdf.patch deleted file mode 100755 index e11e5bca14..0000000000 --- a/network/web/chromium-browser/files/pld-linux/path-libpdf.patch +++ /dev/null @@ -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)) diff --git a/network/web/chromium-browser/files/pld-linux/remove_bundled_libraries-stale.patch b/network/web/chromium-browser/files/pld-linux/remove_bundled_libraries-stale.patch deleted file mode 100755 index 4eca29806c..0000000000 --- a/network/web/chromium-browser/files/pld-linux/remove_bundled_libraries-stale.patch +++ /dev/null @@ -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 ' + - diff --git a/network/web/chromium-browser/files/pld-linux/system-mesa.patch b/network/web/chromium-browser/files/pld-linux/system-mesa.patch deleted file mode 100755 index eef1426480..0000000000 --- a/network/web/chromium-browser/files/pld-linux/system-mesa.patch +++ /dev/null @@ -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'], []], - ] - \ No newline at end of file diff --git a/network/web/chromium-browser/files/png.patch b/network/web/chromium-browser/files/png.patch new file mode 100644 index 0000000000..986e662237 --- /dev/null +++ b/network/web/chromium-browser/files/png.patch @@ -0,0 +1,11 @@ +--- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cppg 2016-05-01 15:22:46.103607522 +0800 ++++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp 2016-05-01 15:25:14.459753876 +0800 +@@ -234,7 +234,7 @@ + #endif + png_uint_32 profileLength = 0; + if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) { +- setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */); ++ setColorProfileAndTransform((const char*)profile, profileLength, imageHasAlpha, false /* useSRGB */); + } + } + #endif // PNG_iCCP_SUPPORTED diff --git a/network/web/chromium-browser/pspec.xml b/network/web/chromium-browser/pspec.xml index d099e39e11..8fd30079f9 100644 --- a/network/web/chromium-browser/pspec.xml +++ b/network/web/chromium-browser/pspec.xml @@ -5,15 +5,15 @@ chromium-browser http://code.google.com/chromium - Pisi Linux Admins - admins@pisilinux.org + Admin PisiLinux + admin@pisilinux.org GPLv2 - chromium-browser + chromium app:gui A WebKit powered web browser Chromium-browser is an open-source web browser, powered by WebKit. - http://gsdview.appspot.com/chromium-browser-official/chromium-48.0.2564.97.tar.xz + http://gsdview.appspot.com/chromium-browser-official/chromium-51.0.2704.84.tar.xz alsa-lib-devel at-spi2-atk-devel @@ -81,26 +81,14 @@ ninja - gentoo/chromium-libsecret-r0.patch - gentoo/chromium-system-jinja-r7.patch - opensuse/chromium-gcc-fixes.patch - opensuse/chromium-master-prefs-path.patch - opensuse/chromium-more-codec-aliases.patch - opensuse/no-clang-on-packman.diff - opensuse/adjust-ldflags-no-keep-memory.patch - opensuse/chromium-sandbox-pie.patch - pld-linux/dlopen_sonamed_gl.patch - pld-linux/remove_bundled_libraries-stale.patch - pld-linux/chromium-browser-build.patch - pld-linux/angle.patch - pld-linux/system-mesa.patch - + PNGImageDecoder.patch + chromium-widevine.patch + pisilinux/gfx_jpeg_codec.patch + pisilinux/fix_build_with_newer_gcc.patch - - chromium-browser + chromium alsa-lib dbus @@ -143,7 +131,7 @@ libpng snappy freetype - harfbuzz + harfbuzz /etc @@ -163,19 +151,12 @@ - - 2016-06-09 - 48.0.2564.97 - Release Bump - Pisi Linux Community - admin@pisilinux.org - - 2016-02-14 - 48.0.2564.97 - First release - Vedat Demir - vedat@pisilinux.org + 2016-06-12 + 51.0.2704.84 + First release. + Ergün Salman + poyraz76@pisilinux.org diff --git a/network/web/chromium-browser/pspec.xml_new b/network/web/chromium-browser/pspec.xml_new deleted file mode 100755 index 4656b1149b..0000000000 --- a/network/web/chromium-browser/pspec.xml_new +++ /dev/null @@ -1,307 +0,0 @@ - - - - - chromium-browser - http://code.google.com/chromium - - Pisi Linux Admins - admins@pisilinux.org - - GPLv2 - chromium-browser - app:gui - A WebKit powered web browser - Chromium-browser is an open-source web browser, powered by WebKit. - http://gsdview.appspot.com/chromium-browser-official/chromium-50.0.2632.0.tar.xz - - alsa-lib-devel - at-spi2-atk-devel - atk-devel - cairo-devel - cups-devel - desktop-file-utils - faac-devel - ffmpeg-devel - flac-devel - pciutils-devel - fontconfig-devel - dbus-devel - gperf - jack-audio-connection-kit-devel - libavc1394-devel - libgnome-keyring-devel - speech-dispatcher-devel - gdk-pixbuf-devel - gsm-devel - gtk2-devel - harfbuzz-devel - hunspell-devel - icu4c-devel - imlib2-devel - lame-devel - libdc1394-devel - libdrm-devel - libevent-devel - libexif-devel - libjpeg-turbo-devel - libmtp-devel - libogg-devel - libopus-devel - libsecret-devel - libtheora-devel - libvdpau-devel - libvorbis-devel - libvpx-devel - libXcomposite-devel - libXcursor-devel - libXdamage-devel - libXext-devel - libXfixes-devel - libXi-devel - libXrandr-devel - libXrender-devel - libXScrnSaver-devel - libXtst-devel - minizip-devel - mit-kerberos - nss-devel - opencore-amr-devel - pango-devel - pulseaudio-libs-devel - python-lxml - schroedinger-devel - snappy-devel - speex-devel - valgrind - webp-devel - x264-devel - xdg-utils - xvid-devel - ninja - - - gentoo/chromium-libsecret-r0.patch - gentoo/chromium-system-jinja-r7.patch - opensuse/chromium-gcc-fixes.patch - opensuse/chromium-master-prefs-path.patch - opensuse/chromium-more-codec-aliases.patch - opensuse/no-clang-on-packman.diff - opensuse/adjust-ldflags-no-keep-memory.patch - opensuse/chromium-sandbox-pie.patch - pld-linux/dlopen_sonamed_gl.patch - pld-linux/remove_bundled_libraries-stale.patch - pld-linux/chromium-browser-build.patch - pld-linux/angle.patch - pld-linux/system-mesa.patch - - - - - - chromium-browser - - alsa-lib - dbus - atk - cairo - cups - flac - fontconfig - gdk-pixbuf - gtk2 - libevent - libjpeg-turbo - libopus - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXScrnSaver - libXtst - minizip - mit-kerberos - nss - pango - pepperflash - pulseaudio-libs - speech-dispatcher - speex - webp - pciutils - nspr - zlib - expat - glib2 - libX11 - libgcc - libpng - snappy - freetype - harfbuzz - - - /etc - /usr/bin - /usr/lib - /usr/share/man - /usr/share/doc - /usr/share/icons - /usr/share/pixmaps - /usr/share/applications - - - master_preferences - chromium-browser.desktop - chromium-browser.sh - - - - - - 2016-01-27 - 50.0.2632.0 - Version bump. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2016-01-27 - 46.0.2490.80 - Version bump. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2015-10-23 - 46.0.2490.80 - This version contains a number of security updates and stability fixes. - Vedat Demir - vedat@pisilinux.org - - - 2015-08-23 - 45.0.2454.85 - This version contains a number of security updates and stability fixes. - Vedat Demir - vedat@pisilinux.org - - - 2015-08-03 - 44.0.2403.155 - This version contains a number of security updates and stability fixes. - Vedat Demir - vedat@pisilinux.org - - - 2015-06-23 - 43.0.2357.132 - This version contains a number of security updates and stability fixes. - Vedat Demir - vedat@pisilinux.org - - - 2015-05-23 - 42.0.2311.135 - This version contains a number of security updates and stability fixes. - Vedat Demir - vedat@pisilinux.org - - - 2015-04-23 - 42.0.2311.90 - This version contains a number of security updates and stability fixes. - Vedat Demir - vedat@pisilinux.org - - - 2015-02-17 - 40.0.2214.114 - This version contains a number of security updates and stability fixes. - Vedat Demir - vedat@pisilinux.org - - - 2015-02-07 - 40.0.2214.94 - Version bump. - Vedat Demir - vedat@pisilinux.org - - - 2014-04-07 - 33.0.1750.152 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-02-24 - 33.0.1750.117 - Version bump, switch bootstrapping NaCl. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-11-25 - 33.0.1707.0 - Fix dep. - Kamil Atlı - suvarice@gmail.com - - - 2013-11-18 - 33.0.1707.0 - Fix dep. - Richard de Bruin - richdb@pisilinux.org - - - 2013-11-13 - 33.0.1707.0 - V.Bump - Osman Erkan - osman.erkan@pisilinux.org - - - 2013-07-07 - 29.0.1547.0 - V.Bump - Osman Erkan - osman.erkan@pisilinux.org - - - 2013-03-27 - 27.0.1425.0 - V.Bump - Osman Erkan - osman.erkan@pisilinux.org - - - 2013-01-22 - 27.0.1418.2 - V.Bump - Osman Erkan - osman.erkan@pisilinux.org - - - 2013-01-22 - 26.0.1390.0 - Güncellendi. - Osman Erkan - osman.erkan@pisilinux.org - - - 2012-12-25 - 26.0.1370.0 - First release - Osman Erkan - osman.erkan@pisilinux.org - - - diff --git a/network/web/chromium-browser/translations.xml b/network/web/chromium-browser/translations.xml old mode 100755 new mode 100644 index e08c6903a0..6d122f4faf --- a/network/web/chromium-browser/translations.xml +++ b/network/web/chromium-browser/translations.xml @@ -4,7 +4,5 @@ chromium-browser Webkit tabanlı ağ tarayıcı Chromium, açık kaynak kodlu Webkit tabanlı bir ağ tarayıcıdır. - Navegador web basado en Webkit - Chromium, navegador web de código abierto basado en Webkit.