rpms/obby/devel obby-0.4.0rc2-gcc41.patch, 1.1, 1.2 obby.spec, 1.18, 1.19
Paul Nasrat (pnasrat)
fedora-extras-commits at redhat.com
Wed Jul 12 19:15:19 UTC 2006
Author: pnasrat
Update of /cvs/extras/rpms/obby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25864
Modified Files:
obby-0.4.0rc2-gcc41.patch obby.spec
Log Message:
Update patch
obby-0.4.0rc2-gcc41.patch:
Index: obby-0.4.0rc2-gcc41.patch
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/obby-0.4.0rc2-gcc41.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- obby-0.4.0rc2-gcc41.patch 12 Jul 2006 18:27:55 -0000 1.1
+++ obby-0.4.0rc2-gcc41.patch 12 Jul 2006 19:15:19 -0000 1.2
@@ -1,57 +1,50 @@
--- obby-0.4.0rc2/inc/server_buffer.hpp.gcc41 2006-05-18 13:29:01.000000000 -0400
-+++ obby-0.4.0rc2/inc/server_buffer.hpp 2006-07-12 14:21:15.000000000 -0400
-@@ -485,7 +485,7 @@
- if(m_enable_keepalives == enable) return;
-
- m_enable_keepalives = enable;
-- user_table& table = basic_buffer<Document, Selector>::m_user_table;
-+ user_table& table = this->m_user_table;
-
- for(user_table::iterator iter =
- table.begin(user::flags::CONNECTED, user::flags::NONE);
-@@ -1076,7 +1076,7 @@
- on_command_emote(const user& from,
- const std::string& paramlist)
++++ obby-0.4.0rc2/inc/server_buffer.hpp 2006-07-12 15:04:20.000000000 -0400
+@@ -627,7 +627,7 @@
{
-- user_table& table = basic_buffer<Document, Selector>::m_user_table;
-+ user_table& table = this->m_user_table;
-
- net6::packet pack("obby_emote_message");
- pack << &from << paramlist;
-@@ -1112,7 +1112,7 @@
- void basic_server_buffer<Document, Selector>::session_close_impl()
- {
- // Session is closed, so all users have quit
-- user_table& table = basic_buffer<Document, Selector>::m_user_table;
-+ user_table& table = this->m_user_table;
-
- for(user_table::iterator iter =
- table.begin(user::flags::CONNECTED, user::flags::NONE);
---- obby-0.4.0rc2/inc/local_buffer.hpp.gcc41 2006-05-18 13:29:01.000000000 -0400
-+++ obby-0.4.0rc2/inc/local_buffer.hpp 2006-07-12 14:21:15.000000000 -0400
-@@ -151,7 +151,7 @@
- void basic_local_buffer<Document, Selector>::session_close_impl()
- {
- // Remove all users except for the local one
-- user_table& table = basic_buffer<Document, Selector>::m_user_table;
-+ user_table& table = this->m_user_table;
-
- for(user_table::iterator iter =
- table.begin(user::flags::CONNECTED, user::flags::NONE);
---- obby-0.4.0rc2/inc/host_buffer.hpp.gcc41 2006-05-18 13:29:01.000000000 -0400
-+++ obby-0.4.0rc2/inc/host_buffer.hpp 2006-07-12 14:21:15.000000000 -0400
-@@ -341,7 +341,7 @@
- template<typename Document, typename Selector>
- void basic_host_buffer<Document, Selector>::init_impl()
- {
-- user_table& table = basic_buffer<Document, Selector>::m_user_table;
-+ user_table& table = this->m_user_table;
- table.deserialised_event().connect(
- sigc::mem_fun(
- *this,
+ // Send our protocol version.
+ net6::packet welcome_pack("obby_welcome");
+- welcome_pack << basic_buffer<Document, Selector>::PROTOCOL_VERSION;
++ welcome_pack << PROTOCOL_VERSION;
+
+ net6_server().send(welcome_pack, user6);
+
+--- obby-0.4.0rc2/inc/client_buffer.hpp.gcc41 2006-05-18 13:29:01.000000000 -0400
++++ obby-0.4.0rc2/inc/client_buffer.hpp 2006-07-12 15:03:47.000000000 -0400
+@@ -819,8 +819,7 @@
+ unsigned long server_version =
+ pack.get_param(0).net6::parameter::as<unsigned long>();
+
+- if(server_version !=
+- basic_buffer<Document, Selector>::PROTOCOL_VERSION)
++ if(server_version != PROTOCOL_VERSION)
+ {
+ on_login_failed(login::ERROR_PROTOCOL_VERSION_MISMATCH);
+ return;
--- obby-0.4.0rc2/inc/buffer.hpp.gcc41 2006-05-18 13:29:01.000000000 -0400
-+++ obby-0.4.0rc2/inc/buffer.hpp 2006-07-12 14:21:15.000000000 -0400
-@@ -270,9 +270,6 @@
++++ obby-0.4.0rc2/inc/buffer.hpp 2006-07-12 15:02:59.000000000 -0400
+@@ -36,6 +36,10 @@
+ namespace obby
+ {
+
++/** Current obby protocol version.
++ */
++extern const unsigned long PROTOCOL_VERSION;
++
+ /** Abstract base class for obby buffers. A buffer contains multiple documents
+ * that are synchronised through many users and a user list.
+ */
+@@ -210,9 +214,6 @@
+ */
+ signal_document_remove_type document_remove_event() const;
+
+- /** Current obby protocol version.
+- */
+- static const unsigned long PROTOCOL_VERSION;
+ protected:
+ /** Internal function to add a document to the buffer.
+ */
+@@ -270,9 +271,6 @@
typedef basic_buffer<obby::document, net6::selector> buffer;
template<typename Document, typename Selector>
@@ -62,16 +55,15 @@
m_chat(*this, 0xff),
m_doc_counter(0), m_package(obby_package(), obby_localedir())
--- obby-0.4.0rc2/src/buffer.cpp.gcc41 2006-05-18 13:29:00.000000000 -0400
-+++ obby-0.4.0rc2/src/buffer.cpp 2006-07-12 14:21:15.000000000 -0400
-@@ -17,3 +17,11 @@
++++ obby-0.4.0rc2/src/buffer.cpp 2006-07-12 15:02:12.000000000 -0400
+@@ -17,3 +17,10 @@
*/
#include "buffer.hpp"
+
+namespace obby {
+
-+template<typename Document, typename Selector>
-+const unsigned long basic_buffer<Document, Selector>::PROTOCOL_VERSION = 8ul;
++const unsigned long PROTOCOL_VERSION = 8ul;
+
+} // namespace obby
+
Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/obby.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- obby.spec 12 Jul 2006 18:27:55 -0000 1.18
+++ obby.spec 12 Jul 2006 19:15:19 -0000 1.19
@@ -2,7 +2,7 @@
Name: obby
Version: 0.4.0
-Release: 4.%{_rc}%{?dist}
+Release: 5.%{_rc}%{?dist}
Summary: A library which provides synced document buffers
Group: Development/Libraries
@@ -69,6 +69,9 @@
%changelog
+* Wed Jul 12 2006 Paul Nasrat <pnasrat at redhat.com> - 0.4.0-5.rc2
+- Modify GCC 4.1 patch so that Gobby will build
+
* Wed Jul 12 2006 Paul Nasrat <pnasrat at redhat.com> - 0.4.0-4.rc2
- GCC 4.1 fixes from Debian Experimental package
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=375193
More information about the fedora-extras-commits
mailing list