Date: Tuesday, October 4, 2011 @ 18:34:27 Author: andrea Revision: 139752
Allow KDM to loads xinitr.d/ scripts (FS#26120); add dependence on xrdb; disable OpenGL ES for [extra] Added: kdebase-workspace/trunk/kdm-xinitrd.patch Modified: kdebase-workspace/trunk/PKGBUILD -------------------+ PKGBUILD | 23 ++++++++++++++--------- kdm-xinitrd.patch | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-10-04 21:42:50 UTC (rev 139751) +++ PKGBUILD 2011-10-04 22:34:27 UTC (rev 139752) @@ -14,14 +14,17 @@ # note on libxdamage: # not detected by namcap because libgl depends on it # but nvidia providing libgl does not depend on libxdamage -depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' - 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' - 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'libgles' 'libegl') +depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' + 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' + 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' + 'xorg-xrdb') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager') optdepends=('kde-wallpapers: officials KDE wallapers') -replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') -conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') +replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' + 'kdebase-kinfocenter') +conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' + 'kdebase-kinfocenter') install="${pkgname}.install" backup=('usr/share/config/kdm/kdmrc' 'etc/pam.d/kde' @@ -30,7 +33,7 @@ options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch') + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') sha1sums=('afd37b2f583690e391828c1ceb7311e2e8d37c6f' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' @@ -38,11 +41,13 @@ '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' + 'd509dac592bd8b310df27991b208c95b6d907514') build() { cd "${srcdir}"/${_pkgname}-${pkgver} patch -p0 -i "${srcdir}"/kdm-zsh-profile.patch + patch -p1 -i "${srcdir}"/kdm-xinitrd.patch patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch @@ -56,8 +61,8 @@ -DWITH_Xmms=OFF \ -DWITH_Googlegadgets=OFF \ -DWITH_libgps=OFF \ - -DWITH_OpenGLES=ON \ - -DKWIN_BUILD_WITH_OPENGLES=ON + -DWITH_OpenGLES=OFF \ + -DKWIN_BUILD_WITH_OPENGLES=OFF make } Added: kdm-xinitrd.patch =================================================================== --- kdm-xinitrd.patch (rev 0) +++ kdm-xinitrd.patch 2011-10-04 22:34:27 UTC (rev 139752) @@ -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"