summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2012-06-19 22:10:04 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2012-06-19 22:10:04 +0000
commit86673a476489f9a91c20b198564a6b9a41df1b8b (patch)
treeb3b078e58f97bd05f9c6c76ad1954e1c98bc8163 /app-admin
parentVersion bump. Inherit user instead of eutils. (diff)
downloadgentoo-2-86673a476489f9a91c20b198564a6b9a41df1b8b.tar.gz
gentoo-2-86673a476489f9a91c20b198564a6b9a41df1b8b.tar.bz2
gentoo-2-86673a476489f9a91c20b198564a6b9a41df1b8b.zip
Add additional cupsfilters search paths, bug 420671.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/system-config-printer-common/ChangeLog7
-rw-r--r--app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-cups_filters_path.patch26
-rw-r--r--app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild3
3 files changed, 34 insertions, 2 deletions
diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index a47f036d905a..f6a6234fdaf4 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/system-config-printer-common
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.70 2012/05/24 13:26:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.71 2012/06/19 22:10:03 reavertm Exp $
+
+ 19 Jun 2012; Maciej Mrozowski <reavertm@gentoo.org>
+ +files/system-config-printer-common-1.3.9-cups_filters_path.patch,
+ system-config-printer-common-1.3.9-r1.ebuild:
+ Add additional cupsfilters search paths, bug 420671.
24 May 2012; Samuli Suominen <ssuominen@gentoo.org>
system-config-printer-common-1.3.9-r1.ebuild:
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-cups_filters_path.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-cups_filters_path.patch
new file mode 100644
index 000000000000..0d7c8edade61
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-cups_filters_path.patch
@@ -0,0 +1,26 @@
+From a3479278f12ddc905f81050b11c769d74f581aee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
+Date: Sat, 16 Jun 2012 08:43:30 +0200
+Subject: [PATCH] add /usr/libexec/cups/filter to the filter search paths
+
+---
+ cupshelpers/cupshelpers.py | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/cupshelpers/cupshelpers.py b/cupshelpers/cupshelpers.py
+index 3fc138b..d1d32f1 100755
+--- a/cupshelpers/cupshelpers.py
++++ b/cupshelpers/cupshelpers.py
+@@ -812,7 +812,8 @@ def missingExecutables(ppd):
+
+ exepath = pathcheck (exe,
+ "/usr/lib/cups/filter:"
+- "/usr/lib64/cups/filter")
++ "/usr/lib64/cups/filter:"
++ "/usr/libexec/cups/filter")
+ if not exepath:
+ add_missing ("/usr/lib/cups/filter/" + exe)
+
+--
+1.7.8.6
+
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild
index 92e9ed27d217..aebbb13abc1e 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild,v 1.8 2012/05/24 13:26:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild,v 1.9 2012/06/19 22:10:03 reavertm Exp $
EAPI="3"
@@ -52,6 +52,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-1.3.9-split.patch"
+ epatch "${FILESDIR}/${PN}-1.3.9-cups_filters_path.patch"
eautoreconf
}