[arch-commits] CVS update of extra/lib/poppler-glib (2 files)

Jan de Groot jgc at archlinux.org
Fri Sep 7 21:36:54 UTC 2007 

    Date: Friday, September 7, 2007 @ 17:36:54
  Author: jgc
    Path: /home/cvs-extra/extra/lib/poppler-glib

   Added: poppler-0.6-bindings.patch (1.1)
Modified: PKGBUILD (1.5 -> 1.6)

upgpkg: poppler-glib 0.6-1
Update to 0.6, warning: sobump


----------------------------+
 PKGBUILD                   |   20 ++---
 poppler-0.6-bindings.patch |  153 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+), 10 deletions(-)


Index: extra/lib/poppler-glib/PKGBUILD
diff -u extra/lib/poppler-glib/PKGBUILD:1.5 extra/lib/poppler-glib/PKGBUILD:1.6
--- extra/lib/poppler-glib/PKGBUILD:1.5	Sat Aug 25 05:03:09 2007
+++ extra/lib/poppler-glib/PKGBUILD	Fri Sep  7 17:36:54 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.5 2007/08/25 09:03:09 jgc Exp $
+# $Id: PKGBUILD,v 1.6 2007/09/07 21:36:54 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=poppler-glib
-pkgver=0.5.91
+pkgver=0.6
 pkgrel=1
 pkgdesc="Poppler glib bindings"
 arch=(i686 x86_64)
@@ -12,13 +12,13 @@
 options=('!libtool')
 url="http://poppler.freedesktop.org/"
 source=(http://poppler.freedesktop.org/poppler-${pkgver}.tar.gz
-	poppler-0.5.9-bindings.patch)
-md5sums=('0cc1b0f183b1559f10154bb57268c6e1'
-         'a33645793c2942d9cc014b50cd9282d6')
+	poppler-0.6-bindings.patch)
+md5sums=('96883867572aa1e55e979ec75369c562'
+         '88467fd38cc5a550ea8035bcc3a9f729')
 
 build() {
   cd ${startdir}/src/poppler-${pkgver}
-  patch -Np1 -i ${startdir}/src/poppler-0.5.9-bindings.patch || return 1
+  patch -Np1 -i ${startdir}/src/poppler-0.6-bindings.patch || return 1
   
   AT_M4DIR="m4" autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc \
@@ -30,9 +30,9 @@
 	      --disable-poppler-qt4 \
 	      --disable-poppler-qt
   pushd poppler || return 1
-  make libpoppler-cairo.la
-  popd
-  make 
-  make DESTDIR=${startdir}/pkg install
+  make libpoppler-cairo.la || return 1
+  popd 
+  make || return 1
+  make DESTDIR=${startdir}/pkg install || return 1
   rm -f ${startdir}/pkg/usr/lib/pkgconfig/poppler-cairo.pc || return 1
 }
Index: extra/lib/poppler-glib/poppler-0.6-bindings.patch
diff -u /dev/null extra/lib/poppler-glib/poppler-0.6-bindings.patch:1.1
--- /dev/null	Fri Sep  7 17:36:54 2007
+++ extra/lib/poppler-glib/poppler-0.6-bindings.patch	Fri Sep  7 17:36:54 2007
@@ -0,0 +1,153 @@
+diff -ur poppler-0.6.orig/glib/demo/Makefile.am poppler-0.6/glib/demo/Makefile.am
+--- poppler-0.6.orig/glib/demo/Makefile.am	2007-09-04 12:40:29.000000000 +0200
++++ poppler-0.6/glib/demo/Makefile.am	2007-09-04 12:40:58.000000000 +0200
+@@ -25,5 +25,5 @@
+ 
+ LDADD =						\
+ 	$(top_builddir)/glib/libpoppler-glib.la	\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler	\
+ 	$(GTK_TEST_LIBS)
+diff -ur poppler-0.6.orig/glib/Makefile.am poppler-0.6/glib/Makefile.am
+--- poppler-0.6.orig/glib/Makefile.am	2007-09-04 12:40:45.000000000 +0200
++++ poppler-0.6/glib/Makefile.am	2007-09-04 12:40:00.000000000 +0200
+@@ -84,7 +84,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_glib_la_LIBADD =				\
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler					\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(FREETYPE_LIBS)				\
+ 	$(FONTCONFIG_LIBS)				\
+@@ -98,7 +98,7 @@
+        test-poppler-glib.c
+ 
+ test_poppler_glib_LDADD =			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	libpoppler-glib.la			\
+ 	$(POPPLER_GLIB_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+Nur in poppler-0.6.orig/glib: Makefile.am.orig.
+diff -ur poppler-0.6.orig/glib/reference/Makefile.am poppler-0.6/glib/reference/Makefile.am
+--- poppler-0.6.orig/glib/reference/Makefile.am	2007-09-04 12:40:29.000000000 +0200
++++ poppler-0.6/glib/reference/Makefile.am	2007-09-04 12:40:58.000000000 +0200
+@@ -72,7 +72,7 @@
+ 	$(POPPLER_GLIB_CFLAGS)				\
+ 	$(FREETYPE_CFLAGS)
+ 
+-GTKDOC_LIBS=$(top_builddir)/poppler/libpoppler.la	\
++GTKDOC_LIBS=-lpoppler	\
+ 	$(top_builddir)/glib/libpoppler-glib.la		\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(FREETYPE_LIBS)				\
+diff -ur poppler-0.6.orig/Makefile.am poppler-0.6/Makefile.am
+--- poppler-0.6.orig/Makefile.am	2007-09-04 12:40:45.000000000 +0200
++++ poppler-0.6/Makefile.am	2007-09-04 12:40:00.000000000 +0200
+@@ -29,7 +29,7 @@
+ utils_subdir = utils
+ endif
+ 
+-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
++SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
+ 
+ EXTRA_DIST =					\
+ 	README-XPDF				\
+@@ -40,9 +40,7 @@
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA =				\
+-	poppler.pc				\
+ 	$(cairo_pc_file)			\
+-	$(splash_pc_file)			\
+ 	$(glib_pc_file)				\
+ 	$(qt_pc_file)                           \
+ 	$(qt4_pc_file)
+diff -ur poppler-0.6.orig/qt/Makefile.am poppler-0.6/qt/Makefile.am
+--- poppler-0.6.orig/qt/Makefile.am	2007-09-04 12:40:45.000000000 +0200
++++ poppler-0.6/qt/Makefile.am	2007-09-04 12:40:00.000000000 +0200
+@@ -24,7 +24,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_qt_la_LIBADD = 			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+ 	$(FONTCONFIG_LIBS)
+@@ -41,7 +41,7 @@
+        test-poppler-qt.cpp
+ 
+ test_poppler_qt_LDADD =				\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	libpoppler-qt.la			\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)
+diff -ur poppler-0.6.orig/qt4/src/Makefile.am poppler-0.6/qt4/src/Makefile.am
+--- poppler-0.6.orig/qt4/src/Makefile.am	2007-09-04 12:40:45.000000000 +0200
++++ poppler-0.6/qt4/src/Makefile.am	2007-09-04 12:40:00.000000000 +0200
+@@ -36,7 +36,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_qt4_la_LIBADD = 			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(FONTCONFIG_LIBS)				\
+ 	$(POPPLER_QT4_LIBS)
+ 
+Nur in poppler-0.6.orig/qt4/src: Makefile.am.orig.
+diff -ur poppler-0.6.orig/qt4/tests/Makefile.am poppler-0.6/qt4/tests/Makefile.am
+--- poppler-0.6.orig/qt4/tests/Makefile.am	2007-09-04 12:40:45.000000000 +0200
++++ poppler-0.6/qt4/tests/Makefile.am	2007-09-04 12:40:00.000000000 +0200
+@@ -7,7 +7,7 @@
+ 	$(POPPLER_QT4_CFLAGS)
+ 
+ LDADDS =					\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
+ 	$(FONTCONFIG_LIBS)				\
+ 	$(POPPLER_QT4_LIBS)
+diff -ur poppler-0.6.orig/test/Makefile.am poppler-0.6/test/Makefile.am
+--- poppler-0.6.orig/test/Makefile.am	2007-09-04 12:40:29.000000000 +0200
++++ poppler-0.6/test/Makefile.am	2007-09-04 12:40:58.000000000 +0200
+@@ -42,14 +42,14 @@
+        gtk-splash-test.cc
+ 
+ gtk_splash_test_LDADD =				\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler	\
+ 	$(GTK_TEST_LIBS)
+ 
+ gtk_cairo_test_SOURCES =			\
+        gtk-cairo-test.cc
+ 
+ gtk_cairo_test_LDADD =					\
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler		\
+ 	$(top_builddir)/glib/libpoppler-glib.la		\
+ 	$(CAIRO_LIBS)					\
+ 	$(GTK_TEST_LIBS)				\
+@@ -59,7 +59,7 @@
+        pdf-inspector.cc
+ 
+ pdf_inspector_LDADD =					\
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler		\
+ 	$(top_builddir)/poppler/libpoppler-cairo.la	\
+ 	$(CAIRO_LIBS)					\
+ 	$(FREETYPE_LIBS)				\
+diff -ur poppler-0.6.orig/utils/Makefile.am poppler-0.6/utils/Makefile.am
+--- poppler-0.6.orig/utils/Makefile.am	2007-09-04 12:40:29.000000000 +0200
++++ poppler-0.6/utils/Makefile.am	2007-09-04 12:40:58.000000000 +0200
+@@ -29,7 +29,7 @@
+ 	$(ABIWORD_CFLAGS)
+ 
+ LDADD =						\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler	\
+ 	$(UTILS_LIBS)				\
+ 	$(FONTCONFIG_LIBS)
+

More information about the arch-commits mailing list