Hello community,
here is the log from the commit of package konversation for openSUSE:Factory
checked in at Tue Mar 31 14:44:49 CEST 2009.
--------
New Changes file:
--- /dev/null 2008-04-22 03:09:48.000000000 +0200
+++ konversation/kde4-konversation.changes 2009-03-31 14:43:55.386813000 +0200
@@ -0,0 +1,72 @@
+-------------------------------------------------------------------
+Mon Mar 30 14:36:04 CEST 2009 - dmueller@suse.de
+
+- add missing akonadi dependency
+
+-------------------------------------------------------------------
+Sun Mar 22 07:45:34 CET 2009 - beineri@opensuse.org
+
+- update to r942587
+ * binary renamed back from konvi to konversation
+
+-------------------------------------------------------------------
+Mon Mar 16 13:45:34 CET 2009 - dmueller@suse.de
+
+- update to r939650
+ * merged/renamed kde4-konversation to konversation
+
+-------------------------------------------------------------------
+Thu Mar 5 15:53:12 CET 2009 - wstephenson@suse.de
+
+- update to r935535
+
+-------------------------------------------------------------------
+Wed Feb 25 09:42:41 CET 2009 - stbinner@suse.de
+
+- update to r931365
+
+-------------------------------------------------------------------
+Wed Feb 18 13:55:00 CET 2009 - dmueller@suse.de
+
+- obsolete konversation on 11.2
+
+-------------------------------------------------------------------
+Tue Feb 17 20:06:56 CET 2009 - stbinner@suse.de
+
+- update to r927519
+
+-------------------------------------------------------------------
+Sat Feb 14 16:51:54 CET 2009 - stbinner@suse.de
+
+- update to r926039
+
+-------------------------------------------------------------------
+Sun Feb 8 13:19:17 CET 2009 - stbinner@suse.de
+
+- update to r923134
+
+-------------------------------------------------------------------
+Sat Feb 7 07:43:47 CET 2009 - stbinner@suse.de
+
+- update to r922461
+
+-------------------------------------------------------------------
+Fri Feb 6 09:56:44 CET 2009 - stbinner@suse.de
+
+- update to r922014
+
+-------------------------------------------------------------------
+Thu Feb 5 13:50:07 CET 2009 - stbinner@suse.de
+
+- update to r921671
+
+-------------------------------------------------------------------
+Wed Feb 4 20:46:42 CET 2009 - stbinner@suse.de
+
+- update to r921325
+
+-------------------------------------------------------------------
+Tue Feb 3 14:57:15 CET 2009 - stbinner@suse.de
+
+- initial package of r920614 svn snapshot
+
--- KDE/konversation/konversation.changes 2009-03-16 14:21:50.000000000 +0100
+++ konversation/konversation.changes 2009-03-30 14:36:16.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Mar 30 14:36:04 CEST 2009 - dmueller@suse.de
+
+- add missing akonadi dependency
+
+-------------------------------------------------------------------
+Sun Mar 22 07:45:34 CET 2009 - beineri@opensuse.org
+
+- update to r942587
+ * binary renamed back from konvi to konversation
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
kde4-konversation.changes
kde4-konversation-openSUSE_10.3.spec
kde4-konversation-openSUSE_11.0.spec
kde4-konversation-openSUSE_11.1.spec
pre_checkin.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde4-konversation-openSUSE_10.3.spec ++++++
#
# spec file for package kde4-konversation (Version 1.1.77.svn942587)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: kde4-konversation
BuildRequires: libkdepimlibs4-devel
Url: http://konversation.kde.org/
License: GPL v2 only; GPL v2 or later
Group: Productivity/Networking/IRC
Summary: A User-Friendly IRC Client for KDE
Version: 1.1.77.svn942587
Release: 1
# svn.kde.org/home/kde/branches/work/konvi-kde4
Source0: konvi-kde4.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_akonadi_requires
%kde4_pimlibs_requires
%if %suse_version > 1110
Provides: kde4-konversation = 1.1.76
Obsoletes: kde4-konversation <= 1.1.76
%endif
%description
Konversation is a user-friendly IRC client for KDE.
Authors:
--------
Dario Abatianni
Matthias Gierlings
Alex Zepeda
Stanislav Karchebny
Mickael Marchand
Peter Simonsson
Christian Muehlhaeuser
John Tapsell
Shintaro Matsuoka
İsmail D�nmez
Eike Hein
%prep
%setup -q -n konvi-kde4
%build
%cmake_kde4 -d build
%make_jobs
%install
pushd build
%makeinstall
popd
%suse_update_desktop_file konversation IRCClient
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc %lang(en) /usr/share/doc/kde/HTML/en/konversation
/usr/bin/konversation
/usr/share/applications/kde4/konversation.desktop
/usr/share/kde4/apps/konversation
/usr/share/icons/hicolor/*/actions/kimproxyaway.*
/usr/share/icons/hicolor/*/actions/kimproxyoffline.*
/usr/share/icons/hicolor/*/actions/char.*
/usr/share/icons/hicolor/*/actions/kimproxyonline.*
/usr/share/icons/hicolor/*/actions/konv_message.*
/usr/share/icons/hicolor/*/apps/konversation.*
/usr/share/kde4/services/konvirc.protocol
/usr/share/kde4/services/konvirc6.protocol
/usr/share/kde4/apps/kconf_update/*
%changelog
* Mon Mar 30 2009 dmueller@suse.de
- add missing akonadi dependency
* Sun Mar 22 2009 beineri@opensuse.org
- update to r942587
* binary renamed back from konvi to konversation
* Mon Mar 16 2009 dmueller@suse.de
- update to r939650
* merged/renamed kde4-konversation to konversation
* Thu Mar 05 2009 wstephenson@suse.de
- update to r935535
* Wed Feb 25 2009 stbinner@suse.de
- update to r931365
* Wed Feb 18 2009 dmueller@suse.de
- obsolete konversation on 11.2
* Tue Feb 17 2009 stbinner@suse.de
- update to r927519
* Sat Feb 14 2009 stbinner@suse.de
- update to r926039
* Sun Feb 08 2009 stbinner@suse.de
- update to r923134
* Sat Feb 07 2009 stbinner@suse.de
- update to r922461
* Fri Feb 06 2009 stbinner@suse.de
- update to r922014
* Thu Feb 05 2009 stbinner@suse.de
- update to r921671
* Wed Feb 04 2009 stbinner@suse.de
- update to r921325
* Tue Feb 03 2009 stbinner@suse.de
- initial package of r920614 svn snapshot
kde4-konversation-openSUSE_11.0.spec: same change
kde4-konversation-openSUSE_11.1.spec: same change
++++++ konversation.spec ++++++
--- /var/tmp/diff_new_pack.l24791/_old 2009-03-31 14:44:00.000000000 +0200
+++ /var/tmp/diff_new_pack.l24791/_new 2009-03-31 14:44:00.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package konversation (Version 1.1.77.svn939650)
+# spec file for package konversation (Version 1.1.77.svn942587)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,12 +23,13 @@
Url: http://konversation.kde.org/
License: GPL v2 or later
Group: Productivity/Networking/IRC
-Summary: A User-Friendly IRC Client for KDE 3
-Version: 1.1.77.svn939650
+Summary: A User-Friendly IRC Client for KDE
+Version: 1.1.77.svn942587
Release: 1
# svn.kde.org/home/kde/branches/work/konvi-kde4
Source0: konvi-kde4.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%kde4_akonadi_requires
%kde4_pimlibs_requires
%if %suse_version > 1110
Provides: kde4-konversation = 1.1.76
@@ -36,7 +37,7 @@
%endif
%description
-Konversation is a user-friendly IRC client for KDE 3.x.
+Konversation is a user-friendly IRC client for KDE
@@ -65,7 +66,7 @@
pushd build
%makeinstall
popd
- %suse_update_desktop_file konvi IRCClient
+ %suse_update_desktop_file konversation IRCClient
%post -p /sbin/ldconfig
@@ -77,8 +78,8 @@
%files
%defattr(-,root,root)
%doc %lang(en) /usr/share/doc/kde/HTML/en/konversation
-/usr/bin/konvi
-/usr/share/applications/kde4/konvi.desktop
+/usr/bin/konversation
+/usr/share/applications/kde4/konversation.desktop
/usr/share/kde4/apps/konversation
/usr/share/icons/hicolor/*/actions/kimproxyaway.*
/usr/share/icons/hicolor/*/actions/kimproxyoffline.*
@@ -88,8 +89,14 @@
/usr/share/icons/hicolor/*/apps/konversation.*
/usr/share/kde4/services/konvirc.protocol
/usr/share/kde4/services/konvirc6.protocol
+/usr/share/kde4/apps/kconf_update/*
%changelog
+* Mon Mar 30 2009 dmueller@suse.de
+- add missing akonadi dependency
+* Sun Mar 22 2009 beineri@opensuse.org
+- update to r942587
+ * binary renamed back from konvi to konversation
* Mon Mar 16 2009 dmueller@suse.de
- update to r939650
* merged/renamed kde4-konversation to konversation
++++++ konvi-kde4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/ChangeLog new/konvi-kde4/ChangeLog
--- old/konvi-kde4/ChangeLog 2008-11-27 13:58:46.000000000 +0100
+++ new/konvi-kde4/ChangeLog 2009-03-18 16:48:17.000000000 +0100
@@ -20,6 +20,8 @@
ver List, don't also try to connect to the hidden server sub-items selected
by implication, avoiding unwanted connection duplicates.
* Mask the password field in the Quick Connect dialog.
+* Fixed a bug causing passive DCC file transfers to stall at 99%.
+* Fixed "/leave" command in queries.
Changes from 1.0.1 to 1.1:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/CMakeLists.txt new/konvi-kde4/CMakeLists.txt
--- old/konvi-kde4/CMakeLists.txt 2009-03-09 19:13:05.000000000 +0100
+++ new/konvi-kde4/CMakeLists.txt 2009-03-16 18:19:02.000000000 +0100
@@ -1,5 +1,5 @@
#This isn't Konversation until it works.
-project(konvi)
+project(konversation)
#paranoid?
cmake_minimum_required(VERSION 2.6.0)
@@ -29,7 +29,7 @@
macro_log_feature(HAVE_XUTIL "X11 Xutil.h header" "X11 Xutil header" "http://www.x.org/" FALSE "" "User inactivity detection support for Away Manager")
endif (Q_WS_X11)
-configure_file(config-konvi.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-konvi.h )
+configure_file(config-konversation.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-konversation.h )
add_subdirectory(src)
add_subdirectory(data)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/config-konversation.h.cmake new/konvi-kde4/config-konversation.h.cmake
--- old/konvi-kde4/config-konversation.h.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/konvi-kde4/config-konversation.h.cmake 2009-03-17 09:17:39.000000000 +0100
@@ -0,0 +1,3 @@
+#cmakedefine HAVE_XSCREENSAVER 1
+#cmakedefine HAVE_X11 1
+#cmakedefine HAVE_XUTIL 1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/config-konvi.h.cmake new/konvi-kde4/config-konvi.h.cmake
--- old/konvi-kde4/config-konvi.h.cmake 2009-03-09 19:13:05.000000000 +0100
+++ new/konvi-kde4/config-konvi.h.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-#cmakedefine HAVE_XSCREENSAVER
-#cmakedefine HAVE_X11
-#cmakedefine HAVE_XUTIL
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/data/CMakeLists.txt new/konvi-kde4/data/CMakeLists.txt
--- old/konvi-kde4/data/CMakeLists.txt 2009-01-31 00:18:14.000000000 +0100
+++ new/konvi-kde4/data/CMakeLists.txt 2009-03-17 09:15:15.000000000 +0100
@@ -5,18 +5,18 @@
########### install files ###############
-install(FILES konvi.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(FILES konversation.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install(FILES konversationui.rc konversation.notifyrc DESTINATION
${DATA_INSTALL_DIR}/konversation)
-#install(FILES updaters/konvi.upd
-# updaters/konvi-0.19-colors.pl
-# updaters/konvi-0.19-sortorder.pl
-# updaters/konvi-0.19-appearance.pl
-# updaters/konvi-0.19-tabplacement.pl
-# updaters/konvi-0.19-custombrowser.pl
-# updaters/konvi-0.19-colorcodes.pl
-# updaters/konvi-0.19-notifylists.pl
-# updaters/konvi-0.20-quickbuttons.pl
-# updaters/konvi-0.20-customfonts.pl
-# DESTINATION ${DATA_INSTALL_DIR}/kconf_update)
+install(FILES updaters/konversation.upd
+ updaters/konversation-0.19-colors.pl
+ updaters/konversation-0.19-sortorder.pl
+ updaters/konversation-0.19-appearance.pl
+ updaters/konversation-0.19-tabplacement.pl
+ updaters/konversation-0.19-custombrowser.pl
+ updaters/konversation-0.19-colorcodes.pl
+ updaters/konversation-0.19-notifylists.pl
+ updaters/konversation-0.20-quickbuttons.pl
+ updaters/konversation-0.20-customfonts.pl
+ DESTINATION ${DATA_INSTALL_DIR}/kconf_update)
install(FILES konvirc.protocol konvirc6.protocol DESTINATION ${SERVICES_INSTALL_DIR})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/data/konversation.desktop new/konvi-kde4/data/konversation.desktop
--- old/konvi-kde4/data/konversation.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/konvi-kde4/data/konversation.desktop 2009-03-16 18:19:02.000000000 +0100
@@ -0,0 +1,47 @@
+[Desktop Entry]
+Type=Application
+Exec=konversation -caption "%c" %i
+Icon=konversation
+X-DocPath=konversation/index.html
+GenericName=IRC Client
+GenericName[ar]=زبون IRC
+GenericName[bg]=IRC клиент
+GenericName[br]=Kliant IRC
+GenericName[ca]=Client IRC
+GenericName[cs]=IRC klient
+GenericName[cy]=Dibynnydd IRC
+GenericName[da]=IRC-klient
+GenericName[de]=IRC-Programm
+GenericName[el]=Πελάτης IRC
+GenericName[es]=Cliente de IRC
+GenericName[et]=IRC klient
+GenericName[ga]=Cliant IRC
+GenericName[gl]=Cliente IRC
+GenericName[he]=לקוח IRC
+GenericName[it]=Client IRC
+GenericName[ja]=IRC クライアント
+GenericName[ka]=IRC საუბარი
+GenericName[lt]=IRC klientas
+GenericName[ms]=Klien IRC
+GenericName[nl]=IRC-client
+GenericName[pa]=IRC ਕਲਾਂਇਟ
+GenericName[pt]=Cliente de IRC
+GenericName[pt_BR]=Cliente IRC
+GenericName[sr]=IRC клијент
+GenericName[sr@Latn]=IRC klijent
+GenericName[sv]=IRC-klient
+GenericName[tr]=IRC İstemcisi
+GenericName[uk]=Клієнт IRC
+GenericName[xx]=xxIRC Clientxx
+GenericName[zh_CN]=IRC 客户端
+GenericName[zh_TW]=IRC 客戶端程式
+Terminal=false
+Name=Konversation
+Name[hi]=कनवर्सेसन
+Name[pa]=ਗੱਲਬਾਤ
+Name[ta]=உரையாடல்
+Name[xx]=xxKonversationxx
+Categories=Qt;KDE;Network;IRCClient;
+X-KDE-ServiceTypes=DBUS/InstantMessenger
+X-DBUS-StartupType=Unique
+X-DBUS-ServiceName=org.kde.konversation
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/data/konvi.desktop new/konvi-kde4/data/konvi.desktop
--- old/konvi-kde4/data/konvi.desktop 2009-02-08 13:39:24.000000000 +0100
+++ new/konvi-kde4/data/konvi.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=konvi -caption "%c" %i
-Icon=konversation
-X-DocPath=konversation/index.html
-GenericName=IRC Client
-GenericName[ar]=زبون IRC
-GenericName[bg]=IRC клиент
-GenericName[br]=Kliant IRC
-GenericName[ca]=Client IRC
-GenericName[cs]=IRC klient
-GenericName[cy]=Dibynnydd IRC
-GenericName[da]=IRC-klient
-GenericName[de]=IRC-Programm
-GenericName[el]=Πελάτης IRC
-GenericName[es]=Cliente de IRC
-GenericName[et]=IRC klient
-GenericName[ga]=Cliant IRC
-GenericName[gl]=Cliente IRC
-GenericName[he]=לקוח IRC
-GenericName[it]=Client IRC
-GenericName[ja]=IRC クライアント
-GenericName[ka]=IRC საუბარი
-GenericName[lt]=IRC klientas
-GenericName[ms]=Klien IRC
-GenericName[nl]=IRC-client
-GenericName[pa]=IRC ਕਲਾਂਇਟ
-GenericName[pt]=Cliente de IRC
-GenericName[pt_BR]=Cliente IRC
-GenericName[sr]=IRC клијент
-GenericName[sr@Latn]=IRC klijent
-GenericName[sv]=IRC-klient
-GenericName[tr]=IRC İstemcisi
-GenericName[uk]=Клієнт IRC
-GenericName[xx]=xxIRC Clientxx
-GenericName[zh_CN]=IRC 客户端
-GenericName[zh_TW]=IRC 客戶端程式
-Terminal=false
-Name=Konversation
-Name[hi]=कनवर्सेसन
-Name[pa]=ਗੱਲਬਾਤ
-Name[ta]=உரையாடல்
-Name[xx]=xxKonversationxx
-Categories=Qt;KDE;Network;IRCClient;
-X-KDE-ServiceTypes=DBUS/InstantMessenger
-X-DBUS-StartupType=Unique
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/data/konvirc6.protocol new/konvi-kde4/data/konvirc6.protocol
--- old/konvi-kde4/data/konvirc6.protocol 2009-02-05 10:25:06.000000000 +0100
+++ new/konvi-kde4/data/konvirc6.protocol 2009-03-16 18:19:02.000000000 +0100
@@ -1,5 +1,5 @@
[Protocol]
-exec=konvi %u
+exec=konversation %u
protocol=irc6
input=none
output=none
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/data/konvirc.protocol new/konvi-kde4/data/konvirc.protocol
--- old/konvi-kde4/data/konvirc.protocol 2009-02-05 10:25:06.000000000 +0100
+++ new/konvi-kde4/data/konvirc.protocol 2009-03-16 18:19:02.000000000 +0100
@@ -1,5 +1,5 @@
[Protocol]
-exec=konvi %u
+exec=konversation %u
protocol=irc
input=none
output=none
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/INSTALL new/konvi-kde4/INSTALL
--- old/konvi-kde4/INSTALL 2009-01-29 11:39:20.000000000 +0100
+++ new/konvi-kde4/INSTALL 2009-03-17 09:19:34.000000000 +0100
@@ -1,28 +1,3 @@
-Basic Installation
-==================
+Build instructions can be found at
+http://techbase.kde.org/Getting_Started/Build/KDE4
- KDE uses the cmake build system. The simple instructions for
-building kdenetwork are these commands:
-
- mkdir ../kdenetwork-build && cd ../kdenetwork-build
- cmake ../kdenetwork
- make
- make install
-
- This will not work unless necessary prerequisites are met. These are,
-in the order they should be built:
-
- kdesupport
- kdelibs
- kdepimlibs
- kdebase
-
- Various components of kdenetwork and the KDE modules listed above have
-other dependencies as well. If these are not met when the 'cmake' command is
-run, those components will not be built. The output of 'cmake' should make it
-clear what these dependencies are and how to meet them.
-
- Arguments can be given to cmake similar to those given to a traditional
-configure script, like the install prefix. See 'cmake --help-full' for more
-information. For example, 'configure --prefix=/usr/lib' translates to
-'cmake -DCMAKE_INSTALL_PREFIX=/usr/lib'.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/Messages.sh new/konvi-kde4/Messages.sh
--- old/konvi-kde4/Messages.sh 2009-02-17 13:50:55.000000000 +0100
+++ new/konvi-kde4/Messages.sh 2009-03-16 18:19:02.000000000 +0100
@@ -1,4 +1,4 @@
#! /usr/bin/env bash
$EXTRACTRC `find . -name \*.ui -o -name \*.rc -o -name \*.kcfg` >> rc.cpp
-$XGETTEXT `find . -name \*.cpp` -o $podir/konvi.pot
+$XGETTEXT `find . -name \*.cpp` -o $podir/konversation.pot
rm -f rc.cpp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/awaymanager.cpp new/konvi-kde4/src/awaymanager.cpp
--- old/konvi-kde4/src/awaymanager.cpp 2009-03-09 19:13:05.000000000 +0100
+++ new/konvi-kde4/src/awaymanager.cpp 2009-03-16 18:19:02.000000000 +0100
@@ -16,7 +16,7 @@
#include "connectionmanager.h"
#include "server.h"
#include "preferences.h"
-#include "config-konvi.h"
+#include "config-konversation.h"
#include
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/CMakeLists.txt new/konvi-kde4/src/CMakeLists.txt
--- old/konvi-kde4/src/CMakeLists.txt 2009-03-09 19:13:05.000000000 +0100
+++ new/konvi-kde4/src/CMakeLists.txt 2009-03-17 09:16:29.000000000 +0100
@@ -192,27 +192,27 @@
)
set (completed_SRCS ${core_SRCS} ${irc_SRCS} ${viewer_SRCS} ${prefs_SRCS} ${dcc_SRCS} ${linkaddressbook_SRCS} ${blowfish_SRCS})
-set (konvi_SRCS ${completed_SRCS})
+set (konversation_SRCS ${completed_SRCS})
-kde4_add_ui_files(konvi_SRCS
+kde4_add_ui_files(konversation_SRCS
identitydialog.ui
queuetunerbase.ui
viewer/searchbarbase.ui
)
-kde4_add_kcfg_files(konvi_SRCS config/preferences_base.kcfgc)
+kde4_add_kcfg_files(konversation_SRCS config/preferences_base.kcfgc)
-kde4_add_executable(konvi ${konvi_SRCS})
+kde4_add_executable(konversation ${konversation_SRCS})
-target_link_libraries(konvi ${KDE4_KIO_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KPARTS_LIBS}
+target_link_libraries(konversation ${KDE4_KIO_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KPARTS_LIBS}
${KDE4_KDE3SUPPORT_LIBS} ${KDEPIMLIBS_KABC_LIBS}
${KDE4_KNOTIFYCONFIG_LIBRARY} ${PHONON_LIBRARY})
if (X11_FOUND AND X11_Xutil_FOUND)
- target_link_libraries(konvi ${X11_X11_LIB})
+ target_link_libraries(konversation ${X11_X11_LIB})
endif (X11_FOUND AND X11_Xutil_FOUND)
if (X11_Xscreensaver_FOUND)
- target_link_libraries(konvi ${X11_Xscreensaver_LIB})
+ target_link_libraries(konversation ${X11_Xscreensaver_LIB})
endif (X11_Xscreensaver_FOUND)
-install(TARGETS konvi ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS konversation ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/dcc/resumedialog.cpp new/konvi-kde4/src/dcc/resumedialog.cpp
--- old/konvi-kde4/src/dcc/resumedialog.cpp 2009-02-15 12:15:52.000000000 +0100
+++ new/konvi-kde4/src/dcc/resumedialog.cpp 2009-03-21 18:02:36.000000000 +0100
@@ -119,6 +119,7 @@
break;
case KDialog::User1:
m_selectedAction = RA_Resume;
+ accept();
break;
case KDialog::Cancel:
m_selectedAction = RA_Cancel;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/dcc/transferrecv.cpp new/konvi-kde4/src/dcc/transferrecv.cpp
--- old/konvi-kde4/src/dcc/transferrecv.cpp 2009-03-13 22:43:53.000000000 +0100
+++ new/konvi-kde4/src/dcc/transferrecv.cpp 2009-03-21 18:11:24.000000000 +0100
@@ -142,7 +142,10 @@
void DccTransferRecv::setFileName( const QString& fileName )
{
if ( getStatus() == Configuring )
+ {
m_fileName = fileName;
+ m_saveFileName = m_fileName;
+ }
}
void DccTransferRecv::setFileURL( const KUrl& url )
@@ -150,7 +153,7 @@
if ( getStatus() == Preparing || getStatus() == Configuring || getStatus() == Queued )
{
m_fileURL = url;
- m_fileName = url.fileName();
+ m_saveFileName = url.fileName();
}
}
@@ -172,10 +175,14 @@
kDebug();
if ( getStatus() != Configuring )
+ {
return false;
+ }
- if ( m_partnerIp.isEmpty() /*|| !m_partnerPort*/ ) //port can be 0, for passive dcc send
+ if ( m_partnerIp.isEmpty())
+ {
return false;
+ }
if (!KAuthorized::authorizeKAction("allow_downloading"))
{
@@ -202,6 +209,7 @@
if ( m_fileName.isEmpty() )
{
m_fileName = "unnamed_file";
+ m_saveFileName = m_fileName;
}
if ( m_fileURL.isEmpty() )
@@ -210,25 +218,35 @@
// set default folder
if ( !Preferences::self()->dccPath().isEmpty() )
+ {
m_fileURL = KUrl( Preferences::self()->dccPath() );
+ }
else
+ {
m_fileURL.setPath( KUser( KUser::UseRealUserID ).homeDir() ); // default folder is *not* specified
+ }
// add a slash if there is none
m_fileURL.adjustPath( KUrl::AddTrailingSlash );
// Append folder with partner's name if wanted
if ( Preferences::self()->dccCreateFolder() )
+ {
m_fileURL.addPath( m_partnerNick + '/' );
+ }
// Just incase anyone tries to do anything nasty
- QString fileNameSanitized = sanitizeFileName( m_fileName );
+ QString fileNameSanitized = sanitizeFileName( m_saveFileName );
// Append partner's name to file name if wanted
if ( Preferences::self()->dccAddPartner() )
+ {
m_fileURL.addPath( m_partnerNick + '.' + fileNameSanitized );
+ }
else
+ {
m_fileURL.addPath( fileNameSanitized );
+ }
}
return DccTransfer::queue();
@@ -241,11 +259,10 @@
if (getStatus() == DccTransfer::Queued)
{
Server* server = KonversationApplication::instance()->getConnectionManager()->getServerByConnectionId( m_connectionId );
- if ( !server )
+ if ( server )
{
- failed( i18n( "Could not send DCC REJECT SEND acknowledgement to the partner via the IRC server." ) );
+ server->dccRejectSend( m_partnerNick, transferFileName(m_fileName) );
}
- server->dccRejectSend( m_partnerNick, transferFileName(m_fileName) );
}
if(m_writeCacheHandler)
@@ -462,6 +479,7 @@
if ( !server )
{
failed( i18n( "Could not send Reverse DCC SEND acknowledgement to the partner via the IRC server." ) );
+ return;
}
m_ownIp = DccCommon::getOwnIp( server );
@@ -470,8 +488,6 @@
setStatus( WaitingRemote, i18n( "Waiting for connection" ) );
server->dccReverseSendAck( m_partnerNick, transferFileName(m_fileName), DccCommon::textIpToNumericalIp( m_ownIp ), m_ownPort, m_fileSize, m_reverseToken );
-
- //FIXME: add connection timer here
}
else
{
@@ -489,7 +505,6 @@
kDebug() << "Requesting resume for " << m_partnerNick << " file " << m_fileName << " partner " << m_partnerPort;
- //TODO m_filename could have been sanitized - will this effect this?
Server* server = KonversationApplication::instance()->getConnectionManager()->getServerByConnectionId( m_connectionId );
if ( !server )
{
@@ -531,10 +546,9 @@
setStatus( Connecting );
- m_recvSocket = new QTcpSocket( this);
+ startConnectionTimer( 30 );
- //m_recvSocket->setResolutionEnabled( false );
- //m_recvSocket->setTimeout( 30000 );
+ m_recvSocket = new QTcpSocket( this);
connect( m_recvSocket, SIGNAL( connected( ) ), this, SLOT( startReceiving() ) );
connect( m_recvSocket, SIGNAL( error( QAbstractSocket::SocketError ) ), this, SLOT( connectionFailed( QAbstractSocket::SocketError ) ) );
@@ -558,15 +572,16 @@
return false;
}
- connect( m_serverSocket, SIGNAL( newConnection() ), this, SLOT( slotServerSocketReadyAccept() ) );
- //connect( m_serverSocket, SIGNAL( gotError( int ) ), this, SLOT( slotServerSocketGotError( int ) ) );
+ connect( m_serverSocket, SIGNAL( newConnection() ), this, SLOT( slotServerSocketReadyAccept() ) );
+
+ startConnectionTimer( 30 );
return true;
}
void DccTransferRecv::slotServerSocketReadyAccept()
{
- //stopConnectionTimer()
+ //reverse dcc
m_recvSocket = m_serverSocket->nextPendingConnection();
if ( !m_recvSocket )
@@ -591,6 +606,7 @@
void DccTransferRecv::startReceiving()
{
kDebug();
+ stopConnectionTimer();
connect( m_recvSocket, SIGNAL( readyRead() ), this, SLOT( readData() ) );
//connect( m_recvSocket, SIGNAL( readyWrite() ), this, SLOT( sendAck() ) );
@@ -600,6 +616,9 @@
m_transferStartPosition = m_transferringPosition;
+ //we don't need the original filename anymore, overwrite it to display the correct one in transfermanager/panel
+ m_fileName = m_saveFileName;
+
startTransferLogger(); // initialize CPS counter, ETA counter, etc...
}
@@ -665,7 +684,6 @@
void DccTransferRecv::startConnectionTimer( int sec )
{
- stopConnectionTimer();
kDebug();
m_connectionTimer->start( sec*1000 );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/dcc/transferrecv.h new/konvi-kde4/src/dcc/transferrecv.h
--- old/konvi-kde4/src/dcc/transferrecv.h 2009-03-02 21:06:40.000000000 +0100
+++ new/konvi-kde4/src/dcc/transferrecv.h 2009-03-21 18:11:24.000000000 +0100
@@ -137,6 +137,9 @@
QTcpServer* m_serverSocket;
QTcpSocket* m_recvSocket;
+ ///We need the original name for resume communication, as sender depends on it
+ QString m_saveFileName;
+
private:
virtual QString getTypeText() const;
virtual QPixmap getTypeIcon() const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/dcc/transfersend.cpp new/konvi-kde4/src/dcc/transfersend.cpp
--- old/konvi-kde4/src/dcc/transfersend.cpp 2009-03-04 17:02:14.000000000 +0100
+++ new/konvi-kde4/src/dcc/transfersend.cpp 2009-03-19 23:07:10.000000000 +0100
@@ -290,6 +290,8 @@
kDebug() << "Passive DCC key(token): " << m_reverseToken;
+ startConnectionTimer( Preferences::self()->dccSendTimeout() );
+
server->dccPassiveSendRequest( m_partnerNick, transferFileName(m_fileName), DccCommon::textIpToNumericalIp( m_ownIp ), m_fileSize, m_reverseToken );
}
@@ -301,6 +303,8 @@
kDebug();
// Reverse DCC
+ startConnectionTimer( Preferences::self()->dccSendTimeout() );
+
m_partnerIp = partnerHost;
m_partnerPort = partnerPort;
@@ -343,6 +347,7 @@
failed( i18n( "Could not accept the connection. (Socket Error)" ) );
return;
}
+ connect( m_sendSocket, SIGNAL( error ( QAbstractSocket::SocketError ) ), this, SLOT( slotGotSocketError(int) ));
// we don't need ServerSocket anymore
m_serverSocket->close();
@@ -352,6 +357,8 @@
void DccTransferSend::startSending()
{
+ stopConnectionTimer();
+
if ( m_fastSend )
connect( m_sendSocket, SIGNAL( bytesWritten( qint64 ) ), this, SLOT( writeData() ) );
connect( m_sendSocket, SIGNAL( readyRead() ), this, SLOT( getAck() ) );
@@ -381,8 +388,22 @@
int actual = m_file.read( m_buffer, m_bufferSize );
if ( actual > 0 )
{
- m_sendSocket->write( m_buffer, actual );
- m_transferringPosition += actual;
+ qint64 byteWritten = m_sendSocket->write( m_buffer, actual );
+ if (byteWritten == -1)
+ {
+ failed ( m_sendSocket->errorString() );
+ return;
+ }
+ //this "can" happen when resources are temporary unavailable
+ //NOTE: this is not fatal
+ if (byteWritten < actual)
+ {
+ kWarning() << "byteWritten < actual : " << byteWritten << " < " << actual;
+ kWarning() << "try to correct it with byteWritten += " << m_sendSocket->bytesToWrite();
+ byteWritten += m_sendSocket->bytesToWrite();
+ }
+ m_transferringPosition += byteWritten;
+ //m_transferringPosition += actual;
if ( (KIO::fileoffset_t)m_fileSize <= m_transferringPosition )
{
Q_ASSERT( (KIO::fileoffset_t)m_fileSize == m_transferringPosition );
@@ -417,6 +438,7 @@
void DccTransferSend::slotGotSocketError( int errorCode )
{
+ stopConnectionTimer();
kDebug() << "code = " << errorCode << " string = " << m_serverSocket->errorString();
failed( i18n( "Socket error: %1", m_serverSocket->errorString() ) );
}
@@ -424,7 +446,7 @@
void DccTransferSend::startConnectionTimer( int sec )
{
kDebug();
- stopConnectionTimer();
+ //start also restarts, no need for us to double check it
m_connectionTimer->start(sec*1000);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/identity.cpp new/konvi-kde4/src/identity.cpp
--- old/konvi-kde4/src/identity.cpp 2009-02-07 12:34:44.000000000 +0100
+++ new/konvi-kde4/src/identity.cpp 2009-03-21 11:27:51.000000000 +0100
@@ -162,7 +162,7 @@
// We can get a QTextCodec from QString based on them, but can't do the reverse of that.
// never set an empty or borked codec!
- QString codecName=newCodecName.toLower();
+ QString codecName=newCodecName;
if(!Konversation::IRCCharsets::self()->isValidEncoding(codecName))
codecName=Konversation::IRCCharsets::self()->encodingForLocale();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/identitydialog.cpp new/konvi-kde4/src/identitydialog.cpp
--- old/konvi-kde4/src/identitydialog.cpp 2009-02-14 21:04:27.000000000 +0100
+++ new/konvi-kde4/src/identitydialog.cpp 2009-03-21 14:20:18.000000000 +0100
@@ -52,7 +52,7 @@
}
// add encodings to combo box
- m_codecCBox->insertItems(0, Konversation::IRCCharsets::self()->availableEncodingDescriptiveNames());
+ m_codecCBox->addItems(Konversation::IRCCharsets::self()->availableEncodingDescriptiveNames());
// set values for the widgets
updateIdentity(0);
@@ -91,7 +91,7 @@
m_realNameEdit->setText(m_currentIdentity->getRealName());
m_nicknameLBox->clear();
- m_nicknameLBox->insertStringList(m_currentIdentity->getNicknameList());
+ m_nicknameLBox->insertStringList(m_currentIdentity->getNicknameList(), 0);//0 is workaround for kdelibs < 4.2.2 bug
m_botEdit->setText(m_currentIdentity->getBot());
m_passwordEdit->setText(m_currentIdentity->getPassword());
@@ -152,7 +152,8 @@
m_currentIdentity->setAutomaticUnaway(m_automaticUnawayChBox->isChecked());
m_currentIdentity->setShellCommand(m_sCommandEdit->text());
- m_currentIdentity->setCodecName(Konversation::IRCCharsets::self()->availableEncodingShortNames()[m_codecCBox->currentIndex()]);
+ if(m_codecCBox->currentIndex() >= 0 && m_codecCBox->currentIndex() < Konversation::IRCCharsets::self()->availableEncodingShortNames().count())
+ m_currentIdentity->setCodecName(Konversation::IRCCharsets::self()->availableEncodingShortNames()[m_codecCBox->currentIndex()]);
m_currentIdentity->setIdent(m_loginEdit->text());
m_currentIdentity->setQuitReason(m_quitEdit->text());
m_currentIdentity->setPartReason(m_partEdit->text());
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/irc/irccharsets.cpp new/konvi-kde4/src/irc/irccharsets.cpp
--- old/konvi-kde4/src/irc/irccharsets.cpp 2009-02-06 14:11:14.000000000 +0100
+++ new/konvi-kde4/src/irc/irccharsets.cpp 2009-03-21 11:27:51.000000000 +0100
@@ -118,12 +118,12 @@
if ( QTextCodec::codecForName( (*it).toAscii() ) == QTextCodec::codecForLocale() )
return *it;
- return "utf8";
+ return "UTF-8";
}
QTextCodec* IRCCharsets::codecForName( const QString& shortName )
{
- if(shortName == "iso-2022-jp")
+ if(shortName == "ISO 2022-JP")
return QTextCodec::codecForName( "jis7" );
else
return QTextCodec::codecForName( shortName.toAscii() );
@@ -133,8 +133,8 @@
{
// setup m_shortNameAliases
// use only [a-z0-9] for keys!
- m_shortNameAliases["unicode"] = "utf8";
- m_shortNameAliases["latin1"] = "iso-8859-1";
+ m_shortNameAliases["unicode"] = "UTF-8";
+ m_shortNameAliases["latin1"] = "ISO 8859-1";
// setup m_shortNames, m_descriptiveNames, m_simplifiedShortNames
QRegExp reSimplify( "[^a-zA-Z0-9]" );
@@ -144,9 +144,8 @@
{
QString encodingName = KGlobal::charsets()->encodingForName( *it );
// exclude encodings which are not supported on IRC
- if ( encodingName == "iso-10646-ucs-2" ||
- encodingName == "utf16" ||
- encodingName == "utf16" ||
+ if ( encodingName == "ISO 10646-UCS-2" ||
+ encodingName == "UTF-16" ||
encodingName == "utf7" )
{
it = m_descriptiveNames.erase( it );
@@ -158,9 +157,9 @@
if(encodingName == "jis7") // Add iso-2022-jp which is same as jis7 but not in Qt
{
- it = m_descriptiveNames.insert(it, "Japanese ( iso-2022-jp )");
- m_shortNames.append( "iso-2022-jp" );
- m_simplifiedShortNames.append( "ISO-2022-JP" );
+ it = m_descriptiveNames.insert(it, "Japanese ( ISO 2022-JP )");
+ m_shortNames.append( "ISO 2022-JP" );
+ m_simplifiedShortNames.append( "ISO2022JP" );
++it;
}
++it;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/irc/outputfilter.cpp new/konvi-kde4/src/irc/outputfilter.cpp
--- old/konvi-kde4/src/irc/outputfilter.cpp 2009-03-07 20:53:22.000000000 +0100
+++ new/konvi-kde4/src/irc/outputfilter.cpp 2009-03-18 17:03:46.000000000 +0100
@@ -443,13 +443,11 @@
{
// But only if we actually are in a channel
if(isAChannel(destination))
- {
result.toServer = "PART " + destination + " :" + m_server->getIdentity()->getPartReason();
- }
+ else if(m_server->getQueryByName(destination))
+ m_server->closeQuery(destination);
else
- {
- result = error(i18n("%1PART without parameters only works from within a channel or a query.", commandChar));
- }
+ result = error(i18n("%1PART and %1LEAVE without parameters only work from within a channel or a query.", commandChar));
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/irc/query.cpp new/konvi-kde4/src/irc/query.cpp
--- old/konvi-kde4/src/irc/query.cpp 2009-02-10 13:56:26.000000000 +0100
+++ new/konvi-kde4/src/irc/query.cpp 2009-03-18 16:48:17.000000000 +0100
@@ -206,10 +206,6 @@
{
textView->clear();
}
- else if(line.toLower()==Preferences::self()->commandChar()+"part")
- {
- m_server->closeQuery(getName());
- }
else if(line.length())
{
sendQueryText(line);
@@ -381,10 +377,7 @@
void Query::popup(int id)
{
- // get the nickname to the context menu popup
- QString name = textView->getContextNick();
- // if there was none (right click into the text view) assume query partner
- if (name.isEmpty()) name = getName();
+ QString name = getName();
switch (id)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/irc/server.cpp new/konvi-kde4/src/irc/server.cpp
--- old/konvi-kde4/src/irc/server.cpp 2009-03-07 20:53:22.000000000 +0100
+++ new/konvi-kde4/src/irc/server.cpp 2009-03-18 21:24:31.000000000 +0100
@@ -1802,6 +1802,12 @@
{
Konversation::OutputFilterResult result = getOutputFilter()->passiveSendRequest(recipient,fileName,address,size,token);
queue(result.toServer);
+
+ appendMessageToFrontmost( i18n( "DCC" ),
+ i18n( "Asking %1 to accept passive upload of \"%2\" (%3)...",
+ recipient,
+ cleanDccFileName(fileName),
+ ( size == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( size ) ) );
}
void Server::dccPassiveResumeGetRequest(const QString& sender,const QString& fileName,uint port,KIO::filesize_t startAt,const QString &token)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/viewer/insertchardialog.cpp new/konvi-kde4/src/viewer/insertchardialog.cpp
--- old/konvi-kde4/src/viewer/insertchardialog.cpp 2009-02-09 00:01:11.000000000 +0100
+++ new/konvi-kde4/src/viewer/insertchardialog.cpp 2009-03-16 14:56:45.000000000 +0100
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include <KCharSelect>
namespace Konversation
@@ -28,7 +29,11 @@
setCaption( i18n("Insert Character") );
setButtonGuiItem(KDialog::Ok, KGuiItem(i18n("&Insert"), "dialog-ok", i18n("Insert a character")));
+#if KDE_IS_VERSION(4, 1, 90)
m_charTable = new KCharSelect(this,0, KCharSelect::CharacterTable|KCharSelect::FontCombo|KCharSelect::BlockCombos);
+#else
+ m_charTable = new KCharSelect(this, KCharSelect::CharacterTable|KCharSelect::FontCombo|KCharSelect::BlockCombos);
+#endif
m_charTable->setCurrentFont( QFont( font ) );
setMainWidget(m_charTable);
connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/konvi-kde4/src/viewer/viewcontainer.cpp new/konvi-kde4/src/viewer/viewcontainer.cpp
--- old/konvi-kde4/src/viewer/viewcontainer.cpp 2009-02-28 17:59:58.000000000 +0100
+++ new/konvi-kde4/src/viewer/viewcontainer.cpp 2009-03-21 12:12:20.000000000 +0100
@@ -1321,6 +1321,13 @@
}
m_tabWidget->insertTab(placement, view, iconSet, label);
+ // HACK Seems like automatic resize isn't all that automatic currently.
+ // Work around it by unsetting it and setting it again.
+ if (Preferences::self()->useMaxSizedTabs())
+ {
+ m_tabWidget->setAutomaticResizeTabs(false);
+ m_tabWidget->setAutomaticResizeTabs(true);
+ }
m_vbox->show();//m_tabWidget->show();
if (m_viewTree)
++++++ pre_checkin.sh ++++++
#!/bin/bash
# This script is called automatically during autobuild checkin.
for spec in konversation-openSUSE_10.3 konversation-openSUSE_11.0 konversation-openSUSE_11.1 ; do
sed -e 's,Name:.*,Name: kde4-konversation,' < konversation.spec > kde4-${spec}.spec
done
cp -f konversation.changes kde4-konversation.changes
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org