* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/files/, x11-libs/qwt/
@ 2021-01-24 14:43 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2021-01-24 14:43 UTC (permalink / raw
To: gentoo-commits
commit: d05bb660d503f5cf90a7e49dfb62a47c452b860c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 14:20:11 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 14:42:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d05bb660
x11-libs/qwt: Drop 6.1.4
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-libs/qwt/Manifest | 1 -
x11-libs/qwt/files/qwt-6.1.4-qt-5.15.patch | 304 -----------------------------
x11-libs/qwt/qwt-6.1.4.ebuild | 130 ------------
3 files changed, 435 deletions(-)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 67c5258709b..8975bcd4c24 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,2 +1 @@
-DIST qwt-6.1.4.tar.bz2 4227315 BLAKE2B dd7212adb3c8fda081b1feeeb9d59b3b087deb0ef56bdbc7bb95e01992e41d5d91065f0b8aaf3337e1c66d4ad431bfb313f9b04bb2e43915f4cb21fb65725e36 SHA512 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da
DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
diff --git a/x11-libs/qwt/files/qwt-6.1.4-qt-5.15.patch b/x11-libs/qwt/files/qwt-6.1.4-qt-5.15.patch
deleted file mode 100644
index 0ee4b1f9d17..00000000000
--- a/x11-libs/qwt/files/qwt-6.1.4-qt-5.15.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-From a5bdaa3b3a34b8a018fe67dfdd34bf8c890de2fa Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 22 May 2020 17:56:55 +0200
-Subject: [PATCH] Fix build with Qt 5.15 (missing headers)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- examples/dials/attitude_indicator.cpp | 1 +
- examples/itemeditor/editor.cpp | 2 ++
- examples/sinusplot/sinusplot.cpp | 1 +
- playground/graphicscale/mainwindow.h | 1 +
- playground/symbols/symbols.cpp | 1 +
- src/qwt_compass_rose.cpp | 1 +
- src/qwt_dial_needle.cpp | 1 +
- src/qwt_graphic.h | 1 +
- src/qwt_null_paintdevice.cpp | 1 +
- src/qwt_null_paintdevice.h | 1 +
- src/qwt_painter.cpp | 1 +
- src/qwt_painter.h | 2 ++
- src/qwt_painter_command.h | 2 ++
- src/qwt_plot_canvas.cpp | 1 +
- src/qwt_plot_canvas.h | 1 +
- src/qwt_plot_glcanvas.cpp | 1 +
- src/qwt_plot_glcanvas.h | 2 ++
- src/qwt_plot_panner.cpp | 2 ++
- src/qwt_plot_renderer.cpp | 1 +
- src/qwt_plot_shapeitem.cpp | 3 +++
- src/qwt_symbol.h | 2 ++
- src/qwt_widget_overlay.cpp | 1 +
- 22 files changed, 30 insertions(+)
-
-diff --git a/examples/dials/attitude_indicator.cpp b/examples/dials/attitude_indicator.cpp
-index ea0d5ab..a01611e 100644
---- a/examples/dials/attitude_indicator.cpp
-+++ b/examples/dials/attitude_indicator.cpp
-@@ -3,6 +3,7 @@
- #include <qwt_round_scale_draw.h>
- #include <qevent.h>
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qpolygon.h>
-
- AttitudeIndicatorNeedle::AttitudeIndicatorNeedle( const QColor &color )
-diff --git a/examples/itemeditor/editor.cpp b/examples/itemeditor/editor.cpp
-index bd06372..c741b01 100644
---- a/examples/itemeditor/editor.cpp
-+++ b/examples/itemeditor/editor.cpp
-@@ -4,6 +4,8 @@
- #include <qwt_scale_map.h>
- #include <qwt_plot_shapeitem.h>
- #include <qevent.h>
-+#include <qpainter.h>
-+#include <qpainterpath.h>
-
- class Overlay: public QwtWidgetOverlay
- {
-diff --git a/examples/sinusplot/sinusplot.cpp b/examples/sinusplot/sinusplot.cpp
-index 119fa4a..6a9bfe7 100644
---- a/examples/sinusplot/sinusplot.cpp
-+++ b/examples/sinusplot/sinusplot.cpp
-@@ -1,5 +1,6 @@
- #include <qapplication.h>
- #include <qlayout.h>
-+#include <qpainterpath.h>
- #include <qwt_plot.h>
- #include <qwt_plot_marker.h>
- #include <qwt_plot_curve.h>
-diff --git a/playground/graphicscale/mainwindow.h b/playground/graphicscale/mainwindow.h
-index d284413..3b544de 100644
---- a/playground/graphicscale/mainwindow.h
-+++ b/playground/graphicscale/mainwindow.h
-@@ -2,6 +2,7 @@
- #define MAIN_WINDOW_H
-
- #include <qmainwindow.h>
-+#include <qpainterpath.h>
-
- class Canvas;
- class QPainterPath;
-diff --git a/playground/symbols/symbols.cpp b/playground/symbols/symbols.cpp
-index f7b2ed6..5b9f56d 100644
---- a/playground/symbols/symbols.cpp
-+++ b/playground/symbols/symbols.cpp
-@@ -1,5 +1,6 @@
- #include <qapplication.h>
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qbuffer.h>
- #ifdef QT_SVG_LIB
- #include <qsvggenerator.h>
-diff --git a/src/qwt_compass_rose.cpp b/src/qwt_compass_rose.cpp
-index 05f7039..fbd30fe 100644
---- a/src/qwt_compass_rose.cpp
-+++ b/src/qwt_compass_rose.cpp
-@@ -11,6 +11,7 @@
- #include "qwt_point_polar.h"
- #include "qwt_painter.h"
- #include <qpainter.h>
-+#include <qpainterpath.h>
-
- static QPointF qwtIntersection(
- QPointF p11, QPointF p12, QPointF p21, QPointF p22 )
-diff --git a/src/qwt_dial_needle.cpp b/src/qwt_dial_needle.cpp
-index 49dd44a..d98f68c 100644
---- a/src/qwt_dial_needle.cpp
-+++ b/src/qwt_dial_needle.cpp
-@@ -13,6 +13,7 @@
- #include "qwt_painter.h"
- #include <qapplication.h>
- #include <qpainter.h>
-+#include <qpainterpath.h>
-
- #if QT_VERSION < 0x040601
- #define qFastSin(x) qSin(x)
-diff --git a/src/qwt_graphic.h b/src/qwt_graphic.h
-index cbd41f9..6881ea9 100644
---- a/src/qwt_graphic.h
-+++ b/src/qwt_graphic.h
-@@ -14,6 +14,7 @@
- #include "qwt_null_paintdevice.h"
- #include <qmetatype.h>
- #include <qimage.h>
-+#include <qpainterpath.h>
- #include <qpixmap.h>
-
- class QwtPainterCommand;
-diff --git a/src/qwt_null_paintdevice.cpp b/src/qwt_null_paintdevice.cpp
-index 3baf0e9..468a838 100644
---- a/src/qwt_null_paintdevice.cpp
-+++ b/src/qwt_null_paintdevice.cpp
-@@ -9,6 +9,7 @@
-
- #include "qwt_null_paintdevice.h"
- #include <qpaintengine.h>
-+#include <qpainterpath.h>
- #include <qpixmap.h>
-
- class QwtNullPaintDevice::PrivateData
-diff --git a/src/qwt_null_paintdevice.h b/src/qwt_null_paintdevice.h
-index e4e9cad..b804429 100644
---- a/src/qwt_null_paintdevice.h
-+++ b/src/qwt_null_paintdevice.h
-@@ -13,6 +13,7 @@
- #include "qwt_global.h"
- #include <qpaintdevice.h>
- #include <qpaintengine.h>
-+#include <qpainterpath.h>
-
- /*!
- \brief A null paint device doing nothing
-diff --git a/src/qwt_painter.cpp b/src/qwt_painter.cpp
-index 7959fe5..626677f 100644
---- a/src/qwt_painter.cpp
-+++ b/src/qwt_painter.cpp
-@@ -17,6 +17,7 @@
- #include <qframe.h>
- #include <qrect.h>
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qpalette.h>
- #include <qpaintdevice.h>
- #include <qpixmap.h>
-diff --git a/src/qwt_painter.h b/src/qwt_painter.h
-index c0a0ff7..bcbe289 100644
---- a/src/qwt_painter.h
-+++ b/src/qwt_painter.h
-@@ -16,6 +16,8 @@
- #include <qrect.h>
- #include <qpen.h>
- #include <qline.h>
-+#include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qpalette.h>
-
- class QPainter;
-diff --git a/src/qwt_painter_command.h b/src/qwt_painter_command.h
-index a2f509a..a49ee52 100644
---- a/src/qwt_painter_command.h
-+++ b/src/qwt_painter_command.h
-@@ -12,6 +12,8 @@
-
- #include "qwt_global.h"
- #include <qpaintengine.h>
-+#include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qpixmap.h>
- #include <qimage.h>
- #include <qpolygon.h>
-diff --git a/src/qwt_plot_canvas.cpp b/src/qwt_plot_canvas.cpp
-index 9438f15..bfe660d 100644
---- a/src/qwt_plot_canvas.cpp
-+++ b/src/qwt_plot_canvas.cpp
-@@ -13,6 +13,7 @@
- #include "qwt_math.h"
- #include "qwt_plot.h"
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qstyle.h>
- #include <qstyleoption.h>
- #include <qpaintengine.h>
-diff --git a/src/qwt_plot_canvas.h b/src/qwt_plot_canvas.h
-index c79e4e4..90a32ce 100644
---- a/src/qwt_plot_canvas.h
-+++ b/src/qwt_plot_canvas.h
-@@ -12,6 +12,7 @@
-
- #include "qwt_global.h"
- #include <qframe.h>
-+#include <qpainter.h>
- #include <qpainterpath.h>
-
- class QwtPlot;
-diff --git a/src/qwt_plot_glcanvas.cpp b/src/qwt_plot_glcanvas.cpp
-index 996c0ad..6975863 100644
---- a/src/qwt_plot_glcanvas.cpp
-+++ b/src/qwt_plot_glcanvas.cpp
-@@ -12,6 +12,7 @@
- #include "qwt_painter.h"
- #include <qevent.h>
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qdrawutil.h>
- #include <qstyle.h>
- #include <qstyleoption.h>
-diff --git a/src/qwt_plot_glcanvas.h b/src/qwt_plot_glcanvas.h
-index 7ca9b5a..a6c01e0 100644
---- a/src/qwt_plot_glcanvas.h
-+++ b/src/qwt_plot_glcanvas.h
-@@ -13,6 +13,8 @@
- #include "qwt_global.h"
- #include <qframe.h>
- #include <qgl.h>
-+#include <qpainter.h>
-+#include <qpainterpath.h>
-
- class QwtPlot;
-
-diff --git a/src/qwt_plot_panner.cpp b/src/qwt_plot_panner.cpp
-index b7daa05..2f31d05 100644
---- a/src/qwt_plot_panner.cpp
-+++ b/src/qwt_plot_panner.cpp
-@@ -14,6 +14,8 @@
- #include <qbitmap.h>
- #include <qstyle.h>
- #include <qstyleoption.h>
-+#include <qpainter.h>
-+#include <qpainterpath.h>
-
- #if QT_VERSION >= 0x050000
- #if QT_VERSION < 0x050100
-diff --git a/src/qwt_plot_renderer.cpp b/src/qwt_plot_renderer.cpp
-index 549c4bc..71cadec 100644
---- a/src/qwt_plot_renderer.cpp
-+++ b/src/qwt_plot_renderer.cpp
-@@ -20,6 +20,7 @@
- #include "qwt_math.h"
-
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qtransform.h>
- #include <qprinter.h>
- #include <qfiledialog.h>
-diff --git a/src/qwt_plot_shapeitem.cpp b/src/qwt_plot_shapeitem.cpp
-index db7896b..09efd95 100644
---- a/src/qwt_plot_shapeitem.cpp
-+++ b/src/qwt_plot_shapeitem.cpp
-@@ -13,6 +13,9 @@
- #include "qwt_curve_fitter.h"
- #include "qwt_clipper.h"
-
-+#include <qpainter.h>
-+#include <qpainterpath.h>
-+
- static QPainterPath qwtTransformPath( const QwtScaleMap &xMap,
- const QwtScaleMap &yMap, const QPainterPath &path, bool doAlign )
- {
-diff --git a/src/qwt_symbol.h b/src/qwt_symbol.h
-index 538778d..2961ebe 100644
---- a/src/qwt_symbol.h
-+++ b/src/qwt_symbol.h
-@@ -11,6 +11,8 @@
- #define QWT_SYMBOL_H
-
- #include "qwt_global.h"
-+#include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qpolygon.h>
-
- class QPainter;
-diff --git a/src/qwt_widget_overlay.cpp b/src/qwt_widget_overlay.cpp
-index 5974413..fa6da48 100644
---- a/src/qwt_widget_overlay.cpp
-+++ b/src/qwt_widget_overlay.cpp
-@@ -10,6 +10,7 @@
- #include "qwt_widget_overlay.h"
- #include "qwt_painter.h"
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qpaintengine.h>
- #include <qimage.h>
- #include <qevent.h>
---
-2.26.2
-
diff --git a/x11-libs/qwt/qwt-6.1.4.ebuild b/x11-libs/qwt/qwt-6.1.4.ebuild
deleted file mode 100644
index 152afdf4b6b..00000000000
--- a/x11-libs/qwt/qwt-6.1.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="2D plotting library for Qt5"
-HOMEPAGE="https://qwt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
-KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="6/1.4"
-IUSE="designer doc examples mathml opengl svg"
-
-DEPEND="
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- designer? ( dev-qt/designer:5 )
- opengl? (
- dev-qt/qtopengl:5
- virtual/opengl
- )
- svg? ( dev-qt/qtsvg:5 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGES-6.1 README )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
- "${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
- "${FILESDIR}"/${P}-qt-5.15.patch # trunk
-)
-
-src_prepare() {
- default
-
- cat > qwtconfig.pri <<-EOF
- QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
- QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
- QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
- QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
- VERSION = ${PV/_*}
- QWT_VERSION = ${PV/_*}
- EOF
-
- use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
- use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
- use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
- use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-
- cat > qwtbuild.pri <<-EOF
- QWT_CONFIG += qt warn_on thread release no_keywords
- EOF
-
- echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
-
- cat >> qwtconfig.pri <<-EOF
- QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer"
- QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
- EOF
- sed \
- -e 's/target doc/target/' \
- -e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
- -e "/^TARGET/s:qwt):qwt6-qt5):g" \
- -i src/src.pro || die
-
- sed \
- -e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
- -e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
- -i qwt.prf designer/designer.pro examples/examples.pri \
- textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
-}
-
-src_configure() {
- eqmake5
-}
-
-src_compile() {
- default
-}
-
-src_test() {
- cd examples || die
- eqmake5 examples.pro
- emake
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- if use mathml; then
- sed \
- -e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \
- -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
- fi
-
- if use doc; then
- local HTML_DOCS=( doc/html/. )
- else
- rm -r "${ED}"/usr/share/doc/${PF}/html || die
- fi
-
- einstalldocs
-
- mkdir -p "${ED}"/usr/share/man/ || die
- mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
- rmdir "${ED}"/usr/share/doc/${PF}/man || die
-
- if use examples; then
- # don't build examples - fix the qt files to build once installed
- cat > examples/examples.pri <<-EOF
- include( qwtconfig.pri )
- TEMPLATE = app
- MOC_DIR = moc
- INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
- DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
- LIBS += -lqwt6
- EOF
- sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
- cp *.pri examples/ || die
- insinto /usr/share/${PN}6
- doins -r examples
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/files/, x11-libs/qwt/
@ 2024-11-18 21:42 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2024-11-18 21:42 UTC (permalink / raw
To: gentoo-commits
commit: 84beceb7019937b2ebd99a484fa920e2750c6b50
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 21:53:04 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 21:41:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84beceb7
x11-libs/qwt: drop 6.1.5
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-libs/qwt/Manifest | 1 -
x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch | 250 ------------------------
x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch | 15 --
x11-libs/qwt/metadata.xml | 1 -
x11-libs/qwt/qwt-6.1.5.ebuild | 129 ------------
5 files changed, 396 deletions(-)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index fd565656c1d5..f6de14cac549 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,3 +1,2 @@
DIST qwt-5.2.3_p20210828.tar.gz 2324516 BLAKE2B f86ee55dab0e70bb255f90384ee920985d71ff998aa74bb087c2bd7bf3cdc23034786bce0d4e652dd4a7b1551719e4723de6689c76500e5f618838f40f7ca838 SHA512 c5eb64593a476d9ff1ec6c16593896bf3b90738a17775bd8186ffc7f86911ae0b91ceb8e7c1736329e9871fd9e1e5653a85df0a4cdb780a1f2f993f33ee07f62
-DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
DIST qwt-6.2.0.tar.bz2 4815773 BLAKE2B 30011de7ef9b555584644ccb0994bfe56af2d7efe16690b236aa1aa0860a4408800fbd31003fd7a7a0ddf8572f573b4d0ff77069f291cd2858b31a2840952b3b SHA512 d992f9dddb09ad0e1d09e23a24a9331c950ca19a413d2627cf423e1ddc2a4ad4eb951646f789e8c7a9ab42668c30d7108071f3f8bbd8e1f4118cadb67c34939d
diff --git a/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch b/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch
deleted file mode 100644
index a225350990a0..000000000000
--- a/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch
+++ /dev/null
@@ -1,250 +0,0 @@
---- qwt-6.0.2-orig/textengines/mathml/qwt_mml_document.cpp 2012-12-01 00:22:46.752106265 +1100
-+++ qwt-6.0.2/textengines/mathml/qwt_mml_document.cpp 2013-01-31 14:29:30.590197611 +1100
-@@ -4421,7 +4421,10 @@
- if ( ok )
- return value;
- else
-- qWarning( "Could not convert %s to form", value_str.toLatin1().data() );
-+ {
-+ QByteArray value_str_ba = value_str.toLatin1();
-+ qWarning( "Could not convert %s to form", value_str_ba.data() );
-+ }
-
- }
-
-@@ -4658,7 +4661,10 @@
- continue;
- }
- else
-- qWarning( "MmlMtableNode::layoutSymbol(): could not parse value %s%%", value.toLatin1().data() );
-+ {
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "MmlMtableNode::layoutSymbol(): could not parse value %s%%", value_ba.data() );
-+ }
- }
-
- // Relatively sized column, but we failed to parse the factor. Treat is like an auto
-@@ -5167,7 +5173,8 @@
- double factor = factor_str.toFloat( &float_ok );
- if ( !float_ok || factor < 0 )
- {
-- qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value_ba.data() );
- return 0;
- }
-
-@@ -5196,7 +5203,8 @@
- unit_size = QwtMmlNode::interpretSpacing( "1" + pseudo_unit, &unit_ok );
- if ( !unit_ok )
- {
-- qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value_ba.data() );
- return 0;
- }
- }
-@@ -5368,7 +5376,8 @@
- return ( int )( em * factor );
- else
- {
-- qWarning( "interpretSpacing(): could not parse \"%sem\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretSpacing(): could not parse \"%sem\"", value_ba.data() );
- if ( ok != 0 )
- *ok = false;
- return 0;
-@@ -5384,7 +5393,8 @@
- return ( int )( ex * factor );
- else
- {
-- qWarning( "interpretSpacing(): could not parse \"%sex\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretSpacing(): could not parse \"%sex\"", value_ba.data() );
- if ( ok != 0 )
- *ok = false;
- return 0;
-@@ -5406,7 +5416,8 @@
- }
- else
- {
-- qWarning( "interpretSpacing(): could not parse \"%scm\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretSpacing(): could not parse \"%scm\"", value_ba.data() );
- if ( ok != 0 )
- *ok = false;
- return 0;
-@@ -5428,7 +5439,8 @@
- }
- else
- {
-- qWarning( "interpretSpacing(): could not parse \"%smm\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretSpacing(): could not parse \"%smm\"", value_ba.data() );
- if ( ok != 0 )
- *ok = false;
- return 0;
-@@ -5450,7 +5462,8 @@
- }
- else
- {
-- qWarning( "interpretSpacing(): could not parse \"%sin\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretSpacing(): could not parse \"%sin\"", value_ba.data() );
- if ( ok != 0 )
- *ok = false;
- return 0;
-@@ -5466,7 +5479,8 @@
- return i;
- else
- {
-- qWarning( "interpretSpacing(): could not parse \"%spx\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretSpacing(): could not parse \"%spx\"", value_ba.data() );
- if ( ok != 0 )
- *ok = false;
- return 0;
-@@ -5478,7 +5492,8 @@
- if ( float_ok && i >= 0 )
- return i;
-
-- qWarning( "interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretSpacing(): could not parse \"%s\"", value_ba.data() );
- if ( ok != 0 )
- *ok = false;
- return 0;
-@@ -5503,7 +5518,8 @@
- return ( int )( base * factor / 100.0 );
- }
-
-- qWarning( "interpretPercentSpacing(): could not parse \"%s%%\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretPercentSpacing(): could not parse \"%s%%\"", value_ba.data() );
- if ( ok != 0 )
- *ok = false;
- return 0;
-@@ -5528,7 +5544,8 @@
- return pt_size;
- }
-
-- qWarning( "interpretPointSize(): could not parse \"%spt\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretPointSize(): could not parse \"%spt\"", value_ba.data() );
- if ( ok != 0 )
- *ok = false;
- return 0;
-@@ -5737,7 +5754,8 @@
- */
- static const QwtMmlOperSpec *searchOperSpecData( const QString &name )
- {
-- const char *name_latin1 = name.toLatin1().data();
-+ QByteArray name_latin1_ba = name.toLatin1();
-+ const char *name_latin1 = name_latin1_ba.data();
-
- // binary search
- // establish invariant g_oper_spec_data[begin].name < name < g_oper_spec_data[end].name
-@@ -5789,7 +5807,8 @@
- if ( spec == 0 )
- continue;
-
-- const char *name_latin1 = name.toLatin1().data();
-+ QByteArray name_ba = name.toLatin1();
-+ const char *name_latin1 = name_ba.data();
-
- // backtrack to the first instance of name
- while ( spec > g_oper_spec_data && qstrcmp( ( spec - 1 )->name, name_latin1 ) == 0 )
-@@ -5918,7 +5937,8 @@
- if ( ok != 0 )
- *ok = false;
-
-- qWarning( "interpretMathVariant(): could not parse value: \"%s\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretMathVariant(): could not parse value: \"%s\"", value_ba.data() );
-
- return QwtMml::NormalMV;
- }
-@@ -5938,7 +5958,8 @@
- if ( ok != 0 )
- *ok = false;
-
-- qWarning( "interpretForm(): could not parse value \"%s\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretForm(): could not parse value \"%s\"", value_ba.data() );
- return QwtMml::InfixForm;
- }
-
-@@ -5959,7 +5980,8 @@
- if ( ok != 0 )
- *ok = false;
-
-- qWarning( "interpretColAlign(): could not parse value \"%s\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretColAlign(): could not parse value \"%s\"", value_ba.data() );
- return QwtMml::ColAlignCenter;
- }
-
-@@ -5984,7 +6006,8 @@
- if ( ok != 0 )
- *ok = false;
-
-- qWarning( "interpretRowAlign(): could not parse value \"%s\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretRowAlign(): could not parse value \"%s\"", value_ba.data() );
- return QwtMml::RowAlignAxis;
- }
-
-@@ -6018,7 +6041,8 @@
- if ( ok != 0 )
- *ok = false;
-
-- qWarning( "interpretFrameType(): could not parse value \"%s\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretFrameType(): could not parse value \"%s\"", value_ba.data() );
- return QwtMml::FrameNone;
- }
-
-@@ -6030,7 +6054,8 @@
- QStringList l = value_list.split( ' ' );
- if ( l.count() != 2 )
- {
-- qWarning( "interpretFrameSpacing: could not parse value \"%s\"", value_list.toLatin1().data() );
-+ QByteArray value_list_ba = value_list.toLatin1();
-+ qWarning( "interpretFrameSpacing: could not parse value \"%s\"", value_list_ba.data() );
- if ( ok != 0 )
- *ok = false;
- return QwtMml::FrameSpacing( ( int )( 0.4 * em ), ( int )( 0.5 * ex ) );
-@@ -6089,7 +6114,10 @@
- else if ( value == "bold" )
- fn.setBold( true );
- else
-- qWarning( "interpretDepreciatedFontAttr(): could not parse fontweight \"%s\"", value.toLatin1().data() );
-+ {
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretDepreciatedFontAttr(): could not parse fontweight \"%s\"", value_ba.data() );
-+ }
- }
-
- if ( font_attr.contains( "fontstyle" ) )
-@@ -6100,7 +6128,10 @@
- else if ( value == "italic" )
- fn.setItalic( true );
- else
-- qWarning( "interpretDepreciatedFontAttr(): could not parse fontstyle \"%s\"", value.toLatin1().data() );
-+ {
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretDepreciatedFontAttr(): could not parse fontstyle \"%s\"", value_ba.data() );
-+ }
- }
-
- if ( font_attr.contains( "fontfamily" ) )
-@@ -6150,7 +6181,8 @@
-
- if ( ok != 0 )
- *ok = false;
-- qWarning( "interpretMathSize(): could not parse mathsize \"%s\"", value.toLatin1().data() );
-+ QByteArray value_ba = value.toLatin1();
-+ qWarning( "interpretMathSize(): could not parse mathsize \"%s\"", value_ba.data() );
- return fn;
- }
-
diff --git a/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch b/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch
deleted file mode 100644
index f00ea604f5f4..000000000000
--- a/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- textengines/mathml/mathml.pro | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/textengines/mathml/mathml.pro b/textengines/mathml/mathml.pro
-index 7032366..b1372f7 100644
---- a/textengines/mathml/mathml.pro
-+++ b/textengines/mathml/mathml.pro
-@@ -63,6 +63,7 @@ contains(QWT_CONFIG, QwtPkgConfig) {
-
- # QMAKE_PKGCONFIG_DESTDIR is buggy, in combination
- # with including pri files: better don't use it
-+ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-
- greaterThan(QT_MAJOR_VERSION, 4) {
-
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index 4ae06e042f79..ff542ee0b955 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -14,7 +14,6 @@
</longdescription>
<use>
<flag name="designer">Installs <pkg>dev-qt/designer</pkg> plugin.</flag>
- <flag name="mathml">Use the MathML renderer of the Qt solutions package.</flag>
<flag name="polar">Install the QwtPolar headers</flag>
</use>
<upstream>
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
deleted file mode 100644
index 2a371e6e9b17..000000000000
--- a/x11-libs/qwt/qwt-6.1.5.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="2D plotting library for Qt5"
-HOMEPAGE="https://qwt.sourceforge.io/"
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
-KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="6/1.5"
-IUSE="designer doc examples mathml opengl svg"
-
-DEPEND="
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- designer? ( dev-qt/designer:5 )
- opengl? (
- dev-qt/qtopengl:5
- virtual/opengl
- )
- svg? ( dev-qt/qtsvg:5 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGES-6.1 README )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
- "${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
-)
-
-src_prepare() {
- default
-
- cat > qwtconfig.pri <<-EOF || die
- QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
- QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
- QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
- QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
- VERSION = ${PV/_*}
- QWT_VERSION = ${PV/_*}
- EOF
-
- use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
- use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
- use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
- use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-
- cat > qwtbuild.pri <<-EOF || die
- QWT_CONFIG += qt warn_on thread release no_keywords
- EOF
-
- echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
-
- cat >> qwtconfig.pri <<-EOF || die
- QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer"
- QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
- EOF
- sed \
- -e 's/target doc/target/' \
- -e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
- -e "/^TARGET/s:qwt):qwt6-qt5):g" \
- -i src/src.pro || die
-
- sed \
- -e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
- -e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
- -i qwt.prf designer/designer.pro examples/examples.pri \
- textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
-}
-
-src_configure() {
- eqmake5
-}
-
-src_compile() {
- default
-}
-
-src_test() {
- cd examples || die
- eqmake5 examples.pro
- emake
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- if use mathml; then
- sed \
- -e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \
- -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
- fi
-
- if use doc; then
- local HTML_DOCS=( doc/html/. )
- else
- rm -r "${ED}"/usr/share/doc/${PF}/html || die
- fi
-
- einstalldocs
-
- mkdir -p "${ED}"/usr/share/man/ || die
- mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
- rmdir "${ED}"/usr/share/doc/${PF}/man || die
-
- if use examples; then
- # don't build examples - fix the qt files to build once installed
- cat > examples/examples.pri <<-EOF || die
- include( qwtconfig.pri )
- TEMPLATE = app
- MOC_DIR = moc
- INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
- DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
- LIBS += -lqwt6
- EOF
- sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
- cp *.pri examples/ || die
- insinto /usr/share/${PN}6
- doins -r examples
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-11-18 21:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-24 14:43 [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/files/, x11-libs/qwt/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-11-18 21:42 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox