poppler-glib, correction port

3 files changed, 95 insertions, 21 deletions

diff --git a/extra/poppler-glib/.footprint.i686 b/extra/poppler-glib/.footprint.i686
index 446abed54..4e5176e95 100644
--- a/extra/poppler-glib/.footprint.i686
+++ b/extra/poppler-glib/.footprint.i686
@@ -1,4 +1,6 @@
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/poppler-glib-demo
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/poppler/
 drwxr-xr-x	root/root	usr/include/poppler/glib/
@@ -24,3 +26,36 @@ lrwxrwxrwx	root/root	usr/lib/libpoppler-glib.so.6 -> libpoppler-glib.so.6.0.0
 -rwxr-xr-x	root/root	usr/lib/libpoppler-glib.so.6.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/poppler-glib.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/gir-1.0/
+-rw-r--r--	root/root	usr/share/gir-1.0/Poppler-0.16.gir
+drwxr-xr-x	root/root	usr/share/gtk-doc/
+drwxr-xr-x	root/root	usr/share/gtk-doc/html/
+drwxr-xr-x	root/root	usr/share/gtk-doc/html/poppler/
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerAnnot.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerAttachment.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerDocument.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerFormField.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerLayer.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerMedia.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerMovie.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerPage.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/annotation-glossary.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/api-index-0-12.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/api-index-0-14.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/api-index-0-16.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/api-index-deprecated.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/api-index-full.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/ch01.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/home.png
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/index.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/index.sgml
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/left.png
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/poppler-PopplerAction.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/poppler-Version-and-Features-Information.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/poppler-poppler.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/poppler.devhelp
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/poppler.devhelp2
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/right.png
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/style.css
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/up.png
diff --git a/extra/poppler-glib/.footprint.x86_64 b/extra/poppler-glib/.footprint.x86_64
index 446abed54..4e5176e95 100644
--- a/extra/poppler-glib/.footprint.x86_64
+++ b/extra/poppler-glib/.footprint.x86_64
@@ -1,4 +1,6 @@
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/poppler-glib-demo
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/poppler/
 drwxr-xr-x	root/root	usr/include/poppler/glib/
@@ -24,3 +26,36 @@ lrwxrwxrwx	root/root	usr/lib/libpoppler-glib.so.6 -> libpoppler-glib.so.6.0.0
 -rwxr-xr-x	root/root	usr/lib/libpoppler-glib.so.6.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/poppler-glib.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/gir-1.0/
+-rw-r--r--	root/root	usr/share/gir-1.0/Poppler-0.16.gir
+drwxr-xr-x	root/root	usr/share/gtk-doc/
+drwxr-xr-x	root/root	usr/share/gtk-doc/html/
+drwxr-xr-x	root/root	usr/share/gtk-doc/html/poppler/
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerAnnot.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerAttachment.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerDocument.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerFormField.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerLayer.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerMedia.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerMovie.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/PopplerPage.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/annotation-glossary.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/api-index-0-12.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/api-index-0-14.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/api-index-0-16.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/api-index-deprecated.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/api-index-full.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/ch01.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/home.png
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/index.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/index.sgml
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/left.png
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/poppler-PopplerAction.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/poppler-Version-and-Features-Information.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/poppler-poppler.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/poppler.devhelp
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/poppler.devhelp2
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/right.png
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/style.css
+-rw-r--r--	root/root	usr/share/gtk-doc/html/poppler/up.png
diff --git a/extra/poppler-glib/Pkgfile b/extra/poppler-glib/Pkgfile
index 271da0934..9228f8059 100755
--- a/extra/poppler-glib/Pkgfile
+++ b/extra/poppler-glib/Pkgfile
@@ -2,32 +2,36 @@
 # URL: http://poppler.freedesktop.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: gtk, poppler, xorg-libxdamage, xorg-libxrandr, xorg-libxinerama, xorg-libxcursor
+# Depends on: gtk, poppler
 # Run on: gtk,poppler
 
 name=poppler-glib
 version=0.16.4
-release=1
+release=2
 source=(http://poppler.freedesktop.org/poppler-$version.tar.gz)
 
 build() {
-	cd poppler-$version
-	./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static \
-	      --enable-zlib \
-	      --enable-libjpeg \
-	      --enable-cairo-output \
-	      --disable-poppler-qt4 \
-	      --enable-poppler-glib \
-		--disable-poppler-cpp \
-	      --disable-poppler-qt
-	pushd poppler
-	make libpoppler-cairo.la
-	popd 
-	make
-	make prefix=$PKG/usr install
-	rm -r $PKG/usr/{bin,share}
-	rm -r $PKG/usr/lib/libpoppler.*
-	rm -r $PKG/usr/lib/pkgconfig/poppler{.pc,-splash.pc,-cairo.pc}
+        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 \
+                --enable-poppler-glib
+        make
+        sed -e 's/^glib_subdir =.*/glib_subdir =/' \
+            -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
+
+        cd poppler
+        make DESTDIR=$PKG install-libLTLIBRARIES
+        cd $SRC/poppler-$version/glib
+        make DESTDIR=$PKG install
+
+        install -m755 -d $PKG/usr/lib/pkgconfig
+        install -m644 ../poppler-glib.pc $PKG/usr/lib/pkgconfig/
+        rm -f $PKG/usr/lib/libpoppler.*
 }
-  
+i