From nobody@FreeBSD.org  Sun May  3 10:48:42 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B1FAD106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  3 May 2009 10:48:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FD3D8FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  3 May 2009 10:48:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n43AmguF097624
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 3 May 2009 10:48:42 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n43Amgk5097623;
	Sun, 3 May 2009 10:48:42 GMT
	(envelope-from nobody)
Message-Id: <200905031048.n43Amgk5097623@www.freebsd.org>
Date: Sun, 3 May 2009 10:48:42 GMT
From: Alberto Villa <villa.alberto@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] Update port: multimedia/kdenlive - fix conflict with kde 3
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         134185
>Category:       ports
>Synopsis:       [maintainer update] Update port: multimedia/kdenlive - fix conflict with kde 3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 03 10:50:01 UTC 2009
>Closed-Date:    Mon May 04 12:55:45 UTC 2009
>Last-Modified:  Mon May  4 13:00:11 UTC 2009
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Sun May 3 15:16:28 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134185 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Mon May 4 12:55:43 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134185 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/134185: commit references a PR
Date: Mon,  4 May 2009 12:55:07 +0000 (UTC)

 rafan       2009-05-04 12:54:52 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/kdenlive/files patch-src-CMakeLists.txt 
   Log:
   - Fix build when kdelibs3 is installed
   
   PR:             ports/134185
   Submitted by:   Alberto Villa <villa.alberto at gmail.com> (maintainer)
   
   Revision  Changes    Path
   1.2       +7 -8      ports/multimedia/kdenlive/files/patch-src-CMakeLists.txt
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
