Adding upstream patches to make modemmanager (net-libs/libmm-qt) optional and to fix build when its installed wrt bug #489890.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

6 files changed, 108 insertions, 14 deletions

diff --git a/net-im/ktp-accounts-kcm/ChangeLog b/net-im/ktp-accounts-kcm/ChangeLog
index 55a1e6218446..a4aba5a70360 100644
--- a/net-im/ktp-accounts-kcm/ChangeLog
+++ b/net-im/ktp-accounts-kcm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/ktp-accounts-kcm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-accounts-kcm/ChangeLog,v 1.19 2013/10/29 21:48:21 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-accounts-kcm/ChangeLog,v 1.20 2013/10/30 21:41:03 johu Exp $
+
+  30 Oct 2013; Johannes Huber <johu@gentoo.org>
+  +files/ktp-accounts-kcm-0.7.0-libmm-qt-api.patch,
+  +files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch,
+  ktp-accounts-kcm-0.7.0.ebuild, metadata.xml:
+  Adding upstream patches to make modemmanager (net-libs/libmm-qt) optional and
+  to fix build when its installed wrt bug #489890.
 
   29 Oct 2013; Johannes Huber <johu@gentoo.org> -ktp-accounts-kcm-0.6.2.ebuild:
   Remove KDE Telepathy 0.6.2.
diff --git a/net-im/ktp-accounts-kcm/Manifest b/net-im/ktp-accounts-kcm/Manifest
index 7fb163561a7e..096d3897e0cf 100644
--- a/net-im/ktp-accounts-kcm/Manifest
+++ b/net-im/ktp-accounts-kcm/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ktp-accounts-kcm-0.7.0-libmm-qt-api.patch 2304 SHA256 bbd5e9747b7c0c52083c62ea3efcfc50b9f4f6eaf74a2ce15408e4ce36cbb25d SHA512 d042b914db977f6b6db38b2403b15ad4252397f24a8dc38d34feeecc72e0de8fc9ae9ad328115d437d3d579d60f9fd25038ee84d92e40c38236cae1d58d3ee96 WHIRLPOOL a702a57138b4297cac4f1122f2bdec1ed85d84d7a4b909023e0a6e370f76a895e33b966ba9885243f8e01bc62b72a826030e2cfd2af43ec324d09fb9bd50d40e
+AUX ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch 885 SHA256 807f063a58fc0c4a0337e84009ad279c40731e1926c0a722849975d0ed82cd75 SHA512 d4d5fe78225ce89b2f658da5874ef473b7494c2a4eeefc0b7b6a347a673a1ff5587cac61616dab8f57704a808cdc95b91322638dbf6bed74c0ba5e42f57caaba WHIRLPOOL 3f02c8f3d3dd1800840f6a20448d298fcc390d116e7d6c25518eee949df936225c88923d395891716d0d7b6cc809f94dcbfa1f11ec3380ebc6b9163dcf2d5e63
 DIST ktp-accounts-kcm-0.6.3.tar.bz2 238738 SHA256 2a983d1fd2ce5868fec15c61ccf5d32d54598271a559195066c777aaa6c69adb SHA512 b5d5eb47c9827ab15acc9de503b514f1460d47183c3141ffc922d941e7045c1228acfd8264737af3e57ec1f252511ad2ac75a720983579463e887bf3b171a010 WHIRLPOOL e8059ab136db3cb5684cc7268b5633057443f15e49cc32095c594f88eda558c47faaf9ef9ecdfece46650cadc800f1058664d7091d609efcc27e4b160ef261b0
 DIST ktp-accounts-kcm-0.7.0.tar.bz2 247591 SHA256 5f9cb4cf71f6eb5c137f16719147ecbeaf22adee3ba2d2fcec60abb6268ee006 SHA512 e402789224c21053365ae39477ca9aaf681e2bcc982f5909999b69e88e1eef842be0a19b3ff108eabbe9413eac33e932c6f69e5a09977f1f6545596b5b29ec16 WHIRLPOOL 081743409e9be34b51c43c89fd2494f6f8c90ed6c3a97d5a7d7d762626666592ac816654f73f162bacda962616845bb6453860c8813ca4e75fd6a4b5a1915cf6
 EBUILD ktp-accounts-kcm-0.6.3.ebuild 960 SHA256 b8dd5b0eaa0b3b8f900d5271a7e0322972b39dbd2b84807a97f4b0bef71ef603 SHA512 95d3aa93533d22b1a5cc7f4845f6f98a7792d7b9e8d2a91ec9761c6ba23d4245e3fc09e792971de9f4360243f78cb47d4cff4c57e15e12a9268942dffebdaf06 WHIRLPOOL b43ebc376746c9f8873aacb6357ae1ab5f8f625e1d009914a5dad1cae54bb48829d11811a83e26ba4a55337d42ddb26ef99e209fcb894d1dd975db5af0e3f96b
-EBUILD ktp-accounts-kcm-0.7.0.ebuild 962 SHA256 8696cf32067e1eb9d095359451a2018ea336e9f28239366c867d9a76d60ad659 SHA512 d7b30f103bfc2c1aed608f0476aed9542c9d02388f5bdbf32ac8aa4d60dde648e334e8af16eff7b2fee8d0372791e071948644ca4faf06ddae8b0ce08c327e1d WHIRLPOOL fd7695ecb048851c9487d327e487f37b88405ad86ff166c3e6b8de3d273b765753540b2ce45fd1a2009c79f14cb67e3ff0d4b3e6e18c1ab1bd14c77f5db0332e
-MISC ChangeLog 3028 SHA256 d870e38d9212b084c0e1070a99107d5581e0d8b9701f004fb1824adfa7649eef SHA512 8b5c5bb925140f0c832e7cdd3de4ddb9c9a99a0bf1ab856e8a11fa140e0db025f19c9005037aca07a2209729479b2c4e46438f31bfe463b2d7c02439c1de499f WHIRLPOOL 472d4c248e29f4e9f5c14a4498ce6a586a12f6d6b0f31c9b96fed2b9077bc5b7a6b07f94e295d96fc1e51faa4fa31a585c1d090b1add07c562ae005bdaa7d1bd
-MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
+EBUILD ktp-accounts-kcm-0.7.0.ebuild 1226 SHA256 7155dd581b9303c86ad67d998a04360eb98ac2c60dde305e411feb4d73d597b7 SHA512 800f1a5122e861883e0474bb4a77c38e1198e930abca16617cc9e422df633e892baa0555c7091f4f7a94790d671b68f4dc565b7071dc989cdd15e237942e42db WHIRLPOOL fbed476bb9c43104322315cdcf4602bf9de6652a29905abe0d25229713e8ab0f8d201dbb1474a45893e19863194227c96475d809911083567aec315b095167a9
+MISC ChangeLog 3364 SHA256 18899a608cc4f58f8dc984a58ad7cb61cb8b4298d8539940573f6b29b778d196 SHA512 daec905d42cc1258c1eea5de4ac4f7da753e9fbeb3f37d1ba77158290e13ef978f45637d75871472221a8cda34c1ddbc9f7394da53f5232f571eda374775f33e WHIRLPOOL d70aeab1c6d412c86e3271149f14994b1c8ac1c0f03d1c675b09c30c7a74a4faf5cb0b3b52b9ced22585782536652bb491b98160aceba51961b035382661cca8
+MISC metadata.xml 251 SHA256 7d7875656c10edc58cca61fa5448e1b406a649ef807b2685d0a5f062f46a6bc2 SHA512 a50db5a1dafbf407a8daab12e39958ded6168feb4bea94365a33a0d53b0f450c11dd7e59dab399b5c3b872023609ee2ba71cf02717885ab4a6c53dfe295b73dc WHIRLPOOL 35b454b452be4433d942dd7f2ad26ac9b29086d620966a33399f9bf744b81518a2b895a7633426ea9cdf13d7294d6a0c66a04d34bb8fcb4a5ff573a8bb4ebfef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJScDs+AAoJEO+t9ga+3I3aS8QH/2rUlqmdZQruMWRKAyc+DL9p
-XgYWfaQaNdHF8NkR/bK7mlZCKkKpi1gLNT+6+8YaQ05Cnbdq20W+kfGHukITfA85
-Gc/4VldC791FDVqFGGID+p3zxy9JCTKM6vXKjcbd3FOqmZT0TWiLyGC0L0vMplrS
-QnJQErPKBKCE5DKdeB46cgM9IuU1obbTtf9FQ90JYunrlH9FyLtkbRDG9K2EaV8p
-WzlQONyG85Rmsh27Wxs0Qev7YzihxpFIPbwYO4teCst9fJHhxlDqcNf39bV9v/FX
-tgIBEBRX4yffszRUoOWID0tYGufVnV+juQEHN42IVLaDe1McAlbvHgNVc1SKWlg=
-=MOlP
+iQEcBAEBCAAGBQJScXzzAAoJEO+t9ga+3I3aPREIANMXVpvlBD+EZ0mFdukSwq3Q
+mx9DKgFk5cio5hcFR/9dUHhG+sfvBpepb3QfRRNXSqXSIwGGPlbr21dEywY0Jw0/
+mCqJUJUi6vAsW6IBypdXtkZiGhnVh/qMuer4DZTtYiLc1iAQPqcA1QKE6aM+mgCF
+JWGIdNJ+ARMthz8jVM3S25Ax6r7sq490DVGWwxP5BGxWZIbCwJIO+W3Wb5epVCja
+l8Jl8RMiYFPTEo2DZz5Sc2QWZTzrPqugJ2BM8148YzWroSYKYUJ+vFl8qPmZmmMe
+stmee9WS2zha1RzVEBSHinz6odF4Z5kZtQZSffoivMDXspN1BgG/ZeTsAg9dGgQ=
+=+zQg
 -----END PGP SIGNATURE-----
diff --git a/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-api.patch b/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-api.patch
new file mode 100644
index 000000000000..b20536db4605
--- /dev/null
+++ b/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-api.patch
@@ -0,0 +1,41 @@
+commit ce0b5d9b435f4102aae35b3a3d5e9e6d0cb27154
+Author: Anant Kamath <kamathanant@gmail.com>
+Date:   Mon Oct 7 04:15:55 2013 +0530
+
+    Fixed to use ModemManagerQt 0.5.1 API correctly
+    
+    BUG: 325377
+
+diff --git a/plugins/pintxo/modem-combobox.cpp b/plugins/pintxo/modem-combobox.cpp
+index db949c4..9e15c0c 100644
+--- a/plugins/pintxo/modem-combobox.cpp
++++ b/plugins/pintxo/modem-combobox.cpp
+@@ -33,8 +33,8 @@ ModemComboBox::ModemComboBox(QWidget* parent) : QComboBox(parent)
+         Q_FOREACH(ModemManager::ModemInterface::Ptr modem, modems) {
+             ModemManager::ModemGsmCardInterface::Ptr simCard = ModemManager::findModemInterface(modem->udi(), ModemManager::ModemInterface::GsmCard).objectCast<ModemManager::ModemGsmCardInterface>();
+             if(!simCard.isNull()) {
+-                QString simIdent = simCard->getSimIdentifier();
+-                QDBusReply<QString> spn  = simCard->getSpn();
++                QString simIdent = simCard->simIdentifier();
++                QDBusReply<QString> spn  = simCard->serviceProviderName();
+                 addItem(spn.isValid() ? spn.value() : QLatin1String("Unknown modem"));
+             }
+         }
+@@ -51,7 +51,7 @@ QString ModemComboBox::selectedSimIdentifier()
+     if(!modem.isNull()){
+         ModemManager::ModemGsmCardInterface::Ptr simCard = ModemManager::findModemInterface(modems.at(currentIndex())->udi(), ModemManager::ModemInterface::GsmCard).objectCast<ModemManager::ModemGsmCardInterface>();
+         if(!simCard.isNull()) {
+-            return simCard->getSimIdentifier();
++            return simCard->simIdentifier();
+         }
+     }
+     return QString();
+@@ -64,7 +64,7 @@ void ModemComboBox::setSelectedModem(const QString &selectedSimIdentifier)
+         Q_FOREACH(ModemManager::ModemInterface::Ptr modem, modems) {
+             ModemManager::ModemGsmCardInterface::Ptr simCard = ModemManager::findModemInterface(modem->udi(), ModemManager::ModemInterface::GsmCard).objectCast<ModemManager::ModemGsmCardInterface>();
+             if(!simCard.isNull()) {
+-                QString simIdent = simCard->getSimIdentifier();
++                QString simIdent = simCard->simIdentifier();
+                 if (simIdent == selectedSimIdentifier) {
+                     setCurrentIndex(i);
+                     return;
diff --git a/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch b/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch
new file mode 100644
index 000000000000..54f15344597b
--- /dev/null
+++ b/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch
@@ -0,0 +1,27 @@
+commit de71c97def75f047ec0dbaabffb8bc698938e84f
+Author: David Edmundson <kde@davidedmundson.co.uk>
+Date:   Wed Oct 30 19:19:23 2013 +0100
+
+    Make each plugin optional
+
+diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
+index e270078..e752ef1 100644
+--- a/plugins/CMakeLists.txt
++++ b/plugins/CMakeLists.txt
+@@ -1,8 +1,8 @@
+-add_subdirectory (gabble)
+-add_subdirectory (butterfly)
+-add_subdirectory (idle)
+-add_subdirectory (haze)
+-add_subdirectory (rakia)
+-add_subdirectory (salut)
+-add_subdirectory (sunshine)
+-add_subdirectory (pintxo)
++macro_optional_add_subdirectory (gabble)
++macro_optional_add_subdirectory (butterfly)
++macro_optional_add_subdirectory (idle)
++macro_optional_add_subdirectory (haze)
++macro_optional_add_subdirectory (rakia)
++macro_optional_add_subdirectory (salut)
++macro_optional_add_subdirectory (sunshine)
++macro_optional_add_subdirectory (pintxo)
diff --git a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.0.ebuild b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.0.ebuild
index e9daa5434126..083c0468cf96 100644
--- a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.0.ebuild
+++ b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.0.ebuild,v 1.1 2013/10/29 20:06:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.0.ebuild,v 1.2 2013/10/30 21:41:03 johu Exp $
 
 EAPI=5
 
@@ -21,12 +21,26 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="4"
-IUSE="debug"
+IUSE="debug modemmanager"
 
 DEPEND="
 	>=net-im/ktp-common-internals-${PV}
 	net-im/telepathy-mission-control
 	net-libs/telepathy-glib
 	>=net-libs/telepathy-qt-0.9.3
+	modemmanager? ( net-libs/libmm-qt )
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-libmm-qt-api.patch"
+	"${FILESDIR}/${P}-libmm-qt-optional.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build modemmanager pintxo)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/net-im/ktp-accounts-kcm/metadata.xml b/net-im/ktp-accounts-kcm/metadata.xml
index 8d1e86a9cefb..c5ae96e2c633 100644
--- a/net-im/ktp-accounts-kcm/metadata.xml
+++ b/net-im/ktp-accounts-kcm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+	<herd>kde</herd>
+	<use>
+		<flag name="modemmanager">Enable support for mobile broadband devices</flag>
+	</use>
 </pkgmetadata>