Hello community, here is the log from the commit of package kraft for openSUSE:Factory checked in at 2018-12-28 12:35:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kraft (Old) and /work/SRC/openSUSE:Factory/.kraft.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kraft" Fri Dec 28 12:35:30 2018 rev:10 rq:661516 version:0.82 Changes: -------- --- /work/SRC/openSUSE:Factory/kraft/kraft.changes 2018-12-03 10:12:52.519570963 +0100 +++ /work/SRC/openSUSE:Factory/.kraft.new.28833/kraft.changes 2018-12-28 12:35:34.859952612 +0100 @@ -1,0 +2,7 @@ +Wed Dec 26 21:18:55 UTC 2018 - Klaas Freitag <[email protected]> + +- Add patch fix_nullptr_warning.patch: Reduce noise when compiling + by disabling the nullptr initialization warning +- Add patch fix_sql_qt12.patch: Make Kraft build with Qt 5.12 again + +------------------------------------------------------------------- New: ---- fix_nullptr_warning.patch fix_sql_qt12.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kraft.spec ++++++ --- /var/tmp/diff_new_pack.AOcnNS/_old 2018-12-28 12:35:35.339952277 +0100 +++ /var/tmp/diff_new_pack.AOcnNS/_new 2018-12-28 12:35:35.351952268 +0100 @@ -36,6 +36,10 @@ %endif # PATCH-FIX-UPSTREAM fix_install_appdata.patch Install appdata in correct place Patch1: fix_install_appdata.patch +# PATCH-FIX-UPSTREAM fix build with Qt 5.12. Can be applied regardless of Qt version, but needed for Qt 5.12 +Patch2: fix_sql_qt12.patch +# PATCH-FIX-UPSTREAM Do not show the compiler warnings for wrong nullptr initialization, too much noise +Patch3: fix_nullptr_warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -76,6 +80,8 @@ %patch0 -p1 %endif %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build ++++++ fix_nullptr_warning.patch ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cf3879..5db1908 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,8 @@ find_package(Ctemplate REQUIRED) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override") #option(QTINDICATE_DISABLE "Disable support for notifications via indicator") +# disable the warning about null-pointer zero. FIXME. +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-zero-as-null-pointer-constant") add_definitions(${QT_DEFINITIONS} ) ++++++ fix_sql_qt12.patch ++++++ diff --git a/src/catalogchapter.cpp b/src/catalogchapter.cpp index 0724cdd..a35d7ff 100644 --- a/src/catalogchapter.cpp +++ b/src/catalogchapter.cpp @@ -17,7 +17,7 @@ #include <QtCore> #include <QtGui> -#include <QtSql> +#include <QSqlQuery> #include <QDebug> diff --git a/src/defaultprovider.cpp b/src/defaultprovider.cpp index 55f6ba7..b253ef9 100644 --- a/src/defaultprovider.cpp +++ b/src/defaultprovider.cpp @@ -14,7 +14,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include <QtSql> +#include <QSqlQuery> +#include <QSqlTableModel> +#include <QSqlRecord> + #include <QFile> #include <QTextStream> #include <QDebug> @@ -24,6 +27,8 @@ #include "doctext.h" #include "kraftsettings.h" #include "doctype.h" +#include "kraftdoc.h" +#include "dbids.h" #include <klocalizedstring.h> diff --git a/src/templkataloglistview.cpp b/src/templkataloglistview.cpp index 9c4eaeb..6a3d52a 100644 --- a/src/templkataloglistview.cpp +++ b/src/templkataloglistview.cpp @@ -16,7 +16,7 @@ * * ***************************************************************************/ -#include <QtSql> +#include <QSqlQuery> #include <QDebug> #include <QMenu>
