[arch-commits] CVS update of extra/lib/poppler-qt (3 files)

Thu Oct 18 18:39:44 UTC 2007

Date: Thursday, October 18, 2007 @ 14:39:44
  Author: jgc
    Path: /home/cvs-extra/extra/lib/poppler-qt

Modified: PKGBUILD (1.6 -> 1.7) poppler-0.6-bindings.patch (1.1 -> 1.2)
 Removed: poppler-0.5.9-bindings.patch (1.1)

upgpkg: poppler-qt 0.6.1-1


------------------------------+
 PKGBUILD                     |   11 ++--
 poppler-0.5.9-bindings.patch |   93 -----------------------------------------
 poppler-0.6-bindings.patch   |    4 -
 3 files changed, 7 insertions(+), 101 deletions(-)


Index: extra/lib/poppler-qt/PKGBUILD
diff -u extra/lib/poppler-qt/PKGBUILD:1.6 extra/lib/poppler-qt/PKGBUILD:1.7

--- extra/lib/poppler-qt/PKGBUILD:1.6	Sat Sep  8 06:26:57 2007
+++ extra/lib/poppler-qt/PKGBUILD	Thu Oct 18 14:39:43 2007
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD,v 1.6 2007/09/08 10:26:57 jgc Exp $
+# $Id: PKGBUILD,v 1.7 2007/10/18 18:39:43 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=poppler-qt
-pkgver=0.6
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="Poppler Qt3 bindings"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('qt>=3.3.8' 'poppler>=0.6')
+depends=('qt>=3.3.8' 'poppler>=0.6.1')
 makedepends=('pkgconfig')
 options=('!libtool')
 url="http://poppler.freedesktop.org/"
 source=(http://poppler.freedesktop.org/poppler-${pkgver}.tar.gz
 	poppler-0.6-bindings.patch)
-md5sums=('96883867572aa1e55e979ec75369c562'
-         '88467fd38cc5a550ea8035bcc3a9f729')
+md5sums=('78a5f8ff1a3464eddb127577eea7a191'
+         '4255424fcf2c29fe3cae9cb14a671da6')
 
 build() {
   [ -z "${QTDIR}" ] && . /etc/profile.d/qt.sh
@@ -39,5 +39,4 @@
   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-qt/poppler-0.5.9-bindings.patch
diff -u extra/lib/poppler-qt/poppler-0.5.9-bindings.patch:1.1 extra/lib/poppler-qt/poppler-0.5.9-bindings.patch:removed
--- extra/lib/poppler-qt/poppler-0.5.9-bindings.patch:1.1	Sat Jul  7 07:56:38 2007
+++ extra/lib/poppler-qt/poppler-0.5.9-bindings.patch	Thu Oct 18 14:39:44 2007
@@ -1,93 +0,0 @@
-diff -ur poppler-0.5.9.orig/glib/Makefile.am poppler-0.5.9/glib/Makefile.am
---- poppler-0.5.9.orig/glib/Makefile.am	2007-05-31 12:38:10.000000000 +0200
-+++ poppler-0.5.9/glib/Makefile.am	2007-05-31 12:38:17.000000000 +0200
-@@ -82,7 +82,7 @@
- 	poppler-private.h
- 
- libpoppler_glib_la_LIBADD =				\
--	$(top_builddir)/poppler/libpoppler.la		\
-+	-lpoppler					\
- 	$(POPPLER_GLIB_LIBS)				\
- 	$(FREETYPE_LIBS)				\
- 	$(FONTCONFIG_LIBS)				\
-@@ -96,7 +96,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.5.9/glib: Makefile.am.orig.
-diff -ur poppler-0.5.9.orig/Makefile.am poppler-0.5.9/Makefile.am
---- poppler-0.5.9.orig/Makefile.am	2007-05-31 12:38:10.000000000 +0200
-+++ poppler-0.5.9/Makefile.am	2007-05-31 12:38:17.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.5.9.orig/qt/Makefile.am poppler-0.5.9/qt/Makefile.am
---- poppler-0.5.9.orig/qt/Makefile.am	2007-05-31 12:38:10.000000000 +0200
-+++ poppler-0.5.9/qt/Makefile.am	2007-05-31 12:38:17.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)
-Nur in poppler-0.5.9/qt: Makefile.am.orig.
-diff -ur poppler-0.5.9.orig/qt4/src/Makefile.am poppler-0.5.9/qt4/src/Makefile.am
---- poppler-0.5.9.orig/qt4/src/Makefile.am	2007-05-31 12:38:10.000000000 +0200
-+++ poppler-0.5.9/qt4/src/Makefile.am	2007-05-31 12:38:55.000000000 +0200
-@@ -35,7 +35,7 @@
- 	poppler-private.h
- 
- libpoppler_qt4_la_LIBADD = 			\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	$(FONTCONFIG_LIBS)				\
- 	$(POPPLER_QT4_LIBS)
- 
-Nur in poppler-0.5.9/qt4/src: Makefile.am.orig.
-Nur in poppler-0.5.9/qt4/src: Makefile.am.rej.
-diff -ur poppler-0.5.9.orig/qt4/tests/Makefile.am poppler-0.5.9/qt4/tests/Makefile.am
---- poppler-0.5.9.orig/qt4/tests/Makefile.am	2007-05-31 12:38:10.000000000 +0200
-+++ poppler-0.5.9/qt4/tests/Makefile.am	2007-05-31 12:38:17.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)
-Nur in poppler-0.5.9/qt4/tests: Makefile.am.orig.
Index: extra/lib/poppler-qt/poppler-0.6-bindings.patch
diff -u extra/lib/poppler-qt/poppler-0.6-bindings.patch:1.1 extra/lib/poppler-qt/poppler-0.6-bindings.patch:1.2
--- extra/lib/poppler-qt/poppler-0.6-bindings.patch:1.1	Sat Sep  8 06:26:57 2007
+++ extra/lib/poppler-qt/poppler-0.6-bindings.patch	Thu Oct 18 14:39:44 2007
@@ -54,12 +54,12 @@
  
  EXTRA_DIST =					\
  	README-XPDF				\
-@@ -40,9 +40,7 @@
+@@ -40,9 +40,6 @@
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA =				\
 -	poppler.pc				\
- 	$(cairo_pc_file)			\
+-	$(cairo_pc_file)			\
 -	$(splash_pc_file)			\
  	$(glib_pc_file)				\
  	$(qt_pc_file)                           \


