[kde-freebsd] [PATCH] x11/kdelibs: fix build on recent CURRENT

[Steve Wills]

>Submitter-Id:	current-users
>Originator:	Steve Wills
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] x11/kdelibs: fix build on recent CURRENT
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 10.0-CURRENT amd64
>Environment:
System: FreeBSD meatwad.mouf.net 10.0-CURRENT FreeBSD 10.0-CURRENT #12 r242847M: Sun Nov 11 22:13:25 EST
>Description:
- Fix build on recent current after CLANG_IS_CC

Obtained from upstream git repo

Port maintainer (kde at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- kdelibs-4.8.4_2.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 307523)
+++ Makefile	(working copy)
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,7 +17,7 @@
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Base set of libraries needed by KDE programs
 
-LIB_DEPENDS=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
+LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
 		aspell.16:${PORTSDIR}/textproc/aspell \
 		jasper.4:${PORTSDIR}/graphics/jasper \
 		pcre.1:${PORTSDIR}/devel/pcre \
Index: files/patch-git_ca33e942
===================================================================
--- files/patch-git_ca33e942	(revision 0)
+++ files/patch-git_ca33e942	(working copy)
@@ -0,0 +1,40 @@
+commit ca33e942d8b6743361c174331070e76417029cca
+Author: Christoph Feck <christoph at maxiom.de>
+Date:   Thu Jul 19 16:17:02 2012 +0200
+
+    Fix QString <-> library name conversion
+    
+    BUG: 303771
+    FIXED-IN: 4.9.0
+
+diff --git kparts/componentfactory.h kparts/componentfactory.h
+index b3c216a..21a2852 100644
+--- kparts/componentfactory.h
++++ kparts/componentfactory.h
+@@ -28,6 +28,8 @@
+ #endif
+ #include <kmimetypetrader.h>
+ 
++#include <QtCore/QFile>
++
+ namespace KParts
+ {
+     namespace ComponentFactory
+@@ -81,7 +83,7 @@ namespace KParts
+                                           const QStringList &args = QStringList(),
+                                           int *error = 0 )
+         {
+-            KLibrary *library = KLibLoader::self()->library( QString( libraryName ) ); // compatibility hack
++            KLibrary *library = KLibLoader::self()->library( QFile::decodeName( libraryName ) ); // compatibility hack
+             if ( !library )
+             {
+                 if ( error )
+@@ -135,7 +137,7 @@ namespace KParts
+                 return 0;
+             }
+ 
+-            return createPartInstanceFromLibrary<T>( library.toLocal8Bit().data(), parentWidget,
++            return createPartInstanceFromLibrary<T>( QFile::encodeName( library ).constData(), parentWidget,
+                                                      parent, args, error );
+         }
+ #endif

Property changes on: files/patch-git_ca33e942
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--- kdelibs-4.8.4_2.patch ends here ---