Sun Aug 18 21:29:08 2013 UTC ()
regen patch with better context


(wiz)
diff -r1.10 -r1.11 pkgsrc/wm/icewm/patches/patch-aa
diff -r1.9 -r1.10 pkgsrc/wm/icewm/patches/patch-ad
diff -r1.3 -r1.4 pkgsrc/wm/icewm/patches/patch-aj
cvs diff -r1.10 -r1.11 pkgsrc/wm/icewm/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/wm/icewm/patches/patch-aa 2008/06/16 10:17:56 1.10
+++ pkgsrc/wm/icewm/patches/patch-aa 2013/08/18 21:29:08 1.11
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.10 2008/06/16 10:17:56 hauke Exp $ 1$NetBSD: patch-aa,v 1.11 2013/08/18 21:29:08 wiz Exp $
2 2
3--- src/ylocale.cc.orig 2007-12-27 19:16:17.000000000 +0100 3--- src/ylocale.cc.orig 2008-01-05 07:34:25.000000000 +0000
4+++ src/ylocale.cc 2008-06-08 15:43:51.000000000 +0200 4+++ src/ylocale.cc
5@@ -153,5 +153,9 @@ 5@@ -152,7 +152,11 @@ YUChar *YLocale::unicodeString(const YLC
 6 char * inbuf((char *) lStr), * outbuf((char *) uStr);
6 size_t inlen(lLen), outlen(4 * lLen); 7 size_t inlen(lLen), outlen(4 * lLen);
7  8
8+#if defined(__NetBSD__) || defined(__sun) 9+#if defined(__NetBSD__) || defined(__sun)
9+ if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen)) 10+ if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen))
10+#else 11+#else
11 if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen)) 12 if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
12+#endif 13+#endif
13 warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno)); 14 warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));
14  15
 16 *((YUChar *) outbuf) = 0;
cvs diff -r1.9 -r1.10 pkgsrc/wm/icewm/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/wm/icewm/patches/patch-ad 2008/06/16 10:17:56 1.9
+++ pkgsrc/wm/icewm/patches/patch-ad 2013/08/18 21:29:08 1.10
@@ -1,11 +1,13 @@ @@ -1,11 +1,13 @@
1$NetBSD: patch-ad,v 1.9 2008/06/16 10:17:56 hauke Exp $ 1$NetBSD: patch-ad,v 1.10 2013/08/18 21:29:08 wiz Exp $
2 2
3--- src/Makefile.in.orig 2007-12-27 19:16:17.000000000 +0100 3--- src/Makefile.in.orig 2008-01-05 07:34:24.000000000 +0000
4+++ src/Makefile.in 2008-06-08 15:48:05.000000000 +0200 4+++ src/Makefile.in
5@@ -34,5 +34,5 @@ 5@@ -33,7 +33,7 @@ DEFS = @DEFS@ \
 6 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
6 -DICESMEXE='"icewm-session$(EXEEXT)"' \ 7 -DICESMEXE='"icewm-session$(EXEEXT)"' \
7 -DICEHELPEXE='"icehelp$(EXEEXT)"' \ 8 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
8- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' 9- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
9+ -DICEHELPIDX='"$(PREFIX)/share/doc/icewm/html/icewm.html"' 10+ -DICEHELPIDX='"$(PREFIX)/share/doc/icewm/html/icewm.html"'
10  11
11 CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \ 12 CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \
 13 @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
cvs diff -r1.3 -r1.4 pkgsrc/wm/icewm/patches/patch-aj (expand / switch to unified diff)

--- pkgsrc/wm/icewm/patches/patch-aj 2008/06/16 10:17:56 1.3
+++ pkgsrc/wm/icewm/patches/patch-aj 2013/08/18 21:29:08 1.4
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: patch-aj,v 1.3 2008/06/16 10:17:56 hauke Exp $ 1$NetBSD: patch-aj,v 1.4 2013/08/18 21:29:08 wiz Exp $
2 2
3--- src/aapm.cc.orig 2007-12-27 19:16:17.000000000 +0100 3--- src/aapm.cc.orig 2008-01-05 07:34:24.000000000 +0000
4+++ src/aapm.cc 2008-06-08 15:50:01.000000000 +0200 4+++ src/aapm.cc
5@@ -39,6 +39,10 @@ 5@@ -38,8 +38,12 @@
 6 #include <sys/file.h>
6 #include <sys/ioctl.h> 7 #include <sys/ioctl.h>
7 #include <sys/types.h> 8 #include <sys/types.h>
8+#ifdef __sparcv9 9+#ifdef __sparcv9
9+#include <sparc/apmvar.h> 10+#include <sparc/apmvar.h>
10+#else 11+#else
11 #include <machine/apmvar.h> 12 #include <machine/apmvar.h>
12 #endif 13 #endif
13+#endif 14+#endif
14  15
15 YColor *YApm::apmBg = 0; 16 YColor *YApm::apmBg = 0;
 17 YColor *YApm::apmFg = 0;