* [gentoo-commits] proj/kde:master commit in: dev-libs/soprano/, dev-libs/soprano/files/
@ 2012-06-08 11:08 Andreas Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Hüttel @ 2012-06-08 11:08 UTC (permalink / raw
To: gentoo-commits
commit: a31532f7ad53da59f951161c5bd681539d16d06e
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Jun 8 11:08:28 2012 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jun 8 11:08:28 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a31532f7
[dev-libs/soprano] Restore ABI/API compatibility (tcpclient stub)
(Portage version: 2.2.0_alpha110/git/Linux x86_64, unsigned Manifest commit)
---
.../soprano/files/soprano-2.7.56-tcpclient.patch | 196 ++++++++++++++++++++
...rano-2.7.56.ebuild => soprano-2.7.56-r1.ebuild} | 1 +
2 files changed, 197 insertions(+), 0 deletions(-)
diff --git a/dev-libs/soprano/files/soprano-2.7.56-tcpclient.patch b/dev-libs/soprano/files/soprano-2.7.56-tcpclient.patch
new file mode 100644
index 0000000..2b04f66
--- /dev/null
+++ b/dev-libs/soprano/files/soprano-2.7.56-tcpclient.patch
@@ -0,0 +1,196 @@
+commit ed17a950a9c6f83590fa62cb97e7278ba7f3e234
+Author: Aaron Seigo <aseigo@kde.org>
+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<QTcpSocket*>( 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<QAbstractSocket::SocketError>();
++ 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<BackendSetting>& 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;
+ }
+
diff --git a/dev-libs/soprano/soprano-2.7.56.ebuild b/dev-libs/soprano/soprano-2.7.56-r1.ebuild
similarity index 98%
rename from dev-libs/soprano/soprano-2.7.56.ebuild
rename to dev-libs/soprano/soprano-2.7.56-r1.ebuild
index b5583ab..a29cff6 100644
--- a/dev-libs/soprano/soprano-2.7.56.ebuild
+++ b/dev-libs/soprano/soprano-2.7.56-r1.ebuild
@@ -49,6 +49,7 @@ CMAKE_IN_SOURCE_BUILD="1"
PATCHES=(
"${FILESDIR}/${PN}-2.4.4-make-broken-redland-fatal.cmake"
+ "${FILESDIR}/${PN}-2.7.56-tcpclient.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-libs/soprano/, dev-libs/soprano/files/
@ 2012-06-27 22:25 Andreas Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Hüttel @ 2012-06-27 22:25 UTC (permalink / raw
To: gentoo-commits
commit: e518290a760371d058779d3bee4c5f4e2fc2fbe7
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Jun 27 22:26:43 2012 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 22:26:43 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e518290a
[dev-libs/soprano] Version bump
(Portage version: 2.2.0_alpha113/git/Linux x86_64, unsigned Manifest commit)
---
.../soprano/files/soprano-2.7.56-tcpclient.patch | 196 --------------------
...prano-2.7.56-r1.ebuild => soprano-2.8.0.ebuild} | 2 -
2 files changed, 0 insertions(+), 198 deletions(-)
diff --git a/dev-libs/soprano/files/soprano-2.7.56-tcpclient.patch b/dev-libs/soprano/files/soprano-2.7.56-tcpclient.patch
deleted file mode 100644
index 2b04f66..0000000
--- a/dev-libs/soprano/files/soprano-2.7.56-tcpclient.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-commit ed17a950a9c6f83590fa62cb97e7278ba7f3e234
-Author: Aaron Seigo <aseigo@kde.org>
-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<QTcpSocket*>( 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<QAbstractSocket::SocketError>();
-+ 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<BackendSetting>& 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;
- }
-
diff --git a/dev-libs/soprano/soprano-2.7.56-r1.ebuild b/dev-libs/soprano/soprano-2.8.0.ebuild
similarity index 97%
rename from dev-libs/soprano/soprano-2.7.56-r1.ebuild
rename to dev-libs/soprano/soprano-2.8.0.ebuild
index a29cff6..5a5dfed 100644
--- a/dev-libs/soprano/soprano-2.7.56-r1.ebuild
+++ b/dev-libs/soprano/soprano-2.8.0.ebuild
@@ -43,13 +43,11 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
virtuoso? ( >=dev-db/virtuoso-server-6.1.0 )
"
-S=${WORKDIR}/${P}-beta1
CMAKE_IN_SOURCE_BUILD="1"
PATCHES=(
"${FILESDIR}/${PN}-2.4.4-make-broken-redland-fatal.cmake"
- "${FILESDIR}/${PN}-2.7.56-tcpclient.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-libs/soprano/, dev-libs/soprano/files/
@ 2013-06-01 15:37 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2013-06-01 15:37 UTC (permalink / raw
To: gentoo-commits
commit: 6bed1851bc5da9203f9e9df3c3b71b74a4db5faa
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 15:35:19 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jun 1 15:35:19 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6bed1851
[dev-libs/soprano] Respin broken patch wrt bug #472014.
Package-Manager: portage-2.1.12.2
---
....cmake => soprano-2.9.3-make-broken-redland-fatal.cmake} | 13 +++++++------
dev-libs/soprano/soprano-9999.ebuild | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake b/dev-libs/soprano/files/soprano-2.9.3-make-broken-redland-fatal.cmake
similarity index 50%
rename from dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake
rename to dev-libs/soprano/files/soprano-2.9.3-make-broken-redland-fatal.cmake
index e63c5a4..6641714 100644
--- a/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake
+++ b/dev-libs/soprano/files/soprano-2.9.3-make-broken-redland-fatal.cmake
@@ -1,12 +1,13 @@
-diff -ru cmake/modules/FindRedland.cmake cmake/modules/FindRedland.cmake
---- cmake/modules/FindRedland.cmake 2009-12-18 15:33:44.000000000 +0100
-+++ cmake/modules/FindRedland.cmake 2010-07-06 03:25:55.421484970 +0200
-@@ -108,7 +108,7 @@
+diff --git a/cmake/modules/FindRedland.cmake b/cmake/modules/FindRedland.cmake
+index c7274c9..577dec2 100644
+--- a/cmake/modules/FindRedland.cmake
++++ b/cmake/modules/FindRedland.cmake
+@@ -115,7 +115,7 @@ if(NOT WIN32)
if(NOT "${_TEST_EXITCODE}" EQUAL 0)
set(_REDLAND_VERSION_OK)
message(STATUS "${_OUTPUT}")
- message(STATUS "Redland with broken NEEDED section detected, disabling")
+ message(SEND_ERROR "Broken Redland detected, rebuild it now. If problem persists, report bug at bugs.gentoo.org.")
- endif(NOT "${_TEST_EXITCODE}" EQUAL 0)
- endif(_REDLAND_STORAGE_LIBS)
+ endif()
+ endif()
diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild
index b837cc1..0f1397a 100644
--- a/dev-libs/soprano/soprano-9999.ebuild
+++ b/dev-libs/soprano/soprano-9999.ebuild
@@ -43,7 +43,7 @@ RDEPEND="${COMMON_DEPEND}
CMAKE_IN_SOURCE_BUILD="1"
PATCHES=(
- "${FILESDIR}/${PN}-2.4.4-make-broken-redland-fatal.cmake"
+ "${FILESDIR}/${PN}-2.9.3-make-broken-redland-fatal.cmake"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-01 15:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-01 15:37 [gentoo-commits] proj/kde:master commit in: dev-libs/soprano/, dev-libs/soprano/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2012-06-27 22:25 Andreas Hüttel
2012-06-08 11:08 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox