diff options
| author | Theo Chatzimichos <tampakrap@gentoo.org> | 2010-12-08 18:24:41 +0200 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2010-12-08 18:24:41 +0200 |
| commit | f57ca8fa0519c18149296bd7b8fe7ff7f53393e3 (patch) | |
| tree | 4d4a78efb4a251ba12d71ca194da9ce98e356713 | |
| parent | af9eeeaa1b6fd3d27fcfe96adcad969ee7e1bf04 (diff) | |
| download | kde-f57ca8fa0519c18149296bd7b8fe7ff7f53393e3.tar.gz kde-f57ca8fa0519c18149296bd7b8fe7ff7f53393e3.tar.bz2 kde-f57ca8fa0519c18149296bd7b8fe7ff7f53393e3.zip | |
[kde-base/kdelibs] remove udisks patch, it was taken from svn for beta1
| -rw-r--r-- | kde-base/kdelibs/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.5.80-udisks.patch | 45 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.5.85.ebuild | 1 |
3 files changed, 1 insertions, 48 deletions
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index e10a32a6738..8cd404d1748 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -19,9 +19,8 @@ AUX kdelibs-4.4.90-xslt.patch 553 RMD160 b667c3330a2721ab0de237f50af81ec830954c0 AUX kdelibs-4.5.0-kfilemetadatawidget.patch 1604 RMD160 a6ce10ad49190a779aabff86aef47579134ac279 SHA1 69ce54b4821859105717a6002444d2ba41e13632 SHA256 81da7bc2a364f67a22729b9ddd9fea30944ee5aaac768cd801adc0ce44fb21db AUX kdelibs-4.5.73-module-suffix.patch 4098 RMD160 e003fcb8a496bcbc1c77f16a1e4ab81d735e9567 SHA1 1e15b7e24cbe41bc3f492b8e862fbd7da7f03212 SHA256 7e4116bf0f475b9ec4a6000830f28e0dcded039f58c2cb73c49c295ef276afd9 AUX kdelibs-4.5.74-klauncher_mac.patch 952 RMD160 666491525d51ca24c9b4228d97aa368ebd9b2eb8 SHA1 6a0ccd169f910842d27d1cc16f4f0f3e7c671de6 SHA256 8477a100f6c73ced8a8be06ac9025d83434fa6396daea8f86df85d7a3fb6fe84 -AUX kdelibs-4.5.80-udisks.patch 1887 RMD160 793e9bad5a965cb7b25df698ec034d6c12396df5 SHA1 490dd553b05323659393841faf69520cabdd071e SHA256 04e1163da9eef5586e28d64eb8de638a519e0bd283b2258f90192a6d650e0494 DIST kdelibs-4.5.85.tar.bz2 14081810 RMD160 3daffd01a6dd849fbb75df7bb1a278bd89bc2eb5 SHA1 d48591373e3d9a3de9ee2bd7940eaf111c04eb98 SHA256 f25a27f97f76f7dc15017d170adc616d8476300282d58c38efff260179edb2ee -EBUILD kdelibs-4.5.85.ebuild 9406 RMD160 7bb8db0adc192aa0c92d66cb65841fd2ab74ab05 SHA1 1d0ab24d4d0ee327b27d48781b40275c2f929f60 SHA256 799e9554f67f00cf11006cb25d59456f34ec0643b3ab3bc5a21ffcec7ca5869b +EBUILD kdelibs-4.5.85.ebuild 9365 RMD160 9ea58e3c4e9132bc4939ca6c0792217a519546c1 SHA1 49bfbd4e35a615761c3f4c0d14ac8a2cb2f511d7 SHA256 10183cb78afef68e25cb9994daff49f0a7d54a5607b6e236d533b77fcf9e3104 EBUILD kdelibs-4.5.9999.ebuild 9192 RMD160 aea9f8a496a66d9bcb169aff45a79f834cb42039 SHA1 140b699b0f526df9f86fe11ac36299aa4d98eae6 SHA256 513782145bb5267debf06d363c29b263e3db056b6ef573ff1f9f8242f0b00ac4 EBUILD kdelibs-9999.ebuild 9338 RMD160 ef63fec63e5d0e3264ea73091fcc69034af73688 SHA1 231203f6420a30dadf86adf53e96ef3f94a1bd4f SHA256 2b6d49d90c4a065df6fcbeab395cffb9bb0398c2053ebead8ce87dc54b1d816a MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7 diff --git a/kde-base/kdelibs/files/kdelibs-4.5.80-udisks.patch b/kde-base/kdelibs/files/kdelibs-4.5.80-udisks.patch deleted file mode 100644 index 30d1b6a8258..00000000000 --- a/kde-base/kdelibs/files/kdelibs-4.5.80-udisks.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: solid/solid/backends/udisks/udisksdevice.cpp -=================================================================== ---- solid/solid/backends/udisks/udisksdevice.cpp (Revision 1200041) -+++ solid/solid/backends/udisks/udisksdevice.cpp (Arbeitskopie) -@@ -37,6 +37,10 @@ - #include <QtCore/QMetaObject> - #include <QtCore/QMetaProperty> - -+#include <QtDBus/QDBusMessage> -+#include <QtDBus/QDBusMetaType> -+#include <QtDBus/QDBusPendingReply> -+ - using namespace Solid::Backends::UDisks; - - // Adapted from KLocale as Solid needs to be Qt-only -@@ -692,12 +696,11 @@ - - QMap<QString, QVariant> UDisksDevice::allProperties() const - { -- const QMetaObject* metaObject = m_device->metaObject(); -- const int count = metaObject->propertyCount(); -- for(int i = metaObject->propertyOffset(); i < count; ++i) { -- const QString name = QString::fromUtf8(metaObject->property(i).name()); -- m_cache.insert(name, m_device->property(name.toUtf8())); -- } -+ QDBusMessage call = QDBusMessage::createMethodCall(m_device->service(), m_device->path(), -+ "org.freedesktop.DBus.Properties", "GetAll"); -+ QDBusPendingReply< QVariantMap > reply = QDBusConnection::systemBus().asyncCall(call); -+ reply.waitForFinished(); -+ m_cache = reply.value(); - - return m_cache; - } -Index: solid/solid/backends/udisks/udisksmanager.cpp -=================================================================== ---- solid/solid/backends/udisks/udisksmanager.cpp (Revision 1200041) -+++ solid/solid/backends/udisks/udisksmanager.cpp (Arbeitskopie) -@@ -48,6 +48,7 @@ - << Solid::DeviceInterface::StorageVolume; - - qDBusRegisterMetaType<QList<QDBusObjectPath> >(); -+ qDBusRegisterMetaType<QVariantMap>(); - - connect(&m_manager, SIGNAL(DeviceAdded(QDBusObjectPath)), - this, SLOT(slotDeviceAdded(QDBusObjectPath))); diff --git a/kde-base/kdelibs/kdelibs-4.5.85.ebuild b/kde-base/kdelibs/kdelibs-4.5.85.ebuild index cfebfbb47c1..598c0cbf608 100644 --- a/kde-base/kdelibs/kdelibs-4.5.85.ebuild +++ b/kde-base/kdelibs/kdelibs-4.5.85.ebuild @@ -133,7 +133,6 @@ PATCHES=( # "${FILESDIR}/${PN}-4.5.74-klauncher_mac.patch" - FIXME read above "${FILESDIR}/${PN}-4.4.3-mimetypes.patch" "${FILESDIR}/${PN}-4.4.90-xslt.patch" - "${FILESDIR}/${PN}-4.5.80-udisks.patch" ) src_prepare() { |