diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | scp2/source/ooo/file_extra_ooo.scp | 2 | ||||
| -rw-r--r-- | vcl/Package_fontunxppds.mk | 1 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/configuration/ppds/SGENT42.PS | 24 |
5 files changed, 0 insertions, 49 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 395274dc0a21..16315935a35c 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -607,7 +607,6 @@ export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@ export WINDOWS_SDK_WILANGID=@WINDOWS_SDK_WILANGID@ export WINDRES=@WINDRES@ export WINEGCC=@WINEGCC@ -export WITHOUT_PPDS=@WITHOUT_PPDS@ export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@ export WITH_EXTENSION_INTEGRATION=@WITH_EXTENSION_INTEGRATION@ export WITH_EXTRA_EXTENSIONS=@WITH_EXTRA_EXTENSIONS@ diff --git a/configure.ac b/configure.ac index 07eb557d03db..99eaf4bb9dec 100644 --- a/configure.ac +++ b/configure.ac @@ -1523,13 +1523,6 @@ AC_ARG_WITH(fonts, known to be available on the system then you should use this option.]), ,) -AC_ARG_WITH(ppds, - AS_HELP_STRING([--without-ppds], - [Removes Postscript Printer definition files from LibreOffice - installation set, for people building for specific distributions where - PPDs are known to be already available (every recent distro with CUPS backend).]), -,) - AC_ARG_WITH(epm, AS_HELP_STRING([--with-epm], [Decides which epm to use. Default is to use the one from the system if @@ -11569,20 +11562,6 @@ AC_SUBST(WITH_FONTS) AC_DEFINE_UNQUOTED([TEST_FONTS_MISSING], $TEST_FONTS_MISSING) dnl =================================================================== -dnl Test whether to include ppds -dnl =================================================================== -AC_MSG_CHECKING([whether to include PPDs]) -if test "$with_ppds" != "no"; then - AC_MSG_RESULT([yes]) - WITHOUT_PPDS= -else - AC_MSG_RESULT([no]) - WITHOUT_PPDS=TRUE - SCPDEFS="$SCPDEFS -DWITHOUT_PPDS" -fi -AC_SUBST(WITHOUT_PPDS) - -dnl =================================================================== dnl Test whether to include extra galleries dnl =================================================================== AC_MSG_CHECKING([whether to include extra galleries]) diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 43cf3bb578a6..e4d5e8864bc0 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -76,14 +76,12 @@ End #ifdef GUIBASE_UNX -#ifndef WITHOUT_PPDS File gid_File_Extra_Fontunxppds Dir = FILELIST_DIR; TXT_FILE_BODY; Styles = (FILELIST); Name = "vcl_fontunxppds.filelist"; End -#endif File gid_File_Extra_Fontunxpsprint Dir = FILELIST_DIR; diff --git a/vcl/Package_fontunxppds.mk b/vcl/Package_fontunxppds.mk index 2d9ea466d24c..0902bcb42809 100644 --- a/vcl/Package_fontunxppds.mk +++ b/vcl/Package_fontunxppds.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Package_Package,vcl_fontunxppds,$(SRCDIR)/vcl/unx/generic/print $(eval $(call gb_Package_add_files,vcl_fontunxppds,$(LIBO_SHARE_FOLDER)/psprint/driver,\ SGENPRT.PS \ - SGENT42.PS \ )) # vim: set noet sw=4 ts=4: diff --git a/vcl/unx/generic/printer/configuration/ppds/SGENT42.PS b/vcl/unx/generic/printer/configuration/ppds/SGENT42.PS deleted file mode 100644 index 1225ea5ea375..000000000000 --- a/vcl/unx/generic/printer/configuration/ppds/SGENT42.PS +++ /dev/null @@ -1,24 +0,0 @@ -*PPD-Adobe: "4.0" -*% -*% 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/. -*% -*% This file incorporates work covered by the following license notice: -*% -*% Licensed to the Apache Software Foundation (ASF) under one or more -*% contributor license agreements. See the NOTICE file distributed -*% with this work for additional information regarding copyright -*% ownership. The ASF licenses this file to you under the Apache -*% License, Version 2.0 (the "License")*% you may not use this file -*% except in compliance with the License. You may obtain a copy of -*% the License at http://www.apache.org/licenses/LICENSE-2.0 . -*% - -*Product: "(Generic Printer T42)" -*ModelName: "Generic Printer (T42 enabled)" -*NickName: "Generic Printer (T42 enabled)" -*TTRasterizer: Type42 -*Include: "./SGENPRT.PS" |