[arch-commits] Commit in poppler-qt3/trunk (3 files)
Jan de Groot
jgc at archlinux.org
Fri Nov 7 23:47:46 UTC 2008
Date: Friday, November 7, 2008 @ 18:47:45
Author: jgc
Revision: 18600
upgpkg: poppler-qt3 0.10.0-1
Added:
poppler-qt3/trunk/poppler-0.10-bindings.patch
Modified:
poppler-qt3/trunk/PKGBUILD
Deleted:
poppler-qt3/trunk/poppler-0.6-bindings.patch
-----------------------------+
PKGBUILD | 14 +--
poppler-0.10-bindings.patch | 180 ++++++++++++++++++++++++++++++++++++++++++
poppler-0.6-bindings.patch | 153 -----------------------------------
3 files changed, 187 insertions(+), 160 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-11-07 23:47:31 UTC (rev 18599)
+++ PKGBUILD 2008-11-07 23:47:45 UTC (rev 18600)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=poppler-qt3
-pkgver=0.8.6
+pkgver=0.10.0
pkgrel=1
pkgdesc="Poppler Qt3 bindings"
arch=(i686 x86_64)
@@ -12,16 +12,16 @@
options=('!libtool')
url="http://poppler.freedesktop.org/"
source=(http://poppler.freedesktop.org/poppler-${pkgver}.tar.gz
- poppler-0.6-bindings.patch)
-md5sums=('6f2f5761ea06074d581951014b646372'
- '4255424fcf2c29fe3cae9cb14a671da6')
+ poppler-0.10-bindings.patch)
+md5sums=('c5f3002c2cb295c4e290925a040f80be'
+ 'f91d3b28c975ddaebd8b601c37e61981')
build() {
. /etc/profile.d/qt3.sh
- cd ${startdir}/src/poppler-${pkgver}
+ cd "${srcdir}/poppler-${pkgver}"
- patch -Np1 -i ${startdir}/src/poppler-0.6-bindings.patch || return 1
+ patch -Np1 -i "${srcdir}/poppler-0.10-bindings.patch" || return 1
libtoolize --force --copy || return 1
AT_M4DIR="m4" autoreconf -i || return 1
./configure --prefix=/usr --sysconfdir=/etc \
@@ -38,5 +38,5 @@
make libpoppler-cairo.la || return 1
popd
make || return 1
- make DESTDIR=${startdir}/pkg install || return 1
+ make DESTDIR="${pkgdir}" install || return 1
}
Added: poppler-0.10-bindings.patch
===================================================================
--- poppler-0.10-bindings.patch (rev 0)
+++ poppler-0.10-bindings.patch 2008-11-07 23:47:45 UTC (rev 18600)
@@ -0,0 +1,180 @@
+diff -ruN poppler-0.10.0/Makefile.am poppler-0.10.0-bindings/Makefile.am
+--- poppler-0.10.0/Makefile.am 2008-09-09 23:46:50.000000000 +0200
++++ poppler-0.10.0-bindings/Makefile.am 2008-11-08 00:03:17.000000000 +0100
+@@ -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,6 @@
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = \
+- poppler.pc \
+- $(cairo_pc_file) \
+- $(splash_pc_file) \
+ $(glib_pc_file) \
+ $(qt_pc_file) \
+ $(qt4_pc_file)
+diff -ruN poppler-0.10.0/glib/Makefile.am poppler-0.10.0-bindings/glib/Makefile.am
+--- poppler-0.10.0/glib/Makefile.am 2008-09-27 17:21:45.000000000 +0200
++++ poppler-0.10.0-bindings/glib/Makefile.am 2008-11-08 00:03:17.000000000 +0100
+@@ -87,7 +87,7 @@
+ poppler-private.h
+
+ libpoppler_glib_la_LIBADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ -lpoppler \
+ $(POPPLER_GLIB_LIBS) \
+ $(GDK_LIBS) \
+ $(FREETYPE_LIBS) \
+@@ -103,7 +103,7 @@
+ test-poppler-glib.cc
+
+ test_poppler_glib_LDADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ -lpoppler \
+ libpoppler-glib.la \
+ $(POPPLER_GLIB_LIBS) \
+ $(GDK_LIBS) \
+diff -ruN poppler-0.10.0/glib/demo/Makefile.am poppler-0.10.0-bindings/glib/demo/Makefile.am
+--- poppler-0.10.0/glib/demo/Makefile.am 2008-08-24 18:19:55.000000000 +0200
++++ poppler-0.10.0-bindings/glib/demo/Makefile.am 2008-11-08 00:03:17.000000000 +0100
+@@ -36,5 +36,5 @@
+
+ LDADD = \
+ $(top_builddir)/glib/libpoppler-glib.la \
+- $(top_builddir)/poppler/libpoppler.la \
++ -lpoppler \
+ $(GTK_TEST_LIBS)
+diff -ruN poppler-0.10.0/glib/reference/Makefile.am poppler-0.10.0-bindings/glib/reference/Makefile.am
+--- poppler-0.10.0/glib/reference/Makefile.am 2008-07-24 22:45:05.000000000 +0200
++++ poppler-0.10.0-bindings/glib/reference/Makefile.am 2008-11-08 00:03:17.000000000 +0100
+@@ -73,7 +73,7 @@
+ $(GDK_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 -ruN poppler-0.10.0/qt/Makefile.am poppler-0.10.0-bindings/qt/Makefile.am
+--- poppler-0.10.0/qt/Makefile.am 2008-07-24 22:45:05.000000000 +0200
++++ poppler-0.10.0-bindings/qt/Makefile.am 2008-11-08 00:03:17.000000000 +0100
+@@ -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 -ruN poppler-0.10.0/qt4/demos/Makefile.am poppler-0.10.0-bindings/qt4/demos/Makefile.am
+--- poppler-0.10.0/qt4/demos/Makefile.am 2008-07-24 22:45:06.000000000 +0200
++++ poppler-0.10.0-bindings/qt4/demos/Makefile.am 2008-11-08 00:05:09.000000000 +0100
+@@ -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 -ruN poppler-0.10.0/qt4/src/Makefile.am poppler-0.10.0-bindings/qt4/src/Makefile.am
+--- poppler-0.10.0/qt4/src/Makefile.am 2008-09-10 00:02:49.000000000 +0200
++++ poppler-0.10.0-bindings/qt4/src/Makefile.am 2008-11-08 00:03:17.000000000 +0100
+@@ -52,7 +52,7 @@
+ poppler-private.h
+
+ libpoppler_qt4_la_LIBADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ -lpoppler \
+ $(FONTCONFIG_LIBS) \
+ $(POPPLER_QT4_LIBS)
+
+diff -ruN poppler-0.10.0/qt4/tests/Makefile.am poppler-0.10.0-bindings/qt4/tests/Makefile.am
+--- poppler-0.10.0/qt4/tests/Makefile.am 2008-09-05 18:41:33.000000000 +0200
++++ poppler-0.10.0-bindings/qt4/tests/Makefile.am 2008-11-08 00:03:17.000000000 +0100
+@@ -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 -ruN poppler-0.10.0/test/Makefile.am poppler-0.10.0-bindings/test/Makefile.am
+--- poppler-0.10.0/test/Makefile.am 2008-10-06 19:35:46.000000000 +0200
++++ poppler-0.10.0-bindings/test/Makefile.am 2008-11-08 00:05:42.000000000 +0100
+@@ -51,14 +51,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) \
+@@ -69,7 +69,7 @@
+
+ pdf_inspector_LDADD = \
+ $(top_builddir)/poppler/libpoppler-cairo.la \
+- $(top_builddir)/poppler/libpoppler.la \
++ -lpoppler \
+ $(CAIRO_LIBS) \
+ $(FREETYPE_LIBS) \
+ $(GTK_TEST_LIBS)
+@@ -79,14 +79,14 @@
+ perf-test-preview-dummy.cc
+
+ perf_test_LDADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ -lpoppler \
+ $(FREETYPE_LIBS)
+
+ pdf_fullrewrite_SOURCES = \
+ pdf-fullrewrite.cc
+
+ pdf_fullrewrite_LDADD = \
+- $(top_builddir)/poppler/libpoppler.la
++ -lpoppler
+
+ EXTRA_DIST = \
+ pdf-operators.c \
+diff -ruN poppler-0.10.0/utils/Makefile.am poppler-0.10.0-bindings/utils/Makefile.am
+--- poppler-0.10.0/utils/Makefile.am 2008-09-09 20:55:24.000000000 +0200
++++ poppler-0.10.0-bindings/utils/Makefile.am 2008-11-08 00:03:17.000000000 +0100
+@@ -29,7 +29,7 @@
+ $(ABIWORD_CFLAGS)
+
+ LDADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ -lpoppler \
+ $(UTILS_LIBS) \
+ $(FONTCONFIG_LIBS)
+
Deleted: poppler-0.6-bindings.patch
===================================================================
--- poppler-0.6-bindings.patch 2008-11-07 23:47:31 UTC (rev 18599)
+++ poppler-0.6-bindings.patch 2008-11-07 23:47:45 UTC (rev 18600)
@@ -1,153 +0,0 @@
-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,6 @@
-
- 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