* [gentoo-commits] proj/kde:master commit in: net-im/ktp-accounts-kcm/files/, net-im/ktp-accounts-kcm/
@ 2013-10-11 23:38 Alexey Shvetsov
0 siblings, 0 replies; 3+ messages in thread
From: Alexey Shvetsov @ 2013-10-11 23:38 UTC (permalink / raw
To: gentoo-commits
commit: 66df97284c6a1846df7ca18c3e9abd5fb86de735
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 23:37:48 2013 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 23:37:48 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=66df9728
[net-im/ktp-accounts-kcm] Fix ftbfs due to libmm-qt api change
Package-Manager: portage-2.2.7
---
.../ktp-accounts-kcm-0.6.80-libmm-qt-api-fix.patch | 32 ++++++++++++++++++++++
.../ktp-accounts-kcm-0.6.80.ebuild | 5 ++++
2 files changed, 37 insertions(+)
diff --git a/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.6.80-libmm-qt-api-fix.patch b/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.6.80-libmm-qt-api-fix.patch
new file mode 100644
index 0000000..47e6adb
--- /dev/null
+++ b/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.6.80-libmm-qt-api-fix.patch
@@ -0,0 +1,32 @@
+--- a/plugins/pintxo/modem-combobox.cpp
++++ b/plugins/pintxo/modem-combobox.cpp
+@@ -33,8 +33,8 @@
+ 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 @@
+ 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 @@
+ 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/ktp-accounts-kcm-0.6.80.ebuild b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.6.80.ebuild
index 0c76b1d..b5fd834 100644
--- a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.6.80.ebuild
+++ b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.6.80.ebuild
@@ -31,3 +31,8 @@ DEPEND="
"
RDEPEND="${DEPEND}
"
+
+PATCHES=(
+ "${FILESDIR}/${P}-libmm-qt-api-fix.patch"
+)
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-im/ktp-accounts-kcm/files/, net-im/ktp-accounts-kcm/
@ 2013-10-30 21:27 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2013-10-30 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 0087d4b33b4d6fb1443b743be504ab3f79d8d5e6
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 30 21:26:49 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Oct 30 21:26:49 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0087d4b3
[net-im/ktp-accounts-kcm] Make modemmanager support optional.
Package-Manager: portage-2.2.7
---
.../ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch | 27 ++++++++++++++++++++++
.../ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild | 18 +++++++++++----
net-im/ktp-accounts-kcm/metadata.xml | 5 +++-
3 files changed, 45 insertions(+), 5 deletions(-)
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 0000000..54f1534
--- /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-9999.ebuild b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
index cde851a..af724e3 100644
--- a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
+++ b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
KDE_MINIMAL="4.7"
KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu ia it
-ja kk km lt mai mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian
+ja kk km lt mai mr nb nds nl pa pl pt pt_BR ro ru sk sl sr sr@ijekavian
sr@ijekavianlatin sr@latin sv tr ug uk vi wa zh_CN zh_TW"
inherit kde4-base
@@ -21,13 +21,23 @@ 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}
-"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.7.0-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 8d1e86a..c5ae96e 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>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-im/ktp-accounts-kcm/files/, net-im/ktp-accounts-kcm/
@ 2013-10-31 16:35 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2013-10-31 16:35 UTC (permalink / raw
To: gentoo-commits
commit: 582e5e671782951c8c9b274e0d1e9a8c21ebb8fb
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 16:35:28 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 16:35:28 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=582e5e67
[net-im/ktp-accounts-kcm] Patched merged into master by upstream.
Package-Manager: portage-2.2.7
---
.../ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch | 27 ----------------------
.../ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild | 2 --
2 files changed, 29 deletions(-)
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
deleted file mode 100644
index 54f1534..0000000
--- a/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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-9999.ebuild b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
index af724e3..a2226f5 100644
--- a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
+++ b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
@@ -32,8 +32,6 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-0.7.0-libmm-qt-optional.patch" )
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_build modemmanager pintxo)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-31 16:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-30 21:27 [gentoo-commits] proj/kde:master commit in: net-im/ktp-accounts-kcm/files/, net-im/ktp-accounts-kcm/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2013-10-31 16:35 Johannes Huber
2013-10-11 23:38 Alexey Shvetsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox