ports/132447: x11-wm/awesome 3.1.2 fails to link.

[Nikos Ntarmos]

The following reply was made to PR ports/132447; it has been noted by GNATS.

From: Nikos Ntarmos <ntarmos at cs.uoi.gr>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/132447: x11-wm/awesome 3.1.2 fails to link.
Date: Tue, 10 Mar 2009 15:51:48 +0200

 --gBBFr7Ir9EOA20Yy
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 I've attached a patch to add a version check for cmake, also including
 some post-release bug-fixes and bumping the portrevision.
 
 Thanks.
 
 \n\n
 
 --gBBFr7Ir9EOA20Yy
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=patch-awesome
 
 diff --git a/awesome/Makefile b/awesome/Makefile
 index 356223e..a502627 100644
 --- a/awesome/Makefile
 +++ b/awesome/Makefile
 @@ -7,6 +7,7 @@
  
  PORTNAME=	awesome
  PORTVERSION=	3.1.2
 +PORTREVISION=	1
  CATEGORIES=	x11-wm
  MASTER_SITES=	http://awesome.naquadah.org/download/
  
 @@ -17,7 +18,8 @@ BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
  		xmlto:${PORTSDIR}/textproc/xmlto \
  		xcb-util>=0.3.3:${PORTSDIR}/x11/xcb-util \
  		xproto>=7.0.11:${PORTSDIR}/x11/xproto \
 -		gperf>=3.0.3:${PORTSDIR}/devel/gperf
 +		gperf>=3.0.3:${PORTSDIR}/devel/gperf \
 +		cmake>=2.6.1_2:${PORTSDIR}/devel/cmake
  LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
  		ev.3:${PORTSDIR}/devel/libev \
  		freetype.9:${PORTSDIR}/print/freetype2 \
 diff --git a/awesome/files/patch-awesome.c b/awesome/files/patch-awesome.c
 new file mode 100644
 index 0000000..d829db4
 --- /dev/null
 +++ b/awesome/files/patch-awesome.c
 @@ -0,0 +1,23 @@
 +--- awesome.c.orig	2009-02-05 16:39:52.000000000 +0200
 ++++ awesome.c	2009-02-17 22:02:32.000000000 +0200
 +@@ -58,7 +58,7 @@
 + {
 +     client_t *c;
 +     xembed_window_t *em;
 +-    int screen_nbr;
 ++    int screen_nbr, nscreens;
 + 
 +     a_dbus_cleanup();
 +     luaA_cs_cleanup();
 +@@ -71,8 +71,10 @@
 +     }
 + 
 +     /* do this only for real screen */
 ++	const xcb_setup_t *setup = xcb_get_setup(globalconf.connection);
 ++	nscreens = setup ? xcb_setup_roots_length(setup) : -1;
 +     for(screen_nbr = 0;
 +-        screen_nbr < xcb_setup_roots_length(xcb_get_setup(globalconf.connection));
 ++        screen_nbr < nscreens;
 +         screen_nbr++)
 +         systray_cleanup(screen_nbr);
 + 
 diff --git a/awesome/files/patch-client.c b/awesome/files/patch-client.c
 index 8ca7dcd..4b76db9 100644
 --- a/awesome/files/patch-client.c
 +++ b/awesome/files/patch-client.c
 @@ -1,5 +1,17 @@
  --- client.c.orig	2009-01-08 12:04:44.000000000 +0200
  +++ client.c	2009-01-31 21:03:28.000000000 +0200
 +@@ -838,6 +838,11 @@ client_unmanage(client_t *c)
 + {
 +     tag_array_t *tags = &globalconf.screens[c->screen].tags;
 + 
 ++    /* Reset transient_for attributes of widows that maybe refering to us */
 ++    for(client_t *tc = globalconf.clients; tc; tc = tc->next)
 ++        if(tc->transient_for == c)
 ++            tc->transient_for = NULL;
 ++
 +     if(globalconf.screens[c->phys_screen].client_focus == c)
 +         client_unfocus(c);
 + 
  @@ -1455,7 +1455,7 @@
                                      xcb_get_wm_class_unchecked(globalconf.connection, (*c)->win),
                                      &hint, NULL))
 diff --git a/awesome/files/patch-utils-awsetbg b/awesome/files/patch-utils-awsetbg
 new file mode 100644
 index 0000000..fed73b4
 --- /dev/null
 +++ b/awesome/files/patch-utils-awsetbg
 @@ -0,0 +1,11 @@
 +--- utils/awsetbg.orig	2009-02-05 16:39:52.000000000 +0200
 ++++ utils/awsetbg	2009-02-17 22:02:54.000000000 +0200
 +@@ -117,7 +117,7 @@
 + }
 + 
 + find_it() {
 +-    [ -n "$1" ] && hash $1 2> /dev/null
 ++    [ -n "$1" ] && which $1 1>/dev/null 2>&1
 + }
 + 
 + message() {
 
 --gBBFr7Ir9EOA20Yy--