1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
Description: Load system-wide application defaults from /etc/X11/app-defaults
Section 11.8.6 of the Debian policy requires all application defaults to be
stored under /etc/X11/app-defaults.
Forwarded: not-needed
Author: Decklin Foster <decklin@red-bean.com>
Origin: vendor
Bug-Debian: http://bugs.debian.org/348697
Reviewed-By: Ryan Kavanagh <ryanakca@kubuntu.org>
Last-Update: 2011-02-24
Index: pkg-urxvt/src/rxvttoolkit.C
===================================================================
--- pkg-urxvt.orig/src/rxvttoolkit.C 2011-06-22 07:29:47.498793478 -0400
+++ pkg-urxvt/src/rxvttoolkit.C 2011-06-22 07:29:50.806809887 -0400
@@ -326,13 +326,15 @@
// 6. System wide per application default file.
/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
- if ((xe = getenv ("XAPPLRESDIR")))
+ if (!(xe = getenv ("XAPPLRESDIR")))
{
- snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
-
- if ((rdb1 = XrmGetFileDatabase (fname)))
- XrmMergeDatabases (rdb1, &database);
+ // Debian-specific; see #348697 and Policy
+ xe = "/etc/X11/app-defaults";
}
+ snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
+
+ if ((rdb1 = XrmGetFileDatabase (fname)))
+ XrmMergeDatabases (rdb1, &database);
// 5. User's per application default file.
// none
|
