diff options
-rw-r--r-- | graphics/xpaint/Makefile | 4 | ||||
-rw-r--r-- | graphics/xpaint/distinfo | 4 | ||||
-rw-r--r-- | graphics/xpaint/patches/patch-ai | 44 |
3 files changed, 43 insertions, 9 deletions
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index dbb8c0e25c0..368a142cdcf 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2011/01/13 13:38:23 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2011/07/14 09:52:59 shattered Exp $ DISTNAME= xpaint-2.7.8.1 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sf-xpaint/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo index b2e6b757920..4cc45582ea9 100644 --- a/graphics/xpaint/distinfo +++ b/graphics/xpaint/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2008/03/21 22:22:20 is Exp $ +$NetBSD: distinfo,v 1.20 2011/07/14 09:52:59 shattered Exp $ SHA1 (xpaint-2.7.8.1.tar.bz2) = d225254cc15cbc166c392b112b57104657a33aaa RMD160 (xpaint-2.7.8.1.tar.bz2) = 8efca6ff71df8635b8ed50e0c6db2b81f2e068cf @@ -10,4 +10,4 @@ SHA1 (patch-ad) = a9223ef202e8fb00186be09d2ae6ae8d5d9968cc SHA1 (patch-ae) = 5ecb812e962701a6d5f068bb7744c5115b2eb263 SHA1 (patch-af) = 73f1289ca104f4c53e8d184251d5a84c5c1ec7ab SHA1 (patch-ag) = 5191cb57084a746fec33dec105a8fe1750c6d8ae -SHA1 (patch-ai) = 50ba8703cf135d81411902110716697032b529d7 +SHA1 (patch-ai) = 38f3532befe2c58cc11d0e055765b6098bbdd9f5 diff --git a/graphics/xpaint/patches/patch-ai b/graphics/xpaint/patches/patch-ai index 2d1a65f14ef..3256afefbe6 100644 --- a/graphics/xpaint/patches/patch-ai +++ b/graphics/xpaint/patches/patch-ai @@ -1,6 +1,6 @@ -$NetBSD: patch-ai,v 1.1 2008/03/21 22:22:21 is Exp $ +$NetBSD: patch-ai,v 1.2 2011/07/14 09:52:59 shattered Exp $ ---- graphic.c.orig 2005-09-02 23:31:56.000000000 +0200 +--- graphic.c.orig 2005-09-02 21:31:56.000000000 +0000 +++ graphic.c @@ -33,7 +33,7 @@ #include "xaw_incdir/SmeBSB.h" @@ -11,7 +11,41 @@ $NetBSD: patch-ai,v 1.1 2008/03/21 22:22:21 is Exp $ #include <xpm.h> #ifdef HAVE_COLTOG -@@ -3606,7 +3606,7 @@ graphicCreate(Widget shell, int width, i +@@ -119,7 +119,8 @@ static char *fontNames[] = { + "-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*", /* Lucida 12 */ + "-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*", /* Helvetica 12 */ + "-*-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*", /* Helvetica Bold 12 */ +-"-*-fixed-medium-r-normal-*-*-120-*-*-m-*-*-*", /* Fixed 12 */ ++"-*-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1", /* Sony 16 */ ++"-*-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1", /* Sony 24 */ + "-*-courier-medium-r-normal-*-*-120-*-*-m-*-*-*" /* Courier 12 */ + }; + +@@ -262,8 +263,9 @@ static PaintMenuItem fontMenu[] = + MI_FLAGCB("Lucida 12", MF_CHECK | MF_GROUP1, fontSet, 6), + MI_FLAGCB("Helvetica 12", MF_CHECK | MF_GROUP1, fontSet, 7), + MI_FLAGCB("Helvetica Bold 12", MF_CHECK | MF_GROUP1, fontSet, 8), +- MI_FLAGCB("Fixed 12", MF_CHECK | MF_GROUP1, fontSet, 9), +- MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 10), ++ MI_FLAGCB("Sony 16", MF_CHECK | MF_GROUP1, fontSet, 9), ++ MI_FLAGCB("Sony 24", MF_CHECK | MF_GROUP1, fontSet, 10), ++ MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 11), + MI_SEPARATOR(), + MI_FLAGCB("select", MF_CHECK | MF_GROUP1, fontSet, NULL), + }; +@@ -515,8 +517,9 @@ static PaintMenuItem popupFontMenu[] = + MI_FLAGCB("Lucida 12", MF_CHECK | MF_GROUP1, fontSet, 6), + MI_FLAGCB("Helvetica 12", MF_CHECK | MF_GROUP1, fontSet, 7), + MI_FLAGCB("Helvetica Bold 12", MF_CHECK | MF_GROUP1, fontSet, 8), +- MI_FLAGCB("Fixed 12", MF_CHECK | MF_GROUP1, fontSet, 9), +- MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 10), ++ MI_FLAGCB("Sony 16", MF_CHECK | MF_GROUP1, fontSet, 9), ++ MI_FLAGCB("Sony 24", MF_CHECK | MF_GROUP1, fontSet, 10), ++ MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 11), + MI_SEPARATOR(), + MI_FLAGCB("select", MF_CHECK | MF_GROUP1, fontSet, NULL), + }; +@@ -3606,7 +3609,7 @@ graphicCreate(Widget shell, int width, i #endif } } @@ -20,7 +54,7 @@ $NetBSD: patch-ai,v 1.1 2008/03/21 22:22:21 is Exp $ return paint; } -@@ -4145,7 +4145,7 @@ stdPasteCB(Widget paint, XtPointer infoA +@@ -4145,7 +4148,7 @@ stdPasteCB(Widget paint, XtPointer infoA PwRegionSet(paint, &rect, pix, newMask); } @@ -29,7 +63,7 @@ $NetBSD: patch-ai,v 1.1 2008/03/21 22:22:21 is Exp $ } void -@@ -4282,7 +4282,7 @@ StdSelectAllCallback(Widget w, XtPointer +@@ -4282,7 +4285,7 @@ StdSelectAllCallback(Widget w, XtPointer rect.height = dh; PwRegionSet(paint, &rect, None, None); |