From da1be5a21ba06235b67a999f696ec66e35dc17a1 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 9 Jan 2015 00:06:49 +0100 Subject: Prepare for new KDE 5: Frameworks 5.6.0, Plasma 5.1.2, Applications 14.12.0. KDE 5_1501 ========== This is going to be KDE 5 for Slackware-current, composed of Frameworks 5.6.0, Plasma 5.1.2 and Applications 14.12.0. Note that there is still a lot of KDE 4 stuff in here, which is necessary to support all the Applications that have not yet been ported to KDE Frameworks 5. The Applications 15.04 (march 2015) release should offer a lot more KF5 ports. Preliminary build procedure (not verified 100% yet): ---------------------------------------------------- - (crude) get rid of Slackware's KDE: removepkg /var/log/packages/*-4.10.5-* - build all the deps using "updates.SlackBuild" script in the "deps/" directory - note that extra-cmake-modules is required here as well as when building the frameworks, so I just copied it from frameworks to deps. - logoff/login to activate Qt5 profile script. - removepkg akonadi-qt5 or else kdepimlibs-4.14.3 picks up Qt5 dependencies and its compilation will fail as a result - build all the KDE 4 stuff in the "kde/" directory, using "./KDE.SlackBuild kde libs kdebase:nepomuk-core kdepimlibs kdebase kdebindings kdebase:kde-workspace k depim extragear" - installpkg akonadi-qt5 - build the remaining KDE 5 stuff in the "kde/" directory, using "./KDE.SlackBui ld frameworks plasma plasma-extra polkit-kde applications" - build kdei ============================================================================== Eric Hameleers / alien at slackware dot com / 09-jan-2015 --- deps/soprano/soprano_tcpclient_stub.diff | 196 +++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) create mode 100644 deps/soprano/soprano_tcpclient_stub.diff (limited to 'deps/soprano/soprano_tcpclient_stub.diff') diff --git a/deps/soprano/soprano_tcpclient_stub.diff b/deps/soprano/soprano_tcpclient_stub.diff new file mode 100644 index 0000000..2b04f66 --- /dev/null +++ b/deps/soprano/soprano_tcpclient_stub.diff @@ -0,0 +1,196 @@ +commit ed17a950a9c6f83590fa62cb97e7278ba7f3e234 +Author: Aaron Seigo +Date: Wed May 30 10:18:52 2012 +0200 + + restore SC / BC with a stub impl of tcpclient + +diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt +index 2689568..4e73e3c 100644 +--- a/client/CMakeLists.txt ++++ b/client/CMakeLists.txt +@@ -14,6 +14,8 @@ include_directories( + ) + + set(soprano_client_SRC ++ ${soprano_server_SOURCE_DIR}/datastream.cpp ++ tcpclient.cpp + socket.cpp + socketstream.cpp + localsocketclient.cpp +@@ -94,6 +96,7 @@ INSTALL(TARGETS sopranoclient + + install( + FILES ++ tcpclient.h + localsocketclient.h + DESTINATION include/soprano + ) +diff --git a/client/tcpclient.cpp b/client/tcpclient.cpp +index 796ca59..01dce0e 100644 +--- a/client/tcpclient.cpp ++++ b/client/tcpclient.cpp +@@ -33,151 +33,58 @@ Q_DECLARE_METATYPE( QAbstractSocket::SocketError ) + const quint16 Soprano::Client::TcpClient::DEFAULT_PORT = 5000; + + +-namespace Soprano { +- namespace Client { +- class TcpClientConnection : public ClientConnection +- { +- public: +- TcpClientConnection( const QHostAddress& address, int port, QObject* parent ); +- ~TcpClientConnection(); +- +- protected: +- QIODevice* newConnection(); +- bool isConnected( QIODevice* ); +- +- private: +- QHostAddress m_address; +- int m_port; +- }; +- +- TcpClientConnection::TcpClientConnection( const QHostAddress& address, int port, QObject* parent ) +- : ClientConnection( parent ), +- m_address( address ), +- m_port( port ) +- { +- } +- +- TcpClientConnection::~TcpClientConnection() +- { +- } +- +- QIODevice* TcpClientConnection::newConnection() +- { +- clearError(); +- +- QTcpSocket* socket = new QTcpSocket; +- socket->connectToHost( m_address, m_port ); +- if ( socket->waitForConnected() ) { +- QObject::connect( socket, SIGNAL(error(QAbstractSocket::SocketError)), +- parent(), SLOT(slotError(QAbstractSocket::SocketError)) ); +- return socket; +- } +- else { +- setError( socket->errorString() ); +- delete socket; +- return 0; +- } +- } +- +- bool TcpClientConnection::isConnected( QIODevice* device ) { +- return device ? ( static_cast( device )->state() == QAbstractSocket::ConnectedState ) : false; +- } +- } +-} +- +- +-class Soprano::Client::TcpClient::Private +-{ +-public: +- Private() +- : connection( 0 ) { +- } +- +- TcpClientConnection* connection; +-}; +- +- + Soprano::Client::TcpClient::TcpClient( QObject* parent ) + : QObject( parent ), +- d( new Private() ) ++ d( 0 ) + { +- qRegisterMetaType(); ++ qWarning() << "This class is deprecated, and the implementation is only a stub now. DO NOT USE IT IN YOUR APPLICATION."; + } + + + Soprano::Client::TcpClient::~TcpClient() + { +- disconnect(); +- delete d; ++ //delete d; + } + + + bool Soprano::Client::TcpClient::connect( const QHostAddress& address, int port ) + { +- if ( !isConnected() ) { +- if ( !d->connection ) +- d->connection = new TcpClientConnection( address, port, this ); +- if ( d->connection->connect() && +- d->connection->checkProtocolVersion() ) { +- return true; +- } +- else { +- disconnect(); +- return false; +- } +- } +- else { +- setError( "Already connected" ); +- return false; +- } ++ Q_UNUSED(address) ++ Q_UNUSED(port) ++ return false; + } + + + bool Soprano::Client::TcpClient::isConnected() + { +- return d->connection ? d->connection->isConnected() : false; ++ return false; + } + + + void Soprano::Client::TcpClient::disconnect() + { +- delete d->connection; +- d->connection = 0; + } + + + Soprano::Model* Soprano::Client::TcpClient::createModel( const QString& name, const QList& settings ) + { +- if ( d->connection ) { +- int modelId = d->connection->createModel( name, settings ); +- setError( d->connection->lastError() ); +- if ( modelId > 0 ) { +- StorageModel* model = new ClientModel( 0, modelId, d->connection ); +- return model; +- } +- } +- else { +- setError( "Not connected" ); +- } +- ++ Q_UNUSED(name) ++ Q_UNUSED(settings) ++ setError( "Not connected" ); + return 0; + } + + + void Soprano::Client::TcpClient::removeModel( const QString& name ) + { +- if ( d->connection ) { +- d->connection->removeModel( name ); +- setError( d->connection->lastError() ); +- } +- else { +- setError( "Not connected" ); +- } ++ Q_UNUSED(name) ++ setError( "Not connected" ); + } + + + void Soprano::Client::TcpClient::slotError( QAbstractSocket::SocketError error ) + { ++ Q_UNUSED(error) + qDebug() << "Error: " << error; + } + -- cgit v1.2.3