Date: Sun, 3 May 2009 10:48:42 GMT From: Alberto Villa <villa.alberto@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/134185: [maintainer update] Update port: multimedia/kdenlive - fix conflict with kde 3 Message-ID: <200905031048.n43Amgk5097623@www.freebsd.org> Resent-Message-ID: <200905031050.n43Ao1oK026579@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 134185
>Category: ports
>Synopsis: [maintainer update] Update port: multimedia/kdenlive - fix conflict with kde 3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun May 03 10:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Alberto Villa
>Release: FreeBSD 7-STABLE
>Organization:
>Environment:
FreeBSD echo.hoth 7.2-PRERELEASE FreeBSD 7.2-PRERELEASE #3: Thu Apr 23 15:17:20 CEST 2009 root@echo.hoth:/usr/obj/usr/src/sys/TPR60 i386
>Description:
cmake includes kdelibs 3, when installed, instead of kdelibs 4
>How-To-Repeat:
install kdelibs 3 and then kdenlive
>Fix:
here's the patch (no files added nor removed, portrevision not touched)
Patch attached with submission follows:
diff -ruN /usr/ports/multimedia/kdenlive/files/patch-src-CMakeLists.txt kdenlive/files/patch-src-CMakeLists.txt
--- /usr/ports/multimedia/kdenlive/files/patch-src-CMakeLists.txt 2009-05-01 23:40:07.000000000 +0200
+++ kdenlive/files/patch-src-CMakeLists.txt 2009-05-03 12:30:33.000000000 +0200
@@ -1,20 +1,19 @@
---- src/CMakeLists.txt.orig 2009-05-01 17:21:12.000000000 +0200
-+++ src/CMakeLists.txt 2009-05-01 17:21:48.000000000 +0200
-@@ -2,17 +2,19 @@
- add_subdirectory( widgets )
- add_subdirectory( mimetypes )
-
-+find_package(Qt4 REQUIRED)
+--- src/CMakeLists.txt.orig 2009-05-03 12:26:01.000000000 +0200
++++ src/CMakeLists.txt 2009-05-03 12:28:57.000000000 +0200
+@@ -5,14 +5,17 @@
find_package(Nepomuk REQUIRED)
include_directories (
++ ${KDE4_INCLUDE_DIR}
++ ${KDE4_INCLUDE_DIR}/KDE
++ ${KDE4_PHONON_INCLUDES}
+ ${QT_INCLUDES}
+ ${LIBMLT_INCLUDE_DIR}
+ ${LIBMLTPLUS_INCLUDE_DIR}
${QDBUS_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
- ${KDE4_INCLUDES}
+- ${KDE4_INCLUDES}
${CMAKE_SOURCE_DIR}/src/widgets
- ${LIBMLT_INCLUDE_DIR}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905031048.n43Amgk5097623>