ports/160773: x11-wm/e17-module-itask: Fixed build with Clang

[Grzegorz Blach]

>Number:         160773
>Category:       ports
>Synopsis:       x11-wm/e17-module-itask: Fixed build with Clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 16 21:00:21 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Grzegorz Blach
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:


System: FreeBSD 8.2-STABLE #13 r225147: Wed Aug 24 20:20:58 CEST 2011
    magik at silver.nine:/usr/obj/usr/src/sys/SILVER



>Description:


Attached patches fixes build x11-wm/e17-module-itask with clang.



>How-To-Repeat:





>Fix:


--- e17-module-itask.diff.txt begins here ---
diff -ruN x11-wm/e17-module-itask/files/patch-src-itask_border_menu.c x11-wm/e17-module-itask/files/patch-src-itask_border_menu.c
--- x11-wm/e17-module-itask/files/patch-src-itask_border_menu.c	1970-01-01 01:00:00.000000000 +0100
+++ x11-wm/e17-module-itask/files/patch-src-itask_border_menu.c	2011-09-16 17:30:32.090402838 +0200
@@ -0,0 +1,11 @@
+--- src/itask_border_menu.c.orig	2011-09-16 17:25:26.367307838 +0200
++++ src/itask_border_menu.c	2011-09-16 17:25:59.976867758 +0200
+@@ -25,7 +25,7 @@
+    E_Menu_Item *mi;
+    E_Menu *m, *m_maximize, *m_stacking;
+    if (bd->border_menu)
+-      return;
++      return NULL;
+ 
+    /* Only allow to change layer for windows in "normal" layers */
+    if ((!bd->lock_user_stacking) &&
diff -ruN x11-wm/e17-module-itask/files/patch-src-itask_items.c x11-wm/e17-module-itask/files/patch-src-itask_items.c
--- x11-wm/e17-module-itask/files/patch-src-itask_items.c	1970-01-01 01:00:00.000000000 +0100
+++ x11-wm/e17-module-itask/files/patch-src-itask_items.c	2011-09-16 17:30:32.090402838 +0200
@@ -0,0 +1,11 @@
+--- src/itask_items.c.orig	2011-09-16 17:25:41.087552558 +0200
++++ src/itask_items.c	2011-09-16 17:26:24.411276478 +0200
+@@ -114,7 +114,7 @@
+      {
+ 	ic = _itask_items_find_item(it, ev->border);
+ 	if (!ic)
+-	  return;
++	  return NULL;
+ 
+ 	itask_item_remove(ic);
+ 	itask_item_swap_youngest_from_menu(it);
--- e17-module-itask.diff.txt ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: