remove --without-ppds option now
This was intended for the time we had a huge bunch of third
party ppds, those are now long gone.
SGENT42.PS is now the same as SGENPRT.PS since
commit 871d8e0f27
Date: Mon Nov 25 14:13:40 2013 +0000
Resolves: rhbz#188467 default to Type42
so get rid of that one, leaving just the single SGENPRT.PS
fallback ppd
Change-Id: I851f25b2789b8aa101acd18193cd01e8cded4d09
This commit is contained 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@
|
||||
|
||||
@@ -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
|
||||
@@ -11568,20 +11561,6 @@ fi
|
||||
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 ===================================================================
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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"
|
||||
Reference in New Issue
Block a user