summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-05-23 01:14:06 +0000
committerTim Harder <radhermit@gentoo.org>2012-05-23 01:14:06 +0000
commit26ee0c9ddc57003f9da84e0308dac8f597bfa41b (patch)
tree797f5636a10bb5cafdf19741b07f1731f1950d6d /app-text/qpdf
parentAdjust the portage blocker from bug #297933 to play nicely with portage-2.1.6... (diff)
downloadhistorical-26ee0c9ddc57003f9da84e0308dac8f597bfa41b.tar.gz
historical-26ee0c9ddc57003f9da84e0308dac8f597bfa41b.tar.bz2
historical-26ee0c9ddc57003f9da84e0308dac8f597bfa41b.zip
Fix build with gcc-4.7 (bug #413935).
Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64
Diffstat (limited to 'app-text/qpdf')
-rw-r--r--app-text/qpdf/ChangeLog6
-rw-r--r--app-text/qpdf/Manifest21
-rw-r--r--app-text/qpdf/files/qpdf-2.3.1-gcc47.patch20
-rw-r--r--app-text/qpdf/qpdf-2.3.1.ebuild3
4 files changed, 38 insertions, 12 deletions
diff --git a/app-text/qpdf/ChangeLog b/app-text/qpdf/ChangeLog
index 9f7a225017eb..321043cd20c5 100644
--- a/app-text/qpdf/ChangeLog
+++ b/app-text/qpdf/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/qpdf
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/ChangeLog,v 1.4 2012/02/19 10:11:41 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/ChangeLog,v 1.5 2012/05/23 01:14:06 radhermit Exp $
+
+ 23 May 2012; Tim Harder <radhermit@gentoo.org> qpdf-2.3.1.ebuild,
+ +files/qpdf-2.3.1-gcc47.patch:
+ Fix build with gcc-4.7 (bug #413935).
19 Feb 2012; Tim Harder <radhermit@gentoo.org> qpdf-2.3.1.ebuild,
+files/qpdf-2.3.1-libpcre-8.30.patch:
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 37bdc68be12b..19c90a8706e7 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,19 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
+AUX qpdf-2.3.1-gcc47.patch 493 RMD160 ca7f8dbb984f727f6007b117ab67710c09670c94 SHA1 fa228ebf4ff85c7ef4e06db3dd91b6a057a7bfe2 SHA256 8c64f7505b2939355bf096df156cb16b14d688ec43308ea2814bee52020b291b
AUX qpdf-2.3.1-libpcre-8.30.patch 338 RMD160 f838d6ab1b3eab6e87901c8a9d62af5c7a8a71db SHA1 dccac27a00757dd3e0355fcdea6427cf22c0b578 SHA256 87e8184694ade3905c7122cc80c3ab2a839aa69bfd49176583d77de6e2a176ed
DIST qpdf-2.3.1.tar.gz 4725246 RMD160 e348f5507a917db007f3f86c6bada76f8cc58d48 SHA1 043cceeb74a702d4e6a6a83b0211d99f28383655 SHA256 e1e687bbc0137e296c702daa5e2d804efce37c4edb48f2c27ae0dd0b43f99a40
-EBUILD qpdf-2.3.1.ebuild 1069 RMD160 cd4177da58cf60d9c35508c6609012e1e85e92ab SHA1 02b51dcfdcee6c0450dfc8540d7bff5b23133f5b SHA256 f84719a579814c93bdf2b61128d2466147f01e20d9a0bfdb6c1ef7fa3e5919a3
-MISC ChangeLog 713 RMD160 edb9646c8f32e7d5653afb1164e0f036cab5fadf SHA1 474478b0fa0ecd20a65351d9713858219e82d907 SHA256 d1f6df83b9d86271cc515203d3ab833a1c0c81b29bafe62c027fc239fdc8a25f
+EBUILD qpdf-2.3.1.ebuild 1108 RMD160 00c80b41b5054598c5754367fb17563f54c1d433 SHA1 6c67860500f57eb2156cfc8381e959e9748d606b SHA256 2326eefc841babc8317035c1612356e198573d8de49d8d703ff45f4ec8a449bd
+MISC ChangeLog 855 RMD160 72888de8504f11f7813a2729cef1adc6bfe6ab96 SHA1 aaa83a0b84d6b5a73ae27f986e5122427014032c SHA256 252f617179e5f7fd5dbb923fa71314d255bda93f01a79ee5e76f5e928b1813a0
MISC metadata.xml 232 RMD160 9725fc18735b1d8d4079f25759ee0823a0c6795d SHA1 ec75efe30e67f74a4f315324afc75ed2a8d30bb4 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCgAGBQJPQMriAAoJEEqz6FtPBkyjJ3AH/jGnAc7NeMGNIkTY6s293vy3
-FJ/x+yM0hWvshE6VACq7eY/aolxb6ZBKEv6fRhyUcdsNVKq9YQfdmOnuxMvnYl2w
-nDbheiwkawEpq24cH6JjjRRIEJ3t4ua4ViufeKMYwgexV9g3+S6so5bad+l8JlWY
-l10NKHWx5qlmNFmMcB74n3Q+Lp/VVqZyAfQWap1qX/Gz0XfeT6PEDy4JpJ30hKqG
-sldiQcWPy0SUh/uIqxqtc23k30TiaF/rhJh3MMf9LMkzkFoZ6DV7mxEINNTBFnmm
-yIRDHZcjzsNosjkgQz0aGdM8CbSBoLlTv1zJj/o6Mn8i4i8L028J6lRrxyNIMuo=
-=Zv90
+iQEcBAEBCgAGBQJPvDnjAAoJEEqz6FtPBkyjJWcH+wdFaXsO4CGcwdUxOTUY+sPd
+HeIDvgtiRBrIqBOrfY909y5viLsWlLRKnAJsXM/G/5eBNjVllKVUOoBUDbSpCQan
+Q0M5+hQnXej4S/ZhIzrHrIsiba36TkiCVztpTtpQ08ZQ7snPjZ2gxknIBBpjS5aw
++FBLkF7WSMdyw3NHsY1TQfWp6K6r4rC7G40VKtC2cYN0fmHGlLBnt4gpFL0tcjBy
+HtYuC0X3z3Fxz0bi6J/souwIQjBz84KWCPzW+HmxbsNKgatfVmNQ417mKnT31o84
+z/EdjRBwclImYBLCy0hvG/QV0zDAYIj11zCuDjp06WYlnEQBk8eRqRjUp9Ow40o=
+=9Lfn
-----END PGP SIGNATURE-----
diff --git a/app-text/qpdf/files/qpdf-2.3.1-gcc47.patch b/app-text/qpdf/files/qpdf-2.3.1-gcc47.patch
new file mode 100644
index 000000000000..3ef4481cdfc4
--- /dev/null
+++ b/app-text/qpdf/files/qpdf-2.3.1-gcc47.patch
@@ -0,0 +1,20 @@
+--- qpdf-2.3.1/include/qpdf/QPDFExc.hh
++++ qpdf-2.3.1/include/qpdf/QPDFExc.hh
+@@ -11,6 +11,7 @@
+ #include <qpdf/DLL.h>
+ #include <qpdf/Constants.h>
+ #include <stdexcept>
++#include <unistd.h>
+
+ class QPDFExc: public std::runtime_error
+ {
+--- qpdf-2.3.1/include/qpdf/QPDFObjectHandle.hh
++++ qpdf-2.3.1/include/qpdf/QPDFObjectHandle.hh
+@@ -8,6 +8,7 @@
+ #ifndef __QPDFOBJECTHANDLE_HH__
+ #define __QPDFOBJECTHANDLE_HH__
+
++#include <unistd.h>
+ #include <string>
+ #include <vector>
+ #include <set>
diff --git a/app-text/qpdf/qpdf-2.3.1.ebuild b/app-text/qpdf/qpdf-2.3.1.ebuild
index b037a6ec42c1..8f563649f6d1 100644
--- a/app-text/qpdf/qpdf-2.3.1.ebuild
+++ b/app-text/qpdf/qpdf-2.3.1.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-text/qpdf/qpdf-2.3.1.ebuild,v 1.2 2012/02/19 10:11:41 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-2.3.1.ebuild,v 1.3 2012/05/23 01:14:06 radhermit Exp $
EAPI="4"
@@ -32,6 +32,7 @@ src_prepare() {
sed -i -e "/docdir/d" make/libtool.mk || die
epatch "${FILESDIR}"/${P}-libpcre-8.30.patch
+ epatch "${FILESDIR}"/${P}-gcc47.patch
}
src_install() {