[arch-commits] Commit in kdelibs/kde-unstable (3 files)
Date: Tuesday, June 12, 2012 @ 01:41:31
Author: andrea
Revision: 161505
KDE 4.9beta2
Modified:
kdelibs/kde-unstable/PKGBUILD
Deleted:
kdelibs/kde-unstable/fix-battery.patch
kdelibs/kde-unstable/fix-mount.patch
---+
PKGBUILD | 17 +
fix-battery.patch | 39 ---
fix-mount.patch | 44
3 files changed, 5 insertions(+), 95 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-06-12 05:34:19 UTC (rev 161504)
+++ PKGBUILD2012-06-12 05:41:31 UTC (rev 161505)
@@ -3,8 +3,8 @@
# Contributor: Pierre Schmitz pie...@archlinux.de
pkgname=kdelibs
-pkgver=4.8.80
-pkgrel=5
+pkgver=4.8.90
+pkgrel=1
pkgdesc=KDE Core Libraries
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kdelibs'
@@ -18,15 +18,11 @@
install=${pkgname}.install
source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
'kde-applications-menu.patch' 'archlinux-menu.patch'
-'use-pythondontwritebytecode.patch'
-'fix-battery.patch'
-'fix-mount.patch')
-sha1sums=('e0d4cef3a09c85e4309e48d7ab62ba9b8eccc575'
+'use-pythondontwritebytecode.patch')
+sha1sums=('926d0c0e6a6134d7292ae4d71e74541044d75a2d'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa'
- '49e3d3e2b9b6e7b3abf6cdf0c37f30fbe7095797'
- '7b74500f1e51d3f1ab8037d92b60285d6ab7d964')
+ 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -39,9 +35,6 @@
# Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
patch -p0 -i ${srcdir}/use-pythondontwritebytecode.patch
- patch -p1 -i ${srcdir}/fix-battery.patch
- patch -p1 -i ${srcdir}/fix-mount.patch
-
cd ${srcdir}
mkdir build
cd build
Deleted: fix-battery.patch
===
--- fix-battery.patch 2012-06-12 05:34:19 UTC (rev 161504)
+++ fix-battery.patch 2012-06-12 05:41:31 UTC (rev 161505)
@@ -1,39 +0,0 @@
-commit 7f8c750541790de5a380409466cf07cfe19c3651
-Author: Lukas Tinkl lu...@kde.org
-Date: Wed Jun 6 15:47:39 2012 +0200
-
-Revert don't consider external batteries (mice, keyboard, BT) as primary
-
-This reverts commit d1661d1638851fd950c5926fb2040ea2abe2a8f0.
-
-This causes more trouble than expected, newer kernels/upower contain a bug
that (in my case
-and many others) marks ALL batteries as non-powersupply.
-
-BUG:301033
-CCBUG:300787
-
-diff --git a/solid/solid/backends/upower/upowerbattery.cpp
b/solid/solid/backends/upower/upowerbattery.cpp
-index 9c5f675..ab555d4 100644
a/solid/solid/backends/upower/upowerbattery.cpp
-+++ b/solid/solid/backends/upower/upowerbattery.cpp
-@@ -44,18 +44,15 @@ Solid::Battery::BatteryType Battery::type() const
- {
- Solid::Battery::BatteryType result = Solid::Battery::UnknownBattery;
- const uint t = m_device-prop(Type).toUInt();
--bool powerSupply = m_device-prop(PowerSupply).toBool();
- switch (t)
- {
- case 1: // TODO Line Power
- break;
- case 2:
--if (powerSupply)
--result = Solid::Battery::PrimaryBattery;
-+result = Solid::Battery::PrimaryBattery;
- break;
- case 3:
--if (powerSupply)
--result = Solid::Battery::UpsBattery;
-+result = Solid::Battery::UpsBattery;
- break;
- case 4:
- result = Solid::Battery::MonitorBattery;
Deleted: fix-mount.patch
===
--- fix-mount.patch 2012-06-12 05:34:19 UTC (rev 161504)
+++ fix-mount.patch 2012-06-12 05:41:31 UTC (rev 161505)
@@ -1,44 +0,0 @@
-commit 19213a6c34e1b47a100815ccbfee8b5c70c3c12a
-Author: Alex Fiestas afies...@kde.org
-Date: Tue Jun 5 18:12:28 2012 +0200
-
-Emit deviceRemoved/Added with the right deviceList set
-
-The problem is quite straightforward, deviceAdded is being emitted when
-the m_deviceList has the OLD list, so the new device is still NOT in it.
-If the user of the library instances a device Solid::Device(UDI) in the
-slot after that signal, the device will be null because it will not be
-found in m_deviceList.
-
-REVIEW: 105132
-
-diff --git a/solid/solid/backends/fstab/fstabmanager.cpp
b/solid/solid/backends/fstab/fstabmanager.cpp
-index 608159f..6b29fa4 100644
a/solid/solid/backends/fstab/fstabmanager.cpp
-+++ b/solid/solid/backends/fstab/fstabmanager.cpp
-@@ -116,17 +116,19 @@ void FstabManager::_k_updateDeviceList()
- QSetQString newlist = deviceList.toSet();
- QSetQString oldlist = m_deviceList.toSet();
-
--
[arch-commits] Commit in kdelibs/kde-unstable (3 files)
Date: Wednesday, June 6, 2012 @ 12:37:51
Author: andrea
Revision: 160904
upgpkg: kdelibs 4.8.80-5
Fix battery not present and cannot mount partition bugs
Added:
kdelibs/kde-unstable/fix-battery.patch
kdelibs/kde-unstable/fix-mount.patch
Modified:
kdelibs/kde-unstable/PKGBUILD
---+
PKGBUILD | 13 ++---
fix-battery.patch | 39 +++
fix-mount.patch | 44
3 files changed, 93 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-06-06 16:18:25 UTC (rev 160903)
+++ PKGBUILD2012-06-06 16:37:51 UTC (rev 160904)
@@ -4,7 +4,7 @@
pkgname=kdelibs
pkgver=4.8.80
-pkgrel=4
+pkgrel=5
pkgdesc=KDE Core Libraries
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kdelibs'
@@ -18,11 +18,15 @@
install=${pkgname}.install
source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
'kde-applications-menu.patch' 'archlinux-menu.patch'
-'use-pythondontwritebytecode.patch')
+'use-pythondontwritebytecode.patch'
+'fix-battery.patch'
+'fix-mount.patch')
sha1sums=('e0d4cef3a09c85e4309e48d7ab62ba9b8eccc575'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa')
+ 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa'
+ '49e3d3e2b9b6e7b3abf6cdf0c37f30fbe7095797'
+ '7b74500f1e51d3f1ab8037d92b60285d6ab7d964')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -34,6 +38,9 @@
# Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
patch -p0 -i ${srcdir}/use-pythondontwritebytecode.patch
+
+ patch -p1 -i ${srcdir}/fix-battery.patch
+ patch -p1 -i ${srcdir}/fix-mount.patch
cd ${srcdir}
mkdir build
Added: fix-battery.patch
===
--- fix-battery.patch (rev 0)
+++ fix-battery.patch 2012-06-06 16:37:51 UTC (rev 160904)
@@ -0,0 +1,39 @@
+commit 7f8c750541790de5a380409466cf07cfe19c3651
+Author: Lukas Tinkl lu...@kde.org
+Date: Wed Jun 6 15:47:39 2012 +0200
+
+Revert don't consider external batteries (mice, keyboard, BT) as primary
+
+This reverts commit d1661d1638851fd950c5926fb2040ea2abe2a8f0.
+
+This causes more trouble than expected, newer kernels/upower contain a bug
that (in my case
+and many others) marks ALL batteries as non-powersupply.
+
+BUG:301033
+CCBUG:300787
+
+diff --git a/solid/solid/backends/upower/upowerbattery.cpp
b/solid/solid/backends/upower/upowerbattery.cpp
+index 9c5f675..ab555d4 100644
+--- a/solid/solid/backends/upower/upowerbattery.cpp
b/solid/solid/backends/upower/upowerbattery.cpp
+@@ -44,18 +44,15 @@ Solid::Battery::BatteryType Battery::type() const
+ {
+ Solid::Battery::BatteryType result = Solid::Battery::UnknownBattery;
+ const uint t = m_device-prop(Type).toUInt();
+-bool powerSupply = m_device-prop(PowerSupply).toBool();
+ switch (t)
+ {
+ case 1: // TODO Line Power
+ break;
+ case 2:
+-if (powerSupply)
+-result = Solid::Battery::PrimaryBattery;
++result = Solid::Battery::PrimaryBattery;
+ break;
+ case 3:
+-if (powerSupply)
+-result = Solid::Battery::UpsBattery;
++result = Solid::Battery::UpsBattery;
+ break;
+ case 4:
+ result = Solid::Battery::MonitorBattery;
Added: fix-mount.patch
===
--- fix-mount.patch (rev 0)
+++ fix-mount.patch 2012-06-06 16:37:51 UTC (rev 160904)
@@ -0,0 +1,44 @@
+commit 19213a6c34e1b47a100815ccbfee8b5c70c3c12a
+Author: Alex Fiestas afies...@kde.org
+Date: Tue Jun 5 18:12:28 2012 +0200
+
+Emit deviceRemoved/Added with the right deviceList set
+
+The problem is quite straightforward, deviceAdded is being emitted when
+the m_deviceList has the OLD list, so the new device is still NOT in it.
+If the user of the library instances a device Solid::Device(UDI) in the
+slot after that signal, the device will be null because it will not be
+found in m_deviceList.
+
+REVIEW: 105132
+
+diff --git a/solid/solid/backends/fstab/fstabmanager.cpp
b/solid/solid/backends/fstab/fstabmanager.cpp
+index 608159f..6b29fa4 100644
+--- a/solid/solid/backends/fstab/fstabmanager.cpp
b/solid/solid/backends/fstab/fstabmanager.cpp
+@@ -116,17 +116,19 @@ void FstabManager::_k_updateDeviceList()
+ QSetQString newlist = deviceList.toSet();
+ QSetQString oldlist = m_deviceList.toSet();
+
+-foreach(const QString device, newlist) {
+-if ( !oldlist.contains(device) )
+-
[arch-commits] Commit in kdelibs/kde-unstable (3 files)
Date: Sunday, January 31, 2010 @ 17:27:45
Author: pierre
Revision: 66586
adjust patches
Modified:
kdelibs/kde-unstable/PKGBUILD
kdelibs/kde-unstable/archlinux-menu.patch
kdelibs/kde-unstable/kde-applications-menu.patch
-+
PKGBUILD|4 ++--
archlinux-menu.patch| 20 +---
kde-applications-menu.patch | 16 +++-
3 files changed, 18 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-31 22:08:20 UTC (rev 66585)
+++ PKGBUILD2010-01-31 22:27:45 UTC (rev 66586)
@@ -18,8 +18,8 @@
source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
'kde-applications-menu.patch' 'archlinux-menu.patch'
'abs-syntax-highlight.patch')
md5sums=('56cd5ff7dfe996a283ae28609047f40e'
- '280f34ee159845f8902c31bd499254fc'
- '79e39afdfc7081f44971da21a8427879'
+ '2b30cc3e382e99333e7ff388943473e9'
+ 'a2c351e5c4d5bef39865e5fc1a39219a'
'18ea42696a7f41332a092d6ead7efc6a')
build() {
Modified: archlinux-menu.patch
===
--- archlinux-menu.patch2010-01-31 22:08:20 UTC (rev 66585)
+++ archlinux-menu.patch2010-01-31 22:27:45 UTC (rev 66586)
@@ -1,24 +1,22 @@
kdelibs-4.3.80/kded/applications.menu~ 2009-12-12 15:53:10.989993958
+0100
-+++ kdelibs-4.3.80/kded/applications.menu 2009-12-12 15:55:47.653312211
+0100
-@@ -15,6 +15,7 @@
- MenunameMore/Menuname
+--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.0
+
kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077
+
+@@ -16,11 +16,19 @@
/DefaultLayout
Layout
-+ MenunameArchlinux/Menuname
- MenunameInternet/Menuname
- MenunameOffice/Menuname
- MenunameGraphics/Menuname
-@@ -30,6 +31,13 @@
+ Merge type=menus/
++ MenunameArch Linux/Menuname
+ MenunameApplications/Menuname
+ Merge type=files/
/Layout
Menu
-+ NameArchlinux/Name
++ NameArch Linux/Name
+ DirectoryArchlinux.directory/Directory
+ Include
+ CategoryArchlinux/Category
+ /Include
+ /Menu
+ Menu
- NameLostFound/Name
+ NameApplications/Name
Directorykde-unknown.directory/Directory
OnlyUnallocated/
Modified: kde-applications-menu.patch
===
--- kde-applications-menu.patch 2010-01-31 22:08:20 UTC (rev 66585)
+++ kde-applications-menu.patch 2010-01-31 22:27:45 UTC (rev 66586)
@@ -1,6 +1,5 @@
-diff -Nura kdelibs-4.3.0.orig/kded/CMakeLists.txt
kdelibs-4.3.0/kded/CMakeLists.txt
kdelibs-4.3.0.orig/kded/CMakeLists.txt 2008-12-10 17:12:28.0
+0100
-+++ kdelibs-4.3.0/kded/CMakeLists.txt 2009-07-30 13:22:06.0 +0200
+--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.0 +
kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +
@@ -69,7 +69,7 @@
if (WIN32)
install( FILES applications.menu DESTINATION
${SHARE_INSTALL_PREFIX}/xdg/menus )
@@ -10,12 +9,11 @@
endif (WIN32)
install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kded.upd DESTINATION
${DATA_INSTALL_DIR}/kconf_update )
-diff -Nura kdelibs-4.3.0.orig/kded/kbuildsycoca.cpp
kdelibs-4.3.0/kded/kbuildsycoca.cpp
kdelibs-4.3.0.orig/kded/kbuildsycoca.cpp 2009-03-10 13:26:04.0
+0100
-+++ kdelibs-4.3.0/kded/kbuildsycoca.cpp2009-07-30 13:22:06.0
+0200
-@@ -306,7 +306,7 @@
- connect(g_vfolder, SIGNAL(newService(const QString , KService::Ptr *)),
- this, SLOT(slotCreateEntry(const QString , KService::Ptr *)));
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.0
+
kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572
+
+@@ -302,7 +302,7 @@
+ if (!m_trackId.isEmpty())
+ g_vfolder-setTrackId(m_trackId);
- VFolderMenu::SubMenu *kdeMenu =
g_vfolder-parseMenu(applications.menu, true);
+ VFolderMenu::SubMenu *kdeMenu =
g_vfolder-parseMenu(kde-applications.menu, true);
