diff options
author | Unit 193 <unit193@ubuntu.com> | 2019-08-10 17:27:03 -0400 |
---|---|---|
committer | Unit 193 <unit193@ubuntu.com> | 2019-08-10 17:27:03 -0400 |
commit | fa1dc6c246d868add1646414c223dddd39adf09f (patch) | |
tree | d3efa3a2f11dd792d81f1c444ce17a51f3840d1e | |
parent | 3210229f1a4b6c1252a22e74ed5931f6b4a82c7d (diff) | |
parent | 81b2a927d50def6c2643db51394a170593d1db85 (diff) | |
download | barrier-fa1dc6c246d868add1646414c223dddd39adf09f.tar.bz2 barrier-fa1dc6c246d868add1646414c223dddd39adf09f.tar.xz barrier-fa1dc6c246d868add1646414c223dddd39adf09f.tar.zst |
Update upstream source from tag 'upstream/2.3.1+dfsg'
Update to upstream version '2.3.1+dfsg'
with Debian dir 09ccb15a840d5b04cfee2308f9994c15f1a7c371
-rw-r--r-- | .travis.yml | 34 | ||||
-rw-r--r-- | Build.properties | 2 | ||||
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | README.md | 10 | ||||
-rw-r--r-- | azure-pipelines.yml | 3 | ||||
-rw-r--r-- | cmake/Version.cmake | 2 | ||||
-rw-r--r-- | snap/snapcraft.yaml | 127 | ||||
-rw-r--r-- | src/lib/barrier/KeyMap.cpp | 1 |
8 files changed, 68 insertions, 112 deletions
diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 43bcd89..0000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -language: cpp - -matrix: - include: - - os: linux - sudo: false - dist: trusty - addons: - apt: - packages: - - libxtst-dev - - qtdeclarative5-dev - - libavahi-compat-libdnssd-dev - script: sh -x ./clean_build.sh - - - os: osx - osx_image: xcode9 - script: - - export COLUMNS=80 - - curl -LO https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci - - chmod +x ./macports-ci - - ./macports-ci install - - PATH="$PATH:/opt/local/bin" - - sudo port -N install qt5-qtbase openssl - - sh -x ./clean_build.sh - - - os: osx - osx_image: xcode9 - script: - - brew update - - brew install qt openssl - - sh -x ./clean_build.sh - -install: true diff --git a/Build.properties b/Build.properties index 7b352fe..7f71f09 100644 --- a/Build.properties +++ b/Build.properties @@ -3,5 +3,5 @@ # BARRIER_VERSION_MAJOR = 2 BARRIER_VERSION_MINOR = 3 -BARRIER_VERSION_PATCH = 0 +BARRIER_VERSION_PATCH = 1 BARRIER_VERSION_STAGE = snapshot diff --git a/CMakeLists.txt b/CMakeLists.txt index d5ec96f..1c28635 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ project (barrier C CXX) option (BARRIER_BUILD_GUI "Build the GUI" ON) option (BARRIER_BUILD_INSTALLER "Build the installer" ON) +set (CMAKE_EXPORT_COMPILE_COMMANDS ON) set (CMAKE_CXX_STANDARD 14) set (CMAKE_CXX_EXTENSIONS OFF) set (CMAKE_CXX_STANDARD_REQUIRED ON) @@ -7,9 +7,15 @@ Find [releases here](https://github.com/debauchee/barrier/releases). - `#barrier` on freenode -Master branch build status: [![Build Status](https://travis-ci.org/debauchee/barrier.svg?branch=master)](https://travis-ci.org/debauchee/barrier) +#### CI Build Status -Azure Pipelines build status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master) +Master branch overall build status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master) +* Linux Build Status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master&jobName=Linux%20Build)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master) +* Mac Build Status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master&jobName=Mac%20Build)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master) +* Windows Debug Build Status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master&jobName=Windows%20Build&configuration=Windows%20Build%20Debug)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master) +* Windows Release Build Status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master&jobName=Windows%20Build&configuration=Windows%20Build%20Release%20with%20Release%20Installer)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master) + +Our CI Builds are provided by Microsoft Azure Pipelines. ### What is it? diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cabe88f..bd773d3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -49,6 +49,9 @@ jobs: inputs: pathtoPublish: $(Build.ArtifactStagingDirectory)\$(CI_ENV_BUILD_TYPE).zip artifactName: Windows $(CI_ENV_BUILD_TYPE) + - script: choco install innosetup --version 5.6.1.20190126 --allow-downgrade + displayName: Ensure desired version of Inno Setup is installed. + condition: eq(variables['CI_ENV_BUILD_TYPE'], 'Release') - script: build_installer.bat displayName: Build Installer condition: eq(variables['CI_ENV_BUILD_TYPE'], 'Release') diff --git a/cmake/Version.cmake b/cmake/Version.cmake index c003ad6..d90f48b 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.4) set (BARRIER_VERSION_MAJOR 2) set (BARRIER_VERSION_MINOR 3) -set (BARRIER_VERSION_PATCH 0) +set (BARRIER_VERSION_PATCH 1) # # Barrier Version diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 671ccd4..3aa2a33 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,104 +1,83 @@ name: barrier-kvm # the Barrier Snappy for Linux / not tested on MAC yet base: core18 -version: '2.2.0' # 03/2019 -summary: Eliminate the barrier between your machines. -description: | - Barrier is KVM software forked from Symless's synergy 1.9 codebase. - Synergy was a commercialized reimplementation of the original - CosmoSynergy written by Chris Schoeneman. +version: master +version-script: git describe --tags --long | sed "s/^v//" +adopt-info: appstream-flathub grade: stable # must be 'stable' to release into candidate/stable channels confinement: strict # use 'strict' once you have the right plugs and slots +icon: res/barrier.svg +license: GPL-2.0 apps: - barrier-kvm: + barrier: command: desktop-launch barrier #first run might take longer - plugs: - gnome-3-26-1604: - interface: content - target: gnome-platform - default-provider: gnome-3-26-1604:gnome-3-26-1604 - plugs: [gnome-3-26-1604] - plugs: [x11] -parts: [qt5conf] + desktop: usr/share/applications/barrier.desktop + common-id: com.github.debauchee.barrier + plugs: &plugs + - desktop + - desktop-legacy + - home + - joystick + - network + - opengl + - pulseaudio + - screen-inhibit-control + - unity7 + - wayland + - x11 + barrierc: + command: desktop-launch barrierc + plugs: *plugs + barriers: + command: desktop-launch barriers + plugs: *plugs + parts: - desktop: - plugin: nil - source: https://github.com/ubuntu/snapcraft-desktop-helpers.git desktop-qt5: source: https://github.com/ubuntu/snapcraft-desktop-helpers.git source-subdir: qt plugin: make - make-parameters: ["FLAVOR=qt5"] - build-packages: - - build-essential - - qtbase5-dev - - dpkg-dev - stage-packages: - - libxkbcommon0 - - ttf-ubuntu-font-family - - dmz-cursor-theme - - light-themes - - adwaita-icon-theme - - gnome-themes-standard - - shared-mime-info - - libqt5gui5 - - libgdk-pixbuf2.0-0 - - libqt5svg5 # for loading icon themes which are svg - - try: [appmenu-qt5] # not available on core18 - - locales-all - - xdg-user-dirs - - fcitx-frontend-qt5 - qt5: - source: https://github.com/ubuntu/snapcraft-desktop-helpers.git - source-subdir: qt - plugin: make - make-parameters: ["FLAVOR=qt5"] - build-packages: - - qtbase5-dev - - dpkg-dev - stage-packages: - - libxkbcommon0 - - ttf-ubuntu-font-family - - dmz-cursor-theme - - light-themes - - adwaita-icon-theme - - gnome-themes-standard - - shared-mime-info - - libqt5gui5 - - libgdk-pixbuf2.0-0 - - libqt5svg5 # for loading icon themes which are svg - - try: [appmenu-qt5] # not available on core18 - - locales-all - barrier-kvm: - source: https://github.com/payomagic/barrier.git + + barrier: + source: . plugin: cmake + configflags: + - "-DCMAKE_INSTALL_PREFIX=/usr" build-packages: - - g++ - - gcc - - make - xorg-dev - libcurl4-openssl-dev - libavahi-compat-libdnssd-dev - libssl-dev - libx11-dev - - libqt4-dev - qtbase5-dev - qt5-style-plugins - - qt5ct - stage-packages: - libxinerama-dev - - libxinerama1 - libxrandr-dev - - libxrandr2 - libxrender-dev - - libxrender1 - libxtst-dev - qtdeclarative5-dev - - libavahi-compat-libdnssd-dev - - libqt5gui5 - libavahi-common-dev + - libqt5svg5-dev + stage-packages: + - libxinerama1 + - libxrandr2 + - libxrender1 + - libqt5gui5 - libqt5x11extras5 - libqt5svg5 - - libqt5svg5-dev - - qt5ct + - libxtst6 + - libavahi-client3 + - libavahi-common3 + - libavahi-compat-libdnssd1 after: [desktop-qt5] + + fix-icon: + plugin: nil + override-build: + sed -i 's|Icon=barrier|Icon=/usr/share/icons/hicolor/scalable/apps/barrier.svg|' $SNAPCRAFT_STAGE/usr/share/applications/barrier.desktop + after: [barrier] + + appstream-flathub: + plugin: dump + source: https://github.com/flathub/com.github.debauchee.barrier.git + parse-info: [com.github.debauchee.barrier.appdata.xml] diff --git a/src/lib/barrier/KeyMap.cpp b/src/lib/barrier/KeyMap.cpp index fd68204..621e747 100644 --- a/src/lib/barrier/KeyMap.cpp +++ b/src/lib/barrier/KeyMap.cpp @@ -1104,6 +1104,7 @@ KeyMap::getDeadKey(KeyID key) case '`': return kKeyDeadGrave; + case '\'': case 0xb4u: return kKeyDeadAcute; |