strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fdo#60924: autoinstall kde libraries

Browse source 
Change-Id: I4c67301b99c2eb066695fc1e85c1e16ea5902d9f
This commit is contained in:
Matúš Kukan 2013-05-04 17:34:10 +02:00
parent d0e099fb5f
commit 4004342ef9
4 changed files with 2 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Repository.mk
View file

@ -218,6 +218,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
endif endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \
$(if $(ENABLE_KDE),kdebe1) \
$(if $(ENABLE_KDE4),kde4be1) \
)) ))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
@ -601,8 +603,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
gdipluscanvas \ gdipluscanvas \
hatchwindowfactory \ hatchwindowfactory \
i18nsearch \ i18nsearch \
kdebe1 \
kde4be1 \
ldapbe2 \ ldapbe2 \
losessioninstall \ losessioninstall \
macbe1 \ macbe1 \

9
scp2/InstallModule_kde.mk
View file

@ -11,15 +11,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/kde))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/kde,kde)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/kde,kde))
$(eval $(call gb_InstallModule_define_if_set,scp2/kde,\
ENABLE_KDE \
ENABLE_KDE4 \
))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/kde,\
scp2/source/kde/file_kde \
))
$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/kde,\ $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/kde,\
scp2/source/kde/module_kde \ scp2/source/kde/module_kde \
)) ))

35
scp2/source/kde/file_kde.scp
View file

@ -1,35 +0,0 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#include "macros.inc"
#ifdef ENABLE_KDE
STD_LIB_FILE( gid_File_Lib_Kdebe, kdebe1 )
#endif
#ifdef ENABLE_KDE4
STD_LIB_FILE( gid_File_Lib_Kde4be, kde4be1 )
#endif

12
scp2/source/kde/module_kde.scp
View file

@ -29,7 +29,6 @@
#include "AutoInstallLibs/kde" #include "AutoInstallLibs/kde"
#if defined( ENABLE_KDE ) || defined( ENABLE_KDE4 )
Module gid_Module_Optional_Kde Module gid_Module_Optional_Kde
ParentID = gid_Module_Optional; ParentID = gid_Module_Optional;
Default = YES; Default = YES;
@ -37,16 +36,5 @@ Module gid_Module_Optional_Kde
MOD_NAME_DESC(MODULE_OPTIONAL_KDE); MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
Styles = (); Styles = ();
Files = (auto_Kde_Lib_ALL Files = (auto_Kde_Lib_ALL
#ifdef ENABLE_KDE
gid_File_Lib_Kdebe
#ifdef ENABLE_KDE4
,
#endif // ENABLE_KDE4
#endif // ENABLE_KDE
#ifdef ENABLE_KDE4
gid_File_Lib_Kde4be
#endif // ENABLE_KDE4
); );
End End
#endif