rpms/synergy/EL-4 synergy-1.3.1-gcc43.patch, NONE, 1.1 synergy.spec, 1.9, 1.10
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Thu Apr 24 11:48:07 UTC 2008
Author: thias
Update of /cvs/extras/rpms/synergy/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25270
Modified Files:
synergy.spec
Added Files:
synergy-1.3.1-gcc43.patch
Log Message:
Backport devel changes, don't use non available modular X.
synergy-1.3.1-gcc43.patch:
--- NEW FILE synergy-1.3.1-gcc43.patch ---
diff -Naupr synergy-1.3.1.orig/lib/arch/CArchDaemonUnix.cpp synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp
--- synergy-1.3.1.orig/lib/arch/CArchDaemonUnix.cpp 2005-04-24 05:02:12.000000000 +0200
+++ synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp 2008-02-24 00:49:30.000000000 +0100
@@ -19,6 +19,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
+#include <cstdlib>
//
// CArchDaemonUnix
diff -Naupr synergy-1.3.1.orig/lib/arch/CMultibyte.cpp synergy-1.3.1/lib/arch/CMultibyte.cpp
--- synergy-1.3.1.orig/lib/arch/CMultibyte.cpp 2005-11-30 05:33:24.000000000 +0100
+++ synergy-1.3.1/lib/arch/CMultibyte.cpp 2008-02-24 01:31:32.000000000 +0100
@@ -17,8 +17,9 @@
#include "common.h"
#include "CArch.h"
-#include <limits.h>
-#include <string.h>
+#include <climits>
+#include <cstring>
+#include <cstdlib>
#if HAVE_LOCALE_H
# include <locale.h>
#endif
@@ -26,7 +27,7 @@
# include <wchar.h>
#elif __APPLE__
// wtf? Darwin puts mbtowc() et al. in stdlib
-# include <stdlib.h>
+# include <cstdlib>
#else
// platform apparently has no wchar_t support. provide dummy
// implementations. hopefully at least the C++ compiler has
diff -Naupr synergy-1.3.1.orig/lib/arch/XArchUnix.cpp synergy-1.3.1/lib/arch/XArchUnix.cpp
--- synergy-1.3.1.orig/lib/arch/XArchUnix.cpp 2005-04-24 05:02:13.000000000 +0200
+++ synergy-1.3.1/lib/arch/XArchUnix.cpp 2008-02-24 01:29:33.000000000 +0100
@@ -13,7 +13,7 @@
*/
#include "XArchUnix.h"
-#include <string.h>
+#include <cstring>
//
// XArchEvalUnix
diff -Naupr synergy-1.3.1.orig/lib/base/CStringUtil.cpp synergy-1.3.1/lib/base/CStringUtil.cpp
--- synergy-1.3.1.orig/lib/base/CStringUtil.cpp 2005-12-14 18:25:20.000000000 +0100
+++ synergy-1.3.1/lib/base/CStringUtil.cpp 2008-02-24 01:01:34.000000000 +0100
@@ -19,6 +19,7 @@
#include <cctype>
#include <cstdio>
#include <cstdlib>
+#include <cstring>
#include <algorithm>
//
diff -Naupr synergy-1.3.1.orig/lib/base/CUnicode.cpp synergy-1.3.1/lib/base/CUnicode.cpp
--- synergy-1.3.1.orig/lib/base/CUnicode.cpp 2005-04-24 05:02:13.000000000 +0200
+++ synergy-1.3.1/lib/base/CUnicode.cpp 2008-02-24 01:29:21.000000000 +0100
@@ -14,7 +14,7 @@
#include "CUnicode.h"
#include "CArch.h"
-#include <string.h>
+#include <cstring>
//
// local utility functions
diff -Naupr synergy-1.3.1.orig/lib/client/CClient.cpp synergy-1.3.1/lib/client/CClient.cpp
--- synergy-1.3.1.orig/lib/client/CClient.cpp 2006-03-09 05:07:17.000000000 +0100
+++ synergy-1.3.1/lib/client/CClient.cpp 2008-02-24 01:21:56.000000000 +0100
@@ -26,6 +26,8 @@
#include "CLog.h"
#include "IEventQueue.h"
#include "TMethodEventJob.h"
+#include <cstring>
+#include <cstdlib>
//
// CClient
diff -Naupr synergy-1.3.1.orig/lib/client/CServerProxy.cpp synergy-1.3.1/lib/client/CServerProxy.cpp
--- synergy-1.3.1.orig/lib/client/CServerProxy.cpp 2006-04-02 03:47:03.000000000 +0200
+++ synergy-1.3.1/lib/client/CServerProxy.cpp 2008-02-24 01:21:28.000000000 +0100
@@ -24,6 +24,7 @@
#include "TMethodEventJob.h"
#include "XBase.h"
#include <memory>
+#include <cstring>
//
// CServerProxy
diff -Naupr synergy-1.3.1.orig/lib/net/CTCPSocket.cpp synergy-1.3.1/lib/net/CTCPSocket.cpp
--- synergy-1.3.1.orig/lib/net/CTCPSocket.cpp 2006-04-02 03:47:03.000000000 +0200
+++ synergy-1.3.1/lib/net/CTCPSocket.cpp 2008-02-24 01:11:17.000000000 +0100
@@ -23,7 +23,9 @@
#include "IEventJob.h"
#include "CArch.h"
#include "XArch.h"
-#include <string.h>
+#include <cstring>
+#include <cstdlib>
+#include <memory>
//
// CTCPSocket
diff -Naupr synergy-1.3.1.orig/lib/platform/CXWindowsScreen.cpp synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
--- synergy-1.3.1.orig/lib/platform/CXWindowsScreen.cpp 2006-04-02 21:16:39.000000000 +0200
+++ synergy-1.3.1/lib/platform/CXWindowsScreen.cpp 2008-02-24 01:19:13.000000000 +0100
@@ -27,6 +27,7 @@
#include "IEventQueue.h"
#include "TMethodEventJob.h"
#include <cstring>
+#include <cstdlib>
#if X_DISPLAY_MISSING
# error X11 is required to build synergy
#else
diff -Naupr synergy-1.3.1.orig/lib/server/CClientProxy1_3.cpp synergy-1.3.1/lib/server/CClientProxy1_3.cpp
--- synergy-1.3.1.orig/lib/server/CClientProxy1_3.cpp 2006-02-12 20:53:43.000000000 +0100
+++ synergy-1.3.1/lib/server/CClientProxy1_3.cpp 2008-02-24 01:27:30.000000000 +0100
@@ -17,6 +17,8 @@
#include "CLog.h"
#include "IEventQueue.h"
#include "TMethodEventJob.h"
+#include <cstring>
+#include <memory>
//
// CClientProxy1_3
diff -Naupr synergy-1.3.1.orig/lib/server/CConfig.cpp synergy-1.3.1/lib/server/CConfig.cpp
--- synergy-1.3.1.orig/lib/server/CConfig.cpp 2006-03-22 06:40:27.000000000 +0100
+++ synergy-1.3.1/lib/server/CConfig.cpp 2008-02-24 01:31:48.000000000 +0100
@@ -19,7 +19,7 @@
#include "XSocket.h"
#include "stdistream.h"
#include "stdostream.h"
-#include <stdlib.h>
+#include <cstdlib>
//
// CConfig
diff -Naupr synergy-1.3.1.orig/lib/server/CInputFilter.cpp synergy-1.3.1/lib/server/CInputFilter.cpp
--- synergy-1.3.1.orig/lib/server/CInputFilter.cpp 2006-04-02 03:47:03.000000000 +0200
+++ synergy-1.3.1/lib/server/CInputFilter.cpp 2008-02-24 01:29:05.000000000 +0100
@@ -19,8 +19,8 @@
#include "CEventQueue.h"
#include "CLog.h"
#include "TMethodEventJob.h"
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
// -----------------------------------------------------------------------------
// Input Filter Condition Classes
diff -Naupr synergy-1.3.1.orig/lib/server/CServer.cpp synergy-1.3.1/lib/server/CServer.cpp
--- synergy-1.3.1.orig/lib/server/CServer.cpp 2006-04-02 03:47:04.000000000 +0200
+++ synergy-1.3.1/lib/server/CServer.cpp 2008-02-24 01:25:14.000000000 +0100
@@ -28,7 +28,8 @@
#include "CLog.h"
#include "TMethodEventJob.h"
#include "CArch.h"
-#include <string.h>
+#include <cstring>
+#include <cstdlib>
//
// CServer
diff -Naupr synergy-1.3.1.orig/lib/synergy/CKeyMap.cpp synergy-1.3.1/lib/synergy/CKeyMap.cpp
--- synergy-1.3.1.orig/lib/synergy/CKeyMap.cpp 2006-03-22 06:40:27.000000000 +0100
+++ synergy-1.3.1/lib/synergy/CKeyMap.cpp 2008-02-24 01:32:13.000000000 +0100
@@ -16,8 +16,8 @@
#include "KeyTypes.h"
#include "CLog.h"
#include <assert.h>
-#include <ctype.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cstdlib>
CKeyMap::CNameToKeyMap* CKeyMap::s_nameToKeyMap = NULL;
CKeyMap::CNameToModifierMap* CKeyMap::s_nameToModifierMap = NULL;
diff -Naupr synergy-1.3.1.orig/lib/synergy/CKeyState.cpp synergy-1.3.1/lib/synergy/CKeyState.cpp
--- synergy-1.3.1.orig/lib/synergy/CKeyState.cpp 2006-04-01 22:53:08.000000000 +0200
+++ synergy-1.3.1/lib/synergy/CKeyState.cpp 2008-02-24 01:28:45.000000000 +0100
@@ -15,7 +15,7 @@
#include "CKeyState.h"
#include "IEventQueue.h"
#include "CLog.h"
-#include <string.h>
+#include <cstring>
#include <algorithm>
static const KeyButton kButtonMask = (KeyButton)(IKeyState::kNumButtons - 1);
diff -Naupr synergy-1.3.1.orig/lib/synergy/CPacketStreamFilter.cpp synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp
--- synergy-1.3.1.orig/lib/synergy/CPacketStreamFilter.cpp 2005-04-24 05:02:16.000000000 +0200
+++ synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp 2008-02-24 01:13:48.000000000 +0100
@@ -16,6 +16,8 @@
#include "IEventQueue.h"
#include "CLock.h"
#include "TMethodEventJob.h"
+#include <cstring>
+#include <memory>
//
// CPacketStreamFilter
diff -Naupr synergy-1.3.1.orig/lib/synergy/IKeyState.cpp synergy-1.3.1/lib/synergy/IKeyState.cpp
--- synergy-1.3.1.orig/lib/synergy/IKeyState.cpp 2006-03-22 06:40:27.000000000 +0100
+++ synergy-1.3.1/lib/synergy/IKeyState.cpp 2008-02-24 01:15:42.000000000 +0100
@@ -13,7 +13,8 @@
*/
#include "IKeyState.h"
-#include <string.h>
+#include <cstring>
+#include <cstdlib>
//
// IKeyState
diff -Naupr synergy-1.3.1.orig/lib/synergy/IPrimaryScreen.cpp synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp
--- synergy-1.3.1.orig/lib/synergy/IPrimaryScreen.cpp 2006-03-22 06:40:27.000000000 +0100
+++ synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp 2008-02-24 01:16:42.000000000 +0100
@@ -13,6 +13,7 @@
*/
#include "IPrimaryScreen.h"
+#include <cstdlib>
//
// IPrimaryScreen
Index: synergy.spec
===================================================================
RCS file: /cvs/extras/rpms/synergy/EL-4/synergy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- synergy.spec 4 May 2006 08:48:56 -0000 1.9
+++ synergy.spec 24 Apr 2008 11:47:25 -0000 1.10
@@ -1,21 +1,20 @@
Summary: Mouse and keyboard sharing utility
Name: synergy
Version: 1.3.1
-Release: 1%{?dist}
-License: GPL
+Release: 7%{?dist}
+License: GPLv2
Group: System Environment/Daemons
URL: http://synergy2.sourceforge.net/
-Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz
-Patch: synergy-1.2.2-werror.patch
+Source: http://downloads.sf.net/synergy2/synergy-%{version}.tar.gz
+Patch0: synergy-1.2.2-werror.patch
+Patch1: synergy-1.3.1-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: autoconf, automake
-# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
-%if %{!?fedora:5}%{?fedora} >= 5
-BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel
-BuildRequires: libXinerama-devel
-%else
+# For EL-4 we don't have modular Xorg
+#BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel
+#BuildRequires: libXinerama-devel
BuildRequires: xorg-x11-devel
-%endif
+# Required by autoreconf
+BuildRequires: autoconf, automake
%description
Synergy lets you easily share a single mouse and keyboard between
@@ -26,8 +25,9 @@
%prep
-%setup
-%patch -p1 -b .werror
+%setup -q
+%patch0 -p1 -b .werror
+%patch1 -p1 -b .gcc43
autoreconf
@@ -38,7 +38,7 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
%clean
@@ -46,7 +46,7 @@
%files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING doc/PORTING NEWS README
%doc doc/*.css doc/*.html
%doc examples/synergy.conf
@@ -55,6 +55,26 @@
%changelog
+* Sun Feb 24 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-7
+- Include patch to fix build failure with gcc 4.3 (#434460).
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> 1.3.1-6
+- Autorebuild for GCC 4.3
+
+* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.3.1-5
+- Rebuild for new BuildID feature.
+
+* Fri Aug 3 2007 Matthias Saou <http://freshrpms.net/> 1.3.1-4
+- Update License field (GPLv2 only, no "or any later version").
+
+* Tue Jun 19 2007 Matthias Saou <http://freshrpms.net/> 1.3.1-3
+- Change to using the DESTDIR install mathod.
+- Drop X build requires conditional.
+- Switch to using a downloads.sf.net source URL.
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.3.1-2
+- FC6 rebuild.
+
* Thu May 4 2006 Matthias Saou <http://freshrpms.net/> 1.3.1-1
- Update to 1.3.1.
- Run full autoreconf instead of just autoconf since 1.6 is required otherwise.
More information about the scm-commits
mailing list