libreoffice/jvmfwk-disable-gcj.diff
Tomáš Chvátal 1bc1315770 - Version bump to 4.1.2.3: bugfix release only.
- Version bump to 4.1.2.3: bugfix release only.

- Version bump to 4.1.2.3: bugfix release only.

- Version bump to 4.1.2.3: bugfix release only.

- Version bump to 4.1.2.3: bugfix release only.

- Version bump to 4.1.2.3: bugfix release only.

- Version bump to 4.1.2.3: bugfix release only.

- Version bump to 4.1.2.3: bugfix release only.

- Version bump to 4.1.2.3: bugfix release only.

- Version bump to 4.1.2.3: bugfix release only.
- Remove upstreamed patch buildfix-neon-0.30.0.diff.
- Adjust patch jvmfwk-disable-gcj.diff to reflect current state.

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=55
2013-10-08 16:48:00 +00:00

22 lines
1.3 KiB
Diff

diff -urN libreoffice-4.1.2.3.old/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml libreoffice-4.1.2.3/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
--- libreoffice-4.1.2.3.old/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 2013-10-08 16:50:15.977432391 +0200
+++ libreoffice-4.1.2.3/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 2013-10-08 16:51:47.260432381 +0200
@@ -35,9 +35,6 @@
<vendor name="Blackdown Java-Linux Team">
<minVersion>1.5.0</minVersion>
</vendor>
- <vendor name="Free Software Foundation, Inc.">
- <minVersion>1.5.0</minVersion>
- </vendor>
<vendor name="BEA Systems, Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
@@ -48,7 +45,6 @@
<library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
<library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
<library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
- <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
<library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
</plugins>
</javaSelection>