This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository openjfx.
commit 30db8e8f1aa020d570a1797170469a31f56234b5 Author: Emmanuel Bourg <[email protected]> Date: Wed Mar 4 15:28:54 2015 +0100 Added a patch fixing a type definition conflict for UChar32 --- debian/changelog | 1 + .../09-fix-conflicting-uchar32-typedef.patch | 25 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 27 insertions(+) diff --git a/debian/changelog b/debian/changelog index 87688f9..89f3ec0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ openjfx (8u40-b25-1) UNRELEASED; urgency=medium * New upstream release - Refreshed the patches - Removed the libav compatibility patch (fixed upstream) + - Added a patch fixing a type definition conflict for UChar32 -- Emmanuel Bourg <[email protected]> Wed, 04 Mar 2015 10:14:28 +0100 diff --git a/debian/patches/09-fix-conflicting-uchar32-typedef.patch b/debian/patches/09-fix-conflicting-uchar32-typedef.patch new file mode 100644 index 0000000..0d266ee --- /dev/null +++ b/debian/patches/09-fix-conflicting-uchar32-typedef.patch @@ -0,0 +1,25 @@ +Description: Fix a type definition conflict for UChar32 +Author: Emmanuel Bourg <[email protected]> +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 +@@ -21,7 +21,7 @@ + typedef uint16_t UChar; + #endif + +-typedef uint32_t UChar32; ++typedef int32_t UChar32; + + #define U_MASK(x) ((uint32_t)1<<(x)) + #define USE_FAST_PATH(c, fast, slow) ((c) <= 0x7F ? fast((char)c) : slow(c)) +--- a/modules/web/src/main/native/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h ++++ b/modules/web/src/main/native/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h +@@ -31,7 +31,7 @@ + #include <wtf/unicode/UnicodeMacrosFromICU.h> + + typedef wchar_t UChar; +-typedef uint32_t UChar32; ++typedef int32_t UChar32; + + namespace WTF { + namespace Unicode { diff --git a/debian/patches/series b/debian/patches/series index c34dc84..1e2cca9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 06-disable-architecture-verification.patch 07-disable-assembler-on-unsupported-archs.patch 08-disable-sse2.patch +09-fix-conflicting-uchar32-typedef.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
