| 1 |
mgorny 14/06/29 09:45:10 |
| 2 |
|
| 3 |
Added: libgnomeprint-2.18.8-cups-config.patch |
| 4 |
Log: |
| 5 |
Enable multilib support, required for gnome-base/libgnomeprintui. Bug #515652. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libgnomeprint-2.18.8-cups-config.patch |
| 16 |
=================================================================== |
| 17 |
From ffbc68cc8518c7e7263a42d4284b749b40c5e871 Mon Sep 17 00:00:00 2001 |
| 18 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 19 |
Date: Sun, 29 Jun 2014 10:47:41 +0200 |
| 20 |
Subject: [PATCH] Use AC_PATH_TOOL to find proper cups-config. |
| 21 |
|
| 22 |
--- |
| 23 |
configure.in | 9 +++++---- |
| 24 |
1 file changed, 5 insertions(+), 4 deletions(-) |
| 25 |
|
| 26 |
diff --git a/configure.in b/configure.in |
| 27 |
index 729278d..186fabf 100644 |
| 28 |
--- a/configure.in |
| 29 |
+++ b/configure.in |
| 30 |
@@ -223,17 +223,18 @@ AC_ARG_WITH(cups, |
| 31 |
) |
| 32 |
if test "x$try_cups" = "xyes"; then |
| 33 |
PKG_CHECK_MODULES(CUPS, "gmodule-2.0") |
| 34 |
+ AC_PATH_TOOL(CUPS_CONFIG, cups-config) |
| 35 |
AC_MSG_CHECKING(for CUPS libraries version >= 1.1.20) |
| 36 |
- if cups-config --version --libs > /dev/null 2>&1; then |
| 37 |
- verstxt=`cups-config --version` |
| 38 |
+ if $CUPS_CONFIG --version --libs > /dev/null 2>&1; then |
| 39 |
+ verstxt=`$CUPS_CONFIG --version` |
| 40 |
vers=`echo "$verstxt" | \ |
| 41 |
awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` |
| 42 |
if test "$vers" -lt 1001020; then |
| 43 |
AC_MSG_RESULT(Cups found but the version found is less than 1.1.20) |
| 44 |
cups_msg="Version requirement not satisfied" |
| 45 |
else |
| 46 |
- CUPS_LIBS="$CUPS_LIBS `cups-config --ldflags` `cups-config --libs`" |
| 47 |
- CUPS_CFLAGS="$CUPS_CFLAGS `cups-config --cflags`" |
| 48 |
+ CUPS_LIBS="$CUPS_LIBS `$CUPS_CONFIG --ldflags` `cups-config --libs`" |
| 49 |
+ CUPS_CFLAGS="$CUPS_CFLAGS `$CUPS_CONFIG --cflags`" |
| 50 |
AC_MSG_RESULT(Found version $verstxt) |
| 51 |
fi |
| 52 |
|
| 53 |
-- |
| 54 |
2.0.0 |
Archives