LibreOffice/core
1
0
Fork 0
mirror of https://github.com/LibreOffice/core.git synced 2025-07-26 08:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

LOK: add OpenGL transitions to impress package

Browse Source 
This is a follow-up to b83387a554
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit af65c54f9c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182452
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
This commit is contained in:
Andras Timar
2025-03-03 17:15:54 +01:00
parent 6c7593e036
commit f78a20ea16
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scp2/InstallModule_impress.mk
View File

@ -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,\

12
scp2/source/impress/module_impress.scp
View File

@ -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"

1
sd/Package_xml.mk
View File

@ -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 \