This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/osx in repository x2goclient. discards 067ad34 pulsemanager.{cpp,h}: new member function fetch_pulseaudio_version () with first skeleton. discards 79d1f8c pulsemanager.cpp: generate platform-dependent values for member variables server_working_dir_ and server_binary_ in constructor. discards bcf2adf pulsemanager.cpp: add "dummy" start_linux () function. discards 242feea pulsemanager.cpp: reorder member varibles in initialization list. discards 8d0ca53 pulsemanager.cpp: another typo fix: findPort -> find_port. discards 4b84abc pulsemanager.cpp: fix another compile error due to typo'd versions of generate_server_config () and generate_client_config (). discards 801222d pulsemanager.cpp: fix compile errors in find_port () by renaming the ret or port variable to search_port. discards 52fc4d5 pulsemanager.{cpp,h}: find_port () actually returns a value, fix declaration accordingly. discards 26f775c pulsemanager.cpp: typo fix in member variable name server_working_dir_. discards 6e5089a pulsemanager.h: whitespace only. discards a8c925e pulsemanager.cpp: make startup sound playing via slot_play_startup_sound () Windows-compatible. discards 8c960ee pulsemanager.cpp: only play startup sound if DEBUG macro is defined. discards a6a96b3 pulsemanager.cpp: make generate_client_config () Windows-compatible. discards 5e76a27 pulsemanager.cpp: make generate_server_config () Windows-compatible. discards 4727d8b pulsemanager.cpp: also load module-esound-protocol-tcp module. discards 628e2c7 pulsemanager.{cpp,h}: implement start_win () as part of Windows functionality. discards df79baf pulsemanager.cpp: let start_osx () use start_generic (). discards 0802abb pulsemanager.{cpp,h}: add new function start_generic () to split off common functionality. discards 63e30f2 pulsemanager.cpp: add Windows stuff to initial env in constructor. discards eec62bc pulsemanager.cpp: add cleanup support to on_pulse_finished (). discards 7d48241 pulsemanager.cpp: add Windows support to shutdown (). discards dacff08 pulsemanager.{cpp,h}: new function create_client_dir (). discards 8a8233a pulsemanager.cpp: make start () wrap the "real" OS-specific start functions. discards fce602d pulsemanager.{cpp,h}: add server_args_, server_binary_ and server_working_dir_ class variables. discards 95fa460 pulsemanager.{cpp,h}: fixup preprocessor usage. discards c367410 pulsemanager.cpp: reformat only. discards 7053575 pulsemanager.{cpp,h}: rename relaunch () to restart (). discards cbcdc52 pulsemanager.{cpp,h}: add ESD support. discards 6a2871b pulsemanager.h: add std:: namespace selector for uint32_t version variables. discards 52851e7 pulsemanager.{cpp,h}: switch port definitions to std::uint16_t. discards aec930e pulsemanager.cpp: reformat only. discards e845cba pulsemanager.{cpp,h}: add pulse_version_{major,minor}_ member variables. discards 454dbb7 pulsemanager.cpp: use initializer list for constructor. discards ce8c076 pulsemanager.{cpp,h}: reformat only. discards 9a4957a pulsemanager.cpp: minor non-behavior changing fixes. discards 9a1c96b pulsemanager.{cpp,h}: use name and underscore for member variables, not underscore and name. discards 2c9d4d8 macbuild.sh: rewrite ID line detection algorithm. discards 21ea5fb macbuild.sh: copy "special" files, so that they can be removed later on. discards c614663 macbuild.sh: fix removal of base prefix in deduplication if base prefix ends in a slash. discards 4f9222c macbuild.sh: more debug messages and a whitespace change. discards e0cf16c macbuild.sh: spelling fix. discards 83a8894 macbuild.sh: merge deduplicate.sh content in. discards dc795d6 deduplicate.sh: replace tabs with two spaces. No functional changes. discards a3362a4 macbuild.sh: replace tabs with two spaces. No functional changes. discards 9f0f2ec deduplicate.sh: remove some noisy debug output. discards c78b745 deduplicate.sh: add WARNING to status message. discards b67131a deduplicate.sh: fix wrong return value capture. discards 9919c36 deduplicate.sh: remove a bit of noisy debug output, but turn on parse_otool_output debugging. discards a7cdef5 deduplicate.sh: cleanup as announced in the last commit - using lazy_canonical_path. discards 599811e deduplicate.sh: surprisingly, it turned out that only checking the duplicate's basename against the current dependency's basename is not good enough. discards fcf290c deduplicate.sh: more temporary debugging output in fixup section. discards bfa2281 deduplicate.sh: copy lazy_canonical_path from macbuild.sh for now. discards 07af5af deduplicate.sh: save dependency format base string as a readonly variable and use that instead of repeating a fixed string. discards 015538a deduplicate.sh: actually include file name in install_name_tool pseudo output. discards b45ce7d deduplicate.sh: parse_otool_output: jump over first matching entry, which is - hopefully - the id line. discards 26ccb58 deduplicate.sh: unstub fixup section. discards 46ac492 deduplicate.sh: add more useful information in fixup section's error message. discards 1e23945 deduplicate.sh: switch to range-based for loop in fixup section for duplicate array walking as we need to access the same element index in the replacement array. discards cd47a75 deduplicate.sh: prevent word splitting when parsing otool's output. discards 15254e7 deduplicate.sh: debug parse_otool_output fiercly for the time being. discards 909addd deduplicate.sh: record crafted "library path" values in duplicates replacement to_files array. discards 52f9e69 deduplicate.sh: change exit to return in parse_otool_output. discards d17e12a deduplicate.sh: fix parse_otool_output: we want to return failure only iff any of the strings are present in otool's output and actually handle the failure string *ARRAY* correctly as that. discards 008bc88 deduplicate.sh: quote "${arr[@]}" correctly to not suddenly force word splitting. discards d6e1a63 deduplicate.sh: change range-based for loops to "${!arr[@]}" to handle "sparse" arrays correctly. discards 4fb15f3 deduplicate.sh: correctly unset an array element. discards e70ba15 deduplicate.sh: add first skeleton for library dependency rewriting of deleted duplicates. discards 3d222e8 deduplicate.sh: non-functional: change WARNING to ERROR in error messages. discards 3024c58 deduplicate.sh: new function for parsing otool's output and printing library dependencies if no error occurred. discards 05c1d62 deduplicate.sh: add missed local variable declaration. discards b8ce054 deduplicate.sh: add duplicates-to-real mapping. discards 66d1dc9 deduplicate.sh: add new, more or less Proof of Concept, and Work in Progress file deduplication script. discards 8446c98 macbuild.sh: also install libraries into staging area with intermediate library path. discards 19fae93 macbuild.sh: fix echo call to also show the intermediate lib dir, not just the library file name. discards c31f036 macbuild.sh: when actually bundling libraries, use @executable_path instead of @loader_path. discards 0cc148d macbuild.sh: add the correct file path to the library bundling array. discards efdb223 macbuild.sh: check current file name against regex, not a (now) full path. discards f2aa23b macbuild.sh: use while-read-loop and find to actually recurse through directories. discards 7a85c24 macbuild.sh: remove libpulse and libpulsecore from libraries to be bundled, as something else will bundle them anyway. discards 032e77d macbuild.sh: add some more debugging output. discards 3ac2b8d macbuild.sh: directories are "executable", so the first check must explicitly include a check for the argument being not a directory. discards 3757c19 macbuild.sh: add Linux library file name scheme regex as a precaution. discards 8a52c0c macbuild.sh: add work-in-progress PulseAudio bundling. discards 5666b3c macbuild.sh: add phase output for bundling nxproxy. discards 312e5fb macbuild.sh: copy PulseAudio libraries and binaries. discards 438f403 macbuild.sh: define PulseAudio libraries and binaries to be later copied. discards fe595f8 macbuild.sh: add EXE_DIR and FRAMEWORKS_DIR internal variables. discards ac10f94 macbuild.sh: refactor nxproxy detection to use MACPORTS_PREFIX. discards 322df7c macbuild.sh: add new repeat_str() helper function. discards a0c6c03 macbuild.sh: add new get_nesting_level() helper function. discards c61b4e5 macbuild.sh: add new lazy_canonical_path() helper function. discards f616456 macbuild.sh: add new dependency_error() helper function. discards 784537c macbuild.sh: add new MACPORTS_PREFIX detection/variable. discards 53d6f21 x2goclient.pro{maemo}: reference new pulsemanager.{cpp,h} files. discards 6873269 pulsemanager.{cpp,h}: new class for PulseAudio management. discards c657971 compat.h: include QtCore/qglobal.h for Q_OS_... macros. discards 6cf8edf compat.{cpp,h}: remove inline keyword, because function is not defined in header file. discards 94950fc compat.{cpp,h}: new files. Implements strndup on OS X 10.6 and below. Add to x2goclient.cpp, x2goclient.pro and x2goclient.pro.maemo. discards f5bf4f2 onmainwindow.cpp: correctly use ~/.x2go/.ssh as ssh directory when starting sshd in user mode. discards b18999a appdialog.cpp: initialize parent in default case. Another GCC compile warning fix. discards 40a1232 {appdialog,configwidget,onmainwindow,unixhelper}.cpp: fix some compile warnings with GCC. Fix a few whitespace issues. discards 88b04ab x2goclient.cpp: fix failing exec() call for the UNIX helper utility: correctly terminate arguments vector. discards 98e4228 unixhelper.{cpp,h}: ignore SIGINT, SIGTERM, SIGPIPE, SIGQUIT, SIGUSR1 and SIGUSR2. discards 62818a3 {unixhelper.{cpp,h},x2goclient.cpp}: switch main cleanup handling to parent PID polling. discards 2e13a5d unixhelper.{cpp,h}: raise sleeping time to two seconds and grace period to 10 seconds. discards f5b1cbd x2goclient.cpp: create new argv array on the heap instead of on the stack. discards 1a1ee78 x2goclient.cpp: fix string comparison. discards f85716c x2goclient.cpp: fix compile problems introduced with the last commit. discards 10b8fe0 x2goclient.cpp: don't start the UNIX cleanup helper process right after forking. discards 56a8a87 x2goclient.cpp: clean up. discards d3afa18 unixhelper.cpp: port from std::signal() to sigaction(). Handle errors. discards d12c88f unixhelper.{cpp,h}: implement signal unblocking in unixhelper::unix_cleanup(). Update documentation. discards 30bb812 unixhelper.cpp: kill process group on error. discards 13200f2 x2goclient.cpp: return return value of unixhelper::unix_cleanup(). discards 24050c4 unixhelper.{cpp,h}: add documentation/comments. discards 2654118 unixhelper.{cpp,h},x2goclient.cpp}: unixhelper should really be a (module) namespace, not a class. discards b0989d8 unixhelper.h: forgot to declare type of unix_cleanup() function. discards f1811cf unixhelper.{h,cpp}: also include <QtCore/qglobal.h> to have Q_OS_UNIX defined on UNIX-based platforms. Move guards around. discards 34c17f4 x2goclient.cpp: fix std::edit -> std::exit typo. discards e9c2f3a x2goclient.cpp: add legacy <sys/types.h> header needed for old operating systems. discards 41262de x2goclient.cpp: add myself to copyright header. discards 5d61763 x2goclient.cpp: use setsid() on UNIX to become session and process group leader. discards d86d0e7 x2goclient.cpp: add fork_helper() function to start up the UNIX cleanup helper. discards 608f9b3 x2goclient.cpp: wrap X2Go Client main function and use that. discards d70a7a8 unixhelper.{cpp,h}: implement cleanup program for process group. discards e0af297 {unixhelper.{cpp,h},x2goclient.pro{maemo}}: add unixhelper stub. adds faf5f02 Central settings for Linux, Mac and Windows. adds f6fcdda Win32-OpenSSL: 1.0.1p -> 1.0.1q new c9ed573 {unixhelper.{cpp,h},x2goclient.pro{maemo}}: add unixhelper stub. new f20f72f unixhelper.{cpp,h}: implement cleanup program for process group. new 315393a x2goclient.cpp: wrap X2Go Client main function and use that. new 56d8a46 x2goclient.cpp: add fork_helper() function to start up the UNIX cleanup helper. new 832b66c x2goclient.cpp: use setsid() on UNIX to become session and process group leader. new db9714a x2goclient.cpp: add myself to copyright header. new 3b7c914 x2goclient.cpp: add legacy <sys/types.h> header needed for old operating systems. new c53cd68 x2goclient.cpp: fix std::edit -> std::exit typo. new ce3a20a unixhelper.{h,cpp}: also include <QtCore/qglobal.h> to have Q_OS_UNIX defined on UNIX-based platforms. Move guards around. new fccb07d unixhelper.h: forgot to declare type of unix_cleanup() function. new c349615 unixhelper.{cpp,h},x2goclient.cpp}: unixhelper should really be a (module) namespace, not a class. new 48aa1bb unixhelper.{cpp,h}: add documentation/comments. new 8cb7505 x2goclient.cpp: return return value of unixhelper::unix_cleanup(). new c604fe1 unixhelper.cpp: kill process group on error. new 7ca40b3 unixhelper.{cpp,h}: implement signal unblocking in unixhelper::unix_cleanup(). Update documentation. new 1eed854 unixhelper.cpp: port from std::signal() to sigaction(). Handle errors. new cd36572 x2goclient.cpp: clean up. new 3ef059b x2goclient.cpp: don't start the UNIX cleanup helper process right after forking. new 04a6118 x2goclient.cpp: fix compile problems introduced with the last commit. new bf648ff x2goclient.cpp: fix string comparison. new ae4ecfd x2goclient.cpp: create new argv array on the heap instead of on the stack. new 4658172 unixhelper.{cpp,h}: raise sleeping time to two seconds and grace period to 10 seconds. new d66713e {unixhelper.{cpp,h},x2goclient.cpp}: switch main cleanup handling to parent PID polling. new 7067bf9 unixhelper.{cpp,h}: ignore SIGINT, SIGTERM, SIGPIPE, SIGQUIT, SIGUSR1 and SIGUSR2. new a8e25ad x2goclient.cpp: fix failing exec() call for the UNIX helper utility: correctly terminate arguments vector. new 6bfcfa7 {appdialog,configwidget,onmainwindow,unixhelper}.cpp: fix some compile warnings with GCC. Fix a few whitespace issues. new e6df394 appdialog.cpp: initialize parent in default case. Another GCC compile warning fix. new 25ac2e4 onmainwindow.cpp: correctly use ~/.x2go/.ssh as ssh directory when starting sshd in user mode. new 05cb7a7 compat.{cpp,h}: new files. Implements strndup on OS X 10.6 and below. Add to x2goclient.cpp, x2goclient.pro and x2goclient.pro.maemo. new ef9788f compat.{cpp,h}: remove inline keyword, because function is not defined in header file. new 48197fe compat.h: include QtCore/qglobal.h for Q_OS_... macros. new aef3c90 pulsemanager.{cpp,h}: new class for PulseAudio management. new 2f066e5 x2goclient.pro{maemo}: reference new pulsemanager.{cpp,h} files. new 5cf5137 macbuild.sh: add new MACPORTS_PREFIX detection/variable. new f5e4993 macbuild.sh: add new dependency_error() helper function. new 7f6e43a macbuild.sh: add new lazy_canonical_path() helper function. new 1ec1e66 macbuild.sh: add new get_nesting_level() helper function. new 5c93727 macbuild.sh: add new repeat_str() helper function. new e7803e5 macbuild.sh: refactor nxproxy detection to use MACPORTS_PREFIX. new b6c5965 macbuild.sh: add EXE_DIR and FRAMEWORKS_DIR internal variables. new a91b5d7 macbuild.sh: define PulseAudio libraries and binaries to be later copied. new ccff19d macbuild.sh: copy PulseAudio libraries and binaries. new 0ba13de macbuild.sh: add phase output for bundling nxproxy. new 74d4fb2 macbuild.sh: add work-in-progress PulseAudio bundling. new 1c3c616 macbuild.sh: add Linux library file name scheme regex as a precaution. new f99b57b macbuild.sh: directories are "executable", so the first check must explicitly include a check for the argument being not a directory. new 8ff0bf2 macbuild.sh: add some more debugging output. new 4ef5935 macbuild.sh: remove libpulse and libpulsecore from libraries to be bundled, as something else will bundle them anyway. new da0d814 macbuild.sh: use while-read-loop and find to actually recurse through directories. new 439d6e4 macbuild.sh: check current file name against regex, not a (now) full path. new 3b60181 macbuild.sh: add the correct file path to the library bundling array. new 8af4885 macbuild.sh: when actually bundling libraries, use @executable_path instead of @loader_path. new c7741da macbuild.sh: fix echo call to also show the intermediate lib dir, not just the library file name. new 9d47365 macbuild.sh: also install libraries into staging area with intermediate library path. new 4e38f03 deduplicate.sh: add new, more or less Proof of Concept, and Work in Progress file deduplication script. new 3cdce1a deduplicate.sh: add duplicates-to-real mapping. new eb9235e deduplicate.sh: add missed local variable declaration. new 09a29f5 deduplicate.sh: new function for parsing otool's output and printing library dependencies if no error occurred. new ae3e613 deduplicate.sh: non-functional: change WARNING to ERROR in error messages. new 78586bb deduplicate.sh: add first skeleton for library dependency rewriting of deleted duplicates. new 1669a07 deduplicate.sh: correctly unset an array element. new 4b95c58 deduplicate.sh: change range-based for loops to "${!arr[@]}" to handle "sparse" arrays correctly. new f8be1da deduplicate.sh: quote "${arr[@]}" correctly to not suddenly force word splitting. new 50cefcb deduplicate.sh: fix parse_otool_output: we want to return failure only iff any of the strings are present in otool's output and actually handle the failure string *ARRAY* correctly as that. new 2c9692d deduplicate.sh: change exit to return in parse_otool_output. new bce6876 deduplicate.sh: record crafted "library path" values in duplicates replacement to_files array. new 871b60c deduplicate.sh: debug parse_otool_output fiercly for the time being. new 77a4dd1 deduplicate.sh: prevent word splitting when parsing otool's output. new dd52790 deduplicate.sh: switch to range-based for loop in fixup section for duplicate array walking as we need to access the same element index in the replacement array. new 4bdcfa8 deduplicate.sh: add more useful information in fixup section's error message. new 091f871 deduplicate.sh: unstub fixup section. new 4812765 deduplicate.sh: parse_otool_output: jump over first matching entry, which is - hopefully - the id line. new 5adb761 deduplicate.sh: actually include file name in install_name_tool pseudo output. new b23422f deduplicate.sh: save dependency format base string as a readonly variable and use that instead of repeating a fixed string. new 254fabf deduplicate.sh: copy lazy_canonical_path from macbuild.sh for now. new de39fb0 deduplicate.sh: more temporary debugging output in fixup section. new 92d24fe deduplicate.sh: surprisingly, it turned out that only checking the duplicate's basename against the current dependency's basename is not good enough. new 03ee67c deduplicate.sh: cleanup as announced in the last commit - using lazy_canonical_path. new 289e46f deduplicate.sh: remove a bit of noisy debug output, but turn on parse_otool_output debugging. new c654511 deduplicate.sh: fix wrong return value capture. new a7f3807 deduplicate.sh: add WARNING to status message. new bc9d0f4 deduplicate.sh: remove some noisy debug output. new 63bd67f macbuild.sh: replace tabs with two spaces. No functional changes. new 19f12f5 deduplicate.sh: replace tabs with two spaces. No functional changes. new 7f2aa9e macbuild.sh: merge deduplicate.sh content in. new eae1f1c macbuild.sh: spelling fix. new 4916c9a macbuild.sh: more debug messages and a whitespace change. new 6e4ba50 macbuild.sh: fix removal of base prefix in deduplication if base prefix ends in a slash. new 768ca2a macbuild.sh: copy "special" files, so that they can be removed later on. new 7b606b2 macbuild.sh: rewrite ID line detection algorithm. new 2c027e6 pulsemanager.{cpp,h}: use name and underscore for member variables, not underscore and name. new a27da43 pulsemanager.cpp: minor non-behavior changing fixes. new 235442e pulsemanager.{cpp,h}: reformat only. new d4ff696 pulsemanager.cpp: use initializer list for constructor. new 2c41b5d pulsemanager.{cpp,h}: add pulse_version_{major,minor}_ member variables. new 2befc49 pulsemanager.cpp: reformat only. new 5883992 pulsemanager.{cpp,h}: switch port definitions to std::uint16_t. new 928c550 pulsemanager.h: add std:: namespace selector for uint32_t version variables. new c3213a1 pulsemanager.{cpp,h}: add ESD support. new 4432d42 pulsemanager.{cpp,h}: rename relaunch () to restart (). new b8891f7 pulsemanager.cpp: reformat only. new aff0331 pulsemanager.{cpp,h}: fixup preprocessor usage. new 726003c pulsemanager.{cpp,h}: add server_args_, server_binary_ and server_working_dir_ class variables. new 8b823ad pulsemanager.cpp: make start () wrap the "real" OS-specific start functions. new 86fc870 pulsemanager.{cpp,h}: new function create_client_dir (). new e50ca6d pulsemanager.cpp: add Windows support to shutdown (). new f031de4 pulsemanager.cpp: add cleanup support to on_pulse_finished (). new a58f260 pulsemanager.cpp: add Windows stuff to initial env in constructor. new 34b3f46 pulsemanager.{cpp,h}: add new function start_generic () to split off common functionality. new c21affe pulsemanager.cpp: let start_osx () use start_generic (). new 867d40e pulsemanager.{cpp,h}: implement start_win () as part of Windows functionality. new 8938b63 pulsemanager.cpp: also load module-esound-protocol-tcp module. new f8b217e pulsemanager.cpp: make generate_server_config () Windows-compatible. new db122ec pulsemanager.cpp: make generate_client_config () Windows-compatible. new bf6ef40 pulsemanager.cpp: only play startup sound if DEBUG macro is defined. new 7c5472b pulsemanager.cpp: make startup sound playing via slot_play_startup_sound () Windows-compatible. new 2a37657 pulsemanager.h: whitespace only. new 508e003 pulsemanager.cpp: typo fix in member variable name server_working_dir_. new e4cec84 pulsemanager.{cpp,h}: find_port () actually returns a value, fix declaration accordingly. new fd3a0cb pulsemanager.cpp: fix compile errors in find_port () by renaming the ret or port variable to search_port. new 8df990f pulsemanager.cpp: fix another compile error due to typo'd versions of generate_server_config () and generate_client_config (). new f4a016e pulsemanager.cpp: another typo fix: findPort -> find_port. new b7c3aec pulsemanager.cpp: reorder member varibles in initialization list. new 3b63cf9 pulsemanager.cpp: add "dummy" start_linux () function. new 9926521 pulsemanager.cpp: generate platform-dependent values for member variables server_working_dir_ and server_binary_ in constructor. new 8e8177b pulsemanager.{cpp,h}: new member function fetch_pulseaudio_version () with first skeleton. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (067ad34) \ N -- N -- N refs/heads/bugfix/osx (8e8177b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 126 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 | 6 +++++ src/onmainwindow.cpp | 14 +++++++++++- src/x2gosettings.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 69 insertions(+), 10 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git