Repository.mk | 4 -
bin/distro-install-file-lists | 2
scp2/InstallModule_ooo.mk | 1
scp2/source/ooo/module_filter.scp | 51 -----------------------
setup_native/source/packinfo/packinfo_office.txt | 15 ------
5 files changed, 2 insertions(+), 71 deletions(-)
New commits:
commit dc2d33dd903590ca37246376acea7cab5befc06b
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sun Feb 12 08:07:00 2017 +0100
AutoInstall oox filter data packages to ooo module
Change-Id: Ib7b0773ee2b347d81d3f8894ea3063c6d6f18d90
Reviewed-on: https://gerrit.libreoffice.org/34168
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/Repository.mk b/Repository.mk
index 8b4205d..988a218 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -799,8 +799,6 @@ $(eval $(call gb_Helper_register_packages, \
instsetoo_native_setup \
$(if $(ENABLE_OOENV),instsetoo_native_ooenv) \
odk_headers_generated \
- oox_customshapes \
- oox_generated \
postprocess_images \
postprocess_registry \
readlicense_oo_readmes \
@@ -896,6 +894,8 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extras_tplwizstyles \
framework_dtd \
$(if $(filter $(OS),MACOSX),infoplist) \
+ oox_customshapes \
+ oox_generated \
package_dtd \
sd_web \
sfx2_emojiconfig \
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 2960f5f..eece72d 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -78,7 +78,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
rm -f common_list.txt
for module in gid_Module_Root gid_Module_Root_Brand \
gid_Module_Root_Files_[0-9] \
- gid_Module_Filter \
gid_Module_Root_Hack \
gid_Module_Oo_Linguistic \
gid_Module_Root_Extension_Dictionary_* \
@@ -394,7 +393,6 @@ else
create_package_directory gid_Module_Root_Files_Images
pkg/libreoffice-common
create_package_directory gid_Module_Oo_Linguistic
pkg/libreoffice-common
create_package_directory gid_Module_Optional_Xsltfiltersamples
pkg/libreoffice-common
- create_package_directory gid_Module_Filter
pkg/libreoffice-common
create_package_directory gid_Module_Optional_Grfflt
pkg/libreoffice-draw
create_package_directory gid_Module_Prg_Calc_Bin
pkg/libreoffice-calc
create_package_directory gid_Module_Prg_Math_Bin
pkg/libreoffice-math
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index ba85431..51c2a62 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
scp2/source/ooo/module_lang_template \
scp2/source/ooo/profileitem_ooo \
scp2/source/ooo/scpaction_ooo \
- scp2/source/ooo/module_filter \
$(if $(filter-out MACOSX WNT,$(OS)), \
scp2/source/ooo/module_libreofficekit \
) \
diff --git a/scp2/source/ooo/module_filter.scp
b/scp2/source/ooo/module_filter.scp
deleted file mode 100644
index bc19b91..0000000
--- a/scp2/source/ooo/module_filter.scp
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "macros.inc"
-
-Module gid_Module_Filter
- Name = "Filter Data";
- Description = "Filter Data";
- PackageInfo = "packinfo_office.txt";
- ParentID = gid_Module_Root_Brand;
- Styles = (HIDDEN_ROOT);
- Dirs = (gid_Dir_Share_Filter);
- Files = (
- gid_File_Dat_OoxDrawingmlAdjNames,
- gid_File_Dat_OoxDrawingmlCsPresets,
- gid_File_Dat_VmlShapeTypes);
-End
-
-Directory gid_Dir_Share_Filter
- ParentID = gid_Brand_Dir_Share;
- DosName = "filter";
-End
-
-File gid_File_Dat_OoxDrawingmlAdjNames
- TXT_FILE_BODY;
- Dir = gid_Dir_Share_Filter;
- Name = "oox-drawingml-adj-names";
- Styles = (PACKED);
-End
-
-File gid_File_Dat_OoxDrawingmlCsPresets
- TXT_FILE_BODY;
- Dir = gid_Dir_Share_Filter;
- Name = "oox-drawingml-cs-presets";
- Styles = (PACKED);
-End
-
-File gid_File_Dat_OoxVmlShapeTypes
- TXT_FILE_BODY;
- Dir = gid_Dir_Share_Filter;
- Name = "vml-shape-types";
- Styles = (PACKED);
-End
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/packinfo/packinfo_office.txt
b/setup_native/source/packinfo/packinfo_office.txt
index a8f8491..b6cace4 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -1163,21 +1163,6 @@ packageversion = "%PACKAGEVERSION"
End
Start
-module = "gid_Module_Filter"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-filter-data"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-filter-data"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION
%PACKAGEVERSION-%PACKAGEREVISION"
-linuxpatchrequires = ""
-copyright = "2017 The Document Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "Filter data for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
-Start
module = "gid_Module_Reportbuilder"
solarispackagename =
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-report-builder"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
