rpm/qwt6
SHA256
1
0
Fork 0
forked from pool/qwt6
Code Pull Requests Activity

Accepting request 908582 from devel:libraries:c_c++

Browse Source 
Update to 6.2.0 (fourth attempt)

OBS-URL: https://build.opensuse.org/request/show/908582
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qwt6?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2021-07-28 17:19:47 +00:00 committed by Git OBS Bridge
commit f06f5e2d03
6 changed files with 46 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qwt-6.1.3-pkgconfig.patch
View File

@ -1,13 +0,0 @@
diff -ruN qwt-6.1.3.orig/textengines/mathml/mathml.pro qwt-6.1.3/textengines/mathml/mathml.pro
--- qwt-6.1.3.orig/textengines/mathml/mathml.pro 2016-06-13 10:14:22.990600268 +0300
+++ qwt-6.1.3/textengines/mathml/mathml.pro 2017-04-20 23:52:55.654701571 +0300
@@ -60,7 +60,8 @@
QMAKE_PKGCONFIG_LIBDIR = $${QWT_INSTALL_LIBS}
QMAKE_PKGCONFIG_INCDIR = $${QWT_INSTALL_HEADERS}
-
+ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+
# QMAKE_PKGCONFIG_DESTDIR is buggy, in combination
# with including pri files: better don't use it

44
qwt-6.1.4-mkspecs.patch
View File

@ -1,18 +1,8 @@
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 {
diff --git a/qwtconfig.pri b/qwtconfig.pri
index 0b054e0..63301e6 100644
--- a/qwtconfig.pri
+++ b/qwtconfig.pri
@@ -28,9 +28,9 @@ win32 {
# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
}
@ -25,25 +15,23 @@ Index: qwt-6.1.4/qwtconfig.pri
######################################################################
# Designer plugin
@@ -41,15 +40,13 @@ QWT_INSTALL_LIBS = $${QWT_INSTALL_P
# add $${QWT_INSTALL_PREFIX}/plugins to QT_PLUGIN_PATH in the
@@ -42,14 +42,12 @@ QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
# 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
@@ -63,8 +61,7 @@ QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
# with every Qt upgrade.
######################################################################
@ -53,19 +41,3 @@ Index: qwt-6.1.4/qwtconfig.pri
######################################################################
# 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.6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:99460d31c115ee4117b0175d885f47c2c590d784206f09815dc058fbe5ede1f6
size 4306402

3
qwt-6.2.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9194f6513955d0fd7300f67158175064460197abab1a92fa127a67a4b0b71530
size 4815773

26
qwt6.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Tue Jul 27 08:07:52 UTC 2021 - Dmitriy Perlow <dap.darkness@gmail.com>
- Rollback previous changes.
- Moved *.so.? & *.so.?.? to the devel subpackage.
- Added BSD-3-Clause for examples subpackage (6.2.0 changes).
-------------------------------------------------------------------
Wed Jul 21 08:06:44 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>
- Obsolete previous library version
-------------------------------------------------------------------
Tue Jul 20 07:16:05 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 6.2.0 (boo#1187996)
* MathML text renderer removed
* Class Includes added
* BSD License for examples
* Spline interpolation
* New plot items
- Check the installed CHANGES-6.2 file for the complete list
of changes.
- Drop qwt-6.1.3-pkgconfig.patch. No longer needed
- Rebase qwt-6.1.4-mkspecs.patch
-------------------------------------------------------------------
Tue Apr 13 07:44:53 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>

20
qwt6.spec
View File

@ -16,9 +16,9 @@
#
%define sover 6
%define sover 6_2
Name: qwt6
Version: 6.1.6
Version: 6.2.0
Release: 0
Summary: Qt5 Widgets for Technical Applications
License: SUSE-QWT-1.0
@ -28,10 +28,8 @@ Source: https://sourceforge.net/projects/qwt/files/qwt/%{version}/qwt-%{
# 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'.
Patch0: qwt-6.1.3-rpath.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
Patch2: qwt-6.1.4-mkspecs.patch
BuildRequires: fdupes
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
@ -87,6 +85,7 @@ in order to create Qt applications using the Qwt(Qt5) widgets.
%package examples
Summary: Example programs using Qwt(Qt5)
License: SUSE-QWT-1.0 or BSD-3-Clause
Group: Development/Libraries/C and C++
Requires: %{name}-devel = %{version}
Provides: %{name}-qt5-examples = %{version}
@ -120,10 +119,7 @@ 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
%patch2 -p1
%patch3 -p1
%autosetup -p1 -n qwt-%{version}
%build
mkdir build
@ -136,6 +132,8 @@ popd
pushd build
%qmake5_install
popd
# nothing references this
rm -f "%{buildroot}/%{_libqt5_libdir}/libqwt.so.6"
# Qwt base examples
mkdir -p %{buildroot}%{%_libqt5_docdir}/qwt6
@ -158,7 +156,7 @@ mv %{buildroot}%{_libqt5_docdir}/qwt6/man/man3 \
%else
%doc COPYING
%endif
%{_libqt5_libdir}/libqwt.so.*
%{_libqt5_libdir}/libqwt.so.6.2*
%files designer
%dir %{_libqt5_plugindir}/designer/
@ -170,7 +168,7 @@ mv %{buildroot}%{_libqt5_docdir}/qwt6/man/man3 \
%{_libqt5_libdir}/pkgconfig/Qt5Qwt6.pc
%{_libqt5_archdatadir}/mkspecs/features/
%dir %{_libqt5_includedir}/qwt6
%{_libqt5_includedir}/qwt6/*.h
%{_libqt5_includedir}/qwt6/*
%{_mandir}/man?/*.3%{ext_info}
%files examples