rpms/jabbin/devel jabbin-2.0beta2a-compilation-flags.patch, NONE, 1.1 jabbin-2.0beta2a-gcc43.patch, NONE, 1.1 jabbin-2.0beta2a-use-external.patch, NONE, 1.1 jabbin-fix_x86_64_build.patch, NONE, 1.1 jabbin.desktop, NONE, 1.1 jabbin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Krzysztof Kurzawski (kurzawa)
fedora-extras-commits at redhat.com
Sun Feb 10 21:41:10 UTC 2008
Author: kurzawa
Update of /cvs/pkgs/rpms/jabbin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15615/devel
Modified Files:
.cvsignore sources
Added Files:
jabbin-2.0beta2a-compilation-flags.patch
jabbin-2.0beta2a-gcc43.patch
jabbin-2.0beta2a-use-external.patch
jabbin-fix_x86_64_build.patch jabbin.desktop jabbin.spec
Log Message:
import jabbin 2.0beta2a
jabbin-2.0beta2a-compilation-flags.patch:
--- NEW FILE jabbin-2.0beta2a-compilation-flags.patch ---
--- jabbin-2.0beta2a/3party/jrtplib/jrtplib.pro.debug 2006-08-10 19:09:46.000000000 +0900
+++ jabbin-2.0beta2a/3party/jrtplib/jrtplib.pro 2008-02-10 22:51:34.000000000 +0900
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += staticlib debug
+CONFIG += staticlib
TARGET = jrtp
INCLUDEPATH += .
--- jabbin-2.0beta2a/3party/libjingle/libjingle.pro.debug 2006-08-10 19:09:44.000000000 +0900
+++ jabbin-2.0beta2a/3party/libjingle/libjingle.pro 2008-02-10 22:50:35.000000000 +0900
@@ -3,8 +3,6 @@
TARGET = jingle
win32:CONFIG += release
-unix:CONFIG += debug
-CONFIG += warn_off
unix:debug: QMAKE_CXXFLAGS += -O0 -g3
--- jabbin-2.0beta2a/src/src.pro.debug 2008-02-10 22:50:35.000000000 +0900
+++ jabbin-2.0beta2a/src/src.pro 2008-02-10 22:50:35.000000000 +0900
@@ -11,7 +11,7 @@
#DEFINES += GPG_DEBUG
#DEFINES += XMPP_DEBUG
-CONFIG += jingle debug
+CONFIG += jingle
INCLUDEPATH += ../3party/libjingle
LIBS += -L../3party/libjingle -ljingle
jabbin-2.0beta2a-gcc43.patch:
--- NEW FILE jabbin-2.0beta2a-gcc43.patch ---
diff -ur jabbin-2.0beta2a/3party/jrtplib/rtcpcompoundpacketbuilder.cpp jabbin-2.0beta2a.new/3party/jrtplib/rtcpcompoundpacketbuilder.cpp
--- jabbin-2.0beta2a/3party/jrtplib/rtcpcompoundpacketbuilder.cpp 2006-08-10 12:09:46.000000000 +0200
+++ jabbin-2.0beta2a.new/3party/jrtplib/rtcpcompoundpacketbuilder.cpp 2008-02-09 16:32:07.000000000 +0100
@@ -43,6 +43,7 @@
#endif // WIN32
#include "rtpdebug.h"
+#include <string.h>
RTCPCompoundPacketBuilder::RTCPCompoundPacketBuilder()
{
diff -ur jabbin-2.0beta2a/3party/jrtplib/rtppacket.cpp jabbin-2.0beta2a.new/3party/jrtplib/rtppacket.cpp
--- jabbin-2.0beta2a/3party/jrtplib/rtppacket.cpp 2006-08-10 12:09:46.000000000 +0200
+++ jabbin-2.0beta2a.new/3party/jrtplib/rtppacket.cpp 2008-02-09 16:32:31.000000000 +0100
@@ -46,6 +46,7 @@
#endif // RTPDEBUG
#include "rtpdebug.h"
+#include <string.h>
void RTPPacket::Clear()
{
diff -ur jabbin-2.0beta2a/3party/libjingle/talk/base/asynctcpsocket.cc jabbin-2.0beta2a.new/3party/libjingle/talk/base/asynctcpsocket.cc
--- jabbin-2.0beta2a/3party/libjingle/talk/base/asynctcpsocket.cc 2006-08-10 12:09:44.000000000 +0200
+++ jabbin-2.0beta2a.new/3party/libjingle/talk/base/asynctcpsocket.cc 2008-02-09 16:34:00.000000000 +0100
@@ -32,6 +32,7 @@
#include "talk/base/byteorder.h"
#include "talk/base/common.h"
#include "talk/base/logging.h"
+#include <cstring>
#if defined(_MSC_VER) && _MSC_VER < 1300
namespace std {
diff -ur jabbin-2.0beta2a/3party/libjingle/talk/base/bytebuffer.cc jabbin-2.0beta2a.new/3party/libjingle/talk/base/bytebuffer.cc
--- jabbin-2.0beta2a/3party/libjingle/talk/base/bytebuffer.cc 2006-08-10 12:09:44.000000000 +0200
+++ jabbin-2.0beta2a.new/3party/libjingle/talk/base/bytebuffer.cc 2008-02-09 16:34:29.000000000 +0100
@@ -30,6 +30,7 @@
#include "talk/base/byteorder.h"
#include <algorithm>
#include <cassert>
+#include <cstring>
#if defined(_MSC_VER) && _MSC_VER < 1300
namespace std {
diff -ur jabbin-2.0beta2a/3party/libjingle/talk/base/messagequeue.h jabbin-2.0beta2a.new/3party/libjingle/talk/base/messagequeue.h
--- jabbin-2.0beta2a/3party/libjingle/talk/base/messagequeue.h 2006-08-10 12:09:44.000000000 +0200
+++ jabbin-2.0beta2a.new/3party/libjingle/talk/base/messagequeue.h 2008-02-09 16:34:46.000000000 +0100
@@ -35,6 +35,7 @@
#include <vector>
#include <queue>
#include <algorithm>
+#include <cstring>
namespace cricket {
diff -ur jabbin-2.0beta2a/3party/libjingle/talk/base/physicalsocketserver.cc jabbin-2.0beta2a.new/3party/libjingle/talk/base/physicalsocketserver.cc
--- jabbin-2.0beta2a/3party/libjingle/talk/base/physicalsocketserver.cc 2006-08-10 12:09:44.000000000 +0200
+++ jabbin-2.0beta2a.new/3party/libjingle/talk/base/physicalsocketserver.cc 2008-02-09 16:38:28.000000000 +0100
@@ -30,6 +30,8 @@
#endif
#include <cassert>
+#include <cstring>
+#include <algorithm>
#ifdef POSIX
extern "C" {
diff -ur jabbin-2.0beta2a/3party/libjingle/talk/base/socketadapters.cc jabbin-2.0beta2a.new/3party/libjingle/talk/base/socketadapters.cc
--- jabbin-2.0beta2a/3party/libjingle/talk/base/socketadapters.cc 2006-08-10 12:09:44.000000000 +0200
+++ jabbin-2.0beta2a.new/3party/libjingle/talk/base/socketadapters.cc 2008-02-09 16:39:10.000000000 +0100
@@ -42,6 +42,7 @@
#endif
#include <cassert>
+#include <cstring>
#include "talk/base/base64.h"
#include "talk/base/basicdefs.h"
diff -ur jabbin-2.0beta2a/3party/libjingle/talk/p2p/base/stun.cc jabbin-2.0beta2a.new/3party/libjingle/talk/p2p/base/stun.cc
--- jabbin-2.0beta2a/3party/libjingle/talk/p2p/base/stun.cc 2006-08-10 12:09:42.000000000 +0200
+++ jabbin-2.0beta2a.new/3party/libjingle/talk/p2p/base/stun.cc 2008-02-09 16:40:23.000000000 +0100
@@ -29,6 +29,7 @@
#include "talk/p2p/base/stun.h"
#include <iostream>
#include <cassert>
+#include <cstring>
#if defined(_MSC_VER) && _MSC_VER < 1300
namespace std {
diff -ur jabbin-2.0beta2a/3party/libjingle/talk/xmpp/xmpppassword.h jabbin-2.0beta2a.new/3party/libjingle/talk/xmpp/xmpppassword.h
--- jabbin-2.0beta2a/3party/libjingle/talk/xmpp/xmpppassword.h 2006-08-10 12:09:44.000000000 +0200
+++ jabbin-2.0beta2a.new/3party/libjingle/talk/xmpp/xmpppassword.h 2008-02-09 16:39:47.000000000 +0100
@@ -30,6 +30,7 @@
#include "talk/base/linked_ptr.h"
#include "talk/base/scoped_ptr.h"
+#include <cstring>
namespace buzz {
diff -ur jabbin-2.0beta2a/src/calldlg.cpp jabbin-2.0beta2a.new/src/calldlg.cpp
--- jabbin-2.0beta2a/src/calldlg.cpp 2006-08-10 12:09:52.000000000 +0200
+++ jabbin-2.0beta2a.new/src/calldlg.cpp 2008-02-09 16:45:24.000000000 +0100
@@ -28,6 +28,7 @@
#include <qtoolbutton.h>
#include <qpushbutton.h>
#include <qsignalmapper.h>
+#include <stdlib.h> /* for abs() */
int call_dlg_mic_level = 100;
int call_dlg_dsp_level = 100;
jabbin-2.0beta2a-use-external.patch:
--- NEW FILE jabbin-2.0beta2a-use-external.patch ---
--- jabbin-2.0beta2a/src/src.pro.ext 2006-08-10 19:09:52.000000000 +0900
+++ jabbin-2.0beta2a/src/src.pro 2008-02-05 00:48:27.000000000 +0900
@@ -68,16 +68,17 @@
include(../psics.pri)
# qca
-DEFINES += QCA_STATIC
-QCA_PREFIX = ../3party/qca
-INCLUDEPATH += $$QCA_PREFIX
-HEADERS += $$QCA_PREFIX/qca.h $$QCA_PREFIX/qcaprovider.h
-SOURCES += $$QCA_PREFIX/qca.cpp $$QCA_PREFIX/qca-tls.cpp
-DEFINES += OSSL_097
+#DEFINES += QCA_STATIC
+#QCA_PREFIX = ../3party/qca
+#INCLUDEPATH += $$QCA_PREFIX
+#HEADERS += $$QCA_PREFIX/qca.h $$QCA_PREFIX/qcaprovider.h
+#SOURCES += $$QCA_PREFIX/qca.cpp $$QCA_PREFIX/qca-tls.cpp
+#DEFINES += OSSL_097
win32:{
INCLUDEPATH += C:\OpenSSL\include
LIBS += C:\OpenSSL\lib\VC\libeay32.lib C:\OpenSSL\lib\VC\ssleay32.lib
}
+LIBS += -lqca
# include Iris XMPP library
jabbin-fix_x86_64_build.patch:
--- NEW FILE jabbin-fix_x86_64_build.patch ---
--- jabbin-2.0beta2a/3party/jrtplib/rtprandom.cpp 2006-08-10 12:09:46.000000000 +0200
+++ jabbin-2.0beta2a.n/3party/jrtplib/rtprandom.cpp 2007-09-10 17:09:44.000000000 +0200
@@ -53,7 +53,7 @@
x = (u_int32_t)getpid();
x += (u_int32_t)time(0);
x -= (u_int32_t)clock();
- x ^= (u_int32_t)(this);
+ x ^= (u_int32_t)((u_int8_t *)this - (u_int8_t *)0);
#ifdef RTP_SUPPORT_GNUDRAND
srand48_r(x,&drandbuffer);
--- jabbin-2.0beta2a/voip/stun.cpp 2006-08-10 12:09:58.000000000 +0200
+++ jabbin-2.0beta2a.n/voip/stun.cpp 2007-09-10 17:15:17.000000000 +0200
@@ -673,12 +673,10 @@
asm("rdtsc" : "=A" (tick));
#elif defined (__SUNPRO_CC) || defined( __sparc__ )
tick = gethrtime();
-#elif defined(__MACH__)
+#else
int fd=open("/dev/random",O_RDONLY);
read(fd,&tick,sizeof(tick));
closesocket(fd);
-#else
-# error Need some way to seed the random number generator
#endif
int seed = int(tick);
#ifdef WIN32
--- jabbin-2.0beta2a/src/libpsi/psiwidgets/iconaction.cpp 2006-08-10 12:09:52.000000000 +0200
+++ jabbin-2.0beta2a.n/src/libpsi/psiwidgets/iconaction.cpp 2007-09-10 17:18:08.000000000 +0200
@@ -72,7 +72,7 @@
QMap<QPopupMenu *, int>::Iterator it = popups.begin();
for ( ; it != popups.end(); ++it ) {
- if ( (int)it.key() == (int)obj ) {
+ if ( (void *)it.key() == (void *)obj ) {
dirty = true;
popups.remove( it );
break;
--- NEW FILE jabbin.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Jabbin
GenericName=Jabbin
Comment=Instant messaging and VoIP Jabber client
Exec=jabbin
Icon=jabbin
Terminal=false
Type=Application
Categories=Network;
GenericName[pl_PL]=Jabbin
--- NEW FILE jabbin.spec ---
Summary: Instant messaging and VoIP Jabber client
Summary(pl): Komunikator i VoIP Jabber klient
Name: jabbin
Version: 2.0
Release: 0.6.beta2a%{?dist}
License: GPLv2+
Group: Applications/Communications
URL: http://jabbin.com/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}beta2a.tar.bz2
Source1: %{name}.desktop
Patch0: jabbin-fix_x86_64_build.patch
Patch1: jabbin-2.0beta2a-use-external.patch
Patch2: jabbin-2.0beta2a-gcc43.patch
Patch3: jabbin-2.0beta2a-compilation-flags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils qt-devel openssl-devel expat-devel speex-devel libXScrnSaver-devel qca-devel
Requires: hicolor-icon-theme
%description
Jabbin is a Instant messaging and VoIP Jabber client.
%description -l pl
Jabbin to komunikator i VoIP Jabber klient.
%prep
%setup -qn jabbin-2.0beta2a
%patch0 -p 1
%patch1 -p 1
%patch2 -p 1
%patch3 -p 1
sed -i 's/\r//' README
%build
qmake jabbin.pro
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/certs
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/sound
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/iconsets
install -m 755 -p src/jabbin $RPM_BUILD_ROOT%{_bindir}
install -m 644 -p certs/readme certs/rootcert.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/certs
# Copy iconsets
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/iconsets/emoticons
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/iconsets/roster/default
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/iconsets/system/default/clients
install -m 644 -p iconsets/emoticons/ikonboard-3.1.jisp $RPM_BUILD_ROOT%{_datadir}/%{name}/iconsets/emoticons/
install -m 644 -p iconsets/roster/readme $RPM_BUILD_ROOT%{_datadir}/%{name}/iconsets/roster/
install -m 644 -p iconsets/roster/default/{*.png,*.gif,*.xml} $RPM_BUILD_ROOT%{_datadir}/%{name}/iconsets/roster/default/
install -m 644 -p iconsets/system/readme $RPM_BUILD_ROOT%{_datadir}/%{name}/iconsets/system/
install -m 644 -p iconsets/system/default/{*.png,*.xml} $RPM_BUILD_ROOT%{_datadir}/%{name}/iconsets/system/default/
install -m 644 -p iconsets/system/default/clients/*.png $RPM_BUILD_ROOT%{_datadir}/%{name}/iconsets/system/default/clients/
install -m 644 -p sound/*wav $RPM_BUILD_ROOT%{_datadir}/%{name}/sound
# Copy icons
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -m 644 -p iconsets/system/default/icon_32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/jabbin.png
install -m 644 -p iconsets/system/default/icon_48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/jabbin.png
# Desktop file
desktop-file-install --vendor="fedora" \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%files
%defattr(-, root, root, -)
%doc CHANGES COPYING README
%{_bindir}/jabbin
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/32x32/apps/jabbin.png
%{_datadir}/icons/hicolor/48x48/apps/jabbin.png
%{_datadir}/applications/fedora-jabbin.desktop
%changelog
* Sun Feb 10 2008 Krzysztof Kurzawski <kurzawax at gmail.com> - 2.0-0.6.beta2a
- Fix license tag
- Add polish summary and description
* Sun Feb 10 2008 Krzysztof Kurzawski <kurzawax at gmail.com> - 2.0-0.5.beta2a
- Add jabbin-2.0beta2a-compilation-flags patch
- Correct install section
- Fix license tag
* Sun Feb 10 2008 Krzysztof Kurzawski <kurzawax at gmail.com> - 2.0-0.4.beta2a
- Add jabbin-2.0beta2a-gcc43 patch
* Tue Feb 05 2008 Krzysztof Kurzawski <kurzawax at gmail.com> - 2.0-0.3.beta2a
- Add jabbin-2.0beta2a-use-external patch
* Thu Dec 27 2007 Krzysztof Kurzawski <kurzawax at gmail.com> - 2.0-0.2.beta2a
- Correct version
* Thu Dec 20 2007 Krzysztof Kurzawski <kurzawax at gmail.com> - 2.0-1.beta2a
- First release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jabbin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 10 Feb 2008 20:19:01 -0000 1.1
+++ .cvsignore 10 Feb 2008 21:40:34 -0000 1.2
@@ -0,0 +1 @@
+jabbin-2.0beta2a.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 10 Feb 2008 20:19:01 -0000 1.1
+++ sources 10 Feb 2008 21:40:34 -0000 1.2
@@ -0,0 +1 @@
+b685999c6ba1f9c15eda2d69cc47361e jabbin-2.0beta2a.tar.bz2
More information about the fedora-extras-commits
mailing list