diff options
| author | joerg <joerg@pkgsrc.org> | 2015-01-06 23:00:16 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-01-06 23:00:16 +0000 |
| commit | e3d2514a7a931bcb9dc4aeea662b02d7c7dbe251 (patch) | |
| tree | 792bd63cccb1cf62fc5e29a525215d01e3d4596d | |
| parent | 2460fd8c7bd0627f972c662125a19b490b1addad (diff) | |
| download | pkgsrc-e3d2514a7a931bcb9dc4aeea662b02d7c7dbe251.tar.gz | |
Remove chunk to add space after -rpath, the option now has a trailing
comma and the space would result in a compiler argument.
| -rw-r--r-- | x11/qt5-qtbase/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp | 12 |
2 files changed, 3 insertions, 13 deletions
diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index 403501b4e5d..8c1fc8a166c 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2015/01/01 21:05:13 wiz Exp $ +$NetBSD: distinfo,v 1.15 2015/01/06 23:00:16 joerg Exp $ SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909 @@ -10,7 +10,7 @@ SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8 SHA1 (patch-mkspecs_features_simd.prf) = 3dea0d38e2791bdcae589bef38f2cce29a4c5b6c SHA1 (patch-qmake_Makefile.unix) = d07bfa160af94d06546865662bc2049a789fffec SHA1 (patch-qmake_generators_makefile.cpp) = 9db55a0a64183b9bff830af185ea1eb7c59d296a -SHA1 (patch-qmake_generators_unix_unixmake.cpp) = 8b8f1b6b34c06f50fb1c20c8c13220a7b4b46989 +SHA1 (patch-qmake_generators_unix_unixmake.cpp) = b278ab55b2a8083d5bd343d9e748790cf99dc4e6 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 7c2966006f20390c5b40698f1a110debd0b88c3a SHA1 (patch-src_concurrent_qtconcurrentiteratekernel.cpp) = abdb069ef9b77ced3c18a9cc9c18bcdfeda02ce8 SHA1 (patch-src_corelib_arch_sparc_arch.pri) = cb95ec1bb7aa6084f14dff5828854deed54b8ca1 diff --git a/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp b/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp index 94908d4b204..e1738327741 100644 --- a/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp +++ b/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp @@ -1,19 +1,9 @@ -$NetBSD: patch-qmake_generators_unix_unixmake.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: patch-qmake_generators_unix_unixmake.cpp,v 1.2 2015/01/06 23:00:16 joerg Exp $ -* First chunk, add a whitespace after -rpath. * fix install target so that destdir is added when installing QMAKE_TARGET --- qmake/generators/unix/unixmake.cpp.orig 2014-12-05 16:24:30.000000000 +0000 +++ qmake/generators/unix/unixmake.cpp -@@ -169,7 +169,7 @@ UnixMakefileGenerator::init() - QString rpathdir = rpathdirs[i].toQString(); - if (!rpathdir.startsWith('@') && !rpathdir.startsWith('$')) - rpathdir = QFileInfo(rpathdir).absoluteFilePath(); -- project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + escapeFilePath(rpathdir); -+ project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + " " + escapeFilePath(rpathdir); - } - } - if (!project->isEmpty("QMAKE_RPATHLINKDIR")) { @@ -353,27 +353,29 @@ UnixMakefileGenerator::init() if (!strncmp(libtoolify[i], "QMAKE_LINK", 10) || !strcmp(libtoolify[i], "QMAKE_AR_CMD")) { libtool_flags += " --mode=link"; |