Wed Apr 18 23:15:19 2012 UTC ()
Add patches from Philipp Hartwig improving fullscreen mode; from the
notion-general mailing list.
Bump PKGREVISION.


(wiz)
diff -r1.1.1.1 -r1.2 pkgsrc/wm/notion/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/wm/notion/distinfo
diff -r0 -r1.1 pkgsrc/wm/notion/patches/patch-ioncore_manage.c
diff -r0 -r1.1 pkgsrc/wm/notion/patches/patch-ioncore_netwm.c
diff -r0 -r1.1 pkgsrc/wm/notion/patches/patch-ioncore_netwm.h
cvs diff -r1.1.1.1 -r1.2 pkgsrc/wm/notion/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/notion/Makefile 2012/01/08 15:22:14 1.1.1.1
+++ pkgsrc/wm/notion/Makefile 2012/04/18 23:15:18 1.2
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.1.1.1 2012/01/08 15:22:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.2 2012/04/18 23:15:18 wiz Exp $
2# 2#
3 3
4DISTNAME= notion-3-2011102900-src 4DISTNAME= notion-3-2011102900-src
5PKGNAME= ${DISTNAME:S/3-/3./:S/-src//} 5PKGNAME= ${DISTNAME:S/3-/3./:S/-src//}
 6PKGREVISION= 1
6CATEGORIES= wm 7CATEGORIES= wm
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=notion/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=notion/}
8EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://notion.sourceforge.net/ 12HOMEPAGE= http://notion.sourceforge.net/
12COMMENT= Tiling window manager based on ion3 13COMMENT= Tiling window manager based on ion3
13LICENSE= ion-license AND gnu-lgpl-v2.1 14LICENSE= ion-license AND gnu-lgpl-v2.1
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17# notion is based on ion3 18# notion is based on ion3
18CONFLICTS= ion3-[0-9]* 19CONFLICTS= ion3-[0-9]*
cvs diff -r1.1.1.1 -r1.2 pkgsrc/wm/notion/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/notion/distinfo 2012/01/08 15:22:14 1.1.1.1
+++ pkgsrc/wm/notion/distinfo 2012/04/18 23:15:18 1.2
@@ -1,9 +1,12 @@ @@ -1,9 +1,12 @@
1$NetBSD: distinfo,v 1.1.1.1 2012/01/08 15:22:14 wiz Exp $ 1$NetBSD: distinfo,v 1.2 2012/04/18 23:15:18 wiz Exp $
2 2
3SHA1 (notion-3-2011102900-src.tar.bz2) = e9f76cee087d8deb7cdef36be160ec830289331a 3SHA1 (notion-3-2011102900-src.tar.bz2) = e9f76cee087d8deb7cdef36be160ec830289331a
4RMD160 (notion-3-2011102900-src.tar.bz2) = afe2b0548a2651d8bb7333761d4842464f7bb2c9 4RMD160 (notion-3-2011102900-src.tar.bz2) = afe2b0548a2651d8bb7333761d4842464f7bb2c9
5Size (notion-3-2011102900-src.tar.bz2) = 584767 bytes 5Size (notion-3-2011102900-src.tar.bz2) = 584767 bytes
6SHA1 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7 6SHA1 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7
 7SHA1 (patch-ioncore_manage.c) = d57e6118716989590b37e472f2d1f921cd16e049
 8SHA1 (patch-ioncore_netwm.c) = ff665477c26c56eea4339484a2ad2255e5ddd7c8
 9SHA1 (patch-ioncore_netwm.h) = d292d751e7c684d177d574ff2e7a7b346a55f5b9
7SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89 10SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89
8SHA1 (patch-pwm_Makefile) = e614eb6aea7af2b526392e7b9c17d5be262bf569 11SHA1 (patch-pwm_Makefile) = e614eb6aea7af2b526392e7b9c17d5be262bf569
9SHA1 (patch-system.mk) = fa439b406cf79b117118991095520380fb95a109 12SHA1 (patch-system.mk) = fa439b406cf79b117118991095520380fb95a109
File Added: pkgsrc/wm/notion/patches/Attic/patch-ioncore_manage.c
$NetBSD: patch-ioncore_manage.c,v 1.1 2012/04/18 23:15:19 wiz Exp $

Fixes some fullscreen apps.
From Philipp Hartwig <ph@phhart.de>
on notion-general@lists.sourceforge.net

--- ioncore/manage.c.orig	2011-10-29 18:19:21.000000000 +0000
+++ ioncore/manage.c
@@ -151,8 +151,8 @@ static bool try_fullscreen(WClientWin *c
         fs_scr=dflt;
     }
 
-    if(fs_scr==NULL)
-        fs_scr=netwm_check_initial_fullscreen(cwin);
+    if(fs_scr==NULL && netwm_check_initial_fullscreen(cwin))
+        fs_scr=dflt;
 
     if(fs_scr==NULL)
         fs_scr=clientwin_fullscreen_chkrq(cwin, param->geom.w, param->geom.h);
File Added: pkgsrc/wm/notion/patches/Attic/patch-ioncore_netwm.c
$NetBSD: patch-ioncore_netwm.c,v 1.1 2012/04/18 23:15:19 wiz Exp $

Fixes some fullscreen apps.
From Philipp Hartwig <ph@phhart.de>
on notion-general@lists.sourceforge.net

--- ioncore/netwm.c.orig	2011-10-29 18:19:21.000000000 +0000
+++ ioncore/netwm.c
@@ -95,7 +95,7 @@ void netwm_init_rootwin(WRootWin *rw)
 /*{{{ _NET_WM_STATE */
 
 
-WScreen *netwm_check_initial_fullscreen(WClientWin *cwin)
+bool netwm_check_initial_fullscreen(WClientWin *cwin)
 {
 
     int i, n;
@@ -106,16 +106,16 @@ WScreen *netwm_check_initial_fullscreen(
                    1, TRUE, (uchar**)&data);
     
     if(n<0)
-        return NULL;
+        return FALSE;
     
     for(i=0; i<n; i++){
         if(data[i]==(long)atom_net_wm_state_fullscreen)
-            return region_screen_of((WRegion*)cwin);
+            return TRUE;
     }
     
     XFree((void*)data);
 
-    return NULL;
+    return FALSE;
 }
File Added: pkgsrc/wm/notion/patches/Attic/patch-ioncore_netwm.h
$NetBSD: patch-ioncore_netwm.h,v 1.1 2012/04/18 23:15:19 wiz Exp $

Fixes some fullscreen apps.
From Philipp Hartwig <ph@phhart.de>
on notion-general@lists.sourceforge.net

--- ioncore/netwm.h.orig	2011-10-29 18:19:21.000000000 +0000
+++ ioncore/netwm.h
@@ -20,7 +20,7 @@
 extern void netwm_init();
 extern void netwm_init_rootwin(WRootWin *rw);
 
-extern WScreen *netwm_check_initial_fullscreen(WClientWin *cwin);
+extern bool netwm_check_initial_fullscreen(WClientWin *cwin);
 extern void netwm_update_state(WClientWin *cwin);
 extern void netwm_delete_state(WClientWin *cwin);
 extern void netwm_set_active(WRegion *reg);