| 1 |
reavertm 11/11/01 14:03:42 |
| 2 |
|
| 3 |
Added: poppler-0.18.1-pkgconfig.patch |
| 4 |
Removed: poppler-0.18.0-poppler_page_get_image-crash.patch |
| 5 |
Log: |
| 6 |
Version bump, remove old |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-text/poppler/files/poppler-0.18.1-pkgconfig.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/files/poppler-0.18.1-pkgconfig.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/files/poppler-0.18.1-pkgconfig.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: poppler-0.18.1-pkgconfig.patch |
| 17 |
=================================================================== |
| 18 |
From ebf7fbc74da10d1bc423d33b26e30166870642e4 Mon Sep 17 00:00:00 2001 |
| 19 |
From: Rex Dieter <rdieter@××××××××.edu> |
| 20 |
Date: Tue, 01 Nov 2011 08:40:53 +0000 |
| 21 |
Subject: Fix pkg-config files |
| 22 |
|
| 23 |
We were using $FOO_REQUIRED instead of @FOO_REQUIRED@ |
| 24 |
--- |
| 25 |
diff --git a/configure.ac b/configure.ac |
| 26 |
index 3a120ca..c4f5b92 100644 |
| 27 |
--- a/configure.ac |
| 28 |
+++ b/configure.ac |
| 29 |
@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then |
| 30 |
POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="" |
| 31 |
|
| 32 |
GLIB_REQUIRED=2.18 |
| 33 |
+ AC_SUBST(GLIB_REQUIRED) |
| 34 |
AC_ARG_ENABLE(poppler-glib, |
| 35 |
AC_HELP_STRING([--disable-poppler-glib], |
| 36 |
[Don't compile poppler glib wrapper.]), |
| 37 |
diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in |
| 38 |
index 55a2278..5fcb6f2 100644 |
| 39 |
--- a/poppler-glib-uninstalled.pc.in |
| 40 |
+++ b/poppler-glib-uninstalled.pc.in |
| 41 |
@@ -1,7 +1,7 @@ |
| 42 |
Name: poppler-glib |
| 43 |
Description: GLib wrapper for poppler - uninstalled |
| 44 |
Version: @VERSION@ |
| 45 |
-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION |
| 46 |
+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ |
| 47 |
|
| 48 |
Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la |
| 49 |
Cflags: -I${pc_top_builddir}/${pcfiledir}/glib |
| 50 |
diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake |
| 51 |
index 3264ed6..e15e669 100644 |
| 52 |
--- a/poppler-glib.pc.cmake |
| 53 |
+++ b/poppler-glib.pc.cmake |
| 54 |
@@ -6,7 +6,7 @@ includedir=${prefix}/include |
| 55 |
Name: poppler-glib |
| 56 |
Description: GLib wrapper for poppler |
| 57 |
Version: @POPPLER_VERSION@ |
| 58 |
-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION |
| 59 |
+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ |
| 60 |
@PC_REQUIRES_PRIVATE@ |
| 61 |
|
| 62 |
Libs: -L${libdir} -lpoppler-glib |
| 63 |
diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in |
| 64 |
index 04d9bb9..9ba8978 100644 |
| 65 |
--- a/poppler-glib.pc.in |
| 66 |
+++ b/poppler-glib.pc.in |
| 67 |
@@ -6,7 +6,7 @@ includedir=@includedir@ |
| 68 |
Name: poppler-glib |
| 69 |
Description: GLib wrapper for poppler |
| 70 |
Version: @VERSION@ |
| 71 |
-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION |
| 72 |
+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ |
| 73 |
@PC_REQUIRES_PRIVATE@ |
| 74 |
|
| 75 |
Libs: -L${libdir} -lpoppler-glib |
| 76 |
-- |
| 77 |
cgit v0.9.0.2-2-gbebe |
Archives