[Git][java-team/openjfx][master] 3 commits: Removed the GCC 7 compatibility patch (fixed upstream)

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / openjfx


Commits:
d8ca829f by Emmanuel Bourg at 2018-06-12T12:51:58+02:00
Removed the GCC 7 compatibility patch (fixed upstream)

- - - - -
8b9c84f4 by Emmanuel Bourg at 2018-06-12T12:53:36+02:00
Removed the UChar patches

- - - - -
010f6465 by Emmanuel Bourg at 2018-06-12T12:54:21+02:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- − debian/patches/09-fix-conflicting-uchar32-typedef.patch
- − debian/patches/21-gcc7-compatibility.patch
- − debian/patches/27-javascript-uint16-vs-char16.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openjfx (8u171-b11-2) unstable; urgency=medium
+
+  * Team upload.
+  * Removed the GCC 7 compatibility patch (fixed upstream)
+  * Removed the UChar patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 12 Jun 2018 12:54:12 +0200
+
 openjfx (8u171-b11-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/09-fix-conflicting-uchar32-typedef.patch deleted
=====================================
--- a/debian/patches/09-fix-conflicting-uchar32-typedef.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix a type definition conflict for UChar32
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
---- a/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
-+++ b/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
-@@ -26,7 +26,7 @@
- // #endif
- 
- #ifndef __UMACHINE_H__ //XXX: recheck
--typedef uint32_t UChar32;
-+typedef int32_t UChar32;
- #endif
- 
- #define U_MASK(x) ((uint32_t)1<<(x))


=====================================
debian/patches/21-gcc7-compatibility.patch deleted
=====================================
--- a/debian/patches/21-gcc7-compatibility.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Fixes the compilation errors with GCC 7
-Origin: backport, http://trac.webkit.org/changeset/217601/webkit
-                  http://trac.webkit.org/changeset/218488/webkit
---- a/modules/web/src/main/native/Source/WebCore/css/CSSValue.h
-+++ b/modules/web/src/main/native/Source/WebCore/css/CSSValue.h
-@@ -21,6 +21,7 @@
- #pragma once
- 
- #include "URLHash.h"
-+#include <functional>
- #include <wtf/Function.h>
- #include <wtf/HashMap.h>
- #include <wtf/RefCounted.h>
---- a/modules/web/src/main/native/Source/WebCore/css/StyleSheetContents.h
-+++ b/modules/web/src/main/native/Source/WebCore/css/StyleSheetContents.h
-@@ -23,6 +23,7 @@
- #include "CSSParserMode.h"
- #include "CachePolicy.h"
- #include "URL.h"
-+#include <functional>
- #include <wtf/Function.h>
- #include <wtf/HashMap.h>
- #include <wtf/RefCounted.h>
---- a/modules/web/src/main/native/Source/WebCore/dom/SlotAssignment.h
-+++ b/modules/web/src/main/native/Source/WebCore/dom/SlotAssignment.h
-@@ -27,6 +27,7 @@
- 
- #include "RenderTreeUpdater.h"
- #include "ShadowRoot.h"
-+#include <functional>
- #include <wtf/HashMap.h>
- #include <wtf/HashSet.h>
- #include <wtf/Vector.h>
---- a/modules/web/src/main/native/Source/WebCore/loader/NetscapePlugInStreamLoader.h
-+++ b/modules/web/src/main/native/Source/WebCore/loader/NetscapePlugInStreamLoader.h
-@@ -29,6 +29,7 @@
- #pragma once
- 
- #include "ResourceLoader.h"
-+#include <functional>
- #include <wtf/Function.h>
- #include <wtf/Forward.h>
- 
---- a/modules/web/src/main/native/Source/WebCore/loader/ResourceLoader.h
-+++ b/modules/web/src/main/native/Source/WebCore/loader/ResourceLoader.h
-@@ -34,6 +34,7 @@
- #include "ResourceLoaderTypes.h"
- #include "ResourceRequest.h"
- #include "ResourceResponse.h"
-+#include <functional>
- #include <wtf/Forward.h>
- 
- #if ENABLE(CONTENT_EXTENSIONS)


=====================================
debian/patches/27-javascript-uint16-vs-char16.patch deleted
=====================================
--- a/debian/patches/27-javascript-uint16-vs-char16.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description:  Fix some uint16/char16 issues in javascriptcore.
-Author: Peter Michael Green <plugwash at raspbian.org>
-
-Last-Update: 2018-05-29
-
---- a/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
-+++ b/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
-@@ -18,7 +18,7 @@
- #if PLATFORM(JAVA) && OS(WINDOWS)
- typedef wchar_t UChar;
- #else
--typedef uint16_t UChar;
-+typedef char16_t UChar;
- #endif
- 
- // #ifdef UChar32


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@
 06-disable-architecture-verification.patch
 07-disable-assembler-on-unsupported-archs.patch
 08-disable-sse2.patch
-09-fix-conflicting-uchar32-typedef.patch
 10-javadoc-locale.patch
 11-icu-dynamic-linking.patch
 fix-arm64-build.patch
@@ -14,10 +13,8 @@ fix-arm32-build.patch
 16-reproducible-build-timestamp.patch
 17-gcc-compatibility.patch
 19-disable-webkit-sampling-profiler.patch
-21-gcc7-compatibility.patch
 22-JDK-8185792-accented-characters-support.patch
 23-webcore-linker-flags.patch
 24-disable-buildSrc-tests.patch
 25-webkit-debug-level.patch
 26-disable-webkit-jit-for-armv4.patch
-27-javascript-uint16-vs-char16.patch



View it on GitLab: https://salsa.debian.org/java-team/openjfx/compare/6cec5fb03bb06cf2e1a6d86ceaf8ea0c00f810dd...010f6465f2b1dcf311247d9a1726207fc200e8e7

-- 
View it on GitLab: https://salsa.debian.org/java-team/openjfx/compare/6cec5fb03bb06cf2e1a6d86ceaf8ea0c00f810dd...010f6465f2b1dcf311247d9a1726207fc200e8e7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180612/3a046015/attachment.html>