Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a598690cbb6d5843f01ecd7217902065f0b3d815)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a598690cbb6d5843f01ecd7217902065f0b3d815)
  • Date: Mon, 7 Jan 2008 10:40:04 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

kde4/kdelibs4/HISTORY | 1
kde4/kdelibs4/qt44.patch | 113
++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 113 insertions(+), 1 deletion(-)

New commits:
commit a598690cbb6d5843f01ecd7217902065f0b3d815
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

kdelibs4: qt44.patch: appended a fix for phonon

diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 4fe0237..84c8e42 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,4 +1,5 @@
2008-01-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * qt44.patch: appended a fix for phonon
* PRE_BUILD, qt44.patch: added patch from r745967 so it compiles with
qt4.4

2008-01-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
diff --git a/kde4/kdelibs4/qt44.patch b/kde4/kdelibs4/qt44.patch
index 17bc63e..e0847bd 100644
--- a/kde4/kdelibs4/qt44.patch
+++ b/kde4/kdelibs4/qt44.patch
@@ -26,4 +26,115 @@ Compile with Qt 4.4
+ return m_nullDevice.data();
} else if (m_devicesMap.contains(udi)) {
return m_devicesMap[udi];
- } else {
\ No newline at end of file
+ } else {
+SVN commit 745966 by thiago:
+
+Compile with Qt 4.4
+
+
+ M +14 -14 path.cpp
+
+
+--- trunk/KDE/kdelibs/phonon/path.cpp #745965:745966
+@@ -125,7 +125,7 @@
+ << QObjectPair(newEffectBackend, rightNode);
+
+ if (d->executeTransaction(disconnections, connections)) {
+- newEffect->k_ptr->addDestructionHandler(d);
++ newEffect->k_ptr->addDestructionHandler(d.data());
+ d->effects.insert(insertIndex, newEffect);
+ return true;
+ } else {
+@@ -181,19 +181,19 @@
+ sink->k_ptr->addInputPath(*this);
+ if (d->sinkNode) {
+ d->sinkNode->k_ptr->removeInputPath(*this);
+- d->sinkNode->k_ptr->removeDestructionHandler(d);
++ d->sinkNode->k_ptr->removeDestructionHandler(d.data());
+ }
+ d->sinkNode = sink;
+- d->sinkNode->k_ptr->addDestructionHandler(d);
++ d->sinkNode->k_ptr->addDestructionHandler(d.data());
+
+ //everything went well: let's update the path and the sink node
+ source->k_ptr->addOutputPath(*this);
+ if (d->sourceNode) {
+ d->sourceNode->k_ptr->removeOutputPath(*this);
+- d->sourceNode->k_ptr->removeDestructionHandler(d);
++ d->sourceNode->k_ptr->removeDestructionHandler(d.data());
+ }
+ d->sourceNode = source;
+- d->sourceNode->k_ptr->addDestructionHandler(d);
++ d->sourceNode->k_ptr->addDestructionHandler(d.data());
+ return true;
+ } else {
+ return false;
+@@ -225,22 +225,22 @@
+ }
+
+ if (d->executeTransaction(disco, QList<QObjectPair>())) {
+- //everything went well, let's remove the reference
++ //everything went well, let's remove the reference
+ //to the paths from the source and sink
+ if (d->sourceNode) {
+ d->sourceNode->k_ptr->removeOutputPath(*this);
+- d->sourceNode->k_ptr->removeDestructionHandler(d);
++ d->sourceNode->k_ptr->removeDestructionHandler(d.data());
+ }
+ d->sourceNode = 0;
+
+ foreach(Effect *e, d->effects) {
+- e->k_ptr->removeDestructionHandler(d);
++ e->k_ptr->removeDestructionHandler(d.data());
+ }
+ d->effects.clear();
+
+ if (d->sinkNode) {
+ d->sinkNode->k_ptr->removeInputPath(*this);
+- d->sinkNode->k_ptr->removeDestructionHandler(d);
++ d->sinkNode->k_ptr->removeDestructionHandler(d.data());
+ }
+ d->sinkNode = 0;
+ return true;
+@@ -265,21 +265,21 @@
+ return false;
+
+ ConnectionTransaction transaction(backend, nodesForTransaction);
+- if (!transaction)
++ if (!transaction)
+ return false;
+
+ QList<QObjectPair>::const_iterator it = disconnections.begin();
+ for(;it != disconnections.end();++it) {
+ const QObjectPair &pair = *it;
+ if (!backend->disconnectNodes(pair.first, pair.second)) {
+-
++
+ //Error: a disconnection failed
+ QList<QObjectPair>::const_iterator it2 = disconnections.begin();
+ for(; it2 != it; ++it2) {
+ const QObjectPair &pair = *it2;
+ bool success = backend->connectNodes(pair.first,
pair.second);
+ Q_ASSERT(success); //a failure here means it is impossible
to reestablish the connection
+- Q_UNUSED(success);
++ Q_UNUSED(success);
+ }
+ return false;
+ }
+@@ -294,14 +294,14 @@
+ const QObjectPair &pair = *it2;
+ bool success = backend->disconnectNodes(pair.first,
pair.second);
+ Q_ASSERT(success); //a failure here means it is impossible
to reestablish the connection
+- Q_UNUSED(success);
++ Q_UNUSED(success);
+ }
+
+ //and now let's reconnect the nodes that were disconnected:
rollback
+ foreach(const QObjectPair &pair, disconnections) {
+ bool success = backend->connectNodes(pair.first,
pair.second);
+ Q_ASSERT(success); //a failure here means it is impossible
to reestablish the connection
+- Q_UNUSED(success);
++ Q_UNUSED(success);
+ }
+
+ return false;



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a598690cbb6d5843f01ecd7217902065f0b3d815), Jaka Kranjc, 01/07/2008

Archive powered by MHonArc 2.6.24.

Top of Page