From owner-svn-ports-head@freebsd.org Mon Jan 22 09:20:06 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 67D68EB5214; Mon, 22 Jan 2018 09:20:06 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 42EB4734E6; Mon, 22 Jan 2018 09:20:06 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 95CB6183CD; Mon, 22 Jan 2018 09:20:05 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0M9K5CT045878; Mon, 22 Jan 2018 09:20:05 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0M9K5Wr045877; Mon, 22 Jan 2018 09:20:05 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201801220920.w0M9K5Wr045877@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Mon, 22 Jan 2018 09:20:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459640 - head/sysutils/k3b-kde4/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/sysutils/k3b-kde4/files X-SVN-Commit-Revision: 459640 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jan 2018 09:20:06 -0000 Author: adridg Date: Mon Jan 22 09:20:05 2018 New Revision: 459640 URL: https://svnweb.freebsd.org/changeset/ports/459640 Log: Fix up the patch from r459623 with a newer upstream commit. One extra nullptr check had gotten lost along the way. Upstream 8969b3735a. Approved by: rakuco (mentor) Modified: head/sysutils/k3b-kde4/files/patch-git_1777236 Modified: head/sysutils/k3b-kde4/files/patch-git_1777236 ============================================================================== --- head/sysutils/k3b-kde4/files/patch-git_1777236 Mon Jan 22 09:12:49 2018 (r459639) +++ head/sysutils/k3b-kde4/files/patch-git_1777236 Mon Jan 22 09:20:05 2018 (r459640) @@ -33,7 +33,7 @@ index a4fc784b5..22928b279 100644 - return QString::fromLocal8Bit( ade->value ); - else - return QString(); -+ return ade && ade->value[0] != '\0' ? QString::fromLocal8Bit( ade->value ) : QString(); ++ return ade && ade->value && ade->value[0] != '\0' ? QString::fromLocal8Bit( ade->value ) : QString(); } @@ -47,7 +47,7 @@ index a4fc784b5..22928b279 100644 - return QString::fromLocal8Bit( ade->value ); - else - return QString(); -+ return ade && ade->value[0] != '\0' ? QString::fromLocal8Bit( ade->value ) : QString(); ++ return ade && ade->value && ade->value[0] != '\0' ? QString::fromLocal8Bit( ade->value ) : QString(); } @@ -61,7 +61,7 @@ index a4fc784b5..22928b279 100644 - return QString::fromLocal8Bit( ade->value ); - else - return QString(); -+ return ade && ade->value[0] != '\0' ? QString::fromLocal8Bit( ade->value ) : QString(); ++ return ade && ade->value && ade->value[0] != '\0' ? QString::fromLocal8Bit( ade->value ) : QString(); }