summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-07-07 05:46:07 +0000
committerMichał Górny <mgorny@gentoo.org>2014-07-07 05:46:07 +0000
commit999e6934e6bcccd5b39d9e7cb79e91414e435915 (patch)
treebd3c5e964d2110047e5255dd0360cdc4cf1e70f3 /gnome-base/libgnomeprint
parentsed to ignore already sysmlink existence error. #515164 (diff)
downloadgentoo-2-999e6934e6bcccd5b39d9e7cb79e91414e435915.tar.gz
gentoo-2-999e6934e6bcccd5b39d9e7cb79e91414e435915.tar.bz2
gentoo-2-999e6934e6bcccd5b39d9e7cb79e91414e435915.zip
Fix incomplete substitution of cups-config, bug #516566.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'gnome-base/libgnomeprint')
-rw-r--r--gnome-base/libgnomeprint/ChangeLog6
-rw-r--r--gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch2
2 files changed, 6 insertions, 2 deletions
diff --git a/gnome-base/libgnomeprint/ChangeLog b/gnome-base/libgnomeprint/ChangeLog
index 0f7db21fae30..d1067fd1823b 100644
--- a/gnome-base/libgnomeprint/ChangeLog
+++ b/gnome-base/libgnomeprint/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/libgnomeprint
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.198 2014/06/29 09:45:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.199 2014/07/07 05:46:07 mgorny Exp $
+
+ 07 Jul 2014; Michał Górny <mgorny@gentoo.org>
+ files/libgnomeprint-2.18.8-cups-config.patch:
+ Fix incomplete substitution of cups-config, bug #516566.
*libgnomeprint-2.18.8-r1 (29 Jun 2014)
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch
index d44b76b5dcbc..999c6f075203 100644
--- a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch
+++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch
@@ -29,7 +29,7 @@ index 729278d..186fabf 100644
else
- CUPS_LIBS="$CUPS_LIBS `cups-config --ldflags` `cups-config --libs`"
- CUPS_CFLAGS="$CUPS_CFLAGS `cups-config --cflags`"
-+ CUPS_LIBS="$CUPS_LIBS `$CUPS_CONFIG --ldflags` `cups-config --libs`"
++ CUPS_LIBS="$CUPS_LIBS `$CUPS_CONFIG --ldflags` `$CUPS_CONFIG --libs`"
+ CUPS_CFLAGS="$CUPS_CFLAGS `$CUPS_CONFIG --cflags`"
AC_MSG_RESULT(Found version $verstxt)
fi