Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Jan 2018 18:44:38 +0000 (UTC)
From:      David Naylor <dbn@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r460322 - head/x11-themes/kde4-style-oxygen-transparent/files
Message-ID:  <201801291844.w0TIicnZ012587@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dbn
Date: Mon Jan 29 18:44:38 2018
New Revision: 460322
URL: https://svnweb.freebsd.org/changeset/ports/460322

Log:
  x11-themes/kde4-style-oxygen-transparent: fix compilation with Clang 6
  
  This also fixes the compilation with GCC 7.  The error is:
  
  	error: comparison between pointer and integer
  	('unsigned char *' and 'XID' (aka 'unsigned long'))
  
  Reported by:	pkg-fallout

Added:
  head/x11-themes/kde4-style-oxygen-transparent/files/
  head/x11-themes/kde4-style-oxygen-transparent/files/patch-libs_oxygenhelper.cpp   (contents, props changed)

Added: head/x11-themes/kde4-style-oxygen-transparent/files/patch-libs_oxygenhelper.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-themes/kde4-style-oxygen-transparent/files/patch-libs_oxygenhelper.cpp	Mon Jan 29 18:44:38 2018	(r460322)
@@ -0,0 +1,11 @@
+--- libs/oxygenhelper.cpp.orig	2018-01-29 16:36:56 UTC
++++ libs/oxygenhelper.cpp
+@@ -1117,7 +1117,7 @@ namespace Oxygen
+             &data);
+ 
+         // finish if no data is found
+-        if( data == None || n != 1 ) return false;
++        if( data == NULL || n != 1 ) return false;
+         else return *data;
+ 
+     }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801291844.w0TIicnZ012587>