diff options
| author | mbalmer <mbalmer@pkgsrc.org> | 2013-06-23 09:30:14 +0000 |
|---|---|---|
| committer | mbalmer <mbalmer@pkgsrc.org> | 2013-06-23 09:30:14 +0000 |
| commit | dd8e8d937284a466f840398d13c5b551f2745ae0 (patch) | |
| tree | cf89eeff8176f0379a849182d332c5c1b8ea9226 /editors | |
| parent | 09348703c34736558f7f8661ade33442ecbdaebe (diff) | |
| download | pkgsrc-dd8e8d937284a466f840398d13c5b551f2745ae0.tar.gz | |
Add a patch from Red Hat to set the default visual. This avoids crashes
when saving the defaults and should fix PR pkg/47777
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/nedit/Makefile | 4 | ||||
| -rw-r--r-- | editors/nedit/distinfo | 3 | ||||
| -rw-r--r-- | editors/nedit/patches/patch-util_misc.c | 14 |
3 files changed, 18 insertions, 3 deletions
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index cdcb4bf382d..f3b2a274651 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.52 2013/04/28 20:35:22 dholland Exp $ +# $NetBSD: Makefile,v 1.53 2013/06/23 09:30:14 mbalmer Exp $ DISTNAME= nedit-${VERS}-src PKGNAME= nedit-${VERS} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_NEDIT:=v${VERS:S/./_/g}/} \ ${MASTER_SITE_SOURCEFORGE:=nedit/} diff --git a/editors/nedit/distinfo b/editors/nedit/distinfo index 9eaa97b053a..11dfec8d63e 100644 --- a/editors/nedit/distinfo +++ b/editors/nedit/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2013/04/28 20:35:22 dholland Exp $ +$NetBSD: distinfo,v 1.14 2013/06/23 09:30:14 mbalmer Exp $ SHA1 (nedit-5.5-src.tar.bz2) = 7d3c87a793a5047cf857af1ac82e39f3b33e8a87 RMD160 (nedit-5.5-src.tar.bz2) = 93fce64bdc5d8a9eff86ab76cec67d44d676d0eb @@ -22,4 +22,5 @@ SHA1 (patch-source_textDisp.c) = 84e3631eb7076c77704390ac6aee66b27d0422f3 SHA1 (patch-source_textDrag.c) = 8b66f1bb80bbc2b3cf3751ff7c601ded34b54646 SHA1 (patch-source_userCmds.c) = 22c6468cffd2cd0d10af03452a2c14d63e893cbe SHA1 (patch-source_window.c) = 72fda2bf7cc178ec57f38d25915dab8a8765874d +SHA1 (patch-util_misc.c) = 0ffbf0bff39ef819f85ac7c9d1aa3cf440ba3594 SHA1 (patch-util_prefFile.c) = 4accc0a25c7744076a7f8ee72c0a04328f0db915 diff --git a/editors/nedit/patches/patch-util_misc.c b/editors/nedit/patches/patch-util_misc.c new file mode 100644 index 00000000000..87434ed3fe8 --- /dev/null +++ b/editors/nedit/patches/patch-util_misc.c @@ -0,0 +1,14 @@ +--- util/misc.c.orig 2013-06-23 11:14:52.000000000 +0200 ++++ util/misc.c 2013-06-23 11:16:27.000000000 +0200 +@@ -383,7 +383,10 @@ Boolean FindBestVisual(Display *display, + *colormap = cachedColormap; + return (*visual == DefaultVisual(display, screen)); + } +- ++ ++ /* Set "Default" visual to avoid crashes with the detected best ones */ ++ reqID = DefaultVisual(display, screen)->visualid; ++ + /* Read the visualID and installColormap resources for the application. + visualID can be specified either as a number (the visual id as + shown by xdpyinfo), as a visual class name, or as Best or Default. */ |