git » plasma-desktop.git » commit eb92c00

diff --git a/9ba1ef4777aae9a2492f9960d5fc46b3a6415d85.patch b/9ba1ef4777aae9a2492f9960d5fc46b3a6415d85.patch
deleted file mode 100644
index be85aaa..0000000
--- a/9ba1ef4777aae9a2492f9960d5fc46b3a6415d85.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Marco Martin <notmart@gmail.com>
-Date: Thu, 02 Apr 2015 12:25:56 +0000
-Subject: iexplicitly fallback to unknown icon
-X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=9ba1ef4777aae9a2492f9960d5fc46b3a6415d85
----
-iexplicitly fallback to unknown icon
-
-as in kicker, we have to manually fallback now
-BUG:345740
----
-
-
---- a/applets/kickoff/core/applicationmodel.cpp
-+++ b/applets/kickoff/core/applicationmodel.cpp
-@@ -149,7 +149,7 @@
-             }
- 
-             AppNode *newnode = new AppNode();
--            newnode->icon = QIcon::fromTheme(p->icon());
-+            newnode->icon = QIcon::fromTheme(p->icon(), QIcon::fromTheme("unknown"));
-             newnode->appName = p->name();
-             newnode->genericName = p->genericName();
-             newnode->desktopEntry = p->entryPath();
-@@ -264,7 +264,7 @@
- 
-         AppNode *newnode = new AppNode();
-         newnode->iconName = icon;
--        newnode->icon = QIcon::fromTheme(icon);
-+        newnode->icon = QIcon::fromTheme(icon, QIcon::fromTheme("unknown"));
-         newnode->appName = appName;
-         newnode->genericName = genericName;
-         newnode->relPath = relPath;
-
---- a/applets/kickoff/core/models.cpp
-+++ b/applets/kickoff/core/models.cpp
-@@ -77,7 +77,7 @@
-         item = new QStandardItem;
-         KDesktopFile desktopFile(url.toLocalFile());
-         item->setText(QFileInfo(urlString.mid(0, urlString.lastIndexOf('.'))).completeBaseName());
--        item->setIcon(QIcon::fromTheme(desktopFile.readIcon()));
-+        item->setIcon(QIcon::fromTheme(desktopFile.readIcon(), QIcon::fromTheme("unknown")));
- 
-         //FIXME: desktopUrl is a hack around borkage in KRecentDocuments which
-         //       stores a path in the URL field!
-@@ -107,7 +107,7 @@
- 
-         item->setText(basename);
-         //FIXME
--//         item->setIcon(QIcon::fromTheme(KMimeType::iconNameForUrl(url)));
-+//         item->setIcon(QIcon::fromTheme(KMimeType::iconNameForUrl(url), QIcon::fromTheme("unknown")));
-         item->setData(url.url(), Kickoff::UrlRole);
-         item->setData(subTitle, Kickoff::SubTitleRole);
- 
-@@ -150,7 +150,7 @@
-     QString appName = service->name();
-     bool nameFirst = displayOrder == NameBeforeDescription;
-     appItem->setText(nameFirst || genericName.isEmpty() ? appName : genericName);
--    appItem->setIcon(QIcon::fromTheme(service->icon()));
-+    appItem->setIcon(QIcon::fromTheme(service->icon(), QIcon::fromTheme("unknown")));
-     appItem->setData(service->entryPath(), Kickoff::UrlRole);
- 
-     if (nameFirst) {
-
diff --git a/PKGBUILD b/PKGBUILD
index 10a79b5..a97941a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,34 +3,26 @@
 # Contributor: Antonio Rojas
 
 pkgname=plasma-desktop
-pkgver=5.2.2
-pkgrel=3
+pkgver=5.3.0
+pkgrel=1
 pkgdesc='KDE Plasma Desktop'
 arch=('i686' 'x86_64')
 url='https://www.kde.org/workspaces/plasmadesktop/'
 license=('LGPL')
-depends=('qt5-graphicaleffects' 'powerdevil' 'polkit-kde-frameworks'
+depends=('powerdevil' 'polkit-kde-agent'
          'libcanberra' 'kwin' 'libusb-compat' 'libxkbfile' 'kmenuedit'
-         'systemsettings' 'ksysguard' 'breeze')
-makedepends=('extra-cmake-modules' 'kdoctools' 'boost' 'baloo-frameworks')
-optdepends=('baloo-frameworks: system indexing'
-           'plasma-nm: Network manager applet')
-conflicts=('kdebase-workspace')
+         'systemsettings' 'ksysguard' 'kpeople' 'baloo')
+makedepends=('extra-cmake-modules' 'kdoctools' 'boost' 'xf86-input-synaptics' 'xorg-server-devel')
+optdepends=('plasma-nm: Network manager applet')
+conflicts=('kdebase-workspace' 'kcm-touchpad-frameworks')
+replaces=('kcm-touchpad-frameworks')
 install="${pkgname}.install"
 groups=('plasma')
-source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
-        aa08cd42a470af7a10f34cc9dbe7aefd0057bb35.patch
-        9ba1ef4777aae9a2492f9960d5fc46b3a6415d85.patch)
-md5sums=('dc5e656b26d31bda9d0504b3df2a5b18'
-         '9c169d282f6a96fbde0fe510de20a603'
-         'beba1fbf46da6463dea6565b63370175')
+source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz")
+md5sums=('3f2b87f8b1d61dd06fd882a6576f4047')
 
 prepare() {
   mkdir build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../aa08cd42a470af7a10f34cc9dbe7aefd0057bb35.patch
-  patch -p1 -i ../9ba1ef4777aae9a2492f9960d5fc46b3a6415d85.patch
 }
 
 build() {
@@ -48,8 +40,4 @@ build() {
 package() {
   cd build
   make DESTDIR="${pkgdir}" install
-
-# Rename kcfg files to avoid conflicting with kdebase-kdepasswd
-  mv "$pkgdir"/usr/share/config.kcfg/kcm_useraccount{,5}.kcfg
-  mv "$pkgdir"/usr/share/config.kcfg/kcm_useraccount_pass{,5}.kcfg
 }
diff --git a/aa08cd42a470af7a10f34cc9dbe7aefd0057bb35.patch b/aa08cd42a470af7a10f34cc9dbe7aefd0057bb35.patch
deleted file mode 100644
index 5c8e49e..0000000
--- a/aa08cd42a470af7a10f34cc9dbe7aefd0057bb35.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Eike Hein <hein@kde.org>
-Date: Wed, 01 Apr 2015 13:49:30 +0000
-Subject: Specify explicit fallbacks.
-X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=aa08cd42a470af7a10f34cc9dbe7aefd0057bb35
----
-Specify explicit fallbacks.
----
-
-
---- a/applets/kicker/plugin/appsmodel.cpp
-+++ b/applets/kicker/plugin/appsmodel.cpp
-@@ -50,7 +50,7 @@
-     bool flat, int appNameFormat)
- {
-     m_name = group->caption();
--    m_icon = QIcon::fromTheme(group->icon());
-+    m_icon = QIcon::fromTheme(group->icon(), QIcon::fromTheme("unknown"));
-     AppsModel* model = new AppsModel(group->entryPath(), flat, parentModel);
-     model->setAppletInterface(parentModel->appletInterface());
-     model->setAppNameFormat(appNameFormat);
-@@ -64,7 +64,7 @@
- : m_service(service)
- {
-     m_name = name;
--    m_icon = QIcon::fromTheme(service->icon());
-+    m_icon = QIcon::fromTheme(service->icon(), QIcon::fromTheme("unknown"));
-     m_service = service;
- }
- 
-
---- a/applets/kicker/plugin/recentdocsmodel.cpp
-+++ b/applets/kicker/plugin/recentdocsmodel.cpp
-@@ -34,7 +34,7 @@
-     const QString &url, const QString &desktopPath)
- {
-     m_name = name;
--    m_icon = QIcon::fromTheme(icon);
-+    m_icon = QIcon::fromTheme(icon, QIcon::fromTheme("unknown"));
-     m_url = url;
-     m_desktopPath = desktopPath;
- }
-
---- a/applets/kicker/plugin/rootmodel.cpp
-+++ b/applets/kicker/plugin/rootmodel.cpp
-@@ -29,7 +29,7 @@
-     AbstractModel *model, AbstractModel *parentModel)
- {
-     m_name = name;
--    m_icon = QIcon::fromTheme(icon);
-+    m_icon = QIcon::fromTheme(icon, QIcon::fromTheme("unknown"));
-     m_model = model;
-     QObject::connect(parentModel, SIGNAL(refreshing()), m_model, SLOT(deleteLater()));
- }
-
---- a/applets/kicker/plugin/systemmodel.cpp
-+++ b/applets/kicker/plugin/systemmodel.cpp
-@@ -36,7 +36,7 @@
- {
-     m_action = action;
-     m_name = name;
--    m_icon = QIcon::fromTheme(icon);
-+    m_icon = QIcon::fromTheme(icon, QIcon::fromTheme("unknown"));
- }
- 
- SystemModel::SystemModel(QObject *parent) : AbstractModel(parent)
-