Attachment 64618 Details for Bug 96012 – file.diff

[patch] file.diff

file.diff (text/plain), 2.22 KB, created by tkato432 on 2006-04-18 17:10:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2006-04-18 17:10:18 UTC

Size: 2.22 KB

patch

obsolete

>diff -urN /usr/ports/x11-wm/icewm/Makefile x11-wm/icewm/Makefile
>--- /usr/ports/x11-wm/icewm/Makefile	Mon Feb 13 22:49:56 2006
>+++ x11-wm/icewm/Makefile	Mon Apr 17 16:06:40 2006
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	icewm
>-PORTVERSION=	1.2.25
>+PORTVERSION=	1.2.26
> CATEGORIES=	x11-wm
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -17,7 +17,6 @@
> USE_X_PREFIX=	yes
> WANT_GNOME=	yes
> USE_GNOME=	gnometarget
>-USE_REINPLACE=	yes
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
>diff -urN /usr/ports/x11-wm/icewm/distinfo x11-wm/icewm/distinfo
>--- /usr/ports/x11-wm/icewm/distinfo	Mon Feb 13 22:49:56 2006
>+++ x11-wm/icewm/distinfo	Mon Apr 17 16:10:03 2006
>@@ -1,3 +1,3 @@
>-MD5 (icewm-1.2.25.tar.gz) = af69d095a6c6fba1f73f80e966bc4459
>-SHA256 (icewm-1.2.25.tar.gz) = b0971c6f79a1642eda06cdb79e022a05168f8031e408cc96e367318c9c5f97fa
>-SIZE (icewm-1.2.25.tar.gz) = 1042790
>+MD5 (icewm-1.2.26.tar.gz) = 097b12d3f8e0f57a964e4821bc1825ed
>+SHA256 (icewm-1.2.26.tar.gz) = 96ed51cbaead5bd8c33522be5bf0baac4c051db0a826f764eb8528b2ec0c5497
>+SIZE (icewm-1.2.26.tar.gz) = 1042824
>diff -urN /usr/ports/x11-wm/icewm/files/patch-src_ylocale.cc x11-wm/icewm/files/patch-src_ylocale.cc
>--- /usr/ports/x11-wm/icewm/files/patch-src_ylocale.cc	Mon May 24 16:57:28 2004
>+++ x11-wm/icewm/files/patch-src_ylocale.cc	Mon Apr 17 16:20:58 2006
>@@ -1,7 +1,7 @@
>---- src/ylocale.cc.orig	Wed Apr 21 05:06:34 2004
>-+++ src/ylocale.cc	Sun Apr 25 19:40:07 2004
>-@@ -149,7 +149,8 @@
>- 	return NULL;
>+--- src/ylocale.cc.orig	Mon Apr 17 01:12:31 2006
>++++ src/ylocale.cc	Mon Apr 17 16:19:46 2006
>+@@ -149,10 +149,11 @@
>+         return NULL;
>  
>      YUChar * uStr(new YUChar[lLen + 1]);
> -    char * inbuf((char *) lStr), * outbuf((char *) uStr);
>@@ -9,4 +9,8 @@
> +    char * outbuf((char *) uStr);
>      size_t inlen(lLen), outlen(4 * lLen);
>  
>-     if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
>+-    if (0 > (int) iconv(instance->toUnicode, const_cast<char **>(&inbuf), &inlen, &outbuf, &outlen))
>++    if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
>+         warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));
>+ 
>+     *((YUChar *) outbuf) = 0;

Actions: View | Diff

Attachments on bug 96012: 64618