[arch-commits] Commit in (7 files)
Antonio Rojas
arojas at archlinux.org
Thu Apr 9 23:02:11 UTC 2015
Date: Friday, April 10, 2015 @ 01:02:11
Author: arojas
Revision: 236015
Drop patches
Modified:
ksysguard/kde-unstable/PKGBUILD
plasma-desktop/kde-unstable/PKGBUILD
plasma-workspace/kde-unstable/PKGBUILD
Deleted:
ksysguard/kde-unstable/ksysguarddrc.patch
plasma-desktop/kde-unstable/9ba1ef4777aae9a2492f9960d5fc46b3a6415d85.patch
plasma-desktop/kde-unstable/aa08cd42a470af7a10f34cc9dbe7aefd0057bb35.patch
plasma-workspace/kde-unstable/lockscreen-focus.patch
----------------------------------------------------------------------------+
ksysguard/kde-unstable/PKGBUILD | 9 -
ksysguard/kde-unstable/ksysguarddrc.patch | 34 -----
plasma-desktop/kde-unstable/9ba1ef4777aae9a2492f9960d5fc46b3a6415d85.patch | 63 ---------
plasma-desktop/kde-unstable/PKGBUILD | 12 -
plasma-desktop/kde-unstable/aa08cd42a470af7a10f34cc9dbe7aefd0057bb35.patch | 66 ----------
plasma-workspace/kde-unstable/PKGBUILD | 8 -
plasma-workspace/kde-unstable/lockscreen-focus.patch | 32 ----
7 files changed, 6 insertions(+), 218 deletions(-)
Modified: ksysguard/kde-unstable/PKGBUILD
===================================================================
--- ksysguard/kde-unstable/PKGBUILD 2015-04-09 22:46:29 UTC (rev 236014)
+++ ksysguard/kde-unstable/PKGBUILD 2015-04-09 23:02:11 UTC (rev 236015)
@@ -16,16 +16,11 @@
conflicts=('kdebase-workspace')
groups=('plasma')
install="${pkgname}.install"
-source=("http://download.kde.org/unstable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz" 'ksysguarddrc.patch')
-md5sums=('524210082838d2858c874c0e1040831d'
- 'ce41545b8d3812feef4e396e98f15891')
+source=("http://download.kde.org/unstable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz")
+md5sums=('524210082838d2858c874c0e1040831d')
prepare() {
mkdir build
-
-# Fix loading config file (FS#44144)
- cd $pkgname-$pkgver
- patch -p1 -i "$srcdir"/ksysguarddrc.patch
}
build() {
Deleted: ksysguard/kde-unstable/ksysguarddrc.patch
===================================================================
--- ksysguard/kde-unstable/ksysguarddrc.patch 2015-04-09 22:46:29 UTC (rev 236014)
+++ ksysguard/kde-unstable/ksysguarddrc.patch 2015-04-09 23:02:11 UTC (rev 236015)
@@ -1,34 +0,0 @@
-From: David Rosca <nowrep at gmail.com>
-Date: Sun, 29 Mar 2015 17:19:54 +0000
-Subject: Fix opening ksysguarddrc config file
-X-Git-Url: http://quickgit.kde.org/?p=ksysguard.git&a=commitdiff&h=5f045a9f8cb9a859b38862440ed1cd1d6eee3a9b
----
-Fix opening ksysguarddrc config file
-
-Use KDE_INSTALL_FULL_SYSCONFDIR instead of SYSCONF_INSTALL_DIR and
-remove extra quotes in -DKSYSGUARDDRCFILE definiton.
-
-REVIEW: 123171
----
-
-
---- a/example/CMakeLists.txt
-+++ b/example/CMakeLists.txt
-@@ -1,3 +1,3 @@
--install( FILES ksysguarddrc DESTINATION ${SYSCONF_INSTALL_DIR} )
-+install( FILES ksysguarddrc DESTINATION ${KDE_INSTALL_FULL_SYSCONFDIR} )
- install( FILES ksysguard.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} )
-
-
---- a/ksysguardd/CMakeLists.txt
-+++ b/ksysguardd/CMakeLists.txt
-@@ -3,7 +3,7 @@
- # Laurent: Verify that we install it into (kdeprefix)/etc/ and not into /etc
- # otherwise it's necessary to change it.
- # into kde 3.x it was installed into /etc/
--add_definitions( -DKSYSGUARDDRCFILE="\\"${SYSCONF_INSTALL_DIR}/ksysguarddrc\\"" )
-+add_definitions( -DKSYSGUARDDRCFILE="${KDE_INSTALL_FULL_SYSCONFDIR}/ksysguarddrc" )
-
- add_definitions(-DOSTYPE_${CMAKE_SYSTEM_NAME})
-
-
Deleted: plasma-desktop/kde-unstable/9ba1ef4777aae9a2492f9960d5fc46b3a6415d85.patch
===================================================================
--- plasma-desktop/kde-unstable/9ba1ef4777aae9a2492f9960d5fc46b3a6415d85.patch 2015-04-09 22:46:29 UTC (rev 236014)
+++ plasma-desktop/kde-unstable/9ba1ef4777aae9a2492f9960d5fc46b3a6415d85.patch 2015-04-09 23:02:11 UTC (rev 236015)
@@ -1,63 +0,0 @@
-From: Marco Martin <notmart at 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) {
-
Modified: plasma-desktop/kde-unstable/PKGBUILD
===================================================================
--- plasma-desktop/kde-unstable/PKGBUILD 2015-04-09 22:46:29 UTC (rev 236014)
+++ plasma-desktop/kde-unstable/PKGBUILD 2015-04-09 23:02:11 UTC (rev 236015)
@@ -19,19 +19,11 @@
conflicts=('kdebase-workspace')
install="${pkgname}.install"
groups=('plasma')
-source=("http://download.kde.org/unstable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
- aa08cd42a470af7a10f34cc9dbe7aefd0057bb35.patch
- 9ba1ef4777aae9a2492f9960d5fc46b3a6415d85.patch)
-md5sums=('0117ad0616bc39b7ef9a43c23580f96f'
- '9c169d282f6a96fbde0fe510de20a603'
- 'beba1fbf46da6463dea6565b63370175')
+source=("http://download.kde.org/unstable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz")
+md5sums=('0117ad0616bc39b7ef9a43c23580f96f')
prepare() {
mkdir build
-
- cd $pkgname-$pkgver
- patch -p1 -i ../aa08cd42a470af7a10f34cc9dbe7aefd0057bb35.patch
- patch -p1 -i ../9ba1ef4777aae9a2492f9960d5fc46b3a6415d85.patch
}
build() {
Deleted: plasma-desktop/kde-unstable/aa08cd42a470af7a10f34cc9dbe7aefd0057bb35.patch
===================================================================
--- plasma-desktop/kde-unstable/aa08cd42a470af7a10f34cc9dbe7aefd0057bb35.patch 2015-04-09 22:46:29 UTC (rev 236014)
+++ plasma-desktop/kde-unstable/aa08cd42a470af7a10f34cc9dbe7aefd0057bb35.patch 2015-04-09 23:02:11 UTC (rev 236015)
@@ -1,66 +0,0 @@
-From: Eike Hein <hein at 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)
-
Modified: plasma-workspace/kde-unstable/PKGBUILD
===================================================================
--- plasma-workspace/kde-unstable/PKGBUILD 2015-04-09 22:46:29 UTC (rev 236014)
+++ plasma-workspace/kde-unstable/PKGBUILD 2015-04-09 23:02:11 UTC (rev 236015)
@@ -23,10 +23,9 @@
'krunner')
groups=('plasma')
source=("http://download.kde.org/unstable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
- 'kde.pam' 'lockscreen-focus.patch')
+ 'kde.pam')
md5sums=('8e38f91aaf9dbb61338e4955b38e7da3'
- '929b182dec8a096206ad493477c09d2c'
- '0dcc042d4188b2f664f9daf4a5923778')
+ '929b182dec8a096206ad493477c09d2c')
prepare() {
mkdir build
@@ -34,9 +33,6 @@
cd ${pkgbase}-${pkgver}
# be sure to use the Qt5 version of qtpaths
sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
-
-# fix password field not getting focus in lock screen (upstream bug #344823)
- patch -p1 -i "$srcdir"/lockscreen-focus.patch
}
build() {
Deleted: plasma-workspace/kde-unstable/lockscreen-focus.patch
===================================================================
--- plasma-workspace/kde-unstable/lockscreen-focus.patch 2015-04-09 22:46:29 UTC (rev 236014)
+++ plasma-workspace/kde-unstable/lockscreen-focus.patch 2015-04-09 23:02:11 UTC (rev 236015)
@@ -1,32 +0,0 @@
-From: Bhushan Shah <bhush94 at gmail.com>
-Date: Wed, 25 Mar 2015 15:55:22 +0000
-Subject: Workaround the lockscreen password field focus issue
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=24f24e03793c8214a5d1f3414a5aeb48eccef4f4
----
-Workaround the lockscreen password field focus issue
-
-Fixes bug 344823
-Backport of a476e1b6bf6f683bd74000bb30076868c9f92371 in 5.2
-
-CCMAIL: release-team at kde.org
----
-
-
---- a/lookandfeel/contents/lockscreen/LockScreen.qml
-+++ b/lookandfeel/contents/lockscreen/LockScreen.qml
-@@ -156,6 +156,14 @@
- enabled: !authenticator.graceLocked
- onAccepted: unlockFunction()
- focus: true
-+ //HACK: Similar hack is needed in sddm loginscreen
-+ //TODO: investigate
-+ Timer {
-+ interval: 200
-+ running: true
-+ repeat: false
-+ onTriggered: passwordInput.forceActiveFocus()
-+ }
- visible: block.mainItem.model.get(block.mainItem.selectedIndex)["showPassword"]
- onVisibleChanged: {
- if (visible) {
-
More information about the arch-commits
mailing list