De-conflict ksvgtopng with KDE3. This tool is used in KDE3 build process

but not in KDE4 one, so it's less painful to tweak KDE4 one.
This commit is contained in:
zhuk 2013-07-05 14:37:22 +00:00
parent b995179673
commit 15d4f225a5
3 changed files with 16 additions and 3 deletions

View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.4 2013/07/04 00:47:01 zhuk Exp $
# $OpenBSD: Makefile,v 1.5 2013/07/05 14:37:22 zhuk Exp $
COMMENT = KDE core run-time components
DISTNAME = kde-runtime-${MODKDE4_VERSION}
REVISION = 0
DPB_PROPERTIES = parallel

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-pics_CMakeLists_txt,v 1.1 2013/07/05 14:37:22 zhuk Exp $
De-conflict with KDE3. Developer tool, not used in builds.
--- pics/CMakeLists.txt.orig Fri Jul 5 17:42:38 2013
+++ pics/CMakeLists.txt Fri Jul 5 17:43:02 2013
@@ -6,6 +6,7 @@ add_subdirectory( emoticons )
set(ksvgtopng_SRCS ksvgtopng.cpp )
kde4_add_executable(ksvgtopng NOGUI ${ksvgtopng_SRCS})
target_link_libraries(ksvgtopng ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSVG_LIBRARY})
+set_target_property(ksvgtopng PROPERTIES OUTPUT_NAME ksvgtopng4)
install(TARGETS ksvgtopng ${INSTALL_TARGETS_DEFAULT_ARGS} )
# create a symlink for the default icon theme,

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2013/05/14 09:16:29 zhuk Exp $
@comment $OpenBSD: PLIST,v 1.3 2013/07/05 14:37:22 zhuk Exp $
@conflict kdebase-<4
@conflict kdesamba-<4
@group wheel
@ -22,7 +22,7 @@ bin/kde4
@bin bin/kquitapp
@bin bin/kreadconfig
@bin bin/kstart
@bin bin/ksvgtopng
@bin bin/ksvgtopng4
@bin bin/ktraderclient
@bin bin/ktrash
@bin bin/kuiserver