Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3493 from Rmys/master

Browse Source 
nodejs-7.9.0:Version Bump
This commit is contained in:
Ayhan YALÇINSOY
2017-05-02 12:52:38 +03:00
committed by GitHub
parent da79571b19 1fc5cdf02e
commit 027bb56838
7 changed files with 171 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/library/nodejs/files/nodejs-v8-icu59.patch
+63
View File
@@ -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<uc16[]> sap1;
std::unique_ptr<uc16[]> 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();
network/library/nodejs/pspec.xml
+11 -1
View File
@@ -12,10 +12,13 @@
<IsA>app:console</IsA>
<Summary>is a platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications</Summary>
<Description>Evented I/O for V8 javascript</Description>
<Archive sha1sum="3c901d7b34cf9cc161f6c3845a576fbf0c91b4c5" type="targz">http://nodejs.org/dist/v4.1.2/node-v4.1.2.tar.gz</Archive>
<Archive sha1sum="19f3feadd52ada7417e63e360fdf9a96be1dd49e" type="targz">http://nodejs.org/dist/v7.9.0/node-v7.9.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>openssl-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">nodejs-v8-icu59.patch</Patch>
</Patches>
</Source>
<Package>
@@ -35,6 +38,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-05-02</Date>
<Version>7.9.0</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>4.1.2</Version>
network/web/chromium-browser/actions.py
+1
View File
@@ -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)
network/web/chromium-browser/files/chromium-58.0.3029.81-system_ffmpeg-1.patch
+56
View File
@@ -0,0 +1,56 @@
Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
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 <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
-#include <libavformat/internal.h>
#include <libavformat/avio.h>
#include <libavutil/avutil.h>
#include <libavutil/imgutils.h>
--- 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<base::TimeDelta> 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<int64_t>(AV_NOPTS_VALUE)) {
- struct AVPacketList* packet_buffer = internal->packet_buffer;
- while (packet_buffer != internal->packet_buffer_end) {
- DCHECK_LT(static_cast<size_t>(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<int64_t>(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<MediaTracks> media_tracks(new MediaTracks());
network/web/chromium-browser/files/chromium-gn-bootstrap-r2.patch
+13
View File
@@ -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',
network/web/chromium-browser/pspec.xml
+20 -4
View File
@@ -13,7 +13,7 @@
<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="8a36da476a83068871ea0e6b1a92cb52b7f049be" type="tarxz">https://commondatastorage.googleapis.com/chromium-browser-official/chromium-55.0.2883.75.tar.xz</Archive>
<Archive sha1sum="76a3c7ef3a90c0eebe22be3ba5af69366af60f48" type="tarxz">https://commondatastorage.googleapis.com/chromium-browser-official/chromium-58.0.3029.81.tar.xz</Archive>
<BuildDependencies>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>at-spi2-atk-devel</Dependency>
@@ -84,14 +84,19 @@
<Dependency>libffi-devel</Dependency>
<Dependency>yasm-devel</Dependency>
<Dependency>usbutils</Dependency>
<Dependency>nodejs</Dependency>
<Dependency>glibc-devel</Dependency>
<Dependency>glib2-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">chromium-52.0.2743.116-unset-madv_free.patch</Patch>
<!--Patch level="1">chromium-52.0.2743.116-unset-madv_free.patch</Patch-->
<Patch level="1">chromium-widevine.patch</Patch>
<Patch level="1">chromium-icu58.patch</Patch>
<!--Patch level="1">chromium-icu58.patch</Patch-->
<Patch level="1">pisilinux/gfx_jpeg_codec.patch</Patch>
<Patch level="1">pisilinux/fix_build_with_newer_gcc.patch</Patch>
<Patch level="1">pisilinux/last_commit_position.patch</Patch>
<Patch level="1">chromium-58.0.3029.81-system_ffmpeg-1.patch</Patch>
<Patch level="1">chromium-gn-bootstrap-r2.patch</Patch>
</Patches>
</Source>
<Package>
@@ -119,6 +124,8 @@
<Dependency>libXrender</Dependency>
<Dependency>libXScrnSaver</Dependency>
<Dependency>libXtst</Dependency>
<Dependency>libxcb</Dependency>
<Dependency>libxslt</Dependency>
<Dependency>minizip</Dependency>
<Dependency>mit-kerberos</Dependency>
<Dependency>nss</Dependency>
@@ -138,7 +145,9 @@
<Dependency>libpng</Dependency>
<Dependency>snappy</Dependency>
<Dependency>freetype</Dependency>
<Dependency>harfbuzz</Dependency>
<Dependency>harfbuzz</Dependency>
<Dependency>nodejs</Dependency>
<Dependency>glibc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
@@ -157,6 +166,13 @@
</Package>
<History>
<Update release="10">
<Date>2017-04-30</Date>
<Version>58.0.3029.81</Version>
<Comment>Version Bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="9">
<Date>2016-12-12</Date>
<Version>55.0.2883.75</Version>