diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
| commit | 51d25a8023c8dafdbcafd8bcc6adb19979f15ac6 (patch) | |
| tree | 3419b254ec8c04b09a938d993fdb768eae03c005 /staging/kdebase-workspace/kdm-xinitrd.patch | |
| parent | 11fe0679d59f68c3fbe3d0a205e5087bf694262e (diff) | |
| parent | 7b2739f21a7ed0d52497fa381c9a2383e71ab7a8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/kdemultimedia/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/wine/PKGBUILD
staging/kdemultimedia/PKGBUILD
Diffstat (limited to 'staging/kdebase-workspace/kdm-xinitrd.patch')
| -rw-r--r-- | staging/kdebase-workspace/kdm-xinitrd.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/staging/kdebase-workspace/kdm-xinitrd.patch b/staging/kdebase-workspace/kdm-xinitrd.patch deleted file mode 100644 index f5fc0e571..000000000 --- a/staging/kdebase-workspace/kdm-xinitrd.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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" |