This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit e2b7d38b32897eaf9bb36d7a3cee6d50a2a8057b 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 c07ed80..9a9e33f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -196,6 +196,9 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low - pulsemanager.cpp: only play startup sound if DEBUG macro is defined. - pulsemanager.cpp: make startup sound playing via slot_play_startup_sound () Windows-compatible. + - {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 2df3c1a..f31535a 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -299,7 +299,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 957d61c..d12c1cb 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -213,6 +213,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