Hello community, here is the log from the commit of package qwt6 for openSUSE:Factory checked in at 2019-06-19 21:04:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qwt6 (Old) and /work/SRC/openSUSE:Factory/.qwt6.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qwt6" Wed Jun 19 21:04:16 2019 rev:12 rq:707885 version:6.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/qwt6/qwt6.changes 2017-08-12 20:25:43.404465043 +0200 +++ /work/SRC/openSUSE:Factory/.qwt6.new.4811/qwt6.changes 2019-06-19 21:04:40.222307179 +0200 @@ -2 +2,62 @@ -Sat Aug 5 08:11:17 UTC 2017 - [email protected] +Wed Jun 5 15:46:53 UTC 2019 - Luigi Baldoni <[email protected]> + +- Fixed conflict with Qwt 5. + +------------------------------------------------------------------- +Fri May 24 09:22:23 UTC 2019 - Luigi Baldoni <[email protected]> + +- Fix requires for -devel package + +------------------------------------------------------------------- +Wed May 22 18:41:14 UTC 2019 - Luigi Baldoni <[email protected]> + +- Build against Qt5 by default +- Dropped qwt-qt5.patch + +------------------------------------------------------------------- +Fri Apr 19 07:12:53 UTC 2019 - Luigi Baldoni <[email protected]> + +- Update to version 6.1.4 + * All widgets ( including plot canvas ) + + missing initialization of the background color hint, when + drawing a styled focus rectangle + + devicePixelRatio handling adjusted, QT_SCALE_FACTOR supported + * Maintenance + + deprecated QString::null replaced by QString() + + making clang-tidy/clazy and friends happier + + compiler warnings with newer Qt versions fixed + * PyQt-Qwt + + specific defines added + * QwtPointMapper + + being multithreaded when possible + * QwtPlotRenderer + + using QPdfWriter instead of QPrinter, when possible + * Build system + + auto-disable building the designer plugin, when the + corresponding Qt installation was not build with designer + support + * Bug fixes + + font resolving when using widget fonts for rendering + to a different paint device. + + QwtPlotDirectPainter::CopyBackingStore: bad offset ( + subtracting the canvas frame ), when flushing the updated + backing store fixed + + QwtAbstractSlider::stepAlignment fixed, when the value is + exactly the upperBound, but no tick position + + Missing right/bottom pixel added for QwtColumnSymbol::NoFrame + + QwtWeedingCurveFitter::fitCurve fixed when being called with + no points + + missing updates added for QwtLegend::setMaxColumns, + QwtScaleWidget::setLayoutFlag + + QwtPlotCurve::drawSteps: polygon clipping fixed by adding + an extra pixel to the clip rectangle + + QwtPlotItem::ScaleInterest enabled for all constructors of + QwtPlotSeriesItem + + QwtPlotMarker::boundingRect fixed for HLine/VLine + + QwtPlotIntervalCurve/QwtPlotTradingCurve::boundingRect + fixed + +- Refreshed qwt-6.1.3-mkspecs.patch as qwt-6.1.4-mkspecs.patch + +------------------------------------------------------------------- +Sat Aug 5 08:12:02 UTC 2017 - [email protected] @@ -7 +68,4 @@ -Wed Jul 26 09:27:22 UTC 2017 - [email protected] +Wed Jul 26 09:27:54 UTC 2017 - [email protected] + +- Remove _tmp manpages and rename the existing one to -qt5 + pattern to avoid conflict with the qt4 package @@ -9 +72,0 @@ -- Remove _tmp manpages Old: ---- qwt-6.1.3-mkspecs.patch qwt-6.1.3.tar.bz2 qwt-qt5.patch qwt6-qt5.changes qwt6-qt5.spec New: ---- qwt-6.1.4-mkspecs.patch qwt-6.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qwt6.spec ++++++ --- /var/tmp/diff_new_pack.CXHiq8/_old 2019-06-19 21:04:41.266308124 +0200 +++ /var/tmp/diff_new_pack.CXHiq8/_new 2019-06-19 21:04:41.274308132 +0200 @@ -1,7 +1,7 @@ # # spec file for package qwt6 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,172 +12,170 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define sover 6 Name: qwt6 -Version: 6.1.3 +Version: 6.1.4 Release: 0 -Summary: Qt Widgets for Technical Applications +Summary: Qt5 Widgets for Technical Applications License: SUSE-QWT-1.0 Group: Development/Libraries/C and C++ -Url: http://qwt.sourceforge.net/ +URL: https://qwt.sourceforge.net/ Source: https://sourceforge.net/projects/qwt/files/qwt/%{version}/qwt-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE to prevent 'ERROR: RPATH "/usr/local/qwt-6.1.0/lib" on -# /usr/lib(64)/qt4/plugins/designer/libqwt_designer_plugin.so is not allowed'. +# /usr/lib(64)/qt(4,5)/plugins/designer/libqwt_designer_plugin.so is not allowed'. Patch0: qwt-6.1.3-rpath.patch # PATCH-FIX-OPENSUSE pkgconfig.patch -- Create and install pc files for pkg-config -Patch1: qwt-6.1.3-pkgconfig.patch +Patch2: qwt-6.1.3-pkgconfig.patch # PATCH-FIX-OPENSUSE mkspecs.patch -- Use established settings for the .pc files -Patch2: qwt-6.1.3-mkspecs.patch +Patch3: qwt-6.1.4-mkspecs.patch BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: qt-devel +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Designer) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(libpng) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -The Qwt(Qt4) library contains GUI Components and utility classes which are +The Qwt(Qt5) library contains GUI Components and utility classes which are primarily useful for programs with a technical background. Beside a 2D plot widget it provides scales, sliders, dials, compasses, thermometers, wheels and knobs to control or display values, arrays, or ranges of type double. %package -n libqwt%{sover} -Summary: Shared library for Qt4 Widgets +Summary: Shared library for Qt5 Widgets for Technical Applications Group: System/Libraries -Provides: %{name} = %{version} -Obsoletes: %{name} < %{version} +Provides: lib%{name}-qt5-%{sover} = %{version} +Obsoletes: lib%{name}-qt5-%{sover} < %{version} %description -n libqwt%{sover} This package contains the shared library to run Technical Applications -developed with/for Qwt(Qt4). +developed with/for Qwt(Qt5). %package devel -Summary: Include headers and Qt Designer plugin for Qwt +Summary: Include headers and Qt Designer plugin for Qwt(Qt5) Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: libqwt%{sover} = %{version} Requires: freetype2-devel Requires: gcc-c++ -Requires: qt-devel +Requires: pkgconfig(Qt5Concurrent) +Requires: pkgconfig(Qt5OpenGL) +Requires: pkgconfig(Qt5PrintSupport) +Requires: pkgconfig(Qt5Svg) +Requires: pkgconfig(Qt5Widgets) Requires: pkgconfig(libpng) -Conflicts: qwt-devel -%if 0%{?suse_version} +Recommends: %{name}-designer Recommends: %{name}-devel-doc Recommends: %{name}-examples -%endif +Conflicts: otherproviders(qwt-qt5-devel) +Conflicts: qwt-devel +Provides: qwt-qt5-devel = %{version} +Obsoletes: qwt6-qt5-devel < %{version} +Provides: qwt6-qt5-devel = %{version} %description devel This package contains the header files of Qwt and its Qt designer plugin -in order to create Qt applications using the Qwt(qt4) widgets. +in order to create Qt applications using the Qwt(Qt5) widgets. %package examples -Summary: Example programs using Qwt +Summary: Example programs using Qwt(Qt5) Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} +Provides: %{name}-qt5-examples = %{version} +Obsoletes: %{name}-qt5-examples < %{version} %description examples -This package contains example programs demonstrating the Qwt widgets. +This package contains example programs demonstrating the Qwt(Qt5) widgets. %package designer -Summary: Plugin for the Qt Interface designer +Summary: Plugin for the Qt5 Interface designer Group: Development/Tools/GUI Builders Requires: %{name}-devel = %{version} -Conflicts: qwt-designer +Conflicts: otherproviders(qwt-qt5-designer) +Provides: qwt-qt5-designer = %{version} +Provides: %{name}-qt5-designer = %{version} +Obsoletes: %{name}-qt5-designer < %{version} %description designer -The %{name}-designer package contains the plugin for the Qt4 User Interface +The %{name}-designer package contains the plugin for the Qt5 User Interface designer tool. %package devel-doc -Summary: Development documentation for Qwt(Qt4) +Summary: Development documentation for Qwt(Qt5) Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} +Provides: %{name}-qt5-devel-doc = %{version} +Obsoletes: %{name}-qt5-devel-doc < %{version} %description devel-doc -This package contains the development documentation of the Qwt widgets +This package contains the development documentation of the Qwt(Qt5) widgets as is it created by doxygen. %prep %setup -q -n qwt-%{version} %patch0 -p1 -%patch1 -p1 %patch2 -p1 -# remove leftovers -rm -f doc/man/man3/_tmp_qwt* -# rename manpages -for f in doc/man/man3/*; do - qwt6name=$(echo $(basename ${f} .3)|sed \ - '/^Qwt/{s/Qwt/Qwt6/;be;}; /^qwt/{s/qwt/qwt6/;be;}; s/$/_qwt6/; :e;') - mv -v ${f} doc/man/man3/${qwt6name}.3 -done +%patch3 -p1 %build mkdir build pushd build -qmake .. \ - QMAKE_STRIP="" \ - QMAKE_CXXFLAGS="%{optflags}" - -make V=1 %{?_smp_mflags} +%qmake5 .. +%make_jobs popd %install pushd build -make V=1 DESTDIR=%{buildroot} install INSTALL_ROOT=%{buildroot} +%qmake5_install popd # Qwt base examples -mkdir -p %{buildroot}%{_libdir}/%{name} -mkdir -p %{buildroot}%{_docdir}/libqt4/%{name} -cp -r examples %{buildroot}%{_docdir}/libqt4/%{name}/examples -cp -r build/examples/bin %{buildroot}%{_libdir}/%{name}/examples +mkdir -p %{buildroot}%{%_libqt5_docdir}/qwt6 +mkdir -p %{buildroot}%{_libqt5_examplesdir}/qwt6 +cp -r examples %{buildroot}%{_libqt5_docdir}/qwt6/examples +cp -r build/examples/bin %{buildroot}%{_libqt5_examplesdir}/qwt6 mkdir -p %{buildroot}%{_mandir} -mv %{buildroot}%{_docdir}/libqt4/qwt6/man/man3 \ +mv %{buildroot}%{_libqt5_docdir}/qwt6/man/man3 \ %{buildroot}%{_mandir}/ -%fdupes %{buildroot}/%{_prefix} +%fdupes %{buildroot}%{_prefix} %post -n libqwt%{sover} -p /sbin/ldconfig %postun -n libqwt%{sover} -p /sbin/ldconfig %files -n libqwt%{sover} -%defattr(-,root,root) -%if 0%{?suse_version} > 1320 || 0%{?leap_version} >= 420200 +%if 0%{?sle_version} != 120200 %license COPYING %else %doc COPYING %endif -%{_libdir}/libqwt.so.* +%{_libqt5_libdir}/libqwt.so.* %files designer -%defattr(-,root,root) -%{_libdir}/qt4/plugins/designer/*.so +%{_libqt5_plugindir}/designer/*.so %files devel -%defattr(-,root,root) %doc README -%{_libdir}/libqwt.so -%{_libdir}/pkgconfig/qwt.pc -%dir %{_includedir}/%{name} -%{_includedir}/%{name}/*.h -%{_datadir}/qt4/mkspecs/features/ -%{_mandir}/man?/*.?%{ext_info} +%{_libqt5_libdir}/libqwt.so +%{_libqt5_libdir}/pkgconfig/Qt5Qwt6.pc +%{_libqt5_archdatadir}/mkspecs/features/ +%dir %{_libqt5_includedir}/qwt6 +%{_libqt5_includedir}/qwt6/*.h +%{_mandir}/man?/*.3%{ext_info} %files examples -%defattr(-,root,root) -%dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/examples -%{_libdir}/%{name}/examples/ +%{_libqt5_examplesdir}/ %files devel-doc -%defattr(-,root,root) -%dir %{_docdir}/libqt4/%{name} -%doc %{_docdir}/libqt4/%{name}/ +%doc %{_libqt5_docdir}/ %changelog ++++++ qwt-6.1.3-mkspecs.patch -> qwt-6.1.4-mkspecs.patch ++++++ --- /work/SRC/openSUSE:Factory/qwt6/qwt-6.1.3-mkspecs.patch 2017-08-12 20:25:43.132503154 +0200 +++ /work/SRC/openSUSE:Factory/.qwt6.new.4811/qwt-6.1.4-mkspecs.patch 2019-06-19 21:04:36.642303936 +0200 @@ -1,7 +1,8 @@ -diff -ruN qwt-6.1.3.orig/qwtconfig.pri qwt-6.1.3/qwtconfig.pri ---- qwt-6.1.3.orig/qwtconfig.pri 2016-06-13 10:14:23.031601095 +0300 -+++ qwt-6.1.3/qwtconfig.pri 2017-04-21 22:45:59.888743725 +0300 -@@ -19,8 +19,7 @@ +Index: qwt-6.1.4/qwtconfig.pri +=================================================================== +--- qwt-6.1.4.orig/qwtconfig.pri ++++ qwt-6.1.4/qwtconfig.pri +@@ -19,8 +19,7 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QW QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] unix { @@ -11,7 +12,7 @@ } win32 { -@@ -28,9 +27,9 @@ +@@ -28,9 +27,9 @@ win32 { # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION } @@ -24,8 +25,8 @@ ###################################################################### # Designer plugin -@@ -41,15 +40,13 @@ - # add $${QWT_INSTALL_PREFIX}/plugins to QT_PLUGIN_PATH in the +@@ -41,15 +40,13 @@ QWT_INSTALL_LIBS = $${QWT_INSTALL_P + # add $${QWT_INSTALL_PREFIX}/plugins to QT_PLUGIN_PATH in the # runtime environment of designer/creator. ###################################################################### - @@ -42,8 +43,8 @@ ###################################################################### # Features -@@ -63,8 +60,7 @@ - # with every Qt upgrade. +@@ -63,8 +60,7 @@ QWT_INSTALL_PLUGINS = $${QWT_INSTALL_P + # with every Qt upgrade. ###################################################################### -QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features @@ -52,24 +53,7 @@ ###################################################################### # Build the static/shared libraries. -@@ -72,14 +68,14 @@ - # it will be a static library. - ###################################################################### - --QWT_CONFIG += QwtDll -+QWT_CONFIG += QwtDll - - ###################################################################### - # QwtPlot enables all classes, that are needed to use the QwtPlot - # widget. - ###################################################################### - --QWT_CONFIG += QwtPlot -+QWT_CONFIG += QwtPlot - - ###################################################################### - # QwtWidgets enables all classes, that are needed to use the all other -@@ -141,7 +137,7 @@ +@@ -141,7 +137,7 @@ win32 { # Otherwise you have to build them from the examples directory. ###################################################################### @@ -77,8 +61,8 @@ +QWT_CONFIG += QwtExamples ###################################################################### - # The playground is primarily intended for the Qwt development -@@ -171,5 +167,5 @@ + # The playground is primarily intended for the Qwt development +@@ -171,5 +167,5 @@ macx:!static:CONFIG(qt_framework, qt_fra unix { ++++++ qwt-6.1.3.tar.bz2 -> qwt-6.1.4.tar.bz2 ++++++ ++++ 177943 lines of diff (skipped)
