init/0.3.1 + upstream patches
This commit is contained in:
parent
7c6d4ed98e
commit
fb7241cd5f
@ -0,0 +1 @@
|
||||
xcb-util-0.3.1.tar.bz2
|
||||
1
import.log
Normal file
1
import.log
Normal file
@ -0,0 +1 @@
|
||||
xcb-util-0_3_1-2_fc10:HEAD:xcb-util-0.3.1-2.fc10.src.rpm:1228863002
|
||||
483
xcb-util-0.3.1-copyright-resolution.patch
Normal file
483
xcb-util-0.3.1-copyright-resolution.patch
Normal file
@ -0,0 +1,483 @@
|
||||
From: Jonathan Landis <landijk-dev@yahoo.com>
|
||||
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 <julien@danjou.info>
|
||||
---
|
||||
|
||||
--- a/aux/xcb_aux.c
|
||||
+++ b/aux/xcb_aux.c
|
||||
@@ -1,3 +1,34 @@
|
||||
+/*
|
||||
+ * Copyright © 2008 Bart Massey <bart@cs.pdx.edu>
|
||||
+ * Copyright © 2008 Ian Osgood <iano@quirkster.com>
|
||||
+ * Copyright © 2008 Jamey Sharp <jamey@minilop.net>
|
||||
+ * Copyright © 2008 Josh Triplett <josh@freedesktop.org>
|
||||
+ *
|
||||
+ * 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 <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
--- a/event/event.c
|
||||
+++ b/event/event.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (C) 2008 Julien Danjou <julien@danjou.info>
|
||||
+ * Copyright © 2008 Julien Danjou <julien@danjou.info>
|
||||
*
|
||||
* 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 <arnau@debian.org>
|
||||
- * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr>
|
||||
+ * Copyright © 2008 Arnaud Fontaine <arnau@debian.org>
|
||||
+ * Copyright © 2007-2008 Vincent Torri <vtorri@univ-evry.fr>
|
||||
*
|
||||
* 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 <bart@cs.pdx.edu>
|
||||
+ * Copyright © 2008 Julien Danjou <julien@danjou.info>
|
||||
+ *
|
||||
+ * 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 <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
--- a/image/test_formats.c
|
||||
+++ b/image/test_formats.c
|
||||
@@ -1,3 +1,31 @@
|
||||
+/*
|
||||
+ * Copyright © 2008 Bart Massey <bart@cs.pdx.edu>
|
||||
+ *
|
||||
+ * 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 <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
--- a/image/test_swap.c
|
||||
+++ b/image/test_swap.c
|
||||
@@ -1,3 +1,31 @@
|
||||
+/*
|
||||
+ * Copyright © 2008 Keith Packard <keithp@keithp.com>
|
||||
+ *
|
||||
+ * 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 <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
--- a/image/test_xcb_image.c
|
||||
+++ b/image/test_xcb_image.c
|
||||
@@ -1,3 +1,31 @@
|
||||
+/*
|
||||
+ * Copyright © 2008 Bart Massey <bart@cs.pdx.edu>
|
||||
+ *
|
||||
+ * 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 <stdlib.h>
|
||||
--- a/image/test_xcb_image_shm.c
|
||||
+++ b/image/test_xcb_image_shm.c
|
||||
@@ -1,3 +1,29 @@
|
||||
+/*
|
||||
+ * Copyright © 2007 Bart Massey <bart@cs.pdx.edu>
|
||||
+ *
|
||||
+ * 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 <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
--- 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 <iano@quirkster.com>
|
||||
+ * Copyright © 2008 Jamey Sharp <jamey@minilop.net>
|
||||
+ * Copyright © 2008 Josh Triplett <josh@freedesktop.org>
|
||||
+ * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de>
|
||||
+ *
|
||||
+ * 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 <stdlib.h>
|
||||
|
||||
#include <xcb/xcb.h>
|
||||
--- a/property/property.c
|
||||
+++ b/property/property.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (C) 2008 Julien Danjou <julien@danjou.info>
|
||||
+ * Copyright © 2008 Julien Danjou <julien@danjou.info>
|
||||
*
|
||||
* 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 <julien@danjou.info>
|
||||
+ * Copyright © 2008 Julien Danjou <julien@danjou.info>
|
||||
*
|
||||
* 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 <iano@quirkster.com>
|
||||
+ * Copyright © 2008 Jamey Sharp <jamey@minilop.net>
|
||||
+ * Copyright © 2008 Josh Triplett <josh@freedesktop.org>
|
||||
+ * Copyright © 2008 Julien Danjou <julien@danjou.info>
|
||||
+ *
|
||||
+ * 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 <string.h>
|
||||
--- a/wm/manage.c
|
||||
+++ b/wm/manage.c
|
||||
@@ -1,3 +1,34 @@
|
||||
+/*
|
||||
+ * Copyright © 2008 Ian Osgood <iano@quirkster.com>
|
||||
+ * Copyright © 2008 Josh Triplett <josh@freedesktop.org>
|
||||
+ * Copyright © 2008 Thomas Hunger <hto@arco.de>
|
||||
+ * Copyright © 2008 Torri Vincent <vtorri@univ-evry.fr>
|
||||
+ *
|
||||
+ * 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 <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#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 <bart@cs.pdx.edu>
|
||||
+ * Copyright © 2008 Jamey Sharp <jamey@minilop.net>
|
||||
+ *
|
||||
+ * 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 <stdio.h>
|
||||
#include "reply_formats.h"
|
||||
|
||||
--- a/wm/table.c
|
||||
+++ b/wm/table.c
|
||||
@@ -1,3 +1,33 @@
|
||||
+/*
|
||||
+ * Copyright © 2008 Ian Osgood <iano@quirkster.com>
|
||||
+ * Copyright © 2008 Josh Triplett <josh@freedesktop.org>
|
||||
+ * Copyright © 2008 Thomas Hunger <hto@arco.de>
|
||||
+ *
|
||||
+ * 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 <stdlib.h>
|
||||
#include "xcb_wm.h"
|
||||
|
||||
--- a/wm/xcbwm-test.c
|
||||
+++ b/wm/xcbwm-test.c
|
||||
@@ -1,3 +1,33 @@
|
||||
+/*
|
||||
+ * Copyright © 2008 Ian Osgood <iano@quirkster.com>
|
||||
+ * Copyright © 2008 Jamey Sharp <jamey@minilop.net>
|
||||
+ * Copyright © 2008 Josh Triplett <josh@freedesktop.org>
|
||||
+ * Copyright © 2008 Julien Danjou <julien@danjou.info>
|
||||
+ *
|
||||
+ * 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 <pthread.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
35
xcb-util-0.3.1-exit-in-library.patch
Normal file
35
xcb-util-0.3.1-exit-in-library.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From c9796f2f53a4ef16f5f5c8f3b7d01bc2ceb11547 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Harris<peter.harris@hummingbird.com>
|
||||
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
|
||||
102
xcb-util.spec
Normal file
102
xcb-util.spec
Normal file
@ -0,0 +1,102 @@
|
||||
Name: xcb-util
|
||||
Version: 0.3.1
|
||||
Release: 2%{?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
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: gperf, pkgconfig, libxcb-devel, m4, xorg-x11-proto-devel
|
||||
|
||||
|
||||
%description
|
||||
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.
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: Development and header files for xcb-util
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{version}-%{release}, pkgconfig
|
||||
%description devel
|
||||
Development files for xcb-util.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
# taken from upstream git
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
|
||||
%build
|
||||
%configure --with-pic --disable-static
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%check
|
||||
|
||||
make check
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
||||
|
||||
rm %{buildroot}%{_libdir}/*.la
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc README
|
||||
%{_libdir}/*.so.*.*
|
||||
%{_libdir}/*.so.?
|
||||
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_libdir}/*.so
|
||||
%{_includedir}/xcb/*.h
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Dec 4 2008 Michal Nowak <mnowak@redhat.com> - 0.3.1-2
|
||||
- patch for exit() in aux library (Peter Harris)
|
||||
- slight changes in spec file
|
||||
|
||||
* Mon Nov 24 2008 Michal Nowak <mnowak@redhat.com> - 0.3.1-1
|
||||
- 0.3.1
|
||||
- fix license issue (Jonathan Landis)
|
||||
|
||||
* Fri Sep 19 2008 Michal Nowak <mnowak@redhat.com> - 0.3.0-1
|
||||
- bump to 0.3.0
|
||||
|
||||
* Sun Aug 17 2008 Michal Nowak <mnowak@redhat.com> - 0.2.1-2
|
||||
- new build deps: gperf, pkgconfig, libxcb, m4, xorg-x11-proto-devel
|
||||
- not installing *.a files anymore
|
||||
- configure with --with-pic
|
||||
|
||||
* Mon Aug 04 2008 Michal Nowak <mnowak@redhat.com> - 0.2.1-1
|
||||
- initial package
|
||||
|
||||
Loading…
Reference in New Issue
Block a user