[packages/qwt] - up to 6.3.0 - disabled qt4, do not reenable

Thu Oct 2 09:24:39 CEST 2025

commit 91322a7972256dbcc2f7ab5d86771db19c485358
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Oct 2 11:23:57 2025 +0200

    - up to 6.3.0
    - disabled qt4, do not reenable

 qwt-install.patch | 37 +++++---------------------------
 qwt-qt5.patch     | 26 ----------------------
 qwt.spec          | 64 ++++++++++++++++---------------------------------------
 3 files changed, 23 insertions(+), 104 deletions(-)
---

diff --git a/qwt.spec b/qwt.spec
index 517a96a..0baddec 100644
--- a/qwt.spec
+++ b/qwt.spec
@@ -1,19 +1,18 @@
 #
 # Conditional build:
-%bcond_without	qt4	# Qt4 build
+%bcond_with	qt4	# Qt4 build
 %bcond_without	qt5	# Qt5 build
 
 Summary:	2D plotting widget extension to the Qt4 GUI
 Summary(pl.UTF-8):	Rozszerzenie wykresów 2D dla GUI Qt4
 Name:		qwt
-Version:	6.1.3
-Release:	2
+Version:	6.3.0
+Release:	1
 License:	Qwt v1.0
 Group:		X11/Libraries
 Source0:	http://downloads.sourceforge.net/qwt/%{name}-%{version}.tar.bz2
-# Source0-md5:	19d1f5fa5e22054d22ee3accc37c54ba
+# Source0-md5:	06a8f8eb1bc07bedfb1df601804439cb
 Patch0:		%{name}-install.patch
-Patch1:		%{name}-qt5.patch
 URL:		http://qwt.sourceforge.net/
 %if %{with qt4}
 BuildRequires:	QtCore-devel >= 4.5
@@ -74,7 +73,7 @@ Summary(pl.UTF-8):	Wtyczka qwt dla Qt Designera
 Group:		X11/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	QtDesigner >= 4.5
-Obsoletes:	qt4-plugin-qwt
+Obsoletes:	qt4-plugin-qwt < 6.1.0
 
 %description -n QtDesigner-plugin-qwt
 qwt plugin for Qt Designer.
@@ -103,13 +102,13 @@ różne rodzaje suwaków i wiele więcej.
 Summary:	Header files for Qt5 Qwt library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Qwt dla Qt5
 Group:		X11/Development/Libraries
-Requires:	qwt5 = %{version}-%{release}
 Requires:	Qt5Core-devel >= 5
 Requires:	Qt5Gui-devel >= 5
 Requires:	Qt5OpenGL-devel >= 5
 Requires:	Qt5Svg-devel >= 5
 Requires:	Qt5Widgets-devel >= 5
 Requires:	Qt5Xml-devel >= 5
+Requires:	qwt5 = %{version}-%{release}
 
 %description -n qwt5-devel
 Header files for Qt5 Qwt library.
@@ -144,7 +143,6 @@ Dokumentacja API biblioteki Qwt wraz z przykładami.
 %prep
 %setup -q
 %patch -P0 -p1
-%patch -P1 -p1
 
 %build
 %if %{with qt4}
@@ -155,7 +153,7 @@ qmake-qt4 ../qwt.pro \
 	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
 	QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
 
-%{__make} -j1
+%{__make}
 cd ..
 %endif
 
@@ -167,28 +165,21 @@ qmake-qt5 ../qwt.pro \
 	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
 	QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
 
-%{__make} -j1
+%{__make}
 cd ..
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_mandir}
 
 %if %{with qt4}
 %{__make} -C build-qt4 install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
-
-%{__mv} $RPM_BUILD_ROOT%{_docdir}/qt4-doc/html/man/man3 $RPM_BUILD_ROOT%{_mandir}
 %endif
 
 %if %{with qt5}
 %{__make} -C build-qt5 install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
-
-%if %{without qt4}
-%{__mv} $RPM_BUILD_ROOT%{_docdir}/qt5-doc/html/man/man3 $RPM_BUILD_ROOT%{_mandir}
-%endif
 %endif
 
 # packaged as %doc
@@ -209,63 +200,44 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with qt4}
 %files
 %defattr(644,root,root,755)
-%doc CHANGES-6.1 COPYING README
-%attr(755,root,root) %{_libdir}/libqwt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqwt.so.6
-%attr(755,root,root) %{_libdir}/libqwtmathml.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqwtmathml.so.6
+%doc COPYING README
+%{_libdir}/libqwt4.so.*.*.*
+%ghost %{_libdir}/libqwt4.so.6
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libqwt.so
-%attr(755,root,root) %{_libdir}/libqwtmathml.so
+%{_libdir}/libqwt4.so
 %{_includedir}/qt4/qwt
 %{_pkgconfigdir}/qwt.pc
-%{_pkgconfigdir}/qwtmathml.pc
 %{_datadir}/qt4/mkspecs/features/qwt*.pri
 %{_datadir}/qt4/mkspecs/features/qwt.prf
-%{_datadir}/qt4/mkspecs/features/qwtmathml.prf
 
 %files -n QtDesigner-plugin-qwt
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so
+%{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so
 %endif
 
 %if %{with qt5}
 %files -n qwt5
 %defattr(644,root,root,755)
-%doc CHANGES-6.1 COPYING README
-%attr(755,root,root) %{_libdir}/libqwt5.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqwt5.so.6
-%attr(755,root,root) %{_libdir}/libqwtmathml5.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqwtmathml5.so.6
+%doc COPYING README
+%{_libdir}/libqwt.so.*.*.*
+%ghost %{_libdir}/libqwt.so.6
 
 %files -n qwt5-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libqwt5.so
-%attr(755,root,root) %{_libdir}/libqwtmathml5.so
+%{_libdir}/libqwt.so
 %{_includedir}/qt5/qwt
 %{_pkgconfigdir}/Qt5Qwt6.pc
-%{_pkgconfigdir}/qwtmathml5.pc
 %{_libdir}/qt5/mkspecs/features/qwt*.pri
 %{_libdir}/qt5/mkspecs/features/qwt.prf
-%{_libdir}/qt5/mkspecs/features/qwtmathml.prf
 
 %files -n Qt5Designer-plugin-qwt
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/qt5/plugins/designer/libqwt_designer_plugin.so
+%{_libdir}/qt5/plugins/designer/libqwt_designer_plugin.so
 %endif
 
 %files apidocs
 %defattr(644,root,root,755)
 %doc doc/html/*.css doc/html/*.html doc/html/*.png examples
-%{_mandir}/man3/Qwt*.3*
-%{_mandir}/man3/barchartscreenshots.3*
-%{_mandir}/man3/controlscreenshots.3*
-%{_mandir}/man3/curvescreenshots.3*
-%{_mandir}/man3/otherscreenshots.3*
-%{_mandir}/man3/qwtchangelog.3*
-%{_mandir}/man3/qwtinstall.3*
-%{_mandir}/man3/qwtlicense.3*
-%{_mandir}/man3/spectrogramscreenshots.3*
 %{_examplesdir}/%{name}-%{version}
diff --git a/qwt-install.patch b/qwt-install.patch
index 9803706..9b75a97 100644
--- a/qwt-install.patch
+++ b/qwt-install.patch
@@ -1,13 +1,13 @@
 --- qwt-6.1.3/qwtbuild.pri.orig	2016-06-13 09:14:23.029601054 +0200
 +++ qwt-6.1.3/qwtbuild.pri	2019-01-06 10:06:28.695874261 +0100
 @@ -14,7 +14,6 @@
- CONFIG           += qt     
+ CONFIG           += qt
  CONFIG           += warn_on
  CONFIG           += no_keywords
 -CONFIG           += silent
+ CONFIG           -= depend_includepath
  
- ######################################################################
- # release/debug mode
+ # CONFIG += sanitize
 --- qwt-6.1.3/qwtconfig.pri.orig	2019-01-03 19:56:12.828429841 +0100
 +++ qwt-6.1.3/qwtconfig.pri	2019-01-06 10:06:13.685874433 +0100
 @@ -19,18 +19,18 @@
@@ -28,7 +28,7 @@
 -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]/html
++QWT_INSTALL_DOCS      = $$[QT_INSTALL_DOCS]
 +QWT_INSTALL_HEADERS   = $$[QT_INSTALL_HEADERS]/qwt
 +QWT_INSTALL_LIBS      = $$[QT_INSTALL_LIBS]
  
@@ -52,7 +52,7 @@
  ######################################################################
  # Features
 @@ -63,8 +63,8 @@
- # with every Qt upgrade. 
+ # with every Qt upgrade.
  ######################################################################
  
 -QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
@@ -62,22 +62,6 @@
  
  ######################################################################
  # Build the static/shared libraries.
-@@ -110,7 +110,7 @@
- # to your qmake project file.
- ######################################################################
- 
--#QWT_CONFIG     += QwtMathML
-+QWT_CONFIG     += QwtMathML
- 
- ######################################################################
- # If you want to build the Qwt designer plugin, 
-@@ -171,5 +171,5 @@
- 
- unix {
- 
--    #QWT_CONFIG     += QwtPkgConfig
-+    QWT_CONFIG     += QwtPkgConfig
- }
 --- qwt-6.1.3/designer/designer.pro.orig	2016-06-13 09:14:23.019600853 +0200
 +++ qwt-6.1.3/designer/designer.pro	2019-01-06 10:06:56.922540605 +0100
 @@ -83,7 +83,6 @@
@@ -88,14 +72,3 @@
          qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
  
          contains(QWT_CONFIG, QwtDll) {
---- qwt-6.1.3/textengines/mathml/mathml.pro.orig	2016-06-13 09:14:22.990600268 +0200
-+++ qwt-6.1.3/textengines/mathml/mathml.pro	2019-01-06 10:06:04.815874533 +0100
-@@ -61,6 +61,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
- 
diff --git a/qwt-qt5.patch b/qwt-qt5.patch
deleted file mode 100644
index f5bded9..0000000
--- a/qwt-qt5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- qwt-6.1.3/qwtfunctions.pri.orig	2016-06-13 09:14:23.025600974 +0200
-+++ qwt-6.1.3/qwtfunctions.pri	2019-01-06 10:10:07.662538429 +0100
-@@ -12,7 +12,11 @@
- defineReplace(qwtLibraryTarget) {
- 
-     unset(LIBRARY_NAME)
-+    greaterThan(QT_MAJOR_VERSION, 4) {
-+    LIBRARY_NAME = $${1}$${QT_MAJOR_VERSION}
-+    } else {
-     LIBRARY_NAME = $$1
-+    }
- 
-     mac:contains(QWT_CONFIG, QwtFramework) {
- 
-@@ -36,7 +40,11 @@
- defineTest(qwtAddLibrary) {
- 
-     LIB_PATH = $$1
-+    greaterThan(QT_MAJOR_VERSION, 4) {
-+    LIB_NAME = $${2}$${QT_MAJOR_VERSION}
-+    } else {
-     LIB_NAME = $$2
-+    }
- 
-     mac:contains(QWT_CONFIG, QwtFramework) {
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qwt.git/commitdiff/91322a7972256dbcc2f7ab5d86771db19c485358

