scp2/InstallModule_impress.mk | 1 +
scp2/source/impress/module_impress.scp | 12 ++++++++++++
sd/Package_xml.mk | 1 +
3 files changed, 14 insertions(+)
New commits:
commit af65c54f9c2ca7750a9466e21745efb9b449ec78
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Mar 3 17:15:54 2025 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Mar 4 08:43:00 2025 +0100
LOK: add OpenGL transitions to impress package
This is a follow-up to b83387a55410a0f7701b3cb7898ef15a36668e4c
that added the necessary files to instdir, when
ENABLE_OPENGL_TRANSITIONS was not TRUE. That variable is unset
for LOKit/COOL for various reasons:
1) disabled for MPL-only build
2) disabled without X11
So I add the files from instdir to impress deb/rpm package based on the
conditions:
1) the target operating system is LINUX, and
2) USING_X11 is not defined.
That is the LOKit/COOL case, and I hope it will not interfere with
anything else.
Change-Id: Ia04249c5ed609b2d8e7695ae6e8dd648cdf9b825
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182438
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk
index fc097b5e13eb..80e8c363f234 100644
--- a/scp2/InstallModule_impress.mk
+++ b/scp2/InstallModule_impress.mk
@@ -17,6 +17,7 @@ $(eval $(call
gb_InstallModule_use_auto_install_libs,scp2/impress,\
$(eval $(call gb_InstallModule_define_if_set,scp2/impress,\
ENABLE_MACOSX_SANDBOX \
+ USING_X11 \
))
$(eval $(call gb_InstallModule_add_templates,scp2/impress,\
diff --git a/scp2/source/impress/module_impress.scp
b/scp2/source/impress/module_impress.scp
index ca335d6973d9..3d91f589b913 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -38,6 +38,9 @@ Module gid_Module_Prg_Impress_Bin
Files = (auto_impress_ALL,
gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,
gid_File_Share_Registry_Impress_Xcd,
+#if defined LINUX && !defined USING_X11
+ gid_File_Share_Registry_Ogltrans_Xcd,
+#endif
gid_File_Tmp_Userinstall_Impress_Inf);
End
@@ -77,4 +80,13 @@ Module gid_Module_Prg_Impress_Other_Reg
Default = YES;
End
+#if defined LINUX && !defined USING_X11
+File gid_File_Share_Registry_Ogltrans_Xcd
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Brand_Dir_Share_Registry;
+ Name = "ogltrans.xcd";
+End
+#endif
+
#include "alllangmodules_impress.inc"
diff --git a/sd/Package_xml.mk b/sd/Package_xml.mk
index 555d46021bb7..30eb90674db9 100644
--- a/sd/Package_xml.mk
+++ b/sd/Package_xml.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Package_Package,sd_xml,$(SRCDIR)/sd/xml))
$(eval $(call
gb_Package_add_files,sd_xml,$(LIBO_SHARE_FOLDER)/config/soffice.cfg/simpress,\
effects.xml \
transitions.xml \
+ $(if $(filter LINUX,$(OS)),$(if $(USING_X11),,transitions-ogl.xml)) \
layoutlist.xml \
objectlist.xml \
styles.xml \
