diff options
| author | wiz <wiz@pkgsrc.org> | 2013-08-18 21:29:08 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2013-08-18 21:29:08 +0000 |
| commit | b9105d169ae5c0975996d621575c18b1df8652e9 (patch) | |
| tree | ab695b01b488ab6d8db44c6fa84f4539f7f814f0 | |
| parent | 9ade2f8abf20995d6ef90272da8df296bdfab0c5 (diff) | |
| download | pkgsrc-b9105d169ae5c0975996d621575c18b1df8652e9.tar.gz | |
regen patch with better context
| -rw-r--r-- | wm/icewm/patches/patch-aa | 10 | ||||
| -rw-r--r-- | wm/icewm/patches/patch-ad | 10 | ||||
| -rw-r--r-- | wm/icewm/patches/patch-aj | 10 |
3 files changed, 18 insertions, 12 deletions
diff --git a/wm/icewm/patches/patch-aa b/wm/icewm/patches/patch-aa index a9bfd5718d4..63cd66766d0 100644 --- a/wm/icewm/patches/patch-aa +++ b/wm/icewm/patches/patch-aa @@ -1,8 +1,9 @@ -$NetBSD: patch-aa,v 1.10 2008/06/16 10:17:56 hauke Exp $ +$NetBSD: patch-aa,v 1.11 2013/08/18 21:29:08 wiz Exp $ ---- src/ylocale.cc.orig 2007-12-27 19:16:17.000000000 +0100 -+++ src/ylocale.cc 2008-06-08 15:43:51.000000000 +0200 -@@ -153,5 +153,9 @@ +--- src/ylocale.cc.orig 2008-01-05 07:34:25.000000000 +0000 ++++ src/ylocale.cc +@@ -152,7 +152,11 @@ YUChar *YLocale::unicodeString(const YLC + char * inbuf((char *) lStr), * outbuf((char *) uStr); size_t inlen(lLen), outlen(4 * lLen); +#if defined(__NetBSD__) || defined(__sun) @@ -12,3 +13,4 @@ $NetBSD: patch-aa,v 1.10 2008/06/16 10:17:56 hauke Exp $ +#endif warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno)); + *((YUChar *) outbuf) = 0; diff --git a/wm/icewm/patches/patch-ad b/wm/icewm/patches/patch-ad index 9682c48a968..0d957244736 100644 --- a/wm/icewm/patches/patch-ad +++ b/wm/icewm/patches/patch-ad @@ -1,11 +1,13 @@ -$NetBSD: patch-ad,v 1.9 2008/06/16 10:17:56 hauke Exp $ +$NetBSD: patch-ad,v 1.10 2013/08/18 21:29:08 wiz Exp $ ---- src/Makefile.in.orig 2007-12-27 19:16:17.000000000 +0100 -+++ src/Makefile.in 2008-06-08 15:48:05.000000000 +0200 -@@ -34,5 +34,5 @@ +--- src/Makefile.in.orig 2008-01-05 07:34:24.000000000 +0000 ++++ src/Makefile.in +@@ -33,7 +33,7 @@ DEFS = @DEFS@ \ + -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \ -DICESMEXE='"icewm-session$(EXEEXT)"' \ -DICEHELPEXE='"icehelp$(EXEEXT)"' \ - -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' + -DICEHELPIDX='"$(PREFIX)/share/doc/icewm/html/icewm.html"' CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \ + @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` diff --git a/wm/icewm/patches/patch-aj b/wm/icewm/patches/patch-aj index 585c878a1f4..c851cb22de2 100644 --- a/wm/icewm/patches/patch-aj +++ b/wm/icewm/patches/patch-aj @@ -1,8 +1,9 @@ -$NetBSD: patch-aj,v 1.3 2008/06/16 10:17:56 hauke Exp $ +$NetBSD: patch-aj,v 1.4 2013/08/18 21:29:08 wiz Exp $ ---- src/aapm.cc.orig 2007-12-27 19:16:17.000000000 +0100 -+++ src/aapm.cc 2008-06-08 15:50:01.000000000 +0200 -@@ -39,6 +39,10 @@ +--- src/aapm.cc.orig 2008-01-05 07:34:24.000000000 +0000 ++++ src/aapm.cc +@@ -38,8 +38,12 @@ + #include <sys/file.h> #include <sys/ioctl.h> #include <sys/types.h> +#ifdef __sparcv9 @@ -13,3 +14,4 @@ $NetBSD: patch-aj,v 1.3 2008/06/16 10:17:56 hauke Exp $ +#endif YColor *YApm::apmBg = 0; + YColor *YApm::apmFg = 0; |