Please allow dwm 2.1-3
Hi,
there was another utf issue addressed in dwm 2.7, please allow the
upload of dwm 2.1-3 to testing with the backported fix, debdiff is attached.
--
Address: Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist
Email: daniel.baumann@panthera-systems.net
Internet: http://people.panthera-systems.net/~daniel-baumann/
diff -u dwm-2.1/debian/patches/00list dwm-2.1/debian/patches/00list
--- dwm-2.1/debian/patches/00list
+++ dwm-2.1/debian/patches/00list
@@ -1,2 +1,3 @@
01-x-terminal-emulator
+98-utf
99-utf
diff -u dwm-2.1/debian/patches/99-utf.dpatch dwm-2.1/debian/patches/99-utf.dpatch
--- dwm-2.1/debian/patches/99-utf.dpatch
+++ dwm-2.1/debian/patches/99-utf.dpatch
@@ -4,84 +4,21 @@
-## DP: Fixes utf support.
+## DP: Fixes utf support (taken from dwm 2.7).
@DPATCH@
-diff -Naur dwm-2.1.orig/config.default.h dwm-2.1/config.default.h
---- dwm-2.1.orig/config.default.h 2006-11-02 09:18:01.000000000 +0000
-+++ dwm-2.1/config.default.h 2006-12-12 10:54:19.000000000 +0000
-@@ -9,7 +9,7 @@
- #define FLOATSYMBOL "><>"
- #define TILESYMBOL "[]="
-
--#define FONT "fixed"
-+#define FONT "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
- #define NORMBGCOLOR "#333366"
- #define NORMFGCOLOR "#cccccc"
- #define SELBGCOLOR "#666699"
diff -Naur dwm-2.1.orig/draw.c dwm-2.1/draw.c
---- dwm-2.1.orig/draw.c 2006-11-02 09:18:01.000000000 +0000
-+++ dwm-2.1/draw.c 2006-12-12 10:54:50.000000000 +0000
-@@ -4,7 +4,6 @@
- #include "dwm.h"
- #include <stdio.h>
- #include <string.h>
--#include <X11/Xlocale.h>
-
- /* static */
-
-@@ -149,7 +148,6 @@
- int i, n;
-
- missing = NULL;
-- setlocale(LC_ALL, "");
- if(dc.font.set)
- XFreeFontSet(dpy, dc.font.set);
- dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-@@ -157,10 +155,6 @@
- while(n--)
- fprintf(stderr, "missing fontset: %s\n", missing[n]);
- XFreeStringList(missing);
-- if(dc.font.set) {
-- XFreeFontSet(dpy, dc.font.set);
-- dc.font.set = NULL;
-- }
+--- dwm-2.1.orig/draw.c 2006-12-16 15:31:39.000000000 +0000
++++ dwm-2.1/draw.c 2006-12-16 15:31:28.000000000 +0000
+@@ -175,11 +175,8 @@
+ if(dc.font.xfont)
+ XFreeFont(dpy, dc.font.xfont);
+ dc.font.xfont = NULL;
+- dc.font.xfont = XLoadQueryFont(dpy, fontstr);
+- if (!dc.font.xfont)
+- dc.font.xfont = XLoadQueryFont(dpy, "fixed");
+- if (!dc.font.xfont)
+- eprint("error, cannot init 'fixed' font\n");
++ if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
++ eprint("error, cannot load font: '%s'\n", fontstr);
+ dc.font.ascent = dc.font.xfont->ascent;
+ dc.font.descent = dc.font.xfont->descent;
}
- if(dc.font.set) {
- XFontSetExtents *font_extents;
-diff -Naur dwm-2.1.orig/main.c dwm-2.1/main.c
---- dwm-2.1.orig/main.c 2006-11-02 09:18:01.000000000 +0000
-+++ dwm-2.1/main.c 2006-12-12 10:56:07.000000000 +0000
-@@ -4,6 +4,7 @@
-
- #include "dwm.h"
- #include <errno.h>
-+#include <locale.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -51,6 +52,9 @@
- XFreePixmap(dpy, dc.drawable);
- XFreeGC(dpy, dc.gc);
- XDestroyWindow(dpy, barwin);
-+ XFreeCursor(dpy, cursor[CurNormal]);
-+ XFreeCursor(dpy, cursor[CurResize]);
-+ XFreeCursor(dpy, cursor[CurMove]);
- XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
- XSync(dpy, False);
- free(seltag);
-@@ -104,7 +108,7 @@
- numlockmask = (1 << i);
- }
- }
-- XFree(modmap);
-+ XFreeModifiermap(modmap);
- /* select for events */
- wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
- | EnterWindowMask | LeaveWindowMask;
-@@ -230,6 +234,7 @@
- }
- else if(argc != 1)
- eprint("usage: dwm [-v]\n");
-+ setlocale(LC_CTYPE, "");
- dpy = XOpenDisplay(0);
- if(!dpy)
- eprint("dwm: cannot open display\n");
diff -u dwm-2.1/debian/changelog dwm-2.1/debian/changelog
--- dwm-2.1/debian/changelog
+++ dwm-2.1/debian/changelog
@@ -1,3 +1,10 @@
+dwm (2.1-3) testing; urgency=medium
+
+ * For consistency, renamed 99-utf.dpatch to 98-utf.dpatch.
+ * Added a new 99-utf.dpatch from dwm 2.7 to fix further utf issues.
+
+ -- Daniel Baumann <daniel@debian.org> Sat, 16 Dec 2006 16:28:00 +0100
+
dwm (2.1-2) testing; urgency=medium
* Applied 99-utf.patch from dwm 2.6 to fix utf support (Closes: #402671).
only in patch2:
unchanged:
--- dwm-2.1.orig/debian/patches/98-utf.dpatch
+++ dwm-2.1/debian/patches/98-utf.dpatch
@@ -0,0 +1,87 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 98-utf.dpatch by Anselm R. Garbe <garbeam@gmail.com>
+##
+## DP: Fixes utf support (taken from dwm 2.6).
+
+@DPATCH@
+
+diff -Naur dwm-2.1.orig/config.default.h dwm-2.1/config.default.h
+--- dwm-2.1.orig/config.default.h 2006-11-02 09:18:01.000000000 +0000
++++ dwm-2.1/config.default.h 2006-12-12 10:54:19.000000000 +0000
+@@ -9,7 +9,7 @@
+ #define FLOATSYMBOL "><>"
+ #define TILESYMBOL "[]="
+
+-#define FONT "fixed"
++#define FONT "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
+ #define NORMBGCOLOR "#333366"
+ #define NORMFGCOLOR "#cccccc"
+ #define SELBGCOLOR "#666699"
+diff -Naur dwm-2.1.orig/draw.c dwm-2.1/draw.c
+--- dwm-2.1.orig/draw.c 2006-11-02 09:18:01.000000000 +0000
++++ dwm-2.1/draw.c 2006-12-12 10:54:50.000000000 +0000
+@@ -4,7 +4,6 @@
+ #include "dwm.h"
+ #include <stdio.h>
+ #include <string.h>
+-#include <X11/Xlocale.h>
+
+ /* static */
+
+@@ -149,7 +148,6 @@
+ int i, n;
+
+ missing = NULL;
+- setlocale(LC_ALL, "");
+ if(dc.font.set)
+ XFreeFontSet(dpy, dc.font.set);
+ dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+@@ -157,10 +155,6 @@
+ while(n--)
+ fprintf(stderr, "missing fontset: %s\n", missing[n]);
+ XFreeStringList(missing);
+- if(dc.font.set) {
+- XFreeFontSet(dpy, dc.font.set);
+- dc.font.set = NULL;
+- }
+ }
+ if(dc.font.set) {
+ XFontSetExtents *font_extents;
+diff -Naur dwm-2.1.orig/main.c dwm-2.1/main.c
+--- dwm-2.1.orig/main.c 2006-11-02 09:18:01.000000000 +0000
++++ dwm-2.1/main.c 2006-12-12 10:56:07.000000000 +0000
+@@ -4,6 +4,7 @@
+
+ #include "dwm.h"
+ #include <errno.h>
++#include <locale.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -51,6 +52,9 @@
+ XFreePixmap(dpy, dc.drawable);
+ XFreeGC(dpy, dc.gc);
+ XDestroyWindow(dpy, barwin);
++ XFreeCursor(dpy, cursor[CurNormal]);
++ XFreeCursor(dpy, cursor[CurResize]);
++ XFreeCursor(dpy, cursor[CurMove]);
+ XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+ XSync(dpy, False);
+ free(seltag);
+@@ -104,7 +108,7 @@
+ numlockmask = (1 << i);
+ }
+ }
+- XFree(modmap);
++ XFreeModifiermap(modmap);
+ /* select for events */
+ wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
+ | EnterWindowMask | LeaveWindowMask;
+@@ -230,6 +234,7 @@
+ }
+ else if(argc != 1)
+ eprint("usage: dwm [-v]\n");
++ setlocale(LC_CTYPE, "");
+ dpy = XOpenDisplay(0);
+ if(!dpy)
+ eprint("dwm: cannot open display\n");
Reply to: