diff mbox series

[06/12] poppler: Update to 0.89.0

Message ID	20200825095040.3854-6-michael.tremer@ipfire.org
State	Accepted
Commit	dfcbf8747289e04bf39eae5b125044c5b2bb5258
Headers	From: Michael Tremer <michael.tremer@ipfire.org> 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 Content-Transfer-Encoding: 8bit Precedence: list Cc: Michael Tremer <michael.tremer@ipfire.org> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org>
Series	[01/12] fontconfig: update to 2.13.1 \| [01/12] fontconfig: update to 2.13.1 [02/12] freetype: Update to 2.10.2 [03/12] openjpeg: New package [04/12] qpdf: Update to 10.0.1 [05/12] lcms2: Update to 2.9 [06/12] poppler: Update to 0.89.0 [07/12] avahi: Update to 0.8 [08/12] poppler-data: New package [09/12] cups: Update to 2.3.3 [10/12] cups-filters: Update to 1.27.4 [11/12] foomatic: Drop files that are now provided by cups-filter [12/12] Rootfile update after fresh build

Commit Message

Michael Tremer Aug. 25, 2020, 9:50 a.m. UTC

  Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/common/poppler | 25 ++++++++++++++++++++-----
 lfs/poppler                     | 27 ++++++++++++++-------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff mbox series

Patch

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)