summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2009-08-03 10:27:06 +0000
committerAlexis Ballier <aballier@gentoo.org>2009-08-03 10:27:06 +0000
commit61208ee1cda6d77f6fa2aaeff4f2f8aaf9366ba6 (patch)
tree5624045aa43c04a609f9b93497832932ecc4083c /dev-libs/pslib
parentold (diff)
downloadgentoo-2-61208ee1cda6d77f6fa2aaeff4f2f8aaf9366ba6.tar.gz
gentoo-2-61208ee1cda6d77f6fa2aaeff4f2f8aaf9366ba6.tar.bz2
gentoo-2-61208ee1cda6d77f6fa2aaeff4f2f8aaf9366ba6.zip
Add patch to build with glibc 2.10, by Viktor S <bugzilla@marinmo.org>, bug #277425
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/pslib')
-rw-r--r--dev-libs/pslib/ChangeLog7
-rw-r--r--dev-libs/pslib/files/pslib-getline.patch47
-rw-r--r--dev-libs/pslib/pslib-0.4.1-r1.ebuild3
3 files changed, 55 insertions, 2 deletions
diff --git a/dev-libs/pslib/ChangeLog b/dev-libs/pslib/ChangeLog
index 595d04035cfd..5af5f0264d38 100644
--- a/dev-libs/pslib/ChangeLog
+++ b/dev-libs/pslib/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/pslib
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pslib/ChangeLog,v 1.14 2009/02/28 13:30:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pslib/ChangeLog,v 1.15 2009/08/03 10:27:06 aballier Exp $
+
+ 03 Aug 2009; Alexis Ballier <aballier@gentoo.org> pslib-0.4.1-r1.ebuild,
+ +files/pslib-getline.patch:
+ Add patch to build with glibc 2.10, by Viktor S <bugzilla@marinmo.org>,
+ bug #277425
28 Feb 2009; Alexis Ballier <aballier@gentoo.org> pslib-0.4.1-r1.ebuild:
build depend on glib and intltool for bug #258273
diff --git a/dev-libs/pslib/files/pslib-getline.patch b/dev-libs/pslib/files/pslib-getline.patch
new file mode 100644
index 000000000000..cfe7ce4da732
--- /dev/null
+++ b/dev-libs/pslib/files/pslib-getline.patch
@@ -0,0 +1,47 @@
+--- src/ps_afm.c 2007-07-11 20:18:00.000000000 +0200
++++ src/ps_afm.c.fix 2009-07-11 14:51:05.000000000 +0200
+@@ -138,7 +138,7 @@
+ return (int)(acc>=0? floor(acc+0.5) : ceil(acc-0.5) ) ;
+ }
+
+-static int getline(FILE *afmin) {
++static int pslib_getline(FILE *afmin) {
+ char *p ;
+ int c ;
+
+@@ -616,7 +616,7 @@
+ return(-1);
+ }
+
+- while (getline(fp)) {
++ while (pslib_getline(fp)) {
+ switch(interest(paramstring())) {
+ case N:
+ handleprotusion(psdoc, metrics) ;
+@@ -664,7 +664,7 @@
+ /*
+ * Read file line by line.
+ */
+- while (getline(metric->afmin)) {
++ while (pslib_getline(metric->afmin)) {
+ switch(interest(paramstring())) {
+ case FontName:
+ metric->fontname = paramnewstring(psdoc) ;
+@@ -1039,7 +1039,7 @@
+
+ while (1) {
+ while (param == NULL || *param == '\0') {
+- if (getline(metrics->afmin) == 0)
++ if (pslib_getline(metrics->afmin) == 0)
+ ps_error(psdoc, PS_RuntimeError, _("Premature end of encoding file."));
+ for (p=buffer; *p != '\0'; p++)
+ if (*p == '%') {
+@@ -1160,7 +1160,7 @@
+ psdoc->free(psdoc, e);
+ return -1;
+ }
+- while (getline(metrics->afmin)) {
++ while (pslib_getline(metrics->afmin)) {
+ for (p=buffer; *p != '\0'; p++)
+ if (*p == '%') {
+ if (ignoreligkern == 0)
diff --git a/dev-libs/pslib/pslib-0.4.1-r1.ebuild b/dev-libs/pslib/pslib-0.4.1-r1.ebuild
index 0993ebe70b69..a88a5c794443 100644
--- a/dev-libs/pslib/pslib-0.4.1-r1.ebuild
+++ b/dev-libs/pslib/pslib-0.4.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pslib/pslib-0.4.1-r1.ebuild,v 1.2 2009/02/28 13:30:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pslib/pslib-0.4.1-r1.ebuild,v 1.3 2009/08/03 10:27:06 aballier Exp $
inherit autotools eutils
@@ -27,6 +27,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}/${PN}-lm.patch"
+ epatch "${FILESDIR}/${PN}-getline.patch"
eautoreconf
}