From 3d4ae8919e4134cf5f7af4832d516329d06203c4 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 1 Dec 2020 13:05:50 +0100
Subject: [PATCH] Resolves: rhbz#1900004 Support Red Hat, Inc. as Java vendor

(Backporting <https://git.libreoffice.org/core/+/
c4aa8b366fb879b0dd37241e70c5842825305620%5E%21> "tdf#124503: Support JRE
installations with unknown java.vendor property" would have caused lots of merge
conflicts, so just add "Red Hat, Inc." as a cheap fix.)

Change-Id: I343dd50a1d5ecfea478c66d58a5a72a09d5aa65b
---
 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 3 +++
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx         | 1 +
 2 files changed, 4 insertions(+)

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 969ed01c6c21..d0a5bd114ace 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -40,5 +40,8 @@
     <vendor name="Azul Systems, Inc.">
       <minVersion>1.6.0</minVersion>
     </vendor>
+    <vendor name="Red Hat, Inc.">
+      <minVersion>1.6.0</minVersion>
+    </vendor>
   </vendorInfos>
 </javaSelection>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index a08b237b62cd..b000684242a2 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -49,6 +49,7 @@ BEGIN_VENDOR_MAP()
     VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
 #endif
     VENDOR_MAP_ENTRY("Azul Systems, Inc.", OtherInfo)
+    VENDOR_MAP_ENTRY("Red Hat, Inc.", OtherInfo)
 END_VENDOR_MAP()
 
 
-- 
2.28.0