[PATCH] fdo#60924: autoinstall gnome libraries
Marcos Souza (via Code Review)
gerrit at gerrit.libreoffice.org
Tue May 7 08:57:17 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3813
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/3813/1
fdo#60924: autoinstall gnome libraries
Change-Id: I0fd872d15a0c938d32aac185c3c00c5fb14a091a
---
M Repository.mk
M scp2/InstallModule_gnome.mk
D scp2/source/gnome/file_gnome.scp
M scp2/source/gnome/module_gnome.scp
4 files changed, 6 insertions(+), 94 deletions(-)
diff --git a/Repository.mk b/Repository.mk
index 9b8b3a4..37ccda7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -222,6 +222,12 @@
endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \
+ $(if $(ENABLE_EVOAB2),evoab) \
+ $(if $(ENABLE_GTK),vclplug_gtk) \
+ $(if $(ENABLE_GTK3),vclplug_gtk3) \
+ $(if $(ENABLE_GCONF),gconfbe1) \
+ $(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
+ $(if $(ENABLE_GIO),losessioninstall) \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \
@@ -379,7 +385,6 @@
calc \
dbp \
dbu \
- evoab \
filtertracer \
flash \
graphicfilter \
@@ -391,7 +396,6 @@
placeware \
pricing \
protocolhandler \
- qstart_gtk \
rpt \
rptui \
rptxml \
@@ -410,8 +414,6 @@
textfd \
updatecheckui \
$(if $(DISABLE_SCRIPTING),,vbahelper) \
- vclplug_gtk \
- vclplug_gtk3 \
vclplug_tde \
vclplug_kde \
vclplug_kde4 \
@@ -606,12 +608,10 @@
fastsax \
fpicker \
fps_office \
- gconfbe1 \
gdipluscanvas \
hatchwindowfactory \
i18nsearch \
ldapbe2 \
- losessioninstall \
macbe1 \
migrationoo2 \
migrationoo3 \
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
index 3a8dd51..716cb43 100644
--- a/scp2/InstallModule_gnome.mk
+++ b/scp2/InstallModule_gnome.mk
@@ -11,21 +11,6 @@
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
-$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
- ENABLE_EVOAB2 \
- ENABLE_GCONF \
- ENABLE_GIO \
- ENABLE_GNOMEVFS \
- ENABLE_GTK \
- ENABLE_GTK3 \
- ENABLE_LOCKDOWN \
- ENABLE_SYSTRAY_GTK \
-))
-
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\
- scp2/source/gnome/file_gnome \
-))
-
$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/gnome,\
scp2/source/gnome/module_gnome \
))
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
deleted file mode 100644
index 9f824d8..0000000
--- a/scp2/source/gnome/file_gnome.scp
+++ /dev/null
@@ -1,59 +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_GIO
-STD_LIB_FILE( gid_File_Lib_GIO, ucpgio1 )
-
-STD_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall)
-#endif
-
-#ifdef ENABLE_GNOMEVFS
-STD_LIB_FILE( gid_File_Lib_Gnomevfs, ucpgvfs1 )
-#endif
-
-#if (defined ENABLE_GCONF && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
-File gid_File_Share_Registry_Gnome_Xcd
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Share_Registry;
- Name = "gnome.xcd";
-End
-#endif
-
-#ifdef ENABLE_GCONF
-STD_LIB_FILE( gid_File_Lib_Gconfbe, gconfbe1 )
-#endif
-
-#ifdef ENABLE_SYSTRAY_GTK
-File gid_File_Lib_QStart_Gtk
- Name = LIBNAME(qstart_gtk);
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index b496ced..a301e21 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -39,28 +39,14 @@
XpdCheckSolaris = "SUNWgnome-vfs";
#endif
Files = (auto_Gnome_lib_ALL
-#ifdef ENABLE_EVOAB2
- gid_File_Lib_Evoab,
-#endif
#ifdef ENABLE_GTK
gid_File_Lib_Fps_Gnome,
- gid_File_Lib_Vclplug_Gtk,
-#endif
-#ifdef ENABLE_GTK3
- gid_File_Lib_Vclplug_Gtk3,
-#endif
-#ifdef ENABLE_SYSTRAY_GTK
- gid_File_Lib_QStart_Gtk,
#endif
#ifdef ENABLE_GNOMEVFS
gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application,
#endif
#ifdef ENABLE_GIO
gid_File_Lib_GIO,
- gid_File_Lib_Losessioninstall,
-#endif
-#ifdef ENABLE_GCONF
- gid_File_Lib_Gconfbe,
#endif
#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
gid_File_Share_Registry_Gnome_Xcd,
--
To view, visit https://gerrit.libreoffice.org/3813
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fd872d15a0c938d32aac185c3c00c5fb14a091a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza.org at gmail.com>
More information about the LibreOffice
mailing list