rpms/kdenetwork/F-10 kdenetwork-4.2.0-kopete-view-history.patch, NONE, 1.1 kdenetwork-4.2.0-libv4l.patch, NONE, 1.1 kdenetwork.spec, 1.163, 1.164 sources, 1.68, 1.69
Lukas Tinkl
ltinkl at fedoraproject.org
Fri Feb 27 18:01:53 UTC 2009
- Previous message (by thread): rpms/museek+/devel .cvsignore, 1.4, 1.5 museek+.spec, 1.11, 1.12 sources, 1.7, 1.8
- Next message (by thread): rpms/kdenetwork/F-9 kdenetwork-4.2.0-kopete-view-history.patch, NONE, 1.1 kdenetwork-4.2.0-libv4l.patch, NONE, 1.1 kdenetwork.spec, 1.162, 1.163 sources, 1.62, 1.63
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ltinkl
Update of /cvs/extras/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1506/F-10
Modified Files:
kdenetwork.spec sources
Added Files:
kdenetwork-4.2.0-kopete-view-history.patch
kdenetwork-4.2.0-libv4l.patch
Log Message:
KDE 4.2.1
kdenetwork-4.2.0-kopete-view-history.patch:
--- NEW FILE kdenetwork-4.2.0-kopete-view-history.patch ---
diff -uNr kdenetwork-4.2.0/kopete/plugins/history/historychatui.rc kdenetwork-4.2.0-kopete-view-history/kopete/plugins/history/historychatui.rc
--- kdenetwork-4.2.0/kopete/plugins/history/historychatui.rc 2008-09-03 16:55:06.000000000 +0530
+++ kdenetwork-4.2.0-kopete-view-history/kopete/plugins/history/historychatui.rc 2009-02-21 16:14:21.364179805 +0530
@@ -1,8 +1,9 @@
<!DOCTYPE kpartgui>
-<kpartgui version="19" name="kopetechatwindow">
+<kpartgui version="21" name="kopetechatwindow">
<MenuBar>
<Menu name="tools" >
<text>&Tools</text>
+ <Action name="viewChatHistory" />
<Action name="historyPrevious" />
<Action name="historyNext" />
<Action name="historyLast" />
@@ -16,4 +17,8 @@
<Action name="historyQuote" />
</ToolBar>
+ <ToolBar name="chatToolBar" fullWidth="true">
+ <Action name="viewChatHistory" />
+ </ToolBar>
+
</kpartgui>
diff -uNr kdenetwork-4.2.0/kopete/plugins/history/historyguiclient.cpp kdenetwork-4.2.0-kopete-view-history/kopete/plugins/history/historyguiclient.cpp
--- kdenetwork-4.2.0/kopete/plugins/history/historyguiclient.cpp 2008-12-10 21:44:03.000000000 +0530
+++ kdenetwork-4.2.0-kopete-view-history/kopete/plugins/history/historyguiclient.cpp 2009-02-21 16:07:53.209181963 +0530
@@ -17,9 +17,11 @@
#include "historyguiclient.h"
#include "historylogger.h"
#include "historyconfig.h"
+#include "historydialog.h"
#include "historyplugin.h"
#include "kopetechatsession.h"
+#include "kopetechatsessionmanager.h"
#include "kopetecontact.h"
#include "kopeteview.h"
@@ -58,6 +60,10 @@
actionNext = KStandardAction::forward ( this, SLOT ( slotNext() ), this );
actionCollection()->addAction ( "historyNext", actionNext );
+ KAction *viewChatHistory = new KAction( KIcon("view-history"), i18n("View &History" ), this );
+ actionCollection()->addAction( "viewChatHistory", viewChatHistory );
+ connect(viewChatHistory, SIGNAL(triggered(bool)), this, SLOT(slotViewHistory()));
+
KAction *actionQuote = new KAction ( KIcon ( "go-last" ),i18n ( "Quote Last Message" ), this );
actionCollection()->addAction ( "historyQuote",actionQuote );
connect ( actionQuote,SIGNAL ( triggered ( bool ) ),this,SLOT ( slotQuote() ) );
@@ -153,4 +159,37 @@
m_manager->view()->setCurrentMessage ( msg );
}
+void HistoryGUIClient::slotViewHistory()
+{
+ // Original Code, but this any segfault if anything in this pipe is NULL - Tejas Dinkar
+ //Kopete::MetaContact *m = Kopete::ChatSessionManager::self()->activeView()->msgManager()->members().first()->metaContact();
+
+ //The same as above but with some checking
+ KopeteView::KopeteView *view= Kopete::ChatSessionManager::self()->activeView();
+ if (!view) {
+ kDebug()<<"Unable to Get Active View!";
+ return;
+ }
+
+ Kopete::ChatSession *session = view->msgManager();
+ if (!session) {
+ kDebug()<<"Unable to Get Active Session!";
+ return;
+ }
+
+ Kopete::Contact *contact = session->members().first();
+ if (!contact) {
+ kDebug()<<"Unable to get contact!";
+ return;
+ }
+
+ Kopete::MetaContact *m = contact->metaContact();
+
+ if(m)
+ {
+ HistoryDialog* dialog = new HistoryDialog(m);
+ dialog->setObjectName( QLatin1String("HistoryDialog") );
+ }
+}
+
#include "historyguiclient.moc"
diff -uNr kdenetwork-4.2.0/kopete/plugins/history/historyguiclient.h kdenetwork-4.2.0-kopete-view-history/kopete/plugins/history/historyguiclient.h
--- kdenetwork-4.2.0/kopete/plugins/history/historyguiclient.h 2008-02-13 21:16:06.000000000 +0530
+++ kdenetwork-4.2.0-kopete-view-history/kopete/plugins/history/historyguiclient.h 2009-02-21 16:09:45.449182229 +0530
@@ -41,6 +41,7 @@
void slotLast();
void slotNext();
void slotQuote();
+ void slotViewHistory();
private:
HistoryLogger *m_logger;
kdenetwork-4.2.0-libv4l.patch:
--- NEW FILE kdenetwork-4.2.0-libv4l.patch ---
diff -up kdenetwork-4.2.0/kopete/libkopete/avdevice/CMakeLists.txt.libv4l kdenetwork-4.2.0/kopete/libkopete/avdevice/CMakeLists.txt
--- kdenetwork-4.2.0/kopete/libkopete/avdevice/CMakeLists.txt.libv4l 2009-01-26 16:03:03.000000000 +0100
+++ kdenetwork-4.2.0/kopete/libkopete/avdevice/CMakeLists.txt 2009-01-26 16:02:26.000000000 +0100
@@ -18,7 +18,7 @@ set(kopete_videodevice_LIB_SRCS
kde4_add_library(kopete_videodevice SHARED ${kopete_videodevice_LIB_SRCS})
-target_link_libraries(kopete_videodevice ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS})
+target_link_libraries(kopete_videodevice ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} -lv4l2)
set_target_properties(kopete_videodevice PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kopete_videodevice ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -up kdenetwork-4.2.0/kopete/libkopete/avdevice/videodevice.cpp.libv4l kdenetwork-4.2.0/kopete/libkopete/avdevice/videodevice.cpp
--- kdenetwork-4.2.0/kopete/libkopete/avdevice/videodevice.cpp.libv4l 2009-01-01 17:27:59.000000000 +0100
+++ kdenetwork-4.2.0/kopete/libkopete/avdevice/videodevice.cpp 2009-01-26 16:47:23.000000000 +0100
@@ -147,7 +147,7 @@ int VideoDevice::xioctl(int request, voi
{
int r;
- do r = ioctl (descriptor, request, arg);
+ do r = v4l2_ioctl (descriptor, request, arg);
while (-1 == r && EINTR == errno);
return r;
}
@@ -185,7 +185,7 @@ int VideoDevice::open()
kDebug() << "Device is already open";
return EXIT_SUCCESS;
}
- descriptor = ::open (QFile::encodeName(full_filename), O_RDWR, 0);
+ descriptor = ::v4l2_open (QFile::encodeName(full_filename), O_RDWR, 0);
if(isOpen())
{
kDebug() << "File " << full_filename << " was opened successfuly";
@@ -988,7 +988,7 @@ int VideoDevice::getFrame()
if (m_currentbuffer.data.isEmpty())
return EXIT_FAILURE;
- bytesread = read (descriptor, &m_currentbuffer.data[0], m_currentbuffer.data.size());
+ bytesread = v4l2_read (descriptor, &m_currentbuffer.data[0], m_currentbuffer.data.size());
if (-1 == bytesread) // must verify this point with ov511 driver.
{
kDebug() << "IO_METHOD_READ failed.";
@@ -1434,7 +1434,7 @@ int VideoDevice::stopCapturing()
unsigned int loop;
for (loop = 0; loop < m_streambuffers; ++loop)
{
- if (munmap(m_rawbuffers[loop].start,m_rawbuffers[loop].length) != 0)
+ if (v4l2_munmap(m_rawbuffers[loop].start,m_rawbuffers[loop].length) != 0)
{
kDebug() << "unable to munmap.";
}
@@ -1462,7 +1462,7 @@ int VideoDevice::close()
{
kDebug() << " Device is open. Trying to properly shutdown the device.";
stopCapturing();
- int ret = ::close(descriptor);
+ int ret = ::v4l2_close(descriptor);
kDebug() << "::close() returns " << ret;
}
descriptor = -1;
@@ -2749,7 +2749,7 @@ int VideoDevice::initMmap()
return errnoReturn ("VIDIOC_QUERYBUF");
m_rawbuffers[m_streambuffers].length = v4l2buffer.length;
- m_rawbuffers[m_streambuffers].start = (uchar *) mmap (NULL /* start anywhere */, v4l2buffer.length, PROT_READ | PROT_WRITE /* required */, MAP_SHARED /* recommended */, descriptor, v4l2buffer.m.offset);
+ m_rawbuffers[m_streambuffers].start = (uchar *) v4l2_mmap (NULL /* start anywhere */, v4l2buffer.length, PROT_READ | PROT_WRITE /* required */, MAP_SHARED /* recommended */, descriptor, v4l2buffer.m.offset);
if (MAP_FAILED == m_rawbuffers[m_streambuffers].start)
return errnoReturn ("mmap");
diff -up kdenetwork-4.2.0/kopete/libkopete/avdevice/videodevice.h.libv4l kdenetwork-4.2.0/kopete/libkopete/avdevice/videodevice.h
--- kdenetwork-4.2.0/kopete/libkopete/avdevice/videodevice.h.libv4l 2009-01-06 18:27:30.000000000 +0100
+++ kdenetwork-4.2.0/kopete/libkopete/avdevice/videodevice.h 2009-01-26 16:05:53.000000000 +0100
@@ -31,6 +31,8 @@
#include <unistd.h>
#include <signal.h>
+#include <libv4l2.h>
+
#if defined(__linux__) && defined(ENABLE_AV)
#include <asm/types.h>
Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- kdenetwork.spec 26 Jan 2009 14:45:45 -0000 1.163
+++ kdenetwork.spec 27 Feb 2009 18:01:22 -0000 1.164
@@ -1,18 +1,21 @@
Summary: K Desktop Environment - Network Applications
Name: kdenetwork
Epoch: 7
-Version: 4.2.0
-Release: 2%{?dist}
+Version: 4.2.1
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.kde.org
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Patch0: kdenetwork-4.2.0-handle-enc-message.patch
+Patch1: kdenetwork-4.2.0-libv4l.patch
# build Kopete against the system libgadu (backported from 4.3)
# http://websvn.kde.org/?view=rev&revision=909144
# http://websvn.kde.org/?view=rev&revision=909145
Patch100: kdenetwork-4.1.96-system-libgadu.patch
+Patch104: kdenetwork-4.2.0-kopete-view-history.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: avahi-compat-libdns_sd-devel
@@ -40,6 +43,7 @@
BuildRequires: soprano-devel >= 2.0.97
BuildRequires: speex-devel
BuildRequires: sqlite-devel
+BuildRequires: libv4l-devel
# FIXME/TODO: libnxcl-devel
# FIXME/TODO: are there other explicit Requires?
@@ -89,7 +93,10 @@
%prep
%setup -q
%patch0 -p1 -b .handle-enc-message
+%patch1 -p1 -b .libv4l
%patch100 -p0 -b .system-libgadu
+%patch104 -p1 -b .kopete-view-history
+
rm -rf kopete/protocols/gadu/libgadu/
%build
@@ -164,6 +171,30 @@
%changelog
+* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+- 4.2.1
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Feb 21 2009 Tejas Dinkar <tejas at gja.in> - 4.2.0-8
+- Added patch to add View History to Kopete (backport from trunk)
+
+* Tue Feb 17 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 7:4.2.0-7
+- Make GCC 4.4 happy (patch)
+
+* Tue Feb 17 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 7:4.2.0-6
+- adjust patch level
+
+* Tue Feb 17 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 7:4.2.0-5
+- KPPP Crash fix backported patch (KDE BZ: #176645 - BZ: #485890)
+
+* Fri Feb 06 2009 Than Ngo <than at redhat.com> - 4.2.0-4
+- fix yahoo protocol to show contact list correctly
+
+* Wed Feb 04 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-3
+- port kopete video to libv4l (#475623)
+
* Mon Jan 26 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-2
- fix kopete jabber protocol encrypted messages handling (#473412)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources 24 Jan 2009 05:58:56 -0000 1.68
+++ sources 27 Feb 2009 18:01:22 -0000 1.69
@@ -1 +1 @@
-0ea1628e11d398fdf45276a35edd3cae kdenetwork-4.2.0.tar.bz2
+17ba9800af0bfcf20a49337624f9946a kdenetwork-4.2.1.tar.bz2
- Previous message (by thread): rpms/museek+/devel .cvsignore, 1.4, 1.5 museek+.spec, 1.11, 1.12 sources, 1.7, 1.8
- Next message (by thread): rpms/kdenetwork/F-9 kdenetwork-4.2.0-kopete-view-history.patch, NONE, 1.1 kdenetwork-4.2.0-libv4l.patch, NONE, 1.1 kdenetwork.spec, 1.162, 1.163 sources, 1.62, 1.63
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list