poppler, correction port

2 files changed, 183 insertions, 15 deletions

diff --git a/extra/poppler/.footprint..i686 b/extra/poppler/.footprint..i686
new file mode 100644
index 000000000..d56f68086
--- /dev/null
+++ b/extra/poppler/.footprint..i686
@@ -0,0 +1,163 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/pdffonts
+-rwxr-xr-x	root/root	usr/bin/pdfimages
+-rwxr-xr-x	root/root	usr/bin/pdfinfo
+-rwxr-xr-x	root/root	usr/bin/pdftoabw
+-rwxr-xr-x	root/root	usr/bin/pdftohtml
+-rwxr-xr-x	root/root	usr/bin/pdftoppm
+-rwxr-xr-x	root/root	usr/bin/pdftops
+-rwxr-xr-x	root/root	usr/bin/pdftotext
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/poppler/
+-rw-r--r--	root/root	usr/include/poppler/Annot.h
+-rw-r--r--	root/root	usr/include/poppler/Array.h
+-rw-r--r--	root/root	usr/include/poppler/BuiltinFont.h
+-rw-r--r--	root/root	usr/include/poppler/BuiltinFontTables.h
+-rw-r--r--	root/root	usr/include/poppler/CMap.h
+-rw-r--r--	root/root	usr/include/poppler/CachedFile.h
+-rw-r--r--	root/root	usr/include/poppler/Catalog.h
+-rw-r--r--	root/root	usr/include/poppler/CharCodeToUnicode.h
+-rw-r--r--	root/root	usr/include/poppler/CharTypes.h
+-rw-r--r--	root/root	usr/include/poppler/CompactFontTables.h
+-rw-r--r--	root/root	usr/include/poppler/DateInfo.h
+-rw-r--r--	root/root	usr/include/poppler/Decrypt.h
+-rw-r--r--	root/root	usr/include/poppler/Dict.h
+-rw-r--r--	root/root	usr/include/poppler/Error.h
+-rw-r--r--	root/root	usr/include/poppler/ErrorCodes.h
+-rw-r--r--	root/root	usr/include/poppler/FileSpec.h
+-rw-r--r--	root/root	usr/include/poppler/FontEncodingTables.h
+-rw-r--r--	root/root	usr/include/poppler/FontInfo.h
+-rw-r--r--	root/root	usr/include/poppler/Form.h
+-rw-r--r--	root/root	usr/include/poppler/Function.h
+-rw-r--r--	root/root	usr/include/poppler/Gfx.h
+-rw-r--r--	root/root	usr/include/poppler/GfxFont.h
+-rw-r--r--	root/root	usr/include/poppler/GfxState.h
+-rw-r--r--	root/root	usr/include/poppler/GfxState_helpers.h
+-rw-r--r--	root/root	usr/include/poppler/GlobalParams.h
+-rw-r--r--	root/root	usr/include/poppler/Hints.h
+-rw-r--r--	root/root	usr/include/poppler/JArithmeticDecoder.h
+-rw-r--r--	root/root	usr/include/poppler/JBIG2Stream.h
+-rw-r--r--	root/root	usr/include/poppler/Lexer.h
+-rw-r--r--	root/root	usr/include/poppler/Linearization.h
+-rw-r--r--	root/root	usr/include/poppler/Link.h
+-rw-r--r--	root/root	usr/include/poppler/LocalPDFDocBuilder.h
+-rw-r--r--	root/root	usr/include/poppler/Movie.h
+-rw-r--r--	root/root	usr/include/poppler/NameToCharCode.h
+-rw-r--r--	root/root	usr/include/poppler/NameToUnicodeTable.h
+-rw-r--r--	root/root	usr/include/poppler/Object.h
+-rw-r--r--	root/root	usr/include/poppler/OptionalContent.h
+-rw-r--r--	root/root	usr/include/poppler/Outline.h
+-rw-r--r--	root/root	usr/include/poppler/OutputDev.h
+-rw-r--r--	root/root	usr/include/poppler/PDFDoc.h
+-rw-r--r--	root/root	usr/include/poppler/PDFDocBuilder.h
+-rw-r--r--	root/root	usr/include/poppler/PDFDocEncoding.h
+-rw-r--r--	root/root	usr/include/poppler/PDFDocFactory.h
+-rw-r--r--	root/root	usr/include/poppler/PSOutputDev.h
+-rw-r--r--	root/root	usr/include/poppler/PSTokenizer.h
+-rw-r--r--	root/root	usr/include/poppler/Page.h
+-rw-r--r--	root/root	usr/include/poppler/PageTransition.h
+-rw-r--r--	root/root	usr/include/poppler/Parser.h
+-rw-r--r--	root/root	usr/include/poppler/PopplerCache.h
+-rw-r--r--	root/root	usr/include/poppler/PreScanOutputDev.h
+-rw-r--r--	root/root	usr/include/poppler/ProfileData.h
+-rw-r--r--	root/root	usr/include/poppler/Rendition.h
+-rw-r--r--	root/root	usr/include/poppler/SecurityHandler.h
+-rw-r--r--	root/root	usr/include/poppler/Sound.h
+-rw-r--r--	root/root	usr/include/poppler/SplashOutputDev.h
+-rw-r--r--	root/root	usr/include/poppler/StdinCachedFile.h
+-rw-r--r--	root/root	usr/include/poppler/StdinPDFDocBuilder.h
+-rw-r--r--	root/root	usr/include/poppler/Stream-CCITT.h
+-rw-r--r--	root/root	usr/include/poppler/Stream.h
+-rw-r--r--	root/root	usr/include/poppler/TextOutputDev.h
+-rw-r--r--	root/root	usr/include/poppler/UTF8.h
+-rw-r--r--	root/root	usr/include/poppler/UnicodeCClassTables.h
+-rw-r--r--	root/root	usr/include/poppler/UnicodeCompTables.h
+-rw-r--r--	root/root	usr/include/poppler/UnicodeDecompTables.h
+-rw-r--r--	root/root	usr/include/poppler/UnicodeMap.h
+-rw-r--r--	root/root	usr/include/poppler/UnicodeMapTables.h
+-rw-r--r--	root/root	usr/include/poppler/UnicodeTypeTable.h
+-rw-r--r--	root/root	usr/include/poppler/XRef.h
+-rw-r--r--	root/root	usr/include/poppler/XpdfPluginAPI.h
+drwxr-xr-x	root/root	usr/include/poppler/cpp/
+-rw-r--r--	root/root	usr/include/poppler/cpp/poppler-document.h
+-rw-r--r--	root/root	usr/include/poppler/cpp/poppler-embedded-file.h
+-rw-r--r--	root/root	usr/include/poppler/cpp/poppler-font.h
+-rw-r--r--	root/root	usr/include/poppler/cpp/poppler-global.h
+-rw-r--r--	root/root	usr/include/poppler/cpp/poppler-image.h
+-rw-r--r--	root/root	usr/include/poppler/cpp/poppler-page-renderer.h
+-rw-r--r--	root/root	usr/include/poppler/cpp/poppler-page-transition.h
+-rw-r--r--	root/root	usr/include/poppler/cpp/poppler-page.h
+-rw-r--r--	root/root	usr/include/poppler/cpp/poppler-rectangle.h
+-rw-r--r--	root/root	usr/include/poppler/cpp/poppler-toc.h
+-rw-r--r--	root/root	usr/include/poppler/cpp/poppler-version.h
+drwxr-xr-x	root/root	usr/include/poppler/fofi/
+-rw-r--r--	root/root	usr/include/poppler/fofi/FoFiBase.h
+-rw-r--r--	root/root	usr/include/poppler/fofi/FoFiEncodings.h
+-rw-r--r--	root/root	usr/include/poppler/fofi/FoFiTrueType.h
+-rw-r--r--	root/root	usr/include/poppler/fofi/FoFiType1.h
+-rw-r--r--	root/root	usr/include/poppler/fofi/FoFiType1C.h
+drwxr-xr-x	root/root	usr/include/poppler/goo/
+-rw-r--r--	root/root	usr/include/poppler/goo/FixedPoint.h
+-rw-r--r--	root/root	usr/include/poppler/goo/GooHash.h
+-rw-r--r--	root/root	usr/include/poppler/goo/GooLikely.h
+-rw-r--r--	root/root	usr/include/poppler/goo/GooList.h
+-rw-r--r--	root/root	usr/include/poppler/goo/GooMutex.h
+-rw-r--r--	root/root	usr/include/poppler/goo/GooString.h
+-rw-r--r--	root/root	usr/include/poppler/goo/GooTimer.h
+-rw-r--r--	root/root	usr/include/poppler/goo/ImgWriter.h
+-rw-r--r--	root/root	usr/include/poppler/goo/JpegWriter.h
+-rw-r--r--	root/root	usr/include/poppler/goo/PNGWriter.h
+-rw-r--r--	root/root	usr/include/poppler/goo/gfile.h
+-rw-r--r--	root/root	usr/include/poppler/goo/gmem.h
+-rw-r--r--	root/root	usr/include/poppler/goo/gstrtod.h
+-rw-r--r--	root/root	usr/include/poppler/goo/gtypes.h
+-rw-r--r--	root/root	usr/include/poppler/poppler-config.h
+drwxr-xr-x	root/root	usr/include/poppler/splash/
+-rw-r--r--	root/root	usr/include/poppler/splash/Splash.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashBitmap.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashClip.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashErrorCodes.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashFTFont.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashFTFontEngine.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashFTFontFile.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashFont.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashFontEngine.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashFontFile.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashFontFileID.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashGlyphBitmap.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashMath.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashPath.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashPattern.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashScreen.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashState.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashT1Font.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashT1FontEngine.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashT1FontFile.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashTypes.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashXPath.h
+-rw-r--r--	root/root	usr/include/poppler/splash/SplashXPathScanner.h
+drwxr-xr-x	root/root	usr/lib/
+-rwxr-xr-x	root/root	usr/lib/libpoppler-cpp.la
+lrwxrwxrwx	root/root	usr/lib/libpoppler-cpp.so -> libpoppler-cpp.so.0.2.0
+lrwxrwxrwx	root/root	usr/lib/libpoppler-cpp.so.0 -> libpoppler-cpp.so.0.2.0
+-rwxr-xr-x	root/root	usr/lib/libpoppler-cpp.so.0.2.0
+-rwxr-xr-x	root/root	usr/lib/libpoppler.la
+lrwxrwxrwx	root/root	usr/lib/libpoppler.so -> libpoppler.so.13.0.0
+lrwxrwxrwx	root/root	usr/lib/libpoppler.so.13 -> libpoppler.so.13.0.0
+-rwxr-xr-x	root/root	usr/lib/libpoppler.so.13.0.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/poppler-cairo.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/poppler-cpp.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/poppler-splash.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/poppler.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/pdffonts.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pdfimages.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pdfinfo.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pdftohtml.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pdftoppm.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pdftops.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pdftotext.1.gz
diff --git a/extra/poppler/Pkgfile b/extra/poppler/Pkgfile
index e92490f5d..c0a06d74c 100755
--- a/extra/poppler/Pkgfile
+++ b/extra/poppler/Pkgfile
@@ -2,27 +2,32 @@
 # URL: http://poppler.freedesktop.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: fontconfig, libjpeg, cairo, libxml2, openjpeg
-# Run on: fontconfig,libjpeg,cairo,libxml2,openjpeg
+# Depends on: fontconfig, libjpeg, cairo, libxml2, openjpeg, lcms
+# Run on: fontconfig,libjpeg,cairo,libxml2,openjpeg,qt
 
 name=poppler
 version=0.16.4
-release=1
+release=4
 source=(http://poppler.freedesktop.org/$name-$version.tar.gz \
 	http://poppler.freedesktop.org/poppler-data-0.4.4.tar.gz)
 
 build() {
-	cd $name-$version
-	./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static \
-	      --enable-cairo-output \
-	      --enable-xpdf-headers \
-	      --enable-libjpeg --enable-zlib \
-	      --disable-poppler-qt4 \
-	      --disable-poppler-glib \
-	      --disable-poppler-qt \
-	      --disable-gtk-test	
-	make
-	make prefix=$PKG/usr install
+ 	cd poppler-$version
+        sed -i -e '/AC_PATH_XTRA/d' configure.ac
+        autoreconf
+        ./configure --prefix=/usr --sysconfdir=/etc \
+                --localstatedir=/var --disable-static \
+                --enable-cairo-output \
+                --enable-xpdf-headers \
+                --enable-libjpeg --enable-zlib \
+                --disable-poppler-qt4 \
+                --disable-poppler-glib
+        make
+        sed -e 's/^glib_subdir =.*/glib_subdir =/' \
+            -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
+
+        make DESTDIR=$PKG install
+
+	rm -f $PKG/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
 }