From d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 29 Jan 2021 18:03:51 +0000 Subject: gentoo resync : 29.01.2021 --- x11-libs/qwt/Manifest | 5 +- x11-libs/qwt/files/qwt-6.1.4-qt-5.15.patch | 304 ----------------------------- x11-libs/qwt/qwt-6.1.4.ebuild | 130 ------------ x11-libs/qwt/qwt-6.1.5.ebuild | 2 +- 4 files changed, 2 insertions(+), 439 deletions(-) delete mode 100644 x11-libs/qwt/files/qwt-6.1.4-qt-5.15.patch delete mode 100644 x11-libs/qwt/qwt-6.1.4.ebuild (limited to 'x11-libs/qwt') diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest index 1159646e858d..c6dabbac6d6e 100644 --- a/x11-libs/qwt/Manifest +++ b/x11-libs/qwt/Manifest @@ -1,8 +1,5 @@ AUX qwt-6.0.2-invalid-read.patch 9447 BLAKE2B a3a9074113cee590bae03f0a55eb6cb2800c88ad06aa989d3293c42be8945db11982c915b775dac43d773f557dbfa57f5f3abf40a0f57c4d414f4003d09f581b SHA512 e9912ec60d062bad89ecb74c0342815f8c7b351318df88120e7510e44224f52a1c89e8ab2bcafd6d8c418a7a3e67347b159d174d417cbebf4fa3377191d0f201 AUX qwt-6.1.1-pc-destdir.patch 498 BLAKE2B 4e3fefa36daebe0c173adaae02c33a622d70cefd626998f9baf65229291be87dcd5dff175961fb2b33d794e0b3f082a36209ce682434bd3f83de6fecc585137a SHA512 a2035e27af7110a2aaf4e28f316e2c6c49b6909345ceec01eb4793ac66445594bf362fa6939506ba6d0300bde9487c83ea770299af8c3ca8d71b162cbc71e769 -AUX qwt-6.1.4-qt-5.15.patch 8857 BLAKE2B 539dd05419d36428aee36a78f92a875c5067366dfe56289e491c70a79d6e94f761eab55c97cf7b34e495ed049d438810ad48dfc9e01dd4bc1078b9fc1b4fe192 SHA512 ed00c4f3a06fd17d0a0bf9540937824e5f4e8e0b8b2fb3bf6e16f18d6fec5415ebc5ac828127ecc7cda6e2de7e52086cc236152f53cb8c21e2f86f6b0d6f430a -DIST qwt-6.1.4.tar.bz2 4227315 BLAKE2B dd7212adb3c8fda081b1feeeb9d59b3b087deb0ef56bdbc7bb95e01992e41d5d91065f0b8aaf3337e1c66d4ad431bfb313f9b04bb2e43915f4cb21fb65725e36 SHA512 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22 -EBUILD qwt-6.1.4.ebuild 3209 BLAKE2B bf5198b9a6a9b78d078cd05c53c14cca5b760cb37a703ffd5813d8c1b93105080704460cdae529feb8594829b84107b27895b000e04f5ee0c56bc41bbaace35d SHA512 496804a34ef7e9f50d05ac24f2280ba1c13badb10b36d6c65117b2973e6256a44b48f991e5f0eb1963e3bb5fc5fa1f6766964e24eb928325b1fcafa76326b36e -EBUILD qwt-6.1.5.ebuild 3169 BLAKE2B ea5707109597a519ee5fa05dd1f86ef2c2832cc3c371dfc12e4cd9116d849ae8e8ed94abdc9bf6ca4e3158fceef2a5b53566a370038ca6368a5aa29d11abf25a SHA512 a7215cbf4fe78eb2965dbac1d1170bd562279c1d44554d45fe1d2c243aaa9b24e2acd7aeb3ae37185265e2080a8f1569fbcc2d53dbfc601d9880f4b4a7011f43 +EBUILD qwt-6.1.5.ebuild 3167 BLAKE2B 50920fd2e5b173db1db2557700577f0c2a1a73b7cd64468c3d188e7a3fe8469227d64ee1b30840ad405e148f910be1d6b89e7d59282195488f70cdba69fd39a6 SHA512 377afb48fc2a3818acae82d2ca21fab2fa1c06cc3836e24583704aa9494ad6f4e1f820bc702a882655b5e99922066f71a701e7f784d77369f6ae94dc71e859fa MISC metadata.xml 870 BLAKE2B 1e2262a74f86901bfdb2a897fb40885880391898e60ca6ddb001ea6f7a1bca4586e2cc2c3af28b8d3f455aac4d93204efb370d491ac6749207cf584c8b08f589 SHA512 53e10079699529613ece87ae1e2908e7f7144d041f62618512d00df0b6bf9ae2c5b70afc8309cef0523e10a6605126f3ce871589c3133d64ac52db9ff7346b43 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 0ee4b1f9d178..000000000000 --- 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 -Date: Fri, 22 May 2020 17:56:55 +0200 -Subject: [PATCH] Fix build with Qt 5.15 (missing headers) - -Signed-off-by: Andreas Sturmlechner ---- - 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 - #include - #include -+#include - #include - - 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 - #include - #include -+#include -+#include - - 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 - #include -+#include - #include - #include - #include -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 -+#include - - 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 - #include -+#include - #include - #ifdef QT_SVG_LIB - #include -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 -+#include - - 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 - #include -+#include - - #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 - #include -+#include - #include - - 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 -+#include - #include - - 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 - #include -+#include - - /*! - \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 - #include - #include -+#include - #include - #include - #include -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 - #include - #include -+#include -+#include - #include - - 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 -+#include -+#include - #include - #include - #include -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 -+#include - #include - #include - #include -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 -+#include - #include - - 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 - #include -+#include - #include - #include - #include -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 - #include -+#include -+#include - - 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 - #include - #include -+#include -+#include - - #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 -+#include - #include - #include - #include -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 -+#include -+ - 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 -+#include - #include - - 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 -+#include - #include - #include - #include --- -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 152afdf4b6b8..000000000000 --- 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 -} diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild index 3328e27fd94b..1c2423d812c1 100644 --- a/x11-libs/qwt/qwt-6.1.5.ebuild +++ b/x11-libs/qwt/qwt-6.1.5.ebuild @@ -10,7 +10,7 @@ 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" +KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" SLOT="6/1.5" IUSE="designer doc examples mathml opengl svg" -- cgit v1.2.3