From 92acec3b95a98eab6e5609d174c996e3934a3ebd347ce6257cb13a56428f4774 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 16 Jun 2020 09:15:50 +0000 Subject: [PATCH] Disable warning messages from Qt5(.15 and up) (boo#1172565) OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=111 --- gnuplot-QtWarningMsg.dif | 25 +++++++++++++++++++++++++ gnuplot.changes | 5 +++++ gnuplot.spec | 4 +++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 gnuplot-QtWarningMsg.dif diff --git a/gnuplot-QtWarningMsg.dif b/gnuplot-QtWarningMsg.dif new file mode 100644 index 0000000..4e71ab3 --- /dev/null +++ b/gnuplot-QtWarningMsg.dif @@ -0,0 +1,25 @@ +boo#1172565 + +--- + src/qtterminal/gnuplot_qt.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +--- src/qtterminal/gnuplot_qt.cpp ++++ src/qtterminal/gnuplot_qt.cpp 2020-06-16 08:54:36.486821163 +0000 +@@ -43,6 +43,7 @@ + + #include "QtGnuplotApplication.h" + #include ++#include + #include + #ifdef _WIN32 + # include +@@ -53,6 +54,8 @@ int main(int argc, char* argv[]) + signal(SIGINT, SIG_IGN); // Do not listen to SIGINT signals anymore + const char * qt_gnuplot_data_dir = QTGNUPLOT_DATA_DIR; + ++ QLoggingCategory::defaultCategory()->setEnabled(QtWarningMsg, false); ++ + #if defined(_WIN32) + /* On Windows, QTGNUPLOT_DATA_DIR is relative to installation dir. */ + char buf[MAX_PATH]; diff --git a/gnuplot.changes b/gnuplot.changes index 8b390a7..b6a84ee 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 16 09:13:13 UTC 2020 - Dr. Werner Fink + +- Disable warning messages from Qt5(.15 and up) (boo#1172565) + ------------------------------------------------------------------- Mon Dec 2 12:31:23 UTC 2019 - Dr. Werner Fink diff --git a/gnuplot.spec b/gnuplot.spec index 33770cd..d5267e4 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -1,7 +1,7 @@ # # spec file for package gnuplot # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -96,6 +96,7 @@ Patch4: gnuplot-4.6.0-demo.diff Patch5: gnuplot-wx3.diff Patch6: gnuplot-QtCore-PIC.dif Patch7: gnuplot-gd.patch +Patch8: gnuplot-QtWarningMsg.dif %define _x11lib %{_libdir} %define _x11data %{_datadir}/X11 %define _libx11 %{_exec_prefix}/lib/X11 @@ -130,6 +131,7 @@ cp %{_sourcedir}/picins.sty docs %patch5 -p1 -b .w3x %patch6 -p0 -b .pic %patch7 -p1 -b .gd +%patch8 -p0 -b .qt %build autoreconf -fi