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