rpms/xcb-util/F-9 import.log, NONE, 1.1 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 xcb-util.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Michal Nowak
mnowak at fedoraproject.org
Tue Jan 13 10:48:57 UTC 2009
- Previous message (by thread): rpms/xcb-util/F-10 import.log, NONE, 1.1 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 xcb-util.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/hunspell-en/devel .cvsignore, 1.13, 1.14 hunspell-en.spec, 1.26, 1.27 sources, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mnowak
Update of /cvs/pkgs/rpms/xcb-util/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29255/F-9
Modified Files:
.cvsignore sources
Added Files:
import.log
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
xcb-util.spec
Log Message:
new pkg: 0.3.2+patches
--- NEW FILE import.log ---
xcb-util-0_3_2-2_fc10:F-9:xcb-util-0.3.2-2.fc10.src.rpm:1231843664
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
--- NEW FILE xcb-util.spec ---
Name: xcb-util
Version: 0.3.2
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.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
%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, both post 0.3.2 patches
%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"
# remove RPATH
chrpath --delete $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-icccm.so.1.0.0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-property.so.1.0.0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-wm.so.0.0.0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-image.so.0.0.0
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
* Fri Dec 19 2008 Michal Nowak <mnowak at redhat.com> - 0.3.2-2
- hack the sed lines after %%configure out and hack chrpath in
- make check is running again
* 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
* Mon Nov 24 2008 Michal Nowak <mnowak at redhat.com> - 0.3.1-1
- 0.3.1
- fix license issue (Jonathan Landis)
* Fri Sep 19 2008 Michal Nowak <mnowak at redhat.com> - 0.3.0-1
- bump to 0.3.0
* Sun Aug 17 2008 Michal Nowak <mnowak at 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 at redhat.com> - 0.2.1-1
- initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 7 Dec 2008 03:29:15 -0000 1.1
+++ .cvsignore 13 Jan 2009 10:48:26 -0000 1.2
@@ -0,0 +1 @@
+xcb-util-0.3.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 7 Dec 2008 03:29:15 -0000 1.1
+++ sources 13 Jan 2009 10:48:26 -0000 1.2
@@ -0,0 +1 @@
+fa41a147f5a63b01207cfd975fecc45c xcb-util-0.3.2.tar.bz2
- Previous message (by thread): rpms/xcb-util/F-10 import.log, NONE, 1.1 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 xcb-util.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/hunspell-en/devel .cvsignore, 1.13, 1.14 hunspell-en.spec, 1.26, 1.27 sources, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list