svn commit: r459640 - head/sysutils/k3b-kde4/files

Adriaan de Groot adridg at FreeBSD.org
Mon Jan 22 09:20:06 UTC 2018


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();
  }
  
  


More information about the svn-ports-all mailing list