Hello community, here is the log from the commit of package kdiff3.1653 for openSUSE:12.3:Update checked in at 2013-05-14 16:58:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/kdiff3.1653 (Old) and /work/SRC/openSUSE:12.3:Update/.kdiff3.1653.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdiff3.1653" Changes: -------- New Changes file: --- /dev/null 2013-05-09 10:40:33.472011256 +0200 +++ /work/SRC/openSUSE:12.3:Update/.kdiff3.1653.new/kdiff3.changes 2013-05-14 16:58:38.000000000 +0200 @@ -0,0 +1,160 @@ +------------------------------------------------------------------- +Thu May 2 12:47:34 BST 2013 - [email protected] + +- Add kdiff3-fix-save-relative-path.patch: fix saving merged + files. Patch is from: https://bugs.archlinux.org/task/31813 + + Added kdiff3-fix-save-relative-path.patch + +------------------------------------------------------------------- +Tue Nov 20 16:10:19 UTC 2012 - [email protected] + +- Fix the SLES build (%make_install is not expanded on SLES) + +------------------------------------------------------------------- +Tue Nov 20 16:08:20 UTC 2012 - [email protected] + +- update to 0.9.97: + * Memory usage optimized for comparison of large directories. + * In overview for two way diff show if only one side contains text. + * If text is selected in either input or output window use that in Find dialog. + * Command line option --cs doesn't change the config value permanently anymore. + * Windows 64 bit specific installer. + * Bugfixes. +- removed libkdiff3part.so (not build anymore) + +------------------------------------------------------------------- +Wed Oct 12 00:28:44 CEST 2011 - [email protected] + +- update to 0.9.96: + * KDiff3FileItemActionPlugin : Context menu that also works in dolphin (for KDE>=4 + * Parser for preprocessor commands. (Allows single apostrophs ') + * Fix crash on A/B-overview (infinite recursion) + * Fix clearcase temp files not deleted problem on windows + * KDiff3 plugin: When launching KDiff3 konqueror isn't blocked anymore + * String corrections (Frederik Schwarzer) + * Fixed writing to KIO. + * Fixed white space merge default options + +------------------------------------------------------------------- +Sat Sep 17 21:04:19 UTC 2011 - [email protected] + +- Removed checks for obsolete openSUSE versions (fix for RPMLINT warnings) +- Added check for duplicate files (fix for RPMLINT warning) +- Cleaned up spec file formatting + +------------------------------------------------------------------- +Tue Aug 10 09:34:13 UTC 2010 - [email protected] + +- updated tarball to fix build + +------------------------------------------------------------------- +Mon Mar 8 10:10:17 UTC 2010 - [email protected] + +- do not package docs in both subpackages + +------------------------------------------------------------------- +Wed May 20 12:08:02 CEST 2009 - [email protected] + +- require kdiff3-lang + +------------------------------------------------------------------- +Fri Mar 6 12:15:12 CET 2009 - [email protected] + +- update to 0.9.95: + * Show line end style for each file + * Translation update + * Bugfixes + +------------------------------------------------------------------- +Fri Feb 20 18:29:46 CET 2009 - [email protected] + +- update to 0.9.94: + * ported to KDE4 + * various smaller fixes + +------------------------------------------------------------------- +Sat Feb 14 12:34:47 CET 2009 - [email protected] + +- call kde_post_install + +------------------------------------------------------------------- +Mon Nov 17 09:58:09 CET 2008 - [email protected] + +- install translations for kdiff3 menu plugin (bnc#442527) + +------------------------------------------------------------------- +Wed Jun 13 23:36:35 CEST 2007 - [email protected] + +- running fdupes makes kdiff3.rpm 348KB smaller + +------------------------------------------------------------------- +Sun Apr 15 22:51:34 CEST 2007 - [email protected] + +- update to version 0.9.92: + * KDE-Konqueror plugin: Launch KDiff3 from Konqueror. + * Temp file names use process id in file name for several instances. + * New File comparison mode: Trust the size and date, but use + binary comparison if date doesn't match (unsafe) + * Open dialog also shows current dirs in directory comparison mode. + * New option for history merge: Max number of history entries + * New option "Auto save and quit on merge without conflicts" + * Several Bugfixes + +------------------------------------------------------------------- +Sun Nov 5 10:20:48 CET 2006 - [email protected] + +- update to version 0.9.91: + * Unicode autodetection based on byte-order-mark. + * Fix for crash after double click below last line + * Saving of maximized window-state (Patch by Robert Vock) + * Separated Merge-options in own tab + * When pasting multiple lines into openfile dialog only first + line is kept + * Drawing in directory view fixed. + * When specifying a separate output dir then for equal files a + copy operation will also be offered. + +------------------------------------------------------------------- +Wed May 24 18:57:23 CEST 2006 - [email protected] + +- fix build for < 10.1 + +------------------------------------------------------------------- +Tue May 16 09:22:18 CEST 2006 - [email protected] + +- update to version 0.9.90 + * Fixed KIO-problems of type "File exists" with tempfiles. + * Fix for manual alignment with 3 files which caused crash. + * Preserve executable bit when overwriting an existing file. + * Documentation and translations updated. + +------------------------------------------------------------------- +Mon Apr 10 11:00:58 CEST 2006 - [email protected] + +- update to version 0.9.89 + +------------------------------------------------------------------- +Wed Jan 25 21:28:12 CET 2006 - [email protected] + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Tue Oct 25 18:29:02 CEST 2005 - [email protected] + +- update to version 0.9.88 (unicode support) + +------------------------------------------------------------------- +Thu Feb 17 13:36:38 CET 2005 - [email protected] + +- menu entry moved to xdg dir + +------------------------------------------------------------------- +Sat Sep 4 11:44:47 CEST 2004 - [email protected] + +- fixing Makefile problems + +------------------------------------------------------------------- +Sat Aug 28 18:15:11 CEST 2004 - [email protected] + +- initial package of version 0.9.86 + New: ---- kdiff3-0.9.97.tar.gz kdiff3-fix-save-relative-path.patch kdiff3.changes kdiff3.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiff3.spec ++++++ # # spec file for package kdiff3 # # Copyright (c) 2013 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/ # Name: kdiff3 Version: 0.9.97 Release: 0 Summary: Feature-Rich Code Comparison Utility License: GPL-2.0+ Group: Development/Tools/Version Control Url: http://kdiff3.sourceforge.net/ Source0: %{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE kdiff3-fix-save-relative-path.patch Patch0: kdiff3-fix-save-relative-path.patch BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel BuildRequires: libkonq-devel Recommends: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %description KDiff3 is a program that: * Compares or merges two or three text input files or directories * Shows the differences line-by-line and character-by-character * Provides an automatic merge facility and an integrated editor for comfortably solving merge conflicts * Supports KIO on KDE (allows accessing ftp, sftp, fish, smb, etc.) * Has an intuitive graphical user interface %lang_package %prep %setup -q %patch0 -p2 %build %cmake_kde4 -d build %make_jobs %install pushd build make DESTDIR=%{buildroot} install popd %suse_update_desktop_file -r kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File %kde_post_install %find_lang %{name} %{name}.lang %find_lang kdiff3plugin %{name}.lang %find_lang kdiff3fileitemactionplugin %{name}.lang rm %{buildroot}%{_kde4_htmldir}/*/kdiff3/common %fdupes -s %{buildroot} %files %defattr(-,root,root) %doc COPYING %{_kde4_applicationsdir}/kdiff3.desktop %{_kde4_appsdir}/kdiff3/ %{_kde4_appsdir}/kdiff3part/ %{_kde4_bindir}/kdiff3 %{_kde4_iconsdir}/??color/*/apps/kdiff3.png %{_kde4_modulesdir}/kdiff3fileitemaction.so %{_kde4_servicesdir}/kdiff3part.desktop %{_kde4_servicesdir}/kdiff3fileitemaction.desktop %files lang -f %{name}.lang %changelog ++++++ kdiff3-fix-save-relative-path.patch ++++++ >From 23ad423e4255c80ee22b269f73e20333f7c06678 Mon Sep 17 00:00:00 2001 From: joachim99 <[email protected]> Date: Sat, 22 Sep 2012 23:02:12 +0200 Subject: [PATCH] - Fix for saving files on KDE with relative path specified via command line option -o. Signed-off-by: joachim99 <[email protected]> --- kdiff3/src-QT4/fileaccess.cpp | 18 ++++++++++++++---- kdiff3/src-QT4/kdiff3.cpp | 2 ++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/kdiff3/src-QT4/fileaccess.cpp b/kdiff3/src-QT4/fileaccess.cpp index 134fc26..b6e01f0 100644 --- a/kdiff3/src-QT4/fileaccess.cpp +++ b/kdiff3/src-QT4/fileaccess.cpp @@ -183,7 +183,8 @@ static QString nicePath( const QFileInfo& fi ) void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent ) { - m_filePath = nicePath( fi.filePath() ); // remove "./" at start + m_filePath = pParent == 0 ? fi.absoluteFilePath() : + nicePath( fi.filePath() ); // remove "./" at start m_bSymLink = fi.isSymLink(); if ( m_bSymLink || (!m_bExists && m_filePath.contains("@@") ) ) @@ -566,7 +567,16 @@ QString FileAccess::absoluteFilePath() const if ( parent() != 0 ) return parent()->absoluteFilePath() + "/" + m_filePath; else - return m_filePath; + { + if ( m_filePath.isEmpty() ) + return QString(); + + QFileInfo fi( m_filePath ); + if ( fi.isAbsolute() ) + return m_filePath; + else + return fi.absoluteFilePath(); // Probably never reached + } } // Full abs path // Just the name-part of the path, without parent directories @@ -1184,7 +1194,7 @@ bool FileAccessJobHandler::rename( const QString& dest ) m_bSuccess = false; KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl, permissions, KIO::HideProgressInfo ); connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); - connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); + connect( pJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long))); ProgressProxy::enterEventLoop( pJob, i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) ); @@ -1673,7 +1683,7 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive, &pp, SLOT( slotListDirInfoMessage(KJob*, const QString&) )); // This line makes the transfer via fish unreliable.:-( - //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); + //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long))); ProgressProxy::enterEventLoop( pListJob, i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) ); diff --git a/kdiff3/src-QT4/kdiff3.cpp b/kdiff3/src-QT4/kdiff3.cpp index 165602f..de7cc9c 100644 --- a/kdiff3/src-QT4/kdiff3.cpp +++ b/kdiff3/src-QT4/kdiff3.cpp @@ -211,6 +211,8 @@ KDiff3App::KDiff3App(QWidget* pParent, const char* /*name*/, KDiff3Part* pKDiff3 m_outputFilename = args->getOption("output"); if ( m_outputFilename.isEmpty() ) m_outputFilename = args->getOption("out"); + if ( ! m_outputFilename.isEmpty() ) + m_outputFilename = FileAccess( m_outputFilename, true ).absoluteFilePath(); } m_bAutoFlag = args!=0 && args->isSet("auto"); -- 1.7.12.2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
