From 772deff4da67400d6d55bc6705f11cc02a5a74c0 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 2 May 2017 11:01:15 +0300 Subject: [PATCH 1/4] nodejs-7.9.0:Version Bump --- .../nodejs/files/nodejs-v8-icu59.patch | 63 +++++++++++++++++++ network/library/nodejs/pspec.xml | 12 +++- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 network/library/nodejs/files/nodejs-v8-icu59.patch diff --git a/network/library/nodejs/files/nodejs-v8-icu59.patch b/network/library/nodejs/files/nodejs-v8-icu59.patch new file mode 100644 index 0000000000..d0343bad78 --- /dev/null +++ b/network/library/nodejs/files/nodejs-v8-icu59.patch @@ -0,0 +1,63 @@ +Index: src/i18n.cc +diff --git a/deps/v8/src/i18n.cc b/deps/v8/src/i18n.cc +index d2245ef34a9a319a53b4cf4b4ea05ec095fef2d5..7c22871ff5e440f771659d44a0db013b34ec2105 100644 +--- a/deps/v8/src/i18n.cc ++++ b/deps/v8/src/i18n.cc +@@ -30,8 +30,13 @@ + #include "unicode/ucol.h" + #include "unicode/ucurr.h" + #include "unicode/unum.h" ++#include "unicode/uvernum.h" + #include "unicode/uversion.h" + ++#if U_ICU_VERSION_MAJOR_NUM >= 59 ++#include "unicode/char16ptr.h" ++#endif ++ + namespace v8 { + namespace internal { + +@@ -270,8 +275,13 @@ icu::DecimalFormat* CreateICUNumberFormat( + } + + UErrorCode status_digits = U_ZERO_ERROR; ++#if U_ICU_VERSION_MAJOR_NUM >= 59 + uint32_t fraction_digits = ucurr_getDefaultFractionDigits( +- currency.getTerminatedBuffer(), &status_digits); ++ icu::toUCharPtr(currency.getTerminatedBuffer()), &status_digits); ++#else ++ uint32_t fraction_digits = ucurr_getDefaultFractionDigits( ++ currency.getTerminatedBuffer(), &status_digits); ++#endif + if (U_SUCCESS(status_digits)) { + number_format->setMinimumFractionDigits(fraction_digits); + number_format->setMaximumFractionDigits(fraction_digits); +Index: src/runtime/runtime-i18n.cc +diff --git a/deps/v8/src/runtime/runtime-i18n.cc b/deps/v8/src/runtime/runtime-i18n.cc +index 0b45381914641a824e36e99eaa0d315bf96252aa..e89175a37db11aa6990888e26e6bb989cf7c36b5 100644 +--- a/deps/v8/src/runtime/runtime-i18n.cc ++++ b/deps/v8/src/runtime/runtime-i18n.cc +@@ -43,6 +43,7 @@ + #include "unicode/uloc.h" + #include "unicode/unistr.h" + #include "unicode/unum.h" ++#include "unicode/ustring.h" + #include "unicode/uversion.h" + + +@@ -609,10 +610,11 @@ RUNTIME_FUNCTION(Runtime_InternalCompare) { + String::FlatContent flat2 = string2->GetFlatContent(); + std::unique_ptr sap1; + std::unique_ptr sap2; +- const UChar* string_val1 = GetUCharBufferFromFlat(flat1, &sap1, length1); +- const UChar* string_val2 = GetUCharBufferFromFlat(flat2, &sap2, length2); +- result = +- collator->compare(string_val1, length1, string_val2, length2, status); ++ icu::UnicodeString string_val1( ++ FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1); ++ icu::UnicodeString string_val2( ++ FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2); ++ result = collator->compare(string_val1, string_val2, status); + } + if (U_FAILURE(status)) return isolate->ThrowIllegalOperation(); + diff --git a/network/library/nodejs/pspec.xml b/network/library/nodejs/pspec.xml index 30d994229f..c3d189e49d 100644 --- a/network/library/nodejs/pspec.xml +++ b/network/library/nodejs/pspec.xml @@ -12,10 +12,13 @@ app:console is a platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications Evented I/O for V8 javascript - http://nodejs.org/dist/v4.1.2/node-v4.1.2.tar.gz + http://nodejs.org/dist/v7.9.0/node-v7.9.0.tar.gz openssl-devel + + nodejs-v8-icu59.patch + @@ -35,6 +38,13 @@ + + 2017-05-02 + 7.9.0 + Version Bump + Pisi Linux Community + admin@pisilinux.org + 2016-06-09 4.1.2 From 9f263cca1c6103d25a683947e15a08c0e19a4c91 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 2 May 2017 11:13:02 +0300 Subject: [PATCH 2/4] liblastfm:Rebuild with new toolchain --- multimedia/sound/liblastfm/pspec.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/multimedia/sound/liblastfm/pspec.xml b/multimedia/sound/liblastfm/pspec.xml index ec151dfafc..025bb71dde 100644 --- a/multimedia/sound/liblastfm/pspec.xml +++ b/multimedia/sound/liblastfm/pspec.xml @@ -67,6 +67,13 @@ + + 2017-05-02 + 1.0.9 + Rebuild with new toolchain + Alihan Öztürk + alihan@pisilinux.org + 2016-04-27 1.0.9 From 01b9c670a085f92e6404893bdc3a9eb47664e5a7 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 2 May 2017 11:20:30 +0300 Subject: [PATCH 3/4] chromium-58.0.3029.81:Version Bump --- network/web/chromium-browser/actions.py | 1 + ...hromium-58.0.3029.81-system_ffmpeg-1.patch | 56 +++++++++++++++++++ .../files/chromium-gn-bootstrap-r2.patch | 13 +++++ network/web/chromium-browser/pspec.xml | 24 ++++++-- 4 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 network/web/chromium-browser/files/chromium-58.0.3029.81-system_ffmpeg-1.patch create mode 100644 network/web/chromium-browser/files/chromium-gn-bootstrap-r2.patch diff --git a/network/web/chromium-browser/actions.py b/network/web/chromium-browser/actions.py index 37aac5f573..cbd5f67ad7 100644 --- a/network/web/chromium-browser/actions.py +++ b/network/web/chromium-browser/actions.py @@ -48,6 +48,7 @@ def setup(): proprietary_codecs=true \ link_pulseaudio=true \ use_pulseaudio=true \ + use_vulcanize=false \ use_gtk3=false' shelltools.system("tools/gn/bootstrap/bootstrap.py --gn-gen-args '%s'"% opt) diff --git a/network/web/chromium-browser/files/chromium-58.0.3029.81-system_ffmpeg-1.patch b/network/web/chromium-browser/files/chromium-58.0.3029.81-system_ffmpeg-1.patch new file mode 100644 index 0000000000..1a771c9f7e --- /dev/null +++ b/network/web/chromium-browser/files/chromium-58.0.3029.81-system_ffmpeg-1.patch @@ -0,0 +1,56 @@ +Submitted By: DJ Lucas +Date: 2017-03-18 +Initial Package Version: 57.0.2987.110 +Upstream Status: Not submitted +Origin: Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-system-ffmpeg-r4.patch +Description: Allows building with system provided ffmpeg. + + +--- a/media/ffmpeg/ffmpeg_common.h.orig 2016-09-09 13:16:07.757294768 +0000 ++++ b/media/ffmpeg/ffmpeg_common.h 2016-09-09 13:16:41.705989273 +0000 +@@ -22,10 +22,6 @@ + + // Include FFmpeg header files. + extern "C" { +-// Disable deprecated features which result in spammy compile warnings. This +-// list of defines must mirror those in the 'defines' section of FFmpeg's +-// BUILD.gn file or the headers below will generate different structures! +-#define FF_API_CONVERGENCE_DURATION 0 + // Upstream libavcodec/utils.c still uses the deprecated + // av_dup_packet(), causing deprecation warnings. + // The normal fix for such things is to disable the feature as below, +@@ -35,7 +35,6 @@ + MSVC_PUSH_DISABLE_WARNING(4244); + #include + #include +-#include + #include + #include + #include +--- a/media/filters/ffmpeg_demuxer.cc.orig 2016-09-09 14:21:40.185828912 +0000 ++++ b/media/filters/ffmpeg_demuxer.cc 2016-09-09 14:21:52.894089352 +0000 +@@ -1185,24 +1185,6 @@ + // If no estimate is found, the stream entry will be kInfiniteDuration. + std::vector start_time_estimates(format_context->nb_streams, + kInfiniteDuration); +- const AVFormatInternal* internal = format_context->internal; +- if (internal && internal->packet_buffer && +- format_context->start_time != static_cast(AV_NOPTS_VALUE)) { +- struct AVPacketList* packet_buffer = internal->packet_buffer; +- while (packet_buffer != internal->packet_buffer_end) { +- DCHECK_LT(static_cast(packet_buffer->pkt.stream_index), +- start_time_estimates.size()); +- const AVStream* stream = +- format_context->streams[packet_buffer->pkt.stream_index]; +- if (packet_buffer->pkt.pts != static_cast(AV_NOPTS_VALUE)) { +- const base::TimeDelta packet_pts = +- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); +- if (packet_pts < start_time_estimates[stream->index]) +- start_time_estimates[stream->index] = packet_pts; +- } +- packet_buffer = packet_buffer->next; +- } +- } + + std::unique_ptr media_tracks(new MediaTracks()); + diff --git a/network/web/chromium-browser/files/chromium-gn-bootstrap-r2.patch b/network/web/chromium-browser/files/chromium-gn-bootstrap-r2.patch new file mode 100644 index 0000000000..76287e1a56 --- /dev/null +++ b/network/web/chromium-browser/files/chromium-gn-bootstrap-r2.patch @@ -0,0 +1,13 @@ +Index: tools/gn/bootstrap/bootstrap.py +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 38cfb117d29c3895291379f00d8dc8c8b0727474..679170e610f8292bcbeb76508fd247d322a69c79 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -385,6 +385,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/base_switches.cc', + 'base/build_time.cc', + 'base/callback_internal.cc', ++ 'base/callback_helpers.cc', + 'base/command_line.cc', + 'base/debug/activity_tracker.cc', + 'base/debug/alias.cc', diff --git a/network/web/chromium-browser/pspec.xml b/network/web/chromium-browser/pspec.xml index a700bfb16e..3851700607 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-55.0.2883.75.tar.xz + https://commondatastorage.googleapis.com/chromium-browser-official/chromium-58.0.3029.81.tar.xz alsa-lib-devel at-spi2-atk-devel @@ -84,14 +84,19 @@ libffi-devel yasm-devel usbutils + nodejs + glibc-devel + glib2-devel - 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 + chromium-58.0.3029.81-system_ffmpeg-1.patch + chromium-gn-bootstrap-r2.patch @@ -119,6 +124,8 @@ libXrender libXScrnSaver libXtst + libxcb + libxslt minizip mit-kerberos nss @@ -138,7 +145,9 @@ libpng snappy freetype - harfbuzz + harfbuzz + nodejs + glibc /etc @@ -157,6 +166,13 @@ + + 2017-04-30 + 58.0.3029.81 + Version Bump + Ergün Salman + poyraz76@pisilinux.org + 2016-12-12 55.0.2883.75 From 1fc5cdf02e24582a596ce2df3a407d54c1e460c5 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 2 May 2017 12:18:44 +0300 Subject: [PATCH 4/4] Update pspec.xml --- network/web/chromium-browser/pspec.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/network/web/chromium-browser/pspec.xml b/network/web/chromium-browser/pspec.xml index 3851700607..44c5237cef 100644 --- a/network/web/chromium-browser/pspec.xml +++ b/network/web/chromium-browser/pspec.xml @@ -170,8 +170,8 @@ 2017-04-30 58.0.3029.81 Version Bump - Ergün Salman - poyraz76@pisilinux.org + Mustafa Cinasal + muscnsl@gmail.com 2016-12-12