diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-01 11:35:39 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-01 11:35:39 -0300 |
| commit | 1192f92b3117f045d8a6e01bdc18a71d4ce7e980 (patch) | |
| tree | f142ada32802fc41be79d63118bbfd3f692c3485 /staging/kdebase-workspace/kdm-xinitrd.patch | |
| parent | a3eb7624c72208c02fb4778c487ac9458436cca0 (diff) | |
| parent | 560562e36a27da267f2f4f7989806790192888ef (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dictd/PKGBUILD
community/libmaa/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
extra/libatasmart/PKGBUILD
extra/llvm/PKGBUILD
extra/pidgin/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/gcc-multilib/gcc_pure64.patch
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/glibc-2.14-libdl-crash.patch
multilib/lib32-glibc/lib32-glibc.conf
multilib/lib32-pcre/PKGBUILD
multilib/libtool-multilib/PKGBUILD
Diffstat (limited to 'staging/kdebase-workspace/kdm-xinitrd.patch')
| -rw-r--r-- | staging/kdebase-workspace/kdm-xinitrd.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/staging/kdebase-workspace/kdm-xinitrd.patch b/staging/kdebase-workspace/kdm-xinitrd.patch new file mode 100644 index 000000000..f5fc0e571 --- /dev/null +++ b/staging/kdebase-workspace/kdm-xinitrd.patch @@ -0,0 +1,18 @@ +--- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~ 2011-10-04 22:11:24.787771512 +0000 ++++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c 2011-10-04 22:13:58.612702824 +0000 +@@ -742,6 +742,15 @@ + "[ -f /etc/xprofile ] && . /etc/xprofile\n" + "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" + "\n" ++"# run all system xinitrc shell scripts.\n" ++"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n" ++" for i in /etc/X11/xinit/xinitrc.d/* ; do\n" ++" if [ -x \"$i\" ]; then\n" ++" . \"$i\"\n" ++" fi\n" ++" done\n" ++"fi\n" ++"\n" + "if [ -d /etc/X11/Xresources ]; then\n" + " for i in /etc/X11/Xresources/*; do\n" + " [ -f $i ] && xrdb -merge $i\n" |