From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 17 19:20:00 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9EC49B8C for ; Sat, 17 Nov 2012 19:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 70AF28FC15 for ; Sat, 17 Nov 2012 19:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qAHJK0Oc018156 for ; Sat, 17 Nov 2012 19:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qAHJK0TA018155; Sat, 17 Nov 2012 19:20:00 GMT (envelope-from gnats) Resent-Date: Sat, 17 Nov 2012 19:20:00 GMT Resent-Message-Id: <201211171920.qAHJK0TA018155@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Steve Wills Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A0863B4B; Sat, 17 Nov 2012 19:16:37 +0000 (UTC) (envelope-from swills@mouf.net) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) by mx1.freebsd.org (Postfix) with ESMTP id 5C2448FC12; Sat, 17 Nov 2012 19:16:37 +0000 (UTC) Received: from meatwad.mouf.net ([IPv6:2001:470:8:58f:21f:d0ff:feaf:1a4d]) by mouf.net (8.14.5/8.14.5) with ESMTP id qAHJGTF4043436 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 17 Nov 2012 14:16:35 -0500 (EST) (envelope-from swills@meatwad.mouf.net) Received: (from swills@localhost) by meatwad.mouf.net (8.14.5/8.14.5/Submit) id qAHJGH7E041207; Sat, 17 Nov 2012 14:16:17 -0500 (EST) (envelope-from swills) Message-Id: <201211171916.qAHJGH7E041207@meatwad.mouf.net> Date: Sat, 17 Nov 2012 14:16:17 -0500 (EST) From: Steve Wills To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/173688: [PATCH] x11/kdelibs: fix build on recent CURRENT Cc: kde@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2012 19:20:00 -0000 >Number: 173688 >Category: ports >Synopsis: [PATCH] x11/kdelibs: fix build on recent CURRENT >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Nov 17 19:20:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Steve Wills >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >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@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@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 +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 + ++#include ++ + 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( library.toLocal8Bit().data(), parentWidget, ++ return createPartInstanceFromLibrary( 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 --- >Release-Note: >Audit-Trail: >Unformatted: