SHA256
1
0
forked from pool/qwt6
qwt6/qwt-6.2.0-qt6-pkgconfig.patch

38 lines
1.4 KiB
Diff
Raw Normal View History

Index: qwt-6.2.0/src/src.pro
===================================================================
--- qwt-6.2.0.orig/src/src.pro
+++ qwt-6.2.0/src/src.pro
@@ -82,14 +82,14 @@ contains(QWT_CONFIG, QwtPkgConfig) {
greaterThan(QT_MAJOR_VERSION, 4) {
QMAKE_PKGCONFIG_FILE = Qt$${QT_MAJOR_VERSION}$${QMAKE_PKGCONFIG_NAME}
- QMAKE_PKGCONFIG_REQUIRES = Qt5Widgets Qt5Concurrent Qt5PrintSupport
Accepting request 1083565 from home:alois:branches:devel:libraries:c_c++ - Fixes boo#1210931 - Add _multibuild to support Qt6 - Add qwt-6.2.0-qt6-pkgconfig.patch and qwt-6.2.0-qt6-libsuffix.patch (courtesy of Fedora) and qwt6-rpmlintrc - Man pages are now installed in the flavored doc dir as per upstream default - Rollback previous changes. - Moved *.so.? & *.so.?.? to the devel subpackage. - Added BSD-3-Clause for examples subpackage (6.2.0 changes). - Obsolete previous library version - 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 - Update to version 6.1.6 * QwtPlotLayout::activate: avoid compiler issues with Qt 5.15 * QwtPointPolar: missing copy constructor added - Update URL - Update to 6.1.5: * Avoid using some of the deprecated Qt APIs * Missing includes of QPainterPath ( Qt 5.15 ) added * QwtPlotSpectroCurve: missing public inheritance * QwtPlotTradingCurve: missing public inheritance * QwtLinearColorMap: handling of alpha values in color stops fixed * QwtPlotRasterItem: Fixed missing color table initialization for QImage::Format_Indexed8 * QwtScaleWidget: missing QEvent::LayoutRequest added * QwtSetSample: bound rectangle fixed for empty sets - Fix build with recent libqt5-qttools packages. - Fixed conflict with Qwt 5. - Fix requires for -devel package - Build against Qt5 by default - Dropped qwt-qt5.patch - 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 - Fixed manpages conflict with qwt5 - Remove _tmp manpages and rename the existing one to -qt5 pattern to avoid conflict with the qt4 package - Dropped pre_checkin.sh - Remove _multibuild prior to Factory submission - Build qwt6-qt5 as separate package * add qwt6-qt5.spec * add qwt6-qt5.changes * add qwt-qt5.patch (thanks to awissu and other contributors of the KDE:Qt5 package) - Refreshed qwt-rpath.patch as qwt-6.1.3-rpath.patch - Create and install pc files for pkg-config: * add qwt-6.1.3-pkgconfig.patch - Use mkspecs directory * add qwt-6.1.3-mkspecs.patch - Use sover macro - Build the examples modules - Renamed the libqwt6 package as libqwt-qt%%sover - Use license macro on openSUSE >= 42.2 - Add man page - Added pre_checkin.sh to keep .changes files in sync - Spec cleanup - Update to version 6.1.3 * QwtPlotMagnifier, QwtPlotZoomer: handling of non linear transformations ( f.e logarithmic ) * Date/Time scales fixed QwtDate::ceil(), QwtDate::weekNumber(), QwtDate::utcOffset() QwtDateScaleEngine fixed when aligning to months * QwtPlotLayout: layout bug for legends witdh visisble scrollbars fixed * Plot items hiding QwtPlotLegendItem without entries QwtPlotShapeItem render code fixed * QwtPlotGLCanvas slightly improved, nevertheless better use Qwt 6.2 when being interested in OpenGL * Other QwtGraphic boundingRect updates fixed QwtSyntheticPointData::x() fixed QwtLogScaleEngine::divideScale ignoring stepSize parameter for ranges below one "decade" QwtPlotAbstractBarChart::getCanvasMarginHint fixed - Fixed source URL - Update to Qwt 6.1.2 * fixes at QwtPlot, color maps, controls and scales. - Removed Mandriva support. - Renamed qwt-6.1.0-rpath.patch to qwt-rpath.patch because upstream doesn't want merge it. Updated. - qwt6-designer is now conflicting with qwt-designer. - Update to Qwt 6.1.0 * New plot items * Scales beyond linear and logarithmic transformations * Datetime scales * Redesign of the dial and meter widgets * Basic support for an OpenGL plot canvas * A new system for plot legends * Off-screen paint device for vector graphics * Changes and improvements to several classes - Added qwt-6.1.0-rpath.patch to prevent https://sourceforge.net/p/qwt/bugs/191 - Qmake debug info stripping was disabled. - Update to Qwt 6.0.2 * qwtfunctions.pri added * QwtPlotDict::detachItems fixed * QwtWeedingCurveFitter::fitCurve performance improvements * QwtDynGridLayout fixed for non widget items * QwtInterval: avoid annoying compiler warning * Autoscaling of curves without points fixed * QwtPlotDirectPainter::drawSeries bad translation removed * QwtPlotIntervalCurve: drawing of symbols fixed * QwtPlotlayout: minor layout bufs fixed * Usage of QwtPlotRasterItem::pixelHint fixed * QwtPlotRenderer: several minor fixes * QwtRasterData: CONREC algorithm fixed * QwtThermo: layout code fixed * QwtThermo: memory leak fixed * QwtMmlDocument: compiler issues * Logarithmic autoscaler fixed for intervals close below a decade - Fix the SLES build (%make_install is not expanded on SLES) - license update: SUSE-QWT-1.0 Added to spreadsheet linked at license.opensuse.org. Package warrants its own license - Initial release OBS-URL: https://build.opensuse.org/request/show/1083565 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/qwt6?expand=0&rev=18
2023-04-28 19:39:54 +02:00
+ QMAKE_PKGCONFIG_REQUIRES = Qt$${QT_MAJOR_VERSION}Widgets Qt$${QT_MAJOR_VERSION}Concurrent Qt$${QT_MAJOR_VERSION}PrintSupport
Accepting request 1083565 from home:alois:branches:devel:libraries:c_c++ - Fixes boo#1210931 - Add _multibuild to support Qt6 - Add qwt-6.2.0-qt6-pkgconfig.patch and qwt-6.2.0-qt6-libsuffix.patch (courtesy of Fedora) and qwt6-rpmlintrc - Man pages are now installed in the flavored doc dir as per upstream default - Rollback previous changes. - Moved *.so.? & *.so.?.? to the devel subpackage. - Added BSD-3-Clause for examples subpackage (6.2.0 changes). - Obsolete previous library version - 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 - Update to version 6.1.6 * QwtPlotLayout::activate: avoid compiler issues with Qt 5.15 * QwtPointPolar: missing copy constructor added - Update URL - Update to 6.1.5: * Avoid using some of the deprecated Qt APIs * Missing includes of QPainterPath ( Qt 5.15 ) added * QwtPlotSpectroCurve: missing public inheritance * QwtPlotTradingCurve: missing public inheritance * QwtLinearColorMap: handling of alpha values in color stops fixed * QwtPlotRasterItem: Fixed missing color table initialization for QImage::Format_Indexed8 * QwtScaleWidget: missing QEvent::LayoutRequest added * QwtSetSample: bound rectangle fixed for empty sets - Fix build with recent libqt5-qttools packages. - Fixed conflict with Qwt 5. - Fix requires for -devel package - Build against Qt5 by default - Dropped qwt-qt5.patch - 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 - Fixed manpages conflict with qwt5 - Remove _tmp manpages and rename the existing one to -qt5 pattern to avoid conflict with the qt4 package - Dropped pre_checkin.sh - Remove _multibuild prior to Factory submission - Build qwt6-qt5 as separate package * add qwt6-qt5.spec * add qwt6-qt5.changes * add qwt-qt5.patch (thanks to awissu and other contributors of the KDE:Qt5 package) - Refreshed qwt-rpath.patch as qwt-6.1.3-rpath.patch - Create and install pc files for pkg-config: * add qwt-6.1.3-pkgconfig.patch - Use mkspecs directory * add qwt-6.1.3-mkspecs.patch - Use sover macro - Build the examples modules - Renamed the libqwt6 package as libqwt-qt%%sover - Use license macro on openSUSE >= 42.2 - Add man page - Added pre_checkin.sh to keep .changes files in sync - Spec cleanup - Update to version 6.1.3 * QwtPlotMagnifier, QwtPlotZoomer: handling of non linear transformations ( f.e logarithmic ) * Date/Time scales fixed QwtDate::ceil(), QwtDate::weekNumber(), QwtDate::utcOffset() QwtDateScaleEngine fixed when aligning to months * QwtPlotLayout: layout bug for legends witdh visisble scrollbars fixed * Plot items hiding QwtPlotLegendItem without entries QwtPlotShapeItem render code fixed * QwtPlotGLCanvas slightly improved, nevertheless better use Qwt 6.2 when being interested in OpenGL * Other QwtGraphic boundingRect updates fixed QwtSyntheticPointData::x() fixed QwtLogScaleEngine::divideScale ignoring stepSize parameter for ranges below one "decade" QwtPlotAbstractBarChart::getCanvasMarginHint fixed - Fixed source URL - Update to Qwt 6.1.2 * fixes at QwtPlot, color maps, controls and scales. - Removed Mandriva support. - Renamed qwt-6.1.0-rpath.patch to qwt-rpath.patch because upstream doesn't want merge it. Updated. - qwt6-designer is now conflicting with qwt-designer. - Update to Qwt 6.1.0 * New plot items * Scales beyond linear and logarithmic transformations * Datetime scales * Redesign of the dial and meter widgets * Basic support for an OpenGL plot canvas * A new system for plot legends * Off-screen paint device for vector graphics * Changes and improvements to several classes - Added qwt-6.1.0-rpath.patch to prevent https://sourceforge.net/p/qwt/bugs/191 - Qmake debug info stripping was disabled. - Update to Qwt 6.0.2 * qwtfunctions.pri added * QwtPlotDict::detachItems fixed * QwtWeedingCurveFitter::fitCurve performance improvements * QwtDynGridLayout fixed for non widget items * QwtInterval: avoid annoying compiler warning * Autoscaling of curves without points fixed * QwtPlotDirectPainter::drawSeries bad translation removed * QwtPlotIntervalCurve: drawing of symbols fixed * QwtPlotlayout: minor layout bufs fixed * Usage of QwtPlotRasterItem::pixelHint fixed * QwtPlotRenderer: several minor fixes * QwtRasterData: CONREC algorithm fixed * QwtThermo: layout code fixed * QwtThermo: memory leak fixed * QwtMmlDocument: compiler issues * Logarithmic autoscaler fixed for intervals close below a decade - Fix the SLES build (%make_install is not expanded on SLES) - license update: SUSE-QWT-1.0 Added to spreadsheet linked at license.opensuse.org. Package warrants its own license - Initial release OBS-URL: https://build.opensuse.org/request/show/1083565 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/qwt6?expand=0&rev=18
2023-04-28 19:39:54 +02:00
contains(QWT_CONFIG, QwtSvg) {
- QMAKE_PKGCONFIG_REQUIRES += Qt5Svg
+ QMAKE_PKGCONFIG_REQUIRES += Qt$${QT_MAJOR_VERSION}Svg
}
contains(QWT_CONFIG, QwtOpenGL) {
- QMAKE_PKGCONFIG_REQUIRES += Qt5OpenGL
+ QMAKE_PKGCONFIG_REQUIRES += Qt$${QT_MAJOR_VERSION}OpenGL
}
QMAKE_DISTCLEAN += $${DESTDIR}/$${QMAKE_PKGCONFIG_DESTDIR}/$${QMAKE_PKGCONFIG_FILE}.pc
Index: qwt-6.2.0/qwt.prf
===================================================================
--- qwt-6.2.0.orig/qwt.prf
+++ qwt-6.2.0/qwt.prf
@@ -44,4 +44,9 @@ else {
}
# QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
-qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt)
+greaterThan(QT_MAJOR_VERSION,5) {
+ qwtAddLibrary($${QWT_OUT_ROOT}/lib,qwt-qt6)
+}
+else {
+ qwtAddLibrary($${QWT_OUT_ROOT}/lib,qwt-qt5)
+}