From patchwork Tue Mar 7 22:05:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6681 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 "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PWTyp6xx7z3ww4 for ; Tue, 7 Mar 2023 22:05:22 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PWTyp1pfFzQS; Tue, 7 Mar 2023 22:05:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PWTyp0xNyz2yvq; Tue, 7 Mar 2023 22:05:22 +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 "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PWTyn1Nj2z2xFl for ; Tue, 7 Mar 2023 22:05:21 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PWTym4xKCzPV; Tue, 7 Mar 2023 22:05:20 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1678226720; 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=cQ4X1i2vCDPaC+eTKaDbiAKXgqwMfpCaC/zgFBEaS0k=; b=fHYLRz8WTwUxVXWrQ2Yd6Yb/3clV5pU0FtXKnXsJ1MjHJifNr/wJKLlPOzi4f8TO5xFqw9 CDv+kDTFsnQIQdBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1678226720; 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=cQ4X1i2vCDPaC+eTKaDbiAKXgqwMfpCaC/zgFBEaS0k=; b=Lb0LNhzUiCx5H+Q+rn+8hCbJ+Gcer43DGrDlb+FgJ3diB8yFntn1YFs/Dzelwr1eD9V0KE kVaUBu1Cy3HhZvZ4MFuHVHV8zyW8E0s0Nre2Nyq/6rhS+A2KxqFHb6rz6VE0JI/dcffFaU YybOGRpOlQLpudNFlts8NSDt/VEcOSJ90PZyN9+kPjYamJ81hTQk9eYdYbhujYVmdxuBJK DEWdfQFlmYpRTmcGyrJGJACeFZaU7fKUadwfIeTgZxZJ87PxfB/vwRl1nPCcovSTYWAZqU vC90lMt+6jlIJVYQtl/wWCUdzFLC5umL13dOcXUPa4zNjFh4wb5n4mOcV0FNGQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/2] qpdf: Update to version 11.3.0 Date: Tue, 7 Mar 2023 23:05:15 +0100 Message-Id: <20230307220516.3459234-1-adolf.belka@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: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from version 10.4.0 to 11.3.0 - Update of rootfile - Build changed to cmake from version 11.0 onwards - find-dependencies run due to lib so bump. Only qpdf and cups-filters are linked to the changed libs. cups-filters being shipped due to a change required because of qpdf-11.3.0 - Changelog is too large to include here. Details can be found in the ChangeLog file in the source tarball. Signed-off-by: Adolf Belka --- config/rootfiles/common/qpdf | 29 +++++++++++++++++++++++------ lfs/qpdf | 17 ++++++++++------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/config/rootfiles/common/qpdf b/config/rootfiles/common/qpdf index 6e59ba345..1afd04a53 100644 --- a/config/rootfiles/common/qpdf +++ b/config/rootfiles/common/qpdf @@ -10,6 +10,7 @@ usr/bin/qpdf #usr/include/qpdf/FileInputSource.hh #usr/include/qpdf/InputSource.hh #usr/include/qpdf/JSON.hh +#usr/include/qpdf/PDFVersion.hh #usr/include/qpdf/Pipeline.hh #usr/include/qpdf/Pl_Buffer.hh #usr/include/qpdf/Pl_Concatenate.hh @@ -17,9 +18,12 @@ usr/bin/qpdf #usr/include/qpdf/Pl_DCT.hh #usr/include/qpdf/Pl_Discard.hh #usr/include/qpdf/Pl_Flate.hh +#usr/include/qpdf/Pl_Function.hh +#usr/include/qpdf/Pl_OStream.hh #usr/include/qpdf/Pl_QPDFTokenizer.hh #usr/include/qpdf/Pl_RunLength.hh #usr/include/qpdf/Pl_StdioFile.hh +#usr/include/qpdf/Pl_String.hh #usr/include/qpdf/PointerHolder.hh #usr/include/qpdf/QIntC.hh #usr/include/qpdf/QPDF.hh @@ -33,6 +37,8 @@ usr/bin/qpdf #usr/include/qpdf/QPDFExc.hh #usr/include/qpdf/QPDFFileSpecObjectHelper.hh #usr/include/qpdf/QPDFFormFieldObjectHelper.hh +#usr/include/qpdf/QPDFJob.hh +#usr/include/qpdf/QPDFLogger.hh #usr/include/qpdf/QPDFMatrix.hh #usr/include/qpdf/QPDFNameTreeObjectHelper.hh #usr/include/qpdf/QPDFNumberTreeObjectHelper.hh @@ -48,22 +54,33 @@ usr/bin/qpdf #usr/include/qpdf/QPDFStreamFilter.hh #usr/include/qpdf/QPDFSystemError.hh #usr/include/qpdf/QPDFTokenizer.hh +#usr/include/qpdf/QPDFUsage.hh #usr/include/qpdf/QPDFWriter.hh #usr/include/qpdf/QPDFXRefEntry.hh #usr/include/qpdf/QTC.hh #usr/include/qpdf/QUtil.hh #usr/include/qpdf/RandomDataProvider.hh #usr/include/qpdf/Types.h +#usr/include/qpdf/auto_job_c_att.hh +#usr/include/qpdf/auto_job_c_copy_att.hh +#usr/include/qpdf/auto_job_c_enc.hh +#usr/include/qpdf/auto_job_c_main.hh +#usr/include/qpdf/auto_job_c_pages.hh +#usr/include/qpdf/auto_job_c_uo.hh #usr/include/qpdf/qpdf-c.h -#usr/lib/libqpdf.la +#usr/include/qpdf/qpdfjob-c.h +#usr/include/qpdf/qpdflogger-c.h +#usr/lib/cmake/qpdf +#usr/lib/cmake/qpdf/libqpdfTargets-noconfig.cmake +#usr/lib/cmake/qpdf/libqpdfTargets.cmake +#usr/lib/cmake/qpdf/qpdfConfig.cmake +#usr/lib/cmake/qpdf/qpdfConfigVersion.cmake #usr/lib/libqpdf.so -usr/lib/libqpdf.so.28 -usr/lib/libqpdf.so.28.4.0 +usr/lib/libqpdf.so.29 +usr/lib/libqpdf.so.29.3.0 #usr/lib/pkgconfig/libqpdf.pc #usr/share/doc/qpdf -#usr/share/doc/qpdf/qpdf-manual.html -#usr/share/doc/qpdf/qpdf-manual.pdf -#usr/share/doc/qpdf/stylesheet.css +#usr/share/doc/qpdf/README-doc.txt #usr/share/man/man1/fix-qdf.1 #usr/share/man/man1/qpdf.1 #usr/share/man/man1/zlib-flate.1 diff --git a/lfs/qpdf b/lfs/qpdf index c51883f83..2b7557c27 100644 --- a/lfs/qpdf +++ b/lfs/qpdf @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team # +# Copyright (C) 2007-2023 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 # @@ -24,7 +24,7 @@ include Config -VER = 10.4.0 +VER = 11.3.0 THISAPP = qpdf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = bc984c742bec582b5b67f7a4f4f00bb22a36e8e14d78b8e8848baed0c94489f6920070bc317928c53aca855c252c2fa5de0fba8b64ba16ba37afc2362d6ae7ba +$(DL_FILE)_BLAKE2 = 80dd2a96f3b82b9e530f26c72cd24cd3b111e2e1cbe821b12af13807e8d54fbc7f5632130f5cbd03df1b7c70de3c94a7e889d4ea4f1a3670a28f726364564b16 install : $(TARGET) @@ -70,9 +70,12 @@ $(subst %,%_BLAKE2,$(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 --disable-static \ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && mkdir -pv build + cd $(DIR_APP)/build && cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_STATIC_LIBS=FALSE \ + -DINSTALL_EXAMPLES=OFF + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install @rm -rf $(DIR_APP) @$(POSTBUILD)