Hello community, here is the log from the commit of package psi+ for openSUSE:Factory checked in at 2015-04-21 10:54:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psi+ (Old) and /work/SRC/openSUSE:Factory/.psi+.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psi+" Changes: -------- --- /work/SRC/openSUSE:Factory/psi+/psi+.changes 2015-04-10 09:52:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.psi+.new/psi+.changes 2015-04-21 10:54:05.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 9 07:49:16 UTC 2015 - [email protected] + +- qt55-build-fixes.patch: add + +------------------------------------------------------------------- New: ---- qt55-build-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psi+.spec ++++++ --- /var/tmp/diff_new_pack.h5KnTN/_old 2015-04-21 10:54:06.000000000 +0200 +++ /var/tmp/diff_new_pack.h5KnTN/_new 2015-04-21 10:54:06.000000000 +0200 @@ -30,6 +30,7 @@ Source1: psi-plus-l10n-1.tar.xz Patch0: kill-Q_WS_X11.patch Patch1: proper-activate.patch +Patch2: qt55-build-fixes.patch Patch100: qca-qt5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: aspell-devel @@ -335,6 +336,7 @@ %setup -q -b 1 %patch0 -p1 %patch1 -p1 +%patch2 -p1 %if 0%{?with_qt5} %patch100 -p1 ++++++ proper-activate.patch ++++++ --- /var/tmp/diff_new_pack.h5KnTN/_old 2015-04-21 10:54:06.000000000 +0200 +++ /var/tmp/diff_new_pack.h5KnTN/_new 2015-04-21 10:54:06.000000000 +0200 @@ -46,7 +46,7 @@ } XSendEvent(xdisplay, rootwin, False, (SubstructureRedirectMask | SubstructureNotifyMask), &e); -+ qDebug() << "tried to flash a window"; ++ qDebug() << "tried to " << (yes ? "" : "de") << "flash a window " << parentWidget_->window()->windowTitle(); #else Q_UNUSED(yes) #endif ++++++ qt55-build-fixes.patch ++++++ --- src/activeprofiles.h | 1 + src/capabilities/capsregistry.h | 1 + src/libpsi/tools/simplecli/simplecli.h | 2 ++ src/plugins/generic/cleanerplugin/optionsparser.h | 1 + src/plugins/generic/juickplugin/juickparser.cpp | 1 + src/plugins/include/stanzasendinghost.h | 2 ++ 6 files changed, 8 insertions(+) --- a/src/activeprofiles.h +++ b/src/activeprofiles.h @@ -22,6 +22,7 @@ #ifndef ACTIVEPSIPROFILES_H #define ACTIVEPSIPROFILES_H +#include <QObject> #include <QStringList> class ActiveProfiles: public QObject --- a/src/capabilities/capsregistry.h +++ b/src/capabilities/capsregistry.h @@ -23,6 +23,7 @@ #include <QObject> #include <QString> +#include <QIODevice> #include <QList> #include <QMap> #include <QDateTime> --- a/src/libpsi/tools/simplecli/simplecli.h +++ b/src/libpsi/tools/simplecli/simplecli.h @@ -21,7 +21,9 @@ #ifndef SIMPLECLI_H #define SIMPLECLI_H +#include <QHash> #include <QMap> +#include <QObject> #include <QStringList> class SimpleCli : public QObject --- a/src/plugins/generic/cleanerplugin/optionsparser.h +++ b/src/plugins/generic/cleanerplugin/optionsparser.h @@ -23,6 +23,7 @@ #include <QDomElement> #include <QMap> +#include <QObject> #include <QStringList> class OptionsParser : public QObject --- a/src/plugins/generic/juickplugin/juickparser.cpp +++ b/src/plugins/generic/juickplugin/juickparser.cpp @@ -19,6 +19,7 @@ */ #include <QDateTime> +#include <QObject> #include "juickparser.h" static const QString juickLink("http://juick.com/%1";); --- a/src/plugins/include/stanzasendinghost.h +++ b/src/plugins/include/stanzasendinghost.h @@ -1,6 +1,8 @@ #ifndef STANZASENDINGHOST_H #define STANZASENDINGHOST_H +#include <QObject> + class QDomElement; class QString;
