diff options
Diffstat (limited to 'java/eclipse/files/patch-rt.equinox.bundles')
| -rw-r--r-- | java/eclipse/files/patch-rt.equinox.bundles | 153 |
1 files changed, 64 insertions, 89 deletions
diff --git a/java/eclipse/files/patch-rt.equinox.bundles b/java/eclipse/files/patch-rt.equinox.bundles index 83e3118cbced..b707c3069768 100644 --- a/java/eclipse/files/patch-rt.equinox.bundles +++ b/java/eclipse/files/patch-rt.equinox.bundles @@ -5,11 +5,54 @@ diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFE org.eclipse.equinox.internal.security.credentials;x-internal:=true, org.eclipse.equinox.internal.security.storage;x-internal:=true, org.eclipse.equinox.internal.security.storage.friends;version="1.0.0";x-friends:="org.eclipse.equinox.security.ui", -- org.eclipse.equinox.internal.security.storage.provider;x-friends:="org.eclipse.equinox.security.linux.x86_64", -+ org.eclipse.equinox.internal.security.storage.provider;x-friends:="org.eclipse.equinox.security.freebsd.amd64", +- org.eclipse.equinox.internal.security.storage.provider;x-friends:="org.eclipse.equinox.security.linux", ++ org.eclipse.equinox.internal.security.storage.provider;x-friends:="org.eclipse.equinox.security.freebsd", org.eclipse.equinox.security.auth;version="1.0.0", org.eclipse.equinox.security.auth.credentials;version="1.0.0", org.eclipse.equinox.security.auth.module;version="1.0.0", +diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/META-INF/MANIFEST.MF +--- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 ++++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +@@ -1,14 +1,14 @@ + Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %fragmentName +-Bundle-SymbolicName: org.eclipse.equinox.security.linux;singleton:=true ++Bundle-SymbolicName: org.eclipse.equinox.security.freebsd;singleton:=true + Bundle-Version: 1.0.200.qualifier + Bundle-Vendor: %providerName + Fragment-Host: org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)" + Bundle-RequiredExecutionEnvironment: JavaSE-11 + Bundle-Localization: fragment +-Eclipse-PlatformFilter: (osgi.os=linux) +-Export-Package: org.eclipse.equinox.internal.security.linux;x-internal:=true +-Automatic-Module-Name: org.eclipse.equinox.security.linux ++Eclipse-PlatformFilter: (osgi.os=freebsd) ++Export-Package: org.eclipse.equinox.internal.security.freebsd;x-internal:=true ++Automatic-Module-Name: org.eclipse.equinox.security.freebsd + Eclipse-BundleShape: dir + Require-Bundle: com.sun.jna;bundle-version="5.8.0" +diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/pom.xml rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/pom.xml +--- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/pom.xml 0000-00-00 00:00:00.000000000 +0000 ++++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd/pom.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -19,7 +19,7 @@ + <relativePath>../../</relativePath> + </parent> + <groupId>org.eclipse.equinox</groupId> +- <artifactId>org.eclipse.equinox.security.linux</artifactId> ++ <artifactId>org.eclipse.equinox.security.freebsd</artifactId> + <version>1.0.200-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +@@ -32,7 +32,7 @@ + <resolver>p2</resolver> + <environments> + <environment> +- <os>linux</os> ++ <os>freebsd</os> + <ws>gtk</ws> + </environment> + </environments> diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project --- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 @@ -24,112 +67,42 @@ diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/. diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF --- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 -@@ -1,13 +1,13 @@ +@@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName -Bundle-SymbolicName: org.eclipse.equinox.security.linux.x86_64;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.security.freebsd.amd64;singleton:=true - Bundle-Version: 1.1.300.qualifier + Bundle-Version: 1.1.500.qualifier Bundle-Vendor: %providerName Fragment-Host: org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: fragment -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) --Export-Package: org.eclipse.equinox.internal.security.linux;x-internal:=true -Automatic-Module-Name: org.eclipse.equinox.security.linux.x86_64 +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64)) -+Export-Package: org.eclipse.equinox.internal.security.freebsd;x-internal:=true +Automatic-Module-Name: org.eclipse.equinox.security.freebsd.amd64 Eclipse-BundleShape: dir -diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile ---- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile 0000-00-00 00:00:00.000000000 +0000 -@@ -1,7 +1,7 @@ - LIBSECRET_CFLAGS = `pkg-config --cflags libsecret-1` - LIBSECRET_LIBS = `pkg-config --libs libsecret-1` - --CFLAGS := $(CFLAGS) -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" $(LIBSECRET_CFLAGS) -+CFLAGS := $(CFLAGS) -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/freebsd" $(LIBSECRET_CFLAGS) - LDFLAGS := $(LDFLAGS) -shared $(LIBSECRET_LIBS) - - all: ../libkeystorelinuxnative.so -@@ -10,7 +10,7 @@ - rm ../libkeystorelinuxnative.so ../target/keystoreLinuxNative.o - - ../libkeystorelinuxnative.so: ../target/keystoreLinuxNative.o -- $(CC) $(LDFLAGS) -o $@ $< -+ $(CC) $(LDFLAGS) -s -o $@ $< - - ../target/keystoreLinuxNative.o: ../target keystoreLinuxNative.c - $(CC) -c $(CFLAGS) -o $@ $(TESTFLAGS) keystoreLinuxNative.c +diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/p2.inf rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/p2.inf +--- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 ++++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 +@@ -1,2 +1,2 @@ + requires.0.namespace=org.eclipse.equinox.p2.iu +-requires.0.name=org.eclipse.equinox.security.linux +\ No newline at end of file ++requires.0.name=org.eclipse.equinox.security.freebsd diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml --- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -18,7 +18,7 @@ +@@ -19,7 +19,7 @@ <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.equinox.security.linux.x86_64</artifactId> + <artifactId>org.eclipse.equinox.security.freebsd.amd64</artifactId> - <version>1.1.300-SNAPSHOT</version> + <version>1.1.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -@@ -35,9 +35,9 @@ - <resolver>p2</resolver> - <environments> - <environment> -- <os>linux</os> -+ <os>freebsd</os> - <ws>gtk</ws> -- <arch>x86_64</arch> -+ <arch>amd64</arch> - </environment> - </environments> - </configuration> -@@ -51,7 +51,7 @@ - <property> - <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( --> - <name>native</name> -- <value>gtk.linux.x86_64</value> -+ <value>gtk.freebsd.amd64</value> - </property> - </activation> - <build> -@@ -64,7 +64,7 @@ - <phase>process-resources</phase> - <configuration> - <target> -- <exec executable="make" newenvironment="false" dir="keystorelinuxnative/"/> -+ <exec executable="gmake" newenvironment="false" dir="keystorelinuxnative/"/> - </target> - </configuration> - <goals> -diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties ---- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties 0000-00-00 00:00:00.000000000 +0000 -@@ -12,7 +12,7 @@ - # Julien HENRY - Linux implementation - ############################################################################### - --## Linux libsecure integration module -+## FreeBSD libsecure integration module - getMasterPasswordError=Secure storage was unable to retrieve the master password from the password storage. If secure storage was created using a different user account, you'll have to switch back to that account. Alternatively, you can use the password recovery, or delete and re-create secure storage. - saveMasterPasswordError=Secure storage was unable to save the master password. --newMasterPasswordGenerated=New secure storage master password was generated (Linux libsecret integration module). -+newMasterPasswordGenerated=New secure storage master password was generated (FreeBSD libsecret integration module). -diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties ---- rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties 0000-00-00 00:00:00.000000000 +0000 -+++ rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties 0000-00-00 00:00:00.000000000 +0000 -@@ -29,7 +29,7 @@ - generate.plugin@org.eclipse.osgi.source=org.eclipse.osgi - generate.plugin@org.eclipse.osgi.util.source=org.eclipse.osgi.util - generate.plugin@org.eclipse.equinox.security.win32.x86_64.source=org.eclipse.equinox.security.win32.x86_64 --generate.plugin@org.eclipse.equinox.security.linux.x86_64.source=org.eclipse.equinox.security.linux.x86_64 -+generate.plugin@org.eclipse.equinox.security.freebsd.amd64.source=org.eclipse.equinox.security.freebsd.amd64 - generate.plugin@org.eclipse.equinox.security.macosx.source=org.eclipse.equinox.security.macosx - generate.plugin@org.eclipse.equinox.security.source=org.eclipse.equinox.security - generate.plugin@org.eclipse.equinox.security.ui.source=org.eclipse.equinox.security.ui diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml --- rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml 0000-00-00 00:00:00.000000000 +0000 @@ -137,10 +110,10 @@ diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt unpack="false"/> <plugin -- id="org.eclipse.equinox.security.linux.x86_64" +- id="org.eclipse.equinox.security.linux" - os="linux" - arch="x86_64" -+ id="org.eclipse.equinox.security.freebsd.amd64" ++ id="org.eclipse.equinox.security.freebsd" + os="freebsd" + arch="amd64" download-size="0" @@ -150,10 +123,10 @@ diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt unpack="false"/> <plugin -- id="org.eclipse.equinox.security.linux.x86_64.source" +- id="org.eclipse.equinox.security.linux.source" - os="linux" - arch="x86_64" -+ id="org.eclipse.equinox.security.freebsd.amd64.source" ++ id="org.eclipse.equinox.security.freebsd.source" + os="freebsd" + arch="amd64" download-size="0" @@ -162,11 +135,13 @@ diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt diff -ru rt.equinox.bundles/pom.xml rt.equinox.bundles/pom.xml --- rt.equinox.bundles/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -84,7 +84,7 @@ +@@ -84,8 +84,8 @@ <module>bundles/org.eclipse.equinox.security</module> <module>bundles/org.eclipse.equinox.security.macosx</module> <module>bundles/org.eclipse.equinox.security.win32.x86_64</module> +- <module>bundles/org.eclipse.equinox.security.linux</module> - <module>bundles/org.eclipse.equinox.security.linux.x86_64</module> ++ <module>bundles/org.eclipse.equinox.security.freebsd</module> + <module>bundles/org.eclipse.equinox.security.freebsd.amd64</module> <module>bundles/org.eclipse.equinox.bidi</module> <module>bundles/org.eclipse.equinox.cm</module> |