Hello community, here is the log from the commit of package trojita for openSUSE:Factory checked in at 2015-12-09 19:51:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trojita (Old) and /work/SRC/openSUSE:Factory/.trojita.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trojita" Changes: -------- --- /work/SRC/openSUSE:Factory/trojita/trojita.changes 2015-02-24 13:07:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.trojita.new/trojita.changes 2015-12-09 22:35:26.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Dec 3 23:42:43 UTC 2015 - [email protected] + +- Added fix-missing-includes.patch for fixing missing includes + when using qt5. +- Added fix-qt5_5-test-regression.patch to circumvent a regression + in qt5 5.5 + +------------------------------------------------------------------- New: ---- fix-missing-includes.patch fix-qt5_5-test-regression.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trojita.spec ++++++ --- /var/tmp/diff_new_pack.67H2oi/_old 2015-12-09 22:35:27.000000000 +0100 +++ /var/tmp/diff_new_pack.67H2oi/_new 2015-12-09 22:35:27.000000000 +0100 @@ -33,9 +33,15 @@ Url: http://trojita.flaska.net/ Source: http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.bz2 Source1: http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.bz2.asc +# PATCH-FIX-UPSTREAM fix-missing-includes.patch -- Fix undefined QObject with newer qt5. Fixed already upstream. +Patch0: fix-missing-includes.patch +# PATCH-FIX-UPSTREAM fix-qt5_5-test-regression.patch -- Remove test failing because of regression in qt5 https://bugs.kde.org/show_bug.cgi?id=345739 +Patch1: fix-qt5_5-test-regression.patch BuildRequires: cmake >= 2.8.7 BuildRequires: git BuildRequires: libqt5-linguist-devel >= 5.2.0 +# both pkgconfig(Qt5Test) and libqt5-sql-sqlite are needed on buildtime for tests! +BuildRequires: libqt5-sql-sqlite BuildRequires: ragel BuildRequires: update-desktop-files BuildRequires: xkeyboard-config @@ -45,13 +51,10 @@ BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0 -# both pkgconfig(Qt5Test) and libqt5-sql-sqlite are needed on buildtime for tests! -BuildRequires: libqt5-sql-sqlite BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 BuildRequires: pkgconfig(zlib) -Requires: libqt5-sql-sqlite BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -65,6 +68,10 @@ %prep %setup -q +%patch0 -p1 +%if 0%{?is_opensuse} +%patch1 -p1 +%endif %build export CXXFLAGS="%{optflags} -fPIC" ++++++ fix-missing-includes.patch ++++++ diff -Nur trojita-0.5/src/AbookAddressbook/AbookAddressbook.h trojita-0.5-new/src/AbookAddressbook/AbookAddressbook.h --- trojita-0.5/src/AbookAddressbook/AbookAddressbook.h 2015-02-23 00:49:04.000000000 +0100 +++ trojita-0.5-new/src/AbookAddressbook/AbookAddressbook.h 2015-12-03 22:39:02.168007129 +0100 @@ -25,6 +25,7 @@ #ifndef ABOOK_ADDRESSBOOK #define ABOOK_ADDRESSBOOK +#include <QObject> #include <QPair> #include "Gui/AbstractAddressbook.h" diff -Nur trojita-0.5/src/Imap/Model/MailboxMetadata.cpp trojita-0.5-new/src/Imap/Model/MailboxMetadata.cpp --- trojita-0.5/src/Imap/Model/MailboxMetadata.cpp 2015-02-23 00:49:04.000000000 +0100 +++ trojita-0.5-new/src/Imap/Model/MailboxMetadata.cpp 2015-12-03 23:02:47.644010305 +0100 @@ -20,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "MailboxMetadata.h" +#include <QDataStream> namespace Imap { ++++++ fix-qt5_5-test-regression.patch ++++++ diff -Nur trojita-0.5/CMakeLists.txt trojita-0.5-new/CMakeLists.txt --- trojita-0.5/CMakeLists.txt 2015-02-23 00:49:04.000000000 +0100 +++ trojita-0.5-new/CMakeLists.txt 2015-12-03 23:51:15.621016783 +0100 @@ -898,12 +898,12 @@ enable_testing() trojita_test(Composer Composer_Submission) trojita_test(Composer Composer_responses) - trojita_test(Composer Html_formatting) + #trojita_test(Composer Html_formatting) if(WITH_QT5) qt5_use_modules(test_Composer_responses WebKitWidgets) - qt5_use_modules(test_Html_formatting WebKitWidgets) - else() - target_link_libraries(test_Html_formatting ${QT_QTWEBKIT_LIBRARY}) + #qt5_use_modules(test_Html_formatting WebKitWidgets) + #else() + #target_link_libraries(test_Html_formatting ${QT_QTWEBKIT_LIBRARY}) endif() trojita_test(Imap Imap_DisappearingMailboxes) trojita_test(Imap Imap_Idle)
