summaryrefslogtreecommitdiff
path: root/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2011-04-25 13:37:00 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 22:45:18 +0200
commit75a4a592e5ccda30715f93563d741b83e0dcf39e (patch)
tree502f745607e77a2c4386ad38d818ddcafe81489c /source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff
parentb76270bf9e6dd375e495fec92140a79a79415d27 (diff)
downloadcurrent-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.gz
Slackware 13.37slackware-13.37
Mon Apr 25 13:37:00 UTC 2011 Slackware 13.37 x86_64 stable is released! Thanks to everyone who pitched in on this release: the Slackware team, the folks producing upstream code, and linuxquestions.org for providing a great forum for collaboration and testing. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. As always, thanks to the Slackware community for testing, suggestions, and feedback. :-) Have fun!
Diffstat (limited to 'source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff')
-rw-r--r--source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff11
1 files changed, 11 insertions, 0 deletions
diff --git a/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff b/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff
new file mode 100644
index 00000000..fde47a9e
--- /dev/null
+++ b/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff
@@ -0,0 +1,11 @@
+diff -Nur xfce-utils-4.6.2.orig//scripts/xinitrc.in.in xfce-utils-4.6.2/scripts/xinitrc.in.in
+--- xfce-utils-4.6.2.orig//scripts/xinitrc.in.in 2010-05-21 11:56:26.000000000 -0500
++++ xfce-utils-4.6.2/scripts/xinitrc.in.in 2011-03-09 22:56:18.687297854 -0600
+@@ -97,6 +97,7 @@
+ cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
+
+ # load local modmap
++test -r /etc/X11/xinit/.Xmodmap && xmodmap /etc/X11/xinit/.Xmodmap
+ test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
+
+ # Launch xscreensaver (if available), but only as non-root user