rpms/xcb-util
7
0
Fork 0
Code Issues Pull Requests Releases Activity

0.3.3

Browse Source
This commit is contained in:
Michal Nowak 2009-02-23 08:06:51 +00:00
parent 97dec272b4
commit 8c666c535d
6 changed files with 9 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
xcb-util-0.3.2.tar.bz2
xcb-util-0.3.3.tar.bz2

1
import.log
View File

@ -1,3 +1,4 @@
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
xcb-util-0_3_2-2_fc10:HEAD:xcb-util-0.3.2-2.fc10.src.rpm:1229687450
xcb-util-0_3_3-1_fc10:HEAD:xcb-util-0.3.3-1.fc10.src.rpm:1235375721

2
sources
View File

@ -1 +1 @@
fa41a147f5a63b01207cfd975fecc45c xcb-util-0.3.2.tar.bz2
b1b16c5c1fcf7a6facb346c262cd3513 xcb-util-0.3.3.tar.bz2

119
xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch
View File

@ -1,119 +0,0 @@
From e9db47701cf7ce17c8ab03cc8cc3618bccba2026 Mon Sep 17 00:00:00 2001
From: Julien Danjou<julien@danjou.info>
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 <xcb/xcb.h>
+
#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

28
xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch
View File

@ -1,28 +0,0 @@
From 6cf9c8d121888d688464a1551342de3f9d6206f6 Mon Sep 17 00:00:00 2001
From: Julien Danjou<julien@danjou.info>
Date: Tue, 16 Dec 2008 17:22:06 +0000
Subject: xcb_keysyms: remove xcb_lookup_t
Signed-off-by: Julien Danjou <julien@danjou.info>
---
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

13
xcb-util.spec
View File

@ -1,14 +1,12 @@
Name: xcb-util
Version: 0.3.2
Release: 2%{?dist}
Version: 0.3.3
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.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
BuildRequires: chrpath
@ -33,9 +31,6 @@ Development files for xcb-util.
%prep
%setup -q
# taken from upstream git, both post 0.3.2 patches
%patch0 -p1
%patch1 -p1
%build
@ -85,6 +80,10 @@ rm -rf %{buildroot}
%changelog
* Fri Feb 20 2009 Michal Nowak <mnowak@redhat.com> - 0.3.3-1
- 0.3.3
- removed patches already in git (and 0.3.3)
* Fri Dec 19 2008 Michal Nowak <mnowak@redhat.com> - 0.3.2-2
- hack the sed lines after %%configure out and hack chrpath in
- make check is running again