rpms/kdesdk/devel kdesdk-3.97.0-fix-kompare.patch, 1.2, 1.3 kdesdk.spec, 1.85, 1.86

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Wed Dec 19 09:29:49 UTC 2007 

Author: kkofler

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2244/devel

Modified Files:
	kdesdk-3.97.0-fix-kompare.patch kdesdk.spec 
Log Message:
* Wed Dec 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-8
- update Kompare from SVN (rev 750443)

kdesdk-3.97.0-fix-kompare.patch:

Index: kdesdk-3.97.0-fix-kompare.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk-3.97.0-fix-kompare.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdesdk-3.97.0-fix-kompare.patch	16 Dec 2007 01:01:39 -0000	1.2
+++ kdesdk-3.97.0-fix-kompare.patch	19 Dec 2007 09:29:43 -0000	1.3
@@ -1,8 +1,51 @@
 Index: CMakeLists.txt
 ===================================================================
 --- CMakeLists.txt	(revision 745228)
-+++ CMakeLists.txt	(revision 748928)
-@@ -43,9 +43,9 @@
++++ CMakeLists.txt	(revision 750443)
+@@ -4,8 +4,8 @@
+ 
+ # search packages used by KDE
+ find_package(KDE4 REQUIRED)
+-include (KDE4Defaults)
+-include (MacroLibrary)
++include(KDE4Defaults)
++include(MacroLibrary)
+ include(MacroOptionalAddSubdirectory)
+ include(CheckIncludeFile)
+ include(CheckIncludeFileCXX)
+@@ -16,36 +16,33 @@
+ set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS})
+ 
+ find_package(Strigi REQUIRED)
+-#if (APPLE)
+-#find_package(Carbon REQUIRED)
+-#endif (APPLE)
+-macro_optional_find_package(KdepimLibs)
++find_package(KdepimLibs REQUIRED)
++
+ macro_optional_find_package(LibXslt)
++macro_log_feature(LIBXSLT_FOUND "LibXSLT" "A library to transform XMLfiles into other XML files" "http://xmlsoft.org/XSLT" FALSE "" "Required to build Umbrello.")
+ macro_optional_find_package(LibXml2)
+-macro_optional_find_package(Flex)
++macro_log_feature(LIBXML2_FOUND "LibXML2" "Libraries used to develop XML applications" "http://xmlsoft.org" FALSE "" "Required to build Umbrello.")
+ 
+ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
+ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+ 
+ macro_optional_add_subdirectory(kate)
+ if( UNIX )
+-macro_optional_add_subdirectory(cervisia)
++  macro_optional_add_subdirectory(cervisia)
+ endif( UNIX )
+ macro_optional_add_subdirectory(doc)
+ macro_optional_add_subdirectory(kapptemplate)
+ 
+ macro_optional_add_subdirectory(kbugbuster)
+ macro_optional_add_subdirectory(kcachegrind)
+-if(KDEPIMLIBS_FOUND)
+ macro_optional_add_subdirectory(kdeaccounts-plugin)
+-endif(KDEPIMLIBS_FOUND)
+ macro_optional_add_subdirectory(kdepalettes)
  macro_optional_add_subdirectory(strigi-analyzer)
  macro_optional_add_subdirectory(kioslave)
  macro_optional_add_subdirectory(kmtrace)
@@ -10,15 +53,24 @@
 -MESSAGE(STATUS "Kompare from the branches/work/kompare/3-way-kompare will replace this version, so do not spend too much time on getting this version to work as it will be replaced.")
 -#add_subdirectory(kompare)
 +if( UNIX )
-+macro_optional_add_subdirectory(kompare)
++  macro_optional_add_subdirectory(kompare)
 +endif( UNIX )
  macro_optional_add_subdirectory(kprofilemethod)
  message(STATUS "remember to port kspy to Qt4's metaobjects")
  #add_subdirectory(kspy)
+@@ -64,7 +61,7 @@
+ #add_subdirectory(scheck)
+ macro_optional_add_subdirectory(scripts)
+ if(LIBXSLT_FOUND AND LIBXML2_FOUND)
+-   macro_optional_add_subdirectory(umbrello)
++  macro_optional_add_subdirectory(umbrello)
+ endif(LIBXSLT_FOUND AND LIBXML2_FOUND)
+ 
+ add_subdirectory( cmake )
 Index: doc/CMakeLists.txt
 ===================================================================
 --- doc/CMakeLists.txt	(revision 745228)
-+++ doc/CMakeLists.txt	(revision 748928)
++++ doc/CMakeLists.txt	(revision 750443)
 @@ -4,8 +4,7 @@
  add_subdirectory(kapptemplate)
  add_subdirectory(kbugbuster)
@@ -32,7 +84,7 @@
 Index: kompare/libdiff2/diffmodel.h
 ===================================================================
 --- kompare/libdiff2/diffmodel.h	(revision 745228)
-+++ kompare/libdiff2/diffmodel.h	(revision 748928)
++++ kompare/libdiff2/diffmodel.h	(revision 750443)
 @@ -25,6 +25,7 @@
  
  #include "diffhunk.h"
@@ -53,7 +105,7 @@
 Index: kompare/libdiff2/difference.h
 ===================================================================
 --- kompare/libdiff2/difference.h	(revision 745228)
-+++ kompare/libdiff2/difference.h	(revision 748928)
++++ kompare/libdiff2/difference.h	(revision 750443)
 @@ -24,6 +24,7 @@
  #include <q3valuevector.h>
  
@@ -89,10 +141,19 @@
  {
  public:
  	enum Type { Change, Insert, Delete, Unchanged };
+@@ -209,8 +210,6 @@
+ 
+ 	bool                  m_applied;
+ 	bool                  m_conflicts;
+-
+-	LevenshteinTable*     m_table;
+ };
+ 
+ typedef Q3ValueList<Difference*> DifferenceList;
 Index: kompare/libdiff2/diff2export.h
 ===================================================================
 --- kompare/libdiff2/diff2export.h	(revision 0)
-+++ kompare/libdiff2/diff2export.h	(revision 748928)
++++ kompare/libdiff2/diff2export.h	(revision 750443)
 @@ -0,0 +1,37 @@
 +/***************************************************************************
 + *   Copyright 2007 Andreas Pakulat <apaku at gmx.de>                         *
@@ -134,7 +195,7 @@
 Index: kompare/libdiff2/kompare.h
 ===================================================================
 --- kompare/libdiff2/kompare.h	(revision 745228)
-+++ kompare/libdiff2/kompare.h	(revision 748928)
++++ kompare/libdiff2/kompare.h	(revision 750443)
 @@ -22,6 +22,8 @@
  
  #include <kurl.h>
@@ -156,7 +217,7 @@
 Index: kompare/libdiff2/komparemodellist.cpp
 ===================================================================
 --- kompare/libdiff2/komparemodellist.cpp	(revision 745228)
-+++ kompare/libdiff2/komparemodellist.cpp	(revision 748928)
++++ kompare/libdiff2/komparemodellist.cpp	(revision 750443)
 @@ -4,8 +4,10 @@
      begin                : Tue Jun 26 2001
      copyright            : (C) 2001-2004 Otto Bruggeman
@@ -296,7 +357,30 @@
  		delete temp;
  	}
  
-@@ -571,12 +585,13 @@
+@@ -413,11 +427,18 @@
+ void KompareModelList::setEncoding( const QString& encoding )
+ {
+ 	m_encoding = encoding;
+-	kDebug() << "Encoding : " << encoding << endl;
+-	m_textCodec = KGlobal::charsets()->codecForName( encoding.latin1() );
+-	kDebug() << "TextCodec: " << m_textCodec << endl;
+-	if ( !m_textCodec )
++	if ( !encoding.compare( "default", Qt::CaseInsensitive ) )
++	{
+ 		m_textCodec = QTextCodec::codecForLocale();
++	}
++	else
++	{
++		kDebug() << "Encoding : " << encoding << endl;
++		m_textCodec = KGlobal::charsets()->codecForName( encoding.latin1() );
++		kDebug() << "TextCodec: " << m_textCodec << endl;
++		if ( !m_textCodec )
++			m_textCodec = QTextCodec::codecForLocale();
++	}
+ 	kDebug() << "TextCodec: " << m_textCodec << endl;
+ }
+ 
+@@ -571,12 +592,13 @@
  {
  	kDebug() << "KompareModelList::saveDiff: " << endl;
  
@@ -312,7 +396,7 @@
  		delete m_diffTemp;
  		m_diffTemp = 0;
  		return false;
-@@ -598,9 +613,9 @@
+@@ -598,9 +620,9 @@
  
  	if( success )
  	{
@@ -324,7 +408,7 @@
  
  		m_diffTemp->close();
  
-@@ -615,7 +630,7 @@
+@@ -615,7 +637,7 @@
  	}
  
  	m_diffURL.truncate( 0 );
@@ -333,7 +417,7 @@
  
  	delete m_diffTemp;
  	m_diffTemp = 0;
-@@ -856,6 +871,7 @@
+@@ -856,6 +878,7 @@
  int KompareModelList::parseDiffOutput( const QString& diff )
  {
  	kDebug(8101) << "KompareModelList::parseDiffOutput" << endl;
@@ -341,7 +425,7 @@
  
  	QStringList diffLines = split( diff );
  
-@@ -949,10 +965,14 @@
+@@ -949,10 +972,14 @@
  
  	int srcLineNo = 1, destLineNo = 1;
  
@@ -362,7 +446,7 @@
 Index: kompare/libdiff2/komparemodellist.h
 ===================================================================
 --- kompare/libdiff2/komparemodellist.h	(revision 745228)
-+++ kompare/libdiff2/komparemodellist.h	(revision 748928)
++++ kompare/libdiff2/komparemodellist.h	(revision 750443)
 @@ -4,8 +4,10 @@
      begin                : Tue Jun 26 2001
      copyright            : (C) 2001-2003 by John Firebaugh
@@ -418,7 +502,7 @@
 Index: kompare/libdiff2/parserbase.cpp
 ===================================================================
 --- kompare/libdiff2/parserbase.cpp	(revision 745228)
-+++ kompare/libdiff2/parserbase.cpp	(revision 748928)
++++ kompare/libdiff2/parserbase.cpp	(revision 750443)
 @@ -3,7 +3,9 @@
  **                              -------------------
  **      begin                   : Sun Aug  4 15:05:35 2002
@@ -438,10 +522,35 @@
  	{
  		++m_diffIterator;
  		return true;
+@@ -529,10 +531,24 @@
+ //	kDebug(8101) << "ParserBase::parseUnifiedHunkBody" << endl;
+ 
+ 	int linenoA = 0, linenoB = 0;
++	bool wasNum;
+ 
+ 	// Fetching the stuff we need from the hunkheader regexp that was parsed in parseUnifiedHunkHeader();
+ 	linenoA = m_unifiedHunkHeader.cap( 1 ).toInt();
++	if( !m_unifiedHunkHeader.cap( 3 ).isEmpty() && m_unifiedHunkHeader.cap( 3 ).toInt(&wasNum) == 0 ) {
++		// If a hunk is an insertion or deletion with no context, the line number given
++		// is the one before the hunk. this isn't what we want, so increment it to fix this.
++		if( wasNum == false )
++			return false;
++		linenoA++;
++	}
+ 	linenoB = m_unifiedHunkHeader.cap( 4 ).toInt();
++	if( !m_unifiedHunkHeader.cap( 6 ).isEmpty() && m_unifiedHunkHeader.cap( 6 ).toInt(&wasNum) == 0 ) {
++		// see above
++		if( wasNum == false )
++			return false;
++		linenoB++;
++	}
+ 	QString function = m_unifiedHunkHeader.cap( 7 );
+ 	for ( int i = 0; i < 9; i++ )
+ 	{
 Index: kompare/libdiff2/diffmodellist.h
 ===================================================================
 --- kompare/libdiff2/diffmodellist.h	(revision 745228)
-+++ kompare/libdiff2/diffmodellist.h	(revision 748928)
++++ kompare/libdiff2/diffmodellist.h	(revision 750443)
 @@ -22,6 +22,7 @@
  #include <q3valuelist.h> // include for the base class
  
@@ -459,10 +568,56 @@
  {
  public:
  	DiffModelList() {}
+Index: kompare/libdiff2/difference.cpp
+===================================================================
+--- kompare/libdiff2/difference.cpp	(revision 745228)
++++ kompare/libdiff2/difference.cpp	(revision 750443)
+@@ -26,14 +26,12 @@
+ 	m_type( type ),
+ 	m_sourceLineNo( sourceLineNo ),
+ 	m_destinationLineNo( destinationLineNo ),
+-	m_applied( false ),
+-	m_table( new LevenshteinTable() )
++	m_applied( false )
+ {
+ }
+ 
+ Difference::~Difference()
+ {
+-	delete m_table;
+ }
+ 
+ void Difference::addSourceLine( QString line )
+@@ -63,6 +61,7 @@
+ 
+ void Difference::determineInlineDifferences()
+ {
++	LevenshteinTable table;
+ 	if ( m_type != Difference::Change )
+ 		return;
+ 
+@@ -80,15 +79,10 @@
+ 		DifferenceString* dl = destinationLineAt( i );
+ 
+ 		// FIXME: If the table cant be created dont do the rest
+-		m_table->createTable( sl, dl );
++		table.createTable( sl, dl );
+ 
+-		m_table->createListsOfMarkers();
++		table.createListsOfMarkers();
+ 	}
+-
+-	// No longer needed, if we ever need to recalculate the inline differences we should
+-	// simply recreate the table
+-	delete m_table;
+-	m_table = 0;
+ }
+ 
+ QString Difference::recreateDifference() const
 Index: kompare/libdiff2/CMakeLists.txt
 ===================================================================
 --- kompare/libdiff2/CMakeLists.txt	(revision 745228)
-+++ kompare/libdiff2/CMakeLists.txt	(revision 748928)
++++ kompare/libdiff2/CMakeLists.txt	(revision 750443)
 @@ -19,54 +19,9 @@
  	perforceparser.cpp )
  
@@ -524,7 +679,7 @@
 Index: kompare/libdiff2/levenshteintable.cpp
 ===================================================================
 --- kompare/libdiff2/levenshteintable.cpp	(revision 745228)
-+++ kompare/libdiff2/levenshteintable.cpp	(revision 748928)
++++ kompare/libdiff2/levenshteintable.cpp	(revision 750443)
 @@ -3,7 +3,9 @@
  ** Filename   : levenshteintable.cpp
  ** Created on : 08 november, 2003
@@ -549,10 +704,53 @@
  			if ( si == dj )
  				cost = 0;
  			else
+Index: kompare/libdiff2/kompareprocess.cpp
+===================================================================
+--- kompare/libdiff2/kompareprocess.cpp	(revision 745228)
++++ kompare/libdiff2/kompareprocess.cpp	(revision 750443)
+@@ -4,8 +4,10 @@
+         begin                   : Sun Mar 4 2001
+         copyright               : (C) 2001-2003 by Otto Bruggeman
+                                   and John Firebaugh
++                                  (C) 2007      Kevin Kofler
+         email                   : otto.bruggeman at home.nl
+                                   jfirebaugh at kde.org
++                                  kevin.kofler at chello.at
+ ****************************************************************************/
+ 
+ /***************************************************************************
+@@ -215,14 +217,21 @@
+ 
+ void KompareProcess::setEncoding( const QString& encoding )
+ {
+-	QTextCodec* textCodec = KGlobal::charsets()->codecForName( encoding.latin1() );
+-	if ( textCodec )
+-		m_textDecoder = textCodec->makeDecoder();
++	if ( !encoding.compare( "default", Qt::CaseInsensitive ) )
++	{
++		m_textDecoder = QTextCodec::codecForLocale()->makeDecoder();
++	}
+ 	else
+ 	{
+-		kDebug(8101) << "Using locale codec as backup..." << endl;
+-		textCodec = QTextCodec::codecForLocale();
+-		m_textDecoder = textCodec->makeDecoder();
++		QTextCodec* textCodec = KGlobal::charsets()->codecForName( encoding.latin1() );
++		if ( textCodec )
++			m_textDecoder = textCodec->makeDecoder();
++		else
++		{
++			kDebug(8101) << "Using locale codec as backup..." << endl;
++			textCodec = QTextCodec::codecForLocale();
++			m_textDecoder = textCodec->makeDecoder();
++		}
+ 	}
+ }
+ 
 Index: kompare/kompareurldialog.cpp
 ===================================================================
 --- kompare/kompareurldialog.cpp	(revision 745228)
-+++ kompare/kompareurldialog.cpp	(revision 748928)
++++ kompare/kompareurldialog.cpp	(revision 750443)
 @@ -1,11 +1,13 @@
  /***************************************************************************
 -                                comparedialog.cpp  -  description
@@ -568,7 +766,7 @@
  ****************************************************************************/
  
  /***************************************************************************
-@@ -36,26 +38,27 @@
+@@ -36,26 +38,30 @@
      setFaceType( List );
  	KSharedConfig::Ptr cfg = KGlobal::config();
  
@@ -576,6 +774,7 @@
 -	m_filesPage = new FilesPage( 0 );
 +	m_filesPage = new FilesPage();
 +	KPageWidgetItem *filesItem = addPage( m_filesPage, i18n( "Files" ) );
++	filesItem->setIcon( KIcon( "text-plain" ) );
 +	filesItem->setHeader( i18n( "Here you can enter the files you want to compare." ) );
  	m_filesSettings = new FilesSettings( this );
 -	m_filesSettings->loadSettings( cfg );
@@ -597,6 +796,7 @@
 -// 	m_viewPage->setSettings( m_viewSettings );
 +	m_diffPage = new DiffPage();
 +	KPageWidgetItem *diffItem = addPage( m_diffPage, i18n( "Diff" ) );
++	diffItem->setIcon( KIcon( "text-x-patch" ) );
 +	diffItem->setHeader( i18n( "Here you can change the options for comparing the files." ) );
 +	m_diffSettings = new DiffSettings( this );
 +	m_diffSettings->loadSettings( cfg.data() );
@@ -604,6 +804,7 @@
  
 +	m_viewPage = new ViewPage();
 +	KPageWidgetItem *viewItem = addPage( m_viewPage, i18n( "Appearance" ) );
++	viewItem->setIcon( KIcon( "preferences-desktop-theme" ) );
 +	viewItem->setHeader( i18n( "Here you can change the options for the view." ) );
 +	m_viewSettings = new ViewSettings( this );
 +	m_viewSettings->loadSettings( cfg.data() );
@@ -612,7 +813,7 @@
  	adjustSize();
  
  	showButtonSeparator( true );
-@@ -65,6 +68,8 @@
+@@ -65,6 +71,8 @@
  	connect( m_filesPage->secondURLRequester(), SIGNAL( textChanged( const QString& ) ),
  	         this, SLOT( slotEnableOk() ) );
  
@@ -621,7 +822,7 @@
  	slotEnableOk();
  }
  
-@@ -82,13 +87,13 @@
+@@ -82,13 +90,13 @@
  	m_diffPage->apply();
  	m_viewPage->apply();
  
@@ -639,7 +840,7 @@
  }
  
  void KompareURLDialog::slotEnableOk()
-@@ -125,7 +130,7 @@
+@@ -125,7 +133,7 @@
  void KompareURLDialog::setGroup( const QString& groupName )
  {
  	m_filesSettings->setGroup( groupName );
@@ -651,7 +852,7 @@
 Index: kompare/interfaces/kompareinterfaceexport.h
 ===================================================================
 --- kompare/interfaces/kompareinterfaceexport.h	(revision 0)
-+++ kompare/interfaces/kompareinterfaceexport.h	(revision 748928)
++++ kompare/interfaces/kompareinterfaceexport.h	(revision 750443)
 @@ -0,0 +1,37 @@
 +/***************************************************************************
 + *   Copyright 2007 Andreas Pakulat <apaku at gmx.de>                         *
@@ -693,7 +894,7 @@
 Index: kompare/komparepart/kompare_qsplitter.h
 ===================================================================
 --- kompare/komparepart/kompare_qsplitter.h	(revision 745228)
-+++ kompare/komparepart/kompare_qsplitter.h	(revision 748928)
++++ kompare/komparepart/kompare_qsplitter.h	(revision 750443)
 @@ -1,213 +0,0 @@
 -/****************************************************************************
 -**
@@ -911,7 +1112,7 @@
 Index: kompare/komparepart/kompareprefdlg.cpp
 ===================================================================
 --- kompare/komparepart/kompareprefdlg.cpp	(revision 745228)
-+++ kompare/komparepart/kompareprefdlg.cpp	(revision 748928)
++++ kompare/komparepart/kompareprefdlg.cpp	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001-2003 by Otto Bruggeman
@@ -932,7 +1133,7 @@
  #include <kdebug.h>
  #include <kiconloader.h>
  #include <klocale.h>
-@@ -30,22 +30,36 @@
+@@ -30,22 +30,38 @@
  
  // implementation
  
@@ -955,6 +1156,7 @@
 -	m_viewPage = new ViewPage( frame );
 +	m_viewPage = new ViewPage();
 +	KPageWidgetItem *item = addPage( m_viewPage, i18n( "View" ) );
++	item->setIcon( KIcon( "preferences-desktop-theme" ) );
 +	item->setHeader( i18n( "View Settings" ) );
  	m_viewPage->setSettings( viewSets );
  
@@ -962,6 +1164,7 @@
 -	m_diffPage = new DiffPage( frame );
 +	m_diffPage = new DiffPage();
 +	item = addPage( m_diffPage, i18n( "Diff" ) );
++	item->setIcon( KIcon( "text-x-patch" ) );
 +	item->setHeader( i18n( "Diff Settings" ) );
  	m_diffPage->setSettings( diffSets );
  
@@ -976,7 +1179,7 @@
  	adjustSize();
  }
  
-@@ -90,7 +104,7 @@
+@@ -90,7 +106,7 @@
  	m_viewPage->apply();
  	m_diffPage->apply();
  
@@ -985,7 +1188,7 @@
  }
  
  /** No descriptions */
-@@ -100,7 +114,7 @@
+@@ -100,7 +116,7 @@
  	m_viewPage->restore();
  	m_diffPage->restore();
  
@@ -997,7 +1200,7 @@
 Index: kompare/komparepart/kompareprefdlg.h
 ===================================================================
 --- kompare/komparepart/kompareprefdlg.h	(revision 745228)
-+++ kompare/komparepart/kompareprefdlg.h	(revision 748928)
++++ kompare/komparepart/kompareprefdlg.h	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001-2003 by Otto Bruggeman
@@ -1029,7 +1232,7 @@
 Index: kompare/komparepart/kompareconnectwidget.cpp
 ===================================================================
 --- kompare/komparepart/kompareconnectwidget.cpp	(revision 745228)
-+++ kompare/komparepart/kompareconnectwidget.cpp	(revision 748928)
++++ kompare/komparepart/kompareconnectwidget.cpp	(revision 750443)
 @@ -5,9 +5,11 @@
      copyright            : (C) 2001-2003 John Firebaugh
                             (C) 2001-2004 Otto Bruggeman
@@ -1266,7 +1469,7 @@
 Index: kompare/komparepart/komparesaveoptionsbase.ui
 ===================================================================
 --- kompare/komparepart/komparesaveoptionsbase.ui	(revision 745228)
-+++ kompare/komparepart/komparesaveoptionsbase.ui	(revision 748928)
++++ kompare/komparepart/komparesaveoptionsbase.ui	(revision 750443)
 @@ -1,336 +1,295 @@
 -<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 -<class>KompareSaveOptionsBase</class>
@@ -1873,7 +2076,7 @@
 Index: kompare/komparepart/kompareconnectwidget.h
 ===================================================================
 --- kompare/komparepart/kompareconnectwidget.h	(revision 745228)
-+++ kompare/komparepart/kompareconnectwidget.h	(revision 748928)
++++ kompare/komparepart/kompareconnectwidget.h	(revision 750443)
 @@ -5,9 +5,11 @@
      copyright            : (C) 2001-2003 John Firebaugh
                             (C) 2001-2004 Otto Bruggeman
@@ -1964,7 +2167,7 @@
 Index: kompare/komparepart/komparesaveoptionsbase.cpp
 ===================================================================
 --- kompare/komparepart/komparesaveoptionsbase.cpp	(revision 0)
-+++ kompare/komparepart/komparesaveoptionsbase.cpp	(revision 748928)
++++ kompare/komparepart/komparesaveoptionsbase.cpp	(revision 750443)
 @@ -0,0 +1,51 @@
 +/***************************************************************************
 +                                komparesaveoptionsbase.cpp  -  description
@@ -2020,7 +2223,7 @@
 Index: kompare/komparepart/kompare_part.cpp
 ===================================================================
 --- kompare/komparepart/kompare_part.cpp	(revision 745228)
-+++ kompare/komparepart/kompare_part.cpp	(revision 748928)
++++ kompare/komparepart/kompare_part.cpp	(revision 750443)
 @@ -5,9 +5,11 @@
          copyright               : (C) 2001-2004 Otto Bruggeman
                                    (C) 2001-2003 John Firebaugh
@@ -2033,7 +2236,7 @@
  ****************************************************************************/
  
  /***************************************************************************
-@@ -19,21 +21,20 @@
+@@ -19,21 +21,19 @@
  **
  ***************************************************************************/
  
@@ -2047,7 +2250,6 @@
  #include <kapplication.h>
  #include <kdebug.h>
 -#include <kfiletreeview.h>
-+#include <k3filetreeview.h>
  #include <kfiledialog.h>
  #include <klocale.h>
  #include <kmessagebox.h>
@@ -2058,7 +2260,7 @@
  #include <kparts/genericfactory.h>
  //#include <ktempdir.h>
  
-@@ -57,9 +58,8 @@
+@@ -57,9 +57,8 @@
  ViewSettings* KomparePart::m_viewSettings = 0L;
  DiffSettings* KomparePart::m_diffSettings = 0L;
  
@@ -2070,7 +2272,7 @@
  	m_tempDiff( 0 ),
  	m_info()
  {
-@@ -73,7 +73,7 @@
+@@ -73,7 +72,7 @@
  		m_diffSettings = new DiffSettings( 0 );
  	}
  
@@ -2079,7 +2281,7 @@
  
  	// This creates the "Model creator" and connects the signals and slots
  	m_modelList = new Diff2::KompareModelList( m_diffSettings, m_info, this, "komparemodellist" );
-@@ -115,9 +115,11 @@
+@@ -115,9 +114,11 @@
  	         this, SIGNAL(applyAllDifferences(bool)) );
  	connect( m_modelList, SIGNAL(applyDifference(const Diff2::Difference*, bool)),
  	         this, SIGNAL(applyDifference(const Diff2::Difference*, bool)) );
@@ -2092,7 +2294,7 @@
  
  	connect( m_modelList, SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)),
  	         m_splitter,  SLOT(slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*)) );
-@@ -163,18 +165,15 @@
+@@ -163,18 +164,15 @@
  {
  	// create our actions
  
@@ -2109,7 +2311,7 @@
 -	                                 this, SLOT(slotShowDiffstats()),
 -	                                 actionCollection(), "file_diffstats" );
 +	m_saveAll = actionCollection()->addAction("file_save_all", this, SLOT(saveAll()));
-+	m_saveAll->setIcon(KIcon("save_all"));
++	m_saveAll->setIcon(KIcon("document-save-all"));
 +	m_saveAll->setText(i18n("Save &All"));
 +	m_saveDiff = actionCollection()->addAction("file_save_diff", this, SLOT(saveDiff()));
 +	m_saveDiff->setText(i18n("Save .&diff..."));
@@ -2120,7 +2322,7 @@
  
  	KStandardAction::preferences(this, SLOT(optionsPreferences()), actionCollection());
  }
-@@ -407,7 +406,7 @@
+@@ -407,7 +405,7 @@
  {
  	// This is called from openURL
  	// This is a little inefficient but i will do it anyway
@@ -2129,7 +2331,7 @@
  	return true;
  }
  
-@@ -422,29 +421,31 @@
+@@ -422,29 +420,31 @@
  
  void KomparePart::saveDiff()
  {
@@ -2168,7 +2370,7 @@
  				if ( result == KMessageBox::Cancel )
  				{
  					break;
-@@ -759,3 +760,5 @@
+@@ -759,3 +759,5 @@
  }
  
  #include "kompare_part.moc"
@@ -2177,7 +2379,7 @@
 Index: kompare/komparepart/komparelistview.cpp
 ===================================================================
 --- kompare/komparepart/komparelistview.cpp	(revision 745228)
-+++ kompare/komparepart/komparelistview.cpp	(revision 748928)
++++ kompare/komparepart/komparelistview.cpp	(revision 750443)
 @@ -19,10 +19,15 @@
  **
  ***************************************************************************/
@@ -2353,7 +2555,7 @@
 Index: kompare/komparepart/komparesplitter.cpp
 ===================================================================
 --- kompare/komparepart/komparesplitter.cpp	(revision 745228)
-+++ kompare/komparepart/komparesplitter.cpp	(revision 748928)
++++ kompare/komparepart/komparesplitter.cpp	(revision 750443)
 @@ -1,12 +1,14 @@
 -/***************************************************************************
 -                                komparesplitter.cpp  -  description
@@ -3263,7 +3465,7 @@
 Index: kompare/komparepart/komparesaveoptionsbase.h
 ===================================================================
 --- kompare/komparepart/komparesaveoptionsbase.h	(revision 0)
-+++ kompare/komparepart/komparesaveoptionsbase.h	(revision 748928)
++++ kompare/komparepart/komparesaveoptionsbase.h	(revision 750443)
 @@ -0,0 +1,40 @@
 +/***************************************************************************
 +                                komparesaveoptionsbase.h  -  description
@@ -3308,7 +3510,7 @@
 Index: kompare/komparepart/kompare_part.h
 ===================================================================
 --- kompare/komparepart/kompare_part.h	(revision 745228)
-+++ kompare/komparepart/kompare_part.h	(revision 748928)
++++ kompare/komparepart/kompare_part.h	(revision 750443)
 @@ -5,9 +5,11 @@
          copyright               : (C) 2001-2004 Otto Bruggeman
                                    (C) 2001-2003 John Firebaugh
@@ -3364,7 +3566,7 @@
 Index: kompare/komparepart/komparelistview.h
 ===================================================================
 --- kompare/komparepart/komparelistview.h	(revision 745228)
-+++ kompare/komparepart/komparelistview.h	(revision 748928)
++++ kompare/komparepart/komparelistview.h	(revision 750443)
 @@ -22,10 +22,17 @@
  #ifndef KOMPARELISTVIEW_H
  #define KOMPARELISTVIEW_H
@@ -3421,7 +3623,7 @@
 Index: kompare/komparepart/komparesplitter.h
 ===================================================================
 --- kompare/komparepart/komparesplitter.h	(revision 745228)
-+++ kompare/komparepart/komparesplitter.h	(revision 748928)
++++ kompare/komparepart/komparesplitter.h	(revision 750443)
 @@ -1,9 +1,11 @@
  /***************************************************************************
 -                                kompareview.cpp  -  description
@@ -3562,7 +3764,7 @@
 Index: kompare/komparepart/CMakeLists.txt
 ===================================================================
 --- kompare/komparepart/CMakeLists.txt	(revision 745228)
-+++ kompare/komparepart/CMakeLists.txt	(revision 748928)
++++ kompare/komparepart/CMakeLists.txt	(revision 750443)
 @@ -10,6 +10,7 @@
     komparesplitter.cpp 
     komparelistview.cpp 
@@ -3583,7 +3785,7 @@
 Index: kompare/komparepart/komparesaveoptionswidget.cpp
 ===================================================================
 --- kompare/komparepart/komparesaveoptionswidget.cpp	(revision 745228)
-+++ kompare/komparepart/komparesaveoptionswidget.cpp	(revision 748928)
++++ kompare/komparepart/komparesaveoptionswidget.cpp	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001-2003 by Otto Bruggeman
@@ -3639,7 +3841,7 @@
 Index: kompare/main.cpp
 ===================================================================
 --- kompare/main.cpp	(revision 745228)
-+++ kompare/main.cpp	(revision 748928)
++++ kompare/main.cpp	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001-2004 Otto Bruggeman
@@ -3651,8 +3853,12 @@
  ****************************************************************************/
  
  /***************************************************************************
-@@ -42,6 +44,7 @@
- 	                      ki18n("(c) 2001-2004, John Firebaugh and Otto Bruggeman"), KLocalizedString(), "http://bruggie.dnsalias.org/kompare/" );
+@@ -39,9 +41,10 @@
+ {
+ 	KAboutData aboutData( "kompare", 0, ki18n("Kompare"), version, ki18n(description),
+ 	                      KAboutData::License_GPL,
+-	                      ki18n("(c) 2001-2004, John Firebaugh and Otto Bruggeman"), KLocalizedString(), "http://bruggie.dnsalias.org/kompare/" );
++	                      ki18n("(c) 2001-2004, John Firebaugh and Otto Bruggeman") );
  	aboutData.addAuthor( ki18n("John Firebaugh"), ki18n("Author"), "jfirebaugh at kde.org" );
  	aboutData.addAuthor( ki18n("Otto Bruggeman"), ki18n("Author"), "otto.bruggeman at home.nl" );
 +	// FIXME: At least Jeff Snyder and Kevin Kofler should be listed here, and it's not 2004 anymore, but we're in a string freeze.
@@ -3680,7 +3886,7 @@
 Index: kompare/kompare_shell.cpp
 ===================================================================
 --- kompare/kompare_shell.cpp	(revision 745228)
-+++ kompare/kompare_shell.cpp	(revision 748928)
++++ kompare/kompare_shell.cpp	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001-2004 Otto Bruggeman
@@ -3763,7 +3969,37 @@
  	// Read basic main-view settings, and set to autosave
  	setAutoSaveSettings( "General Options" );
  }
-@@ -242,23 +249,27 @@
+@@ -202,7 +209,6 @@
+ {
+ 	kDebug(8102) << "Url = " << url.prettyUrl() << endl;
+ 	m_diffURL = url;
+-	m_viewPart->setEncoding( "Default" );
+ 	m_viewPart->openDiff( url );
+ }
+ 
+@@ -217,7 +223,6 @@
+ 
+ 	file.close();
+ 
+-	m_viewPart->setEncoding( "Default" );
+ 	m_viewPart->openDiff( diff );
+ 
+ }
+@@ -227,7 +232,6 @@
+ 	m_sourceURL = source;
+ 	m_destinationURL = destination;
+ 
+-	m_viewPart->setEncoding( "Default" );
+ 	m_viewPart->compare( source, destination );
+ }
+ 
+@@ -236,29 +240,30 @@
+ 	m_sourceURL = url1;
+ 	m_destinationURL = diff;
+ 
+-	m_viewPart->setEncoding( "Default" );
+ 	m_viewPart->openDirAndDiff( url1, diff );
+ }
  
  void KompareShell::setupActions()
  {
@@ -3788,9 +4024,9 @@
 +	a->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_B));
 +	actionCollection()->addAction(KStandardAction::Quit, this, SLOT( slotFileClose() ));
  
- #if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
+-#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
  	createStandardStatusBarAction();
- #endif
+-#endif
  	setStandardToolBarMenuEnabled(true);
 -	m_showTextView = new KToggleAction( i18n("Show T&ext View"), 0, this, SLOT(slotShowTextView()),
 -	                                  actionCollection(), "options_show_text_view" );
@@ -3803,7 +4039,7 @@
  
  	KStandardAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection());
  	KStandardAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection());
-@@ -308,58 +319,58 @@
+@@ -308,58 +313,58 @@
  	KParts::MainWindow::setCaption( caption, m_viewPart->isModified() );
  }
  
@@ -3878,7 +4114,7 @@
  	}
  }
  
-@@ -460,35 +471,48 @@
+@@ -460,35 +465,48 @@
  		{
  			m_textView = qobject_cast<KTextEditor::View*>( m_textViewPart->createView( this ) );
  			m_textViewWidget->setWidget( static_cast<QWidget*>(m_textView) );
@@ -3936,7 +4172,7 @@
  	// use the standard toolbar editor
  	KEditToolBar dlg(factory());
  	connect(&dlg,SIGNAL(newToolbarConfig()),this,SLOT(newToolbarConfig()));
-@@ -497,7 +521,8 @@
+@@ -497,7 +515,8 @@
  
  void KompareShell::newToolbarConfig()
  {
@@ -3946,10 +4182,22 @@
  }
  
  #include "kompare_shell.moc"
+Index: kompare/kompare.desktop
+===================================================================
+--- kompare/kompare.desktop	(revision 745228)
++++ kompare/kompare.desktop	(revision 750443)
+@@ -48,6 +48,7 @@
+ GenericName[pt_BR]=Interface do Diff/Patch
+ GenericName[ro]=Interfaţă grafică pentru "diff" şi "patch"
+ GenericName[ru]=Утилита сравнения файлов
++GenericName[sk]=Rozhranie Diff/Patch
+ GenericName[sl]=Vmesnik za diff/patch
+ GenericName[sr]=Интерфејс за Diff/Patch
+ GenericName[sr at latin]=Interfejs za Diff/Patch
 Index: kompare/libdialogpages/diffsettings.h
 ===================================================================
 --- kompare/libdialogpages/diffsettings.h	(revision 745228)
-+++ kompare/libdialogpages/diffsettings.h	(revision 748928)
++++ kompare/libdialogpages/diffsettings.h	(revision 750443)
 @@ -25,8 +25,9 @@
  
  #include "kompare.h"
@@ -3964,7 +4212,7 @@
 Index: kompare/libdialogpages/filespage.cpp
 ===================================================================
 --- kompare/libdialogpages/filespage.cpp	(revision 745228)
-+++ kompare/libdialogpages/filespage.cpp	(revision 748928)
++++ kompare/libdialogpages/filespage.cpp	(revision 750443)
 @@ -3,8 +3,9 @@
                                  -------------------
          begin                   : Sun Apr 18 2004
@@ -4072,7 +4320,7 @@
 Index: kompare/libdialogpages/viewsettings.h
 ===================================================================
 --- kompare/libdialogpages/viewsettings.h	(revision 745228)
-+++ kompare/libdialogpages/viewsettings.h	(revision 748928)
++++ kompare/libdialogpages/viewsettings.h	(revision 750443)
 @@ -25,8 +25,9 @@
  
  #include "difference.h"
@@ -4087,7 +4335,7 @@
 Index: kompare/libdialogpages/filespage.h
 ===================================================================
 --- kompare/libdialogpages/filespage.h	(revision 745228)
-+++ kompare/libdialogpages/filespage.h	(revision 748928)
++++ kompare/libdialogpages/filespage.h	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001-2004 Otto Bruggeman
@@ -4135,7 +4383,7 @@
 Index: kompare/libdialogpages/diffpage.cpp
 ===================================================================
 --- kompare/libdialogpages/diffpage.cpp	(revision 745228)
-+++ kompare/libdialogpages/diffpage.cpp	(revision 748928)
++++ kompare/libdialogpages/diffpage.cpp	(revision 750443)
 @@ -1,9 +1,11 @@
  /***************************************************************************
 -				diffprefs.cpp  -  description
@@ -4153,7 +4401,11 @@
  ****************************************************************************/
  
  /***************************************************************************
-@@ -26,6 +28,7 @@
+@@ -22,10 +24,10 @@
+ #include <qradiobutton.h>
+ #include <qspinbox.h>
+ 
+-#include <q3whatsthis.h>
  #include <QVBoxLayout>
  #include <QHBoxLayout>
  #include <QTabWidget>
@@ -4161,7 +4413,7 @@
  #include <kbuttongroup.h>
  #include <kapplication.h>
  #include <kcombobox.h>
-@@ -45,8 +48,7 @@
+@@ -45,8 +47,7 @@
  
  #include "diffpage.h"
  
@@ -4171,7 +4423,7 @@
  {
  	m_tabWidget = new QTabWidget( this );
  
-@@ -93,8 +95,8 @@
+@@ -93,8 +94,8 @@
  
  	m_excludeFileCheckBox->setChecked( m_settings->m_excludeFilesFile );
  	slotExcludeFileToggled           ( m_settings->m_excludeFilesFile );
@@ -4182,7 +4434,7 @@
  }
  
  DiffSettings* DiffPage::settings( void )
-@@ -109,7 +111,7 @@
+@@ -109,7 +110,7 @@
  
  void DiffPage::apply()
  {
@@ -4191,7 +4443,7 @@
  
  	m_settings->m_largeFiles                     = m_largerCheckBox->isChecked();
  	m_settings->m_createSmallerDiff              = m_smallerCheckBox->isChecked();
-@@ -135,7 +137,7 @@
+@@ -135,7 +136,7 @@
  	m_settings->m_excludeFilesFileURL            = m_excludeFileURLComboBox->currentText();
  	m_settings->m_excludeFilesFileHistoryList    = m_excludeFileURLComboBox->urls();
  
@@ -4200,7 +4452,7 @@
  }
  
  void DiffPage::setDefaults()
-@@ -215,12 +217,14 @@
+@@ -215,12 +216,14 @@
  	// add diff program selector
  	m_diffProgramGroup = new KButtonGroup( page );
  	layout->addWidget( m_diffProgramGroup );
@@ -4210,14 +4462,18 @@
  
  	m_diffURLRequester = new KUrlRequester( m_diffProgramGroup);
  	m_diffURLRequester->setObjectName("diffURLRequester" );
- 	Q3WhatsThis::add( m_diffURLRequester, i18n( "You can select a different diff program here. On Solaris the standard diff program does not support all the options that the GNU version does. This way you can select that version." ) );
+-	Q3WhatsThis::add( m_diffURLRequester, i18n( "You can select a different diff program here. On Solaris the standard diff program does not support all the options that the GNU version does. This way you can select that version." ) );
++	m_diffURLRequester->setWhatsThis( i18n( "You can select a different diff program here. On Solaris the standard diff program does not support all the options that the GNU version does. This way you can select that version." ) );
 +	bgLayout->addWidget( m_diffURLRequester );
  
  	layout->addStretch( 1 );
  	page->setMinimumSize( sizeHintForWidget( page ) );
-@@ -239,20 +243,26 @@
+@@ -237,29 +240,35 @@
+ 
+ 	// add diff modes
  	m_modeButtonGroup = new KButtonGroup( page );
- 	Q3WhatsThis::add( m_modeButtonGroup, i18n( "Select the format of the output generated by diff. Unified is the one that is used most frequently because it is very readable. The KDE developers like this format the best so use it for sending patches." ) );
+-	Q3WhatsThis::add( m_modeButtonGroup, i18n( "Select the format of the output generated by diff. Unified is the one that is used most frequently because it is very readable. The KDE developers like this format the best so use it for sending patches." ) );
++	m_modeButtonGroup->setWhatsThis( i18n( "Select the format of the output generated by diff. Unified is the one that is used most frequently because it is very readable. The KDE developers like this format the best so use it for sending patches." ) );
  	layout->addWidget( m_modeButtonGroup );
 +	QVBoxLayout* bgLayout = new QVBoxLayout( m_modeButtonGroup );
  	m_modeButtonGroup->setTitle( i18n( "Output Format" ) );
@@ -4243,7 +4499,15 @@
  	layout->addWidget( groupBox );
  	groupBox->setTitle( i18n( "Lines of Context" ) );
  	//groupBox->setMargin( KDialog::marginHint() );
-@@ -278,15 +288,19 @@
+ 
+ 	QLabel* label = new QLabel( i18n( "Number of context lines:" ), groupBox );
+ 	m_locSpinBox = new QSpinBox( 0, 100, 1, groupBox );
+-	Q3WhatsThis::add( m_locSpinBox, i18n( "The number of context lines is normally 2 or 3. This makes the diff readable and applicable in most cases. More than 3 lines will only bloat the diff unnecessarily." ) );
++	m_locSpinBox->setWhatsThis( i18n( "The number of context lines is normally 2 or 3. This makes the diff readable and applicable in most cases. More than 3 lines will only bloat the diff unnecessarily." ) );
+ 	label->setBuddy( m_locSpinBox );
+ 
+ 	layout->addStretch( 1 );
+@@ -278,15 +287,19 @@
  	// add diff options
  	KButtonGroup* optionButtonGroup = new KButtonGroup( page );
  	layout->addWidget( optionButtonGroup );
@@ -4263,7 +4527,7 @@
  
  	QHBoxLayout* groupLayout = new QHBoxLayout( layout );
  	groupLayout->setObjectName( "regexp_horizontal_layout" );
-@@ -312,19 +326,25 @@
+@@ -312,19 +325,25 @@
  
  	KButtonGroup* moreOptionButtonGroup = new KButtonGroup( page );
  	layout->addWidget( moreOptionButtonGroup );
@@ -4289,7 +4553,7 @@
  
  	layout->addStretch( 1 );
  	page->setMinimumSize( sizeHintForWidget( page ) );
-@@ -339,7 +359,7 @@
+@@ -339,7 +358,7 @@
  	layout->setSpacing( KDialog::spacingHint() );
  	layout->setMargin( KDialog::marginHint() );
  
@@ -4298,7 +4562,7 @@
  	excludeFilePatternGroupBox->setTitle( i18n( "File Pattern to Exclude" ) );
  	m_excludeFilePatternCheckBox = new QCheckBox( "", excludeFilePatternGroupBox );
  	QToolTip::add( m_excludeFilePatternCheckBox, i18n( "If this is checked you can enter a shell pattern in the text box on the right or select entries from the list." ) );
-@@ -350,7 +370,7 @@
+@@ -350,7 +369,7 @@
  
  	connect( m_excludeFilePatternCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotExcludeFilePatternToggled(bool)));
  
@@ -4310,7 +4574,7 @@
 Index: kompare/libdialogpages/viewpage.cpp
 ===================================================================
 --- kompare/libdialogpages/viewpage.cpp	(revision 745228)
-+++ kompare/libdialogpages/viewpage.cpp	(revision 748928)
++++ kompare/libdialogpages/viewpage.cpp	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001-2002 by Otto Bruggeman
@@ -4419,7 +4683,7 @@
 Index: kompare/libdialogpages/pagebase.cpp
 ===================================================================
 --- kompare/libdialogpages/pagebase.cpp	(revision 745228)
-+++ kompare/libdialogpages/pagebase.cpp	(revision 748928)
++++ kompare/libdialogpages/pagebase.cpp	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001 by Otto Bruggeman
@@ -4443,7 +4707,7 @@
 Index: kompare/libdialogpages/diffpage.h
 ===================================================================
 --- kompare/libdialogpages/diffpage.h	(revision 745228)
-+++ kompare/libdialogpages/diffpage.h	(revision 748928)
++++ kompare/libdialogpages/diffpage.h	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001-2004 Otto Bruggeman
@@ -4480,7 +4744,7 @@
 Index: kompare/libdialogpages/viewpage.h
 ===================================================================
 --- kompare/libdialogpages/viewpage.h	(revision 745228)
-+++ kompare/libdialogpages/viewpage.h	(revision 748928)
++++ kompare/libdialogpages/viewpage.h	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001-2003 by Otto Bruggeman
@@ -4517,7 +4781,7 @@
 Index: kompare/libdialogpages/pagebase.h
 ===================================================================
 --- kompare/libdialogpages/pagebase.h	(revision 745228)
-+++ kompare/libdialogpages/pagebase.h	(revision 748928)
++++ kompare/libdialogpages/pagebase.h	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001 by Otto Bruggeman
@@ -4554,7 +4818,7 @@
 Index: kompare/libdialogpages/filessettings.cpp
 ===================================================================
 --- kompare/libdialogpages/filessettings.cpp	(revision 745228)
-+++ kompare/libdialogpages/filessettings.cpp	(revision 748928)
++++ kompare/libdialogpages/filessettings.cpp	(revision 750443)
 @@ -1,10 +1,11 @@
  /***************************************************************************
 -				filessettings.cpp  -  description
@@ -4620,7 +4884,7 @@
 Index: kompare/libdialogpages/dialogpagesexport.h
 ===================================================================
 --- kompare/libdialogpages/dialogpagesexport.h	(revision 0)
-+++ kompare/libdialogpages/dialogpagesexport.h	(revision 748928)
++++ kompare/libdialogpages/dialogpagesexport.h	(revision 750443)
 @@ -0,0 +1,37 @@
 +/***************************************************************************
 + *   Copyright 2007 Andreas Pakulat <apaku at gmx.de>                         *
@@ -4662,7 +4926,7 @@
 Index: kompare/libdialogpages/filessettings.h
 ===================================================================
 --- kompare/libdialogpages/filessettings.h	(revision 745228)
-+++ kompare/libdialogpages/filessettings.h	(revision 748928)
++++ kompare/libdialogpages/filessettings.h	(revision 750443)
 @@ -22,10 +22,11 @@
  #include <qstring.h>
  
@@ -4679,7 +4943,7 @@
 Index: kompare/libdialogpages/diffsettings.cpp
 ===================================================================
 --- kompare/libdialogpages/diffsettings.cpp	(revision 745228)
-+++ kompare/libdialogpages/diffsettings.cpp	(revision 748928)
++++ kompare/libdialogpages/diffsettings.cpp	(revision 750443)
 @@ -1,9 +1,11 @@
  /***************************************************************************
 -				diffsettings.cpp  -  description
@@ -4776,7 +5040,7 @@
 Index: kompare/libdialogpages/viewsettings.cpp
 ===================================================================
 --- kompare/libdialogpages/viewsettings.cpp	(revision 745228)
-+++ kompare/libdialogpages/viewsettings.cpp	(revision 748928)
++++ kompare/libdialogpages/viewsettings.cpp	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001-2003 by Otto Bruggeman
@@ -4810,7 +5074,7 @@
 Index: kompare/libdialogpages/CMakeLists.txt
 ===================================================================
 --- kompare/libdialogpages/CMakeLists.txt	(revision 745228)
-+++ kompare/libdialogpages/CMakeLists.txt	(revision 748928)
++++ kompare/libdialogpages/CMakeLists.txt	(revision 750443)
 @@ -15,49 +15,9 @@
  	viewpage.cpp )
  
@@ -4867,7 +5131,7 @@
 Index: kompare/komparenavtreepart/komparenavtreepart.h
 ===================================================================
 --- kompare/komparenavtreepart/komparenavtreepart.h	(revision 745228)
-+++ kompare/komparenavtreepart/komparenavtreepart.h	(revision 748928)
++++ kompare/komparenavtreepart/komparenavtreepart.h	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Mon Feb 26 2002
          copyright               : (C) 2001-2004 Otto Bruggeman
@@ -4892,7 +5156,7 @@
 Index: kompare/komparenavtreepart/komparenavtreepart.cpp
 ===================================================================
 --- kompare/komparenavtreepart/komparenavtreepart.cpp	(revision 745228)
-+++ kompare/komparenavtreepart/komparenavtreepart.cpp	(revision 748928)
++++ kompare/komparenavtreepart/komparenavtreepart.cpp	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001-2004 Otto Bruggeman
@@ -4946,7 +5210,7 @@
 Index: kompare/komparenavtreepart/CMakeLists.txt
 ===================================================================
 --- kompare/komparenavtreepart/CMakeLists.txt	(revision 745228)
-+++ kompare/komparenavtreepart/CMakeLists.txt	(revision 748928)
++++ kompare/komparenavtreepart/CMakeLists.txt	(revision 750443)
 @@ -11,7 +11,7 @@
  
  
@@ -4959,7 +5223,7 @@
 Index: kompare/kompare_shell.h
 ===================================================================
 --- kompare/kompare_shell.h	(revision 745228)
-+++ kompare/kompare_shell.h	(revision 748928)
++++ kompare/kompare_shell.h	(revision 750443)
 @@ -4,8 +4,10 @@
          begin                   : Sun Mar 4 2001
          copyright               : (C) 2001-2003 by Otto Bruggeman
@@ -4999,7 +5263,7 @@
 Index: kompare/CMakeLists.txt
 ===================================================================
 --- kompare/CMakeLists.txt	(revision 745228)
-+++ kompare/CMakeLists.txt	(revision 748928)
++++ kompare/CMakeLists.txt	(revision 750443)
 @@ -15,35 +15,13 @@
  main.cpp
  kompare_shell.cpp


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- kdesdk.spec	16 Dec 2007 01:01:39 -0000	1.85
+++ kdesdk.spec	19 Dec 2007 09:29:43 -0000	1.86
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        3.97.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -174,6 +174,9 @@
 %{_kde4_libdir}/kde4/devel/*
 
 %changelog
+* Wed Dec 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-8
+- update Kompare from SVN (rev 750443)
+
 * Sun Dec 16 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-7
 - don't look for libkompare*part.so in %%{_kde4_libdir}
 - don't list D-Bus interfaces twice in file list

More information about the fedora-extras-commits mailing list