Lines 10-15
Link Here
|
10 |
</attributes> |
10 |
</attributes> |
11 |
</classpathentry> |
11 |
</classpathentry> |
12 |
<classpathentry kind="src" path="Eclipse SWT PI/cairo"/> |
12 |
<classpathentry kind="src" path="Eclipse SWT PI/cairo"/> |
|
|
13 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java |
14 |
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java 0000-00-00 00:00:00.000000000 +0000 |
15 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java 0000-00-00 00:00:00.000000000 +0000 |
16 |
@@ -10,7 +10,6 @@ |
17 |
* |
18 |
* Contributors: |
19 |
* IBM Corporation - initial API and implementation |
20 |
- * Christoph Läubrich - Bug 513185 |
21 |
*******************************************************************************/ |
22 |
package org.eclipse.swt.layout; |
23 |
|
13 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java |
24 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java |
14 |
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java 0000-00-00 00:00:00.000000000 +0000 |
25 |
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java 0000-00-00 00:00:00.000000000 +0000 |
15 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java 0000-00-00 00:00:00.000000000 +0000 |
26 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java 0000-00-00 00:00:00.000000000 +0000 |
Lines 25-34
Link Here
|
25 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java |
36 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java |
26 |
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java 0000-00-00 00:00:00.000000000 +0000 |
37 |
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java 0000-00-00 00:00:00.000000000 +0000 |
27 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java 0000-00-00 00:00:00.000000000 +0000 |
38 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java 0000-00-00 00:00:00.000000000 +0000 |
28 |
@@ -69,12 +69,12 @@ |
39 |
@@ -65,12 +65,12 @@ |
|
|
40 |
|
29 |
static String arch() { |
41 |
static String arch() { |
30 |
String osArch = System.getProperty("os.arch"); //$NON-NLS-1$ |
42 |
String osArch = System.getProperty("os.arch"); //$NON-NLS-1$ |
31 |
if (osArch.equals ("i386") || osArch.equals ("i686")) return "x86"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ |
|
|
32 |
- if (osArch.equals ("amd64")) return "x86_64"; //$NON-NLS-1$ $NON-NLS-2$ |
43 |
- if (osArch.equals ("amd64")) return "x86_64"; //$NON-NLS-1$ $NON-NLS-2$ |
33 |
return osArch; |
44 |
return osArch; |
34 |
} |
45 |
} |
Lines 51-57
Link Here
|
51 |
|
62 |
|
52 |
export CFLAGS='-O -Wall -fPIC' |
63 |
export CFLAGS='-O -Wall -fPIC' |
53 |
|
64 |
|
54 |
@@ -86,21 +86,14 @@ |
65 |
@@ -86,27 +86,25 @@ |
55 |
MAKEFILE=make_win32.mak |
66 |
MAKEFILE=make_win32.mak |
56 |
;; |
67 |
;; |
57 |
*) |
68 |
*) |
Lines 74-82
Link Here
|
74 |
fi |
85 |
fi |
75 |
case $MODEL in |
86 |
case $MODEL in |
76 |
"x86_64") |
87 |
"x86_64") |
77 |
@@ -111,6 +104,11 @@ |
88 |
SWT_ARCH=x86_64 |
78 |
SWT_ARCH=x86 |
89 |
AWT_ARCH=amd64 |
79 |
AWT_ARCH=i386 |
|
|
80 |
;; |
90 |
;; |
81 |
+ "powerpc" | "powerpc64") |
91 |
+ "powerpc" | "powerpc64") |
82 |
+ SWT_ARCH=ppc64 |
92 |
+ SWT_ARCH=ppc64 |
Lines 86-92
Link Here
|
86 |
*) |
96 |
*) |
87 |
SWT_ARCH=$MODEL |
97 |
SWT_ARCH=$MODEL |
88 |
AWT_ARCH=$MODEL |
98 |
AWT_ARCH=$MODEL |
89 |
@@ -118,6 +116,13 @@ |
99 |
@@ -114,6 +112,13 @@ |
90 |
esac |
100 |
esac |
91 |
|
101 |
|
92 |
case $SWT_OS.$SWT_ARCH in |
102 |
case $SWT_OS.$SWT_ARCH in |
Lines 97-131
Link Here
|
97 |
+ export JAVA_HOME |
107 |
+ export JAVA_HOME |
98 |
+ fi |
108 |
+ fi |
99 |
+ ;; |
109 |
+ ;; |
100 |
"linux.x86") |
110 |
"linux.x86_64") |
101 |
if [ "${CC}" = "" ]; then |
111 |
if [ "${CC}" = "" ]; then |
102 |
export CC=gcc |
112 |
export CC=gcc |
103 |
@@ -194,7 +199,7 @@ |
113 |
@@ -148,7 +153,7 @@ |
104 |
|
114 |
|
105 |
|
115 |
|
106 |
# For 64-bit CPUs, we have a switch |
116 |
# For 64-bit CPUs, we have a switch |
107 |
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then |
117 |
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then |
108 |
+if [ ${MODEL} = 'amd64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'powerpc64' ]; then |
118 |
+if [ ${MODEL} = 'amd64' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'aarch64' ]; then |
109 |
SWT_PTR_CFLAGS=-DJNI64 |
119 |
SWT_PTR_CFLAGS=-DJNI64 |
110 |
if [ -d /lib64 ]; then |
120 |
if [ -d /lib64 ]; then |
111 |
XLIB64=-L/usr/X11R6/lib64 |
121 |
XLIB64=-L/usr/X11R6/lib64 |
112 |
@@ -205,6 +210,11 @@ |
122 |
@@ -160,6 +165,11 @@ |
113 |
XLIB64="${XLIB64} -L/usr/lib64" |
|
|
114 |
SWT_LFLAGS=-m64 |
123 |
SWT_LFLAGS=-m64 |
115 |
export SWT_LFLAGS |
124 |
export SWT_LFLAGS |
116 |
+ fi |
125 |
fi |
117 |
+ if [ ${SWT_OS} = "freebsd" ] |
126 |
+ if [ ${SWT_OS} = "freebsd" ] |
118 |
+ then |
127 |
+ then |
119 |
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64" |
128 |
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64" |
120 |
+ export SWT_LFLAGS=-m64 |
129 |
+ export SWT_LFLAGS=-m64 |
121 |
fi |
130 |
+ fi |
122 |
export SWT_PTR_CFLAGS |
131 |
export SWT_PTR_CFLAGS |
123 |
fi |
132 |
fi |
|
|
133 |
|
134 |
@@ -275,10 +285,10 @@ |
135 |
|
136 |
func_build_chromium () { |
137 |
func_echo_plus "Building Chromium bindings:" |
138 |
- if [ -d "chromium_subp/cef_linux" ]; then |
139 |
- export CHROMIUM_HEADERS=./chromium_subp/cef_linux |
140 |
+ if [ -d "chromium_subp/cef_freebsd" ]; then |
141 |
+ export CHROMIUM_HEADERS=./chromium_subp/cef_freebsd |
142 |
else |
143 |
- export CHROMIUM_HEADERS=$CHROMIUM_OUTPUT_DIR/../../../../eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_linux |
144 |
+ export CHROMIUM_HEADERS=$CHROMIUM_OUTPUT_DIR/../../../../eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_freebsd |
145 |
fi |
146 |
${MAKE_TYPE} -f $MAKEFILE "${@}" |
147 |
RETURN_VALUE=$? #make can return 1 or 2 if it fails. Thus need to cache it in case it's used programmatically somewhere. |
148 |
@@ -332,4 +342,4 @@ |
149 |
elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then |
150 |
export GTK_VERSION="3.0" |
151 |
func_build_gtk3 "$@" |
152 |
-fi |
153 |
\ No newline at end of file |
154 |
+fi |
124 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak |
155 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak |
125 |
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 |
156 |
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 |
126 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 |
157 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 |
127 |
@@ -103,16 +103,18 @@ |
158 |
@@ -108,16 +108,18 @@ |
128 |
WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o |
159 |
CHROMIUM_OBJECTS = chromiumlib.o chromiumlib_structs.o chromiumlib_custom.o chromiumlib_stats.o |
129 |
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o |
160 |
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o |
130 |
|
161 |
|
131 |
+port_prefix=`pkg-config --variable=prefix gtk+-3.0` |
162 |
+port_prefix=`pkg-config --variable=prefix gtk+-3.0` |
Lines 146-152
Link Here
|
146 |
|
177 |
|
147 |
ifndef NO_STRIP |
178 |
ifndef NO_STRIP |
148 |
# -s = Remove all symbol table and relocation information from the executable. |
179 |
# -s = Remove all symbol table and relocation information from the executable. |
149 |
@@ -255,10 +257,6 @@ |
180 |
@@ -280,10 +282,6 @@ |
150 |
cp $(ALL_SWT_LIBS) $(OUTPUT_DIR) |
181 |
cp $(ALL_SWT_LIBS) $(OUTPUT_DIR) |
151 |
ifeq ($(BUILD_WEBKIT2EXTENSION),yes) |
182 |
ifeq ($(BUILD_WEBKIT2EXTENSION),yes) |
152 |
@# Copy webextension into it's own folder, but create folder first. |
183 |
@# Copy webextension into it's own folder, but create folder first. |
Lines 186-192
Link Here
|
186 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf |
217 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf |
187 |
--- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 |
218 |
--- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 |
188 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 |
219 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 |
189 |
@@ -16,11 +16,11 @@ |
220 |
@@ -16,14 +16,14 @@ |
190 |
requires.3.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) |
221 |
requires.3.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) |
191 |
|
222 |
|
192 |
requires.4.namespace = org.eclipse.equinox.p2.iu |
223 |
requires.4.namespace = org.eclipse.equinox.p2.iu |
Lines 202-214
Link Here
|
202 |
requires.5.range = [$version$,$version$] |
233 |
requires.5.range = [$version$,$version$] |
203 |
-requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true))) |
234 |
-requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true))) |
204 |
+requires.5.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64)(!(org.eclipse.swt.buildtime=true))) |
235 |
+requires.5.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64)(!(org.eclipse.swt.buildtime=true))) |
|
|
236 |
|
237 |
requires.6.namespace = org.eclipse.equinox.p2.iu |
238 |
requires.6.name = org.eclipse.swt.gtk.linux.aarch64 |
205 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml |
239 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml |
206 |
--- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 0000-00-00 00:00:00.000000000 +0000 |
240 |
--- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 0000-00-00 00:00:00.000000000 +0000 |
207 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 0000-00-00 00:00:00.000000000 +0000 |
241 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 0000-00-00 00:00:00.000000000 +0000 |
208 |
@@ -63,11 +63,11 @@ |
242 |
@@ -64,15 +64,15 @@ |
209 |
</antcall> |
243 |
</antcall> |
210 |
<antcall target="check_fragment_libraries"> |
244 |
<antcall target="check_fragment_libraries"> |
211 |
<param name="library_count" value="8"/> |
245 |
<param name="library_count" value="8"/> |
|
|
246 |
- <param name="fragment" value="org.eclipse.swt.gtk.linux.aarch64"/> |
247 |
+ <param name="fragment" value="org.eclipse.swt.gtk.freebsd.aarch64"/> |
248 |
</antcall> |
249 |
<antcall target="check_fragment_libraries"> |
250 |
<param name="library_count" value="8"/> |
212 |
- <param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64le"/> |
251 |
- <param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64le"/> |
213 |
+ <param name="fragment" value="org.eclipse.swt.gtk.freebsd.powerpc64"/> |
252 |
+ <param name="fragment" value="org.eclipse.swt.gtk.freebsd.powerpc64"/> |
214 |
</antcall> |
253 |
</antcall> |
Lines 219-273
Link Here
|
219 |
</antcall> |
258 |
</antcall> |
220 |
<antcall target="check_fragment_libraries"> |
259 |
<antcall target="check_fragment_libraries"> |
221 |
<param name="library_count" value="4"/> |
260 |
<param name="library_count" value="4"/> |
222 |
@@ -80,12 +80,12 @@ |
261 |
@@ -85,13 +85,13 @@ |
223 |
<property name="checkdir" value="~/build/check_libraries"/> |
262 |
<property name="checkdir" value="~/build/check_libraries"/> |
224 |
<property name="library_count" value="23"/> |
263 |
<property name="library_count" value="43"/> |
225 |
<property name="fragment" value=""/> |
264 |
<property name="fragment" value=""/> |
226 |
- <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**"> |
265 |
- <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.aarch64/**, **/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**, **/org.eclipse.swt.browser.chromium.gtk.linux.x86_64/**, **/org.eclipse.swt.browser.chromium.win32.win32.x86_64/**, **/org.eclipse.swt.browser.chromium.cocoa.macosx.x86_64/**"> |
227 |
+ <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.freebsd.powerpc64/**, **/org.eclipse.swt.gtk.freebsd.amd64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**"> |
266 |
+ <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.freebsd.aarch64/**, **/org.eclipse.swt.gtk.freebsd.powerpc64/**, **/org.eclipse.swt.gtk.freebsd.amd64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**, **/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/**, **/org.eclipse.swt.browser.chromium.win32.win32.x86_64/**, **/org.eclipse.swt.browser.chromium.cocoa.macosx.x86_64/**"> |
228 |
<filename regex="[0-9][0-9][0-9][0-9]."/> |
267 |
<filename regex="[0-9][0-9][0-9][0-9]"/> |
229 |
<filename regex="${swt_version}."/> |
268 |
<filename regex="${swt_version}"/> |
230 |
<exclude name="**/.git/**"/> |
269 |
<exclude name="**/.git/**"/> |
231 |
</fileset> |
270 |
</fileset> |
232 |
- <fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**"> |
271 |
<echo>Matched files ${toString:match}</echo> |
233 |
+ <fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.freebsd.powerpc64/**, **/org.eclipse.swt.gtk.freebsd.amd64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**"> |
272 |
- <fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.aarch64/**, **/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**, **/org.eclipse.swt.browser.chromium.gtk.linux.x86_64/chromium-*/**, **/org.eclipse.swt.browser.chromium.win32.win32.x86_64/chromium-*/**, **/org.eclipse.swt.browser.chromium.cocoa.macosx.x86_64/chromium-*/**"> |
234 |
<filename regex="[0-9][0-9][0-9][0-9]."/> |
273 |
+ <fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.freebsd.aarch64/**, **/org.eclipse.swt.gtk.freebsd.powerpc64/**, **/org.eclipse.swt.gtk.freebsd.amd64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**, **/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/chromium-*/**, **/org.eclipse.swt.browser.chromium.win32.win32.x86_64/chromium-*/**, **/org.eclipse.swt.browser.chromium.cocoa.macosx.x86_64/chromium-*/**"> |
235 |
<filename regex="${swt_version}." negate="true"/> |
274 |
<filename regex="[0-9][0-9][0-9][0-9]"/> |
|
|
275 |
<filename regex="${swt_version}" negate="true"/> |
236 |
<exclude name="**/.git/**"/> |
276 |
<exclude name="**/.git/**"/> |
237 |
@@ -115,13 +115,13 @@ |
277 |
@@ -355,7 +355,7 @@ |
238 |
trust="true" |
278 |
<replace file="${repo.src}/${file_make_common}" token="rev=${rev}" value="rev=${new_rev}"/> |
239 |
outputproperty="m_linux_x86_64_output" |
279 |
<replace file="${repo.src}/${file_make_common}" token="comma_ver=${comma_ver}" value="comma_ver=${new_comma_ver}"/> |
240 |
command="hostname"/> |
280 |
<replace file="${repo.src}/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml" token="${swt_version}" value="${new_version}"/> |
241 |
- <sshexec host="${m_linux_ppc64le}" |
281 |
- <replace file="${repo.bin}/bundles/org.eclipse.swt.browser.chromium.gtk.linux.x86_64/chromium-${cef_ver}/chromium.properties" token="${swt_version}" value="${new_version}"/> |
242 |
+ <sshexec host="${m_linux_powerpc64}" |
282 |
+ <replace file="${repo.bin}/bundles/org.eclipse.swt.browser.chromium.gtk.freebsd.amd64/chromium-${cef_ver}/chromium.properties" token="${swt_version}" value="${new_version}"/> |
243 |
port="2256" |
283 |
<replace file="${repo.bin}/bundles/org.eclipse.swt.browser.chromium.cocoa.macosx.x86_64/chromium-${cef_ver}/chromium.properties" token="${swt_version}" value="${new_version}"/> |
244 |
username="swtbuild" |
284 |
<replace file="${repo.bin}/bundles/org.eclipse.swt.browser.chromium.win32.win32.x86_64/chromium-${cef_ver}/chromium.properties" token="${swt_version}" value="${new_version}"/> |
245 |
keyfile="${keyfile}" |
285 |
</target> |
246 |
failonerror="false" |
286 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/MANIFEST.MF eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/MANIFEST.MF |
247 |
trust="true" |
287 |
--- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 |
248 |
- outputproperty="m_linux_ppc64le_output" |
288 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 |
249 |
+ outputproperty="m_linux_powerpc64_output" |
289 |
@@ -5,6 +5,6 @@ |
250 |
command="hostname"/> |
290 |
Bundle-SymbolicName: org.eclipse.swt.browser.chromium;singleton:=true |
251 |
<sshexec host="${m_mac}" |
291 |
Bundle-Version: 3.115.0.qualifier |
252 |
username="swtbuild" |
292 |
Bundle-ManifestVersion: 2 |
253 |
@@ -139,10 +139,10 @@ |
293 |
-Eclipse-PlatformFilter: (osgi.arch=x86_64) |
254 |
<matches pattern="x${m_linux_x86_64_output}*" string="x${m_linux_x86_64}"/> |
294 |
-SWT-Arch: x86_64 |
255 |
</and> |
295 |
+Eclipse-PlatformFilter: (osgi.arch=amd64) |
|
|
296 |
+SWT-Arch: amd64 |
297 |
Automatic-Module-Name: org.eclipse.swt.browser.chromium |
298 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/p2.inf |
299 |
--- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 |
300 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 |
301 |
@@ -10,6 +10,6 @@ |
302 |
requires.2.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) |
303 |
|
304 |
requires.3.namespace = org.eclipse.equinox.p2.iu |
305 |
-requires.3.name = org.eclipse.swt.browser.chromium.gtk.linux.x86_64 |
306 |
+requires.3.name = org.eclipse.swt.browser.chromium.gtk.freebsd.amd64 |
307 |
requires.3.range = [$version$,$version$] |
308 |
-requires.3.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) |
309 |
+requires.3.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=amd64)(!(org.eclipse.swt.buildtime=true))) |
310 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/buildChromium.xml eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/buildChromium.xml |
311 |
--- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/buildChromium.xml 0000-00-00 00:00:00.000000000 +0000 |
312 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/buildChromium.xml 0000-00-00 00:00:00.000000000 +0000 |
313 |
@@ -35,12 +35,10 @@ |
314 |
<condition property="cefos" value="windows" else="${swt.os}"> |
315 |
<equals arg1="${swt.os}" arg2="win32"/> |
256 |
</condition> |
316 |
</condition> |
257 |
- <condition property="m_linux_ppc64le_test" value="${success_msg}" else="${fail_msg}"> |
317 |
- <property name="ceffile" value="cef_binary_3.3071.1649.g98725e6_${cefos}64_minimal.tar.bz2"/> |
258 |
+ <condition property="m_linux_powerpc64_test" value="${success_msg}" else="${fail_msg}"> |
318 |
- <mkdir dir="${tmphome}"/> |
259 |
<and> |
319 |
- <get src="http://opensource.spotify.com/cefbuilds/${ceffile}" dest="${tmphome}/${ceffile}" usetimestamp="true"/> |
260 |
- <length string="${m_linux_ppc64le_output}" when="greater" length="0"/> |
320 |
- <untar dest="${repo.src}/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_${swt.os}" overwrite="false" compression="bzip2" src="${tmphome}/${ceffile}"> |
261 |
- <matches pattern="x${m_linux_ppc64le_output}*" string="x${m_linux_ppc64le}"/> |
321 |
- <cutdirsmapper dirs="1"/> |
262 |
+ <length string="${m_linux_powerpc64_output}" when="greater" length="0"/> |
322 |
- </untar> |
263 |
+ <matches pattern="x${m_linux_powerpc64_output}*" string="x${m_linux_powerpc64}"/> |
323 |
+ <copy todir="${repo.src}/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_${swt.os}" overwrite="true"> |
264 |
</and> |
324 |
+ <fileset dir="${local.cefsource}"/> |
265 |
</condition> |
325 |
+ </copy> |
266 |
<condition property="m_mac_test" value="${success_msg}" else="${fail_msg}"> |
326 |
+ <patch patchfile="${local.patchfiles}/cef-patch" dir="${repo.src}/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_${swt.os}"/> |
|
|
327 |
</target> |
328 |
|
329 |
<target name="build_chromium" depends="init_fragment,get_version,get_cef"> |
330 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/build.rs eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/build.rs |
331 |
--- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/build.rs 0000-00-00 00:00:00.000000000 +0000 |
332 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/build.rs 0000-00-00 00:00:00.000000000 +0000 |
333 |
@@ -38,8 +38,8 @@ |
334 |
if cfg!(target_os = "macos") { |
335 |
cef_path.push("cef_macosx"); |
336 |
} |
337 |
- else if cfg!(target_os = "linux") { |
338 |
- cef_path.push("cef_linux"); |
339 |
+ else if cfg!(target_os = "freebsd") { |
340 |
+ cef_path.push("cef_freebsd"); |
341 |
} |
342 |
else if cfg!(target_os = "windows") { |
343 |
if std::env::var("CARGO_CFG_TARGET_ARCH").unwrap() == "x86" { |
344 |
@@ -58,11 +58,12 @@ |
345 |
panic!("cargo:warning=Extract and rename cef binary (minimal) distro to {:?}", cef_path); |
346 |
} |
347 |
|
348 |
- if cfg!(target_os = "linux") { |
349 |
+ if cfg!(target_os = "freebsd") { |
350 |
// println!("cargo:rustc-link-lib=gtk-x11-2.0"); |
351 |
// println!("cargo:rustc-link-lib=gdk-x11-2.0"); |
352 |
// println!("cargo:rustc-link-lib=gtk-3.so.0"); |
353 |
println!("cargo:rustc-link-lib=X11"); |
354 |
+ println!("cargo:rustc-link-search=/usr/local/lib"); |
355 |
} |
356 |
|
357 |
// Tell cargo to tell rustc to link the system shared library. |
358 |
@@ -97,14 +98,14 @@ |
359 |
} |
360 |
|
361 |
#[cfg(feature = "gen")] |
362 |
-#[cfg(target_os = "linux")] |
363 |
+#[cfg(target_os = "freebsd")] |
364 |
fn gen_os(cef_path: std::path::Display) { |
365 |
let _ = generator(cef_path) |
366 |
.header("cef_linux.h") |
367 |
.whitelist_type("_cef_main_args_t") |
368 |
.whitelist_type("_cef_window_info_t") |
369 |
.whitelist_function("cef_get_xdisplay") |
370 |
- .generate().expect("Failed to gencef linux") |
371 |
+ .generate().expect("Failed to gencef freebsd") |
372 |
.write_to_file(std::path::Path::new("src").join("cef").join("linux.rs")); |
373 |
} |
374 |
|
375 |
@@ -126,7 +127,7 @@ |
376 |
fn gen_cef(cef_path: std::path::Display) { |
377 |
use std::io::Write; |
378 |
#[cfg(target_os = "windows")] let gen = generator(cef_path).header("include/internal/cef_types_win.h"); |
379 |
- #[cfg(target_os = "linux")] let gen = generator(cef_path).header("include/internal/cef_types_linux.h"); |
380 |
+ #[cfg(target_os = "freebsd")] let gen = generator(cef_path).header("include/internal/cef_types_linux.h"); |
381 |
#[cfg(target_os = "macos")] let gen = generator(cef_path).header("include/internal/cef_types_mac.h"); |
382 |
let generated = gen |
383 |
.header("cef.h") |
384 |
@@ -166,14 +167,14 @@ |
385 |
.blacklist_type(".*XDisplay") |
386 |
.blacklist_type("VisualID") |
387 |
.blacklist_type(".*XEvent") |
388 |
- .raw_line("#[cfg(target_os = \"linux\")] pub mod linux;") |
389 |
- .raw_line("#[cfg(target_os = \"linux\")] pub use self::linux::_cef_window_info_t;") |
390 |
- .raw_line("#[cfg(target_os = \"linux\")] pub use self::linux::_cef_main_args_t;") |
391 |
- .raw_line("#[cfg(target_os = \"linux\")] pub type wchar_t = i32;") |
392 |
- .raw_line("#[cfg(target_os = \"linux\")] pub type char16 = i32;") |
393 |
- .raw_line("#[cfg(target_os = \"linux\")] pub type time_t = isize;") |
394 |
- .raw_line("#[cfg(target_os = \"linux\")] pub type int64 = ::std::os::raw::c_longlong;") |
395 |
- .raw_line("#[cfg(target_os = \"linux\")] pub type uint64 = ::std::os::raw::c_ulonglong;") |
396 |
+ .raw_line("#[cfg(target_os = \"freebsd\")] pub mod linux;") |
397 |
+ .raw_line("#[cfg(target_os = \"freebsd\")] pub use self::linux::_cef_window_info_t;") |
398 |
+ .raw_line("#[cfg(target_os = \"freebsd\")] pub use self::linux::_cef_main_args_t;") |
399 |
+ .raw_line("#[cfg(target_os = \"freebsd\")] pub type wchar_t = i32;") |
400 |
+ .raw_line("#[cfg(target_os = \"freebsd\")] pub type char16 = i32;") |
401 |
+ .raw_line("#[cfg(target_os = \"freebsd\")] pub type time_t = isize;") |
402 |
+ .raw_line("#[cfg(target_os = \"freebsd\")] pub type int64 = ::std::os::raw::c_longlong;") |
403 |
+ .raw_line("#[cfg(target_os = \"freebsd\")] pub type uint64 = ::std::os::raw::c_ulonglong;") |
404 |
.raw_line("#[cfg(target_os = \"macos\")] pub mod mac;") |
405 |
.raw_line("#[cfg(target_os = \"macos\")] pub use self::mac::_cef_window_info_t;") |
406 |
.raw_line("#[cfg(target_os = \"macos\")] pub use self::mac::_cef_main_args_t;") |
407 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/src/cef/mod.rs eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/src/cef/mod.rs |
408 |
--- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/src/cef/mod.rs 0000-00-00 00:00:00.000000000 +0000 |
409 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/src/cef/mod.rs 0000-00-00 00:00:00.000000000 +0000 |
410 |
@@ -16,14 +16,14 @@ |
411 |
#![allow(non_snake_case)] |
412 |
#![allow(non_camel_case_types)] |
413 |
#![allow(non_upper_case_globals)] |
414 |
-#[cfg(target_os = "linux")] pub mod linux; |
415 |
-#[cfg(target_os = "linux")] pub use self::linux::_cef_window_info_t; |
416 |
-#[cfg(target_os = "linux")] pub use self::linux::_cef_main_args_t; |
417 |
-#[cfg(target_os = "linux")] pub type wchar_t = i32; |
418 |
-#[cfg(target_os = "linux")] pub type char16 = i32; |
419 |
-#[cfg(target_os = "linux")] pub type time_t = isize; |
420 |
-#[cfg(target_os = "linux")] pub type int64 = ::std::os::raw::c_longlong; |
421 |
-#[cfg(target_os = "linux")] pub type uint64 = ::std::os::raw::c_ulonglong; |
422 |
+#[cfg(target_os = "freebsd")] pub mod linux; |
423 |
+#[cfg(target_os = "freebsd")] pub use self::linux::_cef_window_info_t; |
424 |
+#[cfg(target_os = "freebsd")] pub use self::linux::_cef_main_args_t; |
425 |
+#[cfg(target_os = "freebsd")] pub type wchar_t = i32; |
426 |
+#[cfg(target_os = "freebsd")] pub type char16 = i32; |
427 |
+#[cfg(target_os = "freebsd")] pub type time_t = isize; |
428 |
+#[cfg(target_os = "freebsd")] pub type int64 = ::std::os::raw::c_longlong; |
429 |
+#[cfg(target_os = "freebsd")] pub type uint64 = ::std::os::raw::c_ulonglong; |
430 |
#[cfg(target_os = "macos")] pub mod mac; |
431 |
#[cfg(target_os = "macos")] pub use self::mac::_cef_window_info_t; |
432 |
#[cfg(target_os = "macos")] pub use self::mac::_cef_main_args_t; |
433 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml |
434 |
--- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml 0000-00-00 00:00:00.000000000 +0000 |
435 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml 0000-00-00 00:00:00.000000000 +0000 |
436 |
@@ -15,7 +15,7 @@ |
437 |
[dependencies] |
438 |
chromium = { path = "../chromium_subp/" } |
439 |
|
440 |
-[target.'cfg(target_os = "linux")'.dependencies] |
441 |
+[target.'cfg(target_os = "freebsd")'.dependencies] |
442 |
x11 = "2.17.0" |
443 |
|
444 |
[target.'cfg(unix)'.dependencies] |
445 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/app.rs eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/app.rs |
446 |
--- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/app.rs 0000-00-00 00:00:00.000000000 +0000 |
447 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/app.rs 0000-00-00 00:00:00.000000000 +0000 |
448 |
@@ -12,7 +12,7 @@ |
449 |
********************************************************************************/ |
450 |
use cef; |
451 |
use utils; |
452 |
-#[cfg(target_os = "linux")] |
453 |
+#[cfg(target_os = "freebsd")] |
454 |
use gtk; |
455 |
|
456 |
use std::os::raw::{c_int, c_void}; |
457 |
@@ -76,7 +76,7 @@ |
458 |
browser |
459 |
} |
460 |
|
461 |
-#[cfg(target_os = "linux")] |
462 |
+#[cfg(target_os = "freebsd")] |
463 |
fn override_system_visual(visual: *mut c_void) { |
464 |
unsafe { |
465 |
let xvisual = gtk::gdk_x11_visual_get_xvisual(visual); |
466 |
@@ -85,12 +85,12 @@ |
467 |
} |
468 |
} |
469 |
|
470 |
-#[cfg(target_os = "linux")] |
471 |
+#[cfg(target_os = "freebsd")] |
472 |
extern "C" { |
473 |
pub fn cef_override_system_visual(visual_id: std::os::raw::c_ulong); |
474 |
} |
475 |
|
476 |
-#[cfg(target_os = "linux")] |
477 |
+#[cfg(target_os = "freebsd")] |
478 |
fn cef_window_info(hwnd: *mut c_void, w: c_int, h: c_int) -> cef::_cef_window_info_t { |
479 |
use std::os::raw::{c_uint}; |
480 |
let window_info = unsafe { |
481 |
@@ -112,7 +112,7 @@ |
482 |
window_info |
483 |
} |
484 |
|
485 |
-#[cfg(target_os = "linux")] |
486 |
+#[cfg(target_os = "freebsd")] |
487 |
pub fn set_window_parent(window_info: *mut cef::_cef_window_info_t, hwnd: *mut c_void, x: c_int, y: c_int, w: c_int, h: c_int) { |
488 |
use std::os::raw::{c_uint}; |
489 |
//unsafe {println!("orig window_info {} {:?}", hwnd, (*window_info)); }; |
490 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/lib.rs eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/lib.rs |
491 |
--- eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/lib.rs 0000-00-00 00:00:00.000000000 +0000 |
492 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/src/lib.rs 0000-00-00 00:00:00.000000000 +0000 |
493 |
@@ -12,7 +12,7 @@ |
494 |
********************************************************************************/ |
495 |
extern crate chromium; |
496 |
|
497 |
-#[cfg(target_os = "linux")] |
498 |
+#[cfg(target_os = "freebsd")] |
499 |
extern crate x11; |
500 |
#[cfg(unix)] |
501 |
extern crate nix; |
502 |
@@ -25,21 +25,21 @@ |
503 |
use chromium::socket; |
504 |
|
505 |
mod app; |
506 |
-#[cfg(target_os = "linux")] |
507 |
+#[cfg(target_os = "freebsd")] |
508 |
mod gtk; |
509 |
|
510 |
use std::os::raw::{c_char, c_int, c_void}; |
511 |
#[cfg(unix)] |
512 |
use std::collections::HashMap; |
513 |
|
514 |
-#[cfg(target_os = "linux")] |
515 |
+#[cfg(target_os = "freebsd")] |
516 |
unsafe extern fn xerror_handler_impl(_: *mut x11::xlib::Display, _event: *mut x11::xlib::XErrorEvent) -> c_int { |
517 |
//print!("X error received: "); |
518 |
//println!("type {}, serial {}, error_code {}, request_code {}, minor_code {}", |
519 |
// (*event).type_, (*event).serial, (*event).error_code, (*event).request_code, (*event).minor_code); |
520 |
0 |
521 |
} |
522 |
-#[cfg(target_os = "linux")] |
523 |
+#[cfg(target_os = "freebsd")] |
524 |
unsafe extern fn xioerror_handler_impl(_: *mut x11::xlib::Display) -> c_int { |
525 |
//println!("XUI error received"); |
526 |
0 |
527 |
@@ -67,7 +67,7 @@ |
528 |
if cfg!(target_family = "windows") { |
529 |
set_env_var(cef_path, "PATH", ";"); |
530 |
} |
531 |
- if cfg!(target_os = "linux") { |
532 |
+ if cfg!(target_os = "freebsd") { |
533 |
set_env_var(cef_path, "LD_LIBRARY_PATH", ":"); |
534 |
} |
535 |
if cfg!(target_os = "macos") { |
536 |
@@ -146,7 +146,7 @@ |
537 |
}; |
538 |
} |
539 |
|
540 |
-#[cfg(target_os = "linux")] |
541 |
+#[cfg(target_os = "freebsd")] |
542 |
fn do_initialize(main_args: cef::_cef_main_args_t, settings: cef::_cef_settings_t, app_raw: *mut cef::_cef_app_t) { |
543 |
unsafe { x11::xlib::XSetErrorHandler(Option::Some(xerror_handler_impl)) }; |
544 |
unsafe { x11::xlib::XSetIOErrorHandler(Option::Some(xioerror_handler_impl)) }; |
545 |
@@ -366,7 +366,7 @@ |
546 |
do_resize(win_handle, width, height); |
547 |
} |
548 |
|
549 |
-#[cfg(target_os = "linux")] |
550 |
+#[cfg(target_os = "freebsd")] |
551 |
fn do_resize(win_handle: *mut c_void, width: i32, height: i32) { |
552 |
use x11::xlib; |
553 |
|
554 |
@@ -642,7 +642,7 @@ |
555 |
} |
556 |
} |
557 |
|
558 |
-#[cfg(target_os = "linux")] |
559 |
+#[cfg(target_os = "freebsd")] |
560 |
fn do_set_focus(parent: *mut c_void, _focus: i32) { |
561 |
let root = unsafe { gtk::gtk_widget_get_toplevel(parent) }; |
562 |
//println!("<<<<<<<< set_focus {} {:?} {:?}", focus, parent, root); |
563 |
@@ -768,4 +768,4 @@ |
564 |
#[no_mangle] |
565 |
pub extern fn cefswt_go_back(browser: *mut cef::_cef_browser_t) { |
566 |
unsafe { (*browser).go_back.expect("null go_back")(browser) }; |
567 |
-} |
568 |
\ No newline at end of file |
569 |
+} |
267 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup |
570 |
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup |
268 |
--- eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000 |
571 |
--- eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000 |
269 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000 |
572 |
+++ eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000 |
270 |
@@ -103,7 +103,7 @@ |
573 |
@@ -108,7 +108,7 @@ |
271 |
xsi:type="predicates:NotPredicate"> |
574 |
xsi:type="predicates:NotPredicate"> |
272 |
<operand |
575 |
<operand |
273 |
xsi:type="predicates:NamePredicate" |
576 |
xsi:type="predicates:NamePredicate" |
Lines 279-285
Link Here
|
279 |
diff -ru eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf |
582 |
diff -ru eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf |
280 |
--- eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 |
583 |
--- eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 |
281 |
+++ eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 |
584 |
+++ eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 |
282 |
@@ -10,11 +10,11 @@ |
585 |
@@ -10,14 +10,14 @@ |
283 |
requires.2.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)) |
586 |
requires.2.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)) |
284 |
|
587 |
|
285 |
requires.3.namespace = org.eclipse.equinox.p2.iu |
588 |
requires.3.namespace = org.eclipse.equinox.p2.iu |
Lines 295-300
Link Here
|
295 |
requires.4.range = 0.0.0 |
598 |
requires.4.range = 0.0.0 |
296 |
-requires.4.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)) |
599 |
-requires.4.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)) |
297 |
+requires.4.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64)) |
600 |
+requires.4.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64)) |
|
|
601 |
|
602 |
requires.5.namespace = org.eclipse.equinox.p2.iu |
603 |
requires.5.name = org.eclipse.swt.gtk.linux.aarch64 |
298 |
diff -ru eclipse.platform.swt/pom.xml eclipse.platform.swt/pom.xml |
604 |
diff -ru eclipse.platform.swt/pom.xml eclipse.platform.swt/pom.xml |
299 |
--- eclipse.platform.swt/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
605 |
--- eclipse.platform.swt/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
300 |
+++ eclipse.platform.swt/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
606 |
+++ eclipse.platform.swt/pom.xml 0000-00-00 00:00:00.000000000 +0000 |
Lines 312-318
Link Here
|
312 |
</modules> |
618 |
</modules> |
313 |
</profile> |
619 |
</profile> |
314 |
<profile> |
620 |
<profile> |
315 |
@@ -118,7 +119,9 @@ |
621 |
@@ -119,7 +120,9 @@ |
316 |
<module>examples/org.eclipse.swt.examples.ole.win32</module> |
622 |
<module>examples/org.eclipse.swt.examples.ole.win32</module> |
317 |
<module>examples/org.eclipse.swt.examples.views</module> |
623 |
<module>examples/org.eclipse.swt.examples.views</module> |
318 |
<module>tests/org.eclipse.swt.tests.fragments.feature</module> |
624 |
<module>tests/org.eclipse.swt.tests.fragments.feature</module> |