Unbreak kde4/kompare

Use ${MODKDE4_DEP_DIR}/libkomparediff2 and don't fetch
kde-applications/libkomparediff2, if it is installed.

Spotted by naddy@ Thanks!
This commit is contained in:
rsadowski 2018-08-13 09:13:30 +00:00
parent b00ad9caf6
commit 18a8e09476
2 changed files with 20 additions and 5 deletions

View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.7 2018/06/29 22:16:29 espie Exp $
# $OpenBSD: Makefile,v 1.8 2018/08/13 09:13:30 rsadowski Exp $
COMMENT = file compare utility for KDE
DISTNAME = kompare-${MODKDE4_VERSION}
REVISION = 4
REVISION = 5
CATEGORIES = textproc devel
HOMEPAGE = http://projects.kde.org/projects/kde/kdesdk/kompare
SHARED_LIBS = komparedialogpages 52.0 # 4.7
#SHARED_LIBS += komparediff2 51.0 # 4.7
SHARED_LIBS += kompareinterface 52.0 # 4.7
WANTLIB = c m pthread
@ -20,9 +19,12 @@ WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/ktexteditor ${KDE4LIB}/nepomuk
WANTLIB += ${KDE4LIB}/nepomukutils
WANTLIB += soprano
LIB_DEPENDS = ${MODKDE4_DEP_DIR}/libkomparediff2>=${MODKDE4_DEP_VERSION}
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
LIB_DEPENDS = ${MODKDE4_DEP_DIR}/libkomparediff2
CONFIGURE_ARGS += -DLIBKOMPAREDIFF2_LIBRARIES="komparediff2" \
-DLIBKOMPAREDIFF2_INCLUDE_DIR="${LOCALBASE}/include/kde4/libkomparediff2"
.include <bsd.port.mk>

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2018/08/13 09:13:30 rsadowski Exp $
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -6,7 +6,6 @@ find_package(KDE4 REQUIRED)
include(KDE4Defaults)
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-find_package(LibKompareDiff2 REQUIRED)
include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${LIBKOMPAREDIFF2_INCLUDE_DIR})
add_subdirectory( doc )