[arch-commits] Commit in plasma-workspace/repos (10 files)
Felix Yan
fyan at archlinux.org
Thu Aug 13 06:54:51 UTC 2015
Date: Thursday, August 13, 2015 @ 08:54:51
Author: fyan
Revision: 243387
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
plasma-workspace/repos/testing-i686/
plasma-workspace/repos/testing-i686/PKGBUILD
(from rev 243386, plasma-workspace/trunk/PKGBUILD)
plasma-workspace/repos/testing-i686/baloo-use-filepath-as-id.patch
(from rev 243386, plasma-workspace/trunk/baloo-use-filepath-as-id.patch)
plasma-workspace/repos/testing-i686/kde.pam
(from rev 243386, plasma-workspace/trunk/kde.pam)
plasma-workspace/repos/testing-i686/remove-baloo-result-header.patch
(from rev 243386, plasma-workspace/trunk/remove-baloo-result-header.patch)
plasma-workspace/repos/testing-x86_64/
plasma-workspace/repos/testing-x86_64/PKGBUILD
(from rev 243386, plasma-workspace/trunk/PKGBUILD)
plasma-workspace/repos/testing-x86_64/baloo-use-filepath-as-id.patch
(from rev 243386, plasma-workspace/trunk/baloo-use-filepath-as-id.patch)
plasma-workspace/repos/testing-x86_64/kde.pam
(from rev 243386, plasma-workspace/trunk/kde.pam)
plasma-workspace/repos/testing-x86_64/remove-baloo-result-header.patch
(from rev 243386, plasma-workspace/trunk/remove-baloo-result-header.patch)
-------------------------------------------------+
testing-i686/PKGBUILD | 80 ++++++++++++++++++++++
testing-i686/baloo-use-filepath-as-id.patch | 21 +++++
testing-i686/kde.pam | 6 +
testing-i686/remove-baloo-result-header.patch | 18 ++++
testing-x86_64/PKGBUILD | 80 ++++++++++++++++++++++
testing-x86_64/baloo-use-filepath-as-id.patch | 21 +++++
testing-x86_64/kde.pam | 6 +
testing-x86_64/remove-baloo-result-header.patch | 18 ++++
8 files changed, 250 insertions(+)
Copied: plasma-workspace/repos/testing-i686/PKGBUILD (from rev 243386, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-08-13 06:54:51 UTC (rev 243387)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Antonio Rojas
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgbase=plasma-workspace
+pkgname=('plasma-workspace' 'drkonqi')
+pkgver=5.3.2
+pkgrel=3
+pkgdesc='KDE Plasma Workspace'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
+license=('LGPL')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland'
+ 'libksysguard' 'libkscreen' 'ktexteditor' 'libqalculate'
+ 'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
+ 'xorg-xmessage' 'xorg-xprop' 'milou' 'breeze' 'prison-frameworks')
+makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo'
+ 'krunner' 'kxmlrpcclient' 'networkmanager-qt')
+groups=('plasma')
+source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
+ 'kde.pam'
+ 'remove-baloo-result-header.patch'
+ 'baloo-use-filepath-as-id.patch')
+md5sums=('3d6a6e1ffcbf2d3e27668dc471523907'
+ '929b182dec8a096206ad493477c09d2c'
+ 'fd0937f725cb04379a17d27857a0aa02'
+ '418a2de6f3596d20da9fd69715e73a70')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgbase}-${pkgver}
+ # be sure to use the Qt5 version of qtpaths
+ sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
+
+ # Patch for Baloo 5.13
+ patch -p1 -i ../remove-baloo-result-header.patch
+ patch -p1 -i ../baloo-use-filepath-as-id.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DLIB_INSTALL_DIR=lib \
+ -DLIBEXEC_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package_plasma-workspace() {
+ optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+ 'gpsd: GPS based geolocation' 'networkmanager-qt: IP based geolocation')
+ conflicts=('kdebase-workspace')
+
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ install -D "${srcdir}"/kde.pam \
+ "${pkgdir}"/etc/pam.d/kde
+
+ # Remove conflicts with drkonqi
+ rm "${pkgdir}"/usr/lib/drkonqi
+ rm -r "${pkgdir}"/usr/share/drkonqi
+}
+
+package_drkonqi() {
+ pkgdesc='KDE crash handler'
+ depends=('kdewebkit' 'kxmlrpcclient' 'gdb')
+
+ cd build/drkonqi
+ make DESTDIR="${pkgdir}" install
+}
Copied: plasma-workspace/repos/testing-i686/baloo-use-filepath-as-id.patch (from rev 243386, plasma-workspace/trunk/baloo-use-filepath-as-id.patch)
===================================================================
--- testing-i686/baloo-use-filepath-as-id.patch (rev 0)
+++ testing-i686/baloo-use-filepath-as-id.patch 2015-08-13 06:54:51 UTC (rev 243387)
@@ -0,0 +1,21 @@
+commit 34c11a481baafd9824ef681b6d359ca34ab04ad8
+Author: Vishesh Handa <me at vhanda.in>
+Date: Wed May 6 14:27:37 2015 +0200
+
+ Baloo Runner: Use the filepath as the unique id of the match
+
+ Baloo no longer exports the identifier of the file
+
+diff --git a/runners/baloo/baloosearchrunner.cpp b/runners/baloo/baloosearchrunner.cpp
+index 0f5e066..2bbd7c1 100644
+--- a/runners/baloo/baloosearchrunner.cpp
++++ b/runners/baloo/baloosearchrunner.cpp
+@@ -114,7 +114,7 @@ QList<Plasma::QueryMatch> SearchRunner::match(Plasma::RunnerContext& context, co
+
+ QString iconName = QMimeDatabase().mimeTypeForFile(localUrl).iconName();
+ match.setIcon(QIcon::fromTheme(iconName));
+- match.setId(it.id());
++ match.setId(it.filePath());
+ match.setText(url.fileName());
+ match.setData(url);
+ match.setType(Plasma::QueryMatch::PossibleMatch);
Copied: plasma-workspace/repos/testing-i686/kde.pam (from rev 243386, plasma-workspace/trunk/kde.pam)
===================================================================
--- testing-i686/kde.pam (rev 0)
+++ testing-i686/kde.pam 2015-08-13 06:54:51 UTC (rev 243387)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth include system-login
+account include system-login
+password include system-login
+session include system-login
Copied: plasma-workspace/repos/testing-i686/remove-baloo-result-header.patch (from rev 243386, plasma-workspace/trunk/remove-baloo-result-header.patch)
===================================================================
--- testing-i686/remove-baloo-result-header.patch (rev 0)
+++ testing-i686/remove-baloo-result-header.patch 2015-08-13 06:54:51 UTC (rev 243387)
@@ -0,0 +1,18 @@
+commit 321cdc7278c29bcf4cf15078a71c8ceea47e7e95
+Author: Vishesh Handa <me at vhanda.in>
+Date: Mon May 11 15:34:51 2015 +0200
+
+ BalooRunner: Baloo/Result header is no longer installed
+
+diff --git a/runners/baloo/baloosearchrunner.cpp b/runners/baloo/baloosearchrunner.cpp
+index 2bbd7c1..0023a11 100644
+--- a/runners/baloo/baloosearchrunner.cpp
++++ b/runners/baloo/baloosearchrunner.cpp
+@@ -30,7 +30,6 @@
+ #include <QTimer>
+
+ #include <Baloo/Query>
+-#include <Baloo/Result>
+
+ SearchRunner::SearchRunner(QObject* parent, const QVariantList& args)
+ : Plasma::AbstractRunner(parent, args)
Copied: plasma-workspace/repos/testing-x86_64/PKGBUILD (from rev 243386, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-08-13 06:54:51 UTC (rev 243387)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Antonio Rojas
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgbase=plasma-workspace
+pkgname=('plasma-workspace' 'drkonqi')
+pkgver=5.3.2
+pkgrel=3
+pkgdesc='KDE Plasma Workspace'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
+license=('LGPL')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland'
+ 'libksysguard' 'libkscreen' 'ktexteditor' 'libqalculate'
+ 'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
+ 'xorg-xmessage' 'xorg-xprop' 'milou' 'breeze' 'prison-frameworks')
+makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo'
+ 'krunner' 'kxmlrpcclient' 'networkmanager-qt')
+groups=('plasma')
+source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
+ 'kde.pam'
+ 'remove-baloo-result-header.patch'
+ 'baloo-use-filepath-as-id.patch')
+md5sums=('3d6a6e1ffcbf2d3e27668dc471523907'
+ '929b182dec8a096206ad493477c09d2c'
+ 'fd0937f725cb04379a17d27857a0aa02'
+ '418a2de6f3596d20da9fd69715e73a70')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgbase}-${pkgver}
+ # be sure to use the Qt5 version of qtpaths
+ sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
+
+ # Patch for Baloo 5.13
+ patch -p1 -i ../remove-baloo-result-header.patch
+ patch -p1 -i ../baloo-use-filepath-as-id.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DLIB_INSTALL_DIR=lib \
+ -DLIBEXEC_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package_plasma-workspace() {
+ optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+ 'gpsd: GPS based geolocation' 'networkmanager-qt: IP based geolocation')
+ conflicts=('kdebase-workspace')
+
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ install -D "${srcdir}"/kde.pam \
+ "${pkgdir}"/etc/pam.d/kde
+
+ # Remove conflicts with drkonqi
+ rm "${pkgdir}"/usr/lib/drkonqi
+ rm -r "${pkgdir}"/usr/share/drkonqi
+}
+
+package_drkonqi() {
+ pkgdesc='KDE crash handler'
+ depends=('kdewebkit' 'kxmlrpcclient' 'gdb')
+
+ cd build/drkonqi
+ make DESTDIR="${pkgdir}" install
+}
Copied: plasma-workspace/repos/testing-x86_64/baloo-use-filepath-as-id.patch (from rev 243386, plasma-workspace/trunk/baloo-use-filepath-as-id.patch)
===================================================================
--- testing-x86_64/baloo-use-filepath-as-id.patch (rev 0)
+++ testing-x86_64/baloo-use-filepath-as-id.patch 2015-08-13 06:54:51 UTC (rev 243387)
@@ -0,0 +1,21 @@
+commit 34c11a481baafd9824ef681b6d359ca34ab04ad8
+Author: Vishesh Handa <me at vhanda.in>
+Date: Wed May 6 14:27:37 2015 +0200
+
+ Baloo Runner: Use the filepath as the unique id of the match
+
+ Baloo no longer exports the identifier of the file
+
+diff --git a/runners/baloo/baloosearchrunner.cpp b/runners/baloo/baloosearchrunner.cpp
+index 0f5e066..2bbd7c1 100644
+--- a/runners/baloo/baloosearchrunner.cpp
++++ b/runners/baloo/baloosearchrunner.cpp
+@@ -114,7 +114,7 @@ QList<Plasma::QueryMatch> SearchRunner::match(Plasma::RunnerContext& context, co
+
+ QString iconName = QMimeDatabase().mimeTypeForFile(localUrl).iconName();
+ match.setIcon(QIcon::fromTheme(iconName));
+- match.setId(it.id());
++ match.setId(it.filePath());
+ match.setText(url.fileName());
+ match.setData(url);
+ match.setType(Plasma::QueryMatch::PossibleMatch);
Copied: plasma-workspace/repos/testing-x86_64/kde.pam (from rev 243386, plasma-workspace/trunk/kde.pam)
===================================================================
--- testing-x86_64/kde.pam (rev 0)
+++ testing-x86_64/kde.pam 2015-08-13 06:54:51 UTC (rev 243387)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth include system-login
+account include system-login
+password include system-login
+session include system-login
Copied: plasma-workspace/repos/testing-x86_64/remove-baloo-result-header.patch (from rev 243386, plasma-workspace/trunk/remove-baloo-result-header.patch)
===================================================================
--- testing-x86_64/remove-baloo-result-header.patch (rev 0)
+++ testing-x86_64/remove-baloo-result-header.patch 2015-08-13 06:54:51 UTC (rev 243387)
@@ -0,0 +1,18 @@
+commit 321cdc7278c29bcf4cf15078a71c8ceea47e7e95
+Author: Vishesh Handa <me at vhanda.in>
+Date: Mon May 11 15:34:51 2015 +0200
+
+ BalooRunner: Baloo/Result header is no longer installed
+
+diff --git a/runners/baloo/baloosearchrunner.cpp b/runners/baloo/baloosearchrunner.cpp
+index 2bbd7c1..0023a11 100644
+--- a/runners/baloo/baloosearchrunner.cpp
++++ b/runners/baloo/baloosearchrunner.cpp
+@@ -30,7 +30,6 @@
+ #include <QTimer>
+
+ #include <Baloo/Query>
+-#include <Baloo/Result>
+
+ SearchRunner::SearchRunner(QObject* parent, const QVariantList& args)
+ : Plasma::AbstractRunner(parent, args)
More information about the arch-commits
mailing list