From patchwork Tue Aug 25 09:50:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3397 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPm3XXqz3x16 for ; Tue, 25 Aug 2020 09:50:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPk1Ck2zv9; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPj5PXVz30Wc; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPh1jcWz2xmg for ; Tue, 25 Aug 2020 09:50:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPg0PjQzkJ; Tue, 25 Aug 2020 09:50:47 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=DBnTrIeJgAAFdjoiwSKQlyh8e1DcEPBxjMS01L0npj0=; b=Oi8C0jcdhgcdtvHFN8rSUAMySYsuuA+k7t9NwT33HMQDHhwwZJQIA0BSQtyyRRgmjziaCU Ild9jZtR4V7R9UBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=DBnTrIeJgAAFdjoiwSKQlyh8e1DcEPBxjMS01L0npj0=; b=U3XoGtyaR1Y6klMul0HeUHKkQ4PQPuLGNt+KRgi2fcUMA88yIvc8da2haSYRcbDERSGwa8 z9M87fIDQjj6OcOtDQ/tijqO6JGMV92JUdpVXyENVc0vQHO5IwlLNXfZ4otVT1urBnG/2V qfC/qrUdZAiR6/eKj5YlmEy4KEQ0v+eC+jRaXGfeW4jt9WB6UKptC/f7AA7elvZus94qgf Dg73sNvBO4PLjXGp0I6Ov+TAHgUCitvpHzpZGI78VG7lH8lljcUdw7lbPhPStNxzo4e9so fs1PswMl7TulnnQex4o1Q2dT4qBp4CmFymr8XzK8duvP/yJgE67OHfph2Xgw3g== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 01/12] fontconfig: update to 2.13.1 Date: Tue, 25 Aug 2020 09:50:29 +0000 Message-Id: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer , Khem Raj Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/common/fontconfig | 2 +- lfs/fontconfig | 17 +++-- ...ts-with-integer-width-macros-from-TS.patch | 72 ------------------- 3 files changed, 11 insertions(+), 80 deletions(-) delete mode 100644 src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch diff --git a/config/rootfiles/common/fontconfig b/config/rootfiles/common/fontconfig index e567d6df3..85fe2f442 100644 --- a/config/rootfiles/common/fontconfig +++ b/config/rootfiles/common/fontconfig @@ -33,7 +33,7 @@ usr/bin/fc-validate #usr/lib/libfontconfig.la #usr/lib/libfontconfig.so usr/lib/libfontconfig.so.1 -usr/lib/libfontconfig.so.1.9.2 +usr/lib/libfontconfig.so.1.12.0 #usr/lib/pkgconfig/fontconfig.pc #usr/share/doc/fontconfig #usr/share/doc/fontconfig/fontconfig-devel diff --git a/lfs/fontconfig b/lfs/fontconfig index 01ac3bb69..cb3f55de4 100644 --- a/lfs/fontconfig +++ b/lfs/fontconfig @@ -24,10 +24,10 @@ include Config -VER = 2.12.1 +VER = 2.13.1 THISAPP = fontconfig-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ce55e525c37147eee14cc2de6cc09f6c +$(DL_FILE)_MD5 = 36cdea1058ef13cbbfdabe6cb019dc1c install : $(TARGET) @@ -69,10 +69,13 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && rm -vf src/fcobjshash.h + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-docs cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch b/src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch deleted file mode 100644 index cad71707a..000000000 --- a/src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 11 Dec 2016 14:32:00 -0800 -Subject: [PATCH] Avoid conflicts with integer width macros from TS - 18661-1:2014 - -glibc 2.25+ has now defined these macros in -https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - fontconfig/fontconfig.h | 2 +- - src/fcobjs.h | 2 +- - src/fcobjshash.gperf | 2 +- - src/fcobjshash.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -Index: fontconfig-2.12.1/fontconfig/fontconfig.h -=================================================================== ---- fontconfig-2.12.1.orig/fontconfig/fontconfig.h -+++ fontconfig-2.12.1/fontconfig/fontconfig.h -@@ -128,7 +128,8 @@ typedef int FcBool; - #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION - - /* Adjust outline rasterizer */ --#define FC_CHAR_WIDTH "charwidth" /* Int */ -+#define FC_CHARWIDTH "charwidth" /* Int */ -+#define FC_CHAR_WIDTH FC_CHARWIDTH - #define FC_CHAR_HEIGHT "charheight"/* Int */ - #define FC_MATRIX "matrix" /* FcMatrix */ - -Index: fontconfig-2.12.1/src/fcobjs.h -=================================================================== ---- fontconfig-2.12.1.orig/src/fcobjs.h -+++ fontconfig-2.12.1/src/fcobjs.h -@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL) - FC_OBJECT (RGBA, FcTypeInteger, NULL) - FC_OBJECT (SCALE, FcTypeDouble, NULL) - FC_OBJECT (MINSPACE, FcTypeBool, NULL) --FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL) -+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL) - FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) - FC_OBJECT (MATRIX, FcTypeMatrix, NULL) - FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) -Index: fontconfig-2.12.1/src/fcobjshash.gperf -=================================================================== ---- fontconfig-2.12.1.orig/src/fcobjshash.gperf -+++ fontconfig-2.12.1/src/fcobjshash.gperf -@@ -44,7 +44,7 @@ int id; - "rgba",FC_RGBA_OBJECT - "scale",FC_SCALE_OBJECT - "minspace",FC_MINSPACE_OBJECT --"charwidth",FC_CHAR_WIDTH_OBJECT -+"charwidth",FC_CHARWIDTH_OBJECT - "charheight",FC_CHAR_HEIGHT_OBJECT - "matrix",FC_MATRIX_OBJECT - "charset",FC_CHARSET_OBJECT -Index: fontconfig-2.12.1/src/fcobjshash.h -=================================================================== ---- fontconfig-2.12.1.orig/src/fcobjshash.h -+++ fontconfig-2.12.1/src/fcobjshash.h -@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char - {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT}, - {-1}, - #line 47 "fcobjshash.gperf" -- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT}, -+ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT}, - #line 48 "fcobjshash.gperf" - {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT}, - #line 55 "fcobjshash.gperf" From patchwork Tue Aug 25 09:50:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3398 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPn1JT2z3x24 for ; Tue, 25 Aug 2020 09:50:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPk2kw0zvT; Tue, 25 Aug 2020 09:50:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPj6DCRz30Wm; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPh26whz2yDq for ; Tue, 25 Aug 2020 09:50:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPh0t9qzm4; Tue, 25 Aug 2020 09:50:48 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fWAAkHz9mS8jKQSPNQjaQMxTg7ugj45k8h2YdSHdCR8=; b=xsA5T78079Slk4SNOaT/Q5kP+Yvt4I2xtaahIlNGPpFKiav/BtCub0y+a4mXYHi0xogitl pQov+hb9qa8vEMDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fWAAkHz9mS8jKQSPNQjaQMxTg7ugj45k8h2YdSHdCR8=; b=nK5Uu+Ytq9uyHngzEnG6gnMM223sCpJJDgbwOuXXXErQh2iR1BEEHY7QB5hmNdYn9K+R6v ag2fZDvNh1YXY45MTIjMUQ8TCjoIFx5f18D2BWsW3OBpxbNphOeIYt3CD6h7JNje+zTeW6 uca4awHSeVTRJh8wjdWffb8ksMqyhvwRvDTRs3/8fHEU2M280DiyTQHLkDydUwVIROoIOG j5gAk39vjupzKuI2E08MIGpqzj7mnUCSSFgnRwPdc7Bmbg0E83/c0MJjd1/VN36jVTiGgQ YMNPQxwtdN7T7Ts9ObbptDZNLQWm/YRVNe6VgioL7AZU8Orp5mxBscou/a8bhA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 02/12] freetype: Update to 2.10.2 Date: Tue, 25 Aug 2020 09:50:30 +0000 Message-Id: <20200825095040.3854-2-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/common/freetype | 5 ++++- lfs/freetype | 14 ++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/common/freetype b/config/rootfiles/common/freetype index 38bff842d..4d72ec357 100644 --- a/config/rootfiles/common/freetype +++ b/config/rootfiles/common/freetype @@ -18,6 +18,8 @@ #usr/include/freetype2/freetype/ftcffdrv.h #usr/include/freetype2/freetype/ftchapters.h #usr/include/freetype2/freetype/ftcid.h +#usr/include/freetype2/freetype/ftcolor.h +#usr/include/freetype2/freetype/ftdriver.h #usr/include/freetype2/freetype/fterrdef.h #usr/include/freetype2/freetype/fterrors.h #usr/include/freetype2/freetype/ftfntfmt.h @@ -36,6 +38,7 @@ #usr/include/freetype2/freetype/ftmoderr.h #usr/include/freetype2/freetype/ftotval.h #usr/include/freetype2/freetype/ftoutln.h +#usr/include/freetype2/freetype/ftparams.h #usr/include/freetype2/freetype/ftpfr.h #usr/include/freetype2/freetype/ftrender.h #usr/include/freetype2/freetype/ftsizes.h @@ -57,7 +60,7 @@ #usr/lib/libfreetype.la #usr/lib/libfreetype.so usr/lib/libfreetype.so.6 -usr/lib/libfreetype.so.6.13.0 +usr/lib/libfreetype.so.6.17.2 #usr/lib/pkgconfig/freetype2.pc #usr/share/aclocal/freetype2.m4 #usr/share/man/man1/freetype-config.1 diff --git a/lfs/freetype b/lfs/freetype index 795ba8378..4106d22ee 100644 --- a/lfs/freetype +++ b/lfs/freetype @@ -24,10 +24,10 @@ include Config -VER = 2.7.1 +VER = 2.10.2 THISAPP = freetype-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 78701bee8d249578d83bb9a2f3aa3616 +$(DL_FILE)_MD5 = 7c0d5a39f232d7eb9f9d7da76bf08074 install : $(TARGET) @@ -70,7 +70,13 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && sed -ri "s:.*(AUX_MODULES.*valid):\1:" modules.cfg + cd $(DIR_APP) && sed -r "s:.*(#.*SUBPIXEL_RENDERING) .*:\1:" \ + -i include/freetype/config/ftoption.h + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-freetype-config \ + --disable-static cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) From patchwork Tue Aug 25 09:50:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3399 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPn524jz3x2V for ; Tue, 25 Aug 2020 09:50:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPl0TPjzvZ; Tue, 25 Aug 2020 09:50:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPk71DHz30Wc; Tue, 25 Aug 2020 09:50:50 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPh6LTqz2xbY for ; Tue, 25 Aug 2020 09:50:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPh1bkpzs0; Tue, 25 Aug 2020 09:50:48 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MDhUXiOS/xbQm4S6DBbE90u7sFP4GMwQ89sJZzwiEzY=; b=yfdpWzXtsD49RvQCDR6SB7mqvLmKxYMXcFAjChgek25Dpq9JucmyicCDKzpHECnhW7qluZ RzHAwlJCt8/Z2QCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MDhUXiOS/xbQm4S6DBbE90u7sFP4GMwQ89sJZzwiEzY=; b=eNeFzzxb0U+7vR3lnMU7fGhztd43M+8xjuGJV2EyEBpWI8Q6Uiw4EvFTi17kjw8Noqae/r T6Dupj3MiitQ7nVkqYRPUmAqlVWvBY4pNjW9l0SMmVv8Yq/pySoIJxfvZQrHNZhc/NGMKL W5Db/hGamfRNzyHIefPS/IXqYBKCSI9xbzOIc6UPFsy0cOOTkHwklrZsNgUNR0Hc4iiCKQ 2BgFKMMNtLo1+miYlJX4EH1VVCcTTlPq29ZCGEaKgwgnFiaYfFYgYDTXcx/KL/uZ7iztgS Nojdkh4AjTqsvN4QFKRjw9B2Ew9yQ7ilTk+InpJKr6OdZsuafu5HnGO1nYxGWg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 03/12] openjpeg: New package Date: Tue, 25 Aug 2020 09:50:31 +0000 Message-Id: <20200825095040.3854-3-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This package adds encoding/decoding JPEG-2000 image files Signed-off-by: Michael Tremer --- config/rootfiles/common/openjpeg | 15 ++++++ lfs/openjpeg | 82 ++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 98 insertions(+) create mode 100644 config/rootfiles/common/openjpeg create mode 100644 lfs/openjpeg diff --git a/config/rootfiles/common/openjpeg b/config/rootfiles/common/openjpeg new file mode 100644 index 000000000..bafa62afc --- /dev/null +++ b/config/rootfiles/common/openjpeg @@ -0,0 +1,15 @@ +usr/bin/opj_compress +usr/bin/opj_decompress +usr/bin/opj_dump +#usr/include/openjpeg-2.3 +#usr/include/openjpeg-2.3/openjpeg.h +#usr/include/openjpeg-2.3/opj_config.h +#usr/include/openjpeg-2.3/opj_stdint.h +#usr/lib/libopenjp2.so +usr/lib/libopenjp2.so.2.3.1 +usr/lib/libopenjp2.so.7 +#usr/lib/openjpeg-2.3 +#usr/lib/openjpeg-2.3/OpenJPEGConfig.cmake +#usr/lib/openjpeg-2.3/OpenJPEGTargets-release.cmake +#usr/lib/openjpeg-2.3/OpenJPEGTargets.cmake +#usr/lib/pkgconfig/libopenjp2.pc diff --git a/lfs/openjpeg b/lfs/openjpeg new file mode 100644 index 000000000..3dbbe3530 --- /dev/null +++ b/lfs/openjpeg @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.3.1 + +THISAPP = openjpeg-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 3b9941dc7a52f0376694adb15a72903f + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && mkdir -pv build + cd $(DIR_APP)/build && cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=RELEASE \ + -DBUILD_STATIC_LIBS=OFF \ + .. + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 2a6198e05..e77bebfa1 100755 --- a/make.sh +++ b/make.sh @@ -1253,6 +1253,7 @@ buildipfire() { lfsmake2 cmake lfsmake2 libjpeg lfsmake2 libjpeg-compat + lfsmake2 openjpeg lfsmake2 libexif lfsmake2 libpng lfsmake2 libtiff From patchwork Tue Aug 25 09:50:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3400 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPp16TJz3x16 for ; Tue, 25 Aug 2020 09:50:54 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPl4BKpzvm; Tue, 25 Aug 2020 09:50:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPl0cmkz30X7; Tue, 25 Aug 2020 09:50:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPh72qZz2xmg for ; Tue, 25 Aug 2020 09:50:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPh61ljzm4; Tue, 25 Aug 2020 09:50:48 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wvJsuG+po+E0cNk55ZOONtkDhpmmHV5z01qwE2j+N7I=; b=imGi1pG12LvePa7j5+V9QwJgXgNKJ7tr1jqleRjVX8n4yA6jWb+tsYZB/OuMIG8EMR8Z2o msJo4VqIzUSCktCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wvJsuG+po+E0cNk55ZOONtkDhpmmHV5z01qwE2j+N7I=; b=HTMqBwxOoUR92kj8uI3Zyh/mhijwOSqVzWmPxGLADxV8p2vQ1+GELlXrV9O1TUg0LhG6CZ IK9ehVJPR0v+1N41R3tHwOP8URI7BDPJr/OlRms5HWeIx68CIq5HadIRGV4xYlkZn4KtHm GY8QRKJobd2smt+B533bJQa1cxKQYvDP+ou7NKEhbJwlD65z8ZyhPRqkgvETEq5NlNFy6U og89CnvGR0Hl46foJoYuZG8itPkV7xESKPUcX4VTfdzahGQO0qZPVUou4+vjsvR1PkmWaS qVkHExjgTT5lx7vMzqOPxQW1tFxcRzlc3kR9JiXPbGctdvgSHEpx+j4e5lVtUg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 04/12] qpdf: Update to 10.0.1 Date: Tue, 25 Aug 2020 09:50:32 +0000 Message-Id: <20200825095040.3854-4-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/common/qpdf | 25 +++++++++++++++++++++++-- lfs/qpdf | 6 +++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/common/qpdf b/config/rootfiles/common/qpdf index 9776c1627..9f6d18ee6 100644 --- a/config/rootfiles/common/qpdf +++ b/config/rootfiles/common/qpdf @@ -4,23 +4,44 @@ usr/bin/qpdf #usr/include/qpdf #usr/include/qpdf/Buffer.hh #usr/include/qpdf/BufferInputSource.hh +#usr/include/qpdf/ClosedFileInputSource.hh #usr/include/qpdf/Constants.h #usr/include/qpdf/DLL.h #usr/include/qpdf/FileInputSource.hh #usr/include/qpdf/InputSource.hh +#usr/include/qpdf/JSON.hh #usr/include/qpdf/Pipeline.hh #usr/include/qpdf/Pl_Buffer.hh #usr/include/qpdf/Pl_Concatenate.hh #usr/include/qpdf/Pl_Count.hh +#usr/include/qpdf/Pl_DCT.hh #usr/include/qpdf/Pl_Discard.hh #usr/include/qpdf/Pl_Flate.hh +#usr/include/qpdf/Pl_QPDFTokenizer.hh +#usr/include/qpdf/Pl_RunLength.hh #usr/include/qpdf/Pl_StdioFile.hh #usr/include/qpdf/PointerHolder.hh +#usr/include/qpdf/QIntC.hh #usr/include/qpdf/QPDF.hh +#usr/include/qpdf/QPDFAcroFormDocumentHelper.hh +#usr/include/qpdf/QPDFAnnotationObjectHelper.hh +#usr/include/qpdf/QPDFCryptoImpl.hh +#usr/include/qpdf/QPDFCryptoProvider.hh +#usr/include/qpdf/QPDFDocumentHelper.hh #usr/include/qpdf/QPDFExc.hh +#usr/include/qpdf/QPDFFormFieldObjectHelper.hh +#usr/include/qpdf/QPDFNameTreeObjectHelper.hh +#usr/include/qpdf/QPDFNumberTreeObjectHelper.hh #usr/include/qpdf/QPDFObjGen.hh #usr/include/qpdf/QPDFObject.hh #usr/include/qpdf/QPDFObjectHandle.hh +#usr/include/qpdf/QPDFObjectHelper.hh +#usr/include/qpdf/QPDFOutlineDocumentHelper.hh +#usr/include/qpdf/QPDFOutlineObjectHelper.hh +#usr/include/qpdf/QPDFPageDocumentHelper.hh +#usr/include/qpdf/QPDFPageLabelDocumentHelper.hh +#usr/include/qpdf/QPDFPageObjectHelper.hh +#usr/include/qpdf/QPDFSystemError.hh #usr/include/qpdf/QPDFTokenizer.hh #usr/include/qpdf/QPDFWriter.hh #usr/include/qpdf/QPDFXRefEntry.hh @@ -32,8 +53,8 @@ usr/bin/qpdf #usr/lib/libqpdf.a #usr/lib/libqpdf.la #usr/lib/libqpdf.so -usr/lib/libqpdf.so.17 -usr/lib/libqpdf.so.17.0.0 +usr/lib/libqpdf.so.28 +usr/lib/libqpdf.so.28.0.1 #usr/lib/pkgconfig/libqpdf.pc #usr/share/doc/qpdf #usr/share/doc/qpdf/qpdf-manual.html diff --git a/lfs/qpdf b/lfs/qpdf index 3a6bd96ed..16259a50c 100644 --- a/lfs/qpdf +++ b/lfs/qpdf @@ -24,7 +24,7 @@ include Config -VER = 6.0.0 +VER = 10.0.1 THISAPP = qpdf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e014bd3ecf1c4d1a520bbc14d84ac20e +$(DL_FILE)_MD5 = eb7fb7c6cd5d3036bf4f7a5e3f44d995 install : $(TARGET) @@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure --prefix=/usr --disable-static cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) From patchwork Tue Aug 25 09:50:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3401 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPp4ZMTz3x2X for ; Tue, 25 Aug 2020 09:50:54 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPl6fxdzvw; Tue, 25 Aug 2020 09:50:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPl1N4xz30X9; Tue, 25 Aug 2020 09:50:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPj0YgLz2xbY for ; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPh6lCxzv9; Tue, 25 Aug 2020 09:50:48 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+yO06t6J7ipW+DLjBGSLEeHHBpNnp2pSGWagCvXn9mU=; b=iSAYGOWVF+U/cgSKRHAdQlKdVyA70P/9FYotHQcGyZza37Zj1FLjgx2qCGCfm8abGhFmJh TV5ms2qQweYUI3Ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+yO06t6J7ipW+DLjBGSLEeHHBpNnp2pSGWagCvXn9mU=; b=Br3xUIk4Ccm0SPot+ba3vcjXD8lzN4bitSFwaLNETebikijz9vow4StZHRVq9BjAKe0Jki 32eycBukEIqL1n5mPy+p47Nvltx0u0xZlfgxc5AfvtNLHtsZC848R6gewZ5JA2m2ckYaIL ehrronCyInMFww9zMH31Y/UfXF2JZQIlGF9wzwCy0dDHHlKXN90pI1Gfgbc6xsx8F6IHam BShm+acUS5eufXbt5tH8/tvF7K0x0gu8uDdLorwMSSovJL6HhtXt3dxLTrP6K3hIiQ75hn /vA5bPJhqB3CT/VxLxmJGCZkBYLa7EzHjNUT66etqJ+3nhR5RNw20CftEfr7fQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 05/12] lcms2: Update to 2.9 Date: Tue, 25 Aug 2020 09:50:33 +0000 Message-Id: <20200825095040.3854-5-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/lcms2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/lcms2 b/lfs/lcms2 index eea9d537e..d3173f3ff 100644 --- a/lfs/lcms2 +++ b/lfs/lcms2 @@ -24,7 +24,7 @@ include Config -VER = 2.8 +VER = 2.9 THISAPP = lcms2-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 87a5913f1a52464190bb655ad230539c +$(DL_FILE)_MD5 = 8de1b7724f578d2995c8fdfa35c3ad0e install : $(TARGET) @@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure --prefix=/usr --disable-static cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) From patchwork Tue Aug 25 09:50:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3402 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPt3myvz3x16 for ; Tue, 25 Aug 2020 09:50:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPm2C0Hzw1; Tue, 25 Aug 2020 09:50:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPl23n8z30XD; Tue, 25 Aug 2020 09:50:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPj1M6pz2xmg for ; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPj0G7Zzm4; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P8h+kV8ZQujBFS3w6r1xJaPazudfC9RWGmsJwD+7IkU=; b=vr6zcYvSfBhWnUarndjOfMG7lcuAH92EeSSEZ/bBzOFd+2SGzr4PyJ2NRu4UKThwIBbEbi c2A2jSt2swApakAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P8h+kV8ZQujBFS3w6r1xJaPazudfC9RWGmsJwD+7IkU=; b=chsJFBoEL5B6fcbjUPasQtYEbrHvtwXoFl7S5QLUtw9aM+wHqK98gdIk1rkAhRbRIRh+G3 9PEwWop6A5oRurHp1v1svgHdJ9fu/hoFy25tLHcyavIAv4LD3xAIG+FcQDaqx4CskelYEl 00kfnzRarxtkVTExrn97EogwuXZfavSC2IhogRInc+JdPYgeFqQ0hZenv/xA7PPmC8CfhE SvGYR8Od0jnJKV+1hmZBycb0yUdqAG05Wn68SKU4NUq+ItrXjb60fyN2Y+RlfhSKd4nBzC dCVhe/1gkNY1XL8pHaTXmYBYVKOkVK0rlcIjTLxkDzjt4NlI27q9oKVh2IhC1w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 06/12] poppler: Update to 0.89.0 Date: Tue, 25 Aug 2020 09:50:34 +0000 Message-Id: <20200825095040.3854-6-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/common/poppler | 25 ++++++++++++++++++++----- lfs/poppler | 27 ++++++++++++++------------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler index 332ee52cb..5ceb9f4d8 100644 --- a/config/rootfiles/common/poppler +++ b/config/rootfiles/common/poppler @@ -1,3 +1,4 @@ +usr/bin/pdfattach usr/bin/pdfdetach usr/bin/pdffonts usr/bin/pdfimages @@ -12,14 +13,21 @@ usr/bin/pdfunite #usr/include/poppler #usr/include/poppler/Annot.h #usr/include/poppler/Array.h ++usr/include/poppler/BBoxOutputDev.h #usr/include/poppler/BuiltinFont.h #usr/include/poppler/BuiltinFontTables.h #usr/include/poppler/CMap.h #usr/include/poppler/CachedFile.h +#usr/include/poppler/CairoFontEngine.h +#usr/include/poppler/CairoOutputDev.h +#usr/include/poppler/CairoRescaleBox.h #usr/include/poppler/Catalog.h +#usr/include/poppler/CertificateInfo.h #usr/include/poppler/CharCodeToUnicode.h #usr/include/poppler/CharTypes.h #usr/include/poppler/CompactFontTables.h +#usr/include/poppler/CurlCachedFile.h +#usr/include/poppler/CurlPDFDocBuilder.h #usr/include/poppler/DateInfo.h #usr/include/poppler/Decrypt.h #usr/include/poppler/Dict.h @@ -38,6 +46,7 @@ usr/bin/pdfunite #usr/include/poppler/Hints.h #usr/include/poppler/JArithmeticDecoder.h #usr/include/poppler/JBIG2Stream.h +#usr/include/poppler/JPEG2000Stream.h #usr/include/poppler/Lexer.h #usr/include/poppler/Linearization.h #usr/include/poppler/Link.h @@ -80,15 +89,18 @@ usr/bin/pdfunite #usr/include/poppler/UnicodeCompTables.h #usr/include/poppler/UnicodeDecompTables.h #usr/include/poppler/UnicodeMap.h +#usr/include/poppler/UnicodeMapFuncs.h #usr/include/poppler/UnicodeMapTables.h #usr/include/poppler/UnicodeTypeTable.h #usr/include/poppler/ViewerPreferences.h #usr/include/poppler/XRef.h #usr/include/poppler/XpdfPluginAPI.h #usr/include/poppler/cpp +#usr/include/poppler/cpp/poppler-destination.h #usr/include/poppler/cpp/poppler-document.h #usr/include/poppler/cpp/poppler-embedded-file.h #usr/include/poppler/cpp/poppler-font.h +#usr/include/poppler/cpp/poppler-font-private.h #usr/include/poppler/cpp/poppler-global.h #usr/include/poppler/cpp/poppler-image.h #usr/include/poppler/cpp/poppler-page-renderer.h @@ -114,6 +126,7 @@ usr/bin/pdfunite #usr/include/poppler/glib/poppler-features.h #usr/include/poppler/glib/poppler-form-field.h #usr/include/poppler/glib/poppler-layer.h +#usr/include/poppler/glib/poppler-macros.h #usr/include/poppler/glib/poppler-media.h #usr/include/poppler/glib/poppler-movie.h #usr/include/poppler/glib/poppler-page.h @@ -121,6 +134,7 @@ usr/bin/pdfunite #usr/include/poppler/glib/poppler.h #usr/include/poppler/goo #usr/include/poppler/goo/FixedPoint.h +#usr/include/poppler/goo/GooCheckedOps.h #usr/include/poppler/goo/GooHash.h #usr/include/poppler/goo/GooLikely.h #usr/include/poppler/goo/GooList.h @@ -132,6 +146,7 @@ usr/bin/pdfunite #usr/include/poppler/goo/NetPBMWriter.h #usr/include/poppler/goo/PNGWriter.h #usr/include/poppler/goo/TiffWriter.h +#usr/include/poppler/goo/gdir.h #usr/include/poppler/goo/gfile.h #usr/include/poppler/goo/gmem.h #usr/include/poppler/goo/grandom.h @@ -152,7 +167,6 @@ usr/bin/pdfunite #usr/include/poppler/splash/SplashFontFileID.h #usr/include/poppler/splash/SplashGlyphBitmap.h #usr/include/poppler/splash/SplashMath.h -#usr/include/poppler/splash/SplashPath.h #usr/include/poppler/splash/SplashPattern.h #usr/include/poppler/splash/SplashScreen.h #usr/include/poppler/splash/SplashState.h @@ -166,17 +180,17 @@ usr/bin/pdfunite #usr/lib/libpoppler-cpp.la #usr/lib/libpoppler-cpp.so usr/lib/libpoppler-cpp.so.0 -usr/lib/libpoppler-cpp.so.0.3.0 +usr/lib/libpoppler-cpp.so.0.9.0 #usr/lib/libpoppler-glib.a #usr/lib/libpoppler-glib.la #usr/lib/libpoppler-glib.so usr/lib/libpoppler-glib.so.8 -usr/lib/libpoppler-glib.so.8.8.0 +usr/lib/libpoppler-glib.so.8.17.0 #usr/lib/libpoppler.a #usr/lib/libpoppler.la #usr/lib/libpoppler.so -usr/lib/libpoppler.so.66 -usr/lib/libpoppler.so.66.0.0 +usr/lib/libpoppler.so.100 +usr/lib/libpoppler.so.100.0.0 #usr/lib/pkgconfig/poppler-cairo.pc #usr/lib/pkgconfig/poppler-cpp.pc #usr/lib/pkgconfig/poppler-glib.pc @@ -220,6 +234,7 @@ usr/lib/libpoppler.so.66.0.0 #usr/share/gtk-doc/html/poppler/style.css #usr/share/gtk-doc/html/poppler/up-insensitive.png #usr/share/gtk-doc/html/poppler/up.png +#usr/share/man/man1/pdfattach.1 #usr/share/man/man1/pdfdetach.1 #usr/share/man/man1/pdffonts.1 #usr/share/man/man1/pdfimages.1 diff --git a/lfs/poppler b/lfs/poppler index c8fdd65e7..b03702146 100644 --- a/lfs/poppler +++ b/lfs/poppler @@ -24,7 +24,7 @@ include Config -VER = 0.52.0 +VER = 0.89.0 THISAPP = poppler-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = dfdd55d5df39685bbb82b0c08fa4ef66 +$(DL_FILE)_MD5 = 92ac57f60ae8c3a1f8bfe01c9530b7b5 install : $(TARGET) @@ -70,16 +70,17 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && \ - ./configure \ - --prefix=/usr \ - --enable-cairo-output \ - --enable-cms=lcms2 \ - --enable-libjpeg \ - --enable-libpng \ - --enable-xpdf-headers - - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && mkdir -pv build + cd $(DIR_APP)/build && cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DTESTDATADIR=$PWD/testfiles \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -ENABLE_QT5=OFF \ + .. + + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install + @rm -rf $(DIR_APP) @$(POSTBUILD) From patchwork Tue Aug 25 09:50:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3403 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPv4hFbz3x16 for ; Tue, 25 Aug 2020 09:50:59 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPm5MDFzwD; Tue, 25 Aug 2020 09:50:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPl2lhmz30Wr; Tue, 25 Aug 2020 09:50:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPj271Gz2xbY for ; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPj13VZzrv; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VZjtor9DvrS25HX7tMPquDcAhj19g0qZFh+3DjkNc7I=; b=oPPPvG88M4WOYieHQc1ns6n2Y/wW65EOEG1W9JJQxtkp2/IikcXvennaRN+ss1XMKstLqm it1ixW6yQwo+/nBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VZjtor9DvrS25HX7tMPquDcAhj19g0qZFh+3DjkNc7I=; b=ilVcNk+mdVckkliXe9wUSFp5Xbqo0QUj9p7zhYdzX7hFb93/4yKcrPa7f98y2mkBaWFDbL G+XWPHpGUsPuVBLBeMR4neQbJvbtDUejX+IDPnz0VfWdeflFfSuCfMUkQlKH1QYdf8A25W B+6Y/KKump2nsMSLIdUnsYehEzLoe4VWayi17CPfp891tT9QHBctXjbXTlfPSvWS9esrkC yLDxA+E+o+pzAyS1rZ6svN7WNbCJ5+thYLWnwx3W3alIz+qrbZf32+sFn5nhzEENQSTUNd VmhacLHNURs5ebRaAnvpcEwSTqC8DqRNfbVwGijRyTvvocV8BB/mdBqxCga58w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 07/12] avahi: Update to 0.8 Date: Tue, 25 Aug 2020 09:50:35 +0000 Message-Id: <20200825095040.3854-7-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/packages/avahi | 12 ++++++++++-- lfs/avahi | 9 ++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi index d8636ca7d..e6ab0c0ff 100644 --- a/config/rootfiles/packages/avahi +++ b/config/rootfiles/packages/avahi @@ -56,6 +56,8 @@ usr/bin/avahi-set-host-name #usr/include/avahi-gobject/ga-record-browser.h #usr/include/avahi-gobject/ga-service-browser.h #usr/include/avahi-gobject/ga-service-resolver.h +#usr/include/avahi-libevent +#usr/include/avahi-libevent/libevent-watch.h #usr/lib/avahi #usr/lib/libavahi-client.a #usr/lib/libavahi-client.la @@ -66,12 +68,12 @@ usr/lib/libavahi-client.so.3.2.9 #usr/lib/libavahi-common.la #usr/lib/libavahi-common.so usr/lib/libavahi-common.so.3 -usr/lib/libavahi-common.so.3.5.3 +usr/lib/libavahi-common.so.3.5.4 #usr/lib/libavahi-core.a #usr/lib/libavahi-core.la #usr/lib/libavahi-core.so usr/lib/libavahi-core.so.7 -usr/lib/libavahi-core.so.7.0.2 +usr/lib/libavahi-core.so.7.1.0 #usr/lib/libavahi-glib.a #usr/lib/libavahi-glib.la #usr/lib/libavahi-glib.so @@ -82,10 +84,16 @@ usr/lib/libavahi-glib.so.1.0.2 #usr/lib/libavahi-gobject.so usr/lib/libavahi-gobject.so.0 usr/lib/libavahi-gobject.so.0.0.5 +#usr/lib/libavahi-libevent.a +#usr/lib/libavahi-libevent.la +#usr/lib/libavahi-libevent.so +usr/lib/libavahi-libevent.so.1 +usr/lib/libavahi-libevent.so.1.0.0 #usr/lib/pkgconfig/avahi-client.pc #usr/lib/pkgconfig/avahi-core.pc #usr/lib/pkgconfig/avahi-glib.pc #usr/lib/pkgconfig/avahi-gobject.pc +#usr/lib/pkgconfig/avahi-libevent.pc usr/sbin/avahi-autoipd usr/sbin/avahi-daemon usr/sbin/avahi-dnsconfd diff --git a/lfs/avahi b/lfs/avahi index 41357f644..6807a080d 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -24,7 +24,7 @@ include Config -VER = 0.7 +VER = 0.8 THISAPP = avahi-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,12 +32,10 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = avahi -PAK_VER = 5 +PAK_VER = 6 DEPS = dbus libdaemon -CFLAGS += -U_FORTIFY_SOURCE - ############################################################################### # Top-level Rules ############################################################################### @@ -46,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d76c59d0882ac6c256d70a2a585362a6 +$(DL_FILE)_MD5 = 229c6aa30674fc43c202b22c5f8c2be7 install : $(TARGET) @@ -86,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-avahi-user=avahi \ --disable-qt3 \ --disable-qt4 \ + --disable-qt5 \ --disable-gtk \ --disable-gtk3 \ --disable-pygtk \ From patchwork Tue Aug 25 09:50:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3404 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPw0JT4z3x24 for ; Tue, 25 Aug 2020 09:51:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPm5m90zwJ; Tue, 25 Aug 2020 09:50:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPl3T5Lz30XJ; Tue, 25 Aug 2020 09:50:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPj36mfz2xmg for ; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPj1r6wzm4; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1FqfL15yBq5/49cDZCtskhDHOjXiBadzpzcPbM+mkZY=; b=VJcsvqmvPDDSZcWQn/VDr2aLs11GKq2ai13k9ybVRcfE0wE6Jrj/mPg8LHpN59gl/gveBJ PXXs2jpZBFX2XQDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1FqfL15yBq5/49cDZCtskhDHOjXiBadzpzcPbM+mkZY=; b=nb9+1HTEePY1z4Cz96iG+66nCFc0JIjn7GKKJZM7qIOF5r2MGIJHnrTceD9qSQXbAYtsMk 3hnGpaEI4K9LC+ycagjrJ+z5ZlDY+LRTOUqeZRvJNm0qmitBUGR+eHKU1rYaNlftHiqz8M P7Qgb4QURpdqAn2zEecVOPQQghBiwYCOlmAt972uhfr95hYxqMd+XyzceiCYSgduM7R3GW mksj8zprGddJg9RppNFJpg7BDz+qw9HxQIW0pKGebROPsx3korAQd85ei3zCaBgRfZ9fvB e88CFJQ3q/AKog4Sp6GQmYq/1CWExJHyGCeNFyUYXvmoIRvyjr37OEv5EKTlaQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 08/12] poppler-data: New package Date: Tue, 25 Aug 2020 09:50:36 +0000 Message-Id: <20200825095040.3854-8-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/common/poppler-data | 259 +++++++++++++++++++++++++++ lfs/poppler-data | 75 ++++++++ make.sh | 1 + 3 files changed, 335 insertions(+) create mode 100644 config/rootfiles/common/poppler-data create mode 100644 lfs/poppler-data diff --git a/config/rootfiles/common/poppler-data b/config/rootfiles/common/poppler-data new file mode 100644 index 000000000..fca2d8b1c --- /dev/null +++ b/config/rootfiles/common/poppler-data @@ -0,0 +1,259 @@ +#usr/share/pkgconfig/poppler-data.pc +usr/share/poppler +#usr/share/poppler/cMap +#usr/share/poppler/cMap/Adobe-CNS1 +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-0 +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-1 +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-2 +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-3 +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-4 +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-5 +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-6 +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-7 +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-B5pc +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-ETen-B5 +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-CID +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Host +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Mac +#usr/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-UCS2 +#usr/share/poppler/cMap/Adobe-CNS1/B5-H +#usr/share/poppler/cMap/Adobe-CNS1/B5-V +#usr/share/poppler/cMap/Adobe-CNS1/B5pc-H +#usr/share/poppler/cMap/Adobe-CNS1/B5pc-UCS2 +#usr/share/poppler/cMap/Adobe-CNS1/B5pc-UCS2C +#usr/share/poppler/cMap/Adobe-CNS1/B5pc-V +#usr/share/poppler/cMap/Adobe-CNS1/CNS-EUC-H +#usr/share/poppler/cMap/Adobe-CNS1/CNS-EUC-V +#usr/share/poppler/cMap/Adobe-CNS1/CNS1-H +#usr/share/poppler/cMap/Adobe-CNS1/CNS1-V +#usr/share/poppler/cMap/Adobe-CNS1/CNS2-H +#usr/share/poppler/cMap/Adobe-CNS1/CNS2-V +#usr/share/poppler/cMap/Adobe-CNS1/ETHK-B5-H +#usr/share/poppler/cMap/Adobe-CNS1/ETHK-B5-V +#usr/share/poppler/cMap/Adobe-CNS1/ETen-B5-H +#usr/share/poppler/cMap/Adobe-CNS1/ETen-B5-UCS2 +#usr/share/poppler/cMap/Adobe-CNS1/ETen-B5-V +#usr/share/poppler/cMap/Adobe-CNS1/ETenms-B5-H +#usr/share/poppler/cMap/Adobe-CNS1/ETenms-B5-V +#usr/share/poppler/cMap/Adobe-CNS1/HKdla-B5-H +#usr/share/poppler/cMap/Adobe-CNS1/HKdla-B5-V +#usr/share/poppler/cMap/Adobe-CNS1/HKdlb-B5-H +#usr/share/poppler/cMap/Adobe-CNS1/HKdlb-B5-V +#usr/share/poppler/cMap/Adobe-CNS1/HKgccs-B5-H +#usr/share/poppler/cMap/Adobe-CNS1/HKgccs-B5-V +#usr/share/poppler/cMap/Adobe-CNS1/HKm314-B5-H +#usr/share/poppler/cMap/Adobe-CNS1/HKm314-B5-V +#usr/share/poppler/cMap/Adobe-CNS1/HKm471-B5-H +#usr/share/poppler/cMap/Adobe-CNS1/HKm471-B5-V +#usr/share/poppler/cMap/Adobe-CNS1/HKscs-B5-H +#usr/share/poppler/cMap/Adobe-CNS1/HKscs-B5-V +#usr/share/poppler/cMap/Adobe-CNS1/UCS2-B5pc +#usr/share/poppler/cMap/Adobe-CNS1/UCS2-ETen-B5 +#usr/share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-H +#usr/share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-V +#usr/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF16-H +#usr/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF16-V +#usr/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF32-H +#usr/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF32-V +#usr/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF8-H +#usr/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF8-V +#usr/share/poppler/cMap/Adobe-GB1 +#usr/share/poppler/cMap/Adobe-GB1/Adobe-GB1-0 +#usr/share/poppler/cMap/Adobe-GB1/Adobe-GB1-1 +#usr/share/poppler/cMap/Adobe-GB1/Adobe-GB1-2 +#usr/share/poppler/cMap/Adobe-GB1/Adobe-GB1-3 +#usr/share/poppler/cMap/Adobe-GB1/Adobe-GB1-4 +#usr/share/poppler/cMap/Adobe-GB1/Adobe-GB1-5 +#usr/share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBK-EUC +#usr/share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBpc-EUC +#usr/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-CID +#usr/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Host +#usr/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Mac +#usr/share/poppler/cMap/Adobe-GB1/Adobe-GB1-UCS2 +#usr/share/poppler/cMap/Adobe-GB1/GB-EUC-H +#usr/share/poppler/cMap/Adobe-GB1/GB-EUC-V +#usr/share/poppler/cMap/Adobe-GB1/GB-H +#usr/share/poppler/cMap/Adobe-GB1/GB-V +#usr/share/poppler/cMap/Adobe-GB1/GBK-EUC-H +#usr/share/poppler/cMap/Adobe-GB1/GBK-EUC-UCS2 +#usr/share/poppler/cMap/Adobe-GB1/GBK-EUC-V +#usr/share/poppler/cMap/Adobe-GB1/GBK2K-H +#usr/share/poppler/cMap/Adobe-GB1/GBK2K-V +#usr/share/poppler/cMap/Adobe-GB1/GBKp-EUC-H +#usr/share/poppler/cMap/Adobe-GB1/GBKp-EUC-V +#usr/share/poppler/cMap/Adobe-GB1/GBT-EUC-H +#usr/share/poppler/cMap/Adobe-GB1/GBT-EUC-V +#usr/share/poppler/cMap/Adobe-GB1/GBT-H +#usr/share/poppler/cMap/Adobe-GB1/GBT-V +#usr/share/poppler/cMap/Adobe-GB1/GBTpc-EUC-H +#usr/share/poppler/cMap/Adobe-GB1/GBTpc-EUC-V +#usr/share/poppler/cMap/Adobe-GB1/GBpc-EUC-H +#usr/share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2 +#usr/share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2C +#usr/share/poppler/cMap/Adobe-GB1/GBpc-EUC-V +#usr/share/poppler/cMap/Adobe-GB1/UCS2-GBK-EUC +#usr/share/poppler/cMap/Adobe-GB1/UCS2-GBpc-EUC +#usr/share/poppler/cMap/Adobe-GB1/UniGB-UCS2-H +#usr/share/poppler/cMap/Adobe-GB1/UniGB-UCS2-V +#usr/share/poppler/cMap/Adobe-GB1/UniGB-UTF16-H +#usr/share/poppler/cMap/Adobe-GB1/UniGB-UTF16-V +#usr/share/poppler/cMap/Adobe-GB1/UniGB-UTF32-H +#usr/share/poppler/cMap/Adobe-GB1/UniGB-UTF32-V +#usr/share/poppler/cMap/Adobe-GB1/UniGB-UTF8-H +#usr/share/poppler/cMap/Adobe-GB1/UniGB-UTF8-V +#usr/share/poppler/cMap/Adobe-Japan1 +#usr/share/poppler/cMap/Adobe-Japan1/78-EUC-H +#usr/share/poppler/cMap/Adobe-Japan1/78-EUC-V +#usr/share/poppler/cMap/Adobe-Japan1/78-H +#usr/share/poppler/cMap/Adobe-Japan1/78-RKSJ-H +#usr/share/poppler/cMap/Adobe-Japan1/78-RKSJ-V +#usr/share/poppler/cMap/Adobe-Japan1/78-V +#usr/share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-H +#usr/share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-V +#usr/share/poppler/cMap/Adobe-Japan1/83pv-RKSJ-H +#usr/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-H +#usr/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-UCS2 +#usr/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-V +#usr/share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-H +#usr/share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-V +#usr/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-H +#usr/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2 +#usr/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2C +#usr/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-V +#usr/share/poppler/cMap/Adobe-Japan1/Add-H +#usr/share/poppler/cMap/Adobe-Japan1/Add-RKSJ-H +#usr/share/poppler/cMap/Adobe-Japan1/Add-RKSJ-V +#usr/share/poppler/cMap/Adobe-Japan1/Add-V +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-0 +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-1 +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-2 +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-3 +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-4 +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-5 +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-6 +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90ms-RKSJ +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90pv-RKSJ +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-CID +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Host +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Mac +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-H +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-V +#usr/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-UCS2 +#usr/share/poppler/cMap/Adobe-Japan1/EUC-H +#usr/share/poppler/cMap/Adobe-Japan1/EUC-V +#usr/share/poppler/cMap/Adobe-Japan1/Ext-H +#usr/share/poppler/cMap/Adobe-Japan1/Ext-RKSJ-H +#usr/share/poppler/cMap/Adobe-Japan1/Ext-RKSJ-V +#usr/share/poppler/cMap/Adobe-Japan1/Ext-V +#usr/share/poppler/cMap/Adobe-Japan1/H +#usr/share/poppler/cMap/Adobe-Japan1/Hankaku +#usr/share/poppler/cMap/Adobe-Japan1/Hiragana +#usr/share/poppler/cMap/Adobe-Japan1/Hojo-EUC-H +#usr/share/poppler/cMap/Adobe-Japan1/Hojo-EUC-V +#usr/share/poppler/cMap/Adobe-Japan1/Hojo-H +#usr/share/poppler/cMap/Adobe-Japan1/Hojo-V +#usr/share/poppler/cMap/Adobe-Japan1/Katakana +#usr/share/poppler/cMap/Adobe-Japan1/NWP-H +#usr/share/poppler/cMap/Adobe-Japan1/NWP-V +#usr/share/poppler/cMap/Adobe-Japan1/RKSJ-H +#usr/share/poppler/cMap/Adobe-Japan1/RKSJ-V +#usr/share/poppler/cMap/Adobe-Japan1/Roman +#usr/share/poppler/cMap/Adobe-Japan1/UCS2-90ms-RKSJ +#usr/share/poppler/cMap/Adobe-Japan1/UCS2-90pv-RKSJ +#usr/share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-H +#usr/share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-V +#usr/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF16-H +#usr/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF16-V +#usr/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF32-H +#usr/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF32-V +#usr/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF8-H +#usr/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF8-V +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-H +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-HW-H +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-HW-V +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-V +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF16-H +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF16-V +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF32-H +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF32-V +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF8-H +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF8-V +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF16-H +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF16-V +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF32-H +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF32-V +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF8-H +#usr/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF8-V +#usr/share/poppler/cMap/Adobe-Japan1/UniJISPro-UCS2-HW-V +#usr/share/poppler/cMap/Adobe-Japan1/UniJISPro-UCS2-V +#usr/share/poppler/cMap/Adobe-Japan1/UniJISPro-UTF8-V +#usr/share/poppler/cMap/Adobe-Japan1/UniJISX0213-UTF32-H +#usr/share/poppler/cMap/Adobe-Japan1/UniJISX0213-UTF32-V +#usr/share/poppler/cMap/Adobe-Japan1/UniJISX02132004-UTF32-H +#usr/share/poppler/cMap/Adobe-Japan1/UniJISX02132004-UTF32-V +#usr/share/poppler/cMap/Adobe-Japan1/V +#usr/share/poppler/cMap/Adobe-Japan1/WP-Symbol +#usr/share/poppler/cMap/Adobe-Japan2 +#usr/share/poppler/cMap/Adobe-Japan2/Adobe-Japan2-0 +#usr/share/poppler/cMap/Adobe-Korea1 +#usr/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-0 +#usr/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-1 +#usr/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-2 +#usr/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-CID +#usr/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Host +#usr/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Mac +#usr/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCms-UHC +#usr/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCpc-EUC +#usr/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-UCS2 +#usr/share/poppler/cMap/Adobe-Korea1/KSC-EUC-H +#usr/share/poppler/cMap/Adobe-Korea1/KSC-EUC-V +#usr/share/poppler/cMap/Adobe-Korea1/KSC-H +#usr/share/poppler/cMap/Adobe-Korea1/KSC-Johab-H +#usr/share/poppler/cMap/Adobe-Korea1/KSC-Johab-V +#usr/share/poppler/cMap/Adobe-Korea1/KSC-V +#usr/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-H +#usr/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-H +#usr/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-V +#usr/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-UCS2 +#usr/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-V +#usr/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-H +#usr/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2 +#usr/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2C +#usr/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-V +#usr/share/poppler/cMap/Adobe-Korea1/UCS2-KSCms-UHC +#usr/share/poppler/cMap/Adobe-Korea1/UCS2-KSCpc-EUC +#usr/share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-H +#usr/share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-V +#usr/share/poppler/cMap/Adobe-Korea1/UniKS-UTF16-H +#usr/share/poppler/cMap/Adobe-Korea1/UniKS-UTF16-V +#usr/share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-H +#usr/share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-V +#usr/share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-H +#usr/share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-V +#usr/share/poppler/cidToUnicode +#usr/share/poppler/cidToUnicode/Adobe-CNS1 +#usr/share/poppler/cidToUnicode/Adobe-GB1 +#usr/share/poppler/cidToUnicode/Adobe-Japan1 +#usr/share/poppler/cidToUnicode/Adobe-Korea1 +#usr/share/poppler/nameToUnicode +#usr/share/poppler/nameToUnicode/Bulgarian +#usr/share/poppler/nameToUnicode/Greek +#usr/share/poppler/nameToUnicode/Thai +#usr/share/poppler/unicodeMap +#usr/share/poppler/unicodeMap/Big5 +#usr/share/poppler/unicodeMap/Big5ascii +#usr/share/poppler/unicodeMap/EUC-CN +#usr/share/poppler/unicodeMap/EUC-JP +#usr/share/poppler/unicodeMap/GBK +#usr/share/poppler/unicodeMap/ISO-2022-CN +#usr/share/poppler/unicodeMap/ISO-2022-JP +#usr/share/poppler/unicodeMap/ISO-2022-KR +#usr/share/poppler/unicodeMap/ISO-8859-6 +#usr/share/poppler/unicodeMap/ISO-8859-7 +#usr/share/poppler/unicodeMap/ISO-8859-8 +#usr/share/poppler/unicodeMap/ISO-8859-9 +#usr/share/poppler/unicodeMap/KOI8-R +#usr/share/poppler/unicodeMap/Latin2 +#usr/share/poppler/unicodeMap/Shift-JIS +#usr/share/poppler/unicodeMap/TIS-620 +#usr/share/poppler/unicodeMap/Windows-1255 diff --git a/lfs/poppler-data b/lfs/poppler-data new file mode 100644 index 000000000..81bc672eb --- /dev/null +++ b/lfs/poppler-data @@ -0,0 +1,75 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.4.9 + +THISAPP = poppler-data-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 35cc7beba00aa174631466f06732be40 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make install prefix=/usr + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index e77bebfa1..994d56685 100755 --- a/make.sh +++ b/make.sh @@ -1396,6 +1396,7 @@ buildipfire() { lfsmake2 ghostscript lfsmake2 qpdf lfsmake2 poppler + lfsmake2 poppler-data lfsmake2 cups-filters lfsmake2 epson-inkjet-printer-escpr lfsmake2 foomatic From patchwork Tue Aug 25 09:50:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3405 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPw488Nz3x2V for ; Tue, 25 Aug 2020 09:51:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPm6ZzSzwQ; Tue, 25 Aug 2020 09:50:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPl4D17z30XL; Tue, 25 Aug 2020 09:50:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPj480Wz2xbY for ; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPj2ptwzrv; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CF+vdhQmELLZOJrV13QLnbtmXP8+9o66ACRas3A3nDA=; b=B5K+pd0B7bxGuuEqqTHecU5Kbe+Y6B9mWKpuVo6lBVGhA3YCXnwB/F+qpKwpFxWgaK20+7 xXT0Z4JL9fxyI/Cg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CF+vdhQmELLZOJrV13QLnbtmXP8+9o66ACRas3A3nDA=; b=vRh1V/Q+g+ZQffQmX03/+Nx3LotUAhzmQ9V8wdF5+6chfK5A/DYbaI1HshBxSd3D15EBuW 52aMGKxJuK0vNB6uQzpDA9IX3Q4Op8VzHUDOaC98q3rCVji2H3+wRrH1jY2VtBKQHnFpIC bu5UOc5AsncSye1CPv+GJ+F+oH3nM3+GMFG+1X0WWDVs6+bo5z+T0HhunMLGavkXKzoEl6 8S0OcjEapJ2lJEulu6KUaGnV8fOJCAVk9veXDjdgEZvvbOVqtIUoppWQbHM60Rxg7G831O NRn6OA+F9CaPa87maHE4zzOQHds0Ehv0NOZDfirBB9xPHgrDgV7U2QGiagyQyg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 09/12] cups: Update to 2.3.3 Date: Tue, 25 Aug 2020 09:50:37 +0000 Message-Id: <20200825095040.3854-9-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/packages/cups | 273 ++++++++++++++++++++------------- lfs/cups | 8 +- 2 files changed, 172 insertions(+), 109 deletions(-) diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index 8234be5e1..f9d15bc8b 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -1,4 +1,3 @@ -#etc/dbus-1/system.d etc/dbus-1/system.d/cups.conf etc/pam.d/cups etc/rc.d/init.d/cups @@ -15,8 +14,8 @@ etc/rc.d/init.d/cups #etc/rc5.d/S81cups usr/bin/cancel #usr/bin/cups-config -usr/bin/cupstestdsc usr/bin/cupstestppd +usr/bin/ippeveprinter usr/bin/ippfind usr/bin/ipptool usr/bin/lp @@ -64,6 +63,9 @@ usr/lib/cups/cgi-bin/classes.cgi usr/lib/cups/cgi-bin/help.cgi usr/lib/cups/cgi-bin/jobs.cgi usr/lib/cups/cgi-bin/printers.cgi +usr/lib/cups/command +usr/lib/cups/command/ippevepcl +usr/lib/cups/command/ippeveps usr/lib/cups/daemon usr/lib/cups/daemon/cups-deviced usr/lib/cups/daemon/cups-driverd @@ -74,7 +76,6 @@ usr/lib/cups/filter usr/lib/cups/filter/commandtops usr/lib/cups/filter/gziptoany usr/lib/cups/filter/pstops -usr/lib/cups/filter/rastertodymo usr/lib/cups/filter/rastertoepson usr/lib/cups/filter/rastertohp usr/lib/cups/filter/rastertolabel @@ -88,17 +89,9 @@ usr/lib/cups/notifier/mailto usr/lib/cups/notifier/rss #usr/lib/libcups.so usr/lib/libcups.so.2 -#usr/lib/libcupscgi.so -usr/lib/libcupscgi.so.1 #usr/lib/libcupsimage.so usr/lib/libcupsimage.so.2 -#usr/lib/libcupsmime.so -usr/lib/libcupsmime.so.1 -#usr/lib/libcupsppdc.so -usr/lib/libcupsppdc.so.1 -usr/sbin/accept usr/sbin/cupsaccept -usr/sbin/cupsaddsmb usr/sbin/cupsctl usr/sbin/cupsd usr/sbin/cupsdisable @@ -109,7 +102,6 @@ usr/sbin/lpadmin usr/sbin/lpc usr/sbin/lpinfo usr/sbin/lpmove -usr/sbin/reject usr/share/cups usr/share/cups/banners usr/share/cups/data @@ -128,30 +120,66 @@ usr/share/cups/examples/r300-basic.drv usr/share/cups/examples/r300-colorman.drv usr/share/cups/examples/r300-remote.drv usr/share/cups/ipptool +usr/share/cups/ipptool/cancel-current-job.test usr/share/cups/ipptool/color.jpg +usr/share/cups/ipptool/create-job-format.test +usr/share/cups/ipptool/create-job-sheets.test +usr/share/cups/ipptool/create-job-timeout.test +usr/share/cups/ipptool/create-job.test usr/share/cups/ipptool/create-printer-subscription.test +usr/share/cups/ipptool/cups-create-local-printer.test usr/share/cups/ipptool/document-a4.pdf usr/share/cups/ipptool/document-a4.ps usr/share/cups/ipptool/document-letter.pdf usr/share/cups/ipptool/document-letter.ps +usr/share/cups/ipptool/fax-job.test usr/share/cups/ipptool/get-completed-jobs.test +usr/share/cups/ipptool/get-devices.test +usr/share/cups/ipptool/get-job-attributes.test +usr/share/cups/ipptool/get-job-attributes2.test +usr/share/cups/ipptool/get-job-template-attributes.test usr/share/cups/ipptool/get-jobs.test usr/share/cups/ipptool/get-notifications.test +usr/share/cups/ipptool/get-ppd-printer.test +usr/share/cups/ipptool/get-ppd.test +usr/share/cups/ipptool/get-ppds-drv-only.test +usr/share/cups/ipptool/get-ppds-language.test +usr/share/cups/ipptool/get-ppds-make-and-model.test +usr/share/cups/ipptool/get-ppds-make.test +usr/share/cups/ipptool/get-ppds-product.test +usr/share/cups/ipptool/get-ppds-psversion.test +usr/share/cups/ipptool/get-ppds.test +usr/share/cups/ipptool/get-printer-attributes-suite.test usr/share/cups/ipptool/get-printer-attributes.test +usr/share/cups/ipptool/get-printer-description-attributes.test +usr/share/cups/ipptool/get-printers-printer-id.test +usr/share/cups/ipptool/get-printers.test usr/share/cups/ipptool/get-subscriptions.test usr/share/cups/ipptool/gray.jpg +usr/share/cups/ipptool/identify-printer-display.test +usr/share/cups/ipptool/identify-printer-multiple.test +usr/share/cups/ipptool/identify-printer.test usr/share/cups/ipptool/ipp-1.1.test usr/share/cups/ipptool/ipp-2.0.test usr/share/cups/ipptool/ipp-2.1.test usr/share/cups/ipptool/ipp-2.2.test +usr/share/cups/ipptool/ipp-backend.test usr/share/cups/ipptool/ipp-everywhere.test usr/share/cups/ipptool/onepage-a4.pdf usr/share/cups/ipptool/onepage-a4.ps usr/share/cups/ipptool/onepage-letter.pdf usr/share/cups/ipptool/onepage-letter.ps +usr/share/cups/ipptool/print-job-and-wait.test usr/share/cups/ipptool/print-job-deflate.test usr/share/cups/ipptool/print-job-gzip.test +usr/share/cups/ipptool/print-job-hold.test +usr/share/cups/ipptool/print-job-letter.test +usr/share/cups/ipptool/print-job-manual.test +usr/share/cups/ipptool/print-job-media-col.test +usr/share/cups/ipptool/print-job-password.test usr/share/cups/ipptool/print-job.test +usr/share/cups/ipptool/print-uri.test +usr/share/cups/ipptool/set-attrs-hold.test usr/share/cups/ipptool/testfile.jpg usr/share/cups/ipptool/testfile.pcl usr/share/cups/ipptool/testfile.pdf @@ -173,7 +201,6 @@ usr/share/cups/profiles usr/share/cups/templates usr/share/cups/templates/add-class.tmpl usr/share/cups/templates/add-printer.tmpl -usr/share/cups/templates/add-rss-subscription.tmpl usr/share/cups/templates/admin.tmpl usr/share/cups/templates/choose-device.tmpl usr/share/cups/templates/choose-make.tmpl @@ -192,7 +219,6 @@ usr/share/cups/templates/command.tmpl usr/share/cups/templates/de usr/share/cups/templates/de/add-class.tmpl usr/share/cups/templates/de/add-printer.tmpl -usr/share/cups/templates/de/add-rss-subscription.tmpl usr/share/cups/templates/de/admin.tmpl usr/share/cups/templates/de/choose-device.tmpl usr/share/cups/templates/de/choose-make.tmpl @@ -250,13 +276,9 @@ usr/share/cups/templates/de/printer.tmpl usr/share/cups/templates/de/printers-header.tmpl usr/share/cups/templates/de/printers.tmpl usr/share/cups/templates/de/restart.tmpl -usr/share/cups/templates/de/samba-export.tmpl -usr/share/cups/templates/de/samba-exported.tmpl usr/share/cups/templates/de/search.tmpl usr/share/cups/templates/de/set-printer-options-header.tmpl usr/share/cups/templates/de/set-printer-options-trailer.tmpl -usr/share/cups/templates/de/subscription-added.tmpl -usr/share/cups/templates/de/subscription-canceled.tmpl usr/share/cups/templates/de/test-page.tmpl usr/share/cups/templates/de/trailer.tmpl usr/share/cups/templates/de/users.tmpl @@ -266,7 +288,6 @@ usr/share/cups/templates/error.tmpl usr/share/cups/templates/es usr/share/cups/templates/es/add-class.tmpl usr/share/cups/templates/es/add-printer.tmpl -usr/share/cups/templates/es/add-rss-subscription.tmpl usr/share/cups/templates/es/admin.tmpl usr/share/cups/templates/es/choose-device.tmpl usr/share/cups/templates/es/choose-make.tmpl @@ -324,16 +345,78 @@ usr/share/cups/templates/es/printer.tmpl usr/share/cups/templates/es/printers-header.tmpl usr/share/cups/templates/es/printers.tmpl usr/share/cups/templates/es/restart.tmpl -usr/share/cups/templates/es/samba-export.tmpl -usr/share/cups/templates/es/samba-exported.tmpl usr/share/cups/templates/es/search.tmpl usr/share/cups/templates/es/set-printer-options-header.tmpl usr/share/cups/templates/es/set-printer-options-trailer.tmpl -usr/share/cups/templates/es/subscription-added.tmpl -usr/share/cups/templates/es/subscription-canceled.tmpl usr/share/cups/templates/es/test-page.tmpl usr/share/cups/templates/es/trailer.tmpl usr/share/cups/templates/es/users.tmpl +usr/share/cups/templates/fr +usr/share/cups/templates/fr/add-class.tmpl +usr/share/cups/templates/fr/add-printer.tmpl +usr/share/cups/templates/fr/admin.tmpl +usr/share/cups/templates/fr/choose-device.tmpl +usr/share/cups/templates/fr/choose-make.tmpl +usr/share/cups/templates/fr/choose-model.tmpl +usr/share/cups/templates/fr/choose-serial.tmpl +usr/share/cups/templates/fr/choose-uri.tmpl +usr/share/cups/templates/fr/class-added.tmpl +usr/share/cups/templates/fr/class-confirm.tmpl +usr/share/cups/templates/fr/class-deleted.tmpl +usr/share/cups/templates/fr/class-jobs-header.tmpl +usr/share/cups/templates/fr/class-modified.tmpl +usr/share/cups/templates/fr/class.tmpl +usr/share/cups/templates/fr/classes-header.tmpl +usr/share/cups/templates/fr/classes.tmpl +usr/share/cups/templates/fr/command.tmpl +usr/share/cups/templates/fr/edit-config.tmpl +usr/share/cups/templates/fr/error-op.tmpl +usr/share/cups/templates/fr/error.tmpl +usr/share/cups/templates/fr/header.tmpl +usr/share/cups/templates/fr/help-header.tmpl +usr/share/cups/templates/fr/help-printable.tmpl +usr/share/cups/templates/fr/help-trailer.tmpl +usr/share/cups/templates/fr/job-cancel.tmpl +usr/share/cups/templates/fr/job-hold.tmpl +usr/share/cups/templates/fr/job-move.tmpl +usr/share/cups/templates/fr/job-moved.tmpl +usr/share/cups/templates/fr/job-release.tmpl +usr/share/cups/templates/fr/job-restart.tmpl +usr/share/cups/templates/fr/jobs-header.tmpl +usr/share/cups/templates/fr/jobs.tmpl +usr/share/cups/templates/fr/list-available-printers.tmpl +usr/share/cups/templates/fr/modify-class.tmpl +usr/share/cups/templates/fr/modify-printer.tmpl +usr/share/cups/templates/fr/norestart.tmpl +usr/share/cups/templates/fr/option-boolean.tmpl +usr/share/cups/templates/fr/option-conflict.tmpl +usr/share/cups/templates/fr/option-header.tmpl +usr/share/cups/templates/fr/option-pickmany.tmpl +usr/share/cups/templates/fr/option-pickone.tmpl +usr/share/cups/templates/fr/option-trailer.tmpl +usr/share/cups/templates/fr/pager.tmpl +usr/share/cups/templates/fr/printer-accept.tmpl +usr/share/cups/templates/fr/printer-added.tmpl +usr/share/cups/templates/fr/printer-cancel-jobs.tmpl +usr/share/cups/templates/fr/printer-configured.tmpl +usr/share/cups/templates/fr/printer-confirm.tmpl +usr/share/cups/templates/fr/printer-default.tmpl +usr/share/cups/templates/fr/printer-deleted.tmpl +usr/share/cups/templates/fr/printer-jobs-header.tmpl +usr/share/cups/templates/fr/printer-modified.tmpl +usr/share/cups/templates/fr/printer-reject.tmpl +usr/share/cups/templates/fr/printer-start.tmpl +usr/share/cups/templates/fr/printer-stop.tmpl +usr/share/cups/templates/fr/printer.tmpl +usr/share/cups/templates/fr/printers-header.tmpl +usr/share/cups/templates/fr/printers.tmpl +usr/share/cups/templates/fr/restart.tmpl +usr/share/cups/templates/fr/search.tmpl +usr/share/cups/templates/fr/set-printer-options-header.tmpl +usr/share/cups/templates/fr/set-printer-options-trailer.tmpl +usr/share/cups/templates/fr/test-page.tmpl +usr/share/cups/templates/fr/trailer.tmpl +usr/share/cups/templates/fr/users.tmpl usr/share/cups/templates/header.tmpl usr/share/cups/templates/help-header.tmpl usr/share/cups/templates/help-printable.tmpl @@ -341,7 +424,6 @@ usr/share/cups/templates/help-trailer.tmpl usr/share/cups/templates/ja usr/share/cups/templates/ja/add-class.tmpl usr/share/cups/templates/ja/add-printer.tmpl -usr/share/cups/templates/ja/add-rss-subscription.tmpl usr/share/cups/templates/ja/admin.tmpl usr/share/cups/templates/ja/choose-device.tmpl usr/share/cups/templates/ja/choose-make.tmpl @@ -399,13 +481,9 @@ usr/share/cups/templates/ja/printer.tmpl usr/share/cups/templates/ja/printers-header.tmpl usr/share/cups/templates/ja/printers.tmpl usr/share/cups/templates/ja/restart.tmpl -usr/share/cups/templates/ja/samba-export.tmpl -usr/share/cups/templates/ja/samba-exported.tmpl usr/share/cups/templates/ja/search.tmpl usr/share/cups/templates/ja/set-printer-options-header.tmpl usr/share/cups/templates/ja/set-printer-options-trailer.tmpl -usr/share/cups/templates/ja/subscription-added.tmpl -usr/share/cups/templates/ja/subscription-canceled.tmpl usr/share/cups/templates/ja/test-page.tmpl usr/share/cups/templates/ja/trailer.tmpl usr/share/cups/templates/ja/users.tmpl @@ -446,7 +524,6 @@ usr/share/cups/templates/printers.tmpl usr/share/cups/templates/pt_BR usr/share/cups/templates/pt_BR/add-class.tmpl usr/share/cups/templates/pt_BR/add-printer.tmpl -usr/share/cups/templates/pt_BR/add-rss-subscription.tmpl usr/share/cups/templates/pt_BR/admin.tmpl usr/share/cups/templates/pt_BR/choose-device.tmpl usr/share/cups/templates/pt_BR/choose-make.tmpl @@ -504,13 +581,9 @@ usr/share/cups/templates/pt_BR/printer.tmpl usr/share/cups/templates/pt_BR/printers-header.tmpl usr/share/cups/templates/pt_BR/printers.tmpl usr/share/cups/templates/pt_BR/restart.tmpl -usr/share/cups/templates/pt_BR/samba-export.tmpl -usr/share/cups/templates/pt_BR/samba-exported.tmpl usr/share/cups/templates/pt_BR/search.tmpl usr/share/cups/templates/pt_BR/set-printer-options-header.tmpl usr/share/cups/templates/pt_BR/set-printer-options-trailer.tmpl -usr/share/cups/templates/pt_BR/subscription-added.tmpl -usr/share/cups/templates/pt_BR/subscription-canceled.tmpl usr/share/cups/templates/pt_BR/test-page.tmpl usr/share/cups/templates/pt_BR/trailer.tmpl usr/share/cups/templates/pt_BR/users.tmpl @@ -518,7 +591,6 @@ usr/share/cups/templates/restart.tmpl usr/share/cups/templates/ru usr/share/cups/templates/ru/add-class.tmpl usr/share/cups/templates/ru/add-printer.tmpl -usr/share/cups/templates/ru/add-rss-subscription.tmpl usr/share/cups/templates/ru/admin.tmpl usr/share/cups/templates/ru/choose-device.tmpl usr/share/cups/templates/ru/choose-make.tmpl @@ -576,23 +648,15 @@ usr/share/cups/templates/ru/printer.tmpl usr/share/cups/templates/ru/printers-header.tmpl usr/share/cups/templates/ru/printers.tmpl usr/share/cups/templates/ru/restart.tmpl -usr/share/cups/templates/ru/samba-export.tmpl -usr/share/cups/templates/ru/samba-exported.tmpl usr/share/cups/templates/ru/search.tmpl usr/share/cups/templates/ru/set-printer-options-header.tmpl usr/share/cups/templates/ru/set-printer-options-trailer.tmpl -usr/share/cups/templates/ru/subscription-added.tmpl -usr/share/cups/templates/ru/subscription-canceled.tmpl usr/share/cups/templates/ru/test-page.tmpl usr/share/cups/templates/ru/trailer.tmpl usr/share/cups/templates/ru/users.tmpl -usr/share/cups/templates/samba-export.tmpl -usr/share/cups/templates/samba-exported.tmpl usr/share/cups/templates/search.tmpl usr/share/cups/templates/set-printer-options-header.tmpl usr/share/cups/templates/set-printer-options-trailer.tmpl -usr/share/cups/templates/subscription-added.tmpl -usr/share/cups/templates/subscription-canceled.tmpl usr/share/cups/templates/test-page.tmpl usr/share/cups/templates/trailer.tmpl usr/share/cups/templates/users.tmpl @@ -608,17 +672,15 @@ usr/share/doc/cups/es usr/share/doc/cups/es/index.html usr/share/doc/cups/help usr/share/doc/cups/help/accounting.html +usr/share/doc/cups/help/admin.html usr/share/doc/cups/help/api-admin.html -usr/share/doc/cups/help/api-array.html -usr/share/doc/cups/help/api-cups.html -usr/share/doc/cups/help/api-filedir.html usr/share/doc/cups/help/api-filter.html -usr/share/doc/cups/help/api-httpipp.html -usr/share/doc/cups/help/api-overview.html usr/share/doc/cups/help/api-ppd.html usr/share/doc/cups/help/api-raster.html usr/share/doc/cups/help/cgi.html +usr/share/doc/cups/help/cupspm.html usr/share/doc/cups/help/encryption.html +usr/share/doc/cups/help/firewalls.html usr/share/doc/cups/help/glossary.html usr/share/doc/cups/help/kerberos.html usr/share/doc/cups/help/license.html @@ -632,15 +694,16 @@ usr/share/doc/cups/help/man-cups-lpd.html usr/share/doc/cups/help/man-cups-snmp.html usr/share/doc/cups/help/man-cups.html usr/share/doc/cups/help/man-cupsaccept.html -usr/share/doc/cups/help/man-cupsaddsmb.html usr/share/doc/cups/help/man-cupsd-helper.html usr/share/doc/cups/help/man-cupsd-logs.html usr/share/doc/cups/help/man-cupsd.conf.html usr/share/doc/cups/help/man-cupsd.html usr/share/doc/cups/help/man-cupsenable.html -usr/share/doc/cups/help/man-cupstestdsc.html usr/share/doc/cups/help/man-cupstestppd.html usr/share/doc/cups/help/man-filter.html +usr/share/doc/cups/help/man-ippevepcl.html +usr/share/doc/cups/help/man-ippeveprinter.html +usr/share/doc/cups/help/man-ippfind.html usr/share/doc/cups/help/man-ipptool.html usr/share/doc/cups/help/man-ipptoolfile.html usr/share/doc/cups/help/man-lp.html @@ -677,8 +740,6 @@ usr/share/doc/cups/help/spec-banner.html usr/share/doc/cups/help/spec-command.html usr/share/doc/cups/help/spec-design.html usr/share/doc/cups/help/spec-ipp.html -usr/share/doc/cups/help/spec-pdf.html -usr/share/doc/cups/help/spec-postscript.html usr/share/doc/cups/help/spec-ppd.html usr/share/doc/cups/help/spec-raster.html usr/share/doc/cups/help/spec-stp.html @@ -712,66 +773,68 @@ usr/share/doc/cups/ru/index.html usr/share/locale/ca/cups_ca.po usr/share/locale/cs/cups_cs.po usr/share/locale/de/cups_de.po +usr/share/locale/en +usr/share/locale/en/cups_en.po usr/share/locale/es/cups_es.po usr/share/locale/fr/cups_fr.po usr/share/locale/it/cups_it.po usr/share/locale/ja/cups_ja.po usr/share/locale/pt_BR/cups_pt_BR.po usr/share/locale/ru/cups_ru.po -#usr/share/man/man1/cancel.1.gz -#usr/share/man/man1/cups-config.1.gz -#usr/share/man/man1/cups.1.gz -#usr/share/man/man1/cupstestdsc.1.gz -#usr/share/man/man1/cupstestppd.1.gz -#usr/share/man/man1/ippfind.1.gz -#usr/share/man/man1/ipptool.1.gz -#usr/share/man/man1/lp.1.gz -#usr/share/man/man1/lpoptions.1.gz -#usr/share/man/man1/lpq.1.gz -#usr/share/man/man1/lpr.1.gz -#usr/share/man/man1/lprm.1.gz -#usr/share/man/man1/lpstat.1.gz -#usr/share/man/man1/ppdc.1.gz -#usr/share/man/man1/ppdhtml.1.gz -#usr/share/man/man1/ppdi.1.gz -#usr/share/man/man1/ppdmerge.1.gz -#usr/share/man/man1/ppdpo.1.gz -#usr/share/man/man5/classes.conf.5.gz -#usr/share/man/man5/client.conf.5.gz -#usr/share/man/man5/cups-files.conf.5.gz -#usr/share/man/man5/cups-snmp.conf.5.gz -#usr/share/man/man5/cupsd-logs.5.gz -#usr/share/man/man5/cupsd.conf.5.gz -#usr/share/man/man5/ipptoolfile.5.gz -#usr/share/man/man5/mailto.conf.5.gz -#usr/share/man/man5/mime.convs.5.gz -#usr/share/man/man5/mime.types.5.gz -#usr/share/man/man5/ppdcfile.5.gz -#usr/share/man/man5/printers.conf.5.gz -#usr/share/man/man5/subscriptions.conf.5.gz -#usr/share/man/man7/backend.7.gz -#usr/share/man/man7/filter.7.gz -#usr/share/man/man7/notifier.7.gz -#usr/share/man/man8/accept.8.gz -#usr/share/man/man8/cups-deviced.8.gz -#usr/share/man/man8/cups-driverd.8.gz -#usr/share/man/man8/cups-exec.8.gz -#usr/share/man/man8/cups-lpd.8.gz -#usr/share/man/man8/cups-snmp.8.gz -#usr/share/man/man8/cupsaccept.8.gz -#usr/share/man/man8/cupsaddsmb.8.gz -#usr/share/man/man8/cupsctl.8.gz -#usr/share/man/man8/cupsd-helper.8.gz -#usr/share/man/man8/cupsd.8.gz -#usr/share/man/man8/cupsdisable.8.gz -#usr/share/man/man8/cupsenable.8.gz -#usr/share/man/man8/cupsfilter.8.gz -#usr/share/man/man8/cupsreject.8.gz -#usr/share/man/man8/lpadmin.8.gz -#usr/share/man/man8/lpc.8.gz -#usr/share/man/man8/lpinfo.8.gz -#usr/share/man/man8/lpmove.8.gz -#usr/share/man/man8/reject.8.gz +usr/share/locale/zh_CN/cups_zh_CN.po +#usr/share/man/man1/cancel.1 +#usr/share/man/man1/cups-config.1 +#usr/share/man/man1/cups.1 +#usr/share/man/man1/cupstestppd.1 +#usr/share/man/man1/ippeveprinter.1 +#usr/share/man/man1/ippfind.1 +#usr/share/man/man1/ipptool.1 +#usr/share/man/man1/lp.1 +#usr/share/man/man1/lpoptions.1 +#usr/share/man/man1/lpq.1 +#usr/share/man/man1/lpr.1 +#usr/share/man/man1/lprm.1 +#usr/share/man/man1/lpstat.1 +#usr/share/man/man1/ppdc.1 +#usr/share/man/man1/ppdhtml.1 +#usr/share/man/man1/ppdi.1 +#usr/share/man/man1/ppdmerge.1 +#usr/share/man/man1/ppdpo.1 +#usr/share/man/man5/classes.conf.5 +#usr/share/man/man5/client.conf.5 +#usr/share/man/man5/cups-files.conf.5 +#usr/share/man/man5/cups-snmp.conf.5 +#usr/share/man/man5/cupsd-logs.5 +#usr/share/man/man5/cupsd.conf.5 +#usr/share/man/man5/ipptoolfile.5 +#usr/share/man/man5/mailto.conf.5 +#usr/share/man/man5/mime.convs.5 +#usr/share/man/man5/mime.types.5 +#usr/share/man/man5/ppdcfile.5 +#usr/share/man/man5/printers.conf.5 +#usr/share/man/man5/subscriptions.conf.5 +#usr/share/man/man7/backend.7 +#usr/share/man/man7/filter.7 +#usr/share/man/man7/ippevepcl.7 +#usr/share/man/man7/ippeveps.7 +#usr/share/man/man7/notifier.7 +#usr/share/man/man8/cups-deviced.8 +#usr/share/man/man8/cups-driverd.8 +#usr/share/man/man8/cups-exec.8 +#usr/share/man/man8/cups-lpd.8 +#usr/share/man/man8/cups-snmp.8 +#usr/share/man/man8/cupsaccept.8 +#usr/share/man/man8/cupsctl.8 +#usr/share/man/man8/cupsd-helper.8 +#usr/share/man/man8/cupsd.8 +#usr/share/man/man8/cupsdisable.8 +#usr/share/man/man8/cupsenable.8 +#usr/share/man/man8/cupsfilter.8 +#usr/share/man/man8/cupsreject.8 +#usr/share/man/man8/lpadmin.8 +#usr/share/man/man8/lpc.8 +#usr/share/man/man8/lpinfo.8 +#usr/share/man/man8/lpmove.8 var/cache/cups var/cache/cups/rss #var/ipfire/cups diff --git a/lfs/cups b/lfs/cups index 6841fae80..2c7138846 100644 --- a/lfs/cups +++ b/lfs/cups @@ -24,7 +24,7 @@ include Config -VER = 2.2.2 +VER = 2.3.3 THISAPP = cups-$(VER) DL_FILE = $(THISAPP)-source.tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 20 +PAK_VER = 21 DEPS = avahi cups-filters dbus ghostscript krb5 libtiff @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 036f6bda6202ae3e280ac00c710b5ca4 +$(DL_FILE)_MD5 = 412434ceefbdf3ec71bc9188a035f589 install : $(TARGET) @@ -88,7 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-gnutls \ --enable-libusb - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb From patchwork Tue Aug 25 09:50:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3406 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPx14Tbz3x16 for ; Tue, 25 Aug 2020 09:51:01 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPn16RwzwZ; Tue, 25 Aug 2020 09:50:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPl52STz30Wy; Tue, 25 Aug 2020 09:50:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPj4qb0z2xmg for ; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPj3rQfzm4; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RIXtOzUWQOzZ7IUrDKWxPoVFyrbea5EvzSC+6hqvpss=; b=L5RQ3ExNkIGbsMdPYmUP3vddoGlEwmVoiwee6TzjEFvZpClVapOKOtFR71/E7Hxgj63IsF ADPLbLKzWtcGtjAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RIXtOzUWQOzZ7IUrDKWxPoVFyrbea5EvzSC+6hqvpss=; b=oP/WH0+vy/h13UurGZTw3BPo42/opXg4lH/lqkXx2+7eW4rWSyKpZKdnn/o0d72nyi5imf 8D78lZxZp/XnmPTclDQ/isbpdOmfZpx+jYFef7Z0jdNUyrlLdWrKEFJnIi0RtKxWQd43kc K4IWBfl+eD7StDg2bg+gQjW5/5/ENQWNnsihbLhqqLgprpzho229R3Z0dNqZABvHoxyb0x jA2eetuX/u+yNzITi46XqiQn4uera+TCP1sKQJEBGUKp1yY/vqST+7B7HvLFHiLIM5MMes ClUIPMMNu+hWCVjT4LWvsuE3rpO+2aBJOTxvawWWm4XQDDId1u6pxBqnZpSeoA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 10/12] cups-filters: Update to 1.27.4 Date: Tue, 25 Aug 2020 09:50:38 +0000 Message-Id: <20200825095040.3854-10-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/packages/cups-filters | 25 ++++++++++++++++++++----- lfs/cups-filters | 4 ++-- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/config/rootfiles/packages/cups-filters b/config/rootfiles/packages/cups-filters index 85564cebc..0c31d52f0 100644 --- a/config/rootfiles/packages/cups-filters +++ b/config/rootfiles/packages/cups-filters @@ -1,5 +1,4 @@ -etc/fonts/conf.d/99pdftoopvp.conf -#etc/rc.d/init.d/cups-browsed +etc/rc.d/init.d/cups-browsed #etc/rc0.d/K35cups-browsed #etc/rc2.d/K35cups-browsed #etc/rc2.d/S82cups-browsed @@ -15,6 +14,8 @@ usr/bin/ttfread #usr/include/cupsfilters/colormanager.h #usr/include/cupsfilters/driver.h #usr/include/cupsfilters/image.h +#usr/include/cupsfilters/ipp.h +#usr/include/cupsfilters/pdftoippprinter.h #usr/include/cupsfilters/ppdgenerator.h #usr/include/cupsfilters/raster.h #usr/include/fontembed @@ -24,6 +25,7 @@ usr/bin/ttfread #usr/include/fontembed/iofn.h #usr/include/fontembed/sfnt.h usr/lib/cups/backend/beh +usr/lib/cups/backend/cups-brf usr/lib/cups/backend/driverless usr/lib/cups/backend/implicitclass usr/lib/cups/backend/parallel @@ -31,8 +33,12 @@ usr/lib/cups/backend/serial usr/lib/cups/driver/driverless usr/lib/cups/filter/bannertopdf usr/lib/cups/filter/brftoembosser +usr/lib/cups/filter/brftopagedbrf +usr/lib/cups/filter/cgmtopdf +usr/lib/cups/filter/cmxtopdf usr/lib/cups/filter/commandtoescpx usr/lib/cups/filter/commandtopclx +usr/lib/cups/filter/emftopdf usr/lib/cups/filter/foomatic-rip usr/lib/cups/filter/gstopdf usr/lib/cups/filter/gstopxl @@ -44,14 +50,16 @@ usr/lib/cups/filter/imagetoraster usr/lib/cups/filter/imagetoubrl usr/lib/cups/filter/imageubrltoindexv3 usr/lib/cups/filter/imageubrltoindexv4 -usr/lib/cups/filter/pdftoopvp +usr/lib/cups/filter/musicxmltobrf usr/lib/cups/filter/pdftopdf usr/lib/cups/filter/pdftops usr/lib/cups/filter/pdftoraster usr/lib/cups/filter/rastertoescpx +usr/lib/cups/filter/rastertopclm usr/lib/cups/filter/rastertopclx usr/lib/cups/filter/rastertopdf usr/lib/cups/filter/rastertops +usr/lib/cups/filter/svgtopdf usr/lib/cups/filter/sys5ippprinter usr/lib/cups/filter/textbrftoindexv3 usr/lib/cups/filter/textbrftoindexv4 @@ -59,6 +67,11 @@ usr/lib/cups/filter/texttobrf usr/lib/cups/filter/texttopdf usr/lib/cups/filter/texttops usr/lib/cups/filter/texttotext +usr/lib/cups/filter/vectortobrf +usr/lib/cups/filter/vectortopdf +usr/lib/cups/filter/vectortoubrl +usr/lib/cups/filter/wmftopdf +usr/lib/cups/filter/xfigtopdf #usr/lib/libcupsfilters.a #usr/lib/libcupsfilters.la #usr/lib/libcupsfilters.so @@ -71,7 +84,7 @@ usr/lib/libfontembed.so.1 usr/lib/libfontembed.so.1.0.0 #usr/lib/pkgconfig/libcupsfilters.pc #usr/lib/pkgconfig/libfontembed.pc -#usr/sbin/cups-browsed +usr/sbin/cups-browsed usr/share/cups/banners/classified usr/share/cups/banners/confidential usr/share/cups/banners/form @@ -103,6 +116,7 @@ usr/share/cups/data/topsecret.pdf usr/share/cups/data/unclassified.pdf usr/share/cups/drv/cupsfilters.drv usr/share/cups/drv/generic-brf.drv +usr/share/cups/drv/generic-ubrl.drv usr/share/cups/drv/indexv3.drv usr/share/cups/drv/indexv4.drv usr/share/cups/mime/braille.convs @@ -124,6 +138,7 @@ usr/share/cups/ppdc/liblouis4.defs usr/share/cups/ppdc/media-braille.defs usr/share/cups/ppdc/pcl.h #usr/share/doc/cups-filters +#usr/share/doc/cups-filters/ABOUT-NLS #usr/share/doc/cups-filters/AUTHORS #usr/share/doc/cups-filters/COPYING #usr/share/doc/cups-filters/INSTALL @@ -141,4 +156,4 @@ usr/share/ppd/cupsfilters/HP-Color_LaserJet_CM3530_MFP-PDF.ppd usr/share/ppd/cupsfilters/Ricoh-PDF_Printer-PDF.ppd usr/share/ppd/cupsfilters/pxlcolor.ppd usr/share/ppd/cupsfilters/pxlmono.ppd -#var/ipfire/cups/cups-browsed.conf +var/ipfire/cups/cups-browsed.conf diff --git a/lfs/cups-filters b/lfs/cups-filters index 1c82b0dbb..4f4d88b95 100644 --- a/lfs/cups-filters +++ b/lfs/cups-filters @@ -24,7 +24,7 @@ include Config -VER = 1.13.4 +VER = 1.27.4 THISAPP = cups-filters-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a288a63ca44ad6e776cf1e86a457f836 +$(DL_FILE)_MD5 = fd43c2fa2f542d45580d113d30bdd2da install : $(TARGET) From patchwork Tue Aug 25 09:50:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3407 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPx6Yxxz3x24 for ; Tue, 25 Aug 2020 09:51:01 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPn4XHNzwc; Tue, 25 Aug 2020 09:50:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPl5nJrz30XQ; Tue, 25 Aug 2020 09:50:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPj5XgBz30Wd for ; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPj4Y9Wzv9; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XM9NwZrYodu+ZtMbQBh7DDY5oR1Ath74P8pEGQTVplA=; b=cAm0aSmzjYXZGdLXNolI2edHvRpx9S+ss7sM6q+Dr/qwTWHe2eLO6l24frguQhmhuHBM2J 4CsbHuF/1xRag9Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XM9NwZrYodu+ZtMbQBh7DDY5oR1Ath74P8pEGQTVplA=; b=Az4bEWi0Zp/Wm1tr+xZsGUJWwzbJbIHIRLXfoes2wtHUErcJ7/iaHVO3MFxBPYt53VV24C csuq04DSxX9+KS1YkUOULK+IW2hl/Z4HGSBwWvKjeF82fAYnh7vlq2jNIGd2i4tUryZn82 nmyAkNn0y4OGZp2vTWZOoFxlGkbA037EdClcm/bRDT3/rWeNP9q3OW2SC4xQJLH42VihHD tzaQPxMqsHqIPVMgaKx7Qa05WCoR6ZMacAYU95LpJcPcl2HewI4ydCiKRX7DgDJrzE/CFe TRfIpwrsHSMuSpWerdWOdF1l2ijdsfSUDtIkUxnRck7Hj8ihkMiugCjJpOYl1g== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 11/12] foomatic: Drop files that are now provided by cups-filter Date: Tue, 25 Aug 2020 09:50:39 +0000 Message-Id: <20200825095040.3854-11-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/packages/foomatic | 5 ----- lfs/foomatic | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/config/rootfiles/packages/foomatic b/config/rootfiles/packages/foomatic index b60408ca8..735913449 100644 --- a/config/rootfiles/packages/foomatic +++ b/config/rootfiles/packages/foomatic @@ -11,12 +11,8 @@ usr/bin/foomatic-ppd-options usr/bin/foomatic-ppd-to-xml usr/bin/foomatic-ppdfile usr/bin/foomatic-printjob -usr/bin/foomatic-rip usr/bin/foomatic-searchprinter -usr/lib/cups/backend/beh usr/lib/cups/driver/foomatic -usr/lib/cups/filter/foomatic-ppdfile -usr/lib/cups/filter/foomatic-rip #usr/lib/perl5/site_perl/5.30.0/Foomatic usr/lib/perl5/site_perl/5.30.0/Foomatic/DB.pm usr/lib/perl5/site_perl/5.30.0/Foomatic/Defaults.pm @@ -8009,7 +8005,6 @@ usr/share/foomatic/xmlschema/types.xsd #usr/share/man/man1/foomatic-ppd-options.1 #usr/share/man/man1/foomatic-ppdfile.1 #usr/share/man/man1/foomatic-printjob.1 -#usr/share/man/man1/foomatic-rip.1 #usr/share/man/man8/foomatic-addpjloptions.8 #usr/share/man/man8/foomatic-getpjloptions.8 #usr/share/man/man8/foomatic-kitload.8 diff --git a/lfs/foomatic b/lfs/foomatic index 1288277e4..9c47228da 100644 --- a/lfs/foomatic +++ b/lfs/foomatic @@ -35,7 +35,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/foomatic-filters-$(VER_FILTERS) TARGET = $(DIR_INFO)/$(THISAPP) PROG = foomatic -PAK_VER = 4 +PAK_VER = 5 DEPS = cups ghostscript libtiff hplip @@ -116,9 +116,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /etc/foomatic echo "cups" > /etc/foomatic/defaultspooler - -mkdir -pv /usr/lib/cups/filter - ln -svf ../../../bin/foomatic-rip /usr/lib/cups/filter/foomatic-rip - ln -svf ../../../bin/foomatic-ppdfile /usr/lib/cups/filter/foomatic-ppdfile - @rm -rf $(DIR_SRC)/foomatic-* @$(POSTBUILD) From patchwork Tue Aug 25 09:50:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3408 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPy1bCkz3x2X for ; Tue, 25 Aug 2020 09:51:02 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPn4y7vzwj; Tue, 25 Aug 2020 09:50:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPl6cXnz30X3; Tue, 25 Aug 2020 09:50:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPj6clpz2xmg for ; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPj5GVrzm4; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AekL/hRgt/0uOgs2nx8J1vZ6GaQkcTokNkOHzR2fV8c=; b=IZ+ka9ELb6v7uGPyUIttEvYoWXliD89Dcoi0HFZpllLU5lpizdiTxxpqwC4CC3vPGGM7xs EkaGQpXLMqL2eoBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AekL/hRgt/0uOgs2nx8J1vZ6GaQkcTokNkOHzR2fV8c=; b=JYkybClCC2hNKLgPa5SOYUfpzl9VkkcqTiDHxMACkP4u8mVnVYfXehycPYV7AOJ464whVF nMojICkp3RdbeQrt1dszskdYj/tHFPxixQ2dvZLXWwhvWP3ylnE1AAWfunouEWsbzXCzhA ZQuwalSEZ3ZvJ7g+ksfjhqV7o6aG3cC9H6zZk1NQM8uAEyoMqgkeOfaBxZ9ynW2LvcHD3v eVGt8zXs5KOq9eRWrVt5hb3IpIq76MQ/RmESMHUCULUyrHeh2W6XvCmSKOn9JiEnLmGQn9 g+Nq+Oue8ABDl3VIjMTJZ4uaVnmPxfiRC7qkw4GKW+HLQcFvCQBOZEU9sURQ6Q== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 12/12] Rootfile update after fresh build Date: Tue, 25 Aug 2020 09:50:40 +0000 Message-Id: <20200825095040.3854-12-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/common/fontconfig | 426 +---------------------------- config/rootfiles/common/poppler | 64 +---- 2 files changed, 12 insertions(+), 478 deletions(-) diff --git a/config/rootfiles/common/fontconfig b/config/rootfiles/common/fontconfig index 85fe2f442..e3d100505 100644 --- a/config/rootfiles/common/fontconfig +++ b/config/rootfiles/common/fontconfig @@ -4,12 +4,13 @@ etc/fonts/conf.d/10-hinting-slight.conf etc/fonts/conf.d/10-scale-bitmap-fonts.conf etc/fonts/conf.d/20-unhint-small-vera.conf etc/fonts/conf.d/30-metric-aliases.conf -etc/fonts/conf.d/30-urw-aliases.conf etc/fonts/conf.d/40-nonlatin.conf +etc/fonts/conf.d/45-generic.conf etc/fonts/conf.d/45-latin.conf etc/fonts/conf.d/49-sansserif.conf etc/fonts/conf.d/50-user.conf etc/fonts/conf.d/51-local.conf +etc/fonts/conf.d/60-generic.conf etc/fonts/conf.d/60-latin.conf etc/fonts/conf.d/65-fonts-persian.conf etc/fonts/conf.d/65-nonlatin.conf @@ -20,6 +21,7 @@ etc/fonts/conf.d/90-synthetic.conf etc/fonts/fonts.conf usr/bin/fc-cache usr/bin/fc-cat +usr/bin/fc-conflist usr/bin/fc-list usr/bin/fc-match usr/bin/fc-pattern @@ -35,215 +37,6 @@ usr/bin/fc-validate usr/lib/libfontconfig.so.1 usr/lib/libfontconfig.so.1.12.0 #usr/lib/pkgconfig/fontconfig.pc -#usr/share/doc/fontconfig -#usr/share/doc/fontconfig/fontconfig-devel -#usr/share/doc/fontconfig/fontconfig-devel.pdf -#usr/share/doc/fontconfig/fontconfig-devel.txt -#usr/share/doc/fontconfig/fontconfig-devel/fcatomiccreate.html -#usr/share/doc/fontconfig/fontconfig-devel/fcatomicdeletenew.html -#usr/share/doc/fontconfig/fontconfig-devel/fcatomicdestroy.html -#usr/share/doc/fontconfig/fontconfig-devel/fcatomiclock.html -#usr/share/doc/fontconfig/fontconfig-devel/fcatomicnewfile.html -#usr/share/doc/fontconfig/fontconfig-devel/fcatomicorigfile.html -#usr/share/doc/fontconfig/fontconfig-devel/fcatomicreplaceorig.html -#usr/share/doc/fontconfig/fontconfig-devel/fcatomicunlock.html -#usr/share/doc/fontconfig/fontconfig-devel/fcblanksadd.html -#usr/share/doc/fontconfig/fontconfig-devel/fcblankscreate.html -#usr/share/doc/fontconfig/fontconfig-devel/fcblanksdestroy.html -#usr/share/doc/fontconfig/fontconfig-devel/fcblanksismember.html -#usr/share/doc/fontconfig/fontconfig-devel/fccachecopyset.html -#usr/share/doc/fontconfig/fontconfig-devel/fccachecreatetagfile.html -#usr/share/doc/fontconfig/fontconfig-devel/fccachedir.html -#usr/share/doc/fontconfig/fontconfig-devel/fccachenumfont.html -#usr/share/doc/fontconfig/fontconfig-devel/fccachenumsubdir.html -#usr/share/doc/fontconfig/fontconfig-devel/fccachesubdir.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetaddchar.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcopy.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcount.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcoverage.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcreate.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetdelchar.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetdestroy.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetequal.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetfirstpage.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsethaschar.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetintersect.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetintersectcount.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetissubset.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetmerge.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetnew.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetnextpage.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetsubtract.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetsubtractcount.html -#usr/share/doc/fontconfig/fontconfig-devel/fccharsetunion.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontadddir.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontaddfile.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontclear.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigbuildfonts.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigcreate.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigdestroy.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigenablehome.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigfilename.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetblanks.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcache.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcachedirs.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigdirs.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigfiles.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcurrent.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetfontdirs.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetfonts.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetrescaninterval.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetsysroot.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfighome.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigparseandload.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigreference.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetcurrent.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetrescaninterval.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetsysroot.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitute.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitutewithpat.html -#usr/share/doc/fontconfig/fontconfig-devel/fcconfiguptodate.html -#usr/share/doc/fontconfig/fontconfig-devel/fcdefaultsubstitute.html -#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheclean.html -#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheload.html -#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheloadfile.html -#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheread.html -#usr/share/doc/fontconfig/fontconfig-devel/fcdircacherescan.html -#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheunlink.html -#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheunload.html -#usr/share/doc/fontconfig/fontconfig-devel/fcdircachevalid.html -#usr/share/doc/fontconfig/fontconfig-devel/fcdirsave.html -#usr/share/doc/fontconfig/fontconfig-devel/fcdirscan.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfileisdir.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfilescan.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfini.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfontlist.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfontmatch.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfontrenderprepare.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetadd.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetcreate.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetdestroy.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetlist.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetmatch.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetprint.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetsort.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetsortdestroy.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfontsort.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharindex.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharset.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharsetandspacing.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypequery.html -#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypequeryface.html -#usr/share/doc/fontconfig/fontconfig-devel/fcgetdefaultlangs.html -#usr/share/doc/fontconfig/fontconfig-devel/fcgetlangs.html -#usr/share/doc/fontconfig/fontconfig-devel/fcgetversion.html -#usr/share/doc/fontconfig/fontconfig-devel/fcinit.html -#usr/share/doc/fontconfig/fontconfig-devel/fcinitbringuptodate.html -#usr/share/doc/fontconfig/fontconfig-devel/fcinitloadconfig.html -#usr/share/doc/fontconfig/fontconfig-devel/fcinitloadconfigandfonts.html -#usr/share/doc/fontconfig/fontconfig-devel/fcinitreinitialize.html -#usr/share/doc/fontconfig/fontconfig-devel/fcislower.html -#usr/share/doc/fontconfig/fontconfig-devel/fcisupper.html -#usr/share/doc/fontconfig/fontconfig-devel/fclanggetcharset.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangnormalize.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangsetadd.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcompare.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcontains.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcopy.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcreate.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangsetdel.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangsetdestroy.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangsetequal.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangsetgetlangs.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangsethash.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangsethaslang.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangsetsubtract.html -#usr/share/doc/fontconfig/fontconfig-devel/fclangsetunion.html -#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixcopy.html -#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixequal.html -#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixinit.html -#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixmultiply.html -#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixrotate.html -#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixscale.html -#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixshear.html -#usr/share/doc/fontconfig/fontconfig-devel/fcnameconstant.html -#usr/share/doc/fontconfig/fontconfig-devel/fcnamegetconstant.html -#usr/share/doc/fontconfig/fontconfig-devel/fcnamegetobjecttype.html -#usr/share/doc/fontconfig/fontconfig-devel/fcnameparse.html -#usr/share/doc/fontconfig/fontconfig-devel/fcnameregisterconstants.html -#usr/share/doc/fontconfig/fontconfig-devel/fcnameregisterobjecttypes.html -#usr/share/doc/fontconfig/fontconfig-devel/fcnameunparse.html -#usr/share/doc/fontconfig/fontconfig-devel/fcnameunregisterconstants.html -#usr/share/doc/fontconfig/fontconfig-devel/fcnameunregisterobjecttypes.html -#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetadd.html -#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetbuild.html -#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetcreate.html -#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetdestroy.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternadd-type.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternadd.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternaddweak.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternbuild.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatterncreate.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatterndel.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatterndestroy.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternduplicate.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternequal.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternequalsubset.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternfilter.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternformat.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternget-type.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternget.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternhash.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternprint.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternreference.html -#usr/share/doc/fontconfig/fontconfig-devel/fcpatternremove.html -#usr/share/doc/fontconfig/fontconfig-devel/fcrangecopy.html -#usr/share/doc/fontconfig/fontconfig-devel/fcrangecreatedouble.html -#usr/share/doc/fontconfig/fontconfig-devel/fcrangecreateinteger.html -#usr/share/doc/fontconfig/fontconfig-devel/fcrangedestroy.html -#usr/share/doc/fontconfig/fontconfig-devel/fcrangegetdouble.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrbasename.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrcmp.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrcmpignorecase.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrcopy.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrcopyfilename.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrdirname.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrdowncase.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrfree.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistcreate.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistdone.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistfirst.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistnext.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrplus.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetadd.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetaddfilename.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetcreate.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetdel.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetdestroy.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetequal.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetmember.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrstr.html -#usr/share/doc/fontconfig/fontconfig-devel/fcstrstrignorecase.html -#usr/share/doc/fontconfig/fontconfig-devel/fctolower.html -#usr/share/doc/fontconfig/fontconfig-devel/fcucs4toutf8.html -#usr/share/doc/fontconfig/fontconfig-devel/fcutf16len.html -#usr/share/doc/fontconfig/fontconfig-devel/fcutf16toucs4.html -#usr/share/doc/fontconfig/fontconfig-devel/fcutf8len.html -#usr/share/doc/fontconfig/fontconfig-devel/fcutf8toucs4.html -#usr/share/doc/fontconfig/fontconfig-devel/fcvaluedestroy.html -#usr/share/doc/fontconfig/fontconfig-devel/fcvalueequal.html -#usr/share/doc/fontconfig/fontconfig-devel/fcvalueprint.html -#usr/share/doc/fontconfig/fontconfig-devel/fcvaluesave.html -#usr/share/doc/fontconfig/fontconfig-devel/fcweightfromopentype.html -#usr/share/doc/fontconfig/fontconfig-devel/fcweighttoopentype.html -#usr/share/doc/fontconfig/fontconfig-devel/ln12.html -#usr/share/doc/fontconfig/fontconfig-devel/t1.html -#usr/share/doc/fontconfig/fontconfig-devel/x102.html -#usr/share/doc/fontconfig/fontconfig-devel/x19.html -#usr/share/doc/fontconfig/fontconfig-devel/x31.html -#usr/share/doc/fontconfig/fontconfig-user.html -#usr/share/doc/fontconfig/fontconfig-user.pdf -#usr/share/doc/fontconfig/fontconfig-user.txt #usr/share/fontconfig #usr/share/fontconfig/conf.avail #usr/share/fontconfig/conf.avail/10-autohint.conf @@ -264,12 +57,13 @@ usr/lib/libfontconfig.so.1.12.0 #usr/share/fontconfig/conf.avail/20-unhint-small-vera.conf #usr/share/fontconfig/conf.avail/25-unhint-nonlatin.conf #usr/share/fontconfig/conf.avail/30-metric-aliases.conf -#usr/share/fontconfig/conf.avail/30-urw-aliases.conf #usr/share/fontconfig/conf.avail/40-nonlatin.conf +#usr/share/fontconfig/conf.avail/45-generic.conf #usr/share/fontconfig/conf.avail/45-latin.conf #usr/share/fontconfig/conf.avail/49-sansserif.conf #usr/share/fontconfig/conf.avail/50-user.conf #usr/share/fontconfig/conf.avail/51-local.conf +#usr/share/fontconfig/conf.avail/60-generic.conf #usr/share/fontconfig/conf.avail/60-latin.conf #usr/share/fontconfig/conf.avail/65-fonts-persian.conf #usr/share/fontconfig/conf.avail/65-khmer.conf @@ -279,212 +73,10 @@ usr/lib/libfontconfig.so.1.12.0 #usr/share/fontconfig/conf.avail/70-yes-bitmaps.conf #usr/share/fontconfig/conf.avail/80-delicious.conf #usr/share/fontconfig/conf.avail/90-synthetic.conf -#usr/share/man/man1/fc-cache.1 -#usr/share/man/man1/fc-cat.1 -#usr/share/man/man1/fc-list.1 -#usr/share/man/man1/fc-match.1 -#usr/share/man/man1/fc-pattern.1 -#usr/share/man/man1/fc-query.1 -#usr/share/man/man1/fc-scan.1 -#usr/share/man/man1/fc-validate.1 -#usr/share/man/man3/FcAtomicCreate.3 -#usr/share/man/man3/FcAtomicDeleteNew.3 -#usr/share/man/man3/FcAtomicDestroy.3 -#usr/share/man/man3/FcAtomicLock.3 -#usr/share/man/man3/FcAtomicNewFile.3 -#usr/share/man/man3/FcAtomicOrigFile.3 -#usr/share/man/man3/FcAtomicReplaceOrig.3 -#usr/share/man/man3/FcAtomicUnlock.3 -#usr/share/man/man3/FcBlanksAdd.3 -#usr/share/man/man3/FcBlanksCreate.3 -#usr/share/man/man3/FcBlanksDestroy.3 -#usr/share/man/man3/FcBlanksIsMember.3 -#usr/share/man/man3/FcCacheCopySet.3 -#usr/share/man/man3/FcCacheCreateTagFile.3 -#usr/share/man/man3/FcCacheDir.3 -#usr/share/man/man3/FcCacheNumFont.3 -#usr/share/man/man3/FcCacheNumSubdir.3 -#usr/share/man/man3/FcCacheSubdir.3 -#usr/share/man/man3/FcCharSetAddChar.3 -#usr/share/man/man3/FcCharSetCopy.3 -#usr/share/man/man3/FcCharSetCount.3 -#usr/share/man/man3/FcCharSetCoverage.3 -#usr/share/man/man3/FcCharSetCreate.3 -#usr/share/man/man3/FcCharSetDelChar.3 -#usr/share/man/man3/FcCharSetDestroy.3 -#usr/share/man/man3/FcCharSetEqual.3 -#usr/share/man/man3/FcCharSetFirstPage.3 -#usr/share/man/man3/FcCharSetHasChar.3 -#usr/share/man/man3/FcCharSetIntersect.3 -#usr/share/man/man3/FcCharSetIntersectCount.3 -#usr/share/man/man3/FcCharSetIsSubset.3 -#usr/share/man/man3/FcCharSetMerge.3 -#usr/share/man/man3/FcCharSetNew.3 -#usr/share/man/man3/FcCharSetNextPage.3 -#usr/share/man/man3/FcCharSetSubtract.3 -#usr/share/man/man3/FcCharSetSubtractCount.3 -#usr/share/man/man3/FcCharSetUnion.3 -#usr/share/man/man3/FcConfigAppFontAddDir.3 -#usr/share/man/man3/FcConfigAppFontAddFile.3 -#usr/share/man/man3/FcConfigAppFontClear.3 -#usr/share/man/man3/FcConfigBuildFonts.3 -#usr/share/man/man3/FcConfigCreate.3 -#usr/share/man/man3/FcConfigDestroy.3 -#usr/share/man/man3/FcConfigEnableHome.3 -#usr/share/man/man3/FcConfigFilename.3 -#usr/share/man/man3/FcConfigGetBlanks.3 -#usr/share/man/man3/FcConfigGetCache.3 -#usr/share/man/man3/FcConfigGetCacheDirs.3 -#usr/share/man/man3/FcConfigGetConfigDirs.3 -#usr/share/man/man3/FcConfigGetConfigFiles.3 -#usr/share/man/man3/FcConfigGetCurrent.3 -#usr/share/man/man3/FcConfigGetFontDirs.3 -#usr/share/man/man3/FcConfigGetFonts.3 -#usr/share/man/man3/FcConfigGetRescanInterval.3 -#usr/share/man/man3/FcConfigGetSysRoot.3 -#usr/share/man/man3/FcConfigHome.3 -#usr/share/man/man3/FcConfigParseAndLoad.3 -#usr/share/man/man3/FcConfigReference.3 -#usr/share/man/man3/FcConfigSetCurrent.3 -#usr/share/man/man3/FcConfigSetRescanInterval.3 -#usr/share/man/man3/FcConfigSetSysRoot.3 -#usr/share/man/man3/FcConfigSubstitute.3 -#usr/share/man/man3/FcConfigSubstituteWithPat.3 -#usr/share/man/man3/FcConfigUptoDate.3 -#usr/share/man/man3/FcDefaultSubstitute.3 -#usr/share/man/man3/FcDirCacheClean.3 -#usr/share/man/man3/FcDirCacheLoad.3 -#usr/share/man/man3/FcDirCacheLoadFile.3 -#usr/share/man/man3/FcDirCacheRead.3 -#usr/share/man/man3/FcDirCacheRescan.3 -#usr/share/man/man3/FcDirCacheUnlink.3 -#usr/share/man/man3/FcDirCacheUnload.3 -#usr/share/man/man3/FcDirCacheValid.3 -#usr/share/man/man3/FcDirSave.3 -#usr/share/man/man3/FcDirScan.3 -#usr/share/man/man3/FcFileIsDir.3 -#usr/share/man/man3/FcFileScan.3 -#usr/share/man/man3/FcFini.3 -#usr/share/man/man3/FcFontList.3 -#usr/share/man/man3/FcFontMatch.3 -#usr/share/man/man3/FcFontRenderPrepare.3 -#usr/share/man/man3/FcFontSetAdd.3 -#usr/share/man/man3/FcFontSetCreate.3 -#usr/share/man/man3/FcFontSetDestroy.3 -#usr/share/man/man3/FcFontSetList.3 -#usr/share/man/man3/FcFontSetMatch.3 -#usr/share/man/man3/FcFontSetPrint.3 -#usr/share/man/man3/FcFontSetSort.3 -#usr/share/man/man3/FcFontSetSortDestroy.3 -#usr/share/man/man3/FcFontSort.3 -#usr/share/man/man3/FcFreeTypeCharIndex.3 -#usr/share/man/man3/FcFreeTypeCharSet.3 -#usr/share/man/man3/FcFreeTypeCharSetAndSpacing.3 -#usr/share/man/man3/FcFreeTypeQuery.3 -#usr/share/man/man3/FcFreeTypeQueryFace.3 -#usr/share/man/man3/FcGetDefaultLangs.3 -#usr/share/man/man3/FcGetLangs.3 -#usr/share/man/man3/FcGetVersion.3 -#usr/share/man/man3/FcInit.3 -#usr/share/man/man3/FcInitBringUptoDate.3 -#usr/share/man/man3/FcInitLoadConfig.3 -#usr/share/man/man3/FcInitLoadConfigAndFonts.3 -#usr/share/man/man3/FcInitReinitialize.3 -#usr/share/man/man3/FcIsLower.3 -#usr/share/man/man3/FcIsUpper.3 -#usr/share/man/man3/FcLangGetCharSet.3 -#usr/share/man/man3/FcLangNormalize.3 -#usr/share/man/man3/FcLangSetAdd.3 -#usr/share/man/man3/FcLangSetCompare.3 -#usr/share/man/man3/FcLangSetContains.3 -#usr/share/man/man3/FcLangSetCopy.3 -#usr/share/man/man3/FcLangSetCreate.3 -#usr/share/man/man3/FcLangSetDel.3 -#usr/share/man/man3/FcLangSetDestroy.3 -#usr/share/man/man3/FcLangSetEqual.3 -#usr/share/man/man3/FcLangSetGetLangs.3 -#usr/share/man/man3/FcLangSetHasLang.3 -#usr/share/man/man3/FcLangSetHash.3 -#usr/share/man/man3/FcLangSetSubtract.3 -#usr/share/man/man3/FcLangSetUnion.3 -#usr/share/man/man3/FcMatrixCopy.3 -#usr/share/man/man3/FcMatrixEqual.3 -#usr/share/man/man3/FcMatrixInit.3 -#usr/share/man/man3/FcMatrixMultiply.3 -#usr/share/man/man3/FcMatrixRotate.3 -#usr/share/man/man3/FcMatrixScale.3 -#usr/share/man/man3/FcMatrixShear.3 -#usr/share/man/man3/FcNameConstant.3 -#usr/share/man/man3/FcNameGetConstant.3 -#usr/share/man/man3/FcNameGetObjectType.3 -#usr/share/man/man3/FcNameParse.3 -#usr/share/man/man3/FcNameRegisterConstants.3 -#usr/share/man/man3/FcNameRegisterObjectTypes.3 -#usr/share/man/man3/FcNameUnparse.3 -#usr/share/man/man3/FcNameUnregisterConstants.3 -#usr/share/man/man3/FcNameUnregisterObjectTypes.3 -#usr/share/man/man3/FcObjectSetAdd.3 -#usr/share/man/man3/FcObjectSetBuild.3 -#usr/share/man/man3/FcObjectSetCreate.3 -#usr/share/man/man3/FcObjectSetDestroy.3 -#usr/share/man/man3/FcPatternAdd-Type.3 -#usr/share/man/man3/FcPatternAdd.3 -#usr/share/man/man3/FcPatternAddWeak.3 -#usr/share/man/man3/FcPatternBuild.3 -#usr/share/man/man3/FcPatternCreate.3 -#usr/share/man/man3/FcPatternDel.3 -#usr/share/man/man3/FcPatternDestroy.3 -#usr/share/man/man3/FcPatternDuplicate.3 -#usr/share/man/man3/FcPatternEqual.3 -#usr/share/man/man3/FcPatternEqualSubset.3 -#usr/share/man/man3/FcPatternFilter.3 -#usr/share/man/man3/FcPatternFormat.3 -#usr/share/man/man3/FcPatternGet-Type.3 -#usr/share/man/man3/FcPatternGet.3 -#usr/share/man/man3/FcPatternHash.3 -#usr/share/man/man3/FcPatternPrint.3 -#usr/share/man/man3/FcPatternReference.3 -#usr/share/man/man3/FcPatternRemove.3 -#usr/share/man/man3/FcRangeCopy.3 -#usr/share/man/man3/FcRangeCreateDouble.3 -#usr/share/man/man3/FcRangeCreateInteger.3 -#usr/share/man/man3/FcRangeDestroy.3 -#usr/share/man/man3/FcRangeGetDouble.3 -#usr/share/man/man3/FcStrBasename.3 -#usr/share/man/man3/FcStrCmp.3 -#usr/share/man/man3/FcStrCmpIgnoreCase.3 -#usr/share/man/man3/FcStrCopy.3 -#usr/share/man/man3/FcStrCopyFilename.3 -#usr/share/man/man3/FcStrDirname.3 -#usr/share/man/man3/FcStrDowncase.3 -#usr/share/man/man3/FcStrFree.3 -#usr/share/man/man3/FcStrListCreate.3 -#usr/share/man/man3/FcStrListDone.3 -#usr/share/man/man3/FcStrListFirst.3 -#usr/share/man/man3/FcStrListNext.3 -#usr/share/man/man3/FcStrPlus.3 -#usr/share/man/man3/FcStrSetAdd.3 -#usr/share/man/man3/FcStrSetAddFilename.3 -#usr/share/man/man3/FcStrSetCreate.3 -#usr/share/man/man3/FcStrSetDel.3 -#usr/share/man/man3/FcStrSetDestroy.3 -#usr/share/man/man3/FcStrSetEqual.3 -#usr/share/man/man3/FcStrSetMember.3 -#usr/share/man/man3/FcStrStr.3 -#usr/share/man/man3/FcStrStrIgnoreCase.3 -#usr/share/man/man3/FcToLower.3 -#usr/share/man/man3/FcUcs4ToUtf8.3 -#usr/share/man/man3/FcUtf16Len.3 -#usr/share/man/man3/FcUtf16ToUcs4.3 -#usr/share/man/man3/FcUtf8Len.3 -#usr/share/man/man3/FcUtf8ToUcs4.3 -#usr/share/man/man3/FcValueDestroy.3 -#usr/share/man/man3/FcValueEqual.3 -#usr/share/man/man3/FcValuePrint.3 -#usr/share/man/man3/FcValueSave.3 -#usr/share/man/man3/FcWeightFromOpenType.3 -#usr/share/man/man3/FcWeightToOpenType.3 -#usr/share/man/man5/fonts-conf.5 +#usr/share/gettext/its/fontconfig.its +#usr/share/gettext/its/fontconfig.loc +#usr/share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo +#usr/share/locale/zh_CN/LC_MESSAGES/fontconfig.mo #usr/share/xml #usr/share/xml/fontconfig usr/share/xml/fontconfig/fonts.dtd diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler index 5ceb9f4d8..17fb1b966 100644 --- a/config/rootfiles/common/poppler +++ b/config/rootfiles/common/poppler @@ -13,9 +13,7 @@ usr/bin/pdfunite #usr/include/poppler #usr/include/poppler/Annot.h #usr/include/poppler/Array.h -+usr/include/poppler/BBoxOutputDev.h -#usr/include/poppler/BuiltinFont.h -#usr/include/poppler/BuiltinFontTables.h +#usr/include/poppler/BBoxOutputDev.h #usr/include/poppler/CMap.h #usr/include/poppler/CachedFile.h #usr/include/poppler/CairoFontEngine.h @@ -25,7 +23,6 @@ usr/bin/pdfunite #usr/include/poppler/CertificateInfo.h #usr/include/poppler/CharCodeToUnicode.h #usr/include/poppler/CharTypes.h -#usr/include/poppler/CompactFontTables.h #usr/include/poppler/CurlCachedFile.h #usr/include/poppler/CurlPDFDocBuilder.h #usr/include/poppler/DateInfo.h @@ -73,7 +70,6 @@ usr/bin/pdfunite #usr/include/poppler/ProfileData.h #usr/include/poppler/Rendition.h #usr/include/poppler/SecurityHandler.h -#usr/include/poppler/SignatureInfo.h #usr/include/poppler/Sound.h #usr/include/poppler/SplashOutputDev.h #usr/include/poppler/StdinCachedFile.h @@ -84,7 +80,6 @@ usr/bin/pdfunite #usr/include/poppler/StructTreeRoot.h #usr/include/poppler/TextOutputDev.h #usr/include/poppler/UTF.h -#usr/include/poppler/UTF8.h #usr/include/poppler/UnicodeCClassTables.h #usr/include/poppler/UnicodeCompTables.h #usr/include/poppler/UnicodeDecompTables.h @@ -94,13 +89,12 @@ usr/bin/pdfunite #usr/include/poppler/UnicodeTypeTable.h #usr/include/poppler/ViewerPreferences.h #usr/include/poppler/XRef.h -#usr/include/poppler/XpdfPluginAPI.h #usr/include/poppler/cpp #usr/include/poppler/cpp/poppler-destination.h #usr/include/poppler/cpp/poppler-document.h #usr/include/poppler/cpp/poppler-embedded-file.h -#usr/include/poppler/cpp/poppler-font.h #usr/include/poppler/cpp/poppler-font-private.h +#usr/include/poppler/cpp/poppler-font.h #usr/include/poppler/cpp/poppler-global.h #usr/include/poppler/cpp/poppler-image.h #usr/include/poppler/cpp/poppler-page-renderer.h @@ -133,17 +127,12 @@ usr/bin/pdfunite #usr/include/poppler/glib/poppler-structure-element.h #usr/include/poppler/glib/poppler.h #usr/include/poppler/goo -#usr/include/poppler/goo/FixedPoint.h #usr/include/poppler/goo/GooCheckedOps.h -#usr/include/poppler/goo/GooHash.h #usr/include/poppler/goo/GooLikely.h -#usr/include/poppler/goo/GooList.h -#usr/include/poppler/goo/GooMutex.h #usr/include/poppler/goo/GooString.h #usr/include/poppler/goo/GooTimer.h #usr/include/poppler/goo/ImgWriter.h #usr/include/poppler/goo/JpegWriter.h -#usr/include/poppler/goo/NetPBMWriter.h #usr/include/poppler/goo/PNGWriter.h #usr/include/poppler/goo/TiffWriter.h #usr/include/poppler/goo/gdir.h @@ -151,7 +140,6 @@ usr/bin/pdfunite #usr/include/poppler/goo/gmem.h #usr/include/poppler/goo/grandom.h #usr/include/poppler/goo/gstrtod.h -#usr/include/poppler/goo/gtypes.h #usr/include/poppler/poppler-config.h #usr/include/poppler/splash #usr/include/poppler/splash/Splash.h @@ -167,27 +155,19 @@ usr/bin/pdfunite #usr/include/poppler/splash/SplashFontFileID.h #usr/include/poppler/splash/SplashGlyphBitmap.h #usr/include/poppler/splash/SplashMath.h +#usr/include/poppler/splash/SplashPath.h #usr/include/poppler/splash/SplashPattern.h #usr/include/poppler/splash/SplashScreen.h #usr/include/poppler/splash/SplashState.h -#usr/include/poppler/splash/SplashT1Font.h -#usr/include/poppler/splash/SplashT1FontEngine.h -#usr/include/poppler/splash/SplashT1FontFile.h #usr/include/poppler/splash/SplashTypes.h #usr/include/poppler/splash/SplashXPath.h #usr/include/poppler/splash/SplashXPathScanner.h -#usr/lib/libpoppler-cpp.a -#usr/lib/libpoppler-cpp.la #usr/lib/libpoppler-cpp.so usr/lib/libpoppler-cpp.so.0 usr/lib/libpoppler-cpp.so.0.9.0 -#usr/lib/libpoppler-glib.a -#usr/lib/libpoppler-glib.la #usr/lib/libpoppler-glib.so usr/lib/libpoppler-glib.so.8 usr/lib/libpoppler-glib.so.8.17.0 -#usr/lib/libpoppler.a -#usr/lib/libpoppler.la #usr/lib/libpoppler.so usr/lib/libpoppler.so.100 usr/lib/libpoppler.so.100.0.0 @@ -196,44 +176,6 @@ usr/lib/libpoppler.so.100.0.0 #usr/lib/pkgconfig/poppler-glib.pc #usr/lib/pkgconfig/poppler-splash.pc #usr/lib/pkgconfig/poppler.pc -#usr/share/gtk-doc/html/poppler -#usr/share/gtk-doc/html/poppler/PopplerAnnot.html -#usr/share/gtk-doc/html/poppler/PopplerAttachment.html -#usr/share/gtk-doc/html/poppler/PopplerDocument.html -#usr/share/gtk-doc/html/poppler/PopplerFormField.html -#usr/share/gtk-doc/html/poppler/PopplerLayer.html -#usr/share/gtk-doc/html/poppler/PopplerMedia.html -#usr/share/gtk-doc/html/poppler/PopplerMovie.html -#usr/share/gtk-doc/html/poppler/PopplerPage.html -#usr/share/gtk-doc/html/poppler/PopplerStructureElement.html -#usr/share/gtk-doc/html/poppler/annotation-glossary.html -#usr/share/gtk-doc/html/poppler/api-index-0-12.html -#usr/share/gtk-doc/html/poppler/api-index-0-14.html -#usr/share/gtk-doc/html/poppler/api-index-0-16.html -#usr/share/gtk-doc/html/poppler/api-index-0-18.html -#usr/share/gtk-doc/html/poppler/api-index-0-20.html -#usr/share/gtk-doc/html/poppler/api-index-0-22.html -#usr/share/gtk-doc/html/poppler/api-index-0-26.html -#usr/share/gtk-doc/html/poppler/api-index-0-33.html -#usr/share/gtk-doc/html/poppler/api-index-0-46.html -#usr/share/gtk-doc/html/poppler/api-index-deprecated.html -#usr/share/gtk-doc/html/poppler/api-index-full.html -#usr/share/gtk-doc/html/poppler/ch01.html -#usr/share/gtk-doc/html/poppler/home.png -#usr/share/gtk-doc/html/poppler/index.html -#usr/share/gtk-doc/html/poppler/left-insensitive.png -#usr/share/gtk-doc/html/poppler/left.png -#usr/share/gtk-doc/html/poppler/poppler-Error-handling.html -#usr/share/gtk-doc/html/poppler/poppler-PDF-Utility-functions.html -#usr/share/gtk-doc/html/poppler/poppler-PopplerAction.html -#usr/share/gtk-doc/html/poppler/poppler-PopplerColor.html -#usr/share/gtk-doc/html/poppler/poppler-Version-and-Features-Information.html -#usr/share/gtk-doc/html/poppler/poppler.devhelp2 -#usr/share/gtk-doc/html/poppler/right-insensitive.png -#usr/share/gtk-doc/html/poppler/right.png -#usr/share/gtk-doc/html/poppler/style.css -#usr/share/gtk-doc/html/poppler/up-insensitive.png -#usr/share/gtk-doc/html/poppler/up.png #usr/share/man/man1/pdfattach.1 #usr/share/man/man1/pdfdetach.1 #usr/share/man/man1/pdffonts.1