diff options
| author | ryoon <ryoon@pkgsrc.org> | 2016-03-02 23:03:59 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2016-03-02 23:03:59 +0000 |
| commit | f02d0b593afd02bdde29a53d6ddcfb7892dd90ba (patch) | |
| tree | 219b0960316cdf451f76ebfa827668a25957a4be /x11/qt5-qtbase | |
| parent | 544d870bf6f174a673ead23f114eefb4f9c7f1e6 (diff) | |
| download | pkgsrc-f02d0b593afd02bdde29a53d6ddcfb7892dd90ba.tar.gz | |
Use RPATH instead of RUNPATH to fix library not found error from Qt5 apps
Bump PKGREVISION
Diffstat (limited to 'x11/qt5-qtbase')
| -rw-r--r-- | x11/qt5-qtbase/Makefile | 4 | ||||
| -rw-r--r-- | x11/qt5-qtbase/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt5-qtbase/patches/patch-configure | 24 |
3 files changed, 24 insertions, 8 deletions
diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile index fd6f41110c5..85b0ad2b99e 100644 --- a/x11/qt5-qtbase/Makefile +++ b/x11/qt5-qtbase/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2016/02/25 08:27:05 jperkin Exp $ +# $NetBSD: Makefile,v 1.32 2016/03/02 23:04:00 ryoon Exp $ DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-qtbase-${QTVERSION} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= C++ X GUI toolkit .include "../../x11/qt5-qtbase/Makefile.common" diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index ef61fc1299e..cfd9256afd7 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.28 2016/02/04 10:41:12 markd Exp $ +$NetBSD: distinfo,v 1.29 2016/03/02 23:04:00 ryoon Exp $ SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44 SHA512 (qtbase-opensource-src-5.5.1.tar.xz) = 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 Size (qtbase-opensource-src-5.5.1.tar.xz) = 46389212 bytes SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764 -SHA1 (patch-configure) = 7ad9c130af98ffcb703e7be924c46f4cc4be4613 +SHA1 (patch-configure) = ad30163463ccc9310e34633f13ca27bfccca59f4 SHA1 (patch-mkspecs_features_create__cmake.prf) = 3f6b3a592e29f5529e5c87dbac036c165470eac4 SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177 SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39 diff --git a/x11/qt5-qtbase/patches/patch-configure b/x11/qt5-qtbase/patches/patch-configure index abb25bcbbf1..ab7746e61e5 100644 --- a/x11/qt5-qtbase/patches/patch-configure +++ b/x11/qt5-qtbase/patches/patch-configure @@ -1,9 +1,9 @@ -$NetBSD: patch-configure,v 1.2 2015/10/26 19:03:59 adam Exp $ +$NetBSD: patch-configure,v 1.3 2016/03/02 23:04:00 ryoon Exp $ * Don't use SDKs on OS X * Add NetBSD/sparc{,64} support ---- configure.orig 2015-06-29 20:03:05.000000000 +0000 +--- configure.orig 2015-10-13 04:35:07.000000000 +0000 +++ configure @@ -337,7 +337,6 @@ getQMakeConf() { @@ -21,7 +21,7 @@ $NetBSD: patch-configure,v 1.2 2015/10/26 19:03:59 adam Exp $ fi getSingleQMakeVariable "$1" "$xspecvals" } -@@ -2894,6 +2892,19 @@ if [ -z "$PLATFORM" ]; then +@@ -2897,6 +2895,19 @@ if [ -z "$PLATFORM" ]; then UNIX_SV:*) PLATFORM=unixware-g++ ;; @@ -41,7 +41,23 @@ $NetBSD: patch-configure,v 1.2 2015/10/26 19:03:59 adam Exp $ QNX:*) PLATFORM=unsupported/qnx-g++ ;; -@@ -4001,10 +4012,12 @@ if true; then ###[ '!' -f "$outpath/bin/ +@@ -3471,11 +3482,11 @@ if [ "$CFG_USE_GOLD_LINKER" != "no" ]; t + fi + + # auto-detect --enable-new-dtags support +-if linkerSupportsFlag $TEST_COMPILER --enable-new-dtags; then +- CFG_ENABLE_NEW_DTAGS=yes +-else ++#if linkerSupportsFlag $TEST_COMPILER --enable-new-dtags; then ++# CFG_ENABLE_NEW_DTAGS=yes ++#else + CFG_ENABLE_NEW_DTAGS=no +-fi ++#fi + + # auto-detect -fstack-protector-strong support (for QNX only currently) + if [ "$XPLATFORM_QNX" = "yes" ]; then +@@ -4014,10 +4025,12 @@ if true; then ###[ '!' -f "$outpath/bin/ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)" EXTRA_OBJS="$EXTRA_OBJS \ qsettings_mac.o \ |