From 7f0f83eb4be5739d23ca41bcd9cef949a8ad34bd Mon Sep 17 00:00:00 2001 From: dillo Date: Mon, 29 Mar 2004 00:50:41 +0000 Subject: Apply longname.patch and fix crash with long file names in visual schnauzer. Bump package revision. While here, convert to buildlink 3. --- graphics/xv/Makefile | 10 +++++----- graphics/xv/distinfo | 9 +++++---- graphics/xv/patches/patch-am | 26 ++++++++++++++++++-------- graphics/xv/patches/patch-ao | 19 +++++++++++-------- graphics/xv/patches/patch-at | 24 +++++++++++++++--------- graphics/xv/patches/patch-ay | 18 ++++++++++++++++++ 6 files changed, 72 insertions(+), 34 deletions(-) create mode 100644 graphics/xv/patches/patch-ay (limited to 'graphics/xv') diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index c5db978e6c4..506a57ae21f 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.52 2004/01/03 18:49:45 reed Exp $ +# $NetBSD: Makefile,v 1.53 2004/03/29 00:50:41 dillo Exp $ DISTNAME= xv-3.10a -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics x11 MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/ \ ftp://ftp.kuis.kyoto-u.ac.jp/X11/contrib/clients/xv/ \ @@ -16,7 +16,7 @@ MAINTAINER= dillo@NetBSD.org HOMEPAGE= http://www.trilon.com/xv/ COMMENT= X11 program that displays images of various formats -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_IMAKE= YES @@ -46,6 +46,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv ${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv -.include "../../graphics/png/buildlink2.mk" -.include "../../graphics/tiff/buildlink2.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo index 8cc063f8f69..999319565f0 100644 --- a/graphics/xv/distinfo +++ b/graphics/xv/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2003/02/28 23:44:37 grant Exp $ +$NetBSD: distinfo,v 1.8 2004/03/29 00:50:41 dillo Exp $ SHA1 (xv-3.10a.tar.gz) = 9e6372f154be9e9e355972cbeb91d98d9c342474 Size (xv-3.10a.tar.gz) = 2259124 bytes @@ -20,15 +20,16 @@ SHA1 (patch-ai) = 1beb3d45b08be536f297661f5dbdca050591548a SHA1 (patch-aj) = 0df06a5187f43dd4a97f795d9ef29fe773b21806 SHA1 (patch-ak) = cfefb6ed9d0747f620f9ea4dcfc948fd8355f137 SHA1 (patch-al) = 7a1118af7b5581ab0fd28b95d4a973aefb544b09 -SHA1 (patch-am) = 2995c284e62fe5bb669eb0562d120a671b0b30ce +SHA1 (patch-am) = 6b59620ae2998f28a06c88d292c6ab9fc9095ccb SHA1 (patch-an) = 8eb0076fc932ad3859e72b5de228806457e812f8 -SHA1 (patch-ao) = 36681bfa24df5715b7203e27c0cfd477890c8c58 +SHA1 (patch-ao) = a708368db9288b0697d9c7fac117b4a1c2eaa751 SHA1 (patch-ap) = d80d3f42ef65f8941a9a2b318ec3895cf35a6fa4 SHA1 (patch-aq) = 5ab291d650c65437000951c6cbb42c0b7799db8f SHA1 (patch-ar) = 61747379c2f080d13bc76b2175e8e7ae61647374 SHA1 (patch-as) = 03e8fafaf267fda7e17aee58ba48096796161e74 -SHA1 (patch-at) = a2c2c57ad852006b66addc5c88f73fce7d4716eb +SHA1 (patch-at) = 25e111754de9fbb48f17bf140f984e14a29413a9 SHA1 (patch-au) = 3cb2fde94db4b71a449c81e4b912132b204b0062 SHA1 (patch-av) = cb815b12de135927cad826623c5071e938a59509 SHA1 (patch-aw) = 2085110d88d34a78d14b68dd6a3cbff56251352f SHA1 (patch-ax) = 81adbda29a9e3633085bd41b409f5795d0f353b1 +SHA1 (patch-ay) = 55ccef29880f7fed50a1287402dd5e8b50b98b48 diff --git a/graphics/xv/patches/patch-am b/graphics/xv/patches/patch-am index 37d6a9b6212..11eab1f68d4 100644 --- a/graphics/xv/patches/patch-am +++ b/graphics/xv/patches/patch-am @@ -1,15 +1,17 @@ -$NetBSD: patch-am,v 1.1 2001/04/05 13:57:16 wiz Exp $ +$NetBSD: patch-am,v 1.2 2004/03/29 00:50:41 dillo Exp $ This patch is based on http://www.mit.edu/afs/athena/contrib/graphics/src/xv/patches/png/xvpng.diff It was edited to fit into the NetBSD Packages Collection! - HF +It is also based on +ftp://ftp.trilon.com/pub/xv/patches/longname.patch --------------------------------------------------------------------------- ---- xvbrowse.c.patched Sun Jun 13 03:22:27 1999 -+++ xvbrowse.c Sun Jun 13 03:25:38 1999 -@@ -61,6 +61,7 @@ +--- xvbrowse.c.orig Sun Mar 21 21:27:18 2004 ++++ xvbrowse.c +@@ -61,6 +61,7 @@ typedef unsigned int mode_t; /* file mo #include "bits/br_pic" #include "bits/br_pi" #include "bits/br_pic2" @@ -17,7 +19,7 @@ It was edited to fit into the NetBSD Packages Collection! - HF #include "bits/br_trash" #include "bits/fcurs" -@@ -106,7 +107,8 @@ +@@ -106,7 +107,8 @@ typedef unsigned int mode_t; /* file mo #define BF_PI 31 #define BF_PIC2 32 #define BF_PCD 33 @@ -27,7 +29,7 @@ It was edited to fit into the NetBSD Packages Collection! - HF #define ISLOADABLE(ftyp) (ftyp!=BF_DIR && ftyp!=BF_CHR && ftyp!=BF_BLK && \ ftyp!=BF_SOCK && ftyp!=BF_FIFO) -@@ -543,6 +545,7 @@ +@@ -543,6 +545,7 @@ void CreateBrowse(geom, fgstr, bgstr, hi bfIcons[BF_PI] = MakePix1(br->win,br_pi_bits,br_pi_width,br_pi_height); bfIcons[BF_PIC2]=MakePix1(br->win,br_pic2_bits,br_pic2_width,br_pic2_height); bfIcons[BF_PCD] = MakePix1(br->win,br_pcd_bits,br_pcd_width,br_pcd_height); @@ -35,7 +37,15 @@ It was edited to fit into the NetBSD Packages Collection! - HF /* check that they all got built */ -@@ -3045,6 +3048,7 @@ +@@ -1509,6 +1512,7 @@ static void drawIcon(br, num) + if (StringWidth(str) > ISPACE_WIDE-6) { + int dotpos; + strncpy(tmpstr, str, (size_t) 56); ++ tmpstr[56] = '\0'; + dotpos = strlen(tmpstr); + strcat(tmpstr,"..."); + +@@ -3045,6 +3049,7 @@ static void scanFile(br, bf, name) case RFT_PI: bf->ftype = BF_PI; break; case RFT_PIC2: bf->ftype = BF_PIC2; break; case RFT_PCD: bf->ftype = BF_PCD; break; @@ -43,7 +53,7 @@ It was edited to fit into the NetBSD Packages Collection! - HF } } } -@@ -3612,6 +3616,7 @@ +@@ -3612,6 +3617,7 @@ static void genIcon(br, bf) case RFT_PI: strcat(str,"PI file"); break; case RFT_PIC2: strcat(str,"PIC2 file"); break; case RFT_PCD: strcat(str,"PhotoCD file"); break; diff --git a/graphics/xv/patches/patch-ao b/graphics/xv/patches/patch-ao index c3fb63b1358..de9aed5b99a 100644 --- a/graphics/xv/patches/patch-ao +++ b/graphics/xv/patches/patch-ao @@ -1,15 +1,18 @@ -$NetBSD: patch-ao,v 1.1 2001/04/05 13:57:17 wiz Exp $ +$NetBSD: patch-ao,v 1.2 2004/03/29 00:50:41 dillo Exp $ This patch is based on http://www.mit.edu/afs/athena/contrib/graphics/src/xv/patches/png/xvpng.diff It was edited to fit into the NetBSD Packages Collection! - HF +It is also based on +ftp://ftp.trilon.com/pub/xv/patches/longname.patch + --------------------------------------------------------------------------- ---- xvdir.c.patched Sun Jun 13 03:27:12 1999 -+++ xvdir.c Sun Jun 13 03:33:01 1999 -@@ -62,6 +62,9 @@ +--- xvdir.c.orig Sun Mar 21 21:18:09 2004 ++++ xvdir.c +@@ -62,6 +62,9 @@ static char *saveFormats[] = { "GIF", #ifdef HAVE_TIFF "TIFF", #endif @@ -19,7 +22,7 @@ It was edited to fit into the NetBSD Packages Collection! - HF "PostScript", "PBM/PGM/PPM (raw)", "PBM/PGM/PPM (ascii)", -@@ -1123,6 +1126,14 @@ +@@ -1123,6 +1126,14 @@ int DoSave() } #endif @@ -34,7 +37,7 @@ It was edited to fit into the NetBSD Packages Collection! - HF -@@ -1181,6 +1192,7 @@ +@@ -1181,6 +1192,7 @@ int DoSave() case F_FITS: rv = WriteFITS (fp, thepic, ptype, w, h, rp, gp, bp, nc, col, picComments); @@ -42,7 +45,7 @@ It was edited to fit into the NetBSD Packages Collection! - HF case F_MAG: rv = WriteMAG (fp, thepic, ptype, w, h, rp, gp, bp, nc, col, picComments); break; -@@ -1415,19 +1427,26 @@ +@@ -1416,19 +1428,26 @@ static void changeSuffix() (strcmp(lowsuf,"eps" )==0) || (strcmp(lowsuf,"rgb" )==0) || (strcmp(lowsuf,"tga" )==0) || @@ -71,7 +74,7 @@ It was edited to fit into the NetBSD Packages Collection! - HF /* found one. set lowsuf = to the new suffix, and tack on to filename */ -@@ -1462,6 +1481,9 @@ +@@ -1463,6 +1482,9 @@ static void changeSuffix() #ifdef HAVE_TIFF case F_TIFF: strcpy(lowsuf,"tif"); break; diff --git a/graphics/xv/patches/patch-at b/graphics/xv/patches/patch-at index 47f58e897a2..5c9c2c07220 100644 --- a/graphics/xv/patches/patch-at +++ b/graphics/xv/patches/patch-at @@ -1,8 +1,14 @@ -$NetBSD: patch-at,v 1.1 2001/04/05 13:57:17 wiz Exp $ +$NetBSD: patch-at,v 1.2 2004/03/29 00:50:41 dillo Exp $ ---- xvpopup.c.orig Thu Jan 19 19:09:31 1995 -+++ xvpopup.c Sun Nov 14 14:05:49 1999 -@@ -200,14 +200,14 @@ +This patch is partially based on +ftp://ftp.trilon.com/pub/xv/patches/longname.patch + +----------------------- + + +--- xvpopup.c.orig Sun Mar 21 21:18:09 2004 ++++ xvpopup.c +@@ -200,14 +200,14 @@ static int doPopUp(txt, labels, n, popty if (!padHaveDooDads) { DCreate(&padWDial, popW, 16, puhigh-16-100-1,75,100, @@ -20,7 +26,7 @@ $NetBSD: patch-at,v 1.1 2001/04/05 13:57:17 wiz Exp $ infofg, infobg, hicol, locol, "Opaque", NULL); MBCreate(&padMthdMB, popW, 100-2+44, 10, 140, 19, NULL, -@@ -258,9 +258,9 @@ +@@ -258,9 +258,9 @@ static int doPopUp(txt, labels, n, popty else if (poptyp == ISPAD) { BTSetActive(&bts[0], (int) strlen(gsBuf)); i = pWIDE * 3; RANGE(i,2048,9999); @@ -32,7 +38,7 @@ $NetBSD: patch-at,v 1.1 2001/04/05 13:57:17 wiz Exp $ DSetActive(&padWDial, (padMode!=PAD_LOAD)); /* DSetRange activates dial */ DSetActive(&padHDial, (padMode!=PAD_LOAD)); -@@ -465,9 +465,9 @@ +@@ -465,9 +465,9 @@ int PadPopUp(pMode, pStr, pWide,pHigh, p changedGSBuf(); /* careful! popW doesn't exist yet! */ if (padHaveDooDads) { @@ -45,7 +51,7 @@ $NetBSD: patch-at,v 1.1 2001/04/05 13:57:17 wiz Exp $ } else { oldW = pWIDE; oldH = pHIGH; oldO = 100; } -@@ -486,9 +486,9 @@ +@@ -486,9 +486,9 @@ int PadPopUp(pMode, pStr, pWide,pHigh, p } if (rv == 1) { /* cancelled: restore normal values */ @@ -58,7 +64,7 @@ $NetBSD: patch-at,v 1.1 2001/04/05 13:57:17 wiz Exp $ } XUnmapWindow(theDisp, padWDial.win); -@@ -498,9 +498,9 @@ +@@ -498,9 +498,9 @@ int PadPopUp(pMode, pStr, pWide,pHigh, p /* load up return values */ *pMode = padMode; *pStr = padBuf; @@ -71,7 +77,7 @@ $NetBSD: patch-at,v 1.1 2001/04/05 13:57:17 wiz Exp $ *pOmode = padOMode; return rv; -@@ -972,8 +972,8 @@ +@@ -973,8 +973,8 @@ static void clickPUD(x,y) else if (popUp == ISPAD) { if (PTINRECT(x, y, padDButt.x, padDButt.y, padDButt.w, padDButt.h)) { if (BTTrack(&padDButt)) { diff --git a/graphics/xv/patches/patch-ay b/graphics/xv/patches/patch-ay new file mode 100644 index 00000000000..71892e60565 --- /dev/null +++ b/graphics/xv/patches/patch-ay @@ -0,0 +1,18 @@ +$NetBSD: patch-ay,v 1.1 2004/03/29 00:50:41 dillo Exp $ + +This patch is based on +ftp://ftp.trilon.com/pub/xv/patches/longname.patch + +-------------------------- + + +--- xvtext.c.orig Sat Jan 14 00:46:28 1995 ++++ xvtext.c +@@ -293,6 +293,7 @@ void OpenTextView(text, len, title, free + tv->textlen = len; + tv->freeonclose = freeonclose; + strncpy(tv->title, title, (size_t) TITLELEN-1); ++ tv->title[TITLELEN-1] = '\0'; + + computeText(tv); /* compute # lines and linestarts array */ + -- cgit v1.2.3