cvs commit: ports/x11/xcb-util Makefile distinfo pkg-plist ports/x11/xcb-util/files patch-icccm-icccm.c

Renato Botelho do Couto garga at FreeBSD.org
Thu Dec 29 12:35:58 UTC 2011


On Fri, Dec 16, 2011 at 04:46:04PM +0400, Roman Bogorodskiy wrote:
>   Renato Botelho do Couto wrote:
> 
> > On Thu, Dec 15, 2011 at 06:31:07PM -0800, Doug Barton wrote:
> > > I can now confirm that at least xfce4-desktop is unable to be recompiled
> > > due to this change. Unless I'm really missing something dramatic it
> > > seems to me that this update should be backed out for now.
> > 
> > I was investigating it because new awesome version requires 0.3.8. This
> > new version was splitted into few pieces, so, we'll need more ports and
> > change dependencies accordingly.
> > 
> > The new ports would be:
> > 
> > xcb-util
> > xcb-util-image
> > xcb-util-keysyms
> > xcb-util-renderutil
> > xcb-util-wm
> > 
> > According my first search, there are few packages that requires
> > xcb-util, it won't be so hard to track all of them.
> > 
> > murphys# find ./ -mindepth 3 -maxdepth 3 -iname Makefile | xargs fgrep -l xcb-util
> > ./graphics/cairo/Makefile
> > ./graphics/pornview/Makefile
> > ./x11/startup-notification/Makefile
> > ./x11/xcb-util/Makefile
> > ./x11-wm/awesome/Makefile
> > ./x11-wm/i3/Makefile
> > ./x11-wm/mcwm/Makefile
> > 
> > I'm start working on this.
> 
> Yes, that sounds like a right thing to do.

Hello guys,

I double checked all the ports that depends of xcb-util, and here is the
first patch with all necessary changes.

I'll wait after 9.0 is released before commit it, so, please review.

Nikos, would you like to maintain the new ports i'm adding (xcb-util-*)?
I believe it makes more sense to one person maintain all those ports.

Regards
-- 
Renato Botelho <garga     @ FreeBSD.org>
               <garga.bsd @ gmail.com>
GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc

"Life, loathe it or ignore it, you can't like it."
		-- Marvin, "Hitchhiker's Guide to the Galaxy"
-------------- next part --------------
Index: graphics/cairo/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- graphics/cairo/Makefile	23 Sep 2011 22:23:04 -0000	1.55
+++ graphics/cairo/Makefile	29 Dec 2011 12:26:15 -0000
@@ -8,7 +8,7 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.10.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH?=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
@@ -59,8 +59,8 @@
 .endif
 
 .if defined(WITH_XCB)
-BUILD_DEPENDS+= 	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
-RUN_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
+BUILD_DEPENDS+= 	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
+RUN_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
 CONFIGURE_ARGS+=	--enable-xcb
 # this option exposes a bug --enable-xlib-xcb=auto
 PLIST_SUB+=		XCB=""
Index: graphics/pornview/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/pornview/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- graphics/pornview/Makefile	23 Sep 2011 22:23:25 -0000	1.42
+++ graphics/pornview/Makefile	29 Dec 2011 12:26:15 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	pornview
 PORTVERSION=	0.2.0.p.1
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/OldFiles
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p./pre/}
@@ -16,7 +16,7 @@
 COMMENT=	PornView is an image viewer/manager
 
 LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif
-LIB_DEPENDS+=	xcb-render-util:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS+=	xcb-render-util:${PORTSDIR}/x11/xcb-util-renderutil
 
 USE_XORG=	x11 xi xext xinerama
 USE_GNOME=	gtk20
Index: x11/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/Makefile,v
retrieving revision 1.777
diff -u -r1.777 Makefile
--- x11/Makefile	8 Dec 2011 12:57:59 -0000	1.777
+++ x11/Makefile	29 Dec 2011 12:26:15 -0000
@@ -320,6 +320,10 @@
     SUBDIR += xcb
     SUBDIR += xcb-proto
     SUBDIR += xcb-util
+    SUBDIR += xcb-util-image
+    SUBDIR += xcb-util-keysyms
+    SUBDIR += xcb-util-renderutil
+    SUBDIR += xcb-util-wm
     SUBDIR += xclick
     SUBDIR += xclip
     SUBDIR += xclipboard
Index: x11/startup-notification/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/startup-notification/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- x11/startup-notification/Makefile	23 Sep 2011 22:26:14 -0000	1.33
+++ x11/startup-notification/Makefile	29 Dec 2011 12:26:15 -0000
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	startup-notification
-PORTVERSION=	0.10
-PORTREVISION=	2
+PORTVERSION=	0.12
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.freedesktop.org/software/startup-notification/releases/
 DIST_SUBDIR=	gnome2
@@ -16,7 +15,7 @@
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	Library that supports startup notification spec from freedesktop.org
 
-LIB_DEPENDS=	xcb-aux.0:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS=	xcb-util.0:${PORTSDIR}/x11/xcb-util
 
 USE_XORG=	x11
 USE_AUTOTOOLS=	libtool
Index: x11/startup-notification/distinfo
===================================================================
RCS file: /home/pcvs/ports/x11/startup-notification/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- x11/startup-notification/distinfo	19 Mar 2011 12:38:02 -0000	1.11
+++ x11/startup-notification/distinfo	29 Dec 2011 12:26:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (gnome2/startup-notification-0.10.tar.gz) = 64bbeb5c28619721fc19d6920ad2b8bf6c0dc3a0e96a1b0bc26f480fbc525459
-SIZE (gnome2/startup-notification-0.10.tar.gz) = 328787
+SHA256 (gnome2/startup-notification-0.12.tar.gz) = 3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a
+SIZE (gnome2/startup-notification-0.12.tar.gz) = 355285
Index: x11/xcb-util/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/xcb-util/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- x11/xcb-util/Makefile	16 Dec 2011 11:26:20 -0000	1.17
+++ x11/xcb-util/Makefile	29 Dec 2011 12:26:15 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xcb-util
-PORTVERSION=	0.3.6
+PORTVERSION=	0.3.8
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
Index: x11/xcb-util/distinfo
===================================================================
RCS file: /home/pcvs/ports/x11/xcb-util/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- x11/xcb-util/distinfo	16 Dec 2011 11:26:20 -0000	1.11
+++ x11/xcb-util/distinfo	29 Dec 2011 12:26:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (xcb-util-0.3.6.tar.bz2) = ffb8ee11ab015858a970ab7edd56bd2436b281657596561d8429d4a90df60e57
-SIZE (xcb-util-0.3.6.tar.bz2) = 293408
+SHA256 (xcb-util-0.3.8.tar.bz2) = c1eed9284750bc09352e60654df77bb585dbbe7673fdcc675e58b7f3a0b447b9
+SIZE (xcb-util-0.3.8.tar.bz2) = 266339
Index: x11/xcb-util/pkg-descr
===================================================================
RCS file: /home/pcvs/ports/x11/xcb-util/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- x11/xcb-util/pkg-descr	16 Feb 2008 17:17:44 -0000	1.1
+++ x11/xcb-util/pkg-descr	29 Dec 2011 12:26:15 -0000
@@ -7,14 +7,9 @@
 
 These libraries are currently included, roughly ordered by maturity:
 
-render-util: Convenience functions for the Render extension.
 aux: Convenient access to connection setup and some core requests.
 atom: Standard core X atom constants and atom caching.
 property: Callback X property-change handling.
-icccm: Both client and window-manager helpers for ICCCM.
-keysyms: Standard X key constants and conversion to/from keycodes.
 event: Callback X event handling.
-image: Port of Xlib's XImage and XShmImage functions.
-wm: Framework for window manager implementation.
 
 WWW: http://xcb.freedesktop.org/
Index: x11/xcb-util/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11/xcb-util/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- x11/xcb-util/pkg-plist	16 Dec 2011 11:26:20 -0000	1.6
+++ x11/xcb-util/pkg-plist	29 Dec 2011 12:26:15 -0000
@@ -1,56 +1,13 @@
-lib/libxcb-atom.so.1
-lib/libxcb-atom.so
-lib/libxcb-atom.la
-lib/libxcb-atom.a
+lib/libxcb-util.so.0
+lib/libxcb-util.so
+lib/libxcb-util.la
+lib/libxcb-util.a
 libdata/pkgconfig/xcb-atom.pc
 libdata/pkgconfig/xcb-aux.pc
 libdata/pkgconfig/xcb-event.pc
-libdata/pkgconfig/xcb-property.pc
-libdata/pkgconfig/xcb-icccm.pc
-libdata/pkgconfig/xcb-image.pc
-libdata/pkgconfig/xcb-keysyms.pc
-libdata/pkgconfig/xcb-reply.pc
-libdata/pkgconfig/xcb-renderutil.pc
-lib/libxcb-aux.so.0
-lib/libxcb-aux.so
-lib/libxcb-aux.la
-lib/libxcb-aux.a
-lib/libxcb-event.so.1
-lib/libxcb-event.so
-lib/libxcb-event.la
-lib/libxcb-event.a
-lib/libxcb-property.so.1
-lib/libxcb-property.so
-lib/libxcb-property.la
-lib/libxcb-property.a
-lib/libxcb-icccm.so.1
-lib/libxcb-icccm.so
-lib/libxcb-icccm.la
-lib/libxcb-icccm.a
-lib/libxcb-image.so.0
-lib/libxcb-image.so
-lib/libxcb-image.la
-lib/libxcb-image.a
-lib/libxcb-keysyms.so.1
-lib/libxcb-keysyms.so
-lib/libxcb-keysyms.la
-lib/libxcb-keysyms.a
-lib/libxcb-reply.so.1
-lib/libxcb-reply.so
-lib/libxcb-reply.la
-lib/libxcb-reply.a
-lib/libxcb-render-util.so.0
-lib/libxcb-render-util.so
-lib/libxcb-render-util.la
-lib/libxcb-render-util.a
+libdata/pkgconfig/xcb-util.pc
 include/xcb/xcb_atom.h
 include/xcb/xcb_aux.h
 include/xcb/xcb_bitops.h
 include/xcb/xcb_event.h
-include/xcb/xcb_property.h
-include/xcb/xcb_icccm.h
-include/xcb/xcb_image.h
-include/xcb/xcb_keysyms.h
-include/xcb/xcb_pixel.h
-include/xcb/xcb_reply.h
-include/xcb/xcb_renderutil.h
+include/xcb/xcb_util.h
Index: x11/xcb-util/files/patch-icccm-icccm.c
===================================================================
RCS file: x11/xcb-util/files/patch-icccm-icccm.c
diff -N x11/xcb-util/files/patch-icccm-icccm.c
--- x11/xcb-util/files/patch-icccm-icccm.c	16 Dec 2011 11:26:20 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- icccm/icccm.c.orig	2009-08-24 11:47:36.000000000 +0300
-+++ icccm/icccm.c	2009-10-21 21:01:52.000000000 +0300
-@@ -627,15 +627,13 @@
- xcb_get_wm_hints_from_reply(xcb_wm_hints_t *hints,
-                             xcb_get_property_reply_t *reply)
- {
--  if(!reply)
-+  if(!reply || reply->type != WM_HINTS || reply->format != 32)
-     return 0;
- 
-   int length = xcb_get_property_value_length(reply);
-   int num_elem = length / (reply->format / 8);
- 
--  if (reply->type != WM_HINTS
--      || reply->format != 32
--      || num_elem < XCB_NUM_WM_HINTS_ELEMENTS - 1)
-+  if(num_elem < XCB_NUM_WM_HINTS_ELEMENTS - 1)
-     return 0;
- 
-   memcpy(hints, (xcb_size_hints_t *) xcb_get_property_value(reply), length);
Index: x11/xcb-util-image/Makefile
===================================================================
RCS file: x11/xcb-util-image/Makefile
diff -N x11/xcb-util-image/Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-image/Makefile	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	xcb-util-image
+# Date created:		2011-12-16
+# Whom:			garga
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xcb-util-image
+PORTVERSION=	0.3.8
+CATEGORIES=	x11
+MASTER_SITES=	http://xcb.freedesktop.org/dist/
+
+MAINTAINER=	garga at FreeBSD.org
+COMMENT=	A port of Xlib's XImage and XShmImage functions
+
+LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb \
+		xcb-util.0:${PORTSDIR}/x11/xcb-util
+#BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+#USE_XORG=	xau xdmcp
+#USE_AUTOTOOLS=	libtool
+
+GNU_CONFIGURE=	yes
+#CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf"
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|' \
+		${WRKSRC}/configure
+
+.include <bsd.port.mk>
Index: x11/xcb-util-image/distinfo
===================================================================
RCS file: x11/xcb-util-image/distinfo
diff -N x11/xcb-util-image/distinfo
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-image/distinfo	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,2 @@
+SHA256 (xcb-util-image-0.3.8.tar.bz2) = 40390528c26e8231132540f16579b821de68bb2e9152918f72182d5a4038a6d9
+SIZE (xcb-util-image-0.3.8.tar.bz2) = 289004
Index: x11/xcb-util-image/pkg-descr
===================================================================
RCS file: x11/xcb-util-image/pkg-descr
diff -N x11/xcb-util-image/pkg-descr
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-image/pkg-descr	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,10 @@
+The xcb-util module provides a number of libraries which sit on top of
+libxcb, the core X protocol library, and some of the extension
+libraries. These experimental libraries provide convenience functions
+and interfaces which make the raw X protocol more usable. Some of the
+libraries also provide client-side code which is not strictly part of
+the X protocol but which have traditionally been provided by Xlib.
+
+Image module is a port o Xlib's XImage and XShmImage functions.
+
+WWW:	http://xcb.freedesktop.org/
Index: x11/xcb-util-image/pkg-plist
===================================================================
RCS file: x11/xcb-util-image/pkg-plist
diff -N x11/xcb-util-image/pkg-plist
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-image/pkg-plist	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,8 @@
+ at comment $FreeBSD$
+include/xcb/xcb_image.h
+include/xcb/xcb_pixel.h
+lib/libxcb-image.so.0
+lib/libxcb-image.so
+lib/libxcb-image.la
+lib/libxcb-image.a
+libdata/pkgconfig/xcb-image.pc
Index: x11/xcb-util-keysyms/Makefile
===================================================================
RCS file: x11/xcb-util-keysyms/Makefile
diff -N x11/xcb-util-keysyms/Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-keysyms/Makefile	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	xcb-util-keysyms
+# Date created:		2011-12-16
+# Whom:			garga
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xcb-util-keysyms
+PORTVERSION=	0.3.8
+CATEGORIES=	x11
+MASTER_SITES=	http://xcb.freedesktop.org/dist/
+
+MAINTAINER=	garga at FreeBSD.org
+COMMENT=	Standard X key constants and conversion to/from keycodes
+
+LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb \
+		xcb-util.0:${PORTSDIR}/x11/xcb-util
+#BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+#USE_XORG=	xau xdmcp
+#USE_AUTOTOOLS=	libtool
+
+GNU_CONFIGURE=	yes
+#CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf"
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|' \
+		${WRKSRC}/configure
+
+.include <bsd.port.mk>
Index: x11/xcb-util-keysyms/distinfo
===================================================================
RCS file: x11/xcb-util-keysyms/distinfo
diff -N x11/xcb-util-keysyms/distinfo
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-keysyms/distinfo	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,2 @@
+SHA256 (xcb-util-keysyms-0.3.8.tar.bz2) = 913d32f7afe380c580da7636ee13f2728790237bb5c03def536363f552686121
+SIZE (xcb-util-keysyms-0.3.8.tar.bz2) = 252726
Index: x11/xcb-util-keysyms/pkg-descr
===================================================================
RCS file: x11/xcb-util-keysyms/pkg-descr
diff -N x11/xcb-util-keysyms/pkg-descr
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-keysyms/pkg-descr	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,11 @@
+The xcb-util module provides a number of libraries which sit on top of
+libxcb, the core X protocol library, and some of the extension
+libraries. These experimental libraries provide convenience functions
+and interfaces which make the raw X protocol more usable. Some of the
+libraries also provide client-side code which is not strictly part of
+the X protocol but which have traditionally been provided by Xlib.
+
+Keysyms module is the Starndard X key constants and conversions to/from
+keycodes.
+
+WWW:	http://xcb.freedesktop.org/
Index: x11/xcb-util-keysyms/pkg-plist
===================================================================
RCS file: x11/xcb-util-keysyms/pkg-plist
diff -N x11/xcb-util-keysyms/pkg-plist
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-keysyms/pkg-plist	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,7 @@
+ at comment $FreeBSD$
+include/xcb/xcb_keysyms.h
+lib/libxcb-keysyms.so.1
+lib/libxcb-keysyms.so
+lib/libxcb-keysyms.la
+lib/libxcb-keysyms.a
+libdata/pkgconfig/xcb-keysyms.pc
Index: x11/xcb-util-renderutil/Makefile
===================================================================
RCS file: x11/xcb-util-renderutil/Makefile
diff -N x11/xcb-util-renderutil/Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-renderutil/Makefile	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	xcb-util-renderutil
+# Date created:		2011-12-16
+# Whom:			garga
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xcb-util-renderutil
+PORTVERSION=	0.3.8
+CATEGORIES=	x11
+MASTER_SITES=	http://xcb.freedesktop.org/dist/
+
+MAINTAINER=	garga at FreeBSD.org
+COMMENT=	Convenience functions for the Render extension
+
+LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb \
+		xcb-util.0:${PORTSDIR}/x11/xcb-util
+#BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+#USE_XORG=	xau xdmcp
+#USE_AUTOTOOLS=	libtool
+
+GNU_CONFIGURE=	yes
+#CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf"
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|' \
+		${WRKSRC}/configure
+
+.include <bsd.port.mk>
Index: x11/xcb-util-renderutil/distinfo
===================================================================
RCS file: x11/xcb-util-renderutil/distinfo
diff -N x11/xcb-util-renderutil/distinfo
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-renderutil/distinfo	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,2 @@
+SHA256 (xcb-util-renderutil-0.3.8.tar.bz2) = 9789a5c55728fa7bae374d9fdf1c61095869bdc68561911760879095644c7452
+SIZE (xcb-util-renderutil-0.3.8.tar.bz2) = 257492
Index: x11/xcb-util-renderutil/pkg-descr
===================================================================
RCS file: x11/xcb-util-renderutil/pkg-descr
diff -N x11/xcb-util-renderutil/pkg-descr
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-renderutil/pkg-descr	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,10 @@
+The xcb-util module provides a number of libraries which sit on top of
+libxcb, the core X protocol library, and some of the extension
+libraries. These experimental libraries provide convenience functions
+and interfaces which make the raw X protocol more usable. Some of the
+libraries also provide client-side code which is not strictly part of
+the X protocol but which have traditionally been provided by Xlib.
+
+Renderutil module s Convenience functions for the Render extension.
+
+WWW:	http://xcb.freedesktop.org/
Index: x11/xcb-util-renderutil/pkg-plist
===================================================================
RCS file: x11/xcb-util-renderutil/pkg-plist
diff -N x11/xcb-util-renderutil/pkg-plist
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-renderutil/pkg-plist	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,7 @@
+ at comment $FreeBSD$
+include/xcb/xcb_renderutil.h
+lib/libxcb-render-util.so.0
+lib/libxcb-render-util.so
+lib/libxcb-render-util.la
+lib/libxcb-render-util.a
+libdata/pkgconfig/xcb-renderutil.pc
Index: x11/xcb-util-wm/Makefile
===================================================================
RCS file: x11/xcb-util-wm/Makefile
diff -N x11/xcb-util-wm/Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-wm/Makefile	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	xcb-util-wm
+# Date created:		2011-12-16
+# Whom:			garga
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xcb-util-wm
+PORTVERSION=	0.3.8
+CATEGORIES=	x11
+MASTER_SITES=	http://xcb.freedesktop.org/dist/
+
+MAINTAINER=	garga at FreeBSD.org
+COMMENT=	Framework for window manager implementation
+
+LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb \
+		xcb-util.0:${PORTSDIR}/x11/xcb-util
+#BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+#USE_XORG=	xau xdmcp
+#USE_AUTOTOOLS=	libtool
+
+GNU_CONFIGURE=	yes
+#CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf"
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|' \
+		${WRKSRC}/configure
+
+.include <bsd.port.mk>
Index: x11/xcb-util-wm/distinfo
===================================================================
RCS file: x11/xcb-util-wm/distinfo
diff -N x11/xcb-util-wm/distinfo
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-wm/distinfo	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,2 @@
+SHA256 (xcb-util-wm-0.3.8.tar.bz2) = c557abbe4c7d45268f0541ee3d8f9a1a8799692fcc28aa33f39db93cc2e65007
+SIZE (xcb-util-wm-0.3.8.tar.bz2) = 305284
Index: x11/xcb-util-wm/pkg-descr
===================================================================
RCS file: x11/xcb-util-wm/pkg-descr
diff -N x11/xcb-util-wm/pkg-descr
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-wm/pkg-descr	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,11 @@
+The xcb-util module provides a number of libraries which sit on top of
+libxcb, the core X protocol library, and some of the extension
+libraries. These experimental libraries provide convenience functions
+and interfaces which make the raw X protocol more usable. Some of the
+libraries also provide client-side code which is not strictly part of
+the X protocol but which have traditionally been provided by Xlib.
+
+WM module is a Framework for window manager implementation. It brings
+both client and window-manager helpers for ICCCM and EWMH.
+
+WWW:	http://xcb.freedesktop.org/
Index: x11/xcb-util-wm/pkg-plist
===================================================================
RCS file: x11/xcb-util-wm/pkg-plist
diff -N x11/xcb-util-wm/pkg-plist
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11/xcb-util-wm/pkg-plist	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,13 @@
+ at comment $FreeBSD$
+include/xcb/xcb_icccm.h
+include/xcb/xcb_ewmh.h
+lib/libxcb-icccm.so.4
+lib/libxcb-icccm.so
+lib/libxcb-icccm.la
+lib/libxcb-icccm.a
+lib/libxcb-ewmh.so.1
+lib/libxcb-ewmh.so
+lib/libxcb-ewmh.la
+lib/libxcb-ewmh.a
+libdata/pkgconfig/xcb-icccm.pc
+libdata/pkgconfig/xcb-ewmh.pc
Index: x11-wm/awesome/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-wm/awesome/Makefile,v
retrieving revision 1.56
diff -u -r1.56 Makefile
--- x11-wm/awesome/Makefile	15 Dec 2011 09:26:00 -0000	1.56
+++ x11-wm/awesome/Makefile	29 Dec 2011 12:26:15 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	awesome
-PORTVERSION=	3.4.10
-PORTREVISION=	3
+PORTVERSION=	3.4.11
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
 
@@ -21,7 +20,7 @@
 		gperf>=3.0.3:${PORTSDIR}/devel/gperf \
 		pango>=1.19.3:${PORTSDIR}/x11-toolkits/pango \
 		xmlto:${PORTSDIR}/textproc/xmlto \
-		xcb-util>=0.3.6:${PORTSDIR}/x11/xcb-util \
+		xcb-util>=0.3.8:${PORTSDIR}/x11/xcb-util \
 		xproto>=7.0.11:${PORTSDIR}/x11/xproto \
 		${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-450
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
@@ -30,7 +29,10 @@
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		xdg-basedir.2:${PORTSDIR}/x11/libxdg-basedir \
 		xcb.2:${PORTSDIR}/x11/libxcb \
-		xcb-event.1:${PORTSDIR}/x11/xcb-util \
+		xcb-util.0:${PORTSDIR}/x11/xcb-util \
+		xcb-image.0:${PORTSDIR}/x11/xcb-util-image \
+		xcb-keysyms.1:${PORTSDIR}/x11/xcb-util-keysyms \
+		xcb-icccm.4:${PORTSDIR}/x11/xcb-util-wm \
 		execinfo.1:${PORTSDIR}/devel/libexecinfo
 
 USE_BZIP2=	yes
Index: x11-wm/awesome/distinfo
===================================================================
RCS file: /home/pcvs/ports/x11-wm/awesome/distinfo,v
retrieving revision 1.30
diff -u -r1.30 distinfo
--- x11-wm/awesome/distinfo	9 Jun 2011 13:05:26 -0000	1.30
+++ x11-wm/awesome/distinfo	29 Dec 2011 12:26:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (awesome-3.4.10.tar.bz2) = 3ed72cf9a63b93290d6ce4dcbbb56cff555cb172868aaac02a64dee995e0c3b0
-SIZE (awesome-3.4.10.tar.bz2) = 747589
+SHA256 (awesome-3.4.11.tar.bz2) = 83fc42d4ea71914d1b456023ce53b546e22e8ccc11a73c4a39a1152d2f30b628
+SIZE (awesome-3.4.11.tar.bz2) = 758495
Index: x11-wm/i3/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-wm/i3/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- x11-wm/i3/Makefile	28 Dec 2011 15:52:16 -0000	1.21
+++ x11-wm/i3/Makefile	29 Dec 2011 12:26:15 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	i3
 DISTVERSION=	4.1.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://i3wm.org/downloads/ \
 		${MASTER_SITE_LOCAL}
@@ -19,7 +20,9 @@
 		pcre>=0:${PORTSDIR}/devel/pcre
 LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
-		xcb-event.1:${PORTSDIR}/x11/xcb-util \
+		xcb-util.0:${PORTSDIR}/x11/xcb-util \
+		xcb-keysyms.1:${PORTSDIR}/x11/xcb-util-keysyms \
+		xcb-icccm.4:${PORTSDIR}/x11/xcb-util-wm \
 		ev.4:${PORTSDIR}/devel/libev \
 		yajl.2:${PORTSDIR}/devel/yajl
 RUN_DEPENDS=	${SITE_PERL}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run
Index: x11-wm/mcwm/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-wm/mcwm/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- x11-wm/mcwm/Makefile	28 Dec 2011 16:42:04 -0000	1.8
+++ x11-wm/mcwm/Makefile	29 Dec 2011 12:26:15 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	mcwm
 PORTVERSION=	20111124
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://hack.org/mc/hacks/mcwm/
 
@@ -16,8 +17,9 @@
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	xcb-util>=0.3.6:${PORTSDIR}/x11/xcb-util
-RUN_DEPENDS=	xcb-util>=0.3.6:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS=	xcb-util.0:${PORTSDIR}/x11/xcb-util \
+		xcb-keysyms.1:${PORTSDIR}/x11/xcb-util-keysyms \
+		xcb-icccm.4:${PORTSDIR}/x11/xcb-util-wm \
 
 MAKE_JOBS_SAFE=	yes
 
Index: x11-wm/mcwm/files/patch-Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-wm/mcwm/files/patch-Makefile,v
retrieving revision 1.5
diff -u -r1.5 patch-Makefile
--- x11-wm/mcwm/files/patch-Makefile	28 Dec 2011 16:42:05 -0000	1.5
+++ x11-wm/mcwm/files/patch-Makefile	29 Dec 2011 12:26:15 -0000
@@ -17,7 +17,7 @@
 -	-lxcb-atom #-ldmalloc
 +CFLAGS+=-g -std=c99 -Wall -Wextra -I/usr/local/include #-DDEBUG #-DDMALLOC
 +LDFLAGS+=-L/usr/local/lib -lxcb -lxcb-randr -lxcb-keysyms -lxcb-icccm \
-+	-lxcb-atom -lxcb-property #-ldmalloc
++	-lxcb-util #-ldmalloc
  
  RM=/bin/rm
 -PREFIX=/usr/local
Index: x11-wm/mcwm/files/patch-mcwm.c
===================================================================
RCS file: x11-wm/mcwm/files/patch-mcwm.c
diff -N x11-wm/mcwm/files/patch-mcwm.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11-wm/mcwm/files/patch-mcwm.c	29 Dec 2011 12:26:15 -0000
@@ -0,0 +1,164 @@
+diff --git a/mcwm.c b/mcwm.c
+index 0613c9f..04a7a41 100644
+--- mcwm.c
++++ mcwm.c
+@@ -45,6 +45,10 @@
+ 
+ #include <X11/keysym.h>
+ 
++#include <xcb/xproto.h>
++#include <xcb/xcb_util.h>
++#include <xcb/xcb_ewmh.h>
++
+ #ifdef DEBUG
+ #include "events.h"
+ #endif
+@@ -503,7 +507,7 @@ void setwmdesktop(xcb_drawable_t win, uint32_t ws)
+     PDEBUG("Changing _NET_WM_DESKTOP on window %d to %d\n", win, ws);
+     
+     xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win,
+-                        atom_desktop, CARDINAL, 32, 1,
++                        atom_desktop, XCB_ATOM_CARDINAL, 32, 1,
+                         &ws);
+ }
+ 
+@@ -521,7 +525,7 @@ int32_t getwmdesktop(xcb_drawable_t win)
+     uint32_t *wsp;
+     uint32_t ws;
+     
+-    cookie = xcb_get_any_property(conn, false, win, atom_desktop,
++    cookie = xcb_get_property(conn, false, win, atom_desktop,XCB_GET_PROPERTY_TYPE_ANY, 0,
+                                   sizeof (int32_t));
+ 
+     reply = xcb_get_property_reply(conn, cookie, NULL);
+@@ -1136,8 +1140,8 @@ struct client *setupwin(xcb_window_t win)
+     /*
+      * Get the window's incremental size step, if any.
+      */
+-    if (!xcb_get_wm_normal_hints_reply(
+-            conn, xcb_get_wm_normal_hints_unchecked(
++    if (!xcb_icccm_get_wm_normal_hints_reply(
++            conn, xcb_icccm_get_wm_normal_hints_unchecked(
+                 conn, win), &hints, NULL))
+     {
+         PDEBUG("Couldn't get size hints.\n");
+@@ -1147,25 +1151,25 @@ struct client *setupwin(xcb_window_t win)
+      * The user specified the position coordinates. Remember that so
+      * we can use geometry later.
+      */
+-    if (hints.flags & XCB_SIZE_HINT_US_POSITION)
++    if (hints.flags & XCB_ICCCM_SIZE_HINT_US_POSITION)
+     {
+         client->usercoord = true;
+     }
+ 
+-    if (hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)
++    if (hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)
+     {
+         client->min_width = hints.min_width;
+         client->min_height = hints.min_height;
+     }
+     
+-    if (hints.flags & XCB_SIZE_HINT_P_MAX_SIZE)
++    if (hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE)
+     {
+         
+         client->max_width = hints.max_width;
+         client->max_height = hints.max_height;
+     }
+     
+-    if (hints.flags & XCB_SIZE_HINT_P_RESIZE_INC)
++    if (hints.flags & XCB_ICCCM_SIZE_HINT_P_RESIZE_INC)
+     {
+         client->width_inc = hints.width_inc;
+         client->height_inc = hints.height_inc;
+@@ -1174,7 +1178,7 @@ struct client *setupwin(xcb_window_t win)
+                client->height_inc);
+     }
+ 
+-    if (hints.flags & XCB_SIZE_HINT_BASE_SIZE)
++    if (hints.flags & XCB_ICCCM_SIZE_HINT_BASE_SIZE)
+     {
+         client->base_width = hints.base_width;
+         client->base_height = hints.base_height;
+@@ -2823,7 +2827,7 @@ void botright(void)
+ void deletewin(void)
+ {
+     xcb_get_property_cookie_t cookie;
+-    xcb_get_wm_protocols_reply_t protocols;
++    xcb_icccm_get_wm_protocols_reply_t protocols;
+     bool use_delete = false;
+     uint32_t i;
+ 
+@@ -2833,14 +2837,14 @@ void deletewin(void)
+     }
+ 
+     /* Check if WM_DELETE is supported.  */
+-    cookie = xcb_get_wm_protocols_unchecked(conn, focuswin->id, wm_protocols);
+-    if (xcb_get_wm_protocols_reply(conn, cookie, &protocols, NULL) == 1) {
++    cookie = xcb_icccm_get_wm_protocols_unchecked(conn, focuswin->id, wm_protocols);
++    if (xcb_icccm_get_wm_protocols_reply(conn, cookie, &protocols, NULL) == 1) {
+         for (i = 0; i < protocols.atoms_len; i++)
+             if (protocols.atoms[i] == wm_delete_window)
+                  use_delete = true;
+     }
+ 
+-    xcb_get_wm_protocols_reply_wipe(&protocols);
++    xcb_icccm_get_wm_protocols_reply_wipe(&protocols);
+ 
+     if (use_delete)
+     {
+@@ -4082,9 +4086,50 @@ int main(int argc, char **argv)
+     conf.fixedcol = getcolor(fixedcol);
+     
+     /* Get some atoms. */
+-    atom_desktop = xcb_atom_get(conn, "_NET_WM_DESKTOP");
+-    wm_delete_window = xcb_atom_get(conn, "WM_DELETE_WINDOW");
+-    wm_protocols = xcb_atom_get(conn, "WM_PROTOCOLS");
++//    atom_desktop = xcb_atom_get(conn, "_NET_WM_DESKTOP");
++//    wm_delete_window = xcb_atom_get(conn, "WM_DELETE_WINDOW");
++//    wm_protocols = xcb_atom_get(conn, "WM_PROTOCOLS");
++
++    char  *atom_name;
++    xcb_intern_atom_cookie_t cookie_desktop;
++    xcb_intern_atom_cookie_t cookie_delete_window;
++    xcb_intern_atom_cookie_t cookie_protocols;
++    xcb_intern_atom_reply_t *rep;
++
++    atom_name = "_NET_WM_DESKTOP";
++    cookie_desktop = xcb_intern_atom (conn,
++                                      0,
++                                      strlen (atom_name),
++                                      atom_name);
++    rep = xcb_intern_atom_reply (conn,
++                                  cookie_desktop,
++                                  NULL);
++    atom_desktop = rep->atom;
++    free (rep);
++
++
++    atom_name = "WM_DELETE_WINDOW";
++    cookie_delete_window = xcb_intern_atom (conn,
++                                      0,
++                                      strlen (atom_name),
++                                      atom_name);
++    rep = xcb_intern_atom_reply (conn,
++                                  cookie_delete_window,
++                                  NULL);
++    wm_delete_window = rep->atom;
++    free (rep);
++
++    atom_name = "WM_PROTOCOLS";
++    cookie_protocols = xcb_intern_atom (conn,
++                                      0,
++                                      strlen (atom_name),
++                                      atom_name);
++    rep = xcb_intern_atom_reply (conn,
++                                  cookie_protocols,
++                                  NULL);
++    wm_protocols = rep->atom;
++    free (rep);
++
+ 
+     /* Check for RANDR extension and configure. */
+     randrbase = setuprandr();


More information about the cvs-all mailing list