| 1 |
johu 13/10/30 21:41:03 |
| 2 |
|
| 3 |
Added: ktp-accounts-kcm-0.7.0-libmm-qt-api.patch |
| 4 |
ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch |
| 5 |
Log: |
| 6 |
Adding upstream patches to make modemmanager (net-libs/libmm-qt) optional and to fix build when its installed wrt bug #489890. |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-api.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-api.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-api.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: ktp-accounts-kcm-0.7.0-libmm-qt-api.patch |
| 17 |
=================================================================== |
| 18 |
commit ce0b5d9b435f4102aae35b3a3d5e9e6d0cb27154 |
| 19 |
Author: Anant Kamath <kamathanant@×××××.com> |
| 20 |
Date: Mon Oct 7 04:15:55 2013 +0530 |
| 21 |
|
| 22 |
Fixed to use ModemManagerQt 0.5.1 API correctly |
| 23 |
|
| 24 |
BUG: 325377 |
| 25 |
|
| 26 |
diff --git a/plugins/pintxo/modem-combobox.cpp b/plugins/pintxo/modem-combobox.cpp |
| 27 |
index db949c4..9e15c0c 100644 |
| 28 |
--- a/plugins/pintxo/modem-combobox.cpp |
| 29 |
+++ b/plugins/pintxo/modem-combobox.cpp |
| 30 |
@@ -33,8 +33,8 @@ ModemComboBox::ModemComboBox(QWidget* parent) : QComboBox(parent) |
| 31 |
Q_FOREACH(ModemManager::ModemInterface::Ptr modem, modems) { |
| 32 |
ModemManager::ModemGsmCardInterface::Ptr simCard = ModemManager::findModemInterface(modem->udi(), ModemManager::ModemInterface::GsmCard).objectCast<ModemManager::ModemGsmCardInterface>(); |
| 33 |
if(!simCard.isNull()) { |
| 34 |
- QString simIdent = simCard->getSimIdentifier(); |
| 35 |
- QDBusReply<QString> spn = simCard->getSpn(); |
| 36 |
+ QString simIdent = simCard->simIdentifier(); |
| 37 |
+ QDBusReply<QString> spn = simCard->serviceProviderName(); |
| 38 |
addItem(spn.isValid() ? spn.value() : QLatin1String("Unknown modem")); |
| 39 |
} |
| 40 |
} |
| 41 |
@@ -51,7 +51,7 @@ QString ModemComboBox::selectedSimIdentifier() |
| 42 |
if(!modem.isNull()){ |
| 43 |
ModemManager::ModemGsmCardInterface::Ptr simCard = ModemManager::findModemInterface(modems.at(currentIndex())->udi(), ModemManager::ModemInterface::GsmCard).objectCast<ModemManager::ModemGsmCardInterface>(); |
| 44 |
if(!simCard.isNull()) { |
| 45 |
- return simCard->getSimIdentifier(); |
| 46 |
+ return simCard->simIdentifier(); |
| 47 |
} |
| 48 |
} |
| 49 |
return QString(); |
| 50 |
@@ -64,7 +64,7 @@ void ModemComboBox::setSelectedModem(const QString &selectedSimIdentifier) |
| 51 |
Q_FOREACH(ModemManager::ModemInterface::Ptr modem, modems) { |
| 52 |
ModemManager::ModemGsmCardInterface::Ptr simCard = ModemManager::findModemInterface(modem->udi(), ModemManager::ModemInterface::GsmCard).objectCast<ModemManager::ModemGsmCardInterface>(); |
| 53 |
if(!simCard.isNull()) { |
| 54 |
- QString simIdent = simCard->getSimIdentifier(); |
| 55 |
+ QString simIdent = simCard->simIdentifier(); |
| 56 |
if (simIdent == selectedSimIdentifier) { |
| 57 |
setCurrentIndex(i); |
| 58 |
return; |
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
1.1 net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch |
| 63 |
|
| 64 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch?rev=1.1&view=markup |
| 65 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch?rev=1.1&content-type=text/plain |
| 66 |
|
| 67 |
Index: ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch |
| 68 |
=================================================================== |
| 69 |
commit de71c97def75f047ec0dbaabffb8bc698938e84f |
| 70 |
Author: David Edmundson <kde@×××××××××××××××××.uk> |
| 71 |
Date: Wed Oct 30 19:19:23 2013 +0100 |
| 72 |
|
| 73 |
Make each plugin optional |
| 74 |
|
| 75 |
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt |
| 76 |
index e270078..e752ef1 100644 |
| 77 |
--- a/plugins/CMakeLists.txt |
| 78 |
+++ b/plugins/CMakeLists.txt |
| 79 |
@@ -1,8 +1,8 @@ |
| 80 |
-add_subdirectory (gabble) |
| 81 |
-add_subdirectory (butterfly) |
| 82 |
-add_subdirectory (idle) |
| 83 |
-add_subdirectory (haze) |
| 84 |
-add_subdirectory (rakia) |
| 85 |
-add_subdirectory (salut) |
| 86 |
-add_subdirectory (sunshine) |
| 87 |
-add_subdirectory (pintxo) |
| 88 |
+macro_optional_add_subdirectory (gabble) |
| 89 |
+macro_optional_add_subdirectory (butterfly) |
| 90 |
+macro_optional_add_subdirectory (idle) |
| 91 |
+macro_optional_add_subdirectory (haze) |
| 92 |
+macro_optional_add_subdirectory (rakia) |
| 93 |
+macro_optional_add_subdirectory (salut) |
| 94 |
+macro_optional_add_subdirectory (sunshine) |
| 95 |
+macro_optional_add_subdirectory (pintxo) |
Archives