diff options
| author | markd <markd> | 2016-02-04 10:41:12 +0000 |
|---|---|---|
| committer | markd <markd> | 2016-02-04 10:41:12 +0000 |
| commit | 6b274a265ef3eec8f095bd614e56943d057e8af4 (patch) | |
| tree | 0c8cbde46f751906301928305fa36cddda82d30f /x11/qt5-qtbase | |
| parent | b9a261a0156ffe8cb5b7c6e99fe24ae1332eb9ee (diff) | |
| download | pkgsrc-6b274a265ef3eec8f095bd614e56943d057e8af4.tar.gz | |
Add $LOCALBASE/share to search path in QStandardPaths()
Diffstat (limited to 'x11/qt5-qtbase')
| -rw-r--r-- | x11/qt5-qtbase/Makefile | 11 | ||||
| -rw-r--r-- | x11/qt5-qtbase/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt5-qtbase/patches/patch-src_corelib_io_qstandardpaths_unix.cpp | 14 |
3 files changed, 24 insertions, 4 deletions
diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile index b2a88c6b0ea..4aee411072c 100644 --- a/x11/qt5-qtbase/Makefile +++ b/x11/qt5-qtbase/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2016/01/18 20:52:43 nros Exp $ +# $NetBSD: Makefile,v 1.30 2016/02/04 10:41:12 markd Exp $ DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-qtbase-${QTVERSION} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= C++ X GUI toolkit .include "../../x11/qt5-qtbase/Makefile.common" @@ -121,13 +121,18 @@ CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/extrafilt CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro CHECK_INTERPRETER_SKIP+=qt5/mkspecs/macx-ios-clang/rename_main.sh -SUBST_CLASSES+= opt +SUBST_CLASSES+= opt path SUBST_STAGE.opt= pre-configure SUBST_MESSAGE.opt= Removing some Qt5 default compiler flags. SUBST_FILES.opt= mkspecs/common/gcc-base.conf SUBST_SED.opt= -e 's,-O[23],,' SUBST_SED.opt+= -e 's,-fvisibility=hidden,,' +SUBST_STAGE.path= pre-configure +SUBST_MESSAGE.path= Add to default XDG path. +SUBST_FILES.path= src/corelib/io/qstandardpaths_unix.cpp +SUBST_VARS.path= LOCALBASE + BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri PC_FILES= Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \ diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index 24c5610508b..ef61fc1299e 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2015/10/29 14:48:04 adam Exp $ +$NetBSD: distinfo,v 1.28 2016/02/04 10:41:12 markd Exp $ SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44 @@ -21,6 +21,7 @@ SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66 SHA1 (patch-src_corelib_global_qsystemdetection.h) = 9bdf20f66818ca1dd2a825a749109ad5fbcb2180 SHA1 (patch-src_corelib_io_io.pri) = 9a59b621441291f388860b523f80b59730632328 SHA1 (patch-src_corelib_io_qlockfile__unix.cpp) = 62274f5a0c114ef86460218b4de303901ab7d0e6 +SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 41852cf146138df3fd0f26d124a6f9a338d472a0 SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d SHA1 (patch-src_openglextensions_openglextensions.pro) = e79effc1433ddda744b79d7e1f47764fee406580 diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_io_qstandardpaths_unix.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_io_qstandardpaths_unix.cpp new file mode 100644 index 00000000000..9f5eced30f7 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_qstandardpaths_unix.cpp @@ -0,0 +1,14 @@ +$NetBSD: patch-src_corelib_io_qstandardpaths_unix.cpp,v 1.1 2016/02/04 10:41:13 markd Exp $ + +Add $LOCALBASE/share to search path + +--- src/corelib/io/qstandardpaths_unix.cpp.orig 2015-10-13 04:35:31.000000000 +0000 ++++ src/corelib/io/qstandardpaths_unix.cpp +@@ -255,6 +255,7 @@ static QStringList xdgDataDirs() + // http://standards.freedesktop.org/basedir-spec/latest/ + QString xdgDataDirsEnv = QFile::decodeName(qgetenv("XDG_DATA_DIRS")); + if (xdgDataDirsEnv.isEmpty()) { ++ dirs.append(QString::fromLatin1("@LOCALBASE@/share")); + dirs.append(QString::fromLatin1("/usr/local/share")); + dirs.append(QString::fromLatin1("/usr/share")); + } else { |