Hello community, here is the log from the commit of package libjreen-qt5 for openSUSE:Factory checked in at 2016-02-01 19:56:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libjreen-qt5 (Old) and /work/SRC/openSUSE:Factory/.libjreen-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libjreen-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/libjreen-qt5/libjreen-qt5.changes 2015-02-10 20:21:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libjreen-qt5.new/libjreen-qt5.changes 2016-02-01 19:56:34.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Jan 27 22:26:28 UTC 2016 - cgiboudeaux@gmx.com + +- Add 0002-Clean_includes.patch. The code using the qMetaTypeId + class is commented out and this camelcase header will be removed + in Qt 5.6. + +------------------------------------------------------------------- New: ---- 0002-Clean_includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjreen-qt5.spec ++++++ --- /var/tmp/diff_new_pack.ZZwgBu/_old 2016-02-01 19:56:35.000000000 +0100 +++ /var/tmp/diff_new_pack.ZZwgBu/_new 2016-02-01 19:56:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libjreen-qt5 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,9 @@ Group: System/Libraries Url: http://github.com/euroelessar/jreen Source: v%{version}.tar.gz +Patch0: 0001-Use-GNUInstallDirs-to-determine-install-dirs.patch +# PATCH-FIX-UPSTREAM -- 0002-Clean_includes.patch +Patch1: 0002-Clean_includes.patch BuildRequires: cmake BuildRequires: libgsasl-devel BuildRequires: speex-devel @@ -33,7 +36,6 @@ BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Xml) BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch0: 0001-Use-GNUInstallDirs-to-determine-install-dirs.patch %description Qt Jabber/XMPP extensible library. @@ -56,6 +58,7 @@ %prep %setup -q -n jreen-%{version} %patch0 -p1 +%patch1 -p1 %build mkdir -p build ++++++ 0002-Clean_includes.patch ++++++ diff --git a/src/stanzaextension.h b/src/stanzaextension.h index 525ce24..6be8fd5 100644 --- a/src/stanzaextension.h +++ b/src/stanzaextension.h @@ -28,7 +28,7 @@ #include <QObject> #include <QSharedPointer> -#include <QMetaTypeId> +// #include <QMetaTypeId> #include "jreen.h" class QXmlStreamWriter;