[arch-commits] Commit in poppler-glib/repos (3 files)

[Jan de Groot]

    Date: Sunday, April 20, 2008 @ 08:09:32
  Author: jgc
Revision: 501

Merged revisions 2-500 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/poppler-glib/trunk

........
  r163 | jgc | 2008-04-12 13:45:09 +0000 (Sat, 12 Apr 2008) | 1 line
  
  upgpkg: poppler-glib 0.8.0-1
........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........

Modified:
  poppler-glib/repos/extra-i686/	(properties)
  poppler-glib/repos/extra-i686/PKGBUILD
Deleted:
  poppler-glib/repos/extra-i686/poppler-0.5.9-bindings.patch

------------------------------+
 PKGBUILD                     |    7 +--
 poppler-0.5.9-bindings.patch |   93 -----------------------------------------
 2 files changed, 4 insertions(+), 96 deletions(-)


Property changes on: poppler-glib/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /poppler-glib/trunk:1
   + /poppler-glib/trunk:1-500

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-20 12:08:00 UTC (rev 500)
+++ extra-i686/PKGBUILD	2008-04-20 12:09:32 UTC (rev 501)
@@ -2,23 +2,24 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=poppler-glib
-pkgver=0.6.3
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="Poppler glib bindings"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gtk2>=2.12.3' 'poppler>=0.6.3')
+depends=('gtk2>=2.12.9-2' 'poppler>=0.8.0')
 makedepends=('pkgconfig')
 options=('!libtool')
 url="http://poppler.freedesktop.org/"
 source=(http://poppler.freedesktop.org/poppler-${pkgver}.tar.gz
 	poppler-0.6-bindings.patch)
-md5sums=('a585677188cd56a090c4dc3357e03a95'
+md5sums=('1a3ea3000d3446a97366c37b876979f4'
          '4255424fcf2c29fe3cae9cb14a671da6')
 
 build() {
   cd ${startdir}/src/poppler-${pkgver}
   patch -Np1 -i ${startdir}/src/poppler-0.6-bindings.patch || return 1
+  libtoolize --force --copy || return 1
   
   AT_M4DIR="m4" autoreconf || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \

Deleted: extra-i686/poppler-0.5.9-bindings.patch
===================================================================
--- extra-i686/poppler-0.5.9-bindings.patch	2008-04-20 12:08:00 UTC (rev 500)
+++ extra-i686/poppler-0.5.9-bindings.patch	2008-04-20 12:09:32 UTC (rev 501)
@@ -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.