unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 5fa76449dfd2100a90a4f7ffbfda726ba7f6804f 960 bytes (raw)
name: gnu/packages/patches/java-openjfx-build-web-WTF.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
 
Subject: [PATCH] Fix compilation against ICU 59+.

ICU4C has moved to char16_t as the type for UTF-16
http://site.icu-project.org/download/59

diff --git 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
index 0993aa6..e6ea131 100644
--- 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
@@ -15,21 +15,6 @@

 #define CharProp(p) com_sun_webkit_dom_CharacterDataImpl_##p

-#if PLATFORM(JAVA) && OS(WINDOWS)
-typedef wchar_t UChar;
-#else
-typedef uint16_t UChar;
-#endif
-
-// #ifdef UChar32
-// #undef UChar32
-// #endif
-
-#ifndef __UMACHINE_H__ //XXX: recheck
-typedef uint32_t UChar32;
-#endif
-
-#define U_MASK(x) ((uint32_t)1<<(x))
 #define USE_FAST_PATH(c, fast, slow) ((c) <= 0x7F ? fast((char)c) : slow(c))

 #define CHECK_PROPERTY(c, mask, isSet) \
--
2.26.2

debug log:

solving 5fa76449df ...
found 5fa76449df in https://yhetil.org/guix-patches/20200607155518.1400-9-levenson@mmer.org/ ||
	https://yhetil.org/guix-patches/CAMRHuGDr_x6YdUgmOFkLkCX+ZgZpJ8o7RHwnVWuaX3TExYMqhg@mail.gmail.com/ ||
	https://yhetil.org/guix-patches/CAMRHuGCUsJDzk-LoHAA5d1fSESyb0Xjg6KUxk09HgUjHFS3W2Q@mail.gmail.com/

applying [1/1] https://yhetil.org/guix-patches/20200607155518.1400-9-levenson@mmer.org/
diff --git a/gnu/packages/patches/java-openjfx-build-web-WTF.patch b/gnu/packages/patches/java-openjfx-build-web-WTF.patch
new file mode 100644
index 0000000000..5fa76449df

Checking patch gnu/packages/patches/java-openjfx-build-web-WTF.patch...
Applied patch gnu/packages/patches/java-openjfx-build-web-WTF.patch cleanly.

skipping https://yhetil.org/guix-patches/CAMRHuGDr_x6YdUgmOFkLkCX+ZgZpJ8o7RHwnVWuaX3TExYMqhg@mail.gmail.com/ for 5fa76449df
skipping https://yhetil.org/guix-patches/CAMRHuGCUsJDzk-LoHAA5d1fSESyb0Xjg6KUxk09HgUjHFS3W2Q@mail.gmail.com/ for 5fa76449df
index at:
100644 5fa76449dfd2100a90a4f7ffbfda726ba7f6804f	gnu/packages/patches/java-openjfx-build-web-WTF.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).