rpms/xcb-util/devel xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch, NONE, 1.1 xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 xcb-util.spec, 1.1, 1.2 xcb-util-0.3.1-copyright-resolution.patch, 1.1, NONE xcb-util-0.3.1-exit-in-library.patch, 1.1, NONE
Michal Nowak
mnowak at fedoraproject.org
Thu Dec 18 20:51:10 UTC 2008
Author: mnowak
Update of /cvs/pkgs/rpms/xcb-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10796/devel
Modified Files:
.cvsignore import.log sources xcb-util.spec
Added Files:
xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch
xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch
Removed Files:
xcb-util-0.3.1-copyright-resolution.patch
xcb-util-0.3.1-exit-in-library.patch
Log Message:
0.3.2 + RPATH temporary fixes
xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch:
--- NEW FILE xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch ---
>From e9db47701cf7ce17c8ab03cc8cc3618bccba2026 Mon Sep 17 00:00:00 2001
From: Julien Danjou<julien at 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
xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch:
--- NEW FILE xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch ---
>From 6cf9c8d121888d688464a1551342de3f9d6206f6 Mon Sep 17 00:00:00 2001
From: Julien Danjou<julien at danjou.info>
Date: Tue, 16 Dec 2008 17:22:06 +0000
Subject: xcb_keysyms: remove xcb_lookup_t
Signed-off-by: Julien Danjou <julien at 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Dec 2008 22:51:17 -0000 1.2
+++ .cvsignore 18 Dec 2008 20:50:40 -0000 1.3
@@ -1 +1 @@
-xcb-util-0.3.1.tar.bz2
+xcb-util-0.3.2.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 9 Dec 2008 22:51:17 -0000 1.1
+++ import.log 18 Dec 2008 20:50:40 -0000 1.2
@@ -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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Dec 2008 22:51:17 -0000 1.2
+++ sources 18 Dec 2008 20:50:40 -0000 1.3
@@ -1 +1 @@
-4b06006e438c3926d077439b31d290d6 xcb-util-0.3.1.tar.bz2
+fa41a147f5a63b01207cfd975fecc45c xcb-util-0.3.2.tar.bz2
Index: xcb-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/devel/xcb-util.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xcb-util.spec 9 Dec 2008 22:51:17 -0000 1.1
+++ xcb-util.spec 18 Dec 2008 20:50:40 -0000 1.2
@@ -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 @@
%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 @@
%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 @@
%changelog
+* Thu Dec 18 2008 Michal Nowak <mnowak at redhat.com> - 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 <mnowak at redhat.com> - 0.3.1-2
- patch for exit() in aux library (Peter Harris)
- slight changes in spec file
--- xcb-util-0.3.1-copyright-resolution.patch DELETED ---
--- xcb-util-0.3.1-exit-in-library.patch DELETED ---
More information about the fedora-extras-commits
mailing list