summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2020-08-30 08:19:06 +0000
committertnn <tnn@pkgsrc.org>2020-08-30 08:19:06 +0000
commit6f96ae264985bd59004ea969bdab496f0110c8d0 (patch)
tree5c8d54e9f8d8579ca19cf796571669c8f290abe6 /x11
parent1c0e49cb09e702aacc8ba0efa520c7486ab937b3 (diff)
downloadpkgsrc-6f96ae264985bd59004ea969bdab496f0110c8d0.tar.gz
qwt6-qt5: ship the optional pkg-config file, gnuradio wants it. Bump.
Diffstat (limited to 'x11')
-rw-r--r--x11/qwt6-qt5/Makefile3
-rw-r--r--x11/qwt6-qt5/PLIST3
-rw-r--r--x11/qwt6-qt5/distinfo4
-rw-r--r--x11/qwt6-qt5/patches/patch-qwtconfig.pri18
4 files changed, 19 insertions, 9 deletions
diff --git a/x11/qwt6-qt5/Makefile b/x11/qwt6-qt5/Makefile
index 54397072f22..dbbb84f639b 100644
--- a/x11/qwt6-qt5/Makefile
+++ b/x11/qwt6-qt5/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2020/08/30 08:05:57 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2020/08/30 08:19:06 tnn Exp $
DISTNAME= qwt-6.1.5
PKGNAME= qwt6-qt5-6.1.5
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qwt/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/qwt6-qt5/PLIST b/x11/qwt6-qt5/PLIST
index 7cf466c19d1..7bdd93642a9 100644
--- a/x11/qwt6-qt5/PLIST
+++ b/x11/qwt6-qt5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/08/30 08:05:57 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/08/30 08:19:06 tnn Exp $
qt5/plugins/designer/libqwt_designer_plugin.so
qwt-${VERSION}/doc/html/analogclock.png
qwt-${VERSION}/doc/html/annotated.html
@@ -1653,3 +1653,4 @@ qwt-${VERSION}/lib/libqwt.so
qwt-${VERSION}/lib/libqwt.so.6
qwt-${VERSION}/lib/libqwt.so.6.1
qwt-${VERSION}/lib/libqwt.so.6.1.5
+qwt-${VERSION}/lib/pkgconfig/Qt5Qwt6.pc
diff --git a/x11/qwt6-qt5/distinfo b/x11/qwt6-qt5/distinfo
index eb527890078..9667f5c3486 100644
--- a/x11/qwt6-qt5/distinfo
+++ b/x11/qwt6-qt5/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2020/08/30 08:05:57 tnn Exp $
+$NetBSD: distinfo,v 1.4 2020/08/30 08:19:06 tnn Exp $
SHA1 (qwt-6.1.5.tar.bz2) = 07c71427f1f4bbd0354b3a98965943ce2f220766
RMD160 (qwt-6.1.5.tar.bz2) = 37bf5b741cbf9c760879b88cdfae741c0c6dc9ce
SHA512 (qwt-6.1.5.tar.bz2) = 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
Size (qwt-6.1.5.tar.bz2) = 4408268 bytes
SHA1 (patch-qwt.prf) = f952dfc68909a24c847a8c33ea4b2cd21591fd31
-SHA1 (patch-qwtconfig.pri) = c1fae28cc33d35445c772f32da55ba20b20fe40a
+SHA1 (patch-qwtconfig.pri) = a39ab75ac32fe47b60c9c913abac6d0a8d27fa28
diff --git a/x11/qwt6-qt5/patches/patch-qwtconfig.pri b/x11/qwt6-qt5/patches/patch-qwtconfig.pri
index 5de9cf0c57b..647d54e4be4 100644
--- a/x11/qwt6-qt5/patches/patch-qwtconfig.pri
+++ b/x11/qwt6-qt5/patches/patch-qwtconfig.pri
@@ -1,10 +1,11 @@
-$NetBSD: patch-qwtconfig.pri,v 1.1 2020/08/30 08:05:57 tnn Exp $
+$NetBSD: patch-qwtconfig.pri,v 1.2 2020/08/30 08:19:06 tnn Exp $
Don't hardcode PREFIX.
+Ship the pkg-config file. Needed by gnuradio-qtgui.
---- qwtconfig.pri.orig 2019-01-02 17:21:31.556467499 +0100
-+++ qwtconfig.pri 2019-10-25 18:51:20.912266571 +0200
-@@ -19,7 +19,7 @@
+--- qwtconfig.pri.orig 2020-06-01 16:48:07.325112226 +0000
++++ qwtconfig.pri
+@@ -19,7 +19,7 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QW
QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
unix {
@@ -13,7 +14,7 @@ Don't hardcode PREFIX.
# QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
}
-@@ -42,14 +42,14 @@
+@@ -42,14 +42,14 @@ QWT_INSTALL_LIBS = $${QWT_INSTALL_P
# runtime environment of designer/creator.
######################################################################
@@ -30,3 +31,10 @@ Don't hardcode PREFIX.
######################################################################
# Features
+@@ -171,5 +171,5 @@ macx:!static:CONFIG(qt_framework, qt_fra
+
+ unix {
+
+- #QWT_CONFIG += QwtPkgConfig
++ QWT_CONFIG += QwtPkgConfig
+ }