From 6ac00ce3a92d22ae4155dadf49fafa337bf68559 Mon Sep 17 00:00:00 2001 From: poyraz76 Date: Sat, 10 Dec 2016 11:28:27 +0200 Subject: [PATCH 1/4] pepperflash 23.0.0.207 version bump --- network/plugin/pepperflash/pspec.xml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/network/plugin/pepperflash/pspec.xml b/network/plugin/pepperflash/pspec.xml index 204d2bea6a..6165571f1c 100644 --- a/network/plugin/pepperflash/pspec.xml +++ b/network/plugin/pepperflash/pspec.xml @@ -12,7 +12,7 @@ library Google Chrome's Pepper Flash plugin for Chromium. Google Chrome's Pepper Flash plugin for Chromium (stable version) - https://sourceforge.net/projects/pisi-source/files/pepperflash-22.0.0.209.tar.gz + https://sourceforge.net/projects/pisi-source/files/pepperflash-23.0.0.207.tar.gz @@ -33,8 +33,15 @@ - 2016-07-22 - 22.0.0.209 + 2016-12-12 + 23.0.0.207 + Version Bump + Ergün Salman + poyraz76@pisilinux.org + + + 2016-06-30 + 22.0.0.192 Version Bump Ergün Salman poyraz76@pisilinux.org From af1657e06ec954ab078ba5cac823adb3398a4ea5 Mon Sep 17 00:00:00 2001 From: poyraz76 Date: Sat, 10 Dec 2016 11:32:02 +0200 Subject: [PATCH 2/4] pepperflash 23.0.0.207 version bump --- network/plugin/pepperflash/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/plugin/pepperflash/pspec.xml b/network/plugin/pepperflash/pspec.xml index 6165571f1c..e7af50cda9 100644 --- a/network/plugin/pepperflash/pspec.xml +++ b/network/plugin/pepperflash/pspec.xml @@ -12,7 +12,7 @@ library Google Chrome's Pepper Flash plugin for Chromium. Google Chrome's Pepper Flash plugin for Chromium (stable version) - https://sourceforge.net/projects/pisi-source/files/pepperflash-23.0.0.207.tar.gz + https://sourceforge.net/projects/pisi-source/files/pepperflash-23.0.0.207.tar.gz From ef4d13956b9c8f59749364d65cce19b927c902af Mon Sep 17 00:00:00 2001 From: poyraz76 Date: Sat, 10 Dec 2016 11:34:50 +0200 Subject: [PATCH 3/4] chromium-browser version bump 55.0.2883.75 --- network/web/chromium-browser/actions.py | 134 +++++++---------- .../files/chromium-icu58.patch | 135 ++++++++++++++++++ .../pisilinux/last_commit_position.patch | 27 ++++ .../web/chromium-browser/files/tools.patch | 27 ++++ network/web/chromium-browser/pspec.xml | 11 +- 5 files changed, 247 insertions(+), 87 deletions(-) create mode 100644 network/web/chromium-browser/files/chromium-icu58.patch create mode 100644 network/web/chromium-browser/files/pisilinux/last_commit_position.patch create mode 100644 network/web/chromium-browser/files/tools.patch diff --git a/network/web/chromium-browser/actions.py b/network/web/chromium-browser/actions.py index cfd500aed9..37aac5f573 100644 --- a/network/web/chromium-browser/actions.py +++ b/network/web/chromium-browser/actions.py @@ -17,106 +17,68 @@ ARCH = "x64" def setup(): shelltools.export("LC_ALL", "C") - shelltools.system("export -n CFLAGS CXXFLAGS") - 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 = "\ - -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 \ - -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 \ - -Duse_mojo=0 \ - -Duse_gconf=0 \ - -Duse_sysroot=0 \ - -Denable_widevine=1 \ - -Ddisable_glibc=1 \ - -Ddisable_nacl=1 \ - -Ddisable_pnacl=1 \ - -Ddisable_fatal_linker_warnings=1 \ - -Drelease_extra_cflags=-fno-ipa-cp \ - -Denable_hangout_services_extension=1 \ - -Dusb_ids_path=/usr/share/misc/usb.ids \ - -Dlibspeechd_h_prefix=speech-dispatcher/ \ - -Dfieldtrial_testing_like_official_build=1 \ - -Dlinux_sandbox_path=/usr/lib/chromium-browser/chromium-sandbox \ - -Dlinux_sandbox_chrome_path=/usr/lib/chromium-browser/chromium-browser \ - -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc \ - -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com \ - -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu " - - 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") + + for LIB in ["flac", "harfbuzz-ng" "libwebp" ,"libxslt", "yasm"]: + shelltools.system('find -type f -path "*third_party/$LIB/*" \! -path "*third_party/$LIB/chromium/*" \! -path "*third_party/$LIB/google/*" \! -regex ".*\.\(gn\|gni\|isolate\|py\)" -delete') + + shelltools.system("build/linux/unbundle/replace_gn_files.py --system-libraries flac harfbuzz-ng libwebp libxslt yasm") + + opt = 'use_sysroot=false \ + is_clang=false enable_nacl=false \ + enable_nacl_nonsfi=false \ + fieldtrial_testing_like_official_build=true \ + clang_use_chrome_plugins=false \ + symbol_level=0 \ + fatal_linker_warnings=false \ + treat_warnings_as_errors=false \ + use_cups=true \ + use_gnome_keyring=false\ + use_gold=false \ + use_kerberos=true \ + enable_hangout_services_extension=true \ + use_gconf=false \ + enable_widevine=true \ + linux_use_bundled_binutils=false \ + is_debug=false \ + ffmpeg_branding="Chrome" \ + google_default_client_secret="0ZChLK6AxeA3Isu96MkwqDR4" \ + google_api_key="AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM" \ + google_default_client_id="413772536636.apps.googleusercontent.com" \ + remove_webcore_debug_symbols=true \ + proprietary_codecs=true \ + link_pulseaudio=true \ + use_pulseaudio=true \ + use_gtk3=false' + + shelltools.system("tools/gn/bootstrap/bootstrap.py --gn-gen-args '%s'"% opt) + shelltools.system("out/Release/gn gen out/Release --args='%s'"% opt) + 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") + shelltools.system("ninja -C out/Release widevinecdmadapter") def install(): shelltools.cd("out/Release") #should be checked should for the missing folder "out/Release" - pisitools.insinto("/usr/lib/chromium-browser", "*.pak") - pisitools.insinto("/usr/lib/chromium-browser", "*.json") - pisitools.insinto("/usr/lib/chromium-browser", "chrome") - pisitools.insinto("/usr/lib/chromium-browser", "locales") - pisitools.insinto("/usr/lib/chromium-browser", "resources") - pisitools.insinto("/usr/lib/chromium-browser", "icudtl.dat") - pisitools.insinto("/usr/lib/chromium-browser", "mksnapshot") - pisitools.insinto("/usr/lib/chromium-browser", "chromedriver") - pisitools.insinto("/usr/lib/chromium-browser", "natives_blob.bin") - pisitools.insinto("/usr/lib/chromium-browser", "snapshot_blob.bin") - pisitools.insinto("/usr/lib/chromium-browser", "character_data_generator") - pisitools.insinto("/usr/lib/chromium-browser", "chrome_sandbox", "chrome-sandbox") - - - 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()) - + for vla in ["*.pak", "*.json", "chrome", "locales", "resources", "icudtl.dat", "mksnapshot", "chromedriver", "natives_blob.bin", "snapshot_blob.bin", "character_data_generator"]: + pisitools.insinto("/usr/lib/chromium-browser", "%s" % vla) + + pisitools.insinto("/usr/lib/chromium-browser", "chrome_sandbox", "chrome-sandbox") + 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") - + 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") + pisitools.dosym("/usr/share/icons/hicolor/256x256/apps/chromium-browser.png", "/usr/share/pixmaps/chromium-browser.png") + + pisitools.dodoc("LICENSE") diff --git a/network/web/chromium-browser/files/chromium-icu58.patch b/network/web/chromium-browser/files/chromium-icu58.patch new file mode 100644 index 0000000000..5b33f58e66 --- /dev/null +++ b/network/web/chromium-browser/files/chromium-icu58.patch @@ -0,0 +1,135 @@ +From 424584b4984bde7c831f42e9fb47f1ad583a1c46 Mon Sep 17 00:00:00 2001 +From: jshin +Date: Fri, 21 Oct 2016 01:15:50 -0700 +Subject: [PATCH] Update aspirational_scripts per Unicode 9 + +This is a preparation to update ICU to 58.1. +Without this change, ICU update CL cannot be tested on +trybots because a compile will fail due to '#error' checking +if ICU version is less than 58. + +BUG=637001 +TEST=None +TBR=pkasting@chromium.org + +Review-Url: https://chromiumcodereview.appspot.com/2436113003 +Cr-Commit-Position: refs/heads/master@{#426749} +--- + components/url_formatter/url_formatter.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc +index 4455db3..2b82c0c 100644 +--- a/components/url_formatter/url_formatter.cc ++++ b/components/url_formatter/url_formatter.cc +@@ -428,9 +428,9 @@ void IDNSpoofChecker::SetAllowedUnicodeSet(UErrorCode* status) { + // section at + // http://www.unicode.org/Public/security/latest/xidmodifications.txt) are + // are added to the allowed set. The list has to be updated when a new +- // version of Unicode is released. The current version is 8.0.0 and ICU 58 +- // will have Unicode 9.0 data. +-#if U_ICU_VERSION_MAJOR_NUM < 58 ++ // version of Unicode is released. The current version is 9.0.0 and ICU 60 ++ // will have Unicode 10.0 data. ++#if U_ICU_VERSION_MAJOR_NUM < 60 + const icu::UnicodeSet aspirational_scripts( + icu::UnicodeString( + // Unified Canadian Syllabics +@@ -444,13 +444,13 @@ void IDNSpoofChecker::SetAllowedUnicodeSet(UErrorCode* status) { + // Yi + "\\uA000-\\uA48C" + // Miao +- "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7F" ++ "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7E" + "\\U00016F8F-\\U00016F9F]", + -1, US_INV), + *status); + allowed_set.addAll(aspirational_scripts); + #else +-#error "Update aspirational_scripts per Unicode 9.0" ++#error "Update aspirational_scripts per Unicode 10.0" + #endif + + // U+0338 is included in the recommended set, while U+05F4 and U+2027 are in +-- +2.10.2 + +From e60b571faa3f14dd9119a6792dccf12f8bf80192 Mon Sep 17 00:00:00 2001 +From: jshin +Date: Fri, 21 Oct 2016 12:20:05 -0700 +Subject: [PATCH] Prepare to upgrade ICU to 58 part 2 + +U_LB_COUNT is assumed to be 40 in Blink line breaking code, but it's +43 in ICU 58/Unicode 9. + +Three new classes (Emoji Base, Emoji Modifier, and ZWJ) should behave +identically whether or not 'word-break: break-all' is in effect. + +BUG=637001 +TEST=TextBreakIterator.cpp is compiled without an error with ICU 58. +R=kojii@chromium.org +CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel + +Review-Url: https://chromiumcodereview.appspot.com/2440923002 +Cr-Commit-Position: refs/heads/master@{#426860} +--- + .../WebKit/Source/platform/text/TextBreakIterator.cpp | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp b/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp +index 568dc0a..36121eb 100644 +--- a/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp ++++ b/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp +@@ -28,6 +28,9 @@ + #include "wtf/StdLibExtras.h" + #include "wtf/text/CharacterNames.h" + ++#include ++#include ++ + namespace blink { + + unsigned numGraphemeClusters(const String& string) { +@@ -129,6 +132,11 @@ static const unsigned char asciiLineBreakTable[][(asciiLineBreakTableLastChar - + }; + // clang-format on + ++#if U_ICU_VERSION_MAJOR_NUM >= 58 ++#define BA_LB_COUNT (U_LB_COUNT - 3) ++#else ++#define BA_LB_COUNT U_LB_COUNT ++#endif + // Line breaking table for CSS word-break: break-all. This table differs from + // asciiLineBreakTable in: + // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking +@@ -136,7 +144,7 @@ static const unsigned char asciiLineBreakTable[][(asciiLineBreakTableLastChar - + // - 1 indicates additional break opportunities. 0 indicates to fallback to + // normal line break, not "prohibit break." + // clang-format off +-static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = { ++static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = { + // XX AI AL B2 BA BB BK CB CL CM CR EX GL HY ID IN IS LF NS NU OP PO PR QU SA SG SP SY ZW NL WJ H2 H3 JL JT JV CP CJ HL RI + { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX + { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI +@@ -190,7 +198,7 @@ static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == + asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + + 1, + "asciiLineBreakTable should be consistent"); +-static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, ++static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, + "breakAllLineBreakClassTable should be consistent"); + + static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh) { +@@ -226,8 +234,8 @@ static inline ULineBreak lineBreakPropertyValue(UChar lastCh, UChar ch) { + + static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, + ULineBreak lineBreak) { +- if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && +- lastLineBreak < U_LB_COUNT) { ++ if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && ++ lastLineBreak < BA_LB_COUNT) { + const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak]; + return tableRow[lineBreak / 8] & (1 << (lineBreak % 8)); + } +-- +2.10.2 diff --git a/network/web/chromium-browser/files/pisilinux/last_commit_position.patch b/network/web/chromium-browser/files/pisilinux/last_commit_position.patch new file mode 100644 index 0000000000..cb84290fc3 --- /dev/null +++ b/network/web/chromium-browser/files/pisilinux/last_commit_position.patch @@ -0,0 +1,27 @@ +--- chromium-55.0.2883.75/tools/gn/gn_main.cc.orig 2016-12-12 11:49:56.260549036 +0000 ++++ chromium-55.0.2883.75/tools/gn/gn_main.cc 2016-12-12 11:50:14.780931485 +0000 +@@ -11,13 +11,7 @@ + #include "tools/gn/standard_out.h" + #include "tools/gn/switches.h" + +-// Only the GN-generated build makes this header for now. +-// TODO(brettw) consider adding this if we need it in GYP. +-#if defined(GN_BUILD) +-#include "tools/gn/last_commit_position.h" +-#else + #define LAST_COMMIT_POSITION "UNKNOWN" +-#endif + + namespace { + +--- chromium-55.0.2883.75/tools/gn/BUILD.gn.orig 2016-12-12 11:50:43.513524769 +0000 ++++ chromium-55.0.2883.75/tools/gn/BUILD.gn 2016-12-12 11:50:57.697817632 +0000 +@@ -227,7 +227,6 @@ + + deps = [ + ":gn_lib", +- ":last_commit_position", + "//base", + "//build/config/sanitizers:deps", + ] + diff --git a/network/web/chromium-browser/files/tools.patch b/network/web/chromium-browser/files/tools.patch new file mode 100644 index 0000000000..cb84290fc3 --- /dev/null +++ b/network/web/chromium-browser/files/tools.patch @@ -0,0 +1,27 @@ +--- chromium-55.0.2883.75/tools/gn/gn_main.cc.orig 2016-12-12 11:49:56.260549036 +0000 ++++ chromium-55.0.2883.75/tools/gn/gn_main.cc 2016-12-12 11:50:14.780931485 +0000 +@@ -11,13 +11,7 @@ + #include "tools/gn/standard_out.h" + #include "tools/gn/switches.h" + +-// Only the GN-generated build makes this header for now. +-// TODO(brettw) consider adding this if we need it in GYP. +-#if defined(GN_BUILD) +-#include "tools/gn/last_commit_position.h" +-#else + #define LAST_COMMIT_POSITION "UNKNOWN" +-#endif + + namespace { + +--- chromium-55.0.2883.75/tools/gn/BUILD.gn.orig 2016-12-12 11:50:43.513524769 +0000 ++++ chromium-55.0.2883.75/tools/gn/BUILD.gn 2016-12-12 11:50:57.697817632 +0000 +@@ -227,7 +227,6 @@ + + deps = [ + ":gn_lib", +- ":last_commit_position", + "//base", + "//build/config/sanitizers:deps", + ] + diff --git a/network/web/chromium-browser/pspec.xml b/network/web/chromium-browser/pspec.xml index 08caafab07..4b22e0c463 100644 --- a/network/web/chromium-browser/pspec.xml +++ b/network/web/chromium-browser/pspec.xml @@ -13,7 +13,7 @@ app:gui A WebKit powered web browser Chromium-browser is an open-source web browser, powered by WebKit. - https://commondatastorage.googleapis.com/chromium-browser-official/chromium-53.0.2785.116.tar.xz + https://commondatastorage.googleapis.com/chromium-browser-official/chromium-55.0.2883.75.tar.xz alsa-lib-devel at-spi2-atk-devel @@ -86,8 +86,10 @@ chromium-52.0.2743.116-unset-madv_free.patch chromium-widevine.patch + chromium-icu58.patch pisilinux/gfx_jpeg_codec.patch pisilinux/fix_build_with_newer_gcc.patch + pisilinux/last_commit_position.patch @@ -153,6 +155,13 @@ + + 2016-12-12 + 55.0.2883.75 + Version Bump. + Ergün Salman + poyraz76@pisilinux.org + 2016-09-23 53.0.2785.116 From f8949e153b2b746acd34b534498dcc6b254380b9 Mon Sep 17 00:00:00 2001 From: poyraz76 Date: Sat, 10 Dec 2016 11:38:16 +0200 Subject: [PATCH 4/4] gtk --- desktop/lookandfeel/gtk-theme-orion/pspec.xml | 2 +- desktop/lookandfeel/gtk2-engines-murrine/pspec.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/lookandfeel/gtk-theme-orion/pspec.xml b/desktop/lookandfeel/gtk-theme-orion/pspec.xml index 7f4396fa04..279ac5d006 100644 --- a/desktop/lookandfeel/gtk-theme-orion/pspec.xml +++ b/desktop/lookandfeel/gtk-theme-orion/pspec.xml @@ -28,7 +28,7 @@ - 2016-10-01 + 2016-12-12 1.5 First Release. Stefan Gronewold(groni) diff --git a/desktop/lookandfeel/gtk2-engines-murrine/pspec.xml b/desktop/lookandfeel/gtk2-engines-murrine/pspec.xml index 163c5974e2..5701c0f2b9 100644 --- a/desktop/lookandfeel/gtk2-engines-murrine/pspec.xml +++ b/desktop/lookandfeel/gtk2-engines-murrine/pspec.xml @@ -44,11 +44,11 @@ - 2016-12-07 + 2016-12-12 0.98.2 First release Pisi Linux Community admin@pisilinux.org - \ No newline at end of file +