Attachment #148230 for bug #194286

Lines 2-9 Link Here

(-)Makefile (-2 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= kdiff3	4	PORTNAME= kdiff3
5	PORTVERSION= 0.9.97	5	PORTVERSION= 0.9.98
6	PORTREVISION= 4	6	#PORTREVISION= 0
7	CATEGORIES= textproc kde	7	CATEGORIES= textproc kde
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9		9
Lines 11-16 Link Here
11	COMMENT= KDE4 graphical frontend for diff	11	COMMENT= KDE4 graphical frontend for diff
12		12
13	LICENSE= GPLv2	13	LICENSE= GPLv2
		14	LICENSE_FILE= ${WRKSRC}/COPYING
14		15
15	USE_KDE4= kdelibs libkonq kdeprefix kdehier automoc4	16	USE_KDE4= kdelibs libkonq kdeprefix kdehier automoc4
16	USE_QT4= moc_build qmake_build rcc_build uic_build	17	USE_QT4= moc_build qmake_build rcc_build uic_build
Lines 27-30 Link Here
27	DOCS_CMAKE_OFF= -DBUILD_doc:BOOL=FALSE	28	DOCS_CMAKE_OFF= -DBUILD_doc:BOOL=FALSE
28	DOCS_CMAKE_ON= -DBUILD_doc:BOOL=TRUE	29	DOCS_CMAKE_ON= -DBUILD_doc:BOOL=TRUE
29		30
		31	post-patch:
		32	#Fix build with kdelibs>=4.5.0
		33	${REINPLACE_CMD} -e 's,V4.1.2-Based,V4.2-Based,g' \
		34	${WRKSRC}/doc/*/index.docbook
		35
30	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (kdiff3-0.9.97.tar.gz) = e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a	1	SHA256 (kdiff3-0.9.98.tar.gz) = 802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668
2	SIZE (kdiff3-0.9.97.tar.gz) = 1803769	2	SIZE (kdiff3-0.9.98.tar.gz) = 1762715




--- CMakeLists.txt.orig	2011-08-27 12:48:36.000000000 +0200
+++ CMakeLists.txt	2014-01-14 15:16:41.070645341 +0100
@@ -20,8 +20,26 @@
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kdiff3.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdiff3.h )
 
 add_subdirectory(src-QT4)
-add_subdirectory(po)
-add_subdirectory(doc)
+if(BUILD_po)
+  message(STATUS "")
+  message(STATUS "NLS activated ")
+  message(STATUS "")
+  add_subdirectory(po)
+else(BUILD_po)
+  message(STATUS "")
+  message(STATUS "NLS deactivated ")
+  message(STATUS "")
+endif(BUILD_po)
+if(BUILD_doc)
+  message(STATUS "")
+  message(STATUS "DOCS activated ")
+  message(STATUS "")
+  add_subdirectory(doc)
+else(BUILD_doc)
+  message(STATUS "")
+  message(STATUS "DOCS deactivated ")
+  message(STATUS "")
+endif(BUILD_doc)
 
 
 find_file(KFILEITEMACTIONPLUGIN_FOUND kfileitemactionplugin.h PATHS ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH)




--- ./src-QT4/fileaccess.cpp.orig	2012-08-10 16:51:08.000000000 -0500
+++ ./src-QT4/fileaccess.cpp	2014-06-05 09:45:18.675613156 -0500
@@ -183,7 +183,8 @@
 
 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 @@
    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 @@
       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 @@
                   &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()) );

Lines 1-11 Link Here

(-)files/patch-src-QT4__kdiff3.cpp (-11 lines)
1	--- ./src-QT4/kdiff3.cpp.orig 2012-07-14 05:27:14.000000000 -0500
2	+++ ./src-QT4/kdiff3.cpp 2014-06-05 09:45:18.677611475 -0500
3	@@ -210,6 +210,8 @@
4	m_outputFilename = args->getOption("output");
5	if ( m_outputFilename.isEmpty() )
6	m_outputFilename = args->getOption("out");
7	+ if ( ! m_outputFilename.isEmpty() )
8	+ m_outputFilename = FileAccess( m_outputFilename, true ).absoluteFilePath();
9	}
10
11	m_bAutoFlag = args!=0 && args->isSet("auto");




%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3fileitemactionplugin.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3plugin.mo
%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/rw
@dirrmtry share/icons/locolor/32x32/apps
@dirrmtry share/icons/locolor/32x32
@dirrmtry share/icons/locolor/16x16/apps
@dirrmtry share/icons/locolor/16x16
@dirrmtry share/icons/locolor
%%PORTDOCS%%@dirrmtry share/doc/HTML/pt/kdiff3
%%PORTDOCS%%@dirrmtry share/doc/HTML/nl/kdiff3
%%PORTDOCS%%@dirrmtry share/doc/HTML/it/kdiff3
%%PORTDOCS%%@dirrmtry share/doc/HTML/fr/kdiff3
%%PORTDOCS%%@dirrmtry share/doc/HTML/et/kdiff3
%%PORTDOCS%%@dirrmtry share/doc/HTML/es/kdiff3
%%PORTDOCS%%@dirrmtry share/doc/HTML/en/kdiff3
%%PORTDOCS%%@dirrmtry share/doc/HTML/de/kdiff3
%%PORTDOCS%%@dirrmtry share/doc/HTML/da/kdiff3
@dirrmtry share/apps/kdiff3part
@dirrmtry share/apps/kdiff3

Return to bug 194286

Line 0 Link Here

(-)files/patch-CMakeLists.txt (+31 lines)
	1	--- CMakeLists.txt.orig 2011-08-27 12:48:36.000000000 +0200
	2	+++ CMakeLists.txt 2014-01-14 15:16:41.070645341 +0100
	3	@@ -20,8 +20,26 @@
	4	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kdiff3.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdiff3.h )
	5
	6	add_subdirectory(src-QT4)
	7	-add_subdirectory(po)
	8	-add_subdirectory(doc)
	9	+if(BUILD_po)
	10	+ message(STATUS "")
	11	+ message(STATUS "NLS activated ")
	12	+ message(STATUS "")
	13	+ add_subdirectory(po)
	14	+else(BUILD_po)
	15	+ message(STATUS "")
	16	+ message(STATUS "NLS deactivated ")
	17	+ message(STATUS "")
	18	+endif(BUILD_po)
	19	+if(BUILD_doc)
	20	+ message(STATUS "")
	21	+ message(STATUS "DOCS activated ")
	22	+ message(STATUS "")
	23	+ add_subdirectory(doc)
	24	+else(BUILD_doc)
	25	+ message(STATUS "")
	26	+ message(STATUS "DOCS deactivated ")
	27	+ message(STATUS "")
	28	+endif(BUILD_doc)
	29
	30
	31	find_file(KFILEITEMACTIONPLUGIN_FOUND kfileitemactionplugin.h PATHS ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH)

Lines 1-48 Link Here

(-)files/patch-src-QT4__fileaccess.cpp (-48 lines)
1	--- ./src-QT4/fileaccess.cpp.orig 2012-08-10 16:51:08.000000000 -0500
2	+++ ./src-QT4/fileaccess.cpp 2014-06-05 09:45:18.675613156 -0500
3	@@ -183,7 +183,8 @@
4
5	void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent )
6	{
7	- m_filePath = nicePath( fi.filePath() ); // remove "./" at start
8	+ m_filePath = pParent == 0 ? fi.absoluteFilePath() :
9	+ nicePath( fi.filePath() ); // remove "./" at start
10
11	m_bSymLink = fi.isSymLink();
12	if ( m_bSymLink \|\| (!m_bExists && m_filePath.contains("@@") ) )
13	@@ -566,7 +567,16 @@
14	if ( parent() != 0 )
15	return parent()->absoluteFilePath() + "/" + m_filePath;
16	else
17	- return m_filePath;
18	+ {
19	+ if ( m_filePath.isEmpty() )
20	+ return QString();
21	+
22	+ QFileInfo fi( m_filePath );
23	+ if ( fi.isAbsolute() )
24	+ return m_filePath;
25	+ else
26	+ return fi.absoluteFilePath(); // Probably never reached
27	+ }
28	} // Full abs path
29
30	// Just the name-part of the path, without parent directories
31	@@ -1184,7 +1194,7 @@
32	m_bSuccess = false;
33	KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl, permissions, KIO::HideProgressInfo );
34	connect( pJob, SIGNAL(result(KJob)), this, SLOT(slotSimpleJobResult(KJob)));
35	- connect( pJob, SIGNAL(percent(KJob,unsigned long)), this, SLOT(slotPercent(KJob, unsigned long)));
36	+ connect( pJob, SIGNAL(percent(KJob,unsigned long)), &pp, SLOT(slotPercent(KJob, unsigned long)));
37
38	ProgressProxy::enterEventLoop( pJob,
39	i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) );
40	@@ -1673,7 +1683,7 @@
41	&pp, SLOT( slotListDirInfoMessage(KJob*, const QString&) ));
42
43	// This line makes the transfer via fish unreliable.:-(
44	- //connect( pListJob, SIGNAL(percent(KJob,unsigned long)), this, SLOT(slotPercent(KJob, unsigned long)));
45	+ //connect( pListJob, SIGNAL(percent(KJob,unsigned long)), &pp, SLOT(slotPercent(KJob, unsigned long)));
46
47	ProgressProxy::enterEventLoop( pListJob,
48	i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) );

Lines 154-174 Link Here

(-)pkg-plist (-18 lines)
154	%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3.mo	154	%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3.mo
155	%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3fileitemactionplugin.mo	155	%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3fileitemactionplugin.mo
156	%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3plugin.mo	156	%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3plugin.mo
157	%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
158	%%NLS%%@dirrmtry share/locale/rw
159	@dirrmtry share/icons/locolor/32x32/apps
160	@dirrmtry share/icons/locolor/32x32
161	@dirrmtry share/icons/locolor/16x16/apps
162	@dirrmtry share/icons/locolor/16x16
163	@dirrmtry share/icons/locolor
164	%%PORTDOCS%%@dirrmtry share/doc/HTML/pt/kdiff3
165	%%PORTDOCS%%@dirrmtry share/doc/HTML/nl/kdiff3
166	%%PORTDOCS%%@dirrmtry share/doc/HTML/it/kdiff3
167	%%PORTDOCS%%@dirrmtry share/doc/HTML/fr/kdiff3
168	%%PORTDOCS%%@dirrmtry share/doc/HTML/et/kdiff3
169	%%PORTDOCS%%@dirrmtry share/doc/HTML/es/kdiff3
170	%%PORTDOCS%%@dirrmtry share/doc/HTML/en/kdiff3
171	%%PORTDOCS%%@dirrmtry share/doc/HTML/de/kdiff3
172	%%PORTDOCS%%@dirrmtry share/doc/HTML/da/kdiff3
173	@dirrmtry share/apps/kdiff3part
174	@dirrmtry share/apps/kdiff3