From eb358d77291eba677141bab113dc27d7aabb0f3e Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 15 Apr 2024 11:44:04 +0200
Subject: Merging upstream version 4:24.2.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 solenv/bin/assemble-flatpak-appdata.sh | 1 +
 solenv/gbuild/JavaClassSet.mk          | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/assemble-flatpak-appdata.sh b/solenv/bin/assemble-flatpak-appdata.sh
index 4896cf3f20..84b5f53992 100755
--- a/solenv/bin/assemble-flatpak-appdata.sh
+++ b/solenv/bin/assemble-flatpak-appdata.sh
@@ -41,6 +41,7 @@ cat <<\EOF >"${1?}"org.libreoffice.LibreOffice.appdata.xml
   you can easily share documents with users of other popular office suites
   without worrying about compatibility.</p>
  </description>
+ <launchable type="desktop-id">org.libreoffice.LibreOffice.desktop</launchable>
  <url type="homepage">http://www.libreoffice.org/discover/libreoffice/</url>
  <url type="bugtracker">https://bugs.documentfoundation.org/</url>
  <url type="donation">https://donate.libreoffice.org/</url>
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 84fbcc13c3..8acf120dd6 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -19,7 +19,7 @@
 
 gb_JavaClassSet_JAVACCOMMAND = $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVACFLAGS) \
     -encoding utf8 \
-    --release $(1) \
+    $(if $(MODULAR_JAVA),--release $(1),-source $(1) -target $(1)) \
     -Xlint:-options \
     -Xlint:unchecked
 
@@ -51,7 +51,7 @@ $(call gb_Helper_abbreviate_dirs,\
 			-d $(call gb_JavaClassSet_get_classdir,$(2)) \
 			@$$RESPONSEFILE &&) \
 		rm -f $$RESPONSEFILE &&) \
-		$(if $(T_MODULENAME),\
+		$(if $(MODULAR_JAVA),$(if $(T_MODULENAME),\
 			RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
 				$(T_JAVA9FILES)) && \
 			$(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,9) \
@@ -61,7 +61,7 @@ $(call gb_Helper_abbreviate_dirs,\
 				$(if $(T_MODULENAME),--patch-module $(T_MODULENAME)="$(subst $(WHITESPACE),$(gb_CLASSPATHSEP),$(strip $(dir $(PACKAGEDIRS))))") \
 				-d $(call gb_JavaClassSet_get_classdir,$(2)) \
 				@$$RESPONSEFILE &&) \
-			rm -f $$RESPONSEFILE &&) \
+			rm -f $$RESPONSEFILE &&)) \
 	touch $(1))
 
 endef
-- 
cgit v1.2.3