pool/qwt6
SHA256
5
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/qwt6?expand=0&rev=6

Browse Source
This commit is contained in:
Luigi Baldoni 2019-04-19 08:12:09 +00:00 committed by Git OBS Bridge
parent 1c322e5b34
commit 6338e31258
7 changed files with 37 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
qwt-6.1.3-mkspecs.patch
View File

@ -1,87 +0,0 @@
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 @@
QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
unix {
- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
- # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
+ QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
}
win32 {
@@ -28,9 +27,9 @@
# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
}
-QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
-QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
-QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
+QWT_INSTALL_DOCS = $$[QT_INSTALL_DOCS]/qwt6
+QWT_INSTALL_HEADERS = $$[QT_INSTALL_HEADERS]/qwt6
+QWT_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
######################################################################
# Designer plugin
@@ -41,15 +40,13 @@
# add $${QWT_INSTALL_PREFIX}/plugins to QT_PLUGIN_PATH in the
# runtime environment of designer/creator.
######################################################################
-
-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
-
# linux distributors often organize the Qt installation
# their way and QT_INSTALL_PREFIX doesn't offer a good
# path. Also QT_INSTALL_PREFIX is only one of the default
# search paths of the designer - not the Qt creator
+######################################################################
-#QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PREFIX]/plugins/designer
+QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]/designer
######################################################################
# Features
@@ -63,8 +60,7 @@
# with every Qt upgrade.
######################################################################
-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
-# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features
+QWT_INSTALL_FEATURES = $$[QMAKE_MKSPECS]/features
######################################################################
# 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 @@
# Otherwise you have to build them from the examples directory.
######################################################################
-#QWT_CONFIG += QwtExamples
+QWT_CONFIG += QwtExamples
######################################################################
# The playground is primarily intended for the Qwt development
@@ -171,5 +167,5 @@
unix {
- #QWT_CONFIG += QwtPkgConfig
+ QWT_CONFIG += QwtPkgConfig
}

71
qwt-6.1.4-mkspecs.patch
View File

@ -1,71 +0,0 @@
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 {
- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
- # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
+ QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
}
win32 {
@@ -28,9 +27,9 @@ win32 {
# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
}
-QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
-QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
-QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
+QWT_INSTALL_DOCS = $$[QT_INSTALL_DOCS]/qwt6
+QWT_INSTALL_HEADERS = $$[QT_INSTALL_HEADERS]/qwt6
+QWT_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
######################################################################
# Designer plugin
@@ -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.
######################################################################
-
-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
-
# linux distributors often organize the Qt installation
# their way and QT_INSTALL_PREFIX doesn't offer a good
# path. Also QT_INSTALL_PREFIX is only one of the default
# search paths of the designer - not the Qt creator
+######################################################################
-#QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PREFIX]/plugins/designer
+QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]/designer
######################################################################
# Features
@@ -63,8 +60,7 @@ QWT_INSTALL_PLUGINS = $${QWT_INSTALL_P
# with every Qt upgrade.
######################################################################
-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
-# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features
+QWT_INSTALL_FEATURES = $$[QMAKE_MKSPECS]/features
######################################################################
# Build the static/shared libraries.
@@ -141,7 +137,7 @@ win32 {
# Otherwise you have to build them from the examples directory.
######################################################################
-#QWT_CONFIG += QwtExamples
+QWT_CONFIG += QwtExamples
######################################################################
# The playground is primarily intended for the Qwt development
@@ -171,5 +167,5 @@ macx:!static:CONFIG(qt_framework, qt_fra
unix {
- #QWT_CONFIG += QwtPkgConfig
+ QWT_CONFIG += QwtPkgConfig
}

3
qwt-6.1.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9
size 4227315

45
qwt6-qt5.changes
View File

@ -1,48 +1,3 @@
-------------------------------------------------------------------
Fri Apr 19 07:12:53 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
- 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 - aloisio@gmx.com

17
qwt6-qt5.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package qwt6-qt5
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 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,18 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define sover 5-6
Name: qwt6-qt5
Version: 6.1.4
Version: 6.1.3
Release: 0
Summary: Qt5 Widgets for Technical Applications
License: SUSE-QWT-1.0
Group: Development/Libraries/C and C++
URL: https://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)/qt(4,5)/plugins/designer/libqwt_designer_plugin.so is not allowed'.
@ -33,7 +33,7 @@ Patch1: qwt-qt5.patch
# PATCH-FIX-OPENSUSE pkgconfig.patch -- Create and install pc files for pkg-config
Patch2: qwt-6.1.3-pkgconfig.patch
# PATCH-FIX-OPENSUSE mkspecs.patch -- Use established settings for the .pc files
Patch3: qwt-6.1.4-mkspecs.patch
Patch3: qwt-6.1.3-mkspecs.patch
BuildRequires: fdupes
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
@ -155,7 +155,8 @@ mv %{buildroot}%{_libqt5_docdir}/qwt6/man/man3 \
%postun -n libqwt-qt%{sover} -p /sbin/ldconfig
%files -n libqwt-qt%{sover}
%if 0%{?sle_version} != 120200
%defattr(-,root,root)
%if 0%{?suse_version} > 1320 || 0%{?leap_version} >= 420200
%license COPYING
%else
%doc COPYING
@ -163,9 +164,11 @@ mv %{buildroot}%{_libqt5_docdir}/qwt6/man/man3 \
%{_libqt5_libdir}/libqwt-qt5.so.*
%files designer
%defattr(-,root,root)
%{_libqt5_plugindir}/designer/*.so
%files devel
%defattr(-,root,root)
%doc README
%{_libqt5_libdir}/libqwt-qt5.so
%{_libqt5_libdir}/pkgconfig/Qt5Qwt6.pc
@ -175,9 +178,11 @@ mv %{buildroot}%{_libqt5_docdir}/qwt6/man/man3 \
%{_mandir}/man?/*.?%{ext_info}
%files examples
%defattr(-,root,root)
%{_libqt5_examplesdir}/
%files devel-doc
%defattr(-,root,root)
%doc %{_libqt5_docdir}/
%changelog

47
qwt6.changes
View File

@ -1,50 +1,3 @@
-------------------------------------------------------------------
Fri Apr 19 07:12:53 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
- 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
- Dropped designer subpackage
-------------------------------------------------------------------
Sat Aug 5 08:11:17 UTC 2017 - aloisio@gmx.com

33
qwt6.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package qwt6
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 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,18 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define sover 6
Name: qwt6
Version: 6.1.4
Version: 6.1.3
Release: 0
Summary: Qt Widgets for Technical Applications
License: SUSE-QWT-1.0
Group: Development/Libraries/C and C++
URL: http://qwt.sourceforge.net/
Url: http://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'.
@ -31,13 +31,14 @@ 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
# PATCH-FIX-OPENSUSE mkspecs.patch -- Use established settings for the .pc files
Patch2: qwt-6.1.4-mkspecs.patch
Patch2: qwt-6.1.3-mkspecs.patch
BuildRequires: fdupes
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: qt-devel
BuildRequires: pkgconfig(libpng)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The Qwt(Qt4) library contains GUI Components and utility classes which are
@ -57,7 +58,7 @@ This package contains the shared library to run Technical Applications
developed with/for Qwt(Qt4).
%package devel
Summary: Include headers for Qwt
Summary: Include headers and Qt Designer plugin for Qwt
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: freetype2-devel
@ -82,6 +83,16 @@ Requires: %{name}-devel = %{version}
%description examples
This package contains example programs demonstrating the Qwt widgets.
%package designer
Summary: Plugin for the Qt Interface designer
Group: Development/Tools/GUI Builders
Requires: %{name}-devel = %{version}
Conflicts: qwt-designer
%description designer
The %{name}-designer package contains the plugin for the Qt4 User Interface
designer tool.
%package devel-doc
Summary: Development documentation for Qwt(Qt4)
Group: Development/Libraries/C and C++
@ -136,14 +147,20 @@ mv %{buildroot}%{_docdir}/libqt4/qwt6/man/man3 \
%postun -n libqwt%{sover} -p /sbin/ldconfig
%files -n libqwt%{sover}
%if 0%{?sle_version} != 120200
%defattr(-,root,root)
%if 0%{?suse_version} > 1320 || 0%{?leap_version} >= 420200
%license COPYING
%else
%doc COPYING
%endif
%{_libdir}/libqwt.so.*
%files designer
%defattr(-,root,root)
%{_libdir}/qt4/plugins/designer/*.so
%files devel
%defattr(-,root,root)
%doc README
%{_libdir}/libqwt.so
%{_libdir}/pkgconfig/qwt.pc
@ -153,11 +170,13 @@ mv %{buildroot}%{_docdir}/libqt4/qwt6/man/man3 \
%{_mandir}/man?/*.?%{ext_info}
%files examples
%defattr(-,root,root)
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/examples
%{_libdir}/%{name}/examples/
%files devel-doc
%defattr(-,root,root)
%dir %{_docdir}/libqt4/%{name}
%doc %{_docdir}/libqt4/%{name}/