This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/cleanup in repository x2goclient. from 5a8ddcb x2goutils: rename fixup_resources() and wrap_legacy_resources() to fixup_resource_URIs() and wrap_legacy_resource_URIs(). new c636f0a sessionexplorer, sessionwidget: wrap more places in wrap_legacy_resource_URIs(). new 6f47f51 general: move res/Info.plist and macdmg.DS_Store to res/osxbundle/ and update references in: new 303e367 macbuild.sh: add debug mode selector via DEBUG env variable. new 8da0744 x2goclient.pro: enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. The 4 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 | 4 ++++ macbuild.sh | 10 ++++++++-- res/{ => osxbundle}/Info.plist | 0 macdmg.DS_Store => res/osxbundle/macdmg.DS_Store | Bin 15364 -> 15364 bytes src/sessionexplorer.cpp | 8 +++----- src/sessionwidget.cpp | 10 +++++----- x2goclient.pro | 5 ++++- 7 files changed, 24 insertions(+), 13 deletions(-) rename res/{ => osxbundle}/Info.plist (100%) rename macdmg.DS_Store => res/osxbundle/macdmg.DS_Store (100%) -- Alioth's /srv/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 feature/cleanup in repository x2goclient. commit c636f0a9167420f7f02f30f6ed73e806fbd75a0c Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 00:00:01 2015 +0100 sessionexplorer, sessionwidget: wrap more places in wrap_legacy_resource_URIs(). --- src/sessionexplorer.cpp | 8 +++----- src/sessionwidget.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/sessionexplorer.cpp b/src/sessionexplorer.cpp index fcdd719..5e54c0d 100644 --- a/src/sessionexplorer.cpp +++ b/src/sessionexplorer.cpp @@ -167,11 +167,9 @@ void SessionExplorer::slotCreateDesktopIcon ( SessionButton* bt ) name.replace("/","::"); - QString sessIcon=st.setting()->value ( - bt->id() +"/icon", - ( QVariant ) - ":/img/icons/128x128/x2gosession.png" - ).toString(); + QString sessIcon = wrap_legacy_resource_URIs (st.setting ()->value (bt->id() + "/icon", + (QVariant) ":/img/icons/128x128/x2gosession.png" + ).toString ()); sessIcon = expandHome(sessIcon); if ( sessIcon.startsWith ( ":/img/icons",Qt::CaseInsensitive ) || !sessIcon.endsWith ( ".png",Qt::CaseInsensitive ) ) diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp index e49b718..13abd99 100644 --- a/src/sessionwidget.cpp +++ b/src/sessionwidget.cpp @@ -409,7 +409,7 @@ void SessionWidget::slot_getIcon() tr ( "Pictures" ) +" (*.png *.xpm *.jpg)" ); if ( path!=QString::null ) { - sessIcon=path; + sessIcon = wrap_legacy_resource_URIs (path); icon->setIcon ( QIcon ( sessIcon ) ); } } @@ -545,10 +545,10 @@ void SessionWidget::readConfig() sessName->setText (name); - sessIcon=st.setting()->value ( - sessionId+"/icon", - ( QVariant ) ":/img/icons/128x128/x2gosession.png" ).toString().trimmed(); - sessIcon=expandHome(sessIcon); + sessIcon = wrap_legacy_resource_URIs (st.setting ()->value (sessionId+"/icon", + (QVariant) ":/img/icons/128x128/x2gosession.png" + ).toString ().trimmed ()); + sessIcon = expandHome (sessIcon); icon->setIcon ( QIcon ( sessIcon ) ); server->setText ( st.setting()->value ( -- Alioth's /srv/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 feature/cleanup in repository x2goclient. commit 6f47f519433dbdfda3abb15f068e76fa7dde3cac Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 00:16:11 2015 +0100 general: move res/Info.plist and macdmg.DS_Store to res/osxbundle/ and update references in: + x2goclient.pro + macbuild.sh --- debian/changelog | 2 ++ macbuild.sh | 2 +- res/{ => osxbundle}/Info.plist | 0 macdmg.DS_Store => res/osxbundle/macdmg.DS_Store | Bin 15364 -> 15364 bytes x2goclient.pro | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93d6cab..8c167fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -201,6 +201,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Rename fixup_resources() and wrap_legacy_resources() to fixup_resource_URIs() and wrap_legacy_resource_URIs(). Update references. + - Move res/Info.plist and macdmg.DS_Store to res/osxbundle/ and update + references in x2goclient.pro and macbuild.sh. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index ffe21ff..422a250 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -70,7 +70,7 @@ ${PKG_DMG} \ --verbosity 2 \ --mkdir "/.background" \ --copy "${TOP_DIR}/res/img/png/macinstaller_background.png:/.background" \ - --copy "${TOP_DIR}/macdmg.DS_Store:/.DS_Store" \ + --copy "${TOP_DIR}/res/osxbundle/macdmg.DS_Store:/.DS_Store" \ --copy "${TOP_DIR}/LICENSE" \ --copy "${TOP_DIR}/COPYING" \ --symlink "/Applications: " \ diff --git a/res/Info.plist b/res/osxbundle/Info.plist similarity index 100% rename from res/Info.plist rename to res/osxbundle/Info.plist diff --git a/macdmg.DS_Store b/res/osxbundle/macdmg.DS_Store similarity index 100% rename from macdmg.DS_Store rename to res/osxbundle/macdmg.DS_Store diff --git a/x2goclient.pro b/x2goclient.pro index 9d5ca8a..e3ee3ce 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -201,7 +201,7 @@ ICON = $${PWD}/res/img/icons/x2go-mac.icns # Info.plist file being created in the first place. # The last command takes care of actually putting the icon in place - yet # another bug in qmake. Bummer. -QMAKE_INFO_PLIST = $${PWD}/res/Info.plist +QMAKE_INFO_PLIST = $${PWD}/res/osxbundle/Info.plist QMAKE_INFO_PLIST_OUT = $${TARGET}.app/Contents/Info.plist PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist QMAKE_POST_LINK += /bin/cp -n $${ICON} $${OUT_PWD}/$${TARGET}.app/Contents/Resources/ -- Alioth's /srv/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 feature/cleanup in repository x2goclient. commit 303e367e592a412d2a69016f4ac05c5a9e165418 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 00:37:53 2015 +0100 macbuild.sh: add debug mode selector via DEBUG env variable. --- debian/changelog | 1 + macbuild.sh | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8c167fa..1c9207c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -203,6 +203,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium references. - Move res/Info.plist and macdmg.DS_Store to res/osxbundle/ and update references in x2goclient.pro and macbuild.sh. + - Add debug mode selector via DEBUG env variable to macbuild.sh. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index 422a250..a02e3cb 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -15,6 +15,12 @@ LIBZ="libz.1.dylib" : SDK="${SDK:-"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"}" : MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-"10.7"}" +: DEBUG="${DEBUG:-"0"}" + +case "${DEBUG}" in + ("0"|"no"|""|"No"|"nO"|"NO") BUILD_MODE="release";; + (*) BUILD_MODE="debug";; +esac set -e @@ -40,7 +46,7 @@ phase "Running lrelease" lrelease "${PROJECT}" phase "Running qmake" -qmake -config release -spec macx-g++ "${PROJECT}" \ +qmake -config "${BUILD_MODE}" -spec macx-g++ "${PROJECT}" \ CONFIG+="x86_64" \ QMAKE_MAC_SDK="${SDK}" \ QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" -- Alioth's /srv/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 feature/cleanup in repository x2goclient. commit 8da074487bd60061da376afd196094572033d604 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 00:50:55 2015 +0100 x2goclient.pro: enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. --- debian/changelog | 1 + x2goclient.pro | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1c9207c..87b0930 100644 --- a/debian/changelog +++ b/debian/changelog @@ -204,6 +204,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Move res/Info.plist and macdmg.DS_Store to res/osxbundle/ and update references in x2goclient.pro and macbuild.sh. - Add debug mode selector via DEBUG env variable to macbuild.sh. + - Enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index e3ee3ce..5a195bd 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -206,6 +206,9 @@ QMAKE_INFO_PLIST_OUT = $${TARGET}.app/Contents/Info.plist PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist QMAKE_POST_LINK += /bin/cp -n $${ICON} $${OUT_PWD}/$${TARGET}.app/Contents/Resources/ +QMAKE_CXXFLAGS_DEBUG -= -g +QMAKE_CXXFLAGS_DEBUG += -g3 -ggdb3 -gdwarf-4 + plugin { DEFINES += CFGPLUGIN linux-g++ { -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org