This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from c3b9cd9 {macbuild.sh,x2goclient.pro}: pass MacPorts library and include path's to qmake. new 42138b7 macbuild.sh: hotfix for needing MacPorts - bugfix/osx contains a more thorough fix, but backporting is not an option. new 081b6b1 x2gosettings.cpp: let centralSettings () return false on Windows. The 2 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 | 1 + macbuild.sh | 4 ++++ src/x2gosettings.cpp | 2 ++ 3 files changed, 7 insertions(+) -- 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 42138b7ba136ceb635fdc0443bfb2cfbc3cdb75d Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 2 20:53:46 2015 +0100 macbuild.sh: hotfix for needing MacPorts - bugfix/osx contains a more thorough fix, but backporting is not an option. --- macbuild.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/macbuild.sh b/macbuild.sh index c85701e..f663a18 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -99,6 +99,10 @@ pushd "${BUILD_DIR}" phase "Running lrelease" lrelease "${PROJECT}" + +# WILL BE REMOVED IN OTHER BRANCH - ONLY HERE FOR COMPAT REASONS +MACPORTS_PREFIX="/opt/local" + phase "Running qmake" qmake -config "${BUILD_MODE}" -spec macx-g++ "${PROJECT}" \ CONFIG+="${BUILD_ARCH}" \ -- 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 081b6b1a3d95169a21d58f782f7d5b7c41d385dd Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 2 22:05:52 2015 +0100 x2gosettings.cpp: let centralSettings () return false on Windows. --- debian/changelog | 1 + src/x2gosettings.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index c618907..e5d5338 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low - {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. + - x2gosettings.cpp: let centralSettings () return false on Windows. [ Oleksandr Shneyder ] * New upstream release (4.0.5.1): diff --git a/src/x2gosettings.cpp b/src/x2gosettings.cpp index 943cdf0..d045ae8 100644 --- a/src/x2gosettings.cpp +++ b/src/x2gosettings.cpp @@ -77,6 +77,8 @@ bool X2goSettings::centralSettings() QDir d("/etc/x2goclient/settings"); x2goDebug<<d.exists(); return d.exists(); +#else + return (false); #endif } -- 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