head 1.3; access; symbols pkgsrc-2014Q4:1.2.0.4 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.2 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.1.0.6 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.4 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.2 pkgsrc-2013Q4-base:1.1; locks; strict; comment @// @; 1.3 date 2014.12.30.17.23.46; author adam; state dead; branches; next 1.2; commitid 1jIE5UF7705yw54y; 1.2 date 2014.08.23.20.25.11; author wiz; state Exp; branches; next 1.1; commitid ruKGxArHRO30GwNx; 1.1 date 2013.12.13.14.38.35; author ryoon; state Exp; branches; next ; commitid LyqQkBZQHNHTSYgx; desc @@ 1.3 log @Changes 5.4.0: Chromium-based browser engine Qt WebEngine Qt WebView for showing web content using the native OS web engine on mobile Full support on Qt for Windows Store Apps, including WinRT and Windows Phone 8.1 Improved Compliance with iOS 8 and Xcode 6 Improved OS X 10.10 ‘Yosemite’ support and new Mac AppStore signing High-DPI support for Windows and OS X Dynamic GL switching between OpenGL and ANGLE on Windows Mix OpenGL and Qt Quick with QOpenGLWidget Android Look-and-Feel for Qt Quick Controls Qt Creator 3.3 with new Qt Quick Designer Bluetooth now supports BlueZ5 with tech preview on Bluetooth LE @ text @$NetBSD: patch-qtbase_qmake_generators_unix_unixmake.cpp,v 1.2 2014/08/23 20:25:11 wiz Exp $ * First chunk, add a whitespace after -rpath. * fix install target so that destdir is added when installing QMAKE_TARGET --- qtbase/qmake/generators/unix/unixmake.cpp.orig 2014-02-01 20:37:29.000000000 +0000 +++ qtbase/qmake/generators/unix/unixmake.cpp @@@@ -156,7 +156,7 @@@@ UnixMakefileGenerator::init() const ProStringList &rpathdirs = project->values("QMAKE_RPATHDIR"); for(int i = 0; i < rpathdirs.size(); ++i) { if(!project->isEmpty("QMAKE_LFLAGS_RPATH")) - project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + escapeFilePath(QFileInfo(rpathdirs[i].toQString()).absoluteFilePath()); + project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + " " + escapeFilePath(QFileInfo(rpathdirs[i].toQString()).absoluteFilePath()); } } if (!project->isEmpty("QMAKE_RPATHLINKDIR")) { @@@@ -346,27 +346,29 @@@@ UnixMakefileGenerator::init() if (!strncmp(libtoolify[i], "QMAKE_LINK", 10) || !strcmp(libtoolify[i], "QMAKE_AR_CMD")) { libtool_flags += " --mode=link"; if(project->isActiveConfig("staticlib")) { - libtool_flags += " -static"; + comp_flags += " -static"; } else { if(!project->isEmpty("QMAKE_LIB_FLAG")) { + if(project->isActiveConfig("plugin")) + comp_flags += " -avoid-version"; + else { int maj = project->first("VER_MAJ").toInt(); int min = project->first("VER_MIN").toInt(); int pat = project->first("VER_PAT").toInt(); - comp_flags += " -version-info " + QString::number(10*maj + min) + - ":" + QString::number(pat) + ":0"; + comp_flags += " -version-info " + QString::number(maj + min) + + ":" + QString::number(pat) + + ":" + QString::number(min); + } if (strcmp(libtoolify[i], "QMAKE_AR_CMD")) { - QString rpath = Option::output_dir; - if(!project->isEmpty("DESTDIR")) { - rpath = project->first("DESTDIR").toQString(); - if(QDir::isRelativePath(rpath)) - rpath.prepend(Option::output_dir + Option::dir_sep); - } + QString rpath = Option::fixPathToTargetOS(project->first("target.path").toQString(), false); + if(rpath.right(1) != Option::dir_sep) + rpath += Option::dir_sep; comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, false); } } } if(project->isActiveConfig("plugin")) - libtool_flags += " -module"; + comp_flags += " -module"; } else { libtool_flags += " --mode=compile"; } @@@@ -722,7 +724,6 @@@@ UnixMakefileGenerator::defaultInstall(co QString targetdir = Option::fixPathToTargetOS(project->first("target.path").toQString(), false); if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep) destdir += Option::dir_sep; - targetdir = fileFixify(targetdir, FileFixifyAbsolute); if(targetdir.right(1) != Option::dir_sep) targetdir += Option::dir_sep; @@@@ -760,10 +761,18 @@@@ UnixMakefileGenerator::defaultInstall(co QString src_targ = target; if(src_targ == "$(TARGET)") src_targ = "$(TARGETL)"; - QString dst_dir = fileFixify(targetdir, FileFixifyAbsolute); + QString dst_dir = targetdir; if(QDir::isRelativePath(dst_dir)) - dst_dir = Option::fixPathToTargetOS(Option::output_dir + Option::dir_sep + dst_dir); - ret = "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; + dst_dir = Option::fixPathToTargetOS(dst_dir); + if(!ret.isEmpty()) + ret += "\n\t"; + if(project->first("TEMPLATE") == "app") { + ret += "-$(LIBTOOL) --mode=install cp \"" + Option::fixPathToTargetOS(destdir + src_targ, false) + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; + } else { + ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; + } + if(!uninst.isEmpty()) + uninst.append("\n\t"); uninst.append("-$(LIBTOOL) --mode=uninstall \"" + src_targ + "\""); } else { QString src_targ = target; @ 1.2 log @Fix qmake to handle DESTDIR correctly. From Niclas Rosenvik. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-qtbase_qmake_generators_unix_unixmake.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ @ 1.1 log @Import Qt5 5.2.0rc1 packages and qt5 input module from uim Only tested on NetBSD/amd64 6.99.28. ToDo: * inputmethod/qt5-ibus from Qt5 should be created @ text @d1 1 a1 1 $NetBSD$ d4 1 d6 1 a6 1 --- qtbase/qmake/generators/unix/unixmake.cpp.orig 2013-11-27 01:01:10.000000000 +0000 d65 1 a65 1 @@@@ -760,10 +761,14 @@@@ UnixMakefileGenerator::defaultInstall(co d77 5 a81 1 + ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; @