Commit Graph

3465 Commits

Author SHA1 Message Date
Adrian Lucrèce Céleste 13ac24821a
Merge pull request #511 from keeganquinn/elcapitan-build-fix
Cast values to fix build errors on OS X 10.11.
2019-11-24 19:02:44 -05:00
Keegan Quinn 3d832fd728 Cast values to fix build errors on OS X 10.11. 2019-11-24 12:40:13 -08:00
Adrian Lucrèce Céleste 36ed253e12
Merge pull request #507 from galkinvv/man-conf-name-dot
Man page: fix incorrect name of user conf file in barriers.1
2019-11-21 16:37:46 -05:00
Vasily Galkin e2d460b779 Man page: fix incorrect name of user conf file in barriers.1
The leading dot was lost in documentation in previous change
while moving file to another directory.
The usage of leading dot in non-home folder is not a common practice,
but this is the current behavior,
and this commit just update man page to match the code.

Also the man pages has a not that they are auto-generated by help2man.
I used help2man to update them,
but it's output has some problems (wrong formatting of copyrights).

So in addition to the only important change (naming fix)
there is some more changes:

* Formatting manually added to the list of config files.
* New option --screen-change-script auto-added by help2man
* Man files themselves and doc/UpdateManpages.txt now mention
that some manual work is needed after help2man
2019-11-21 21:17:18 +03:00
Adrian Lucrèce Céleste d8e0394a54
Merge pull request #504 from tiwoc/macos-tray-image
Let tray image blend into macOS menu bar
2019-11-21 08:36:46 -05:00
Daniel Seither 8ef0668b09 Let tray image blend into macOS menu bar
The expected style for macOS menu bar images is a template image than
can adapt to the user's appearance settings. Also, high-res screens
("Retina" in Apple speak) need higher resolution images.

Based on /res/barrier.svg, I created black and transparent SVGs for the
three icon states. I had to remove some details to make the image scale
down to icon size without becoming too crowded, and I drew a new
checkmark and the transfer arrow.
2019-11-21 10:45:08 +01:00
Adrian Lucrèce Céleste 1246ec36fd
Merge pull request #498 from tiwoc/fix-macos-warnings
Fix macOS build warnings
2019-11-19 09:18:54 -05:00
Daniel Seither dc2d8e9661 Add override specifiers 2019-11-19 12:04:55 +01:00
Daniel Seither 937326bf4f OSXDragView: Get rid of uninitialized variable warning 2019-11-19 12:04:29 +01:00
Daniel Seither 96e8adbaae IpcLogOutputter: Put member initializers in execution order
Member initializers are always run in the order defined in the header.
This commit reorders them in the implementation so that their order
reflects their execution order.
2019-11-19 12:03:53 +01:00
Daniel Seither da3876325d Remove unused variables 2019-11-19 12:01:37 +01:00
Adrian Lucrèce Céleste 9080ce451b
Merge pull request #486 from ctsrc/script-dir
Replace hard-coded names of build directory in build_installer.sh scr…
2019-11-09 21:33:50 -05:00
Adrian Lucrèce Céleste 22e353869a
Add settings in the Info.plist file that enable high-DPI support… (#488)
Add settings in the Info.plist file that enable high-DPI support on macOS
2019-11-09 21:33:27 -05:00
Adrian Lucrèce Céleste 3e4de1d9c1
Remove shell script that changes directory and then executes bar… (#487)
Remove shell script that changes directory and then executes barrier on macOS, and execute barrier directly instead
2019-11-09 21:32:59 -05:00
Erik Nordstrøm 3737ed634d Add settings in the Info.plist file that enable high-DPI support on macOS.
These changes follow the instructions in the official Qt docs.

https://doc.qt.io/qt-5/highdpi.html
2019-11-08 03:15:13 +01:00
Erik Nordstrøm 983b84be35 Remove shell script that changes directory and then executes barrier on macOS, and execute barrier directly instead. 2019-11-08 02:00:15 +01:00
Erik Nordstrøm 9c6de19f17 Replace hard-coded names of build directory in build_installer.sh script for macOS with looking at the location of the script by the script itself when it is run. This makes it possible to have differently named build dirs for debug and release builds, and without restricting what each of those directories must be named. 2019-11-08 01:01:10 +01:00
Adrian Lucrèce Céleste 07a1c31fab
Merge pull request #473 from RealKelsar/master
make non-gui variants build without avahi
2019-10-18 19:38:25 -04:00
Tetja Rediske 93a4035409 make non-gui variants build without avahi 2019-10-19 00:28:13 +02:00
Adrian Lucrèce Céleste 6daa516e99
Merge pull request #468 from qbit/openbsd
tell build system about openbsd
2019-10-16 19:50:55 -04:00
Aaron Bieber 459c136036
tell build system about openbsd 2019-10-16 17:35:30 -06:00
Adrian Lucrèce Céleste 14a708db33
Merge pull request #455 from xkill/master
Update debian changelog for 2.3.2 release
2019-10-09 09:43:52 -04:00
Pablo Catalina 29723a5745 Update changelog for 2.3.2 release 2019-10-09 12:52:10 +02:00
Pablo Catalina 8d9f8fa617 Update changelog for 2.3.2 release 2019-10-09 12:29:39 +02:00
Adrian Lucrèce Céleste 210c2b70bd
[Version] bump to 2.3.2, stable 2019-10-02 21:26:26 -04:00
Adrian Lucrèce Céleste 8320686e0d
Merge pull request #439 from mirh/master
Fix debug build launch
2019-09-20 10:37:32 -04:00
mirh 90f7a68695
Fix debug build launch 2019-09-19 22:41:51 +02:00
Adrian Lucrèce Céleste 0ed18c6b89
Merged mouse drift fix from synergy-core (#424)
Merged mouse drift fix from synergy-core
2019-09-03 15:02:43 -07:00
Casey Barton 69a65e4725 Merged mouse drift fix from synergy-core 2019-09-03 13:24:46 -04:00
Adrian Lucrèce Céleste 4dddbb5816
[README] update README with info about packages (#422)
[README] update README with info about packages
2019-09-01 11:14:49 -07:00
Adrian Lucrèce Céleste 894191d1cb
[README] update README with info about packages 2019-09-01 14:09:39 -04:00
Adrian Lucrèce Céleste f791a482b9
Add snap build status 2019-08-28 13:18:48 -04:00
Adrian Lucrèce Céleste 0ed9451430
[Azure Pipelines] use QT 5.13.0 (#418)
* [Azure Pipelines] use QT 5.13.0

* [Azure Pipelines] update build_env_tmp.bat to QT 5.13
2019-08-23 15:59:14 -04:00
Adrian Lucrèce Céleste 28466eea10
[CMake] properly declare FPIC (#417)
[CMake] properly declare FPIC
2019-08-23 15:48:20 -04:00
Adrian Lucrèce Céleste 1bdc95a498
[CMake] properly declare FPIC
use CMAKE_POSITION_INDEPENDENT_CODE instead of manually addinf -fPIC to CXX args.

	modified:   CMakeLists.txt
2019-08-23 15:40:36 -04:00
Adrian Lucrèce Céleste f1c570752b
Merge pull request #413 from debauchee/revert-405-fix/build-scripts
Revert "Tidy up and fix lint errors in build scripts"
2019-08-22 17:11:02 -04:00
Adrian Lucrèce Céleste 70a4ece9e8
Revert "Tidy up and fix lint errors in build scripts" 2019-08-22 17:03:18 -04:00
Adrian Lucrèce Céleste 58f6c735ff
Merge pull request #412 from maxiberta/rename-snap
Rename the snap as `barrier`.
2019-08-22 15:03:58 -04:00
Adrian Lucrèce Céleste fca05b9163
Use standard mutex APIs instead of the home-grown wrapper (#410)
Use standard mutex APIs instead of the home-grown wrapper
2019-08-22 15:01:35 -04:00
Adrian Lucrèce Céleste 7bb541ea91
Merge pull request #411 from p12tic/rewrite-memory-management
Use explicit memory ownership in SocketMultiplexer
2019-08-22 15:01:21 -04:00
Adrian Lucrèce Céleste ccfa10f2a0
Merge pull request #391 from EbonJaeger
Re-implement patch for horizontal scrolling and extra mouse buttons
2019-08-22 14:57:46 -04:00
Maximiliano Bertacchini 5812030f43 Rename the snap as `barrier`. 2019-08-22 15:55:12 -03:00
Adrian Lucrèce Céleste e31ebc1b22
Merge pull request #408 from p12tic/fix-ssl-mem-leak
Fix memory leak during SSL socket shutdown
2019-08-22 12:54:27 -04:00
Adrian Lucrèce Céleste 69ea670c1f
Fix retry timer not being unregistered properly (#409)
Fix retry timer not being unregistered properly
2019-08-22 12:54:19 -04:00
Povilas Kanapickas 3600f4b255 Fix retry timer not being unregistered properly
This is cherry-pick of 70ba53caf4 from symless/synergy-core
2019-08-22 18:11:03 +03:00
Adrian Lucrèce Céleste 4ec30b6ade
Tidy up and fix lint errors in build scripts (#405)
Tidy up and fix lint errors in build scripts
2019-08-20 13:36:54 -04:00
Dom Rodriguez 452820eef7
Interim fix for failed macOS builds
Not ideal, but it might just work. Take two!

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2019-08-20 18:29:17 +01:00
Dom Rodriguez c685f0f231
Tidy up and fix lint errors in build scripts
I've tidied up the code in both of the build scripts used for *nix-like
systems, and the macOS/OSX specific build script helper.

This has been tested on Linux with no issues, but this PR will hopefully
indicate if the changes run without issues on macOS as well.

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
2019-08-20 18:08:03 +01:00
Adrian Lucrèce Céleste cf3b86341a
Merge pull request #404 from shymega/fix/cmake-qt
Fix: CMake now checks for required Qt5 libraries
2019-08-18 17:35:57 -04:00
Dom Rodriguez 6c88843771
Fix: CMake now checks for required Qt5 libraries
This won't fix #402 completely, but it *will* help mitigate similar
issues with Qt5 libraries during compilation in the future.
2019-08-18 22:29:19 +01:00