[arch-commits] Commit in kdebase-workspace (4 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Sat Mar 8 19:27:56 UTC 2014
Date: Saturday, March 8, 2014 @ 20:27:55
Author: andrea
Revision: 207421
upgpkg: kdebase-workspace 4.11.7-3
Drop nepomuk runner
Added:
kdebase-workspace/kde-unstable/
kdebase-workspace/kde-unstable/PKGBUILD
(from rev 206908, kdebase-workspace/trunk/PKGBUILD)
kdebase-workspace/kde-unstable/khotkeys-qt4.patch
(from rev 206908, kdebase-workspace/trunk/khotkeys-qt4.patch)
Deleted:
kdebase-workspace/kde-unstable/PKGBUILD
---------------------------------+
PKGBUILD | 87 -----------------------------------
kde-unstable/PKGBUILD | 93 ++++++++++++++++++++++++++++++++++++++
kde-unstable/khotkeys-qt4.patch | 22 ++++++++
3 files changed, 115 insertions(+), 87 deletions(-)
Deleted: kde-unstable/PKGBUILD
===================================================================
--- trunk/PKGBUILD 2014-03-05 07:38:14 UTC (rev 206697)
+++ kde-unstable/PKGBUILD 2014-03-08 19:27:55 UTC (rev 207421)
@@ -1,87 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.11.7
-_pkgver=4.12.3
-pkgrel=1
-pkgdesc="Provides the interface and basic tools for the KDE workspace"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kde-workspace'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde')
-# note on libxdamage:
-# not detected by namcap because libgl depends on it
-# but nvidia providing libgl does not depend on libxdamage
-depends=("kdelibs>=${pkgver}" 'kdepim-runtime' 'lm_sensors' 'libraw1394'
- 'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage' 'libqalculate'
- 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
- 'xorg-xrdb' 'libxres' 'xorg-xrandr' 'xorg-xmessage' 'libusb-compat'
- 'kde-base-artwork' 'xcb-util-renderutil' 'xcb-util-image' 'ttf-font'
- 'xcb-util-keysyms' 'xcb-util-wm' 'pciutils' 'glu')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
-optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces'
- 'appmenu-qt: menu applications over dbus')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc')
-source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
- 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
- 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('515c687a5a967e14e0470012e99ca2ae4cd86700'
- '660eae40a707d2711d8d7f32a93214865506b795'
- '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
- '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
- 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
- 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
- 'c079ebd157c836ba996190f0d2bcea1a7828d02c'
- 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
- 'd509dac592bd8b310df27991b208c95b6d907514')
-
-prepare() {
- mkdir build
-
- cd ${_pkgname}-${pkgver}
-
- # reads the shell scripts in /etc/kde/
- patch -p0 -i "${srcdir}"/etc-scripts.patch
- # FS#26120
- patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
-
- # KDEBUG#202629
- patch -p0 -i "${srcdir}"/terminate-server.patch
-}
-
-build() {
- cd build
- cmake ../${_pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Xmms=OFF \
- -DWITH_libgps=OFF \
- -DPYTHON_EXECUTABLE=/usr/bin/python2 \
- -DWITH_CkConnector=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-
- 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 -m644 "${srcdir}"/kdm.service \
- "${pkgdir}"/usr/lib/systemd/system/kdm.service
- install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm
-}
Copied: kdebase-workspace/kde-unstable/PKGBUILD (from rev 206908, kdebase-workspace/trunk/PKGBUILD)
===================================================================
--- kde-unstable/PKGBUILD (rev 0)
+++ kde-unstable/PKGBUILD 2014-03-08 19:27:55 UTC (rev 207421)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdebase-workspace
+_pkgname=kde-workspace
+pkgver=4.11.7
+_pkgver=4.12.3
+pkgrel=3
+pkgdesc="Provides the interface and basic tools for the KDE workspace"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/kde-workspace'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=("kdelibs>=${pkgver}" 'kdepim-runtime' 'lm_sensors' 'libraw1394'
+ 'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage' 'libqalculate'
+ 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
+ 'xorg-xrdb' 'libxres' 'xorg-xrandr' 'xorg-xmessage' 'libusb-compat'
+ 'kde-base-artwork' 'xcb-util-renderutil' 'xcb-util-image' 'ttf-font'
+ 'xcb-util-keysyms' 'xcb-util-wm' 'pciutils' 'glu')
+makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
+optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces'
+ 'appmenu-qt: menu applications over dbus')
+install="${pkgname}.install"
+backup=('usr/share/config/kdm/kdmrc')
+source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
+ 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
+ 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+ 'khotkeys-qt4.patch')
+sha1sums=('515c687a5a967e14e0470012e99ca2ae4cd86700'
+ '660eae40a707d2711d8d7f32a93214865506b795'
+ '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
+ '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+ 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
+ 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
+ 'c079ebd157c836ba996190f0d2bcea1a7828d02c'
+ 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+ 'd509dac592bd8b310df27991b208c95b6d907514'
+ 'aa9d2e5a69986c4c3d47829721ea99edb473be12')
+
+prepare() {
+ mkdir build
+
+ cd ${_pkgname}-${pkgver}
+
+ # reads the shell scripts in /etc/kde/
+ patch -p0 -i "${srcdir}"/etc-scripts.patch
+ # FS#26120
+ patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
+ # FS#39188
+ patch -p1 -i "${srcdir}"/khotkeys-qt4.patch
+
+ # KDEBUG#202629
+ patch -p0 -i "${srcdir}"/terminate-server.patch
+}
+
+build() {
+ cd build
+ cmake ../${_pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWITH_Xmms=OFF \
+ -DWITH_libgps=OFF \
+ -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+ -DWITH_CkConnector=OFF \
+ -DWITH_NepomukCore=OFF \
+ -DWITH_Soprano=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ 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 -m644 "${srcdir}"/kdm.service \
+ "${pkgdir}"/usr/lib/systemd/system/kdm.service
+ install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm
+}
Copied: kdebase-workspace/kde-unstable/khotkeys-qt4.patch (from rev 206908, kdebase-workspace/trunk/khotkeys-qt4.patch)
===================================================================
--- kde-unstable/khotkeys-qt4.patch (rev 0)
+++ kde-unstable/khotkeys-qt4.patch 2014-03-08 19:27:55 UTC (rev 207421)
@@ -0,0 +1,22 @@
+--- kde-workspace-4.11.7/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp~ 2014-03-05 18:41:23.126818552 +0000
++++ kde-workspace-4.11.7/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp 2014-03-05 18:42:05.563172036 +0000
+@@ -117,7 +117,7 @@
+
+ void DbusActionWidget::launchDbusBrowser() const
+ {
+- if( KRun::runCommand( "qdbusviewer", window()) == 0 )
++ if( KRun::runCommand( "qdbusviewer-qt4", window()) == 0 )
+ {
+ KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer" ));
+ }
+--- kde-workspace-4.11.7/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp~ 2014-03-05 18:41:29.120107842 +0000
++++ kde-workspace-4.11.7/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp 2014-03-05 18:41:52.349936188 +0000
+@@ -133,7 +133,7 @@
+ }
+ kDebug() << "D-Bus call:" << _application << ":" << _object << ":" << _function << ":" << args_list;
+ KProcess proc;
+- proc << "qdbus" << _application << _object << _function << args_list;
++ proc << "qdbus-qt4" << _application << _object << _function << args_list;
+ proc.startDetached();
+ }
+
More information about the arch-commits
mailing list