rev 12007 - kde-extras/kvirc/trunk/debian/patches

[Raúl Sánchez Siles]

Author: kebianizao-guest
Date: 2008-08-28 21:27:28 +0000 (Thu, 28 Aug 2008)
New Revision: 12007

Added:
   kde-extras/kvirc/trunk/debian/patches/50_rejoin-channels_r2094.patch
   kde-extras/kvirc/trunk/debian/patches/51_PERL_SYS_INIT3_r2271-bug495064.patch
Log:
Renumbered perl/hppa and rejoin channels patch.


Added: kde-extras/kvirc/trunk/debian/patches/50_rejoin-channels_r2094.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/50_rejoin-channels_r2094.patch	                        (rev 0)
+++ kde-extras/kvirc/trunk/debian/patches/50_rejoin-channels_r2094.patch	2008-08-28 21:27:28 UTC (rev 12007)
@@ -0,0 +1,11 @@
+Index: 3.4/src/kvilib/irc/kvi_ircserver.cpp
+===================================================================
+--- 3.4/src/kvilib/irc/kvi_ircserver.cpp (revision 1085)
++++ 3.4/src/kvilib/irc/kvi_ircserver.cpp (revision 2094)
+@@ -71,5 +71,5 @@
+ KviIrcServer::KviIrcServer(const KviIrcServer &serv)
+ {
+-	m_pReconnectInfo     = 0;
++	m_pReconnectInfo     = serv.m_pReconnectInfo;
+ 	m_szHostname         = serv.m_szHostname;
+ 	m_szIp               = serv.m_szIp;


Property changes on: kde-extras/kvirc/trunk/debian/patches/50_rejoin-channels_r2094.patch
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: kde-extras/kvirc/trunk/debian/patches/51_PERL_SYS_INIT3_r2271-bug495064.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/51_PERL_SYS_INIT3_r2271-bug495064.patch	                        (rev 0)
+++ kde-extras/kvirc/trunk/debian/patches/51_PERL_SYS_INIT3_r2271-bug495064.patch	2008-08-28 21:27:28 UTC (rev 12007)
@@ -0,0 +1,25 @@
+Index: 3.4/src/modules/perlcore/libkviperlcore.cpp
+===================================================================
+--- 3.4/src/modules/perlcore/libkviperlcore.cpp (revision 1085)
++++ 3.4/src/modules/perlcore/libkviperlcore.cpp (revision 2271)
+@@ -150,4 +150,8 @@
+ {
+ 	if(m_pInterpreter)done();
++	int daArgc = 4;
++	char * daArgs[] = { "yo", "-e", "0", "-w" };
++	char ** daEnv=NULL;
++	PERL_SYS_INIT3(&daArgc,(char ***)&daArgs,&daEnv);
+ 	m_pInterpreter = perl_alloc();
+ 	if(!m_pInterpreter)return false;
+@@ -155,5 +159,4 @@
+ 	PL_perl_destruct_level = 1;
+ 	perl_construct(m_pInterpreter);
+-	char * daArgs[] = { "yo", "-e", "0", "-w" };
+ 	perl_parse(m_pInterpreter,xs_init,4,daArgs,NULL);
+ 	QString szInitCode;
+@@ -200,4 +203,5 @@
+ 	perl_destruct(m_pInterpreter);
+ 	perl_free(m_pInterpreter);
++	PERL_SYS_TERM();
+ 	m_pInterpreter = 0;
+ }