On Fri Mar 13, 2020 at 09:58:29PM +0100, Rafael Sadowski wrote: > Is anyone willing to make x11/qwt qt5 only without -common etc.? The > difficult part is to set the right @pkgpath/@conflict.. foo and thus > enable a pkg_add update. > > No more customers available for the Qt4 (main) parts, only Qt5. > > I'm looking forward to test diff. > > Rafael Sadowski >
Here is my final version. I've adjusted gnuradio and qgis. The pkg_add upgrade process looks ok, right? $ TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -u boost-1.67.0p1->1.67.0p1: ok gnuradio-3.8.2.0p0:python-3.8.6p0->3.8.6p0: ok qwt-6.1.3p2-qt5+qwt-common-6.1.3p2->qwt-6.1.5 forward dependencies: | Dependency of gnuradio-3.8.2.0 on qwt-*-qt5 doesn't match | Dependency of qgis-3.16.0 on qwt-*-qt5 doesn't match Merging gnuradio-3.8.2.0->3.8.2.0p0 (ok) Merging qgis-3.16.0->3.16.0p0 (ok) gnuradio-3.8.2.0p0+qgis-3.1...:qtconnectivity-5.13.2->5.13.2: ok gnuradio-3.8.2.0p0+qgis-3.1...:py3-qt5-5.13.2p0->5.13.2p0: ok gnuradio-3.8.2.0p0+qgis-3.1...:qscintilla-2.11.4p2->2.11.4p2: ok gnuradio-3.8.2.0p0+qgis-3.1...:py3-qscintilla-2.11.4p3->2.11.4p3: ok gnuradio-3.8.2.0+qgis-3.16.0+qwt-6.1.3p2-qt5+qwt-common-6.1.3p2->gnuradio-3.8.2.0p0+qgis-3.16.0p0+qwt-6.1.5: ok Running tags: ok Feedback, concerns? Rafael diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index 12bb35dc35a..7a2c371847c 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -4,6 +4,7 @@ COMMENT = signal-processing toolkit for SDR (software-defined radio) V = 3.8.2.0 DISTNAME = gnuradio-$V +REVISION = 0 SHARED_LIBS += gnuradio-analog 0.0 # 3.7 SHARED_LIBS += gnuradio-atsc 0.0 # 3.7 @@ -41,7 +42,7 @@ WANTLIB += Qt5Core Qt5Gui Qt5Widgets SDL boost_atomic-mt boost_chrono-mt WANTLIB += boost_date_time-mt boost_filesystem-mt boost_program_options-mt WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c fftw3f WANTLIB += fftw3f_threads gmp gmpxx gsl gslcblas gsm iconv jack -WANTLIB += log4cpp m orc-0.4 portaudio qwt-qt5 zmq +WANTLIB += log4cpp m orc-0.4 portaudio qwt zmq MASTER_SITES = https://github.com/gnuradio/gnuradio/releases/download/v$V/ @@ -92,7 +93,7 @@ LIB_DEPENDS = audio/jack \ devel/sdl \ math/fftw3,float \ net/zeromq \ - x11/qwt,qt5 + x11/qwt CONFIGURE_ARGS =-DENABLE_DOXYGEN=OFF \ -DENABLE_GR_UHD=OFF \ diff --git a/geo/qgis/Makefile b/geo/qgis/Makefile index a419dad45e3..9ac6e6c4d43 100644 --- a/geo/qgis/Makefile +++ b/geo/qgis/Makefile @@ -11,6 +11,7 @@ DISTNAME = qgis-3.16.0 EXTRACT_SUFX = .tar.bz2 CATEGORIES = geo x11 DEBUG_PACKAGES =${BUILD_PACKAGES} +REVISION = 0 SHARED_LIBS = qgis_core 45.0 \ qgis_app 31.0 \ @@ -70,7 +71,7 @@ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \ www/fcgi \ x11/qt5/qtwebkit \ x11/qt5/qt3d \ - qwt-*-qt5:x11/qwt,qt5 \ + x11/qwt \ geo/gdal \ geo/mdal>=0.5 \ geo/geos \ @@ -84,7 +85,7 @@ WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5Gui Qt5Network WANTLIB += Qt5Positioning Qt5PrintSupport Qt5Sql Qt5Svg WANTLIB += Qt5Test Qt5WebKit Qt5WebKitWidgets Qt5Widgets Qt5Xml WANTLIB += c exiv2 expat fcgi gdal geos_c gsl gslcblas m mdal pq proj ${MODPY_WANTLIB} -WANTLIB += qca-qt5 qscintilla2_qt5 qt5keychain qwt-qt5 spatialindex +WANTLIB += qca-qt5 qscintilla2_qt5 qt5keychain qwt spatialindex WANTLIB += spatialite sqlite3 util zip hdf5 xml2 z GL WANTLIB += Qt53DCore Qt53DExtras Qt53DInput Qt53DLogic WANTLIB += Qt53DRender Qt5Gamepad protobuf-lite diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile index 0c9f1c089c2..a9a5d5b971a 100644 --- a/x11/qwt/Makefile +++ b/x11/qwt/Makefile @@ -1,64 +1,37 @@ # $OpenBSD: Makefile,v 1.29 2019/07/12 20:51:20 sthen Exp $ -COMMENT-main = Qt Widgets for Technical Applications -COMMENT-common = common files for the qwt packages +COMMENT= Qt widgets for technical applications -VERSION = 6.1.3 -DISTNAME = qwt-${VERSION} -SHARED_LIBS = qwt${QTLIBSUFFIX} 7.0 -PKGNAME-main = qwt-${VERSION} -FULLPKGNAME-common = qwt-common-${VERSION} -FULLPKGPATH-common = x11/qwt,-common -REVISION = 2 +VERSION = 6.1.5 +DISTNAME = qwt-${VERSION} -CATEGORIES = x11 -EXTRACT_SUFX = .tar.bz2 +SHARED_LIBS = qwt${QTLIBSUFFIX} 7.0 -HOMEPAGE = http://qwt.sourceforge.net/ +CATEGORIES = x11 -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=qwt/} +HOMEPAGE = http://qwt.sourceforge.net/ + +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=qwt/} +EXTRACT_SUFX = .tar.bz2 # Qwt License, Version 1.0 # http://qwt.sourceforge.net/qwtlicense.html PERMIT_PACKAGE = Yes -MODULES = devel/qmake +WANTLIB += Qt5Gui Qt5OpenGL Qt5PrintSupport Qt5Svg Qt5Widgets +WANTLIB += Qt5Xml m + +MODULES = x11/qt5 \ + devel/qmake + MODQMAKE_INSTALL_ROOT = -NO_TEST = Yes -USE_GMAKE = Yes -MULTI_PACKAGES= -main -common -FLAVORS = qt5 -FLAVOR ?= - -COMPILER = base-clang ports-gcc base-gcc - -.if ${FLAVOR:Mqt5} -PKGSPEC-main = qwt-*-qt5 -MODULES += x11/qt5 -QTVER = qt5 -QTLIBSUFFIX = -${QTVER} -LIB_DEPENDS += x11/qt5/qtsvg \ - x11/qt5/qttools -WANTLIB-main += GL Qt5Concurrent Qt5Core Qt5Designer Qt5Gui Qt5OpenGL -WANTLIB-main += Qt5PrintSupport Qt5Svg Qt5Widgets Qt5Xml -.else -PKGSPEC-main = qwt-*-!qt5 -MODULES += x11/qt4 -QTVER = qt4 -QTLIBSUFFIX = # empty -WANTLIB-main += GL ICE QtDesigner QtGui QtOpenGL QtScript QtSvg QtXml SM X11 Xext Xi -WANTLIB-main += Xinerama Xrender fontconfig freetype pthread QtCore -.endif - -WANTLIB-main += ${COMPILER_LIBCXX} m - -WANTLIB-common = # empty -RUN_DEPENDS-common = # empty -LIB_DEPENDS-common = # empty -PKG_ARCH-common= * - -RUN_DEPENDS = ${FULLPKGPATH-common} +NO_TEST = Yes +USE_GMAKE = Yes + +LIB_DEPENDS = x11/qt5/qtsvg + +QTVER = qt5 SUBST_VARS = WRKINST QTVER QTLIBSUFFIX pre-configure: @@ -66,12 +39,11 @@ pre-configure: ${WRKSRC}/designer/designer.pro \ ${WRKSRC}/textengines/textengines.pri \ ${WRKSRC}/src/src.pro - post-configure: -# ensure CXXFLAGS/-std=c++11 is passed to all clang++ invocations,including the ones generating dependencies -.if ${FLAVOR:Mqt5} - sed -i -e 's/@$$(CXX) -M/@$$(CXX) $$(CXXFLAGS) -M/' ${WRKBUILD}/{src,designer}/Makefile -.endif + # ensure CXXFLAGS/-std=c++11 is passed to all clang++ + # invocations,including the ones generating dependencies + sed -i -e 's/@$$(CXX) -M/@$$(CXX) $$(CXXFLAGS) -M/' \ + ${WRKBUILD}/{src,designer}/Makefile post-install: rm -rf ${PREFIX}/share/doc/qwt/html/*.md5 diff --git a/x11/qwt/distinfo b/x11/qwt/distinfo index 8b1831883d5..f28e6d54bb4 100644 --- a/x11/qwt/distinfo +++ b/x11/qwt/distinfo @@ -1,2 +1,2 @@ -SHA256 (qwt-6.1.3.tar.bz2) = 8+zTTnKporCEIvtsjpCcp29M5fp3rK16KIO3AfQwlzM= -SIZE (qwt-6.1.3.tar.bz2) = 4245614 +SHA256 (qwt-6.1.5.tar.bz2) = QHbeY+wrXoQ3nd/r8nx7KbjckHTz234sph0RoditwEE= +SIZE (qwt-6.1.5.tar.bz2) = 4408268 diff --git a/x11/qwt/patches/patch-designer_designer_pro b/x11/qwt/patches/patch-designer_designer_pro deleted file mode 100644 index 62557ee05e0..00000000000 --- a/x11/qwt/patches/patch-designer_designer_pro +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-designer_designer_pro,v 1.4 2018/05/28 18:47:00 landry Exp $ - -Index: designer/designer.pro ---- designer/designer.pro.orig -+++ designer/designer.pro -@@ -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, qwt${QTLIBSUFFIX}) - - contains(QWT_CONFIG, QwtDll) { - diff --git a/x11/qwt/patches/patch-qwt_prf b/x11/qwt/patches/patch-qwt_prf deleted file mode 100644 index ca162855bc5..00000000000 --- a/x11/qwt/patches/patch-qwt_prf +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-qwt_prf,v 1.1 2018/05/28 18:47:00 landry Exp $ - -Index: qwt.prf ---- qwt.prf.orig -+++ qwt.prf -@@ -34,4 +34,4 @@ else { - } - - # QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS} --qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt) -+qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt${QTLIBSUFFIX}) diff --git a/x11/qwt/patches/patch-qwtconfig_pri b/x11/qwt/patches/patch-qwtconfig_pri index 1e37c9f3386..03362b706c9 100644 --- a/x11/qwt/patches/patch-qwtconfig_pri +++ b/x11/qwt/patches/patch-qwtconfig_pri @@ -31,7 +31,7 @@ Index: qwtconfig.pri # 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_PREFIX}/plugins - # with every Qt upgrade. + # with every Qt upgrade. ###################################################################### -QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features diff --git a/x11/qwt/patches/patch-src_src_pro b/x11/qwt/patches/patch-src_src_pro deleted file mode 100644 index 983d6c5021e..00000000000 --- a/x11/qwt/patches/patch-src_src_pro +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_src_pro,v 1.4 2018/05/28 18:47:00 landry Exp $ - -Index: src/src.pro ---- src/src.pro.orig -+++ src/src.pro -@@ -17,7 +17,7 @@ include( $${QWT_ROOT}/qwtfunctions.pri ) - QWT_OUT_ROOT = $${OUT_PWD}/.. - - TEMPLATE = lib --TARGET = $$qwtLibraryTarget(qwt) -+TARGET = $$qwtLibraryTarget(qwt${QTLIBSUFFIX}) - - DESTDIR = $${QWT_OUT_ROOT}/lib - diff --git a/x11/qwt/patches/patch-textengines_textengines_pri b/x11/qwt/patches/patch-textengines_textengines_pri deleted file mode 100644 index fad51545b21..00000000000 --- a/x11/qwt/patches/patch-textengines_textengines_pri +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-textengines_textengines_pri,v 1.1 2018/05/28 18:47:00 landry Exp $ - -Index: textengines/textengines.pri ---- textengines/textengines.pri.orig -+++ textengines/textengines.pri -@@ -34,7 +34,7 @@ contains(QWT_CONFIG, QwtFramework) { - CONFIG += lib_bundle - } - --qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt) -+qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt${QTLIBSUFFIX}) - - # Install directives - diff --git a/x11/qwt/pkg/DESCR-main b/x11/qwt/pkg/DESCR similarity index 100% rename from x11/qwt/pkg/DESCR-main rename to x11/qwt/pkg/DESCR diff --git a/x11/qwt/pkg/DESCR-common b/x11/qwt/pkg/DESCR-common deleted file mode 100644 index 2417f828a17..00000000000 --- a/x11/qwt/pkg/DESCR-common +++ /dev/null @@ -1 +0,0 @@ -Common files for the qwt packages. diff --git a/x11/qwt/pkg/PFRAG.no-qt5-main b/x11/qwt/pkg/PFRAG.no-qt5-main deleted file mode 100644 index 78c6592a198..00000000000 --- a/x11/qwt/pkg/PFRAG.no-qt5-main +++ /dev/null @@ -1,4 +0,0 @@ -@comment $OpenBSD: PFRAG.no-qt5-main,v 1.1 2018/05/28 18:47:00 landry Exp $ -@conflict qwt-*-!qt5 -@pkgpath x11/qwt -@lib lib/libqwt${QTLIBSUFFIX}.so.${LIBqwt_VERSION} diff --git a/x11/qwt/pkg/PFRAG.qt5-main b/x11/qwt/pkg/PFRAG.qt5-main deleted file mode 100644 index 67bcb7ba91b..00000000000 --- a/x11/qwt/pkg/PFRAG.qt5-main +++ /dev/null @@ -1,4 +0,0 @@ -@comment $OpenBSD: PFRAG.qt5-main,v 1.1 2018/05/28 18:47:00 landry Exp $ -@conflict qwt-*-qt5 -@pkgpath x11/qwt,qt5 -@lib lib/libqwt${QTLIBSUFFIX}.so.${LIBqwt-qt5_VERSION} diff --git a/x11/qwt/pkg/PLIST-common b/x11/qwt/pkg/PLIST similarity index 98% rename from x11/qwt/pkg/PLIST-common rename to x11/qwt/pkg/PLIST index 9a5cf013607..b370f47e2b5 100644 --- a/x11/qwt/pkg/PLIST-common +++ b/x11/qwt/pkg/PLIST @@ -1,5 +1,10 @@ -@comment $OpenBSD: PLIST-common,v 1.1 2018/05/28 18:47:00 landry Exp $ -@conflict qwt-<6.1.3p0 +@comment $OpenBSD: PLIST,v$ +@conflict qwt-<6.1.5 +@conflict qwt-common-<6.1.5 +@conflict qwt-*-qt5 +@pkgpath x11/qwt,-main +@pkgpath x11/qwt,-common +@pkgpath x11/qwt,-main,qt5 include/qwt.h include/qwt_abstract_legend.h include/qwt_abstract_scale.h @@ -98,6 +103,16 @@ include/qwt_thermo.h include/qwt_transform.h include/qwt_wheel.h include/qwt_widget_overlay.h +@lib lib/libqwt.so.${LIBqwt_VERSION} +lib/${QTVER}/ +lib/${QTVER}/mkspecs/ +lib/${QTVER}/mkspecs/features/ +lib/${QTVER}/mkspecs/features/qwt.prf +lib/${QTVER}/mkspecs/features/qwtconfig.pri +lib/${QTVER}/mkspecs/features/qwtfunctions.pri +lib/${QTVER}/plugins/ +lib/${QTVER}/plugins/designer/ +@so lib/${QTVER}/plugins/designer/libqwt_designer_plugin.so @man man/man3/QwtAbstractLegend.3 @man man/man3/QwtAbstractScale.3 @man man/man3/QwtAbstractScaleDraw.3 @@ -231,9 +246,6 @@ include/qwt_widget_overlay.h @man man/man3/QwtWeedingCurveFitter.3 @man man/man3/QwtWheel.3 @man man/man3/QwtWidgetOverlay.3 -@man man/man3/_tmp_qwt-6.1.3-tmp_src_.3 -@man man/man3/_tmp_qwt-6.1.3-tmp_textengines_.3 -@man man/man3/_tmp_qwt-6.1.3-tmp_textengines_mathml_.3 @man man/man3/barchartscreenshots.3 @man man/man3/controlscreenshots.3 @man man/man3/curvescreenshots.3 @@ -244,11 +256,15 @@ include/qwt_widget_overlay.h @man man/man3/spectrogramscreenshots.3 share/doc/qwt/ share/doc/qwt/html/ +share/doc/qwt/html/_form0.eps +share/doc/qwt/html/_form0.ps +share/doc/qwt/html/_formulas.aux +share/doc/qwt/html/_formulas.dvi +share/doc/qwt/html/_formulas.log +share/doc/qwt/html/_formulas.tex share/doc/qwt/html/analogclock.png share/doc/qwt/html/annotated.html share/doc/qwt/html/annotated_dup.js -share/doc/qwt/html/arrowdown.png -share/doc/qwt/html/arrowright.png share/doc/qwt/html/barchart-grouped-600x400.png share/doc/qwt/html/barchart-stacked-600x400.png share/doc/qwt/html/barchartscreenshots.html @@ -887,17 +903,9 @@ share/doc/qwt/html/doxygen.png share/doc/qwt/html/dynsections.js share/doc/qwt/html/folderclosed.png share/doc/qwt/html/folderopen.png -share/doc/qwt/html/form_0.png -share/doc/qwt/html/form_1.png -share/doc/qwt/html/form_2.png -share/doc/qwt/html/form_3.png -share/doc/qwt/html/form_4.png -share/doc/qwt/html/form_5.png -share/doc/qwt/html/formula.repository share/doc/qwt/html/friedberg-bars-600x400.png share/doc/qwt/html/friedberg-tube-600x400.png share/doc/qwt/html/functions.html -share/doc/qwt/html/functions_0x7e.html share/doc/qwt/html/functions_b.html share/doc/qwt/html/functions_c.html share/doc/qwt/html/functions_d.html @@ -932,7 +940,6 @@ share/doc/qwt/html/functions_eval_y.html share/doc/qwt/html/functions_f.html share/doc/qwt/html/functions_func.html share/doc/qwt/html/functions_func.js -share/doc/qwt/html/functions_func_0x7e.html share/doc/qwt/html/functions_func_b.html share/doc/qwt/html/functions_func_c.html share/doc/qwt/html/functions_func_d.html @@ -956,6 +963,7 @@ share/doc/qwt/html/functions_func_w.html share/doc/qwt/html/functions_func_x.html share/doc/qwt/html/functions_func_y.html share/doc/qwt/html/functions_func_z.html +share/doc/qwt/html/functions_func_~.html share/doc/qwt/html/functions_g.html share/doc/qwt/html/functions_h.html share/doc/qwt/html/functions_i.html @@ -977,6 +985,7 @@ share/doc/qwt/html/functions_w.html share/doc/qwt/html/functions_x.html share/doc/qwt/html/functions_y.html share/doc/qwt/html/functions_z.html +share/doc/qwt/html/functions_~.html share/doc/qwt/html/graph_legend.html share/doc/qwt/html/graph_legend.png share/doc/qwt/html/hierarchy.html @@ -1089,6 +1098,8 @@ share/doc/qwt/html/inherits.html share/doc/qwt/html/itemeditor-600x400.png share/doc/qwt/html/jquery.js share/doc/qwt/html/knob.png +share/doc/qwt/html/menu.js +share/doc/qwt/html/menudata.js share/doc/qwt/html/nav_f.png share/doc/qwt/html/nav_g.png share/doc/qwt/html/nav_h.png diff --git a/x11/qwt/pkg/PLIST-main b/x11/qwt/pkg/PLIST-main deleted file mode 100644 index 00de4f5bff2..00000000000 --- a/x11/qwt/pkg/PLIST-main +++ /dev/null @@ -1,10 +0,0 @@ -@comment $OpenBSD: PLIST-main,v 1.1 2018/05/28 18:47:00 landry Exp $ -@option no-default-conflict -@conflict qwt-<6.1.3p0 -!%%qt5%% -%%qt5%% -lib/${QTVER}/mkspecs/features/qwt.prf -lib/${QTVER}/mkspecs/features/qwtconfig.pri -lib/${QTVER}/mkspecs/features/qwtfunctions.pri -lib/${QTVER}/plugins/designer/ -lib/${QTVER}/plugins/designer/libqwt_designer_plugin.so
