This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from ef22cf4 res/txt/packs: add adaptive method. new c3b9cd9 {macbuild.sh,x2goclient.pro}: pass MacPorts library and include path's to qmake. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 +++ macbuild.sh | 4 +++- x2goclient.pro | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit c3b9cd96fa1488cda4a25b3e28dad4e4ef68240d Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 30 04:32:40 2015 +0100 {macbuild.sh,x2goclient.pro}: pass MacPorts library and include path's to qmake. Due to the qt4-mac's changes, we do not automatically get these values automatically "appended" in a usable way anymore. --- debian/changelog | 3 +++ macbuild.sh | 4 +++- x2goclient.pro | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 31cc80b..c618907 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low - onmainwindow.cpp: do NOT reformat. Reverts most of the previous commit because it breaks code logic. - res/txt/packs: add adaptive method. + - {macbuild.sh,x2goclient.pro}: pass MacPorts library and include path's + to qmake. Due to the qt4-mac's changes, we do not automatically get + these values automatically "appended" in a usable way anymore. [ Oleksandr Shneyder ] * New upstream release (4.0.5.1): diff --git a/macbuild.sh b/macbuild.sh index 097ac91..c85701e 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -104,7 +104,9 @@ qmake -config "${BUILD_MODE}" -spec macx-g++ "${PROJECT}" \ CONFIG+="${BUILD_ARCH}" \ QMAKE_MAC_SDK="${SDK}" \ QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \ - OSX_STDLIB="${STDLIB}" + OSX_STDLIB="${STDLIB}" \ + MACPORTS_INCLUDE_PATH="${MACPORTS_PREFIX}/include" \ + MACPORTS_LIBRARY_PATH="${MACPORTS_PREFIX}/lib" phase "Running make" make -j2 diff --git a/x2goclient.pro b/x2goclient.pro index 97e8bdd..efe7e52 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -207,6 +207,14 @@ macx { QMAKE_CXXFLAGS += --stdlib=$${OSX_STDLIB} } + !isEmpty(MACPORTS_INCLUDE_PATH) { + INCLUDEPATH += $${MACPORTS_INCLUDE_PATH} + } + + !isEmpty(MACPORTS_LIBRARY_PATH) { + LIBS = -L$${MACPORTS_LIBRARY_PATH} $${LIBS} + } + # Strictly speaking, this is a bug in qmake and we should neither need $${PWD} # nor QMAKE_INFO_PLIST_OUT nor PRE_TARGETDEPS nor QMAKE_POST_LINK. # Not defining the latter two will however lead to it being empty and no -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org