Hello community,
here is the log from the commit of package nodejs4 for openSUSE:Factory checked
in at 2017-06-01 16:34:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nodejs4 (Old)
and /work/SRC/openSUSE:Factory/.nodejs4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs4"
Thu Jun 1 16:34:07 2017 rev:12 rq:500159 version:4.8.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/nodejs4/nodejs4.changes 2017-05-27
13:16:50.620409925 +0200
+++ /work/SRC/openSUSE:Factory/.nodejs4.new/nodejs4.changes 2017-06-01
16:34:12.186690718 +0200
@@ -1,0 +2,6 @@
+Tue May 30 12:45:42 UTC 2017 - adam.ma...@suse.de
+
+- 0f3e69db.patch, icu59.patch: GCC 7 compilation fixes for v8
+ backported and add missing ICU59 headers (bnc#1041283)
+
+-------------------------------------------------------------------
New:
----
0f3e69db.patch
icu59.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nodejs4.spec ++++++
--- /var/tmp/diff_new_pack.5wMlij/_old 2017-06-01 16:34:13.650484231 +0200
+++ /var/tmp/diff_new_pack.5wMlij/_new 2017-06-01 16:34:13.654483667 +0200
@@ -89,6 +89,8 @@
## UPSTREAM PATCHES HERE, if any
Patch1: 8334.diff
+Patch2: 0f3e69db.patch
+Patch3: icu59.patch
## Our patches
# PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built
@@ -202,8 +204,12 @@
%prep
echo "`grep node-v%{version}.tar.xz %{S:1} | head -n1 | cut -c1-64` %{S:0}" |
sha256sum -c
%setup -q -n node-v%{version}
-%if 4 != 7
+%if 4 < 7
%patch1 -p1
+%patch2 -p1
+%endif
+%if 4 < 8
+%patch3 -p1
%endif
%patch101 -p1
%patch102 -p1
@@ -346,7 +352,7 @@
%{_bindir}/npm
%{_libdir}/node_modules/npm
%{_mandir}/man*/*npm*%{ext_man}
-%{_mandir}/man5/package.json.5%{ext_man}
+%{_mandir}/man5/package*.json.5%{ext_man}
%{_mandir}/man7/semver.7%{ext_man}
%files devel
++++++ 0f3e69db.patch ++++++
commit 0f3e69db41c2b6a1863f2454b028f3b3b28a9613
Author: Zuzana Svetlikova <zsvet...@redhat.com>
Date: Wed Apr 26 18:04:40 2017 +0200
v8: fix gcc 7 build errors
Porting https://github.com/nodejs/node/pull/12392 to master
Ref: https://github.com/nodejs/node/pull/12392
Fixes: https://github.com/nodejs/node/issues/10388
PR-URL: https://github.com/nodejs/node/pull/12676
Reviewed-By: Ben Noordhuis <i...@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <a...@addaleax.net>
Index: node-v4.8.3/deps/v8/src/objects-inl.h
===================================================================
--- node-v4.8.3.orig/deps/v8/src/objects-inl.h
+++ node-v4.8.3/deps/v8/src/objects-inl.h
@@ -37,6 +37,27 @@
namespace v8 {
namespace internal {
+template <typename Derived, typename Shape, typename Key>
+uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) {
+ if (Shape::UsesSeed) {
+ return Shape::SeededHash(key, GetHeap()->HashSeed());
+ } else {
+ return Shape::Hash(key);
+ }
+}
+
+
+template <typename Derived, typename Shape, typename Key>
+uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key,
+ Object* object) {
+ if (Shape::UsesSeed) {
+ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
+ } else {
+ return Shape::HashForObject(key, object);
+ }
+}
+
+
PropertyDetails::PropertyDetails(Smi* smi) {
value_ = smi->value();
}
Index: node-v4.8.3/deps/v8/src/objects.h
===================================================================
--- node-v4.8.3.orig/deps/v8/src/objects.h
+++ node-v4.8.3/deps/v8/src/objects.h
@@ -3045,22 +3045,10 @@ class HashTableBase : public FixedArray
template <typename Derived, typename Shape, typename Key>
class HashTable : public HashTableBase {
public:
- // Wrapper methods
- inline uint32_t Hash(Key key) {
- if (Shape::UsesSeed) {
- return Shape::SeededHash(key, GetHeap()->HashSeed());
- } else {
- return Shape::Hash(key);
- }
- }
-
- inline uint32_t HashForObject(Key key, Object* object) {
- if (Shape::UsesSeed) {
- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
- } else {
- return Shape::HashForObject(key, object);
- }
- }
+ // Wrapper methods. Defined in src/objects-inl.h
+ // to break a cycle with src/heap/heap.h.
+ inline uint32_t Hash(Key key);
+ inline uint32_t HashForObject(Key key, Object* object);
// Returns a new HashTable object.
MUST_USE_RESULT static Handle<Derived> New(
++++++ icu59.patch ++++++
Index: node-v4.8.3/deps/v8/src/runtime/runtime-i18n.cc
===================================================================
--- node-v4.8.3.orig/deps/v8/src/runtime/runtime-i18n.cc
+++ node-v4.8.3/deps/v8/src/runtime/runtime-i18n.cc
@@ -22,6 +22,7 @@
#include "unicode/dtfmtsym.h"
#include "unicode/dtptngen.h"
#include "unicode/locid.h"
+#include "unicode/normlzr.h"
#include "unicode/numfmt.h"
#include "unicode/numsys.h"
#include "unicode/rbbi.h"
@@ -32,6 +33,7 @@
#include "unicode/ucurr.h"
#include "unicode/uloc.h"
#include "unicode/unum.h"
+#include "unicode/ustring.h"
#include "unicode/uversion.h"
