Skip to Content.
Sympa Menu

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

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 (b547ae052727c82dc081daef81ffbbf33533aed5)
  • Date: Mon, 7 Jan 2008 09:08:15 -0600

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

kde4/kdelibs4/HISTORY | 3 +++
kde4/kdelibs4/PRE_BUILD | 4 ++++
kde4/kdelibs4/qt44.patch | 29 +++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)

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

kdelibs4: qt44.patch: added patch from r745967 so it compiles with qt4.4
Looks backward compatible, but I'm not sure. Currently it is always
applied.

diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index a0e114b..4fe0237 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,6 @@
+2008-01-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD, qt44.patch: added patch from r745967 so it compiles with
qt4.4
+
2008-01-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: force a recompile of soprano if it is too old

diff --git a/kde4/kdelibs4/PRE_BUILD b/kde4/kdelibs4/PRE_BUILD
new file mode 100755
index 0000000..11b987f
--- /dev/null
+++ b/kde4/kdelibs4/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p3 < $SPELL_DIRECTORY/qt44.patch
diff --git a/kde4/kdelibs4/qt44.patch b/kde4/kdelibs4/qt44.patch
new file mode 100644
index 0000000..17bc63e
--- /dev/null
+++ b/kde4/kdelibs4/qt44.patch
@@ -0,0 +1,29 @@
+SVN commit 745967 by thiago:
+
+Compile with Qt 4.4
+
+
+ M +1 -1 kdecore/config/kconfiggroup.cpp
+ M +1 -1 solid/solid/devicemanager.cpp
+
+
+--- trunk/KDE/kdelibs/kdecore/config/kconfiggroup.cpp #745966:745967
+@@ -626,7 +626,7 @@
+
+ // detach (QExplicitlySharedDataPointer takes care of deleting the old
d if necessary)
+ // ### temporary solution until QExplicitlySharedDataPointer has
detach()
+- d = new KConfigGroupPrivate(d, config()->isGroupImmutable(group),
group);
++ d = new KConfigGroupPrivate(d.data(),
config()->isGroupImmutable(group), group);
+ }
+
+ QString KConfigGroup::name() const
+--- trunk/KDE/kdelibs/solid/solid/devicemanager.cpp #745966:745967
+@@ -197,7 +197,7 @@
+ Solid::DevicePrivate
*Solid::DeviceManagerPrivate::findRegisteredDevice(const QString &udi)
+ {
+ if (udi.isEmpty()) {
+- return m_nullDevice;
++ return m_nullDevice.data();
+ } else if (m_devicesMap.contains(udi)) {
+ return m_devicesMap[udi];
+ } else {
\ No newline at end of file



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

Archive powered by MHonArc 2.6.24.

Top of Page