Группа :: Сети/Удалённый доступ
Пакет: barrier
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: barrier-2.3.3-alt2.1.patch
Скачать
Скачать
.gear/barrier.spec | 107 +++++++++++++++++++++
.gear/rules | 5 +
.gear/tags/list | 1 +
.gear/upstream/remotes | 3 +
src/test/CMakeLists.txt | 15 +--
src/test/integtests/CMakeLists.txt | 4 +-
.../integtests/platform/XWindowsScreenTests.cpp | 3 +-
src/test/unittests/CMakeLists.txt | 4 +-
8 files changed, 121 insertions(+), 21 deletions(-)
diff --git a/.gear/barrier.spec b/.gear/barrier.spec
new file mode 100644
index 00000000..ae55b96f
--- /dev/null
+++ b/.gear/barrier.spec
@@ -0,0 +1,107 @@
+%define _unpackaged_files_terminate_build 1
+
+Name: barrier
+Version: 2.3.3
+Release: alt2.1
+
+Summary: Keyboard and mouse sharing solution
+License: GPLv2
+Group: Networking/Remote access
+
+URL: https://github.com/debauchee/barrier
+#Source: https://github.com/debauchee/barrier/archive/v%version.tar.gz
+Source: %name-%version.tar
+
+Patch0: %name-%version-%release.patch
+
+BuildRequires: libgtest-devel
+BuildRequires: libgmock-devel
+BuildRequires: cmake
+BuildRequires: libavahi-devel
+BuildRequires: libX11-devel
+BuildRequires: libXtst-devel
+BuildRequires: qt5-base-devel
+BuildRequires: libcurl-devel
+BuildRequires: desktop-file-utils
+BuildRequires: openssl-devel
+BuildRequires: xvfb-run
+
+%description
+ Barrier allows you to share one mouse and keyboard between multiple computers.
+ Work seamlessly across Windows, macOS and Linux.
+
+%prep
+%setup
+%patch0 -p1
+
+%build
+%cmake
+%cmake_build
+
+%install
+%cmakeinstall_std
+%find_lang %name
+
+install -D -p -m 0644 doc/barrierc.1 %buildroot%_man1dir/barrierc.1
+install -D -p -m 0644 doc/barriers.1 %buildroot%_man1dir/barriers.1
+
+mkdir -p %buildroot%_datadir/metainfo
+## Write AppStream
+cat <<END> %buildroot%_datadir/metainfo/%name.appdata.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2018 Ding-Yi Chen <dchen@redhat.com> -->
+<component type="desktop-application">
+ <id>%name</id>
+ <metadata_license>FSFAP</metadata_license>
+ <project_license>GPLv2</project_license>
+ <name>barrier</name>
+ <summary>Share mouse and keyboard between multiple computers over the network</summary>
+
+ <description>
+ <p>
+ Barrier allows you to share one mouse and keyboard between multiple computers.
+ Work seamlessly across Windows, macOS and Linux.
+ </p>
+ </description>
+
+ <launchable type="desktop-id">%name.desktop</launchable>
+
+ <url type="homepage">https://github.com/debauchee/barrier</url>
+
+ <provides>
+ <binary>barrier</binary>
+ <binary>barrierc</binary>
+ <binary>barriers</binary>
+ </provides>
+
+ <releases>
+ <release version="%version" date="2019-03-21" />
+ </releases>
+</component>
+END
+
+%check
+cd %_cmake__builddir
+./bin/unittests
+xvfb-run --server-args='-extension GLX -screen 0 1280x1024x24 -noreset' ./bin/integtests
+
+%files -f %name.lang
+%doc LICENSE ChangeLog res/Readme.txt doc/barrier.conf.example*
+%_bindir/barrier*
+%_desktopdir/barrier.desktop
+%_iconsdir/hicolor/*/apps/barrier.svg
+%_datadir/metainfo/%name.appdata.xml
+%_man1dir/barrierc.1*
+%_man1dir/barriers.1*
+
+%changelog
+* Tue Apr 27 2021 Arseny Maslennikov <arseny@altlinux.org> 2.3.3-alt2.1
+- NMU: spec: adapted to new cmake macros.
+
+* Thu Dec 03 2020 Danil Shein <dshein@altlinux.org> 2.3.3-alt2
+- fixed integration tests failing in highly loaded build environment
+
+* Wed Nov 11 2020 Danil Shein <dshein@altlinux.org> 2.3.3-alt1
+- initial build for ALT
+
+
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 00000000..0cb1af77
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,5 @@
+spec: .gear/barrier.spec
+tar: v@version@:.
+diff: v@version@:. .
+
+
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 00000000..aa197fc9
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+3395cca9673b645ddce3bac9141f148752f9494c v2.3.3
diff --git a/.gear/upstream/remotes b/.gear/upstream/remotes
new file mode 100644
index 00000000..23218608
--- /dev/null
+++ b/.gear/upstream/remotes
@@ -0,0 +1,3 @@
+[remote "upstream"]
+ url = https://github.com/debauchee/barrier.git
+ fetch = +refs/heads/*:refs/remotes/upstream/*
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index daecb317..e6dcb806 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -14,20 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-include_directories(
- ../../ext/gtest
- ../../ext/gtest/include
- ../../ext/gmock
- ../../ext/gmock/include)
-
-add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc)
-add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc)
-
-if (UNIX)
- # ignore warnings in gtest and gmock
- set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
- set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w")
-endif()
+find_package(GTest REQUIRED CONFIG)
add_subdirectory(integtests)
add_subdirectory(unittests)
diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
index 0460d8df..72c97015 100644
--- a/src/test/integtests/CMakeLists.txt
+++ b/src/test/integtests/CMakeLists.txt
@@ -68,8 +68,6 @@ endif()
include_directories(
../../
- ../../../ext/gtest/include
- ../../../ext/gmock/include
)
if (UNIX)
@@ -80,4 +78,4 @@ endif()
add_executable(integtests ${sources})target_link_libraries(integtests
- arch base client common io ipc mt net platform server synlib gtest gmock ${libs} ${OPENSSL_LIBS})+ arch base client common io ipc mt net platform server synlib GTest::gtest GTest::gmock ${libs} ${OPENSSL_LIBS})diff --git a/src/test/integtests/platform/XWindowsScreenTests.cpp b/src/test/integtests/platform/XWindowsScreenTests.cpp
index d8f75e15..a11cddb4 100644
--- a/src/test/integtests/platform/XWindowsScreenTests.cpp
+++ b/src/test/integtests/platform/XWindowsScreenTests.cpp
@@ -29,7 +29,8 @@ TEST(CXWindowsScreenTests, fakeMouseMove_nonPrimary_getCursorPosValuesCorrect)
EXPECT_CALL(eventQueue, adoptHandler(_, _, _)).Times(2);
EXPECT_CALL(eventQueue, adoptBuffer(_)).Times(2);
EXPECT_CALL(eventQueue, removeHandler(_, _)).Times(2);
- XWindowsScreen screen(new XWindowsImpl(), ":0.0", false, false, 0, &eventQueue);
+
+ XWindowsScreen screen(new XWindowsImpl(), nullptr, false, false, 0, &eventQueue);
screen.fakeMouseMove(10, 20);
diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
index c46375ce..5f1b5752 100644
--- a/src/test/unittests/CMakeLists.txt
+++ b/src/test/unittests/CMakeLists.txt
@@ -50,8 +50,6 @@ list(APPEND headers ${platform_sources})include_directories(
../../
- ../../../ext/gtest/include
- ../../../ext/gmock/include
../../../ext
)
@@ -67,4 +65,4 @@ endif()
add_executable(unittests ${sources})target_link_libraries(unittests
- arch base client server common io net platform server synlib mt ipc gtest gmock ${libs} ${OPENSSL_LIBS})+ arch base client server common io net platform server synlib mt ipc GTest::gtest GTest::gmock ${libs} ${OPENSSL_LIBS})