rpms/licq/F-11 licq-1.3.5-gcc44.patch,NONE,1.1 licq.spec,1.28,1.29
Miloš Jakubíček
mjakubicek at fedoraproject.org
Sat May 23 21:54:54 UTC 2009
Author: mjakubicek
Update of /cvs/pkgs/rpms/licq/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15572/F-11
Modified Files:
licq.spec
Added Files:
licq-1.3.5-gcc44.patch
Log Message:
- Fix FTBFS: added licq-1.3.5-gcc44.patch
- Do submit patches upstream!
licq-1.3.5-gcc44.patch:
--- NEW FILE licq-1.3.5-gcc44.patch ---
--- src/licq.cpp.orig 2009-04-26 12:02:05.000000000 +0200
+++ src/licq.cpp 2009-04-26 12:02:43.000000000 +0200
@@ -183,14 +183,14 @@
/*-----Helper functions for CLicq::UpgradeLicq-----------------------------*/
int SelectUserUtility(const struct dirent *d)
{
- char *pcDot = strrchr(d->d_name, '.');
+ const char *pcDot = strrchr(d->d_name, '.');
if (pcDot == NULL) return (0);
return (strcmp(pcDot, ".uin") == 0);
}
int SelectHistoryUtility(const struct dirent *d)
{
- char *pcDot = strchr(d->d_name, '.');
+ const char *pcDot = strchr(d->d_name, '.');
if (pcDot == NULL) return (0);
return (strcmp(pcDot, ".history") == 0 ||
strcmp(pcDot, ".history.removed") == 0);
--- src/icqpacket.cpp.orig 2009-04-26 12:18:07.000000000 +0200
+++ src/icqpacket.cpp 2009-04-26 12:18:21.000000000 +0200
@@ -5635,7 +5635,7 @@
}
// Remove path from filename (if it exists)
- char *pcEndOfPath = strrchr(_szFilename, '/');
+ const char *pcEndOfPath = strrchr(_szFilename, '/');
if (pcEndOfPath != NULL)
m_szFilename = strdup(pcEndOfPath + 1);
else
--- src/utility.cpp.orig 2009-04-26 12:18:48.000000000 +0200
+++ src/utility.cpp 2009-04-26 12:18:56.000000000 +0200
@@ -46,7 +46,7 @@
//=====CUtilityManager==========================================================
int SelectUtility(const struct dirent *d)
{
- char *pcDot = strrchr(d->d_name, '.');
+ const char *pcDot = strrchr(d->d_name, '.');
if (pcDot == NULL) return (0);
return (strcmp(pcDot, ".utility") == 0);
}
--- src/translate.cpp.orig 2009-04-26 12:19:24.000000000 +0200
+++ src/translate.cpp 2009-04-26 12:19:49.000000000 +0200
@@ -71,7 +71,7 @@
bool CTranslator::setTranslationMap(const char *_szMapFileName)
{
// Map name is the file name with no path
- char *szMapName = strrchr(_szMapFileName, '/');
+ const char *szMapName = strrchr(_szMapFileName, '/');
if (szMapName == NULL)
m_szMapName = strdup(_szMapFileName);
else
--- src/file.cpp.orig 2009-04-26 12:20:14.000000000 +0200
+++ src/file.cpp 2009-04-26 12:20:44.000000000 +0200
@@ -540,7 +540,7 @@
bool bTrim, int _nMax)
{
//static char s_szData[MAX_LINE_LEN];
- char *szPostEquals;
+ const char *szPostEquals;
char szData[MAX_LINE_LEN];
int nMax = (_nMax > 0 ? _nMax : MAX_LINE_LEN);
--- src/icqd-filetransfer.cpp.orig 2009-04-26 12:21:14.000000000 +0200
+++ src/icqd-filetransfer.cpp 2009-04-26 12:21:31.000000000 +0200
@@ -98,7 +98,7 @@
m_bValid = true;
m_nError = 0;
- char *pcNoPath = NULL;
+ const char *pcNoPath = NULL;
struct stat buf;
// Remove any path from the filename
--- src/rtf.ll.orig 2009-04-26 12:22:03.000000000 +0200
+++ src/rtf.ll 2009-04-26 12:22:28.000000000 +0200
@@ -541,7 +541,7 @@
return;
}
if (m_bFontName){
- char *pp = strchr(str, ';');
+ const char *pp = strchr(str, ';');
unsigned size = strlen(pp);
if (pp){
size = (pp - str);
--- src/rtf.cc.orig 2009-05-23 21:16:58.000000000 +0200
+++ src/rtf.cc 2009-05-23 21:18:48.000000000 +0200
@@ -2141,7 +2141,7 @@
return;
}
if (m_bFontName){
- char *pp = strchr(str, ';');
+ const char *pp = strchr(str, ';');
unsigned size = strlen(pp);
if (pp){
size = (pp - str);
--- plugins/msn/src/msn-sb.cpp.orig 2009-05-23 21:36:43.000000000 +0200
+++ plugins/msn/src/msn-sb.cpp 2009-05-23 21:37:37.000000000 +0200
@@ -428,7 +428,7 @@
const char *szParam = strServer.c_str();
char szServer[16];
char *szPort;
- if ((szPort = strchr(szParam, ':')))
+ if ((szPort = (char *) strchr(szParam, ':')))
{
strncpy(szServer, szParam, szPort - szParam);
szServer[szPort - szParam] = '\0';
@@ -491,7 +491,7 @@
const char *szParam = strServer.c_str();
char szServer[16];
char *szPort;
- if ((szPort = strchr(szParam, ':')))
+ if ((szPort = (char *) strchr(szParam, ':')))
{
strncpy(szServer, szParam, szPort - szParam);
szServer[szPort - szParam] = '\0';
--- plugins/msn/src/msn-srv.cpp.orig 2009-05-23 21:38:07.000000000 +0200
+++ plugins/msn/src/msn-srv.cpp 2009-05-23 21:40:11.000000000 +0200
@@ -76,7 +76,7 @@
const char *szParam = strServer.c_str();
char szNewServer[16];
char *szPort;
- if ((szPort = strchr(szParam, ':')))
+ if ((szPort = (char *) strchr(szParam, ':')))
{
strncpy(szNewServer, szParam, szPort - szParam);
szNewServer[szPort - szParam] = '\0';
--- plugins/msn/src/msn-ssl.cpp.orig 2009-05-23 21:35:25.000000000 +0200
+++ plugins/msn/src/msn-ssl.cpp 2009-05-23 21:56:07.000000000 +0200
@@ -68,7 +68,7 @@
if (strFirstLine == "HTTP/1.1 200 OK")
{
m_pSSLPacket->ParseHeaders();
- char *fromPP = strstr(m_pSSLPacket->GetValue("Authentication-Info").c_str(), "from-PP=");
+ const char *fromPP = strstr(m_pSSLPacket->GetValue("Authentication-Info").c_str(), "from-PP=");
char *tag;
if (fromPP == 0)
@@ -76,7 +76,7 @@
else
{
fromPP+= 9; // skip to the tag
- char *endTag = strchr(fromPP, '\'');
+ const char *endTag = strchr(fromPP, '\'');
tag = strndup(fromPP, endTag - fromPP); // Thanks, this is all we need
}
@@ -146,7 +146,7 @@
m_pNexusBuff->ParseHeaders();
- char *szLogin = strstr(m_pNexusBuff->GetValue("PassportURLs").c_str(), "DALogin=");
+ const char *szLogin = strstr(m_pNexusBuff->GetValue("PassportURLs").c_str(), "DALogin=");
szLogin += 8; // skip to the tag
//char *szEndURL = strchr(szLogin, '/');
//char *szServer = strndup(szLogin, szEndURL - szLogin); // this is all we need
Index: licq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/licq/F-11/licq.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- licq.spec 25 Feb 2009 20:18:04 -0000 1.28
+++ licq.spec 23 May 2009 21:54:23 -0000 1.29
@@ -1,6 +1,6 @@
Name: licq
Version: 1.3.5
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2+
Source0: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
Source1: http://prdownloads.sourceforge.net/icqnd/icqnd-0.1.9.6.tar.bz2
@@ -14,9 +14,12 @@ BuildRequires: openssl-devel
BuildRequires: desktop-file-utils
BuildRequires: libXScrnSaver-devel
BuildRequires: gettext, automake, libtool
+# Patches 0,1,3 submitted upstream: http://www.licq.org/ticket/1668
+# Patch 2 is an upstream patch.
Patch0: licq-1.3.5-gcc43.patch
Patch1: licq-1.3.5-dos.patch
Patch2: licq-1.3.5-logonfix.patch
+Patch3: licq-1.3.5-gcc44.patch
%package kde
Summary: Licq plugin for KDE
@@ -76,6 +79,7 @@ tar -C plugins -xjf %{SOURCE1}
%patch0 -p1 -b .gcc43.patch
%patch1 -p1 -b .dos
%patch2 -p1 -b .logonfix
+%patch3 -b .gcc44
#remove cvs stuff
rm -rf `find . -name CVS`
@@ -230,6 +234,10 @@ rm -rf $RPM_BUILD_ROOT
%doc plugins/auto-reply/{README,licq_autoreply.conf,examples}
%changelog
+* Sat May 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.3.5-7
+- Fix FTBFS: added licq-1.3.5-gcc44.patch
+- Do submit patches upstream!
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the fedora-extras-commits
mailing list