Hello community, here is the log from the commit of package synergy for openSUSE:Factory checked in at 2014-07-10 08:16:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/synergy (Old) and /work/SRC/openSUSE:Factory/.synergy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "synergy" Changes: -------- --- /work/SRC/openSUSE:Factory/synergy/synergy.changes 2013-10-31 16:01:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.synergy.new/synergy.changes 2014-07-10 08:17:14.000000000 +0200 @@ -1,0 +2,93 @@ +Wed Jul 2 10:00:47 UTC 2014 - [email protected] + +- Do not use werror and simplify cflags handling + +------------------------------------------------------------------- +Wed Jul 2 04:37:12 UTC 2014 - [email protected] + +- setting Source with URL +- changing to %cmake macro and cleanup + +------------------------------------------------------------------- +Tue Jul 1 16:04:04 UTC 2014 - [email protected] + +- bump to 1.5.0 + Changes: + 1.5.0 + ===== + Bug #4060 - Key stuck down on Windows server + Bug #4061 - Windows server repeats modifier keys + + 1.4.18 + ====== + Bug #3980 - Shell extension DLL causes explorer.exe to crash + Task #4049 - Correct code style in OSXKeyState compilation unit + Task #4050 - Fix subversion issue tracker URL + Task #4053 - Improve deb package quality + Task #4054 - Improve rpm package quality + + 1.4.17 + ====== + Bug #2836 - Unable to begin screen name or alias with numbers + Bug #3796 - Some files being unintentionally dragged (including explorer.exe) + Bug #3886 - Alias is allowed to match screen name + Bug #3919 - RPM install fails on Fedora 20, failed dependencies: libcurl + Bug #3921 - Error: synwinxt.dll outdated (upgrading from 1.4.15 to 1.4.16) + Bug #3927 - Mavericks accessibility exception not working (when upgrading from + 1.4.15 to 1.4.16) + Bug #3933 - Plus signs in the email address cause premium login to fail + Bug #3939 - Compile fails on ARM (Raspberry Pi) because of cryptopp/Crypto++ + lib + Bug #3947 - Conflicts when using yum localinstall on Fedora 20 + Bug #3959 - Premium title doesn't always show on first login + Bug #3968 - GUI auto-hides on initial first install (with no config) + Task #3936 - Change installer to WiX for improved file upgrade process + Task #3950 - Poll modifier after key down on Mac OS X and log results + Task #3951 - Clear filename stored in synwinxt on mouse up + Task #3952 - Make Premium wizard page cleaner + Task #3953 - Inherit XArch and XBase from std::exception + Task #3954 - Make "lock to screen" log message go to NOTE level instead of + DEBUG + Task #3960 - Split CMSWindowsHookLibraryLoader into hook and shellex loaders + Task #3961 - Remove Windows 95 support + Task #3963 - Disable failing Linux unit/integ tests on Fedora 20 32-bit + (valgrind SIGILL) + Task #3964 - Make Premium login error more verbose + Task #3969 - Merge String.cpp and StringUtil.cpp + + 1.4.16 + ====== + Bug #3338 - Alt tab not working with Windows 8 + Bug #3642 - Failed to start server on Mac OS X 10.9 Mavericks, assistive + devices problem + Bug #3785 - Synwinxt.dll error opening file for writing during install of + 1.4.15 + Bug #3787 - Wont automatically load after login on OS X + Bug #3788 - Configuration wizard: Premium login fails when behind a proxy + Bug #3796 - Some files being unintentionally dragged (including explorer.exe) + Bug #3799 - Synergy Client on Fedora crashes on drag/drop operations + Bug #3818 - Client freezes on Mac OS 10.6.8 + Bug #3874 - Premium GUI login is case sensitive for email + Bug #3911 - Drag and drop error on OS X 10.9 Mavericks + +- added patches: + synergy-efl.patch + synergy-1.5.0-crytopp.patch + synergy-1.5.0-CSocketMultiplexer.patch + synergy-1.5.0-disable-version-check.patch + synergy-1.5.0-pthread.patch + synergy-1.5.0-test.patch +- removed patches: + fix-for-efl.patch + synergy-1.4.12-cryptopp.patch + synergy-pthread.patch + +------------------------------------------------------------------- +Tue Jul 1 10:18:19 UTC 2014 - [email protected] + +- fix-for-efl.patch + - reference: + https://phab.enlightenment.org/T1335 + http://synergy-project.org/spit/issues/details/4091/ + +------------------------------------------------------------------- Old: ---- synergy-1.4.12-cryptopp.patch synergy-1.4.15-Source.tar.gz synergy-pthread.patch New: ---- synergy-1.5.0-CSocketMultiplexer.patch synergy-1.5.0-crytopp.patch synergy-1.5.0-disable-version-check.patch synergy-1.5.0-pthread.patch synergy-1.5.0-r2278-Source.tar.gz synergy-1.5.0-test.patch synergy-efl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ synergy.spec ++++++ --- /var/tmp/diff_new_pack.qBINcD/_old 2014-07-10 08:17:17.000000000 +0200 +++ /var/tmp/diff_new_pack.qBINcD/_new 2014-07-10 08:17:17.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package synergy # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,28 @@ Name: synergy -Version: 1.4.15 +Version: 1.5.0 Release: 0 Summary: Mouse, keyboard and clipboard sharing utility License: GPL-2.0+ Group: System/X11/Utilities -Url: http://synergy-foss.org/ -Source: http://synergy.googlecode.com/files/synergy-%{version}-Source.tar.gz +Url: http://synergy-project.org/ +Source: http://synergy-project.org/files/packages/%{name}-%{version}-r2278-Source.tar.gz Source1: synergy-firewall-services Source2: qsynergy.desktop Source3: qsynergy.png Source4: synergys.socket Source5: synergys.service -Patch0: synergy-1.4.12-cryptopp.patch -Patch1: synergy-pthread.patch +# patches from Gentoo (taken from Mageia) +Patch10: synergy-1.5.0-crytopp.patch +Patch11: synergy-1.5.0-pthread.patch +Patch12: synergy-1.5.0-CSocketMultiplexer.patch +Patch13: synergy-1.5.0-test.patch +Patch14: synergy-1.5.0-disable-version-check.patch +# our patch :o) +Patch20: synergy-efl.patch BuildRequires: cmake +BuildRequires: curl-devel BuildRequires: gcc-c++ BuildRequires: libcryptopp-devel BuildRequires: libqt4-devel @@ -75,23 +82,30 @@ keyboard. %prep -%setup -q -n "synergy-%{version}-Source" -%patch0 -p1 -%patch1 -p1 +%setup -q -n "%{name}-%{version}-Source" +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch20 -p1 cp %{SOURCE2} . +# disable werror +sed -i \ + -e '/set(CMAKE_CXX_FLAGS/ d' \ + CMakeLists.txt + %build -cmake -G "Unix Makefiles" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS_RELEASE="%{optflags} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS_RELEASE="%{optflags} -DNDEBUG" \ - . +%cmake make VERBOSE=1 %{?_smp_mflags} +# leave the build subfolder +cd .. # GUI build cd src/gui -qmake PREFIX=%{_prefix} CONFIG+=RELEASE QMAKE_CXXFLAGS="%{optflags}" QMAKE_CFLAGS="%{optflags}" +qmake PREFIX=%{_prefix} CONFIG+=RELEASE QMAKE_CXXFLAGS="%{optflags}" QMAKE_CFLAGS="$CFLAGS" make %{?_smp_mflags} %install @@ -99,10 +113,9 @@ install -D bin/synergyc "%{buildroot}%{_bindir}/synergyc" install -D bin/synergys "%{buildroot}%{_bindir}/synergys" 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" install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/synergy" -install -D -m0644 doc/synergys.man %{buildroot}%{_mandir}/man1/synergys.1 -install -D -m0644 doc/synergyc.man %{buildroot}%{_mandir}/man1/synergyc.1 -gzip -9 %{buildroot}/%{_mandir}/man1/synergys.1 # Unit file %if 0%{?suse_version} >= 1220 ++++++ synergy-1.5.0-CSocketMultiplexer.patch ++++++ http://synergy-project.org/spit/issues/details/2935/ https://bugs.gentoo.org/show_bug.cgi?id=505978 --- a/src/lib/net/SocketMultiplexer.cpp +++ b/src/lib/net/SocketMultiplexer.cpp @@ -243,6 +243,7 @@ for (CSocketJobMap::iterator i = m_socketJobMap.begin(); i != m_socketJobMap.end();) { if (*(i->second) == NULL) { + m_socketJobs.erase(i->second); m_socketJobMap.erase(i++); m_update = true; } ++++++ synergy-1.5.0-crytopp.patch ++++++ diff -up ./CMakeLists.txt.0010 ./CMakeLists.txt --- ./CMakeLists.txt.0010 2014-05-23 18:43:58.000000000 +0300 +++ ./CMakeLists.txt 2014-05-29 14:51:45.762682400 +0300 @@ -144,6 +144,10 @@ if (UNIX) check_type_size(long SIZEOF_LONG) check_type_size(short SIZEOF_SHORT) + set(CMAKE_REQUIRED_LIBRARIES crypto++) + set(CMAKE_REQUIRED_LIBRARIES) + set(CMAKE_INCLUDE_DIRECTORIES) + # pthread is used on both Linux and Mac check_library_exists("pthread" pthread_create "" HAVE_PTHREAD) if (HAVE_PTHREAD) diff -up ./ext/CMakeLists.txt.0010 ./ext/CMakeLists.txt --- ./ext/CMakeLists.txt.0010 2014-03-20 21:24:24.000000000 +0200 +++ ./ext/CMakeLists.txt 2014-05-29 14:51:45.758682560 +0300 @@ -13,47 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -set(cryptopp_dir cryptopp562) - -# only compile the crypto++ files we need. -set(cryptopp_src - ${cryptopp_dir}/3way.cpp - ${cryptopp_dir}/algparam.cpp - ${cryptopp_dir}/asn.cpp - ${cryptopp_dir}/authenc.cpp - ${cryptopp_dir}/basecode.cpp - ${cryptopp_dir}/cpu.cpp - ${cryptopp_dir}/cryptlib.cpp - ${cryptopp_dir}/des.cpp - ${cryptopp_dir}/dessp.cpp - ${cryptopp_dir}/dll.cpp - ${cryptopp_dir}/ec2n.cpp - ${cryptopp_dir}/ecp.cpp - ${cryptopp_dir}/filters.cpp - ${cryptopp_dir}/fips140.cpp - ${cryptopp_dir}/gcm.cpp - ${cryptopp_dir}/gf2n.cpp - ${cryptopp_dir}/gfpcrypt.cpp - ${cryptopp_dir}/hex.cpp - ${cryptopp_dir}/hmac.cpp - ${cryptopp_dir}/hrtimer.cpp - ${cryptopp_dir}/integer.cpp - ${cryptopp_dir}/iterhash.cpp - ${cryptopp_dir}/misc.cpp - ${cryptopp_dir}/modes.cpp - ${cryptopp_dir}/mqueue.cpp - ${cryptopp_dir}/nbtheory.cpp - ${cryptopp_dir}/oaep.cpp - ${cryptopp_dir}/osrng.cpp - ${cryptopp_dir}/pubkey.cpp - ${cryptopp_dir}/queue.cpp - ${cryptopp_dir}/randpool.cpp - ${cryptopp_dir}/rdtables.cpp - ${cryptopp_dir}/rijndael.cpp - ${cryptopp_dir}/rng.cpp - ${cryptopp_dir}/sha.cpp -) - # if 64-bit windows, compile asm file. if (CMAKE_CL_64) list(APPEND cryptopp_src ${cryptopp_dir}/x64dll.asm ${cryptopp_dir}/x64masm.asm) @@ -87,10 +46,3 @@ if (UNIX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${CRYPTOPP_ARCH}") endif() endif() - -add_library(cryptopp STATIC ${cryptopp_src}) - -if (UNIX) - # ignore warnings in crypto++ - set_target_properties(cryptopp PROPERTIES COMPILE_FLAGS "-w") -endif() diff -up ./src/lib/io/CryptoMode_cryptopp.h.0010 ./src/lib/io/CryptoMode_cryptopp.h --- ./src/lib/io/CryptoMode_cryptopp.h.0010 2014-02-28 14:36:45.000000000 +0200 +++ ./src/lib/io/CryptoMode_cryptopp.h 2014-05-29 14:51:45.758682560 +0300 @@ -25,6 +25,6 @@ # pragma GCC system_header #endif -#include <cryptopp562/gcm.h> -#include <cryptopp562/modes.h> -#include <cryptopp562/aes.h> +#include <cryptopp/gcm.h> +#include <cryptopp/modes.h> +#include <cryptopp/aes.h> diff -up ./src/lib/io/CryptoStream_cryptopp.h.0010 ./src/lib/io/CryptoStream_cryptopp.h --- ./src/lib/io/CryptoStream_cryptopp.h.0010 2014-02-28 14:36:45.000000000 +0200 +++ ./src/lib/io/CryptoStream_cryptopp.h 2014-05-29 14:51:45.758682560 +0300 @@ -25,5 +25,5 @@ # pragma GCC system_header #endif -#include <cryptopp562/osrng.h> -#include <cryptopp562/sha.h> +#include <cryptopp/osrng.h> +#include <cryptopp/sha.h> ++++++ synergy-1.5.0-disable-version-check.patch ++++++ diff -up ./src/gui/src/MainWindow.cpp.0021 ./src/gui/src/MainWindow.cpp --- ./src/gui/src/MainWindow.cpp.0021 2014-05-29 14:49:49.207324766 +0300 +++ ./src/gui/src/MainWindow.cpp 2014-05-29 14:50:15.792265886 +0300 @@ -127,7 +127,7 @@ void MainWindow::open() showNormal(); - m_VersionChecker.checkLatest(); + //m_VersionChecker.checkLatest(); // only start if user has previously started. this stops the gui from // auto hiding before the user has configured synergy (which of course ++++++ synergy-1.5.0-pthread.patch ++++++ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,6 +141,8 @@ 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-1.5.0-test.patch ++++++ --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,6 +19,6 @@ add_subdirectory(plugin) add_subdirectory(micro) -if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX") +if (${WITH_GENTOO_TEST} MATCHES "ON") add_subdirectory(test) endif() --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -14,20 +14,5 @@ # 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-1.6.0 - ../../ext/gtest-1.6.0/include - ../../ext/gmock-1.6.0 - ../../ext/gmock-1.6.0/include) - -add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc) -add_library(gmock STATIC ../../ext/gmock-1.6.0/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() - add_subdirectory(integtests) add_subdirectory(unittests) ++++++ synergy-efl.patch ++++++ Index: synergy-1.5.0-Source/src/lib/platform/XWindowsClipboard.cpp =================================================================== --- synergy-1.5.0-Source.orig/src/lib/platform/XWindowsClipboard.cpp +++ synergy-1.5.0-Source/src/lib/platform/XWindowsClipboard.cpp @@ -937,8 +937,14 @@ CXWindowsClipboard::pushReplies() for (CReplyMap::iterator index = m_replies.begin(); index != m_replies.end(); ) { assert(!index->second.empty()); - if (!index->second.front()->m_replied) { - pushReplies(index, index->second, index->second.begin()); + CReplyList::iterator listit = index->second.begin(); + while (listit != index->second.end()) { + if (!(*listit)->m_replied) + break; + ++listit; + } + if (listit != index->second.end() && !(*listit)->m_replied) { + pushReplies(index, index->second, listit); } else { ++index; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
