[arch-commits] Commit in kdebase-workspace (3 files)
Andrea Scarpino
andrea at archlinux.org
Thu Sep 8 09:01:46 UTC 2011
Date: Thursday, September 8, 2011 @ 05:01:46
Author: andrea
Revision: 137511
Enable Fake NetworkManager-0.9 solid module (FS#25923)
Modified:
kdebase-workspace/repos/extra-i686/PKGBUILD
kdebase-workspace/repos/extra-x86_64/PKGBUILD
kdebase-workspace/trunk/PKGBUILD
-----------------------------+
repos/extra-i686/PKGBUILD | 6 +++---
repos/extra-x86_64/PKGBUILD | 6 +++---
trunk/PKGBUILD | 36 ++++++++++++++++++------------------
3 files changed, 24 insertions(+), 24 deletions(-)
Modified: repos/extra-i686/PKGBUILD
===================================================================
--- repos/extra-i686/PKGBUILD 2011-09-08 07:55:21 UTC (rev 137510)
+++ repos/extra-i686/PKGBUILD 2011-09-08 09:01:46 UTC (rev 137511)
@@ -5,7 +5,7 @@
pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.7.1
-pkgrel=2
+pkgrel=4
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -17,7 +17,8 @@
depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz'
'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier'
'xorg-xsetroot' 'libxcomposite' 'libxinerama')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python')
+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')
@@ -55,7 +56,6 @@
-DWITH_Xmms=OFF \
-DWITH_Googlegadgets=OFF \
-DWITH_libgps=OFF \
- -DWITH_NetworkManager=OFF \
-DKWIN_MOBILE_EFFECTS=OFF \
-DWITH_OpenGLES=OFF \
-DKWIN_BUILD_WITH_OPENGLES=OFF
Modified: repos/extra-x86_64/PKGBUILD
===================================================================
--- repos/extra-x86_64/PKGBUILD 2011-09-08 07:55:21 UTC (rev 137510)
+++ repos/extra-x86_64/PKGBUILD 2011-09-08 09:01:46 UTC (rev 137511)
@@ -5,7 +5,7 @@
pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.7.1
-pkgrel=2
+pkgrel=4
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -17,7 +17,8 @@
depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz'
'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier'
'xorg-xsetroot' 'libxcomposite' 'libxinerama')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python'i
+ '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')
@@ -55,7 +56,6 @@
-DWITH_Xmms=OFF \
-DWITH_Googlegadgets=OFF \
-DWITH_libgps=OFF \
- -DWITH_NetworkManager=OFF \
-DKWIN_MOBILE_EFFECTS=OFF \
-DWITH_OpenGLES=OFF \
-DKWIN_BUILD_WITH_OPENGLES=OFF
Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD 2011-09-08 07:55:21 UTC (rev 137510)
+++ trunk/PKGBUILD 2011-09-08 09:01:46 UTC (rev 137511)
@@ -5,7 +5,7 @@
pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.7.1
-pkgrel=3
+pkgrel=5
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -17,7 +17,8 @@
depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz'
'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier'
'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'libgles' 'libegl')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python')
+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')
@@ -40,12 +41,12 @@
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
build() {
- cd ${srcdir}/${_pkgname}-${pkgver}
- patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
- patch -p0 -i ${srcdir}/fixpath.patch
- patch -p0 -i ${srcdir}/terminate-server.patch
+ cd "${srcdir}"/${_pkgname}-${pkgver}
+ patch -p0 -i "${srcdir}"/kdm-zsh-profile.patch
+ patch -p0 -i "${srcdir}"/fixpath.patch
+ patch -p0 -i "${srcdir}"/terminate-server.patch
- cd ${srcdir}
+ cd "${srcdir}"
mkdir build
cd build
cmake ../${_pkgname}-${pkgver} \
@@ -55,23 +56,22 @@
-DWITH_Xmms=OFF \
-DWITH_Googlegadgets=OFF \
-DWITH_libgps=OFF \
- -DWITH_NetworkManager=OFF \
-DWITH_OpenGLES=ON \
-DKWIN_BUILD_WITH_OPENGLES=ON
make
}
package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
- install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm
- install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde
- install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np
- install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver
- install -d -m755 ${pkgdir}/usr/share/xsessions/
- ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop ${pkgdir}/usr/share/xsessions/
- install -d -m755 ${pkgdir}/etc/kde/{env,shutdown}
+ install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
+ install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde
+ install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np
+ install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver
+ install -d -m755 "${pkgdir}"/usr/share/xsessions/
+ ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/
+ install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown}
- install -d -g 135 -o 135 ${pkgdir}/var/lib/kdm
+ install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm
}
More information about the arch-commits
mailing list