Backport cui/source/options/optjava.cxx fixes
This commit is contained in:
parent
794f20489a
commit
02973439c2
3 changed files with 101 additions and 2 deletions
41
CentOS-9/SOURCES/0001-cui-fix-without-java-build.patch
Normal file
41
CentOS-9/SOURCES/0001-cui-fix-without-java-build.patch
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
From af3963c32c63893949a3028396af90ee7d811e5b Mon Sep 17 00:00:00 2001
|
||||
From: Miklos Vajna <vmiklos@collabora.com>
|
||||
Date: Wed, 21 Jun 2023 12:06:42 +0200
|
||||
Subject: [PATCH 1/2] cui: fix --without-java build
|
||||
|
||||
This went wrong in commit 7795a2adc0a724220440dca997495043902f1384
|
||||
(Allow bootstrap variables in Java user classpath settings, 2nd try,
|
||||
2023-06-12), I assume that _rPath is always empty in the without-java
|
||||
case.
|
||||
|
||||
Change-Id: I8749f5bd30b0853a76fb9ccf5d1e7a8e4e23f1ba
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153386
|
||||
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
|
||||
Tested-by: Jenkins
|
||||
---
|
||||
cui/source/options/optjava.cxx | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
|
||||
index 17f128ce9b3b..7a537dfe4eed 100644
|
||||
--- a/cui/source/options/optjava.cxx
|
||||
+++ b/cui/source/options/optjava.cxx
|
||||
@@ -940,6 +940,7 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
|
||||
if ( m_sOldPath.isEmpty() )
|
||||
m_sOldPath = _rPath;
|
||||
m_xPathList->clear();
|
||||
+#if HAVE_FEATURE_JAVA
|
||||
if (!_rPath.isEmpty())
|
||||
{
|
||||
std::vector paths = jfw_convertUserPathList(_rPath);
|
||||
@@ -961,6 +962,7 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
|
||||
// select first entry
|
||||
m_xPathList->select(0);
|
||||
}
|
||||
+#endif
|
||||
SelectHdl_Impl(*m_xPathList);
|
||||
}
|
||||
|
||||
--
|
||||
2.39.3
|
||||
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
From 8b330bb761e05fcfabd5a30f8784046c93b91431 Mon Sep 17 00:00:00 2001
|
||||
From: Miklos Vajna <vmiklos@collabora.com>
|
||||
Date: Wed, 21 Jun 2023 16:16:57 +0200
|
||||
Subject: [PATCH 2/2] cui: don't build SvxJavaClassPathDlg::SetClassPath() for
|
||||
the non-java case
|
||||
|
||||
Since SvxJavaClassPathDlg::SetClassPath is only called from #if
|
||||
HAVE_FEATURE_JAVA code (in IMPL_LINK_NOARG(SvxJavaOptionsPage,
|
||||
ClassPathHdl_Impl, weld::Button&, void) in
|
||||
cui/source/options/optjava.cxx ) anyway, see
|
||||
<https://gerrit.libreoffice.org/c/core/+/153386/2#message-06ee95be419a14ee8f08035142b5718e0377d120>.
|
||||
|
||||
Change-Id: I0e5a21036ce048c18d408c07cce088dbab7fc030
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153396
|
||||
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
|
||||
Tested-by: Jenkins
|
||||
---
|
||||
cui/source/options/optjava.cxx | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
|
||||
index 7a537dfe4eed..64ba41c3fe0b 100644
|
||||
--- a/cui/source/options/optjava.cxx
|
||||
+++ b/cui/source/options/optjava.cxx
|
||||
@@ -935,12 +935,12 @@ OUString SvxJavaClassPathDlg::GetClassPath() const
|
||||
return sPath.makeStringAndClear();
|
||||
}
|
||||
|
||||
+#if HAVE_FEATURE_JAVA
|
||||
void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
|
||||
{
|
||||
if ( m_sOldPath.isEmpty() )
|
||||
m_sOldPath = _rPath;
|
||||
m_xPathList->clear();
|
||||
-#if HAVE_FEATURE_JAVA
|
||||
if (!_rPath.isEmpty())
|
||||
{
|
||||
std::vector paths = jfw_convertUserPathList(_rPath);
|
||||
@@ -962,8 +962,8 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
|
||||
// select first entry
|
||||
m_xPathList->select(0);
|
||||
}
|
||||
-#endif
|
||||
SelectHdl_Impl(*m_xPathList);
|
||||
}
|
||||
+#endif
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
--
|
||||
2.39.3
|
||||
|
||||
|
|
@ -269,6 +269,11 @@ Patch5: 0001-aarch64-failing-here.patch
|
|||
# backported
|
||||
Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
|
||||
Patch9: 0001-Adapt-test-code-to-cURL-8.2.0.patch
|
||||
# backported fix
|
||||
# https://gerrit.libreoffice.org/c/core/+/153386/2#message-06ee95be419a14ee8f08035142b5718e0377d120
|
||||
Patch10: 0001-cui-fix-without-java-build.patch
|
||||
Patch11: 0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch
|
||||
|
||||
# not upstreamed
|
||||
Patch500: 0001-disable-libe-book-support.patch
|
||||
|
||||
|
|
@ -1544,7 +1549,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
|
|||
%{baseinstdir}/program/libdeployment.so
|
||||
%{baseinstdir}/program/libdeploymentgui.so
|
||||
%{baseinstdir}/program/libdlgprovlo.so
|
||||
%{baseinstdir}/program/libexpwraplo.so
|
||||
#%{baseinstdir}/program/libexpwraplo.so
|
||||
%{baseinstdir}/program/libfps_officelo.so
|
||||
%{baseinstdir}/program/gdbtrace
|
||||
%{baseinstdir}/program/gengal
|
||||
|
|
@ -1576,6 +1581,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
|
|||
%{baseinstdir}/program/libdesktop_detectorlo.so
|
||||
%{baseinstdir}/program/libdict_ja.so
|
||||
%{baseinstdir}/program/libdict_zh.so
|
||||
%{baseinstdir}/program/libdocmodello.so
|
||||
%{baseinstdir}/program/libdrawinglayerlo.so
|
||||
%{baseinstdir}/program/libdrawinglayercorelo.so
|
||||
%{baseinstdir}/program/libeditenglo.so
|
||||
|
|
@ -2017,7 +2023,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
|
|||
%{baseinstdir}/program/impress.abignore
|
||||
%endif
|
||||
%{baseinstdir}/program/libPresentationMinimizerlo.so
|
||||
%{baseinstdir}/program/libPresenterScreenlo.so
|
||||
#%{baseinstdir}/program/libPresenterScreenlo.so
|
||||
%{baseinstdir}/program/libwpftimpresslo.so
|
||||
%dir %{baseinstdir}/share/config/soffice.cfg/simpress
|
||||
%{baseinstdir}/share/config/soffice.cfg/simpress/effects.xml
|
||||
|
|
@ -2260,6 +2266,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
|||
* Tue Aug 08 2023 Sandino Araico Sánchez <sandino@sandino.net> 1:7.6.0.2-1
|
||||
- 7.6.0.2
|
||||
- Removed some failing unit tests
|
||||
- Backport cui/source/options/optjava.cxx fixes
|
||||
|
||||
* Mon Jul 31 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.5.5.2-1
|
||||
- 7.5.5.2
|
||||
|
|
|
|||
Loading…
Reference in a new issue