Index: audio/simon/Makefile =================================================================== --- audio/simon/Makefile +++ audio/simon/Makefile @@ -15,7 +15,7 @@ libsamplerate.so:audio/libsamplerate \ libpocketsphinx.so:audio/pocketsphinx \ libsphinxad.so:audio/sphinxbase \ - libqwt6.so:x11-toolkits/qwt6 + libqwt6.so:x11-toolkits/qwt6@qt4 USES= cmake:outsource gettext kde:4 tar:bz2 USE_KDE= kdelibs automoc4 pimlibs Index: finance/qhacc/Makefile =================================================================== --- finance/qhacc/Makefile +++ finance/qhacc/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgpgme.so:security/gpgme \ - libqwt6.so:x11-toolkits/qwt6 + libqwt6.so:x11-toolkits/qwt6@qt4 USES= compiler:c++11-lib qmake:norecursive tar:tgz USE_QT4= corelib gui sql moc_build rcc_build uic_build @@ -28,8 +28,8 @@ post-patch: @${REINPLACE_CMD} -e \ '/^INSTALLDIR/s|=.*|=${DATADIR}| ; \ - /^QWTINCS/s|=.*|=${LOCALBASE}/include/qwt6| ; \ - /^QWTLIBS/s|=.*|=${LOCALBASE}/lib -lqwt6| ; \ + /^QWTINCS/s|=.*|=${LOCALBASE}/include/qt4/qwt6| ; \ + /^QWTLIBS/s|=.*|=${LOCALBASE}/lib/qt4 -lqwt6| ; \ /+= debug/s|^|#| ; \ /^QMAKE_CFLAGS/s|=.*|= $$$${GPGMEINCS}| ; \ /^QMAKE_CXXFLAGS/s|=.*|= $$$${GPGMEINCS}| ; \ Index: x11-toolkits/qwt6-designerplugin/Makefile =================================================================== --- x11-toolkits/qwt6-designerplugin/Makefile +++ x11-toolkits/qwt6-designerplugin/Makefile @@ -1,30 +0,0 @@ -# $FreeBSD$ - -PORTNAME= qwt -PORTVERSION= 6.1.3 -CATEGORIES= x11-toolkits devel -MASTER_SITES= SF -PKGNAMESUFFIX= 6-designerplugin - -MAINTAINER= ports@FreeBSD.org -COMMENT= Qt Designer plugin for Qwt - -LIB_DEPENDS= libqwt6.so:x11-toolkits/qwt6 - -USES= gmake qmake tar:bzip2 -USE_QT4= designer moc_build rcc_build -QMAKE_ARGS+= CONFIG+=QwtDesigner \ - PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL} - -PLIST_FILES= ${QT_PLUGINDIR_REL}/designer/libqwt6_designer_plugin.so - -STRIP_FILES= ${QT_PLUGINDIR_REL}/designer/libqwt6_designer_plugin.so - -CONFIGURE_WRKSRC= ${WRKSRC}/designer -BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} - -post-install: - ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} - -.include Index: x11-toolkits/qwt6-designerplugin/distinfo =================================================================== --- x11-toolkits/qwt6-designerplugin/distinfo +++ x11-toolkits/qwt6-designerplugin/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1507301892 -SHA256 (qwt-6.1.3.tar.bz2) = f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733 -SIZE (qwt-6.1.3.tar.bz2) = 4245614 Index: x11-toolkits/qwt6-designerplugin/files/patch-designer__designer.pro =================================================================== --- x11-toolkits/qwt6-designerplugin/files/patch-designer__designer.pro +++ x11-toolkits/qwt6-designerplugin/files/patch-designer__designer.pro @@ -1,29 +0,0 @@ ---- designer/designer.pro.orig 2016-06-13 07:14:23 UTC -+++ designer/designer.pro -@@ -42,7 +42,7 @@ contains(QWT_CONFIG, QwtDesigner) { - - - TEMPLATE = lib -- TARGET = qwt_designer_plugin -+ TARGET = qwt6_designer_plugin - - DESTDIR = plugins/designer - -@@ -84,7 +84,7 @@ contains(QWT_CONFIG, QwtDesigner) { - # into the plugin. Not supported on Windows ! - - QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS} -- qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt) -+ qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt6) - - contains(QWT_CONFIG, QwtDll) { - -@@ -113,7 +113,7 @@ contains(QWT_CONFIG, QwtDesigner) { - - RESOURCES += qwt_designer_plugin.qrc - -- target.path = $${QWT_INSTALL_PLUGINS} -+ target.path = $$PLUGINDIR/designer - INSTALLS += target - } - else { Index: x11-toolkits/qwt6-designerplugin/pkg-descr =================================================================== --- x11-toolkits/qwt6-designerplugin/pkg-descr +++ x11-toolkits/qwt6-designerplugin/pkg-descr @@ -1,9 +0,0 @@ -The Qwt library contains GUI Components and utility classes which -are primarily useful for programs with a technical background. -Beside a 2D plot widget it provides scales, sliders, dials, compasses, -thermometers, wheels and knobs to control or display values, arrays, -or ranges of type double. - -This port installs Qt Designer plugin for Qwt library version 6. - -WWW: http://qwt.sourceforge.net Index: x11-toolkits/qwt6/Makefile =================================================================== --- x11-toolkits/qwt6/Makefile +++ x11-toolkits/qwt6/Makefile @@ -4,27 +4,38 @@ PORTVERSION= 6.1.3 CATEGORIES= x11-toolkits MASTER_SITES= SF -PKGNAMESUFFIX= 6 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= lbartoletti@tuxfamily.org COMMENT= Qt Widgets for Technical Applications USES= gmake qmake tar:bzip2 -USE_QT4= corelib gui opengl svg xml moc_build USE_GL= gl USE_LDCONFIG= yes -DOCSDIR= ${PREFIX}/share/doc/qwt6 +DOCSDIR= ${PREFIX}/share/doc/qwt6-${FLAVOR} PORTDOCS= * -PLIST_SUB= INCLUDEDIR=include/qwt6 \ +PLIST_SUB= INCLUDEDIR=include/${FLAVOR}/qwt6 \ SHLIB_VER=${PORTVERSION} \ SHLIB_SHVER=${PORTVERSION:R} \ - QT_MKSPECDIR=share/qt4/mkspecs + QT_MKSPECDIR=lib/${FLAVOR}/mkspecs +PLIST= ${PKGDIR}/pkg-plist.${FLAVOR} +FLAVORS= qt5 qt4 +FLAVOR?= ${FLAVORS:[2]} + +.if ${FLAVOR} == qt4 +PKGNAMESUFFIX= 6-qt4 +USE_QT4= corelib gui opengl svg xml moc_build +.else +PKGNAMESUFFIX= 6-qt5 +USE_QT5= buildtools_build widgets gui core designer gui opengl svg xml printsupport concurrent +.endif + OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e '/INSTALLS.*doc/d' ${WRKSRC}/doc/doc.pro + @${REINPLACE_CMD} -e 's/__QT_VERSION__/${FLAVOR:S/qt//}/g' ${WRKSRC}/qwtconfig.pri post-install-DOCS-on: @(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) Index: x11-toolkits/qwt6/files/patch-qwt.prf =================================================================== --- x11-toolkits/qwt6/files/patch-qwt.prf +++ x11-toolkits/qwt6/files/patch-qwt.prf @@ -1,4 +1,4 @@ ---- qwt.prf.orig 2017-10-06 14:51:04 UTC +--- qwt.prf.orig 2014-10-13 16:16:53 UTC +++ qwt.prf @@ -34,4 +34,4 @@ else { } Index: x11-toolkits/qwt6/files/patch-qwtconfig.pri =================================================================== --- x11-toolkits/qwt6/files/patch-qwtconfig.pri +++ x11-toolkits/qwt6/files/patch-qwtconfig.pri @@ -9,21 +9,34 @@ # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION } -@@ -29,7 +29,7 @@ win32 { +@@ -28,9 +28,9 @@ win32 { + # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION } - QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc +-QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc -QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include -+QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt6 - QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib +-QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib ++QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/share/doc/qwt6-qt__QT_VERSION__ ++QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qt__QT_VERSION__/qwt6 ++QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib/qt__QT_VERSION__ ###################################################################### + # Designer plugin +@@ -42,7 +42,7 @@ QWT_INSTALL_LIBS = $${QWT_INSTALL_P + # runtime environment of designer/creator. + ###################################################################### + +-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer ++QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/lib/qt__QT_VERSION__/plugins/designer + + # linux distributors often organize the Qt installation + # their way and QT_INSTALL_PREFIX doesn't offer a good @@ -63,7 +63,7 @@ QWT_INSTALL_PLUGINS = $${QWT_INSTALL_P # with every Qt upgrade. ###################################################################### -QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features -+QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/share/qt4/mkspecs/features ++QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/lib/qt__QT_VERSION__/mkspecs/features # QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features ###################################################################### Index: x11-toolkits/qwt6/files/patch-textengines_textengines.pri =================================================================== --- x11-toolkits/qwt6/files/patch-textengines_textengines.pri +++ x11-toolkits/qwt6/files/patch-textengines_textengines.pri @@ -1,4 +1,4 @@ ---- textengines/textengines.pri.orig 2017-10-06 14:51:21 UTC +--- textengines/textengines.pri.orig 2016-06-13 07:14:23 UTC +++ textengines/textengines.pri @@ -34,7 +34,7 @@ contains(QWT_CONFIG, QwtFramework) { CONFIG += lib_bundle Index: x11-toolkits/qwt6/pkg-descr =================================================================== --- x11-toolkits/qwt6/pkg-descr +++ x11-toolkits/qwt6/pkg-descr @@ -1,4 +1,4 @@ -This is Qt4 port of Qwt library version 6. The Qwt library contains +This is the port of Qwt library version 6. The Qwt library contains GUI Components and utility classes which are primarily useful for programs with a technical background. Beside a 2D plot widget it provides scales, sliders, dials, compasses, thermometers, wheels Index: x11-toolkits/qwt6/pkg-plist =================================================================== --- x11-toolkits/qwt6/pkg-plist +++ x11-toolkits/qwt6/pkg-plist @@ -1,111 +0,0 @@ -%%INCLUDEDIR%%/qwt.h -%%INCLUDEDIR%%/qwt_abstract_legend.h -%%INCLUDEDIR%%/qwt_abstract_scale.h -%%INCLUDEDIR%%/qwt_abstract_scale_draw.h -%%INCLUDEDIR%%/qwt_abstract_slider.h -%%INCLUDEDIR%%/qwt_analog_clock.h -%%INCLUDEDIR%%/qwt_arrow_button.h -%%INCLUDEDIR%%/qwt_clipper.h -%%INCLUDEDIR%%/qwt_color_map.h -%%INCLUDEDIR%%/qwt_column_symbol.h -%%INCLUDEDIR%%/qwt_compass.h -%%INCLUDEDIR%%/qwt_compass_rose.h -%%INCLUDEDIR%%/qwt_compat.h -%%INCLUDEDIR%%/qwt_counter.h -%%INCLUDEDIR%%/qwt_curve_fitter.h -%%INCLUDEDIR%%/qwt_date.h -%%INCLUDEDIR%%/qwt_date_scale_draw.h -%%INCLUDEDIR%%/qwt_date_scale_engine.h -%%INCLUDEDIR%%/qwt_dial.h -%%INCLUDEDIR%%/qwt_dial_needle.h -%%INCLUDEDIR%%/qwt_dyngrid_layout.h -%%INCLUDEDIR%%/qwt_event_pattern.h -%%INCLUDEDIR%%/qwt_global.h -%%INCLUDEDIR%%/qwt_graphic.h -%%INCLUDEDIR%%/qwt_interval.h -%%INCLUDEDIR%%/qwt_interval_symbol.h -%%INCLUDEDIR%%/qwt_knob.h -%%INCLUDEDIR%%/qwt_legend.h -%%INCLUDEDIR%%/qwt_legend_data.h -%%INCLUDEDIR%%/qwt_legend_label.h -%%INCLUDEDIR%%/qwt_magnifier.h -%%INCLUDEDIR%%/qwt_math.h -%%INCLUDEDIR%%/qwt_mathml_text_engine.h -%%INCLUDEDIR%%/qwt_matrix_raster_data.h -%%INCLUDEDIR%%/qwt_null_paintdevice.h -%%INCLUDEDIR%%/qwt_painter.h -%%INCLUDEDIR%%/qwt_painter_command.h -%%INCLUDEDIR%%/qwt_panner.h -%%INCLUDEDIR%%/qwt_picker.h -%%INCLUDEDIR%%/qwt_picker_machine.h -%%INCLUDEDIR%%/qwt_pixel_matrix.h -%%INCLUDEDIR%%/qwt_plot.h -%%INCLUDEDIR%%/qwt_plot_abstract_barchart.h -%%INCLUDEDIR%%/qwt_plot_barchart.h -%%INCLUDEDIR%%/qwt_plot_canvas.h -%%INCLUDEDIR%%/qwt_plot_curve.h -%%INCLUDEDIR%%/qwt_plot_dict.h -%%INCLUDEDIR%%/qwt_plot_directpainter.h -%%INCLUDEDIR%%/qwt_plot_glcanvas.h -%%INCLUDEDIR%%/qwt_plot_grid.h -%%INCLUDEDIR%%/qwt_plot_histogram.h -%%INCLUDEDIR%%/qwt_plot_intervalcurve.h -%%INCLUDEDIR%%/qwt_plot_item.h -%%INCLUDEDIR%%/qwt_plot_layout.h -%%INCLUDEDIR%%/qwt_plot_legenditem.h -%%INCLUDEDIR%%/qwt_plot_magnifier.h -%%INCLUDEDIR%%/qwt_plot_marker.h -%%INCLUDEDIR%%/qwt_plot_multi_barchart.h -%%INCLUDEDIR%%/qwt_plot_panner.h -%%INCLUDEDIR%%/qwt_plot_picker.h -%%INCLUDEDIR%%/qwt_plot_rasteritem.h -%%INCLUDEDIR%%/qwt_plot_renderer.h -%%INCLUDEDIR%%/qwt_plot_rescaler.h -%%INCLUDEDIR%%/qwt_plot_scaleitem.h -%%INCLUDEDIR%%/qwt_plot_seriesitem.h -%%INCLUDEDIR%%/qwt_plot_shapeitem.h -%%INCLUDEDIR%%/qwt_plot_spectrocurve.h -%%INCLUDEDIR%%/qwt_plot_spectrogram.h -%%INCLUDEDIR%%/qwt_plot_svgitem.h -%%INCLUDEDIR%%/qwt_plot_textlabel.h -%%INCLUDEDIR%%/qwt_plot_tradingcurve.h -%%INCLUDEDIR%%/qwt_plot_zoneitem.h -%%INCLUDEDIR%%/qwt_plot_zoomer.h -%%INCLUDEDIR%%/qwt_point_3d.h -%%INCLUDEDIR%%/qwt_point_data.h -%%INCLUDEDIR%%/qwt_point_mapper.h -%%INCLUDEDIR%%/qwt_point_polar.h -%%INCLUDEDIR%%/qwt_raster_data.h -%%INCLUDEDIR%%/qwt_round_scale_draw.h -%%INCLUDEDIR%%/qwt_samples.h -%%INCLUDEDIR%%/qwt_sampling_thread.h -%%INCLUDEDIR%%/qwt_scale_div.h -%%INCLUDEDIR%%/qwt_scale_draw.h -%%INCLUDEDIR%%/qwt_scale_engine.h -%%INCLUDEDIR%%/qwt_scale_map.h -%%INCLUDEDIR%%/qwt_scale_widget.h -%%INCLUDEDIR%%/qwt_series_data.h -%%INCLUDEDIR%%/qwt_series_store.h -%%INCLUDEDIR%%/qwt_slider.h -%%INCLUDEDIR%%/qwt_spline.h -%%INCLUDEDIR%%/qwt_symbol.h -%%INCLUDEDIR%%/qwt_system_clock.h -%%INCLUDEDIR%%/qwt_text.h -%%INCLUDEDIR%%/qwt_text_engine.h -%%INCLUDEDIR%%/qwt_text_label.h -%%INCLUDEDIR%%/qwt_thermo.h -%%INCLUDEDIR%%/qwt_transform.h -%%INCLUDEDIR%%/qwt_wheel.h -%%INCLUDEDIR%%/qwt_widget_overlay.h -lib/libqwt6.so -lib/libqwt6.so.6 -lib/libqwt6.so.%%SHLIB_VER%% -lib/libqwt6.so.%%SHLIB_SHVER%% -lib/libqwtmathml.so -lib/libqwtmathml.so.6 -lib/libqwtmathml.so.%%SHLIB_VER%% -lib/libqwtmathml.so.%%SHLIB_SHVER%% -%%QT_MKSPECDIR%%/features/qwt.prf -%%QT_MKSPECDIR%%/features/qwtconfig.pri -%%QT_MKSPECDIR%%/features/qwtfunctions.pri -%%QT_MKSPECDIR%%/features/qwtmathml.prf Index: x11-toolkits/qwt6/pkg-plist.qt4 =================================================================== --- x11-toolkits/qwt6/pkg-plist.qt4 +++ x11-toolkits/qwt6/pkg-plist.qt4 @@ -0,0 +1,112 @@ +%%INCLUDEDIR%%/qwt.h +%%INCLUDEDIR%%/qwt_abstract_legend.h +%%INCLUDEDIR%%/qwt_abstract_scale.h +%%INCLUDEDIR%%/qwt_abstract_scale_draw.h +%%INCLUDEDIR%%/qwt_abstract_slider.h +%%INCLUDEDIR%%/qwt_analog_clock.h +%%INCLUDEDIR%%/qwt_arrow_button.h +%%INCLUDEDIR%%/qwt_clipper.h +%%INCLUDEDIR%%/qwt_color_map.h +%%INCLUDEDIR%%/qwt_column_symbol.h +%%INCLUDEDIR%%/qwt_compass.h +%%INCLUDEDIR%%/qwt_compass_rose.h +%%INCLUDEDIR%%/qwt_compat.h +%%INCLUDEDIR%%/qwt_counter.h +%%INCLUDEDIR%%/qwt_curve_fitter.h +%%INCLUDEDIR%%/qwt_date.h +%%INCLUDEDIR%%/qwt_date_scale_draw.h +%%INCLUDEDIR%%/qwt_date_scale_engine.h +%%INCLUDEDIR%%/qwt_dial.h +%%INCLUDEDIR%%/qwt_dial_needle.h +%%INCLUDEDIR%%/qwt_dyngrid_layout.h +%%INCLUDEDIR%%/qwt_event_pattern.h +%%INCLUDEDIR%%/qwt_global.h +%%INCLUDEDIR%%/qwt_graphic.h +%%INCLUDEDIR%%/qwt_interval.h +%%INCLUDEDIR%%/qwt_interval_symbol.h +%%INCLUDEDIR%%/qwt_knob.h +%%INCLUDEDIR%%/qwt_legend.h +%%INCLUDEDIR%%/qwt_legend_data.h +%%INCLUDEDIR%%/qwt_legend_label.h +%%INCLUDEDIR%%/qwt_magnifier.h +%%INCLUDEDIR%%/qwt_math.h +%%INCLUDEDIR%%/qwt_mathml_text_engine.h +%%INCLUDEDIR%%/qwt_matrix_raster_data.h +%%INCLUDEDIR%%/qwt_null_paintdevice.h +%%INCLUDEDIR%%/qwt_painter.h +%%INCLUDEDIR%%/qwt_painter_command.h +%%INCLUDEDIR%%/qwt_panner.h +%%INCLUDEDIR%%/qwt_picker.h +%%INCLUDEDIR%%/qwt_picker_machine.h +%%INCLUDEDIR%%/qwt_pixel_matrix.h +%%INCLUDEDIR%%/qwt_plot.h +%%INCLUDEDIR%%/qwt_plot_abstract_barchart.h +%%INCLUDEDIR%%/qwt_plot_barchart.h +%%INCLUDEDIR%%/qwt_plot_canvas.h +%%INCLUDEDIR%%/qwt_plot_curve.h +%%INCLUDEDIR%%/qwt_plot_dict.h +%%INCLUDEDIR%%/qwt_plot_directpainter.h +%%INCLUDEDIR%%/qwt_plot_glcanvas.h +%%INCLUDEDIR%%/qwt_plot_grid.h +%%INCLUDEDIR%%/qwt_plot_histogram.h +%%INCLUDEDIR%%/qwt_plot_intervalcurve.h +%%INCLUDEDIR%%/qwt_plot_item.h +%%INCLUDEDIR%%/qwt_plot_layout.h +%%INCLUDEDIR%%/qwt_plot_legenditem.h +%%INCLUDEDIR%%/qwt_plot_magnifier.h +%%INCLUDEDIR%%/qwt_plot_marker.h +%%INCLUDEDIR%%/qwt_plot_multi_barchart.h +%%INCLUDEDIR%%/qwt_plot_panner.h +%%INCLUDEDIR%%/qwt_plot_picker.h +%%INCLUDEDIR%%/qwt_plot_rasteritem.h +%%INCLUDEDIR%%/qwt_plot_renderer.h +%%INCLUDEDIR%%/qwt_plot_rescaler.h +%%INCLUDEDIR%%/qwt_plot_scaleitem.h +%%INCLUDEDIR%%/qwt_plot_seriesitem.h +%%INCLUDEDIR%%/qwt_plot_shapeitem.h +%%INCLUDEDIR%%/qwt_plot_spectrocurve.h +%%INCLUDEDIR%%/qwt_plot_spectrogram.h +%%INCLUDEDIR%%/qwt_plot_svgitem.h +%%INCLUDEDIR%%/qwt_plot_textlabel.h +%%INCLUDEDIR%%/qwt_plot_tradingcurve.h +%%INCLUDEDIR%%/qwt_plot_zoneitem.h +%%INCLUDEDIR%%/qwt_plot_zoomer.h +%%INCLUDEDIR%%/qwt_point_3d.h +%%INCLUDEDIR%%/qwt_point_data.h +%%INCLUDEDIR%%/qwt_point_mapper.h +%%INCLUDEDIR%%/qwt_point_polar.h +%%INCLUDEDIR%%/qwt_raster_data.h +%%INCLUDEDIR%%/qwt_round_scale_draw.h +%%INCLUDEDIR%%/qwt_samples.h +%%INCLUDEDIR%%/qwt_sampling_thread.h +%%INCLUDEDIR%%/qwt_scale_div.h +%%INCLUDEDIR%%/qwt_scale_draw.h +%%INCLUDEDIR%%/qwt_scale_engine.h +%%INCLUDEDIR%%/qwt_scale_map.h +%%INCLUDEDIR%%/qwt_scale_widget.h +%%INCLUDEDIR%%/qwt_series_data.h +%%INCLUDEDIR%%/qwt_series_store.h +%%INCLUDEDIR%%/qwt_slider.h +%%INCLUDEDIR%%/qwt_spline.h +%%INCLUDEDIR%%/qwt_symbol.h +%%INCLUDEDIR%%/qwt_system_clock.h +%%INCLUDEDIR%%/qwt_text.h +%%INCLUDEDIR%%/qwt_text_engine.h +%%INCLUDEDIR%%/qwt_text_label.h +%%INCLUDEDIR%%/qwt_thermo.h +%%INCLUDEDIR%%/qwt_transform.h +%%INCLUDEDIR%%/qwt_wheel.h +%%INCLUDEDIR%%/qwt_widget_overlay.h +%%QT_LIBDIR%%/libqwt6.so +%%QT_LIBDIR%%/libqwt6.so.6 +%%QT_LIBDIR%%/libqwt6.so.%%SHLIB_SHVER%% +%%QT_LIBDIR%%/libqwt6.so.%%SHLIB_VER%% +%%QT_LIBDIR%%/libqwtmathml.so +%%QT_LIBDIR%%/libqwtmathml.so.6 +%%QT_LIBDIR%%/libqwtmathml.so.%%SHLIB_SHVER%% +%%QT_LIBDIR%%/libqwtmathml.so.%%SHLIB_VER%% +%%QT_MKSPECDIR%%/features/qwt.prf +%%QT_MKSPECDIR%%/features/qwtconfig.pri +%%QT_MKSPECDIR%%/features/qwtfunctions.pri +%%QT_MKSPECDIR%%/features/qwtmathml.prf + Index: x11-toolkits/qwt6/pkg-plist.qt5 =================================================================== --- x11-toolkits/qwt6/pkg-plist.qt5 +++ x11-toolkits/qwt6/pkg-plist.qt5 @@ -0,0 +1,112 @@ +%%INCLUDEDIR%%/qwt.h +%%INCLUDEDIR%%/qwt_abstract_legend.h +%%INCLUDEDIR%%/qwt_abstract_scale.h +%%INCLUDEDIR%%/qwt_abstract_scale_draw.h +%%INCLUDEDIR%%/qwt_abstract_slider.h +%%INCLUDEDIR%%/qwt_analog_clock.h +%%INCLUDEDIR%%/qwt_arrow_button.h +%%INCLUDEDIR%%/qwt_clipper.h +%%INCLUDEDIR%%/qwt_color_map.h +%%INCLUDEDIR%%/qwt_column_symbol.h +%%INCLUDEDIR%%/qwt_compass.h +%%INCLUDEDIR%%/qwt_compass_rose.h +%%INCLUDEDIR%%/qwt_compat.h +%%INCLUDEDIR%%/qwt_counter.h +%%INCLUDEDIR%%/qwt_curve_fitter.h +%%INCLUDEDIR%%/qwt_date.h +%%INCLUDEDIR%%/qwt_date_scale_draw.h +%%INCLUDEDIR%%/qwt_date_scale_engine.h +%%INCLUDEDIR%%/qwt_dial.h +%%INCLUDEDIR%%/qwt_dial_needle.h +%%INCLUDEDIR%%/qwt_dyngrid_layout.h +%%INCLUDEDIR%%/qwt_event_pattern.h +%%INCLUDEDIR%%/qwt_global.h +%%INCLUDEDIR%%/qwt_graphic.h +%%INCLUDEDIR%%/qwt_interval.h +%%INCLUDEDIR%%/qwt_interval_symbol.h +%%INCLUDEDIR%%/qwt_knob.h +%%INCLUDEDIR%%/qwt_legend.h +%%INCLUDEDIR%%/qwt_legend_data.h +%%INCLUDEDIR%%/qwt_legend_label.h +%%INCLUDEDIR%%/qwt_magnifier.h +%%INCLUDEDIR%%/qwt_math.h +%%INCLUDEDIR%%/qwt_mathml_text_engine.h +%%INCLUDEDIR%%/qwt_matrix_raster_data.h +%%INCLUDEDIR%%/qwt_null_paintdevice.h +%%INCLUDEDIR%%/qwt_painter.h +%%INCLUDEDIR%%/qwt_painter_command.h +%%INCLUDEDIR%%/qwt_panner.h +%%INCLUDEDIR%%/qwt_picker.h +%%INCLUDEDIR%%/qwt_picker_machine.h +%%INCLUDEDIR%%/qwt_pixel_matrix.h +%%INCLUDEDIR%%/qwt_plot.h +%%INCLUDEDIR%%/qwt_plot_abstract_barchart.h +%%INCLUDEDIR%%/qwt_plot_barchart.h +%%INCLUDEDIR%%/qwt_plot_canvas.h +%%INCLUDEDIR%%/qwt_plot_curve.h +%%INCLUDEDIR%%/qwt_plot_dict.h +%%INCLUDEDIR%%/qwt_plot_directpainter.h +%%INCLUDEDIR%%/qwt_plot_glcanvas.h +%%INCLUDEDIR%%/qwt_plot_grid.h +%%INCLUDEDIR%%/qwt_plot_histogram.h +%%INCLUDEDIR%%/qwt_plot_intervalcurve.h +%%INCLUDEDIR%%/qwt_plot_item.h +%%INCLUDEDIR%%/qwt_plot_layout.h +%%INCLUDEDIR%%/qwt_plot_legenditem.h +%%INCLUDEDIR%%/qwt_plot_magnifier.h +%%INCLUDEDIR%%/qwt_plot_marker.h +%%INCLUDEDIR%%/qwt_plot_multi_barchart.h +%%INCLUDEDIR%%/qwt_plot_panner.h +%%INCLUDEDIR%%/qwt_plot_picker.h +%%INCLUDEDIR%%/qwt_plot_rasteritem.h +%%INCLUDEDIR%%/qwt_plot_renderer.h +%%INCLUDEDIR%%/qwt_plot_rescaler.h +%%INCLUDEDIR%%/qwt_plot_scaleitem.h +%%INCLUDEDIR%%/qwt_plot_seriesitem.h +%%INCLUDEDIR%%/qwt_plot_shapeitem.h +%%INCLUDEDIR%%/qwt_plot_spectrocurve.h +%%INCLUDEDIR%%/qwt_plot_spectrogram.h +%%INCLUDEDIR%%/qwt_plot_svgitem.h +%%INCLUDEDIR%%/qwt_plot_textlabel.h +%%INCLUDEDIR%%/qwt_plot_tradingcurve.h +%%INCLUDEDIR%%/qwt_plot_zoneitem.h +%%INCLUDEDIR%%/qwt_plot_zoomer.h +%%INCLUDEDIR%%/qwt_point_3d.h +%%INCLUDEDIR%%/qwt_point_data.h +%%INCLUDEDIR%%/qwt_point_mapper.h +%%INCLUDEDIR%%/qwt_point_polar.h +%%INCLUDEDIR%%/qwt_raster_data.h +%%INCLUDEDIR%%/qwt_round_scale_draw.h +%%INCLUDEDIR%%/qwt_samples.h +%%INCLUDEDIR%%/qwt_sampling_thread.h +%%INCLUDEDIR%%/qwt_scale_div.h +%%INCLUDEDIR%%/qwt_scale_draw.h +%%INCLUDEDIR%%/qwt_scale_engine.h +%%INCLUDEDIR%%/qwt_scale_map.h +%%INCLUDEDIR%%/qwt_scale_widget.h +%%INCLUDEDIR%%/qwt_series_data.h +%%INCLUDEDIR%%/qwt_series_store.h +%%INCLUDEDIR%%/qwt_slider.h +%%INCLUDEDIR%%/qwt_spline.h +%%INCLUDEDIR%%/qwt_symbol.h +%%INCLUDEDIR%%/qwt_system_clock.h +%%INCLUDEDIR%%/qwt_text.h +%%INCLUDEDIR%%/qwt_text_engine.h +%%INCLUDEDIR%%/qwt_text_label.h +%%INCLUDEDIR%%/qwt_thermo.h +%%INCLUDEDIR%%/qwt_transform.h +%%INCLUDEDIR%%/qwt_wheel.h +%%INCLUDEDIR%%/qwt_widget_overlay.h +%%QT_LIBDIR%%/libqwt6.so +%%QT_LIBDIR%%/libqwt6.so.6 +%%QT_LIBDIR%%/libqwt6.so.%%SHLIB_SHVER%% +%%QT_LIBDIR%%/libqwt6.so.%%SHLIB_VER%% +%%QT_LIBDIR%%/libqwtmathml.so +%%QT_LIBDIR%%/libqwtmathml.so.6 +%%QT_LIBDIR%%/libqwtmathml.so.%%SHLIB_SHVER%% +%%QT_LIBDIR%%/libqwtmathml.so.%%SHLIB_VER%% +%%QT_MKSPECDIR%%/features/qwt.prf +%%QT_MKSPECDIR%%/features/qwtconfig.pri +%%QT_MKSPECDIR%%/features/qwtfunctions.pri +%%QT_MKSPECDIR%%/features/qwtmathml.prf + Index: x11/leechcraft/Makefile =================================================================== --- x11/leechcraft/Makefile +++ x11/leechcraft/Makefile @@ -13,7 +13,7 @@ LICENSE= BSL LICENSE_FILE= ${WRKDIR}/${DISTNAME}/LICENSE -LIB_DEPENDS= libqwt6.so:x11-toolkits/qwt6 \ +LIB_DEPENDS= libqwt6.so:x11-toolkits/qwt6@qt4 \ libpcre.so:devel/pcre \ libboost_program_options.so:devel/boost-libs Index: x11/leechcraft/files/patch-5c29ae8130.diff =================================================================== --- x11/leechcraft/files/patch-5c29ae8130.diff +++ x11/leechcraft/files/patch-5c29ae8130.diff @@ -1,14 +1,3 @@ ---- plugins/bittorrent/core.h.orig 2014-07-28 18:35:44 UTC -+++ plugins/bittorrent/core.h -@@ -271,7 +271,7 @@ namespace BitTorrent - const QVector& files = QVector (), - LeechCraft::TaskParameters params = LeechCraft::NoParameters); - void KillTask (int); -- void RemoveTorrent (int, int opt = libtorrent::session::none); -+ void RemoveTorrent (int, int opt = 0); - void PauseTorrent (int); - void ResumeTorrent (int); - void ForceReannounce (int); --- plugins/bittorrent/core.cpp.orig 2014-07-28 18:35:44 UTC +++ plugins/bittorrent/core.cpp @@ -230,9 +230,11 @@ namespace BitTorrent @@ -41,6 +30,17 @@ handle = Session_->add_torrent (atp); if (XmlSettingsManager::Instance ()->property ("ResolveCountries").toBool ()) +--- plugins/bittorrent/core.h.orig 2014-07-28 18:35:44 UTC ++++ plugins/bittorrent/core.h +@@ -271,7 +271,7 @@ namespace BitTorrent + const QVector& files = QVector (), + LeechCraft::TaskParameters params = LeechCraft::NoParameters); + void KillTask (int); +- void RemoveTorrent (int, int opt = libtorrent::session::none); ++ void RemoveTorrent (int, int opt = 0); + void PauseTorrent (int); + void ResumeTorrent (int); + void ForceReannounce (int); --- plugins/bittorrent/torrentplugin.cpp.orig 2014-07-28 18:35:44 UTC +++ plugins/bittorrent/torrentplugin.cpp @@ -555,7 +555,7 @@ namespace LeechCraft Index: x11/leechcraft/files/patch-plugins_azoth_plugins_otroid_otrhandler.cpp =================================================================== --- x11/leechcraft/files/patch-plugins_azoth_plugins_otroid_otrhandler.cpp +++ x11/leechcraft/files/patch-plugins_azoth_plugins_otroid_otrhandler.cpp @@ -1,5 +1,5 @@ ---- plugins/azoth/plugins/otroid/otrhandler.cpp.orig 2014-07-28 20:35:44.000000000 +0200 -+++ plugins/azoth/plugins/otroid/otrhandler.cpp 2016-01-26 13:30:45.499740000 +0100 +--- plugins/azoth/plugins/otroid/otrhandler.cpp.orig 2014-07-28 18:35:44 UTC ++++ plugins/azoth/plugins/otroid/otrhandler.cpp @@ -510,7 +510,7 @@ namespace OTRoid auto list = proxy->GetReturnValue ().toList (); Index: x11/leechcraft/files/patch-plugins_lmp_cmake_FindTaglib.cmake =================================================================== --- x11/leechcraft/files/patch-plugins_lmp_cmake_FindTaglib.cmake +++ x11/leechcraft/files/patch-plugins_lmp_cmake_FindTaglib.cmake @@ -1,4 +1,4 @@ ---- plugins/lmp/cmake/FindTaglib.cmake.orig 2016-01-03 16:39:26 UTC +--- plugins/lmp/cmake/FindTaglib.cmake.orig 2014-07-28 18:35:44 UTC +++ plugins/lmp/cmake/FindTaglib.cmake @@ -29,7 +29,7 @@ if(TAGLIBCONFIG_EXECUTABLE) Index: x11/leechcraft/files/patch-util_network_addresses.cpp =================================================================== --- x11/leechcraft/files/patch-util_network_addresses.cpp +++ x11/leechcraft/files/patch-util_network_addresses.cpp @@ -1,5 +1,5 @@ ---- util/network/addresses.cpp.orig 2014-07-28 20:35:44.000000000 +0200 -+++ util/network/addresses.cpp 2016-01-26 12:58:09.726934000 +0100 +--- util/network/addresses.cpp.orig 2014-07-28 18:35:44 UTC ++++ util/network/addresses.cpp @@ -38,7 +38,7 @@ namespace Util AddrList_t GetLocalAddresses (int defaultPort) { Index: x11/leechcraft/files/patch-util_xdg_xdg.cpp =================================================================== --- x11/leechcraft/files/patch-util_xdg_xdg.cpp +++ x11/leechcraft/files/patch-util_xdg_xdg.cpp @@ -1,5 +1,5 @@ ---- util/xdg/xdg.cpp.orig 2014-07-28 20:35:44.000000000 +0200 -+++ util/xdg/xdg.cpp 2016-01-26 13:01:00.517701000 +0100 +--- util/xdg/xdg.cpp.orig 2014-07-28 18:35:44 UTC ++++ util/xdg/xdg.cpp @@ -44,13 +44,13 @@ namespace XDG QPixmap GetAppPixmap (const QString& name)