Attachment #120502 for bug #163301

View | Details | Raw Unified | Return to bug 163301
Collapse All | Expand All

Lines 6-13 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/x11/xcb-util/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= xcb-util	8	PORTNAME= xcb-util
9	PORTVERSION= 0.3.6	9	PORTVERSION= 0.3.8
10	PORTREVISION= 1
11	CATEGORIES= x11	10	CATEGORIES= x11
12	MASTER_SITES= http://xcb.freedesktop.org/dist/	11	MASTER_SITES= http://xcb.freedesktop.org/dist/
13		12

Lines 1-2 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/x11/xcb-util/distinfo (-2 / +2 lines)
1	SHA256 (xcb-util-0.3.6.tar.bz2) = ffb8ee11ab015858a970ab7edd56bd2436b281657596561d8429d4a90df60e57	1	SHA256 (xcb-util-0.3.8.tar.bz2) = c1eed9284750bc09352e60654df77bb585dbbe7673fdcc675e58b7f3a0b447b9
2	SIZE (xcb-util-0.3.6.tar.bz2) = 293408	2	SIZE (xcb-util-0.3.8.tar.bz2) = 266339




--- 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);




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-util.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
include/xcb/xcb_atom.h
include/xcb/xcb_aux.h
include/xcb/xcb_bitops.h
include/xcb/xcb_event.h
include/xcb/xcb_util.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

Return to bug 163301

Lines 1-20 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/x11/xcb-util/files/patch-icccm-icccm.c (-20 lines)
1	--- icccm/icccm.c.orig 2009-08-24 11:47:36.000000000 +0300
2	+++ icccm/icccm.c 2009-10-21 21:01:52.000000000 +0300
3	@@ -627,15 +627,13 @@
4	xcb_get_wm_hints_from_reply(xcb_wm_hints_t *hints,
5	xcb_get_property_reply_t *reply)
6	{
7	- if(!reply)
8	+ if(!reply \|\| reply->type != WM_HINTS \|\| reply->format != 32)
9	return 0;
10
11	int length = xcb_get_property_value_length(reply);
12	int num_elem = length / (reply->format / 8);
13
14	- if (reply->type != WM_HINTS
15	- \|\| reply->format != 32
16	- \|\| num_elem < XCB_NUM_WM_HINTS_ELEMENTS - 1)
17	+ if(num_elem < XCB_NUM_WM_HINTS_ELEMENTS - 1)
18	return 0;
19
20	memcpy(hints, (xcb_size_hints_t *) xcb_get_property_value(reply), length);

Lines 1-56 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/x11/xcb-util/pkg-plist (-49 / +6 lines)
1	lib/libxcb-atom.so.1	1	lib/libxcb-util.so.0
2	lib/libxcb-atom.so	2	lib/libxcb-util.so
3	lib/libxcb-atom.la	3	lib/libxcb-util.la
4	lib/libxcb-atom.a	4	lib/libxcb-util.a
5	libdata/pkgconfig/xcb-atom.pc	5	libdata/pkgconfig/xcb-atom.pc
6	libdata/pkgconfig/xcb-aux.pc	6	libdata/pkgconfig/xcb-aux.pc
7	libdata/pkgconfig/xcb-event.pc	7	libdata/pkgconfig/xcb-event.pc
8	libdata/pkgconfig/xcb-property.pc	8	libdata/pkgconfig/xcb-util.pc
9	libdata/pkgconfig/xcb-icccm.pc
10	libdata/pkgconfig/xcb-image.pc
11	libdata/pkgconfig/xcb-keysyms.pc
12	libdata/pkgconfig/xcb-reply.pc
13	libdata/pkgconfig/xcb-renderutil.pc
14	lib/libxcb-aux.so.0
15	lib/libxcb-aux.so
16	lib/libxcb-aux.la
17	lib/libxcb-aux.a
18	lib/libxcb-event.so.1
19	lib/libxcb-event.so
20	lib/libxcb-event.la
21	lib/libxcb-event.a
22	lib/libxcb-property.so.1
23	lib/libxcb-property.so
24	lib/libxcb-property.la
25	lib/libxcb-property.a
26	lib/libxcb-icccm.so.1
27	lib/libxcb-icccm.so
28	lib/libxcb-icccm.la
29	lib/libxcb-icccm.a
30	lib/libxcb-image.so.0
31	lib/libxcb-image.so
32	lib/libxcb-image.la
33	lib/libxcb-image.a
34	lib/libxcb-keysyms.so.1
35	lib/libxcb-keysyms.so
36	lib/libxcb-keysyms.la
37	lib/libxcb-keysyms.a
38	lib/libxcb-reply.so.1
39	lib/libxcb-reply.so
40	lib/libxcb-reply.la
41	lib/libxcb-reply.a
42	lib/libxcb-render-util.so.0
43	lib/libxcb-render-util.so
44	lib/libxcb-render-util.la
45	lib/libxcb-render-util.a
46	include/xcb/xcb_atom.h	9	include/xcb/xcb_atom.h
47	include/xcb/xcb_aux.h	10	include/xcb/xcb_aux.h
48	include/xcb/xcb_bitops.h	11	include/xcb/xcb_bitops.h
49	include/xcb/xcb_event.h	12	include/xcb/xcb_event.h
50	include/xcb/xcb_property.h	13	include/xcb/xcb_util.h
51	include/xcb/xcb_icccm.h
52	include/xcb/xcb_image.h
53	include/xcb/xcb_keysyms.h
54	include/xcb/xcb_pixel.h
55	include/xcb/xcb_reply.h
56	include/xcb/xcb_renderutil.h