Hi Marcelo, I've prepared a 0-day NMU for this bug, based on Timo's patch. The full diff is attached. I made an abortive attempt to use "variable" as the fallback instead of "fixed", since that seemed more in line with the use of helvetica; but it turns out that the "variable" font alias in xfonts-base *points* to helvetica, which is not part of xfonts-base and therefore cannot be relied on. The NMU will be uploaded shortly. -release: please approve wmaker_0.91.0-7.1 for sarge, fixing this RC bug. Cheers, -- Steve Langasek postmodern programmer
reverted:
--- wmaker-0.91.0/debian/patches/40_switchpanel.diff
+++ wmaker-0.91.0.orig/debian/patches/40_switchpanel.diff
@@ -1,11 +0,0 @@
---- wmaker-0.91.0/src/switchpanel.c 2004-10-26 03:13:50.000000000 +0200
-+++ switchpanel.c 2005-01-07 19:13:47.000000000 +0100
-@@ -687,7 +687,7 @@
- }
-
- if (focus < 0)
-- focus= 0;
-+ return NULL;
-
- if (focus >= 0 && panel->current != focus) {
- WWindow *wwin;
diff -u wmaker-0.91.0/debian/patches/60_optional_switch_panel.diff wmaker-0.91.0/debian/patches/60_optional_switch_panel.diff
--- wmaker-0.91.0/debian/patches/60_optional_switch_panel.diff
+++ wmaker-0.91.0/debian/patches/60_optional_switch_panel.diff
@@ -215,7 +215,7 @@
}
-
- if (focus < 0)
-- return NULL;
+- focus= 0;
-
- if (focus >= 0 && panel->current != focus) {
- WWindow *wwin;
diff -u wmaker-0.91.0/debian/changelog wmaker-0.91.0/debian/changelog
--- wmaker-0.91.0/debian/changelog
+++ wmaker-0.91.0/debian/changelog
@@ -1,3 +1,17 @@
+wmaker (0.91.0-7.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for sarge-targetted RC bugfix.
+ * Make sure wmaker falls back to "fixed" in the absence of gsfonts-x11,
+ since X clients can't depend directly on font packages for their
+ operation. Thanks to Timo Lindfors for finding this bug.
+ Closes: #279489.
+ * Remove debian/patches/40_switchpanel.diff, which conflicts with
+ debian/patches/60_switchpanel.diff; merge the patches together,
+ otherwise dpatch doesn't unpatch cleanly in the "clean" target.
+
+ -- Steve Langasek <vorlon@debian.org> Wed, 11 May 2005 22:56:50 -0700
+
wmaker (0.91.0-7) unstable; urgency=low
* debian/rules: move the ugly hack earlier in the rules, I'm stepping
only in patch2:
unchanged:
--- wmaker-0.91.0.orig/src/screen.c
+++ wmaker-0.91.0/src/screen.c
@@ -808,6 +808,8 @@
scr->info_text_font = WMBoldSystemFontOfSize(scr->wmscreen, 12);
scr->tech_draw_font= XLoadQueryFont(dpy, "-adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*");
+ if (scr->tech_draw_font == NULL) /* fallback to our guaranteed font */
+ scr->tech_draw_font == XLoadQueryFont(dpy, "fixed");
scr->gview = WCreateGeometryView(scr->wmscreen);
WMRealizeWidget(scr->gview);
Attachment:
signature.asc
Description: Digital signature