diff options
author | wiz <wiz@pkgsrc.org> | 2005-01-03 14:32:27 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2005-01-03 14:32:27 +0000 |
commit | 815d74b4ac5e7f8f7ec43d0781642c7dd7d50501 (patch) | |
tree | 9d1006fc684859dec674de85ccdfb75efd20befd /graphics | |
parent | 9626616f474f619d57f2725d88f2e97d6c3a6d87 (diff) | |
download | pkgsrc-815d74b4ac5e7f8f7ec43d0781642c7dd7d50501.tar.gz |
Remove KDE2 packages (and their dependencies) as proposed on tech-pkg.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/Makefile | 3 | ||||
-rw-r--r-- | graphics/kdegraphics2/DESCR | 1 | ||||
-rw-r--r-- | graphics/kdegraphics2/Makefile | 25 | ||||
-rw-r--r-- | graphics/kdegraphics2/PLIST | 206 | ||||
-rw-r--r-- | graphics/kdegraphics2/distinfo | 7 | ||||
-rw-r--r-- | graphics/kdegraphics2/patches/patch-aa | 12 | ||||
-rw-r--r-- | graphics/kdegraphics2/patches/patch-ab | 217 | ||||
-rw-r--r-- | graphics/kdegraphics2/patches/patch-ac | 24 |
8 files changed, 1 insertions, 494 deletions
diff --git a/graphics/Makefile b/graphics/Makefile index 870403fc77d..c875770f76c 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.350 2004/12/28 21:58:06 xtraeme Exp $ +# $NetBSD: Makefile,v 1.351 2005/01/03 14:32:28 wiz Exp $ # COMMENT= Graphics tools and libraries @@ -140,7 +140,6 @@ SUBDIR+= jpeginfo SUBDIR+= jpegoptim SUBDIR+= jpegpixi SUBDIR+= kbarcode -SUBDIR+= kdegraphics2 SUBDIR+= kdegraphics3 SUBDIR+= kphotobook SUBDIR+= kphotools diff --git a/graphics/kdegraphics2/DESCR b/graphics/kdegraphics2/DESCR deleted file mode 100644 index 90ae45773be..00000000000 --- a/graphics/kdegraphics2/DESCR +++ /dev/null @@ -1 +0,0 @@ -KDE provides an integrated X11 based environment, much like CDE. diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile deleted file mode 100644 index 24bdbb1c776..00000000000 --- a/graphics/kdegraphics2/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: Makefile,v 1.21 2004/12/28 23:18:21 reed Exp $ - -DISTNAME= kdegraphics-2.2.2 -PKGREVISION= 9 -CATEGORIES= graphics -COMMENT= Graphics programs for the KDE integrated X11 desktop - -.include "../../x11/kde2/Makefile.kde2" - -BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde -#DEPENDS+= gPhoto2 -#DEPENDS+= gpio - -USE_BUILDLINK3= YES -CONFIGURE_ARGS+= --without-kamera # requires gPhoto2, gpio - -# Ensure we export symbols in the linked shared object. -LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} - -.include "../../graphics/tiff/buildlink3.mk" -.include "../../x11/kde2/kde2.mk" -.include "../../x11/kdebase2/buildlink3.mk" -.include "../../mk/ghostscript.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/graphics/kdegraphics2/PLIST b/graphics/kdegraphics2/PLIST deleted file mode 100644 index 1f89eed08ee..00000000000 --- a/graphics/kdegraphics2/PLIST +++ /dev/null @@ -1,206 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:34 jlam Exp $ -bin/kcolorchooser -bin/kcoloredit -bin/kdvi -bin/kfax -bin/kfract -bin/kghostview -bin/kiconedit -bin/kpaint -bin/kruler -bin/ksnapshot -bin/kview -bin/kviewshell -lib/kcolorchooser.la -lib/kview.la -lib/libkdvi.la -lib/libkfax.la -lib/libkghostview.la -lib/libkmultipage.la -lib/libkpagetest.la -lib/libkviewerpart.la -lib/libkviewpart.la -share/doc/kde/HTML/en/kdvi/KDVI-features.dvi -share/doc/kde/HTML/en/kdvi/KDVI-features.tex -share/doc/kde/HTML/en/kdvi/aboutkde.ps -share/doc/kde/HTML/en/kdvi/common -share/doc/kde/HTML/en/kdvi/index.cache.bz2 -share/doc/kde/HTML/en/kdvi/index.docbook -share/doc/kde/HTML/en/kdvi/optionrequester1.png -share/doc/kde/HTML/en/kdvi/optionrequester2.png -share/doc/kde/HTML/en/kfract/common -share/doc/kde/HTML/en/kfract/index.cache.bz2 -share/doc/kde/HTML/en/kfract/index.docbook -share/doc/kde/HTML/en/kfract/kfract.png -share/doc/kde/HTML/en/kghostview/common -share/doc/kde/HTML/en/kghostview/index.cache.bz2 -share/doc/kde/HTML/en/kghostview/index.docbook -share/doc/kde/HTML/en/kiconedit/common -share/doc/kde/HTML/en/kiconedit/index.cache.bz2 -share/doc/kde/HTML/en/kiconedit/index.docbook -share/doc/kde/HTML/en/kpaint/common -share/doc/kde/HTML/en/kpaint/index.cache.bz2 -share/doc/kde/HTML/en/kpaint/index.docbook -share/doc/kde/HTML/en/kruler/common -share/doc/kde/HTML/en/kruler/index.cache.bz2 -share/doc/kde/HTML/en/kruler/index.docbook -share/doc/kde/HTML/en/ksnapshot/common -share/doc/kde/HTML/en/ksnapshot/index.cache.bz2 -share/doc/kde/HTML/en/ksnapshot/index.docbook -share/doc/kde/HTML/en/ksnapshot/preview.png -share/doc/kde/HTML/en/ksnapshot/window.png -share/doc/kde/HTML/en/kview/common -share/doc/kde/HTML/en/kview/index.cache.bz2 -share/doc/kde/HTML/en/kview/index.docbook -share/doc/kde/HTML/en/kview/snapshot1.png -share/doc/kde/HTML/en/kview/snapshot2.png -share/doc/kde/HTML/en/kview/snapshot3.png -share/doc/kde/HTML/en/kview/snapshot4.png -share/doc/kde/HTML/en/kview/snapshot5.png -share/doc/kde/HTML/en/kview/snapshot6.png -share/doc/kde/HTML/en/kview/snapshot7.png -share/doc/kde/HTML/en/kview/snapshot8.png -share/doc/kde/HTML/en/kview/snapshot9.png -share/kde/applnk/Graphics/kcolorchooser.desktop -share/kde/applnk/Graphics/kcoloredit.desktop -share/kde/applnk/Graphics/kdvi.desktop -share/kde/applnk/Graphics/kfax.desktop -share/kde/applnk/Graphics/kfract.desktop -share/kde/applnk/Graphics/kghostview.desktop -share/kde/applnk/Graphics/kiconedit.desktop -share/kde/applnk/Graphics/kpaint.desktop -share/kde/applnk/Graphics/kruler.desktop -share/kde/applnk/Graphics/ksnapshot.desktop -share/kde/applnk/Graphics/kview.desktop -share/kde/apps/kdvi/kdvi_part.rc -share/kde/apps/kdvi/toolbar/forwpage.xpm -share/kde/apps/kdvi/toolbar/largetext.xpm -share/kde/apps/kdvi/toolbar/smalltext.xpm -share/kde/apps/kfax/kfax_part.rc -share/kde/apps/kfax/pics/kfax.tif -share/kde/apps/kfax/pics/kfaxlogo.xpm -share/kde/apps/kfract/kfract.rc -share/kde/apps/kghostview/kghostviewui.rc -share/kde/apps/kghostview/kgv_part.rc -share/kde/apps/kghostview/pdf_sec.ps -share/kde/apps/kiconedit/pics/compressed.png -share/kde/apps/kiconedit/pics/source.png -share/kde/apps/kiconedit/pics/standard.png -share/kde/apps/kiconedit/toolbar/aim-cursor.xpm -share/kde/apps/kiconedit/toolbar/aim.png -share/kde/apps/kiconedit/toolbar/areaselect.png -share/kde/apps/kiconedit/toolbar/circle.png -share/kde/apps/kiconedit/toolbar/ellipse.png -share/kde/apps/kiconedit/toolbar/eraser-cursor.xpm -share/kde/apps/kiconedit/toolbar/fileclose.png -share/kde/apps/kiconedit/toolbar/filledcircle.png -share/kde/apps/kiconedit/toolbar/filledellipse.png -share/kde/apps/kiconedit/toolbar/filledrectangle.png -share/kde/apps/kiconedit/toolbar/flood-cursor.xpm -share/kde/apps/kiconedit/toolbar/flood.png -share/kde/apps/kiconedit/toolbar/grayscale.png -share/kde/apps/kiconedit/toolbar/grid.png -share/kde/apps/kiconedit/toolbar/kdepalette.png -share/kde/apps/kiconedit/toolbar/line.png -share/kde/apps/kiconedit/toolbar/newwin.png -share/kde/apps/kiconedit/toolbar/paintbrush-cursor.xpm -share/kde/apps/kiconedit/toolbar/paintbrush.png -share/kde/apps/kiconedit/toolbar/pointer.png -share/kde/apps/kiconedit/toolbar/rectangle.png -share/kde/apps/kiconedit/toolbar/selectcircle.png -share/kde/apps/kiconedit/toolbar/selectrect.png -share/kde/apps/kiconedit/toolbar/spraycan-cursor.xpm -share/kde/apps/kiconedit/toolbar/spraycan.png -share/kde/apps/kiconedit/toolbar/transform.png -share/kde/apps/kpaint/kpaint.rc -share/kde/apps/kpaint/toolbar/areaselect.xpm -share/kde/apps/kpaint/toolbar/brush.xpm -share/kde/apps/kpaint/toolbar/circle.xpm -share/kde/apps/kpaint/toolbar/ellipse.xpm -share/kde/apps/kpaint/toolbar/largetext.xpm -share/kde/apps/kpaint/toolbar/line.xpm -share/kde/apps/kpaint/toolbar/pen.xpm -share/kde/apps/kpaint/toolbar/rectangle.xpm -share/kde/apps/kpaint/toolbar/roundangle.xpm -share/kde/apps/kpaint/toolbar/spraycan.xpm -share/kde/apps/kruler/eventsrc -share/kde/apps/kruler/kruler-east.png -share/kde/apps/kruler/kruler-north.png -share/kde/apps/kruler/kruler-south.png -share/kde/apps/kruler/kruler-west.png -share/kde/apps/kruler/move.wav -share/kde/apps/kview/kview_part.rc -share/kde/apps/kview/kview_popup.rc -share/kde/apps/kview/kviewui.rc -share/kde/apps/kview/toolbar/rotate.png -share/kde/apps/kviewerpart/kviewerpart.rc -share/kde/apps/kviewshell/kviewshell.rc -share/kde/apps/kviewshell/paper-formats -share/kde/icons/hicolor/16x16/apps/kcoloredit.png -share/kde/icons/hicolor/16x16/apps/kdvi.png -share/kde/icons/hicolor/16x16/apps/kfax.png -share/kde/icons/hicolor/16x16/apps/kfract.png -share/kde/icons/hicolor/16x16/apps/kghostview.png -share/kde/icons/hicolor/16x16/apps/kiconedit.png -share/kde/icons/hicolor/16x16/apps/kpaint.png -share/kde/icons/hicolor/16x16/apps/kruler.png -share/kde/icons/hicolor/16x16/apps/ksnapshot.png -share/kde/icons/hicolor/16x16/apps/kview.png -share/kde/icons/hicolor/32x32/apps/kcoloredit.png -share/kde/icons/hicolor/32x32/apps/kdvi.png -share/kde/icons/hicolor/32x32/apps/kfax.png -share/kde/icons/hicolor/32x32/apps/kfract.png -share/kde/icons/hicolor/32x32/apps/kghostview.png -share/kde/icons/hicolor/32x32/apps/kiconedit.png -share/kde/icons/hicolor/32x32/apps/kpaint.png -share/kde/icons/hicolor/32x32/apps/kruler.png -share/kde/icons/hicolor/32x32/apps/ksnapshot.png -share/kde/icons/hicolor/32x32/apps/kview.png -share/kde/icons/hicolor/48x48/apps/kdvi.png -share/kde/icons/hicolor/48x48/apps/kfax.png -share/kde/icons/hicolor/48x48/apps/kfract.png -share/kde/icons/hicolor/48x48/apps/kghostview.png -share/kde/icons/hicolor/48x48/apps/kiconedit.png -share/kde/icons/hicolor/48x48/apps/kpaint.png -share/kde/icons/hicolor/48x48/apps/kruler.png -share/kde/icons/hicolor/48x48/apps/ksnapshot.png -share/kde/icons/hicolor/48x48/apps/kview.png -share/kde/icons/locolor/16x16/apps/kcoloredit.png -share/kde/icons/locolor/32x32/apps/kcoloredit.png -@comment dirrm share/kde/icons/locolor/32x32/apps -@comment dirrm share/kde/icons/locolor/16x16/apps -@comment dirrm share/kde/icons/hicolor/48x48/apps -@comment dirrm share/kde/icons/hicolor/32x32/apps -@comment dirrm share/kde/icons/hicolor/16x16/apps -@dirrm share/kde/apps/kviewshell -@dirrm share/kde/apps/kviewerpart -@dirrm share/kde/apps/kview/toolbar -@dirrm share/kde/apps/kview -@dirrm share/kde/apps/kruler -@dirrm share/kde/apps/kpaint/toolbar -@dirrm share/kde/apps/kpaint -@dirrm share/kde/apps/kiconedit/toolbar -@dirrm share/kde/apps/kiconedit/pics -@dirrm share/kde/apps/kiconedit -@dirrm share/kde/apps/kghostview -@dirrm share/kde/apps/kfract -@dirrm share/kde/apps/kfax/pics -@dirrm share/kde/apps/kfax -@dirrm share/kde/apps/kdvi/toolbar -@dirrm share/kde/apps/kdvi -@comment dirrm share/kde/apps -@comment dirrm share/kde/applnk/Toys -@comment dirrm share/kde/applnk/Graphics -@comment dirrm share/kde/applnk/Games/TacticStrategy -@comment dirrm share/kde/applnk/Games/Card -@comment dirrm share/kde/applnk/Games/Board -@comment dirrm share/kde/applnk/Games/Arcade -@dirrm share/doc/kde/HTML/en/kview -@dirrm share/doc/kde/HTML/en/ksnapshot -@dirrm share/doc/kde/HTML/en/kruler -@dirrm share/doc/kde/HTML/en/kpaint -@dirrm share/doc/kde/HTML/en/kiconedit -@dirrm share/doc/kde/HTML/en/kghostview -@dirrm share/doc/kde/HTML/en/kfract -@dirrm share/doc/kde/HTML/en/kdvi -@comment dirrm share/doc/kde/HTML/en diff --git a/graphics/kdegraphics2/distinfo b/graphics/kdegraphics2/distinfo deleted file mode 100644 index e5754d5ac9b..00000000000 --- a/graphics/kdegraphics2/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.7 2002/10/14 11:55:18 markd Exp $ - -SHA1 (kdegraphics-2.2.2.tar.bz2) = c52d921d3a99f52466cfe718cf8562b09d436bb1 -Size (kdegraphics-2.2.2.tar.bz2) = 1648936 bytes -SHA1 (patch-aa) = 2d560cb3eef4bfb5b5685a292696b1e165b44432 -SHA1 (patch-ab) = a074def1950102058f48ce5ec975c786a8c00be1 -SHA1 (patch-ac) = c101876bfd5488d6c651561dceb17189e8ddb0f1 diff --git a/graphics/kdegraphics2/patches/patch-aa b/graphics/kdegraphics2/patches/patch-aa deleted file mode 100644 index e15a24f8fee..00000000000 --- a/graphics/kdegraphics2/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2001/12/03 15:37:16 skrll Exp $ - ---- configure.orig Sat Nov 10 21:12:41 2001 -+++ configure Mon Nov 26 13:47:03 2001 -@@ -11062,6 +11062,7 @@ - sane_includes="-I$ac_sane_includes" - sane_libdir="" - -+ac_sane_includes=NO - if test -n "$ac_sane_includes" && test -r "$ac_sane_includes/sane.h"; then - - sane_libdirs="/usr/lib /usr/local/lib /usr/lib/sane /usr/local/lib/sane" diff --git a/graphics/kdegraphics2/patches/patch-ab b/graphics/kdegraphics2/patches/patch-ab deleted file mode 100644 index c8b9d0fd3b6..00000000000 --- a/graphics/kdegraphics2/patches/patch-ab +++ /dev/null @@ -1,217 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2002/10/14 11:55:17 markd Exp $ - -Index: ps.c -=================================================================== -RCS file: /home/kde/kdegraphics/kghostview/ps.c,v -retrieving revision 1.11 -retrieving revision 1.11.2.1 -diff -u -5 -d -p -r1.11 -r1.11.2.1 ---- kghostview/ps.c 2001/05/04 09:37:49 1.11 -+++ kghostview/ps.c 2002/09/27 02:39:53 1.11.2.1 -@@ -224,11 +224,12 @@ psscan(file) - if (doc == NULL) { - fprintf(stderr, "Fatal Error: Dynamic memory exhausted.\n"); - exit(-1); - } - memset(doc, 0, sizeof(struct document)); -- sscanf(line, "%*s %s", text); -+ sscanf(line, "%*s %256s", text); -+ text[256] = 0; - doc->epsf = iscomment(text, "EPSF-"); - doc->beginheader = position; - section_len = line_len; - } else { - return(NULL); -@@ -248,11 +249,12 @@ psscan(file) - } else if (doc->title == NULL && iscomment(line+2, "Title:")) { - doc->title = gettextline(line+length("%%Title:")); - } else if (doc->date == NULL && iscomment(line+2, "CreationDate:")) { - doc->date = gettextline(line+length("%%CreationDate:")); - } else if (bb_set == NONE && iscomment(line+2, "BoundingBox:")) { -- sscanf(line+length("%%BoundingBox:"), "%s", text); -+ sscanf(line+length("%%BoundingBox:"), "%256s", text); -+ text[256] = 0; - if (strcmp(text, "(atend)") == 0) { - bb_set = ATEND; - } else { - if (sscanf(line+length("%%BoundingBox:"), "%d %d %d %d", - &(doc->boundingbox[LLX]), -@@ -280,11 +282,12 @@ psscan(file) - } - } - } - } else if (orientation_set == NONE && - iscomment(line+2, "Orientation:")) { -- sscanf(line+length("%%Orientation:"), "%s", text); -+ sscanf(line+length("%%Orientation:"), "%256s", text); -+ text[256] = 0; - if (strcmp(text, "(atend)") == 0) { - orientation_set = ATEND; - } else if (strcmp(text, "Portrait") == 0) { - doc->orientation = PORTRAIT; - orientation_set = 1; -@@ -297,11 +300,12 @@ psscan(file) - } else if (strcmp(text, "Seascape") == 0) { - doc->orientation = SEASCAPE; - orientation_set = 1; - } - } else if (page_order_set == NONE && iscomment(line+2, "PageOrder:")) { -- sscanf(line+length("%%PageOrder:"), "%s", text); -+ sscanf(line+length("%%PageOrder:"), "%256s", text); -+ text[256] = 0; - if (strcmp(text, "(atend)") == 0) { - page_order_set = ATEND; - } else if (strcmp(text, "Ascend") == 0) { - doc->pageorder = ASCEND; - page_order_set = 1; -@@ -311,11 +315,12 @@ psscan(file) - } else if (strcmp(text, "Special") == 0) { - doc->pageorder = SPECIAL; - page_order_set = 1; - } - } else if (pages_set == NONE && iscomment(line+2, "Pages:")) { -- sscanf(line+length("%%Pages:"), "%s", text); -+ sscanf(line+length("%%Pages:"), "%256s", text); -+ text[256] = 0; - if (strcmp(text, "(atend)") == 0) { - pages_set = ATEND; - } else { - switch (sscanf(line+length("%%Pages:"), "%d %d", - &maxpages, &i)) { -@@ -560,11 +565,12 @@ psscan(file) - section_len += line_len; - if (!DSCcomment(line)) { - /* Do nothing */ - } else if (doc->default_page_orientation == NONE && - iscomment(line+2, "PageOrientation:")) { -- sscanf(line+length("%%PageOrientation:"), "%s", text); -+ sscanf(line+length("%%PageOrientation:"), "%256s", text); -+ text[256] = 0; - if (strcmp(text, "Portrait") == 0) { - doc->default_page_orientation = PORTRAIT; - } else if (strcmp(text, "Landscape") == 0) { - doc->default_page_orientation = LANDSCAPE; - } else if (strcmp(text, "UpsideDown") == 0) { -@@ -688,11 +694,12 @@ psscan(file) - preread = 0; - if (!DSCcomment(line)) { - /* Do nothing */ - } else if (doc->default_page_orientation == NONE && - iscomment(line+2, "PageOrientation:")) { -- sscanf(line+length("%%PageOrientation:"), "%s", text); -+ sscanf(line+length("%%PageOrientation:"), "%256s", text); -+ text[256] = 0; - if (strcmp(text, "Portrait") == 0) { - doc->default_page_orientation = PORTRAIT; - } else if (strcmp(text, "Landscape") == 0) { - doc->default_page_orientation = LANDSCAPE; - } else if (strcmp(text, "UpsideDown") == 0) { -@@ -814,11 +821,12 @@ continuepage: - section_len += line_len; - if (!DSCcomment(line)) { - /* Do nothing */ - } else if (doc->pages[doc->numpages].orientation == NONE && - iscomment(line+2, "PageOrientation:")) { -- sscanf(line+length("%%PageOrientation:"), "%s", text); -+ sscanf(line+length("%%PageOrientation:"), "%256s", text); -+ text[256] = 0; - if (strcmp(text, "Portrait") == 0) { - doc->pages[doc->numpages].orientation = PORTRAIT; - } else if (strcmp(text, "Landscape") == 0) { - doc->pages[doc->numpages].orientation = LANDSCAPE; - } else if (strcmp(text, "UpsideDown") == 0) { -@@ -850,11 +858,12 @@ continuepage: - } - } - free(cp); - } else if ((page_bb_set == NONE || page_bb_set == ATEND) && - iscomment(line+2, "PageBoundingBox:")) { -- sscanf(line+length("%%PageBoundingBox:"), "%s", text); -+ sscanf(line+length("%%PageBoundingBox:"), "%256s", text); -+ text[256] = 0; - if (strcmp(text, "(atend)") == 0) { - page_bb_set = ATEND; - } else { - if (sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d", - &(doc->pages[doc->numpages].boundingbox[LLX]), -@@ -954,22 +963,24 @@ continuepage: - doc->boundingbox[URY]++; - } - } - } else if (orientation_set == ATEND && - iscomment(line+2, "Orientation:")) { -- sscanf(line+length("%%Orientation:"), "%s", text); -+ sscanf(line+length("%%Orientation:"), "%256s", text); -+ text[256] = 0; - if (strcmp(text, "Portrait") == 0) { - doc->orientation = PORTRAIT; - } else if (strcmp(text, "Landscape") == 0) { - doc->orientation = LANDSCAPE; - } else if (strcmp(text, "UpsideDown") == 0) { - doc->orientation = UPSIDEDOWN; - } else if (strcmp(text, "Seascape") == 0) { - doc->orientation = SEASCAPE; - } - } else if (page_order_set == ATEND && iscomment(line+2, "PageOrder:")) { -- sscanf(line+length("%%PageOrder:"), "%s", text); -+ sscanf(line+length("%%PageOrder:"), "%256s", text); -+ text[256] = 0; - if (strcmp(text, "Ascend") == 0) { - doc->pageorder = ASCEND; - } else if (strcmp(text, "Descend") == 0) { - doc->pageorder = DESCEND; - } else if (strcmp(text, "Special") == 0) { -@@ -1248,13 +1259,16 @@ readline(line, size, fp, position, line_ - *line_len += nbytes; - } - *line_len += nbytes; - strcpy(line, save); - } else if (iscomment(line+7, "Data:")) { -+ int rc = 0; - text[0] = '\0'; - strcpy(save, line+7); -- if (sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text) >= 1) { -+ rc = sscanf(line+length("%%BeginData:"), "%d %*s %256s", &num, text); -+ text[256] = 0; -+ if (rc >= 1) { - if (strcmp(text, "Lines") == 0) { - for (i=0; i < num; i++) { - cp = fgets(line, size, fp); - *line_len += cp ? strlen(line) : 0; - } -@@ -1323,13 +1337,15 @@ pscopy(from, to, begin, end) - fputs(line, to); - - if (!(DSCcomment(line) && iscomment(line+2, "Begin"))) { - /* Do nothing */ - } else if (iscomment(line+7, "Data:")) { -+ int rc = 0; - text[0] = '\0'; -- if (sscanf(line+length("%%BeginData:"), -- "%d %*s %s", &num, text) >= 1) { -+ rc = sscanf(line+length("%%BeginData:"),"%d %*s %256s", &num, text); -+ text[256] = 0; -+ if (rc >= 1) { - if (strcmp(text, "Lines") == 0) { - for (i=0; i < num; i++) { - fgets(line, sizeof line, from); - fputs(line, to); - } -@@ -1403,13 +1419,15 @@ pscopyuntil(from, to, begin, end, commen - } - fputs(line, to); - if (!(DSCcomment(line) && iscomment(line+2, "Begin"))) { - /* Do nothing */ - } else if (iscomment(line+7, "Data:")) { -+ int rc = 0; - text[0] = '\0'; -- if (sscanf(line+length("%%BeginData:"), -- "%d %*s %s", &num, text) >= 1) { -+ rc = sscanf(line+length("%%BeginData:"),"%d %*s %256s", &num, text); -+ text[256] = 0; -+ if (rc >= 1) { - if (strcmp(text, "Lines") == 0) { - for (i=0; i < num; i++) { - fgets(line, sizeof line, from); - fputs(line, to); - } diff --git a/graphics/kdegraphics2/patches/patch-ac b/graphics/kdegraphics2/patches/patch-ac deleted file mode 100644 index b5b2a85137c..00000000000 --- a/graphics/kdegraphics2/patches/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2002/10/14 11:55:17 markd Exp $ - -Index: kgv_miniwidget.cpp -=================================================================== -RCS file: /home/kde/kdegraphics/kghostview/kgv_miniwidget.cpp,v -retrieving revision 1.100.2.2 -retrieving revision 1.100.2.3 -diff -u -5 -d -p -u -r1.100.2.2 -r1.100.2.3 ---- kghostview/kgv_miniwidget.cpp 2001/11/08 00:35:51 1.100.2.2 -+++ kghostview/kgv_miniwidget.cpp 2002/09/27 02:39:53 1.100.2.3 -@@ -527,11 +527,12 @@ bool KGVMiniWidget::psCopyDoc( const QSt - here = ftell( from ); - if( pages_written || pages_atend ) { - free( comment ); - continue; - } -- sscanf( comment + length("%%Pages:" ), "%s", text ); -+ sscanf( comment + length("%%Pages:" ), "%256s", text ); -+ text[256] = 0; - if( strcmp( text, "(atend)" ) == 0 ) { - fputs( comment, to ); - pages_atend = true; - } - else { |