summaryrefslogtreecommitdiff
path: root/java/eclipse/files
diff options
context:
space:
mode:
Diffstat (limited to 'java/eclipse/files')
-rw-r--r--java/eclipse/files/eclipse.in2
-rw-r--r--java/eclipse/files/patch-eclipse-platform-parent12
-rw-r--r--java/eclipse/files/patch-eclipse.platform.releng6
-rw-r--r--java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder16
-rw-r--r--java/eclipse/files/patch-eclipse.platform.resources6
-rw-r--r--java/eclipse/files/patch-eclipse.platform.swt12
-rw-r--r--java/eclipse/files/patch-eclipse.platform.swt.binaries8
-rw-r--r--java/eclipse/files/patch-eclipse.platform.ui2
-rw-r--r--java/eclipse/files/patch-production14
9 files changed, 32 insertions, 46 deletions
diff --git a/java/eclipse/files/eclipse.in b/java/eclipse/files/eclipse.in
index 476350acca8a..42d2238d5ec4 100644
--- a/java/eclipse/files/eclipse.in
+++ b/java/eclipse/files/eclipse.in
@@ -6,4 +6,4 @@
#
# $FreeBSD$
#
-exec %%DATADIR%%/eclipse "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" exec %%DATADIR%%/eclipse "$@"
diff --git a/java/eclipse/files/patch-eclipse-platform-parent b/java/eclipse/files/patch-eclipse-platform-parent
index 84e0e67d321c..674913b6dd17 100644
--- a/java/eclipse/files/patch-eclipse-platform-parent
+++ b/java/eclipse/files/patch-eclipse-platform-parent
@@ -5,11 +5,11 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml
'eclipiserun-repo' repository, such as for computing .api-descriptions and
generating API Tools reports.
-->
-- <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.14-I-builds/</eclipserun-repo>
-+ <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.14/</eclipserun-repo>
+- <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.15-I-builds/</eclipserun-repo>
++ <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.15/</eclipserun-repo>
-- <comparator.repo>https://download.eclipse.org/eclipse/updates/4.14-I-builds</comparator.repo>
-+ <comparator.repo>https://download.eclipse.org/eclipse/updates/4.14</comparator.repo>
+- <comparator.repo>https://download.eclipse.org/eclipse/updates/4.15-I-builds</comparator.repo>
++ <comparator.repo>https://download.eclipse.org/eclipse/updates/4.15</comparator.repo>
<!--
NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.
@@ -36,8 +36,8 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml
For maintenance streams should always be "M-builds".
Ideally, this value would be provided by the environment, see bug 489789.
-->
-- <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.14-I-builds</eclipse-p2-repo.url>
-+ <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.14</eclipse-p2-repo.url>
+- <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.15-I-builds</eclipse-p2-repo.url>
++ <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.15</eclipse-p2-repo.url>
</properties>
<repositories>
<repository>
diff --git a/java/eclipse/files/patch-eclipse.platform.releng b/java/eclipse/files/patch-eclipse.platform.releng
index ac582eb15b46..90edfe676e80 100644
--- a/java/eclipse/files/patch-eclipse.platform.releng
+++ b/java/eclipse/files/patch-eclipse.platform.releng
@@ -14,7 +14,7 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x
download-size="0"
install-size="0"
version="0.0.0"
-@@ -355,9 +355,9 @@
+@@ -362,9 +362,9 @@
unpack="false"/>
<plugin
@@ -27,7 +27,7 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x
download-size="0"
install-size="0"
version="0.0.0"
-@@ -394,9 +394,9 @@
+@@ -401,9 +401,9 @@
unpack="false"/>
<plugin
@@ -40,7 +40,7 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x
download-size="0"
install-size="0"
version="0.0.0"
-@@ -458,9 +458,9 @@
+@@ -465,9 +465,9 @@
unpack="false"/>
<plugin
diff --git a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
index c55c2ef70d6d..f1174d3f2585 100644
--- a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
+++ b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
@@ -98,10 +98,10 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/mai
org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
--org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.13-linux-gtk-x86_64.tar.gz
-+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.13-freebsd-gtk-amd64.tar.gz
- org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.13-win32-x86_64.zip
- org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.13-macosx-cocoa-x86_64.tar.gz
+-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.14-linux-gtk-x86_64.tar.gz
++org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.14-freebsd-gtk-amd64.tar.gz
+ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.14-win32-x86_64.zip
+ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.14-macosx-cocoa-x86_64.tar.gz
diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh 0000-00-00 00:00:00.000000000 +0000
@@ -110,11 +110,11 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/mai
mkdir -p workarea/${buildId}/eclipse-testing
--cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-platform-4.13-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
-+cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-platform-4.13-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+-cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-platform-4.14-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
++cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-platform-4.14-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
--cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-SDK-4.13-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
-+cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-SDK-4.13-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/
+-cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-SDK-4.14-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
++cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-SDK-4.14-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/
cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
diff --git a/java/eclipse/files/patch-eclipse.platform.resources b/java/eclipse/files/patch-eclipse.platform.resources
index ae4a03dcd441..c771fc9ae4a1 100644
--- a/java/eclipse/files/patch-eclipse.platform.resources
+++ b/java/eclipse/files/patch-eclipse.platform.resources
@@ -67,7 +67,7 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.
<version>1.2.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-@@ -37,9 +37,9 @@
+@@ -33,9 +33,9 @@
<resolver>p2</resolver>
<environments>
<environment>
@@ -79,7 +79,7 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.
</environment>
</environments>
</configuration>
-@@ -54,7 +54,7 @@
+@@ -50,7 +50,7 @@
<property>
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
<name>native</name>
@@ -88,7 +88,7 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.
</property>
</activation>
<build>
-@@ -67,10 +67,10 @@
+@@ -63,10 +63,10 @@
<phase>process-resources</phase>
<configuration>
<target>
diff --git a/java/eclipse/files/patch-eclipse.platform.swt b/java/eclipse/files/patch-eclipse.platform.swt
index 84a9befe8d4c..4391bcaa9b11 100644
--- a/java/eclipse/files/patch-eclipse.platform.swt
+++ b/java/eclipse/files/patch-eclipse.platform.swt
@@ -124,7 +124,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library
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
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000
-@@ -101,16 +101,18 @@
+@@ -103,16 +103,18 @@
WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
@@ -146,7 +146,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library
ifndef NO_STRIP
# -s = Remove all symbol table and relocation information from the executable.
-@@ -253,10 +255,6 @@
+@@ -255,10 +257,6 @@
cp $(ALL_SWT_LIBS) $(OUTPUT_DIR)
ifeq ($(BUILD_WEBKIT2EXTENSION),yes)
@# Copy webextension into it's own folder, but create folder first.
@@ -174,15 +174,15 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/ecl
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
--- 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
+++ 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
-@@ -157,7 +157,7 @@
+@@ -120,7 +120,7 @@
* https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/
* https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript
*/
-- static final int ASYNC_EXEC_TIMEOUT_MS = 10000; // Webkit2.
+- static final int ASYNC_EXEC_TIMEOUT_MS = 10000;
+ static final int ASYNC_EXEC_TIMEOUT_MS = 100; // Dirty hack for webkit issues on FreeBSD
- static boolean bug522733FirstInstanceCreated = false; //Webkit2 workaround for Bug 522733
-
+ /** Workaround for bug 522733 */
+ static boolean bug522733FirstInstanceCreated = false;
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
--- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000
diff --git a/java/eclipse/files/patch-eclipse.platform.swt.binaries b/java/eclipse/files/patch-eclipse.platform.swt.binaries
index f42af3ca37b7..24771f048882 100644
--- a/java/eclipse/files/patch-eclipse.platform.swt.binaries
+++ b/java/eclipse/files/patch-eclipse.platform.swt.binaries
@@ -83,7 +83,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64
Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64; singleton:=true
- Bundle-Version: 3.113.0.qualifier
+ Bundle-Version: 3.114.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
@@ -26,8 +26,8 @@
@@ -141,7 +141,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64
<groupId>org.eclipse.swt</groupId>
- <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
+ <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId>
- <version>3.113.0-SNAPSHOT</version>
+ <version>3.114.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
@@ -171,7 +171,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power
Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64;singleton:=true
- Bundle-Version: 3.113.0.qualifier
+ Bundle-Version: 3.114.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
@@ -26,8 +26,8 @@
@@ -212,7 +212,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power
<groupId>org.eclipse.swt</groupId>
- <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId>
+ <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64</artifactId>
- <version>3.113.0-SNAPSHOT</version>
+ <version>3.114.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
diff --git a/java/eclipse/files/patch-eclipse.platform.ui b/java/eclipse/files/patch-eclipse.platform.ui
index 86999a4aefdd..c5ca5579e242 100644
--- a/java/eclipse/files/patch-eclipse.platform.ui
+++ b/java/eclipse/files/patch-eclipse.platform.ui
@@ -1,7 +1,7 @@
diff -ru eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml
--- eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml 0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml 0000-00-00 00:00:00.000000000 +0000
-@@ -37,9 +37,9 @@
+@@ -33,9 +33,9 @@
<resolver>p2</resolver>
<environments>
<environment>
diff --git a/java/eclipse/files/patch-production b/java/eclipse/files/patch-production
deleted file mode 100644
index 32f05dffec4c..000000000000
--- a/java/eclipse/files/patch-production
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru production/checkConfigIIUs.sh production/checkConfigIIUs.sh
---- production/checkConfigIIUs.sh 0000-00-00 00:00:00.000000000 +0000
-+++ production/checkConfigIIUs.sh 0000-00-00 00:00:00.000000000 +0000
-@@ -39,8 +39,8 @@
-
- declare -a PLATFORMS=( \
- cocoa.macosx.x86_64 \
--gtk.linux.ppc64le \
--gtk.linux.x86_64 \
-+gtk.freebsd.powerpc64 \
-+gtk.freebsd.amd64 \
- win32.win32.x86_64 \
- )
- NPLATFORMS=${#PLATFORMS[@]}
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-04 08:37:07 +0000