From 0e0a297615a3e35507e1130a00314cac71b63cad Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Thu, 15 Sep 2011 20:38:34 +0000 Subject: [PATCH] Fix build with zlib-1.2.5.1 (bug #383113, patch by Nikos Chantziaras). Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64 --- www-client/lynx/ChangeLog | 6 +- www-client/lynx/Manifest | 19 +- .../lynx/files/lynx-2.8.8_pre9-zlib.patch | 452 ++++++++++++++++++ www-client/lynx/lynx-2.8.8_pre9.ebuild | 3 +- 4 files changed, 469 insertions(+), 11 deletions(-) create mode 100644 www-client/lynx/files/lynx-2.8.8_pre9-zlib.patch diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog index fbd3aefe94fd..68ee6525f2f5 100644 --- a/www-client/lynx/ChangeLog +++ b/www-client/lynx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/lynx # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.109 2011/09/15 09:26:55 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.110 2011/09/15 20:38:34 radhermit Exp $ + + 15 Sep 2011; Tim Harder lynx-2.8.8_pre9.ebuild, + +files/lynx-2.8.8_pre9-zlib.patch: + Fix build with zlib-1.2.5.1 (bug #383113, patch by Nikos Chantziaras). *lynx-2.8.8_pre9 (15 Sep 2011) diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest index fd2235f80cd1..a01e5c47a6e4 100644 --- a/www-client/lynx/Manifest +++ b/www-client/lynx/Manifest @@ -5,6 +5,7 @@ AUX lynx-2.8.6-CVE-2008-4690.patch 1598 RMD160 f54f9a8ddf113e1d57eefbc4a624a4b2b AUX lynx-2.8.6-mint.patch 1001 RMD160 11c3a218d0c9b51fa5db9ba644d2da2aae1707bd SHA1 1c631792b0184de69ce8b6e5899b2c4e5224d4ce SHA256 e82ae63b656664563c312c107fff0fe1f1b6c8ae1ec054cad3a2f543f3e7ad96 AUX lynx-2.8.7-configure-openssl.patch 1222 RMD160 39f979bfad18b63322c91b2dd2762ad9674efd83 SHA1 50a987b46ec1139cf3ee73151b56a41bda04e74c SHA256 1b7e679307a05e92646b9b6ee96f69ddbc5b60d72ad8bd7e3661c07d46abea15 AUX lynx-2.8.7-include-locale.patch 381 RMD160 25566fffe5f4a0674b5130a44e33facc76252ba6 SHA1 18e9f8e71bbd248e597c7d8755509579c3842c1f SHA256 47bf397918356141dcee2556865032ac75f7ea72252e758246f881785b80992c +AUX lynx-2.8.8_pre9-zlib.patch 13486 RMD160 8062dd7b33cab7305b8f7faf872472b5661aa98f SHA1 ff034c2a18ddbefcc76770f9e964dc8196d73ec4 SHA256 0a9afdeeb3e51540da3cee93f2329e8a74df785a05ad639fb3496a4ff919f2af DIST lynx2.8.7rel.1.tar.bz2 2432045 RMD160 0969f85b6776c5e426cea4b910271356f9193bf1 SHA1 f5e67a298322b22fe0edcfba326c02eaa5edcb72 SHA256 40ec9774deb4a7acf69e1bcfb5e272a3857ccc17e20d923255d64cb5dbe55dad DIST lynx2.8.7rel.2.tar.bz2 2436801 RMD160 553e232aebaa09f88a6a190a1dfe7debb89f0a41 SHA1 a34978f7f83cd46bd857cb957faa5a9120458afa SHA256 301bda96ad3cd5032805e8d5315a42061a11e472e3d3a7baee3a2879517ef627 DIST lynx2.8.8dev.5.tar.bz2 2463677 RMD160 71392a7a8e600419d7d81a0cefe2b677781bfbb2 SHA1 5a8a684849a9898711b6ef87c6eef1693ca8293f SHA256 94afbc5b671d9e4b805cfbb22edbf6b1a619a32ec57c2fba4e4ce6ebad4e2f8e @@ -12,17 +13,17 @@ DIST lynx2.8.8dev.9.tar.bz2 2521699 RMD160 6a06842a272da1fa498dae1ed1a988708ef3e EBUILD lynx-2.8.7_p1.ebuild 3258 RMD160 2f19bde44f9c25f5a25baee14fcccfa67de441ec SHA1 47fd1f3fb3b82c56a0aab10636225ca207cf08d8 SHA256 f3e7fa8ebe50bf827fee7c5c999a9ae38277ce4c7c168871d5f07697ad52e772 EBUILD lynx-2.8.7_p2.ebuild 3038 RMD160 181d4eb8bf6bd467187997f7effb5f4424f478c5 SHA1 1d4b3be87638a13e0d862fa5b44e3fba3630d0b3 SHA256 7a65a361afc09886517fbd4d042004094a5fb0b4a9c866f5ed12e70f491cc976 EBUILD lynx-2.8.8_pre5.ebuild 3397 RMD160 8773aa1f0c9af9be6c9e3dfac5322cad1bcd8ffa SHA1 d0aa6d6034888ccfe39e91cd3f218c3a710968c7 SHA256 fa10800529f5e2996c6a04703604c38f19f5662122cb671367768836e111adca -EBUILD lynx-2.8.8_pre9.ebuild 3354 RMD160 20402bf4a58c2b43d698ddf2364a0180491bd0c5 SHA1 49a1c422728c50300ae1d6a16352f110202f6d96 SHA256 8b7e0a491e5210c3c411d246b467221b8b4fd2d2e78e1ea791f132a115dc29dd -MISC ChangeLog 20823 RMD160 0857969840787df59f8be9a142bdb01589880c03 SHA1 1afb6214681b978f9056caa313ccc4537bede41a SHA256 92434b37a43d6d810dcac247ce51b6200f2c1d466c2a888d23e9d81038593e4b +EBUILD lynx-2.8.8_pre9.ebuild 3392 RMD160 b61a99225fb99990d63fbfaa903595424aedf1cc SHA1 c0dfaf737594dc0bfd7b0f2ba3f3f5efba6177c7 SHA256 5aef5a62d0b1acbd4be72c94e27d52a961168d99327e95e48bbf2216e70265ad +MISC ChangeLog 21007 RMD160 dee27ed91801602978df3db5678b4929e30ddca7 SHA1 f75bf2925bd6a5e01464ab913c65333c4e0f72e9 SHA256 e4ecb303ad9e0ef8c15cbbd5b17716952c9c40a41d2ebc51767e0a1e45dded5a MISC metadata.xml 497 RMD160 581f43dba68c5aabdca2937796954c08213f2ec0 SHA1 1d802c0548a18daae4d84060b1b10fe062a44958 SHA256 1cc98f4ed470e4b5daeb9fa376b806c3d7220adb6b0bb4876a560a6c52f1bb45 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOccTlAAoJEEqz6FtPBkyjq8oH/jrFC7WLuEsClhskPP43IOeA -wrL94O0xpVbnG24rQ0dWuT2R1r76PieyUPSvhQxYRpOhntQCAQSnFxD5S6/1vxOG -xsNrzdZZkd/ZmfBnz07vjtUwt8jZckGq9Uxo5Wg0SvK0EdFYZXBhMpTXl7moNWid -2B774aGdtAIzhHdLq02NjmEA3Bq5vC7BgGoCettnX8hP4bLm+k0+t2zE4SiDI9lv -L0NrpovNi1R6Hpvl1CbmYoqX8IMK+3p4/eIu/9ag5OUk0lTUgN/GPby+XdCwUABr -5CsBTnx885xovxrQjgsKzvCx6FG9u8Ya5FgqNe7JiJqY5Hv3PE97Kq77AgsXHfQ= -=sFkU +iQEcBAEBCgAGBQJOcmJXAAoJEEqz6FtPBkyjJX0H+QFInpvk6hazBWqOnJoy7h3r +cgc2HfvwLEacZfwIb0o9YgC0XJwtVcs4i7R/9Uek9fSeQ59Filuxkf8evntisJmz +gkQmqDsq4eDuaTxyDAa36mI3lTGsNZDMHUUhV5bTMnatz0RAdwCuxEVwQFpIbNQc +M4GUjHfU+Rox06YT8QERAnbYcuqYYSMhfu8zyS/KAVv/7UKkskDvdabARhp1IeNN +HDZI7mIm0feEm1arPAZB85/R4DDedBmjedA0YQIx4102SPK+GFkx2Bf8cDWulINk +318b+DW4mO3N5R+CEuyaGIFFDCOhca37CA1lRAix6T/p2PSSfSNk6W1Uty1h9rQ= +=j117 -----END PGP SIGNATURE----- diff --git a/www-client/lynx/files/lynx-2.8.8_pre9-zlib.patch b/www-client/lynx/files/lynx-2.8.8_pre9-zlib.patch new file mode 100644 index 000000000000..b4b5bb60c30c --- /dev/null +++ b/www-client/lynx/files/lynx-2.8.8_pre9-zlib.patch @@ -0,0 +1,452 @@ +--- a/src/GridText.c ++++ b/src/GridText.c +@@ -124,8 +124,8 @@ + const char *checked_radio = "(*)"; + const char *unchecked_radio = "( )"; + +-static BOOLEAN underline_on = OFF; +-static BOOLEAN bold_on = OFF; ++static BOOLEAN underline_on = LOFF; ++static BOOLEAN bold_on = LOFF; + + #ifdef USE_SOURCE_CACHE + int LYCacheSource = SOURCE_CACHE_NONE; +@@ -2406,7 +2406,7 @@ + /* + * Bold the link after incrementing nlinks. + */ +- LYhighlight(OFF, (nlinks - 1), target); ++ LYhighlight(LOFF, (nlinks - 1), target); + + display_flag = TRUE; + +@@ -4018,27 +4018,27 @@ + if (ch == LY_UNDERLINE_START_CHAR) { + line->data[line->size++] = LY_UNDERLINE_START_CHAR; + line->data[line->size] = '\0'; +- underline_on = ON; ++ underline_on = LON; + if (!(dump_output_immediately && use_underscore)) + ctrl_chars_on_this_line++; + return; + } else if (ch == LY_UNDERLINE_END_CHAR) { + line->data[line->size++] = LY_UNDERLINE_END_CHAR; + line->data[line->size] = '\0'; +- underline_on = OFF; ++ underline_on = LOFF; + if (!(dump_output_immediately && use_underscore)) + ctrl_chars_on_this_line++; + return; + } else if (ch == LY_BOLD_START_CHAR) { + line->data[line->size++] = LY_BOLD_START_CHAR; + line->data[line->size] = '\0'; +- bold_on = ON; ++ bold_on = LON; + ctrl_chars_on_this_line++; + return; + } else if (ch == LY_BOLD_END_CHAR) { + line->data[line->size++] = LY_BOLD_END_CHAR; + line->data[line->size] = '\0'; +- bold_on = OFF; ++ bold_on = LOFF; + ctrl_chars_on_this_line++; + return; + } else if (ch == LY_SOFT_HYPHEN) { +--- a/src/LYCurses.c ++++ b/src/LYCurses.c +@@ -2928,7 +2928,7 @@ + int pending GCC_UNUSED) + { + #ifdef USE_COLOR_STYLE +- LynxChangeStyle(flag == ON ? s_alink : s_a, ABS_OFF); ++ LynxChangeStyle(flag == LON ? s_alink : s_a, ABS_OFF); + #else + if (flag) { + lynx_stop_reverse(); +--- a/src/LYLocal.c ++++ b/src/LYLocal.c +@@ -1597,7 +1597,7 @@ + if (nlinks > 0) { + LYmove(links[cur].ly, 2); + lynx_stop_reverse(); +- if (flag == ON) { ++ if (flag == LON) { + LYaddch('+'); + } else { + LYaddch(' '); +@@ -1630,7 +1630,7 @@ + s = t; + while ((name = (char *) HTList_nextObject(s)) != NULL) { + if (!strcmp(links[i].lname, name)) { +- tagflag(ON, i); ++ tagflag(LON, i); + break; + } + } +--- a/src/LYMainLoop.c ++++ b/src/LYMainLoop.c +@@ -513,7 +513,7 @@ + && nextlink >= 0 + && nextlink < nlinks) { + if (curdoc.link >= 0 && curdoc.link < nlinks) { +- LYhighlight(OFF, curdoc.link, prev_target); ++ LYhighlight(LOFF, curdoc.link, prev_target); + result = TRUE; + } + curdoc.link = nextlink; +@@ -548,7 +548,7 @@ + static void set_curdoc_link_by_mouse(int nextlink) + { + if (set_curdoc_link(nextlink)) { +- LYhighlight(ON, nextlink, prev_target); ++ LYhighlight(LON, nextlink, prev_target); + LYmsec_delay(20); + } + } +@@ -3574,7 +3574,7 @@ + newdoc.isHEAD = FALSE; + newdoc.safe = FALSE; + newdoc.internal_link = FALSE; +- LYhighlight(OFF, curdoc.link, prev_target); ++ LYhighlight(LOFF, curdoc.link, prev_target); + #ifdef DIRED_SUPPORT + if (lynx_edit_mode) { + DIRED_UNCACHE_2; +@@ -3834,7 +3834,7 @@ + int real_c) + { + if (curdoc.link < nlinks - 1) { /* next link */ +- LYhighlight(OFF, curdoc.link, prev_target); ++ LYhighlight(LOFF, curdoc.link, prev_target); + #ifdef FASTTAB + /* + * Move to different textarea if TAB in textarea. +@@ -4475,7 +4475,7 @@ + found = TRUE; + HTList_removeObject(tagged, tagname); + FREE(tagname); +- tagflag(OFF, curdoc.link); ++ tagflag(LOFF, curdoc.link); + break; + } + } +@@ -4485,7 +4485,7 @@ + tagname = NULL; + StrAllocCopy(tagname, links[curdoc.link].lname); + HTList_addObject(tagged, tagname); +- tagflag(ON, curdoc.link); ++ tagflag(LON, curdoc.link); + } + } + if (curdoc.link < nlinks - 1) { +@@ -6510,10 +6510,10 @@ + * Highlight current link, unless it is an active text input field. + */ + if (!curlink_is_editable) { +- LYhighlight(ON, curdoc.link, prev_target); ++ LYhighlight(LON, curdoc.link, prev_target); + #ifndef INACTIVE_INPUT_STYLE_VH + } else if (!textinput_activated) { +- LYhighlight(ON, curdoc.link, prev_target); ++ LYhighlight(LON, curdoc.link, prev_target); + #endif + } + } +--- a/src/LYSearch.c ++++ b/src/LYSearch.c +@@ -336,7 +336,7 @@ + /* + * Found in link, changed cur, we're done. + */ +- LYhighlight(OFF, oldcur, prev_target); ++ LYhighlight(LOFF, oldcur, prev_target); + return (TRUE); + } + } else { +@@ -349,7 +349,7 @@ + /* + * Found in link, changed cur, we're done. + */ +- LYhighlight(OFF, oldcur, prev_target); ++ LYhighlight(LOFF, oldcur, prev_target); + return (TRUE); + } + +@@ -369,7 +369,7 @@ + */ + www_user_search((cur_doc->line + offset), cur_doc, prev_target, direction); + if (cur_doc->link != oldcur) { +- LYhighlight(OFF, oldcur, prev_target); ++ LYhighlight(LOFF, oldcur, prev_target); + return (TRUE); + } + return (BOOL) (www_search_result > 0); +--- a/src/LYUtils.c ++++ b/src/LYUtils.c +@@ -553,7 +553,7 @@ + * Start emphasis immediately if we are making the link + * non-current. -FM + */ +- if (flag != ON) { ++ if (flag != LON) { + LYstartTargetEmphasis(); + TargetEmphasisON = TRUE; + LYaddstr(tmp); +@@ -571,7 +571,7 @@ + * Start emphasis immediately if we are making the link + * non-current. -FM + */ +- if (flag != ON) { ++ if (flag != LON) { + LYstartTargetEmphasis(); + TargetEmphasisON = TRUE; + LYaddstr(tmp); +@@ -585,7 +585,7 @@ + * Start emphasis immediately if we are making the link + * non-current. -FM + */ +- if (flag != ON) { ++ if (flag != LON) { + LYstartTargetEmphasis(); + TargetEmphasisON = TRUE; + LYaddstr(tmp); +@@ -625,7 +625,7 @@ + * character of hightext if we are making the link + * current. -FM + */ +- if (flag == ON && data[(itmp + 1)] == '\0') { ++ if (flag == LON && data[(itmp + 1)] == '\0') { + LYstopTargetEmphasis(); + TargetEmphasisON = FALSE; + LYGetYX(y, offset); +@@ -645,7 +645,7 @@ + * character of hightext if we are making the link + * current. -FM + */ +- if (flag == ON && data[(itmp + 1)] == '\0') { ++ if (flag == LON && data[(itmp + 1)] == '\0') { + LYstopTargetEmphasis(); + TargetEmphasisON = FALSE; + LYGetYX(y, offset); +@@ -661,7 +661,7 @@ + * character of hightext if we are making the link + * current. -FM + */ +- if (flag == ON && data[(itmp + 1)] == '\0') { ++ if (flag == LON && data[(itmp + 1)] == '\0') { + LYstopTargetEmphasis(); + TargetEmphasisON = FALSE; + LYGetYX(y, offset); +@@ -684,7 +684,7 @@ + TargetEmphasisON = FALSE; + } + LYGetYX(y, offset); +- if (offset < (hoffset + (flag == ON ? (hLen - 1) : hLen)) ++ if (offset < (hoffset + (flag == LON ? (hLen - 1) : hLen)) + /* + * See if we have another hit that starts within the + * hightext. -FM +@@ -705,7 +705,7 @@ + */ + && (HitOffset + offset) < + (hoffset + +- (flag == ON ? (hLen - 1) : hLen))) { ++ (flag == LON ? (hLen - 1) : hLen))) { + /* + * Set up the data and offset for the hit, and let the code + * for within hightext hits handle it. -FM +@@ -726,7 +726,7 @@ + * hightext, we are done. Otherwise, move there and start + * restoring the emphasis. -FM + */ +- if ((Offset - offset) <= (flag == ON ? (hLen - 1) : hLen)) { ++ if ((Offset - offset) <= (flag == LON ? (hLen - 1) : hLen)) { + data = SKIP_GLYPHS(utf_flag, data, Offset - offset); + if (utf_flag) { + LYrefresh(); +@@ -751,7 +751,7 @@ + * non-current, or we are making it current but this is not + * the first or last character of the hightext. -FM + */ +- if (flag != ON || ++ if (flag != LON || + (offset > hoffset && data[itmp + 1] != '\0')) { + LYstartTargetEmphasis(); + TargetEmphasisON = TRUE; +@@ -771,7 +771,7 @@ + * non-current, or we are making it current but this is not + * the first or last character of the hightext. -FM + */ +- if (flag != ON || ++ if (flag != LON || + (offset > hoffset && data[itmp + 1] != '\0')) { + LYstartTargetEmphasis(); + TargetEmphasisON = TRUE; +@@ -787,7 +787,7 @@ + * non-current, or we are making it current but this is not + * the first or last character of the hightext. -FM + */ +- if (flag != ON || ++ if (flag != LON || + (offset > hoffset && data[itmp + 1] != '\0')) { + LYstartTargetEmphasis(); + TargetEmphasisON = TRUE; +@@ -825,7 +825,7 @@ + * character of hightext if we are making the link + * current. -FM + */ +- if (flag == ON && data[(itmp + 1)] == '\0') { ++ if (flag == LON && data[(itmp + 1)] == '\0') { + LYstopTargetEmphasis(); + TargetEmphasisON = FALSE; + LYGetYX(y, offset); +@@ -845,7 +845,7 @@ + * character of hightext if we are making the link + * current. -FM + */ +- if (flag == ON && data[(itmp + 1)] == '\0') { ++ if (flag == LON && data[(itmp + 1)] == '\0') { + LYstopTargetEmphasis(); + TargetEmphasisON = FALSE; + LYGetYX(y, offset); +@@ -861,7 +861,7 @@ + * character of hightext if we are making the link + * current. -FM + */ +- if (flag == ON && data[(itmp + 1)] == '\0') { ++ if (flag == LON && data[(itmp + 1)] == '\0') { + LYstopTargetEmphasis(); + TargetEmphasisON = FALSE; + LYGetYX(y, offset); +@@ -884,7 +884,7 @@ + TargetEmphasisON = FALSE; + } + LYGetYX(y, offset); +- if (offset < (hoffset + (flag == ON ? (hLen - 1) : hLen)) ++ if (offset < (hoffset + (flag == LON ? (hLen - 1) : hLen)) + /* + * See if we have another hit that starts within the + * hightext. -FM +@@ -904,7 +904,7 @@ + * last character, we are done. -FM + */ + && (HitOffset + offset) < +- (hoffset + (flag == ON ? (hLen - 1) : hLen))) { ++ (hoffset + (flag == LON ? (hLen - 1) : hLen))) { + /* + * If the target extends beyond our buffer, emphasize + * everything in the hightext starting at this hit. +@@ -945,7 +945,7 @@ + * last character of hightext if we are making + * the link current. -FM + */ +- if (flag == ON && data[(itmp + 1)] == '\0') { ++ if (flag == LON && data[(itmp + 1)] == '\0') { + LYstopTargetEmphasis(); + TargetEmphasisON = FALSE; + LYGetYX(y, offset); +@@ -965,7 +965,7 @@ + * last character of hightext if we are making + * the link current. -FM + */ +- if (flag == ON && data[(itmp + 1)] == '\0') { ++ if (flag == LON && data[(itmp + 1)] == '\0') { + LYstopTargetEmphasis(); + TargetEmphasisON = FALSE; + } else { +@@ -979,7 +979,7 @@ + * last character of hightext if we are making + * the link current. -FM + */ +- if (flag == ON && data[(itmp + 1)] == '\0') { ++ if (flag == LON && data[(itmp + 1)] == '\0') { + LYstopTargetEmphasis(); + TargetEmphasisON = FALSE; + } else { +@@ -1025,7 +1025,7 @@ + s = s_curedit; + #endif + +- if (flag != ON) { ++ if (flag != LON) { + int x; + + /* +@@ -1119,13 +1119,13 @@ + NONNULL(target))); + + #if defined(TEXTFIELDS_MAY_NEED_ACTIVATION) && defined(INACTIVE_INPUT_STYLE_VH) +- if (flag == OFF) ++ if (flag == LOFF) + textinput_redrawn = FALSE; + #endif + + if (nlinks > 0) { + #ifdef USE_COLOR_STYLE +- if (flag == ON || links[cur].type == WWW_FORM_LINK_TYPE) { ++ if (flag == LON || links[cur].type == WWW_FORM_LINK_TYPE) { + LYmove(LYP + title_adjust, LXP); + LynxChangeStyle(find_cached_style(cur, flag), STACK_ON); + } +@@ -1134,7 +1134,7 @@ + || LYGetHiliteStr(cur, 0) == NULL) { + LYMoveToLink(cur, target, NULL, + flag, links[cur].inUnderline, utf_flag); +- lynx_start_link_color(flag == ON, links[cur].inUnderline); ++ lynx_start_link_color(flag == LON, links[cur].inUnderline); + } else { + LYMoveToLink(cur, target, LYGetHiliteStr(cur, 0), + flag, links[cur].inUnderline, utf_flag); +@@ -1162,7 +1162,7 @@ + LYaddch('_'); + + #ifdef USE_COLOR_STYLE +- } else if (flag == OFF) { ++ } else if (flag == LOFF) { + hl2_drawn = TRUE; + redraw_lines_of_link(cur); + CTRACE2(TRACE_STYLE, +@@ -1196,17 +1196,17 @@ + int row = LYP + hi_count + title_adjust; + + hi_offset = LYGetHilitePos(cur, hi_count); +- lynx_stop_link_color(flag == ON, links[cur].inUnderline); ++ lynx_stop_link_color(flag == LON, links[cur].inUnderline); + LYmove(row, hi_offset); + + #ifdef USE_COLOR_STYLE + CTRACE2(TRACE_STYLE, + (tfp, "STYLE.highlight.line2: @(%d,%d), style=%d.\n", + row, hi_offset, +- flag == ON ? s_alink : s_a)); +- LynxChangeStyle(flag == ON ? s_alink : s_a, ABS_ON); ++ flag == LON ? s_alink : s_a)); ++ LynxChangeStyle(flag == LON ? s_alink : s_a, ABS_ON); + #else +- lynx_start_link_color(flag == ON, links[cur].inUnderline); ++ lynx_start_link_color(flag == LON, links[cur].inUnderline); + #endif + + for (i = 0; (tmp[0] = hi_string[i]) != '\0' +@@ -1225,7 +1225,7 @@ + } + } + } +- lynx_stop_link_color(flag == ON, links[cur].inUnderline); ++ lynx_stop_link_color(flag == LON, links[cur].inUnderline); + } + #ifdef SHOW_WHEREIS_TARGETS + for (hi_count = target1_drawn ? 1 : 0; +--- a/src/LYUtils.h ++++ b/src/LYUtils.h +@@ -522,8 +522,8 @@ + /* + * Miscellaneous. + */ +-#define ON 1 +-#define OFF 0 ++#define LON 1 ++#define LOFF 0 + #define STREQ(a,b) (strcmp(a,b) == 0) + #define STRNEQ(a,b,c) (StrNCmp(a,b,c) == 0) + diff --git a/www-client/lynx/lynx-2.8.8_pre9.ebuild b/www-client/lynx/lynx-2.8.8_pre9.ebuild index f193d01c079b..791c2fd77b1f 100644 --- a/www-client/lynx/lynx-2.8.8_pre9.ebuild +++ b/www-client/lynx/lynx-2.8.8_pre9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_pre9.ebuild,v 1.1 2011/09/15 09:26:55 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_pre9.ebuild,v 1.2 2011/09/15 20:38:34 radhermit Exp $ EAPI=4 @@ -58,6 +58,7 @@ src_prepare() { # fix configure for openssl compiled with kerberos (bug #267749) epatch "${FILESDIR}/lynx-2.8.7-configure-openssl.patch" epatch "${FILESDIR}"/${PN}-2.8.6-mint.patch + epatch "${FILESDIR}"/${P}-zlib.patch } src_configure() { -- 2.26.2