Hello community, here is the log from the commit of package synergy for openSUSE:Factory checked in at 2018-12-04 20:56:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/synergy (Old) and /work/SRC/openSUSE:Factory/.synergy.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "synergy" Tue Dec 4 20:56:41 2018 rev:20 rq:653676 version:1.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/synergy/synergy.changes 2018-03-04 12:52:51.531033687 +0100 +++ /work/SRC/openSUSE:Factory/.synergy.new.19453/synergy.changes 2018-12-04 20:56:47.288688966 +0100 @@ -1,0 +2,32 @@ +Thu Nov 8 03:26:30 UTC 2018 - sfl...@suse.de + +- Disable build and use of gmock due to its incompatible apache-2.0 + license https://build.opensuse.org/request/show/616454 + legal-disable-tests.patch +- No need to sed out setting the CXX flags +- spec cleaner run + +------------------------------------------------------------------- +Wed Jun 13 07:31:18 UTC 2018 - ohole...@suse.com + +- Fix source download URL + - s/synergy/synergy-core/ + +------------------------------------------------------------------- +Tue Jun 12 15:22:04 UTC 2018 - ohole...@suse.com + +- Update to 1.9.1 + * Fixed issue with screen resolution detection during sleep on macOS + * Updated OpenSSL to v1.0.2o +- Update to 1.9.0 + * Ported UI to Qt 5 + * Moved GUI build script to CMake + * Build with MSVC 2015 + * Removal of deprecated 'hm.sh' script and toolchains +- Add Provides and Obsoletes synergy-core (new upstream name) +- Remove patch 0001-OpenSSL-1.1.0-build-fix.patch as now upstream +- Add patch qt5_fixes.patch to fix building under QT5.11 +- Refresh patch synergy-1.5.0-pthread.patch +- Refresh patch synergy-1.5.0-disable-version-check.patch + +------------------------------------------------------------------- @@ -565 +596,0 @@ - Old: ---- 0001-OpenSSL-1.1.0-build-fix.patch v1.8.8-stable.tar.gz New: ---- legal-disable-tests.patch qt5_fixes.patch v1.9.1-stable.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ synergy.spec ++++++ --- /var/tmp/diff_new_pack.kAKHhP/_old 2018-12-04 20:56:48.280687872 +0100 +++ /var/tmp/diff_new_pack.kAKHhP/_new 2018-12-04 20:56:48.280687872 +0100 @@ -12,26 +12,32 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +# since Nov 2017 synergy FOSS core is called synergy-core +%define synergy synergy-core Name: synergy -Version: 1.8.8 +Version: 1.9.1 Release: 0 Summary: Mouse, keyboard and clipboard sharing utility -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/X11/Utilities -Url: http://synergy-project.org/ -Source0: https://github.com/symless/synergy/archive/v%{version}-stable.tar.gz +URL: http://synergy-project.org/ +Source0: https://github.com/symless/synergy-core/archive/v%{version}-stable.tar.gz Source1: synergy-firewall-services Source2: qsynergy.desktop Source3: qsynergy.png Source4: synergys.socket Source5: synergys.service -Patch1: 0001-OpenSSL-1.1.0-build-fix.patch +# The test suite uses an incompatible Apache-2.0 license +# https://build.opensuse.org/request/show/616454 +Patch1: legal-disable-tests.patch # PATCH-FIX-UPSTREAM add-support-for-latin-s-and-t-with-comma-below.patch Patch2: add-support-for-latin-s-and-t-with-comma-below.patch +# PATCH-FIX-UPSTREAM qt5_fixes.patch +Patch3: qt5_fixes.patch # patches from Gentoo (taken from Mageia) Patch11: synergy-1.5.0-pthread.patch Patch14: synergy-1.5.0-disable-version-check.patch @@ -46,9 +52,14 @@ BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xtst) +Provides: %{synergy} = %{version} +Obsoletes: %{synergy} < %{version} %{?systemd_requires} %if 0%{?suse_version} != 1315 BuildRequires: libcryptopp-devel @@ -82,40 +93,27 @@ keyboard. %prep -%setup -q -n %{name}-%{version}-stable +%setup -q -n %{synergy}-%{version}-stable %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch11 -p1 %patch14 -p1 cp %{SOURCE2} . -# extract bundled gtest and gmock to enable building tests -# tests are not started at the moment since they segfault at the end (TODO) -unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip -unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip - -# disable werror -sed -i \ - -e '/set(CMAKE_CXX_FLAGS/ d' \ - CMakeLists.txt - %build +export SYNERGY_VERSION_STAGE="release" %cmake make VERBOSE=1 %{?_smp_mflags} # leave the build subfolder cd .. -# GUI build -cd src/gui -qmake-qt5 PREFIX=%{_prefix} CONFIG+=RELEASE QMAKE_CXXFLAGS="%{optflags} -fPIE" \ - QMAKE_CFLAGS="%{optflags} -fPIE" QMAKE_LFLAGS+="-pie" -make %{?_smp_mflags} - %install chmod -x ChangeLog -install -D bin/synergyc "%{buildroot}%{_bindir}/synergyc" -install -D bin/synergys "%{buildroot}%{_bindir}/synergys" -install -D bin/syntool "%{buildroot}%{_bindir}/syntool" +install -D build/bin/synergyd "%{buildroot}%{_bindir}/synergyd" +install -D build/bin/synergyc "%{buildroot}%{_bindir}/synergyc" +install -D build/bin/synergys "%{buildroot}%{_bindir}/synergys" +install -D build/bin/syntool "%{buildroot}%{_bindir}/syntool" install -D -m0644 doc/synergy.conf.example "%{buildroot}%{_sysconfdir}/synergy.conf" install -D -m0644 doc/synergyc.man "%{buildroot}%{_mandir}/man1/synergyc.1" install -D -m0644 doc/synergys.man "%{buildroot}%{_mandir}/man1/synergys.1" @@ -129,7 +127,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcsynergys # GUI package -install -Dm 0755 bin/%{name} %{buildroot}%{_bindir}/q%{name} +install -Dm 0755 build/bin/%{name} %{buildroot}%{_bindir}/q%{name} %suse_update_desktop_file -i q%{name} %post @@ -148,11 +146,12 @@ %service_del_preun synergys.service synergys.socket %files -%defattr(-, root, root) -%doc README ChangeLog LICENSE doc/synergy.conf* +%doc ChangeLog doc/synergy.conf* +%license LICENSE %config(noreplace) %{_sysconfdir}/synergy.conf %{_bindir}/synergyc %{_bindir}/synergys +%{_bindir}/synergyd %{_bindir}/syntool %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/synergy %{_mandir}/man1/synergys.1%{?ext_man} @@ -162,8 +161,7 @@ %{_sbindir}/rcsynergys %files -n qsynergy -%defattr(-,root,root) -%doc LICENSE +%license LICENSE %{_bindir}/q%{name} %{_datadir}/applications/q%{name}.desktop %{_datadir}/pixmaps/q%{name}.png ++++++ legal-disable-tests.patch ++++++ Index: synergy-core-1.9.1-stable/ext/gmock/CMakeLists.txt =================================================================== --- synergy-core-1.9.1-stable.orig/ext/gmock/CMakeLists.txt +++ synergy-core-1.9.1-stable/ext/gmock/CMakeLists.txt @@ -1,3 +1,6 @@ +# Disable building gmock as it has an incompatible license and can't be used. +# https://build.opensuse.org/request/show/616454 +if (0) ######################################################################## # CMake build script for Google Mock. # @@ -149,3 +152,4 @@ if (gmock_build_tests) cxx_executable(gmock_output_test_ test gmock) py_test(gmock_output_test) endif() +endif (0) Index: synergy-core-1.9.1-stable/src/test/CMakeLists.txt =================================================================== --- synergy-core-1.9.1-stable.orig/src/test/CMakeLists.txt +++ synergy-core-1.9.1-stable/src/test/CMakeLists.txt @@ -14,6 +14,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +# Disable building tests as they use gmock with an incompatible apache2.0 licenses +# https://build.opensuse.org/request/show/616454 +if (0) + include_directories( ../../ext/gtest ../../ext/gtest/include @@ -31,3 +35,5 @@ endif() add_subdirectory(integtests) add_subdirectory(unittests) + +endif (0) ++++++ qt5_fixes.patch ++++++ diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 54cafabc..67f63113 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -39,7 +39,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") target_link_libraries (synergy dns_sd) endif() -qt5_use_modules (synergy Core Widgets Network) +target_link_libraries(synergy Qt5::Core Qt5::Widgets Qt5::Network) target_compile_definitions (synergy PRIVATE -DSYNERGY_VERSION_STAGE="${SYNERGY_VERSION_STAGE}") target_compile_definitions (synergy PRIVATE -DSYNERGY_REVISION="${SYNERGY_REVISION}") diff --git a/src/gui/src/ActionDialog.h b/src/gui/src/ActionDialog.h index 34e4e856..264c1bf4 100644 --- a/src/gui/src/ActionDialog.h +++ b/src/gui/src/ActionDialog.h @@ -21,6 +21,7 @@ #define ACTIONDIALOG_H #include <QDialog> +#include <QButtonGroup> #include "ui_ActionDialogBase.h" diff --git a/src/gui/src/ScreenSetupView.h b/src/gui/src/ScreenSetupView.h index 38eae2a4..f415f5c6 100644 --- a/src/gui/src/ScreenSetupView.h +++ b/src/gui/src/ScreenSetupView.h @@ -22,6 +22,7 @@ #include <QTableView> #include <QFlags> +#include <QHeaderView> #include "Screen.h" ++++++ synergy-1.5.0-disable-version-check.patch ++++++ --- /var/tmp/diff_new_pack.kAKHhP/_old 2018-12-04 20:56:48.328687819 +0100 +++ /var/tmp/diff_new_pack.kAKHhP/_new 2018-12-04 20:56:48.332687815 +0100 @@ -1,13 +1,11 @@ -Index: synergy-1.7.4-stable/src/gui/src/MainWindow.cpp -=================================================================== ---- synergy-1.7.4-stable.orig/src/gui/src/MainWindow.cpp -+++ synergy-1.7.4-stable/src/gui/src/MainWindow.cpp -@@ -168,7 +168,7 @@ void MainWindow::open() - showNormal(); - } +--- synergy-core-1.9.1-stable/src/gui/src/MainWindow.cpp 2018-04-10 12:18:42.000000000 +0200 ++++ synergy-core-1.9.1-stable/src/gui/src/MainWindow.cpp.new 2018-06-11 16:06:19.292619233 +0200 +@@ -197,7 +197,7 @@ void MainWindow::open() + showNormal(); + } -- m_VersionChecker.checkLatest(); -+ //m_VersionChecker.checkLatest(); +- m_VersionChecker.checkLatest(); ++ //m_VersionChecker.checkLatest(); - if (!appConfig().autoConfigPrompted()) { - promptAutoConfig(); + if (!appConfig().autoConfigPrompted()) { + promptAutoConfig(); ++++++ synergy-1.5.0-pthread.patch ++++++ --- /var/tmp/diff_new_pack.kAKHhP/_old 2018-12-04 20:56:48.340687806 +0100 +++ /var/tmp/diff_new_pack.kAKHhP/_new 2018-12-04 20:56:48.340687806 +0100 @@ -1,13 +1,11 @@ -Index: synergy-1.7.4-stable/CMakeLists.txt -=================================================================== ---- synergy-1.7.4-stable.orig/CMakeLists.txt -+++ synergy-1.7.4-stable/CMakeLists.txt -@@ -153,6 +153,8 @@ if (UNIX) - check_library_exists("pthread" pthread_create "" HAVE_PTHREAD) - if (HAVE_PTHREAD) - list(APPEND libs pthread) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") - else() - message(FATAL_ERROR "Missing library: pthread") - endif() +--- synergy-core-1.9.1-stable/CMakeLists.txt 2018-04-10 12:18:42.000000000 +0200 ++++ synergy-core-1.9.1-stable/CMakeLists.txt.new 2018-06-11 15:59:26.986183205 +0200 +@@ -125,6 +125,8 @@ if (UNIX) + # pthread is used on both Linux and Mac + check_library_exists ("pthread" pthread_create "" HAVE_PTHREAD) + if (HAVE_PTHREAD) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") + list (APPEND libs pthread) + else() + message (FATAL_ERROR "Missing library: pthread") ++++++ v1.8.8-stable.tar.gz -> v1.9.1-stable.tar.gz ++++++ /work/SRC/openSUSE:Factory/synergy/v1.8.8-stable.tar.gz /work/SRC/openSUSE:Factory/.synergy.new.19453/v1.9.1-stable.tar.gz differ: char 12, line 1
