summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Gurr <tgurr@gentoo.org>2012-09-28 18:40:11 +0000
committerTimo Gurr <tgurr@gentoo.org>2012-09-28 18:40:11 +0000
commit5b689f9ef14cae5fd00e1a98596d8f4cfa1a049f (patch)
treea7b4d53df3d9a96da99017e2e10d129e6cb05dcd /net-print
parentNo longer install symlinks in /usr/bin to work with recent gcc-config. #431930 (diff)
downloadgentoo-2-5b689f9ef14cae5fd00e1a98596d8f4cfa1a049f.tar.gz
gentoo-2-5b689f9ef14cae5fd00e1a98596d8f4cfa1a049f.tar.bz2
gentoo-2-5b689f9ef14cae5fd00e1a98596d8f4cfa1a049f.zip
Add Upstream patch to fix bug #434686, thanks to everyone involved.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups-filters/ChangeLog6
-rw-r--r--net-print/cups-filters/cups-filters-1.0.24.ebuild4
-rw-r--r--net-print/cups-filters/files/cups-filters-1.0.24-rev7009.diff18
3 files changed, 26 insertions, 2 deletions
diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index f1e03f2e3feb..166d6c863931 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-print/cups-filters
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.41 2012/09/21 09:37:21 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.42 2012/09/28 18:40:11 tgurr Exp $
+
+ 28 Sep 2012; Timo Gurr <tgurr@gentoo.org> cups-filters-1.0.24.ebuild,
+ +files/cups-filters-1.0.24-rev7009.diff:
+ Add Upstream patch to fix bug #434686, thanks to everyone involved.
21 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
cups-filters-9999.ebuild:
diff --git a/net-print/cups-filters/cups-filters-1.0.24.ebuild b/net-print/cups-filters/cups-filters-1.0.24.ebuild
index 694e1fa137c6..bc902e4106de 100644
--- a/net-print/cups-filters/cups-filters-1.0.24.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.24.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/net-print/cups-filters/cups-filters-1.0.24.ebuild,v 1.2 2012/09/11 14:13:44 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.24.ebuild,v 1.3 2012/09/28 18:40:11 tgurr Exp $
EAPI=4
@@ -41,6 +41,8 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-rev7009.diff )
+
src_prepare() {
base_src_prepare
if [[ "${PV}" == "9999" ]]; then
diff --git a/net-print/cups-filters/files/cups-filters-1.0.24-rev7009.diff b/net-print/cups-filters/files/cups-filters-1.0.24-rev7009.diff
new file mode 100644
index 000000000000..0759b9db2fbb
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.0.24-rev7009.diff
@@ -0,0 +1,18 @@
+=== modified file 'filter/pdftopdf/qpdf_pdftopdf_processor.cc'
+--- filter/pdftopdf/qpdf_pdftopdf_processor.cc 2012-09-06 21:13:06 +0000
++++ filter/pdftopdf/qpdf_pdftopdf_processor.cc 2012-09-08 14:20:18 +0000
+@@ -464,9 +464,10 @@
+ void QPDF_PDFTOPDF_Processor::setComments(const std::vector<std::string> &comments) // {{{
+ {
+ extraheader.clear();
+- for (auto &it : comments) {
+- assert(it.at(0)=='%');
+- extraheader.append(it);
++ const int len=comments.size();
++ for (int iA=0;iA<len;iA++) {
++ assert(comments[iA].at(0)=='%');
++ extraheader.append(comments[iA]);
+ extraheader.push_back('\n');
+ }
+ }
+