Attachment #64618 for bug #96012

View | Details | Raw Unified | Return to bug 96012
Collapse All | Expand All

Lines 6-12 Link Here

(-)x11-wm/icewm/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= icewm	8	PORTNAME= icewm
9	PORTVERSION= 1.2.25	9	PORTVERSION= 1.2.26
10	CATEGORIES= x11-wm	10	CATEGORIES= x11-wm
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 17-23 Link Here
17	USE_X_PREFIX= yes	17	USE_X_PREFIX= yes
18	WANT_GNOME= yes	18	WANT_GNOME= yes
19	USE_GNOME= gnometarget	19	USE_GNOME= gnometarget
20	USE_REINPLACE= yes
21	USE_GMAKE= yes	20	USE_GMAKE= yes
22	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
23	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \	22	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \

Lines 1-3 Link Here

(-)x11-wm/icewm/distinfo (-3 / +3 lines)
1	MD5 (icewm-1.2.25.tar.gz) = af69d095a6c6fba1f73f80e966bc4459	1	MD5 (icewm-1.2.26.tar.gz) = 097b12d3f8e0f57a964e4821bc1825ed
2	SHA256 (icewm-1.2.25.tar.gz) = b0971c6f79a1642eda06cdb79e022a05168f8031e408cc96e367318c9c5f97fa	2	SHA256 (icewm-1.2.26.tar.gz) = 96ed51cbaead5bd8c33522be5bf0baac4c051db0a826f764eb8528b2ec0c5497
3	SIZE (icewm-1.2.25.tar.gz) = 1042790	3	SIZE (icewm-1.2.26.tar.gz) = 1042824

Lines 1-7 Link Here

(-)x11-wm/icewm/files/patch-src_ylocale.cc (-5 / +9 lines)
1	--- src/ylocale.cc.orig Wed Apr 21 05:06:34 2004	1	--- src/ylocale.cc.orig Mon Apr 17 01:12:31 2006
2	+++ src/ylocale.cc Sun Apr 25 19:40:07 2004	2	+++ src/ylocale.cc Mon Apr 17 16:19:46 2006
3	@@ -149,7 +149,8 @@	3	@@ -149,10 +149,11 @@
4	return NULL;	4	return NULL;
5		5
6	YUChar * uStr(new YUChar[lLen + 1]);	6	YUChar * uStr(new YUChar[lLen + 1]);
7	- char * inbuf((char ) lStr), outbuf((char *) uStr);	7	- char * inbuf((char ) lStr), outbuf((char *) uStr);
Lines 9-12 Link Here
9	+ char * outbuf((char *) uStr);	9	+ char * outbuf((char *) uStr);
10	size_t inlen(lLen), outlen(4 * lLen);	10	size_t inlen(lLen), outlen(4 * lLen);
11		11
12	if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))	12	- if (0 > (int) iconv(instance->toUnicode, const_cast<char **>(&inbuf), &inlen, &outbuf, &outlen))
		13	+ if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
		14	warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));
		15
		16	((YUChar ) outbuf) = 0;

Return to bug 96012