On Wednesday 11 of June 2014 17:07:04 Sebastian Kügler wrote: > [CC:ing frameworks-devel, hoping for additional input] > > On Friday, June 06, 2014 23:24:50 šumski wrote: > > On Friday 06 of June 2014 21:32:48 Eric Hameleers wrote: > > > On Fri, 6 Jun 2014, ?umski wrote: > > > > On Thursday 05 of June 2014 16:47:59 Jonathan Riddell wrote: > > > >> Tars are up for Plasma 5 Beta 2, please try them out and let me know > > > >> of problems. I'd especially like to know if translations > > > >> successfully install as I noticed some not doing so last time. > > > > > > > > khotkeys also don't build, they have one > > > > ecm_optional_add_subdirectory(doc) > > > > too many ;-) > > > > > > > > > > > > Cheers, > > > > Hrvoje > > > > > > I got that error too in khelpcenter kinfocenter and kio-extras. That's > > > where I stopped trying to compile this until the tarballs get fixed. > > > > Other then these issues present in tarball only (not git), there is an > > ongoing problem with plasma-desktop which blocks creating proper 32bit > > packages: http://paste.opensuse.org/25338349 > > > > build succeeds on 64bit builds. with our daily packages we've just used: > > sed -i 's|add_subdirectory( dbus )|#add_subdirectory( dbus )|g' > > kcms/kfontinst/CMakeLists.txt > > but this cannot go in distributions... > > It seems that the #defines in > frameworks/kdelibs4support/src/kdecore/kde_file.h get mixed up, but I have > to say I'm not "portability guy" enough to know which defines should > trigger when. Input is most welcome here... > > Hrvoje, Jonathan: Could you perhaps try modifying it there locally, and see > if the build succeeds then? (Should be enough to make sure the #else /* > unix */ branch is evaluated, instead of the ones that point the KDE_lstat, > KDE_stat, etc. to *64 versions. Unfortunately, we cannot touch the buildhost, only sources which are built (and i'm running x86_64 OS). You might be right about kde_file, though seems to be a namespace clash/mixup. The attached patch resolves the failure here (basically renaming stat method to statFont).... Might not be the best way to go forward, but might provide some clues what's wrong.
Cheers, Hrvoje > Cheers,
diff --git a/kcms/kfontinst/dbus/FontInst.cpp b/kcms/kfontinst/dbus/FontInst.cpp
index 637d7a2..42413c1 100644
--- a/kcms/kfontinst/dbus/FontInst.cpp
+++ b/kcms/kfontinst/dbus/FontInst.cpp
@@ -157,7 +157,7 @@ void FontInst::list(int folders, int pid)
emit fontList(pid, fonts);
}
-void FontInst::stat(const QString &name, int folders, int pid)
+void FontInst::statFont(const QString &name, int folders, int pid)
{
KFI_DBUG << name << folders << pid;
diff --git a/kcms/kfontinst/dbus/FontInst.h b/kcms/kfontinst/dbus/FontInst.h
index 1365efd..01183db 100644
--- a/kcms/kfontinst/dbus/FontInst.h
+++ b/kcms/kfontinst/dbus/FontInst.h
@@ -104,7 +104,7 @@ class KFONTINST_EXPORT FontInst : public QObject
public Q_SLOTS:
Q_NOREPLY void list(int folders, int pid);
- Q_NOREPLY void stat(const QString &font, int folders, int pid);
+ Q_NOREPLY void statFont(const QString &font, int folders, int pid);
Q_NOREPLY void install(const QString &file, bool createAfm, bool toSystem, int pid, bool checkConfig);
Q_NOREPLY void uninstall(const QString &family, quint32 style, bool fromSystem, int pid, bool checkConfig);
Q_NOREPLY void uninstall(const QString &name, bool fromSystem, int pid, bool checkConfig);
diff --git a/kcms/kfontinst/dbus/FontinstIface.cpp b/kcms/kfontinst/dbus/FontinstIface.cpp
index e27cbbb..174ac51 100644
--- a/kcms/kfontinst/dbus/FontinstIface.cpp
+++ b/kcms/kfontinst/dbus/FontinstIface.cpp
@@ -1,8 +1,8 @@
/*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
* Command line was: qdbusxml2cpp -m -p FontinstIface org.kde.fontinst.xml -i Family.h
*
- * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
*
* This is an auto-generated file.
* This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/kcms/kfontinst/dbus/FontinstIface.h b/kcms/kfontinst/dbus/FontinstIface.h
index 2a59cbe..cb1b9ce 100644
--- a/kcms/kfontinst/dbus/FontinstIface.h
+++ b/kcms/kfontinst/dbus/FontinstIface.h
@@ -1,15 +1,15 @@
/*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
* Command line was: qdbusxml2cpp -m -p FontinstIface org.kde.fontinst.xml -i Family.h
*
- * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
*
* This is an auto-generated file.
* Do not edit! All changes made to it will be lost.
*/
-#ifndef FONTINSTIFACE_H
-#define FONTINSTIFACE_H
+#ifndef FONTINSTIFACE_H_1402519768
+#define FONTINSTIFACE_H_1402519768
#include <QtCore/QObject>
#include <QtCore/QByteArray>
@@ -40,56 +40,56 @@ public Q_SLOTS: // METHODS
inline Q_NOREPLY void disable(const QString &family, uint style, bool inSystem, int pid, bool checkConfig)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(family) << qVariantFromValue(style) << qVariantFromValue(inSystem) << qVariantFromValue(pid) << qVariantFromValue(checkConfig);
+ argumentList << QVariant::fromValue(family) << QVariant::fromValue(style) << QVariant::fromValue(inSystem) << QVariant::fromValue(pid) << QVariant::fromValue(checkConfig);
callWithArgumentList(QDBus::NoBlock, QLatin1String("disable"), argumentList);
}
inline Q_NOREPLY void enable(const QString &family, uint style, bool inSystem, int pid, bool checkConfig)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(family) << qVariantFromValue(style) << qVariantFromValue(inSystem) << qVariantFromValue(pid) << qVariantFromValue(checkConfig);
+ argumentList << QVariant::fromValue(family) << QVariant::fromValue(style) << QVariant::fromValue(inSystem) << QVariant::fromValue(pid) << QVariant::fromValue(checkConfig);
callWithArgumentList(QDBus::NoBlock, QLatin1String("enable"), argumentList);
}
inline QDBusPendingReply<QString> folderName(bool sys)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(sys);
+ argumentList << QVariant::fromValue(sys);
return asyncCallWithArgumentList(QLatin1String("folderName"), argumentList);
}
inline Q_NOREPLY void install(const QString &file, bool createAfm, bool toSystem, int pid, bool checkConfig)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(file) << qVariantFromValue(createAfm) << qVariantFromValue(toSystem) << qVariantFromValue(pid) << qVariantFromValue(checkConfig);
+ argumentList << QVariant::fromValue(file) << QVariant::fromValue(createAfm) << QVariant::fromValue(toSystem) << QVariant::fromValue(pid) << QVariant::fromValue(checkConfig);
callWithArgumentList(QDBus::NoBlock, QLatin1String("install"), argumentList);
}
inline Q_NOREPLY void list(int folders, int pid)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(folders) << qVariantFromValue(pid);
+ argumentList << QVariant::fromValue(folders) << QVariant::fromValue(pid);
callWithArgumentList(QDBus::NoBlock, QLatin1String("list"), argumentList);
}
inline Q_NOREPLY void move(const QString &family, uint style, bool toSystem, int pid, bool checkConfig)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(family) << qVariantFromValue(style) << qVariantFromValue(toSystem) << qVariantFromValue(pid) << qVariantFromValue(checkConfig);
+ argumentList << QVariant::fromValue(family) << QVariant::fromValue(style) << QVariant::fromValue(toSystem) << QVariant::fromValue(pid) << QVariant::fromValue(checkConfig);
callWithArgumentList(QDBus::NoBlock, QLatin1String("move"), argumentList);
}
inline Q_NOREPLY void reconfigure(int pid, bool force)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(pid) << qVariantFromValue(force);
+ argumentList << QVariant::fromValue(pid) << QVariant::fromValue(force);
callWithArgumentList(QDBus::NoBlock, QLatin1String("reconfigure"), argumentList);
}
inline Q_NOREPLY void removeFile(const QString &family, uint style, const QString &file, bool fromSystem, int pid, bool checkConfig)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(family) << qVariantFromValue(style) << qVariantFromValue(file) << qVariantFromValue(fromSystem) << qVariantFromValue(pid) << qVariantFromValue(checkConfig);
+ argumentList << QVariant::fromValue(family) << QVariant::fromValue(style) << QVariant::fromValue(file) << QVariant::fromValue(fromSystem) << QVariant::fromValue(pid) << QVariant::fromValue(checkConfig);
callWithArgumentList(QDBus::NoBlock, QLatin1String("removeFile"), argumentList);
}
@@ -99,24 +99,24 @@ public Q_SLOTS: // METHODS
return asyncCallWithArgumentList(QLatin1String("saveDisabled"), argumentList);
}
- inline Q_NOREPLY void stat(const QString &name, int folders, int pid)
+ inline Q_NOREPLY void statFont(const QString &name, int folders, int pid)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(name) << qVariantFromValue(folders) << qVariantFromValue(pid);
- callWithArgumentList(QDBus::NoBlock, QLatin1String("stat"), argumentList);
+ argumentList << QVariant::fromValue(name) << QVariant::fromValue(folders) << QVariant::fromValue(pid);
+ callWithArgumentList(QDBus::NoBlock, QLatin1String("statFont"), argumentList);
}
inline Q_NOREPLY void uninstall(const QString &name, bool fromSystem, int pid, bool checkConfig)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(name) << qVariantFromValue(fromSystem) << qVariantFromValue(pid) << qVariantFromValue(checkConfig);
+ argumentList << QVariant::fromValue(name) << QVariant::fromValue(fromSystem) << QVariant::fromValue(pid) << QVariant::fromValue(checkConfig);
callWithArgumentList(QDBus::NoBlock, QLatin1String("uninstall"), argumentList);
}
inline Q_NOREPLY void uninstall(const QString &family, uint style, bool fromSystem, int pid, bool checkConfig)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(family) << qVariantFromValue(style) << qVariantFromValue(fromSystem) << qVariantFromValue(pid) << qVariantFromValue(checkConfig);
+ argumentList << QVariant::fromValue(family) << QVariant::fromValue(style) << QVariant::fromValue(fromSystem) << QVariant::fromValue(pid) << QVariant::fromValue(checkConfig);
callWithArgumentList(QDBus::NoBlock, QLatin1String("uninstall"), argumentList);
}
diff --git a/kcms/kfontinst/dbus/org.kde.fontinst.xml b/kcms/kfontinst/dbus/org.kde.fontinst.xml
index 8319cd5..80d2c62 100644
--- a/kcms/kfontinst/dbus/org.kde.fontinst.xml
+++ b/kcms/kfontinst/dbus/org.kde.fontinst.xml
@@ -34,7 +34,7 @@
<arg name="pid" type="i" direction="in"/>
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
</method>
- <method name="stat">
+ <method name="statFont">
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="KFI::Family"/>
<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="KFI::Family"/>
<arg name="name" type="s" direction="in"/>
diff --git a/kcms/kfontinst/kio/FontInstInterface.cpp b/kcms/kfontinst/kio/FontInstInterface.cpp
index c8ae4e0..a9b1845 100644
--- a/kcms/kfontinst/kio/FontInstInterface.cpp
+++ b/kcms/kfontinst/kio/FontInstInterface.cpp
@@ -95,11 +95,11 @@ Families FontInstInterface::list(bool system)
return rv;
}
-Family FontInstInterface::stat(const QString &file, bool system)
+Family FontInstInterface::statFont(const QString &file, bool system)
{
KFI_DBUG;
Family rv;
- itsInterface->stat(file, system ? FontInst::SYS_MASK : FontInst::USR_MASK, getpid());
+ itsInterface->statFont(file, system ? FontInst::SYS_MASK : FontInst::USR_MASK, getpid());
if(FontInst::STATUS_OK==waitForResponse())
{
rv=*itsFamilies.items.begin();
diff --git a/kcms/kfontinst/kio/FontInstInterface.h b/kcms/kfontinst/kio/FontInstInterface.h
index 98503b1..a7d0198 100644
--- a/kcms/kfontinst/kio/FontInstInterface.h
+++ b/kcms/kfontinst/kio/FontInstInterface.h
@@ -47,7 +47,7 @@ class FontInstInterface : public QObject
int uninstall(const QString &name, bool fromSystem);
int reconfigure();
Families list(bool system);
- Family stat(const QString &file, bool system);
+ Family statFont(const QString &file, bool system);
QString folderName(bool sys);
private:
diff --git a/kcms/kfontinst/kio/KioFonts.cpp b/kcms/kfontinst/kio/KioFonts.cpp
index 71dc177..3401202 100644
--- a/kcms/kfontinst/kio/KioFonts.cpp
+++ b/kcms/kfontinst/kio/KioFonts.cpp
@@ -500,7 +500,7 @@ void CKioFonts::del(const QUrl &url, bool isFile)
error(KIO::ERR_DOES_NOT_EXIST, url.toDisplayString());
}
-void CKioFonts::stat(const QUrl &url)
+void CKioFonts::statFont(const QUrl &url)
{
KFI_DBUG << url;
@@ -771,7 +771,7 @@ Family CKioFonts::getFont(const QUrl &url, EFolder folder)
KFI_DBUG << url << name;
- return itsInterface->stat(name, FOLDER_SYS==folder);
+ return itsInterface->statFont(name, FOLDER_SYS==folder);
}
void CKioFonts::handleResp(int resp, const QString &file, const QString &tempFile, bool destIsSystem)
diff --git a/kcms/kfontinst/kio/KioFonts.h b/kcms/kfontinst/kio/KioFonts.h
index 59db12a..ac55fc0 100644
--- a/kcms/kfontinst/kio/KioFonts.h
+++ b/kcms/kfontinst/kio/KioFonts.h
@@ -59,7 +59,7 @@ class CKioFonts : public KIO::SlaveBase
void del(const QUrl &url, bool isFile);
void copy(const QUrl &src, const QUrl &dest, int mode, KIO::JobFlags flags);
void rename(const QUrl &src, const QUrl &dest, KIO::JobFlags flags);
- void stat(const QUrl &url);
+ void statFont(const QUrl &url);
void special(const QByteArray &a);
private:
diff --git a/kcms/kfontinst/viewpart/FontViewPart.cpp b/kcms/kfontinst/viewpart/FontViewPart.cpp
index 9caa5f2..a7de921 100644
--- a/kcms/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcms/kfontinst/viewpart/FontViewPart.cpp
@@ -488,7 +488,7 @@ void CFontViewPart::checkInstallable()
if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(OrgKdeFontinstInterface::staticInterfaceName()))
QProcess::startDetached(QLatin1String(KFONTINST_LIB_EXEC_DIR"/fontinst"));
itsInstallButton->setEnabled(false);
- itsInterface->stat(itsPreview->engine()->descriptiveName(), FontInst::SYS_MASK|FontInst::USR_MASK, getpid());
+ itsInterface->statFont(itsPreview->engine()->descriptiveName(), FontInst::SYS_MASK|FontInst::USR_MASK, getpid());
}
}
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Plasma-devel mailing list Plasma-devel@kde.org https://mail.kde.org/mailman/listinfo/plasma-devel
