View | Details | Raw Unified | Return to bug 222824
Collapse All | Expand All

(-)x11/alacritty/Makefile (+4 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	alacritty
3
PORTNAME=	alacritty
4
PORTVERSION=	g20170618
4
PORTVERSION=	g20170618
5
PORTREVISION=	1
5
CATEGORIES=	x11
6
CATEGORIES=	x11
6
7
7
MAINTAINER=	tobik@FreeBSD.org
8
MAINTAINER=	tobik@FreeBSD.org
Lines 22-27 GH_TUPLE= jwilm:glutin:cc64178d39a1fa06b2c5403117e Link Here
22
		jwilm:rust-fontconfig:419135e5e1106ec0973dd4923bd9c70d8e438cc8:servofontconfig \
23
		jwilm:rust-fontconfig:419135e5e1106ec0973dd4923bd9c70d8e438cc8:servofontconfig \
23
		jwilm:libfontconfig:618a52973d46e5cce4f054f6ee3bd2682167eee4:servofontconfigsys
24
		jwilm:libfontconfig:618a52973d46e5cce4f054f6ee3bd2682167eee4:servofontconfigsys
24
25
26
EXTRA_PATCHES+=	${EXTRA_PATCHES_${OPSYS}_${OSREL:R}}
27
EXTRA_PATCHES_FreeBSD_12=	${PATCHDIR}/extra-patch-freebsd12
28
25
PLIST_FILES=	bin/alacritty
29
PLIST_FILES=	bin/alacritty
26
30
27
CARGO_CRATES=	android_glue-0.2.2 \
31
CARGO_CRATES=	android_glue-0.2.2 \
(-)x11/alacritty/files/extra-patch-freebsd12 (+220 lines)
Line 0 Link Here
1
--- cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/aarch64.rs.orig	2017-03-02 02:44:01 UTC
2
+++ cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/aarch64.rs
3
@@ -7,10 +7,12 @@ s! {
4
     pub struct stat {
5
         pub st_dev: ::dev_t,
6
         pub st_ino: ::ino_t,
7
-        pub st_mode: ::mode_t,
8
         pub st_nlink: ::nlink_t,
9
+        pub st_mode: ::mode_t,
10
+        pub st_pad0: ::uint16_t,
11
         pub st_uid: ::uid_t,
12
         pub st_gid: ::gid_t,
13
+        pub st_pad1: ::uint32_t,
14
         pub st_rdev: ::dev_t,
15
         pub st_atime: ::time_t,
16
         pub st_atime_nsec: ::c_long,
17
@@ -18,13 +20,13 @@ s! {
18
         pub st_mtime_nsec: ::c_long,
19
         pub st_ctime: ::time_t,
20
         pub st_ctime_nsec: ::c_long,
21
+        pub st_birthtime: ::time_t,
22
+        pub st_birthtime_nsec: ::c_long,
23
         pub st_size: ::off_t,
24
         pub st_blocks: ::blkcnt_t,
25
         pub st_blksize: ::blksize_t,
26
         pub st_flags: ::fflags_t,
27
-        pub st_gen: ::uint32_t,
28
-        pub st_lspare: ::int32_t,
29
-        pub st_birthtime: ::time_t,
30
-        pub st_birthtime_nsec: ::c_long,
31
+        pub st_gen: ::uint64_t,
32
+        pub st_spare: [::uint64_t; 10],
33
     }
34
 }
35
--- cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig	2017-04-26 14:28:39 UTC
36
+++ cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/mod.rs
37
@@ -1,8 +1,8 @@
38
 pub type fflags_t = u32;
39
 pub type clock_t = i32;
40
-pub type ino_t = u32;
41
+pub type ino_t = u64;
42
 pub type lwpid_t = i32;
43
-pub type nlink_t = u16;
44
+pub type nlink_t = u64;
45
 pub type blksize_t = u32;
46
 pub type clockid_t = ::c_int;
47
 pub type sem_t = _sem;
48
@@ -44,10 +44,13 @@ s! {
49
     }
50
 
51
     pub struct dirent {
52
-        pub d_fileno: u32,
53
+        pub d_fileno: u64,
54
+        pub d_off: u64,
55
         pub d_reclen: u16,
56
         pub d_type: u8,
57
-        pub d_namlen: u8,
58
+        pub d_pad0: u8,
59
+        pub d_namlen: u16,
60
+        pub d_pad1: u16,
61
         pub d_name: [::c_char; 256],
62
     }
63
 
64
--- cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/x86.rs.orig	2016-10-14 21:54:23 UTC
65
+++ cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/x86.rs
66
@@ -7,25 +7,30 @@ s! {
67
     pub struct stat {
68
         pub st_dev: ::dev_t,
69
         pub st_ino: ::ino_t,
70
-        pub st_mode: ::mode_t,
71
         pub st_nlink: ::nlink_t,
72
+        pub st_mode: ::mode_t,
73
+        pub st_pad0: ::uint16_t,
74
         pub st_uid: ::uid_t,
75
         pub st_gid: ::gid_t,
76
+        pub st_pad1: ::uint32_t,
77
         pub st_rdev: ::dev_t,
78
+        pub st_atime_ext: ::int32_t,
79
         pub st_atime: ::time_t,
80
         pub st_atime_nsec: ::c_long,
81
+        pub st_mtime_ext: ::int32_t,
82
         pub st_mtime: ::time_t,
83
         pub st_mtime_nsec: ::c_long,
84
+        pub st_ctime_ext: ::int32_t,
85
         pub st_ctime: ::time_t,
86
         pub st_ctime_nsec: ::c_long,
87
+        pub st_birthtime_ext: ::int32_t,
88
+        pub st_birthtime: ::time_t,
89
+        pub st_birthtime_nsec: ::c_long,
90
         pub st_size: ::off_t,
91
         pub st_blocks: ::blkcnt_t,
92
         pub st_blksize: ::blksize_t,
93
         pub st_flags: ::fflags_t,
94
-        pub st_gen: ::uint32_t,
95
-        pub st_lspare: ::int32_t,
96
-        pub st_birthtime: ::time_t,
97
-        pub st_birthtime_nsec: ::c_long,
98
-        __unused: [u8; 8],
99
+        pub st_gen: ::uint64_t,
100
+        pub st_spare: [::uint64_t; 10],
101
     }
102
 }
103
--- cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/x86_64.rs.orig	2016-10-14 21:54:23 UTC
104
+++ cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/x86_64.rs
105
@@ -7,10 +7,12 @@ s! {
106
     pub struct stat {
107
         pub st_dev: ::dev_t,
108
         pub st_ino: ::ino_t,
109
-        pub st_mode: ::mode_t,
110
         pub st_nlink: ::nlink_t,
111
+        pub st_mode: ::mode_t,
112
+        pub st_pad0: ::uint16_t,
113
         pub st_uid: ::uid_t,
114
         pub st_gid: ::gid_t,
115
+        pub st_pad1: ::uint32_t,
116
         pub st_rdev: ::dev_t,
117
         pub st_atime: ::time_t,
118
         pub st_atime_nsec: ::c_long,
119
@@ -18,13 +20,13 @@ s! {
120
         pub st_mtime_nsec: ::c_long,
121
         pub st_ctime: ::time_t,
122
         pub st_ctime_nsec: ::c_long,
123
+        pub st_birthtime: ::time_t,
124
+        pub st_birthtime_nsec: ::c_long,
125
         pub st_size: ::off_t,
126
         pub st_blocks: ::blkcnt_t,
127
         pub st_blksize: ::blksize_t,
128
         pub st_flags: ::fflags_t,
129
-        pub st_gen: ::uint32_t,
130
-        pub st_lspare: ::int32_t,
131
-        pub st_birthtime: ::time_t,
132
-        pub st_birthtime_nsec: ::c_long,
133
+        pub st_gen: ::uint64_t,
134
+        pub st_spare: [::uint64_t; 10],
135
     }
136
 }
137
--- cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/mod.rs.orig	2017-05-19 03:32:21 UTC
138
+++ cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/mod.rs
139
@@ -1,4 +1,4 @@
140
-pub type dev_t = u32;
141
+pub type dev_t = u64;
142
 pub type mode_t = u16;
143
 pub type pthread_attr_t = *mut ::c_void;
144
 pub type rlim_t = i64;
145
@@ -35,8 +35,9 @@ s! {
146
         pub filter: ::c_short,
147
         pub flags: ::c_ushort,
148
         pub fflags: ::c_uint,
149
-        pub data: ::intptr_t,
150
+        pub data: i64,
151
         pub udata: *mut ::c_void,
152
+        pub ext: [u64; 4],
153
     }
154
 
155
     pub struct sockaddr_storage {
156
--- cargo-crates/mio-0.5.1/src/sys/unix/kqueue.rs.orig	2016-04-27 20:28:22 UTC
157
+++ cargo-crates/mio-0.5.1/src/sys/unix/kqueue.rs
158
@@ -110,6 +110,7 @@ impl Selector {
159
                 fflags: FilterFlag::empty(),
160
                 data: 0,
161
-                udata: token
162
+                udata: token,
163
+                ext: [0, 0, 0, 0],
164
             });
165
     }
166
 
167
--- cargo-crates/mio-0.6.2/src/sys/unix/kqueue.rs.orig	2016-12-14 20:41:05 UTC
168
+++ cargo-crates/mio-0.6.2/src/sys/unix/kqueue.rs
169
@@ -121,6 +121,7 @@ impl Selector {
170
                 fflags: FilterFlag::empty(),
171
                 data: 0,
172
                 udata: token as UData,
173
+                ext: [0, 0, 0, 0],
174
             });
175
     }
176
 
177
--- cargo-crates/nix-0.5.1/src/sys/event.rs.orig	2016-03-16 20:17:51 UTC
178
+++ cargo-crates/nix-0.5.1/src/sys/event.rs
179
@@ -23,8 +23,9 @@ mod ffi {
180
         pub filter: EventFilter,    // 2
181
         pub flags: EventFlag,       // 2
182
         pub fflags: FilterFlag,     // 4
183
-        pub data: intptr_t,         // 8
184
-        pub udata: usize             // 8
185
+        pub data: i64,              // 8
186
+        pub udata: usize,           // 8
187
+        pub ext: [u64; 4],          // 32
188
     }
189
 
190
     #[cfg(target_os = "netbsd")]
191
@@ -346,6 +347,7 @@ pub fn ev_set(ev: &mut KEvent,
192
     ev.fflags = fflags;
193
     ev.data   = 0;
194
     ev.udata  = udata;
195
+    ev.ext    = [0, 0, 0, 0];
196
 }
197
 
198
 #[cfg(target_os = "netbsd")]
199
--- cargo-crates/nix-0.7.0/src/sys/event.rs.orig	2016-08-31 18:53:01 UTC
200
+++ cargo-crates/nix-0.7.0/src/sys/event.rs
201
@@ -23,8 +23,9 @@ mod ffi {
202
         pub filter: EventFilter,    // 2
203
         pub flags: EventFlag,       // 2
204
         pub fflags: FilterFlag,     // 4
205
-        pub data: intptr_t,         // 8
206
-        pub udata: usize             // 8
207
+        pub data: i64,              // 8
208
+        pub udata: usize,           // 8
209
+        pub ext: [u64; 4],          // 32
210
     }
211
 
212
     #[cfg(target_os = "netbsd")]
213
@@ -346,6 +347,7 @@ pub fn ev_set(ev: &mut KEvent,
214
     ev.fflags = fflags;
215
     ev.data   = 0;
216
     ev.udata  = udata;
217
+    ev.ext    = [0, 0, 0, 0];
218
 }
219
 
220
 #[cfg(target_os = "netbsd")]

Return to bug 222824