From d70a1d75638c21e56910050e27516367478e6822 Mon Sep 17 00:00:00 2001 From: bsiegert Date: Mon, 23 May 2016 05:02:35 +0000 Subject: Pullup ticket #4997 - requested by joerg misc/kchmviewer: build fix Revisions pulled up: - misc/kchmviewer/Makefile 1.57 - misc/kchmviewer/distinfo 1.14 - misc/kchmviewer/patches/patch-src_src.pro 1.1 --- Module Name: pkgsrc Committed By: joerg Date: Sat May 7 10:05:22 UTC 2016 Modified Files: pkgsrc/misc/kchmviewer: Makefile distinfo Added Files: pkgsrc/misc/kchmviewer/patches: patch-src_src.pro Log Message: Instruct qmake to include X11BASE rpath. Bump revision. --- misc/kchmviewer/Makefile | 4 ++-- misc/kchmviewer/distinfo | 3 ++- misc/kchmviewer/patches/patch-src_src.pro | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 misc/kchmviewer/patches/patch-src_src.pro (limited to 'misc') diff --git a/misc/kchmviewer/Makefile b/misc/kchmviewer/Makefile index 267038a6803..6f5a7e6d2dc 100644 --- a/misc/kchmviewer/Makefile +++ b/misc/kchmviewer/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.55 2016/03/05 11:28:55 jperkin Exp $ +# $NetBSD: Makefile,v 1.55.2.1 2016/05/23 05:02:35 bsiegert Exp $ DISTNAME= kchmviewer-7.2.1 -PKGREVISION= 9 +PKGREVISION= 11 CATEGORIES= misc x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kchmviewer/} diff --git a/misc/kchmviewer/distinfo b/misc/kchmviewer/distinfo index 037acaaa066..7fd88710be6 100644 --- a/misc/kchmviewer/distinfo +++ b/misc/kchmviewer/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.13 2015/11/03 23:49:39 agc Exp $ +$NetBSD: distinfo,v 1.13.4.1 2016/05/23 05:02:35 bsiegert Exp $ SHA1 (kchmviewer-7.2.1.tar.gz) = 2234ae47e7915aa673cda7e31efe3569cd6c5ddc RMD160 (kchmviewer-7.2.1.tar.gz) = a8e5c18082eb34d9b76abe783494cdeb6bdad4ca SHA512 (kchmviewer-7.2.1.tar.gz) = 16e742a390ab94d3dd2537d4436cd22b90c759fb7698f0c724f2e234f26668076fba40e7c0084c0ec5360fdf213689ca2497aa069d0b52952930400113b9094b Size (kchmviewer-7.2.1.tar.gz) = 342665 bytes SHA1 (patch-po_kchmviewer_it.po) = beca7d046ed0409c2391660b12de5202160bd623 +SHA1 (patch-src_src.pro) = 05bf035ea3dc8160f570e8ec1f24dd979ddef90f diff --git a/misc/kchmviewer/patches/patch-src_src.pro b/misc/kchmviewer/patches/patch-src_src.pro new file mode 100644 index 00000000000..2e51d88fb27 --- /dev/null +++ b/misc/kchmviewer/patches/patch-src_src.pro @@ -0,0 +1,10 @@ +$NetBSD: patch-src_src.pro,v 1.1.2.2 2016/05/23 05:02:35 bsiegert Exp $ + +--- src/src.pro.orig 2016-05-06 18:34:34.000000000 +0000 ++++ src/src.pro +@@ -105,3 +105,5 @@ macx-g++: { + linux-g++-32: { + LIBS += -L. + } ++ ++QMAKE_LFLAGS += ${COMPILER_RPATH_FLAG}${X11BASE}/lib -- cgit v1.2.3