[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:08:29 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=0077069
The following commit has been merged in the master branch:
commit 00770693c077cf3ae67cfa1f3ed1240dcda4950d
Author: Aleix Pol <aleixpol at kde.org>
Date: Fri Oct 24 19:34:20 2014 +0200
Properly export KTp OTR symbols
Couldn't detect this without a clean build and install.
---
KTp/OTR/CMakeLists.txt | 4 ++++
KTp/OTR/channel-adapter.h | 4 ++--
KTp/OTR/channel-proxy-interface.h | 4 ++--
KTp/OTR/proxy-service-interface.h | 4 ++--
KTp/OTR/types.h | 12 ++++++------
KTp/OTR/utils.h | 14 +++++++-------
6 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/KTp/OTR/CMakeLists.txt b/KTp/OTR/CMakeLists.txt
index c85d626..9f0c6cb 100644
--- a/KTp/OTR/CMakeLists.txt
+++ b/KTp/OTR/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
set (ktp_otr_private_HDRS
channel-adapter.h
channel-proxy-interface.h
@@ -5,6 +7,7 @@ set (ktp_otr_private_HDRS
proxy-service-interface.h
types.h
utils.h
+ ${CMAKE_CURRENT_BINARY_DIR}/ktpotr_export.h
)
add_library (KTpOTR SHARED
@@ -20,6 +23,7 @@ set_target_properties(KTpOTR PROPERTIES
SOVERSION ${KTP_SONUMBER}
EXPORT_NAME OTR
DEFINE_SYMBOL MAKE_KTP_LIB)
+generate_export_header(KTpOTR)
target_link_libraries (KTpOTR
PUBLIC
diff --git a/KTp/OTR/channel-adapter.h b/KTp/OTR/channel-adapter.h
index 9b47473..2e900af 100644
--- a/KTp/OTR/channel-adapter.h
+++ b/KTp/OTR/channel-adapter.h
@@ -21,7 +21,7 @@
#include "types.h"
#include "constants.h"
-#include "KTp/ktp-export.h"
+#include "ktpotr_export.h"
#include <QObject>
@@ -32,7 +32,7 @@
namespace KTp {
-class KTP_EXPORT ChannelAdapter : public QObject, public Tp::RefCounted
+class KTPOTR_EXPORT ChannelAdapter : public QObject, public Tp::RefCounted
{
Q_OBJECT
diff --git a/KTp/OTR/channel-proxy-interface.h b/KTp/OTR/channel-proxy-interface.h
index 1f5d980..ba92de4 100644
--- a/KTp/OTR/channel-proxy-interface.h
+++ b/KTp/OTR/channel-proxy-interface.h
@@ -8,7 +8,7 @@
#ifndef OTR_CHANNEL_PROXY_HEADER
#define OTR_CHANNEL_PROXY_HEADER
-#include "KTp/ktp-export.h"
+#include "ktpotr_export.h"
#include <QtGlobal>
@@ -41,7 +41,7 @@ namespace Client
*
* Proxy class providing a 1:1 mapping of the D-Bus interface "org.kde.TelepathyProxy.ChannelProxy.Interface.OTR".
*/
-class KTP_EXPORT ChannelProxyInterfaceOTRInterface : public Tp::AbstractInterface
+class KTPOTR_EXPORT ChannelProxyInterfaceOTRInterface : public Tp::AbstractInterface
{
Q_OBJECT
diff --git a/KTp/OTR/proxy-service-interface.h b/KTp/OTR/proxy-service-interface.h
index 4d20c8f..3498259 100644
--- a/KTp/OTR/proxy-service-interface.h
+++ b/KTp/OTR/proxy-service-interface.h
@@ -10,7 +10,7 @@
#include "types.h"
-#include <KTp/ktp-export.h>
+#include "ktpotr_export.h"
#include <TelepathyQt/Types>
@@ -45,7 +45,7 @@ namespace Client
*
* Proxy class providing a 1:1 mapping of the D-Bus interface "org.kde.TelepathyProxy.ProxyService".
*/
-class KTP_EXPORT ProxyServiceInterface : public Tp::AbstractInterface
+class KTPOTR_EXPORT ProxyServiceInterface : public Tp::AbstractInterface
{
Q_OBJECT
diff --git a/KTp/OTR/types.h b/KTp/OTR/types.h
index c49ad78..c448513 100644
--- a/KTp/OTR/types.h
+++ b/KTp/OTR/types.h
@@ -20,7 +20,7 @@
#ifndef OTR_TYPES_HEADER
#define OTR_TYPES_HEADER
-#include "KTp/ktp-export.h"
+#include "ktpotr_export.h"
#include <QtGlobal>
#include <QByteArray>
@@ -47,7 +47,7 @@ namespace KTp
* A struct (Contact_Name, Fingerprint, Is_Verified) representing remote
* contact's fingerprint, as returned by Get_Known_Fingerprints
*/
-struct KTP_EXPORT FingerprintInfo
+struct KTPOTR_EXPORT FingerprintInfo
{
QString contactName;
QString fingerprint;
@@ -55,13 +55,13 @@ struct KTP_EXPORT FingerprintInfo
bool inUse;
};
-KTP_EXPORT bool operator==(const FingerprintInfo& v1, const FingerprintInfo& v2);
+KTPOTR_EXPORT bool operator==(const FingerprintInfo& v1, const FingerprintInfo& v2);
inline bool operator!=(const FingerprintInfo& v1, const FingerprintInfo& v2)
{
return !operator==(v1, v2);
}
-KTP_EXPORT QDBusArgument& operator<<(QDBusArgument& arg, const FingerprintInfo& val);
-KTP_EXPORT const QDBusArgument& operator>>(const QDBusArgument& arg, FingerprintInfo& val);
+KTPOTR_EXPORT QDBusArgument& operator<<(QDBusArgument& arg, const FingerprintInfo& val);
+KTPOTR_EXPORT const QDBusArgument& operator>>(const QDBusArgument& arg, FingerprintInfo& val);
/**
* \ingroup list
@@ -72,7 +72,7 @@ KTP_EXPORT const QDBusArgument& operator>>(const QDBusArgument& arg, Fingerprint
typedef QList<FingerprintInfo> FingerprintInfoList;
// ---------- \generated by TpQt ----------------------------------------------------------------
-void KTP_EXPORT registerOtrTypes();
+void KTPOTR_EXPORT registerOtrTypes();
} /* namespace KTp */
diff --git a/KTp/OTR/utils.h b/KTp/OTR/utils.h
index 831a3f4..dd1c366 100644
--- a/KTp/OTR/utils.h
+++ b/KTp/OTR/utils.h
@@ -18,7 +18,7 @@
#ifndef OTR_UTILS_HEADER
#define OTR_UTILS_HEADER
-#include "KTp/ktp-export.h"
+#include "ktpotr_export.h"
#include <TelepathyQt/PendingVariant>
#include <TelepathyQt/Types>
@@ -29,22 +29,22 @@ namespace KTp {
namespace Utils {
/** Extracts pending-messages-ids from message list */
- KTP_EXPORT Tp::UIntList getPendingMessagesIDs(const QList<Tp::ReceivedMessage> &messageQueue);
+ KTPOTR_EXPORT Tp::UIntList getPendingMessagesIDs(const QList<Tp::ReceivedMessage> &messageQueue);
/** Extracts pending-mesage-id from message */
- KTP_EXPORT uint getId(const Tp::MessagePartList &message);
+ KTPOTR_EXPORT uint getId(const Tp::MessagePartList &message);
/** Returns an object path for the otr proxy channel given a text channel it corresponds to */
- KTP_EXPORT QString getOtrProxyObjectPathFor(const Tp::TextChannelPtr &textChannel);
+ KTPOTR_EXPORT QString getOtrProxyObjectPathFor(const Tp::TextChannelPtr &textChannel);
/** Returns true if message is generated internally by OTR implementation */
- KTP_EXPORT bool isOtrEvent(const Tp::ReceivedMessage &message);
+ KTPOTR_EXPORT bool isOtrEvent(const Tp::ReceivedMessage &message);
/** Returns true if text is an OTR protocol message */
- KTP_EXPORT bool isOtrMessage(const QString &text);
+ KTPOTR_EXPORT bool isOtrMessage(const QString &text);
/** Returns notification for a user assuming that the message is an otr event */
- KTP_EXPORT QString processOtrMessage(const Tp::ReceivedMessage &message);
+ KTPOTR_EXPORT QString processOtrMessage(const Tp::ReceivedMessage &message);
}
}
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list