cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix kompare: do not pass -H unless we explicitly ask for a gdiff-like program

Browse Source
This commit is contained in:
espie 2006-02-20 14:08:14 +00:00
parent f5b6df33be
commit 970aaf7c7b
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/kde/sdk3/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.24 2006/02/04 19:30:57 espie Exp $
# $OpenBSD: Makefile,v 1.25 2006/02/20 14:08:14 espie Exp $
COMMENT= "K Desktop Environment, developer extensions"
CATEGORIES= x11 x11/kde devel
VERSION= 3.5.1
DISTNAME= kdesdk-${VERSION}
PKGNAME= ${DISTNAME}
PKGNAME= ${DISTNAME}p0
MODKDE_VERSION= 3.5
SHARED_LIBS= cvsservice 1.0 \
kbabelcommon 6.0 \
@ -16,6 +16,7 @@ SHARED_LIBS= cvsservice 1.0 \
LIB_DEPENDS= kdecore.6,DCOP,kabc,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kresources,kspell,ktexteditor,kutils,kwalletclient,vcard,kunittest::x11/kde/libs3 \
kcal::x11/kde/pim3
FLAVORS= debug
SEPARATE_BUILD=flavored
WANTLIB= ICE SM X11 Xext Xrender art_lgpl_2 c jpeg ktnef m pcre \

16
x11/kde/sdk3/patches/patch-kompare_libdiff2_kompareprocess_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-kompare_libdiff2_kompareprocess_cpp,v 1.1 2006/02/20 14:08:14 espie Exp $
--- kompare/libdiff2/kompareprocess.cpp.orig Mon Feb 20 14:57:09 2006
+++ kompare/libdiff2/kompareprocess.cpp Mon Feb 20 15:00:13 2006
@@ -118,7 +118,11 @@ void KompareProcess::writeCommandLine()
break;
}
- if ( m_diffSettings->m_largeFiles )
+ if ( m_diffSettings->m_largeFiles
+#if defined(__OpenBSD__)
+ && !m_diffSettings->m_diffProgram.isEmpty()
+#endif
+ )
{
*this << "-H";
}