cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put LOCALBASE/X11BASE in env if they're not already there. Fixes qmake

Browse Source 
builds.
This commit is contained in:
espie 2010-05-28 12:12:04 +00:00
parent 36adf53a0d
commit c84ed918a2
7 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/qt-creator/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2010/05/27 12:44:19 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2010/05/28 12:12:04 espie Exp $
COMMENT = cross-platform IDE for use with Qt
V = 1.3.1
DISTNAME = qt-creator-${V}-src
PKGNAME = qt-creator-${V}p0
PKGNAME = qt-creator-${V}p1
EXTRACT_SUFX = .zip
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
@ -58,6 +58,6 @@ pre-configure:
ln -sf ${PREFIX}/lib/qt4/bin/qhelpgenerator ${WRKDIR}/bin/bin
do-configure:
cd ${WRKBUILD} && QTDIR=${WRKDIR}/bin qmake4 ${WRKSRC}/qtcreator.pro
cd ${WRKBUILD} && QTDIR=${WRKDIR}/bin qmake4 ${WRKSRC}/qtcreator.pro CONFIG+=debug
.include <bsd.port.mk>

4
devel/qt-creator/patches/patch-src_libs_extensionsystem_extensionsystem_pro
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libs_extensionsystem_extensionsystem_pro,v 1.1.1.1 2010/05/27 12:30:14 espie Exp $
$OpenBSD: patch-src_libs_extensionsystem_extensionsystem_pro,v 1.2 2010/05/28 12:12:04 espie Exp $
--- src/libs/extensionsystem/extensionsystem.pro.orig Fri Jan 15 18:36:52 2010
+++ src/libs/extensionsystem/extensionsystem.pro Fri Mar 12 20:58:20 2010
+++ src/libs/extensionsystem/extensionsystem.pro Fri May 28 12:10:12 2010
@@ -4,7 +4,7 @@ DEFINES += EXTENSIONSYSTEM_LIBRARY
include(../../qtcreatorlibrary.pri)
include(extensionsystem_dependencies.pri)

4
devel/qt-creator/patches/patch-src_libs_utils_process_stub_unix_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libs_utils_process_stub_unix_c,v 1.1.1.1 2010/05/27 12:30:14 espie Exp $
$OpenBSD: patch-src_libs_utils_process_stub_unix_c,v 1.2 2010/05/28 12:12:05 espie Exp $
--- src/libs/utils/process_stub_unix.c.orig Fri Jan 15 18:36:52 2010
+++ src/libs/utils/process_stub_unix.c Fri Mar 12 20:57:12 2010
+++ src/libs/utils/process_stub_unix.c Fri May 28 12:10:12 2010
@@ -40,6 +40,10 @@
#include <stdlib.h>
#include <stdio.h>

6
devel/qt-creator/patches/patch-src_plugins_help_helpplugin_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_plugins_help_helpplugin_cpp,v 1.1.1.1 2010/05/27 12:30:14 espie Exp $
--- src/plugins/help/helpplugin.cpp.orig Sat Apr 24 17:20:30 2010
+++ src/plugins/help/helpplugin.cpp Sat Apr 24 17:19:53 2010
$OpenBSD: patch-src_plugins_help_helpplugin_cpp,v 1.2 2010/05/28 12:12:05 espie Exp $
--- src/plugins/help/helpplugin.cpp.orig Fri Jan 15 18:36:52 2010
+++ src/plugins/help/helpplugin.cpp Fri May 28 12:10:12 2010
@@ -80,7 +80,7 @@
#include <QtGui/QMessageBox>
#include <QtHelp/QHelpEngine>

16
devel/qt-creator/patches/patch-src_plugins_projectexplorer_environment_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_plugins_projectexplorer_environment_cpp,v 1.1 2010/05/28 12:12:05 espie Exp $
--- src/plugins/projectexplorer/environment.cpp.orig Fri May 28 13:57:03 2010
+++ src/plugins/projectexplorer/environment.cpp Fri May 28 13:58:22 2010
@@ -81,6 +81,12 @@ Environment::Environment(QStringList env)
#endif
}
}
+ if (m_values.value("LOCALBASE").isNull()) {
+ m_values.insert("LOCALBASE", "/usr/local");
+ }
+ if (m_values.value("X11BASE").isNull()) {
+ m_values.insert("X11BASE", "/usr/X11R6");
+ }
}
QStringList Environment::toStringList() const

6
devel/qt-creator/patches/patch-src_plugins_projectexplorer_toolchain_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_plugins_projectexplorer_toolchain_cpp,v 1.1.1.1 2010/05/27 12:30:14 espie Exp $
--- src/plugins/projectexplorer/toolchain.cpp.orig Thu May 27 13:21:24 2010
+++ src/plugins/projectexplorer/toolchain.cpp Thu May 27 13:21:28 2010
$OpenBSD: patch-src_plugins_projectexplorer_toolchain_cpp,v 1.2 2010/05/28 12:12:05 espie Exp $
--- src/plugins/projectexplorer/toolchain.cpp.orig Fri Jan 15 18:36:52 2010
+++ src/plugins/projectexplorer/toolchain.cpp Fri May 28 12:10:12 2010
@@ -235,7 +235,7 @@ void GccToolChain::addToEnvironment(ProjectExplorer::E
QString GccToolChain::makeCommand() const

4
devel/qt-creator/patches/patch-src_qtcreatorplugin_pri
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_qtcreatorplugin_pri,v 1.1.1.1 2010/05/27 12:30:14 espie Exp $
$OpenBSD: patch-src_qtcreatorplugin_pri,v 1.2 2010/05/28 12:12:05 espie Exp $
--- src/qtcreatorplugin.pri.orig Fri Jan 15 18:36:52 2010
+++ src/qtcreatorplugin.pri Thu May 27 12:25:35 2010
+++ src/qtcreatorplugin.pri Fri May 28 12:10:12 2010
@@ -35,6 +35,13 @@ macx {
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'