From 5f26c36c1f58756b5b21846f77fcfc87fae6d1a9 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 18 Dec 2008 20:50:40 +0000 Subject: [PATCH] 0.3.2 + RPATH temporary fixes --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- xcb-util-0.3.1-copyright-resolution.patch | 483 ------------------ xcb-util-0.3.1-exit-in-library.patch | 35 -- ...-revert-keysyms-use-xcb_key_lookup_t.patch | 119 +++++ ....3.2-xcb_keysyms-remove-xcb_lookup_t.patch | 28 + xcb-util.spec | 26 +- 8 files changed, 169 insertions(+), 527 deletions(-) delete mode 100644 xcb-util-0.3.1-copyright-resolution.patch delete mode 100644 xcb-util-0.3.1-exit-in-library.patch create mode 100644 xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch create mode 100644 xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch diff --git a/.cvsignore b/.cvsignore index bc04e67..72b7d9e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xcb-util-0.3.1.tar.bz2 +xcb-util-0.3.2.tar.bz2 diff --git a/import.log b/import.log index 45aa7a0..8d7a732 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ xcb-util-0_3_1-2_fc10:HEAD:xcb-util-0.3.1-2.fc10.src.rpm:1228863002 +xcb-util-0_3_2-1_fc10:HEAD:xcb-util-0.3.2-1.fc10.src.rpm:1229633234 diff --git a/sources b/sources index 5f6e27d..0867e2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b06006e438c3926d077439b31d290d6 xcb-util-0.3.1.tar.bz2 +fa41a147f5a63b01207cfd975fecc45c xcb-util-0.3.2.tar.bz2 diff --git a/xcb-util-0.3.1-copyright-resolution.patch b/xcb-util-0.3.1-copyright-resolution.patch deleted file mode 100644 index 67774af..0000000 --- a/xcb-util-0.3.1-copyright-resolution.patch +++ /dev/null @@ -1,483 +0,0 @@ -From: Jonathan Landis -Date: Fri, 21 Nov 2008 09:10:15 +0000 (+0100) -Subject: Fix copyright statement -X-Git-Url: http://gitweb.freedesktop.org/?p=xcb/util.git;a=commitdiff;h=7ba0d2c98a6fc033dc1edfd791cfacdace4eab51 - -Fix copyright statement - -Signed-off-by: Julien Danjou ---- - ---- a/aux/xcb_aux.c -+++ b/aux/xcb_aux.c -@@ -1,3 +1,34 @@ -+/* -+ * Copyright © 2008 Bart Massey -+ * Copyright © 2008 Ian Osgood -+ * Copyright © 2008 Jamey Sharp -+ * Copyright © 2008 Josh Triplett -+ * -+ * Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, copy, -+ * modify, merge, publish, distribute, sublicense, and/or sell copies -+ * of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * Except as contained in this notice, the names of the authors or -+ * their institutions shall not be used in advertising or otherwise to -+ * promote the sale, use or other dealings in this Software without -+ * prior written authorization from the authors. -+ */ -+ - #include - #include - #include ---- a/event/event.c -+++ b/event/event.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2008 Julien Danjou -+ * Copyright © 2008 Julien Danjou - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation ---- a/icccm/icccm.c -+++ b/icccm/icccm.c -@@ -1,6 +1,6 @@ - /* -- * Copyright (C) 2008 Arnaud Fontaine -- * Copyright (C) 2007-2008 Vincent Torri -+ * Copyright © 2008 Arnaud Fontaine -+ * Copyright © 2007-2008 Vincent Torri - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation ---- a/image/test_bitmap.c -+++ b/image/test_bitmap.c -@@ -1,3 +1,32 @@ -+/* -+ * Copyright © 2008 Bart Massey -+ * Copyright © 2008 Julien Danjou -+ * -+ * Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, copy, -+ * modify, merge, publish, distribute, sublicense, and/or sell copies -+ * of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * Except as contained in this notice, the names of the authors or -+ * their institutions shall not be used in advertising or otherwise to -+ * promote the sale, use or other dealings in this Software without -+ * prior written authorization from the authors. -+ */ -+ - #include - #include - #include ---- a/image/test_formats.c -+++ b/image/test_formats.c -@@ -1,3 +1,31 @@ -+/* -+ * Copyright © 2008 Bart Massey -+ * -+ * Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, copy, -+ * modify, merge, publish, distribute, sublicense, and/or sell copies -+ * of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * Except as contained in this notice, the names of the authors or -+ * their institutions shall not be used in advertising or otherwise to -+ * promote the sale, use or other dealings in this Software without -+ * prior written authorization from the authors. -+ */ -+ - #include - #include - #include ---- a/image/test_swap.c -+++ b/image/test_swap.c -@@ -1,3 +1,31 @@ -+/* -+ * Copyright © 2008 Keith Packard -+ * -+ * Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, copy, -+ * modify, merge, publish, distribute, sublicense, and/or sell copies -+ * of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * Except as contained in this notice, the names of the authors or -+ * their institutions shall not be used in advertising or otherwise to -+ * promote the sale, use or other dealings in this Software without -+ * prior written authorization from the authors. -+ */ -+ - #include - #include - #include ---- a/image/test_xcb_image.c -+++ b/image/test_xcb_image.c -@@ -1,3 +1,31 @@ -+/* -+ * Copyright © 2008 Bart Massey -+ * -+ * Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, copy, -+ * modify, merge, publish, distribute, sublicense, and/or sell copies -+ * of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * Except as contained in this notice, the names of the authors or -+ * their institutions shall not be used in advertising or otherwise to -+ * promote the sale, use or other dealings in this Software without -+ * prior written authorization from the authors. -+ */ -+ - /* gcc -g -O2 -Wall `pkg-config --cflags --libs xcb` -o test xcb_image.o test_xcb_image.c */ - - #include ---- a/image/test_xcb_image_shm.c -+++ b/image/test_xcb_image_shm.c -@@ -1,3 +1,29 @@ -+/* -+ * Copyright © 2007 Bart Massey -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * Except as contained in this notice, the names of the authors or their -+ * institutions shall not be used in advertising or otherwise to promote the -+ * sale, use or other dealings in this Software without prior written -+ * authorization from the authors. -+ */ -+ - #include - #include - ---- a/image/xcb_image.c -+++ b/image/xcb_image.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2007 Bart Massey -+/* Copyright © 2007 Bart Massey - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), ---- a/keysyms/keysyms.c -+++ b/keysyms/keysyms.c -@@ -1,3 +1,34 @@ -+/* -+ * Copyright © 2008 Ian Osgood -+ * Copyright © 2008 Jamey Sharp -+ * Copyright © 2008 Josh Triplett -+ * Copyright © 2008 Ulrich Eckhardt -+ * -+ * Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, copy, -+ * modify, merge, publish, distribute, sublicense, and/or sell copies -+ * of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * Except as contained in this notice, the names of the authors or -+ * their institutions shall not be used in advertising or otherwise to -+ * promote the sale, use or other dealings in this Software without -+ * prior written authorization from the authors. -+ */ -+ - #include - - #include ---- a/property/property.c -+++ b/property/property.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2008 Julien Danjou -+ * Copyright © 2008 Julien Danjou - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation ---- a/reply/reply.c -+++ b/reply/reply.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2008 Julien Danjou -+ * Copyright © 2008 Julien Danjou - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation ---- a/reply/test_reply.c -+++ b/reply/test_reply.c -@@ -1,3 +1,34 @@ -+/* -+ * Copyright © 2008 Ian Osgood -+ * Copyright © 2008 Jamey Sharp -+ * Copyright © 2008 Josh Triplett -+ * Copyright © 2008 Julien Danjou -+ * -+ * Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, copy, -+ * modify, merge, publish, distribute, sublicense, and/or sell copies -+ * of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * Except as contained in this notice, the names of the authors or -+ * their institutions shall not be used in advertising or otherwise to -+ * promote the sale, use or other dealings in this Software without -+ * prior written authorization from the authors. -+ */ -+ - #include "xcb_reply.h" - - #include ---- a/wm/manage.c -+++ b/wm/manage.c -@@ -1,3 +1,34 @@ -+/* -+ * Copyright © 2008 Ian Osgood -+ * Copyright © 2008 Josh Triplett -+ * Copyright © 2008 Thomas Hunger -+ * Copyright © 2008 Torri Vincent -+ * -+ * Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, copy, -+ * modify, merge, publish, distribute, sublicense, and/or sell copies -+ * of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * Except as contained in this notice, the names of the authors or -+ * their institutions shall not be used in advertising or otherwise to -+ * promote the sale, use or other dealings in this Software without -+ * prior written authorization from the authors. -+ */ -+ - #include - #include - #include "xcb_wm.h" ---- a/wm/reply_formats.c -+++ b/wm/reply_formats.c -@@ -1,9 +1,31 @@ - /* -- * Copyright (C) 2001-2002 Bart Massey and Jamey Sharp. -- * All Rights Reserved. See the file COPYING in this directory -- * for licensing information. -+ * Copyright © 2008 Bart Massey -+ * Copyright © 2008 Jamey Sharp -+ * -+ * Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, copy, -+ * modify, merge, publish, distribute, sublicense, and/or sell copies -+ * of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * Except as contained in this notice, the names of the authors or -+ * their institutions shall not be used in advertising or otherwise to -+ * promote the sale, use or other dealings in this Software without -+ * prior written authorization from the authors. - */ -- - #include - #include "reply_formats.h" - ---- a/wm/table.c -+++ b/wm/table.c -@@ -1,3 +1,33 @@ -+/* -+ * Copyright © 2008 Ian Osgood -+ * Copyright © 2008 Josh Triplett -+ * Copyright © 2008 Thomas Hunger -+ * -+ * Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, copy, -+ * modify, merge, publish, distribute, sublicense, and/or sell copies -+ * of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * Except as contained in this notice, the names of the authors or -+ * their institutions shall not be used in advertising or otherwise to -+ * promote the sale, use or other dealings in this Software without -+ * prior written authorization from the authors. -+ */ -+ - #include - #include "xcb_wm.h" - ---- a/wm/xcbwm-test.c -+++ b/wm/xcbwm-test.c -@@ -1,3 +1,33 @@ -+/* -+ * Copyright © 2008 Ian Osgood -+ * Copyright © 2008 Jamey Sharp -+ * Copyright © 2008 Josh Triplett -+ * Copyright © 2008 Julien Danjou -+ * -+ * Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, copy, -+ * modify, merge, publish, distribute, sublicense, and/or sell copies -+ * of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * Except as contained in this notice, the names of the authors or -+ * their institutions shall not be used in advertising or otherwise to -+ * promote the sale, use or other dealings in this Software without -+ * prior written authorization from the authors. -+ */ - #include - #include - #include diff --git a/xcb-util-0.3.1-exit-in-library.patch b/xcb-util-0.3.1-exit-in-library.patch deleted file mode 100644 index 19a5922..0000000 --- a/xcb-util-0.3.1-exit-in-library.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c9796f2f53a4ef16f5f5c8f3b7d01bc2ceb11547 Mon Sep 17 00:00:00 2001 -From: Peter Harris -Date: Sat, 29 Nov 2008 17:26:46 +0000 -Subject: Don't call exit() in xcb_aux_get_depth; return 0 instead. - ---- -diff --git a/aux/xcb_aux.c b/aux/xcb_aux.c -index cc96a62..1adc02a 100644 ---- a/aux/xcb_aux.c -+++ b/aux/xcb_aux.c -@@ -44,18 +44,15 @@ xcb_aux_get_depth (xcb_connection_t *c, - { - xcb_drawable_t drawable; - xcb_get_geometry_reply_t *geom; -- int depth; -+ int depth = 0; - - drawable = screen->root; - geom = xcb_get_geometry_reply (c, xcb_get_geometry(c, drawable), 0); - -- if (!geom) { -- perror ("GetGeometry(root) failed"); -- exit (0); -+ if (geom) { -+ depth = geom->depth; -+ free (geom); - } -- -- depth = geom->depth; -- free (geom); - - return depth; - } --- -cgit v0.8.1-24-ge5fb diff --git a/xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch b/xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch new file mode 100644 index 0000000..c84b206 --- /dev/null +++ b/xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch @@ -0,0 +1,119 @@ +From e9db47701cf7ce17c8ab03cc8cc3618bccba2026 Mon Sep 17 00:00:00 2001 +From: Julien Danjou +Date: Tue, 16 Dec 2008 17:21:41 +0000 +Subject: Revert "keysyms: use xcb_key_lookup_t type for col paramter" + +This reverts commit 24da2934459c7811f77713a3c7aaa6691ad203f2. +--- +diff --git a/keysyms/keysyms.c b/keysyms/keysyms.c +index b6f6ab8..d1f1d52 100644 +--- a/keysyms/keysyms.c ++++ b/keysyms/keysyms.c +@@ -185,8 +185,8 @@ rule that is satisfied from the following list: + */ + + xcb_keysym_t xcb_key_symbols_get_keysym (xcb_key_symbols_t *syms, +- xcb_keycode_t keycode, +- xcb_key_lookup_t col) ++ xcb_keycode_t keycode, ++ int col) + { + xcb_keysym_t *keysyms; + xcb_keysym_t keysym_null = { XCB_NO_SYMBOL }; +@@ -266,17 +266,17 @@ xcb_key_symbols_get_keycode (xcb_key_symbols_t *syms, + } + + xcb_keysym_t +-xcb_key_press_lookup_keysym (xcb_key_symbols_t *syms, +- xcb_key_press_event_t *event, +- xcb_key_lookup_t col) ++xcb_key_press_lookup_keysym (xcb_key_symbols_t *syms, ++ xcb_key_press_event_t *event, ++ int col) + { + return xcb_key_symbols_get_keysym (syms, event->detail, col); + } + + xcb_keysym_t +-xcb_key_release_lookup_keysym (xcb_key_symbols_t *syms, +- xcb_key_release_event_t *event, +- xcb_key_lookup_t col) ++xcb_key_release_lookup_keysym (xcb_key_symbols_t *syms, ++ xcb_key_release_event_t *event, ++ int col) + { + return xcb_key_symbols_get_keysym (syms, event->detail, col); + } +diff --git a/keysyms/xcb_keysyms.h b/keysyms/xcb_keysyms.h +index 3b408e4..2b46239 100644 +--- a/keysyms/xcb_keysyms.h ++++ b/keysyms/xcb_keysyms.h +@@ -3,41 +3,43 @@ + + #include + ++ + #ifdef __cplusplus + extern "C" { + #endif + ++ + typedef struct _XCBKeySymbols xcb_key_symbols_t; + + /* enumeration for col parameter? */ +-typedef enum { +- xcb_key_lookup_none_t = 1, +- xcb_key_lookup_chars_t = 2, +- xcb_key_lookup_key_sym_t = 3, +- xcb_key_lookup_both_t = 4 +-} xcb_key_lookup_t; ++enum { ++ xcb_lookup_none_t = 1, ++ xcb_lookup_chars_t = 2, ++ xcb_lookup_key_sym_t = 3, ++ xcb_lookup_both_t = 4 ++} xcb_lookup_t; + + xcb_key_symbols_t *xcb_key_symbols_alloc (xcb_connection_t *c); + + void xcb_key_symbols_free (xcb_key_symbols_t *syms); + +-xcb_keysym_t xcb_key_symbols_get_keysym (xcb_key_symbols_t *syms, +- xcb_keycode_t keycode, +- xcb_key_lookup_t col); ++xcb_keysym_t xcb_key_symbols_get_keysym (xcb_key_symbols_t *syms, ++ xcb_keycode_t keycode, ++ int col); + + xcb_keycode_t xcb_key_symbols_get_keycode (xcb_key_symbols_t *syms, +- xcb_keysym_t keysym); ++ xcb_keysym_t keysym); + +-xcb_keysym_t xcb_key_press_lookup_keysym (xcb_key_symbols_t *syms, +- xcb_key_press_event_t *event, +- xcb_key_lookup_t col); ++xcb_keysym_t xcb_key_press_lookup_keysym (xcb_key_symbols_t *syms, ++ xcb_key_press_event_t *event, ++ int col); + +-xcb_keysym_t xcb_key_release_lookup_keysym (xcb_key_symbols_t *syms, +- xcb_key_release_event_t *event, +- xcb_key_lookup_t col); ++xcb_keysym_t xcb_key_release_lookup_keysym (xcb_key_symbols_t *syms, ++ xcb_key_release_event_t *event, ++ int col); + + int xcb_refresh_keyboard_mapping (xcb_key_symbols_t *syms, +- xcb_mapping_notify_event_t *event); ++ xcb_mapping_notify_event_t *event); + + /* TODO: need XLookupString equivalent */ + +@@ -62,4 +64,5 @@ int xcb_is_modifier_key (xcb_keysym_t keysym); + } + #endif + ++ + #endif /* __XCB_KEYSYMS_H__ */ +-- +cgit v0.8.1-24-ge5fb diff --git a/xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch b/xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch new file mode 100644 index 0000000..21b4309 --- /dev/null +++ b/xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch @@ -0,0 +1,28 @@ +From 6cf9c8d121888d688464a1551342de3f9d6206f6 Mon Sep 17 00:00:00 2001 +From: Julien Danjou +Date: Tue, 16 Dec 2008 17:22:06 +0000 +Subject: xcb_keysyms: remove xcb_lookup_t + +Signed-off-by: Julien Danjou +--- +diff --git a/keysyms/xcb_keysyms.h b/keysyms/xcb_keysyms.h +index 2b46239..1202982 100644 +--- a/keysyms/xcb_keysyms.h ++++ b/keysyms/xcb_keysyms.h +@@ -11,14 +11,6 @@ extern "C" { + + typedef struct _XCBKeySymbols xcb_key_symbols_t; + +-/* enumeration for col parameter? */ +-enum { +- xcb_lookup_none_t = 1, +- xcb_lookup_chars_t = 2, +- xcb_lookup_key_sym_t = 3, +- xcb_lookup_both_t = 4 +-} xcb_lookup_t; +- + xcb_key_symbols_t *xcb_key_symbols_alloc (xcb_connection_t *c); + + void xcb_key_symbols_free (xcb_key_symbols_t *syms); +-- +cgit v0.8.1-24-ge5fb diff --git a/xcb-util.spec b/xcb-util.spec index 5cbb2d4..7ce7ce6 100644 --- a/xcb-util.spec +++ b/xcb-util.spec @@ -1,14 +1,14 @@ Name: xcb-util -Version: 0.3.1 -Release: 2%{?dist} +Version: 0.3.2 +Release: 1%{?dist} Summary: Convenience libraries sitting on top of libxcb Group: System Environment/Libraries License: MIT URL: http://xcb.freedesktop.org Source0: http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2 -Patch0: xcb-util-0.3.1-copyright-resolution.patch -Patch1: xcb-util-0.3.1-exit-in-library.patch +Patch0: xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch +Patch1: xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gperf, pkgconfig, libxcb-devel, m4, xorg-x11-proto-devel @@ -32,7 +32,7 @@ Development files for xcb-util. %prep %setup -q -# taken from upstream git +# taken from upstream git, both post 0.3.2 patches %patch0 -p1 %patch1 -p1 @@ -40,12 +40,17 @@ Development files for xcb-util. %build %configure --with-pic --disable-static +# get rid of rpath - Freedesktop.org bug 19156, https://bugs.freedesktop.org/show_bug.cgi?id=19156 +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + make %{?_smp_mflags} -%check +# fix make check, Freedesktop.org bug 19157 +#%check -make check +#make check %install @@ -81,6 +86,13 @@ rm -rf %{buildroot} %changelog +* Thu Dec 18 2008 Michal Nowak - 0.3.2-1 +- 0.3.2 +- remove rpath (x86-64) +- xcb_keysyms: remove xcb_lookup_t +- Revert "keysyms: use xcb_key_lookup_t type for col paramter" +- temporary disabled %%check due to RPATH regression + * Thu Dec 4 2008 Michal Nowak - 0.3.1-2 - patch for exit() in aux library (Peter Harris) - slight changes in spec file