* [PATCH 1/2] qpdf: Update to version 11.3.0
@ 2023-03-07 22:05 Adolf Belka
2023-03-07 22:05 ` [PATCH 2/2] cups-filters: -std=c++17 required due to problem introduced with qpdf-11.3.0 Adolf Belka
0 siblings, 1 reply; 2+ messages in thread
From: Adolf Belka @ 2023-03-07 22:05 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5298 bytes --]
- 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 <adolf.belka(a)ipfire.org>
---
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 <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# 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)
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 2/2] cups-filters: -std=c++17 required due to problem introduced with qpdf-11.3.0
2023-03-07 22:05 [PATCH 1/2] qpdf: Update to version 11.3.0 Adolf Belka
@ 2023-03-07 22:05 ` Adolf Belka
0 siblings, 0 replies; 2+ messages in thread
From: Adolf Belka @ 2023-03-07 22:05 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1778 bytes --]
- Add -std=c++17 flag to configure
- Disable static libs
- Update of rootfile
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/packages/cups-filters | 2 --
lfs/cups-filters | 4 +++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/rootfiles/packages/cups-filters b/config/rootfiles/packages/cups-filters
index 0378162f5..6cdccf203 100644
--- a/config/rootfiles/packages/cups-filters
+++ b/config/rootfiles/packages/cups-filters
@@ -74,12 +74,10 @@ 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
usr/lib/libcupsfilters.so.1
usr/lib/libcupsfilters.so.1.0.0
-#usr/lib/libfontembed.a
#usr/lib/libfontembed.la
#usr/lib/libfontembed.so
usr/lib/libfontembed.so.1
diff --git a/lfs/cups-filters b/lfs/cups-filters
index b9f9a1939..7f209aa03 100644
--- a/lfs/cups-filters
+++ b/lfs/cups-filters
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cups-filters
-PAK_VER = 11
+PAK_VER = 12
DEPS = cups ghostscript
@@ -84,12 +84,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && \
+ CXXFLAGS="-std=c++17" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--with-pdftops=hybrid \
--disable-mutool \
+ --disable-static \
--disable-avahi
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-07 22:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-07 22:05 [PATCH 1/2] qpdf: Update to version 11.3.0 Adolf Belka
2023-03-07 22:05 ` [PATCH 2/2] cups-filters: -std=c++17 required due to problem introduced with qpdf-11.3.0 Adolf Belka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox