Package: dvipsk-ja
Version: 5.96+jp1.7a-3
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu karmic ubuntu-patch
In Ubuntu, we've applied the attached patch to achieve the following:
* Added patch 02_rename-getline.dpatch to avoid name conflict with
getline() in dvipsk/afm2tfm.c (LP: #435120).
We thought you might be interested in doing the same.
Build fails with the following error:
afm2tfm.c:260: error: conflicting types for 'getline'
/usr/include/stdio.h:651: note: previous declaration of 'getline' was here
http://launchpadlibrarian.net/31699882/buildlog_ubuntu-karmic-i386.dvipsk-ja_5.96%2Bjp1.7a-3_FAILEDTOBUILD.txt.gz
-- System Information:
Debian Release: 5.0
APT prefers jaunty-updates
APT policy: (500, 'jaunty-updates'), (500, 'jaunty-security'), (500,
'jaunty-proposed'), (500, 'jaunty-backports'), (500, 'jaunty')
Architecture: i386 (i686)
Kernel: Linux 2.6.28-15-generic (SMP w/2 CPU cores)
Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_rename-getline.dpatch by Ilya Barygin <[email protected]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Rename getline() so that it doesn't conflict with the one defined in stdio.h.
@DPATCH@
diff -urNad dvipsk-ja-5.96+jp1.7a~/dvipsk/afm2tfm.c dvipsk-ja-5.96+jp1.7a/dvipsk/afm2tfm.c
--- dvipsk-ja-5.96+jp1.7a~/dvipsk/afm2tfm.c 2007-12-04 19:32:00.000000000 +0300
+++ dvipsk-ja-5.96+jp1.7a/dvipsk/afm2tfm.c 2009-09-23 12:42:50.000000000 +0400
@@ -257,7 +257,7 @@
}
int
-getline P1H(void) {
+get_line P1H(void) {
register char *p ;
register int c ;
@@ -612,7 +612,7 @@
ai = newchar() ;
ai->adobenum = -1 ;
ai->adobename = "||" ; /* boundary character name */
- while (getline()) {
+ while (get_line()) {
switch(interest(paramstring())) {
case FontName:
fontname = paramnewstring() ;
@@ -1888,7 +1888,7 @@
while (1) {
while (param == 0 || *param == 0) {
- if (getline() == 0)
+ if (get_line() == 0)
error("! premature end in encoding file") ;
for (p=buffer; *p; p++)
if (*p == '%') {
@@ -1979,7 +1979,7 @@
p = gettoken() ;
if (strcmp(p, "]"))
error("! token 258 in encoding must be make-array (])") ;
- while (getline()) {
+ while (get_line()) {
for (p=buffer; *p; p++)
if (*p == '%') {
if (ignoreligkern == 0)
