rpms/kadu/F-11 kadu-gcc44.patch,NONE,1.1 kadu.spec,1.43,1.44
Miloš Jakubíček
mjakubicek at fedoraproject.org
Fri Apr 24 07:20:02 UTC 2009
Author: mjakubicek
Update of /cvs/pkgs/rpms/kadu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16849/F-11
Modified Files:
kadu.spec
Added Files:
kadu-gcc44.patch
Log Message:
- Fix FTBFS: added kadu-gcc44.patch
kadu-gcc44.patch:
--- NEW FILE kadu-gcc44.patch ---
--- kadu-core/protocol.h.orig 2009-04-24 00:46:53.000000000 +0200
+++ kadu-core/protocol.h 2009-04-24 00:47:48.000000000 +0200
@@ -14,6 +14,7 @@
#include "status.h"
#include "usergroup.h"
+#include <stdint.h>
typedef uint32_t UinType;
--- kadu-core/userbox.h.orig 2009-04-24 00:47:07.000000000 +0200
+++ kadu-core/userbox.h 2009-04-24 00:48:02.000000000 +0200
@@ -20,6 +20,7 @@
#include "userlist.h"
#include "exports.h"
+#include <stdint.h>
class QFontMetrics;
--- kadu-core/action.h.orig 2009-04-24 09:00:08.000000000 +0200
+++ kadu-core/action.h 2009-04-24 09:01:08.000000000 +0200
@@ -91,7 +91,7 @@
ActionType Type;
QString Name;
QObject *Object;
- char *Slot;
+ const char *Slot;
QString IconName;
QString Text;
QString CheckedText;
@@ -107,7 +107,7 @@
virtual void configurationUpdated();
public:
- ActionDescription(ActionType Type, const QString &Name, QObject *Object, char *Slot,
+ ActionDescription(ActionType Type, const QString &Name, QObject *Object, const char *Slot,
const QString &IconName, const QString &Text, bool Checkable = false, const QString &CheckedText = "", ActionBoolCallback enableCallback = 0);
virtual ~ActionDescription();
--- kadu-core/action.cpp.orig 2009-04-24 09:00:13.000000000 +0200
+++ kadu-core/action.cpp 2009-04-24 09:01:15.000000000 +0200
@@ -115,7 +115,7 @@
setIcon(icons_manager->loadIcon(Description->IconName));
}
-ActionDescription::ActionDescription(ActionType Type, const QString &Name, QObject *Object, char *Slot,
+ActionDescription::ActionDescription(ActionType Type, const QString &Name, QObject *Object, const char *Slot,
const QString &IconName, const QString &Text, bool Checkable, const QString &CheckedText, ActionBoolCallback enableCallback)
: ShortcutItem(""), ShortcutContext(Qt::WidgetShortcut)
{
Index: kadu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kadu/F-11/kadu.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kadu.spec 25 Feb 2009 10:06:06 -0000 1.43
+++ kadu.spec 24 Apr 2009 07:19:32 -0000 1.44
@@ -107,7 +107,7 @@
Name: kadu_opt
%endif
Version: 0.6.5
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: An Gadu-Gadu client for online messaging
Summary(pl): Klient Gadu-Gadu
Group: Applications/Internet
@@ -156,6 +156,8 @@
#Patch0: kadu-0.6.0-xmmsfix.patch
Patch0: kadu-0.6.5-voice-external-libgsm.patch
+Patch1: kadu-gcc44.patch
+# Sent to kadu-security [AT]Â kadu [DOT] net on 2009/04/24
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
BuildRequires: libpng-devel libsndfile-devel openssl-devel
@@ -502,10 +504,11 @@
#echo 'install (FILES "data/mediaplayer.png" DESTINATION "share/kadu/modules/data/mediaplayer")' >> modules/mediaplayer/CMakeLists.txt
%patch0
+%patch1
%build
%{cmake} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_USE_PTHREADS:BOOL=ON -DBUILD_DESCRIPTION="Fedora" .
-make VERBOSE=1 %{?_smp_mflags}
+make -k VERBOSE=1 %{?_smp_mflags}
%install
@@ -678,6 +681,9 @@
%changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.6.5-10
+- Fix FTBFS: added kadu-gcc44.patch
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the scm-commits
mailing list