From f317a9c9f18b5c12bcd921fa5c152d3ff9a9fb3b Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Dec 18 2008 21:24:25 +0000 Subject: libX11 1.1.99.2 --- diff --git a/.cvsignore b/.cvsignore index 97523c9..7e4932d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libX11-1.1.4.tar.bz2 +libX11-1.1.99.2.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..3dc82d1 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +libX11-1_1_99_2-1_fc11:HEAD:libX11-1.1.99.2-1.fc11.src.rpm:1229635434 diff --git a/libX11-1.1.4-XF86Suspend.patch b/libX11-1.1.4-XF86Suspend.patch deleted file mode 100644 index 99ece4a..0000000 --- a/libX11-1.1.4-XF86Suspend.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7aca689ce14d314b5c8c72c8df76f53f76ab467c Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 14 Nov 2008 10:32:50 +1000 -Subject: [PATCH] Add XF86Suspend, XF86Hibernate to KeysymDB. - ---- - src/XKeysymDB | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/XKeysymDB b/src/XKeysymDB -index e6fec07..5e66882 100644 ---- a/src/XKeysymDB -+++ b/src/XKeysymDB -@@ -351,6 +351,8 @@ XF86Red :1008FFA3 - XF86Green :1008FFA4 - XF86Yellow :1008FFA5 - XF86Blue :1008FFA6 -+XF86Suspend :1008FFA7 -+XF86Hibernate :1008FFA8 - - ! XFree86 special action keys - XF86_Switch_VT_1 :1008FE01 --- -1.6.0.3 - diff --git a/libX11-1.1.4-keysyms.patch b/libX11-1.1.4-keysyms.patch deleted file mode 100644 index 29f15c2..0000000 --- a/libX11-1.1.4-keysyms.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up libX11-1.1.4/src/XKeysymDB.orig libX11-1.1.4/src/XKeysymDB ---- libX11-1.1.4/src/XKeysymDB.orig 2008-10-24 10:55:46.000000000 +1030 -+++ libX11-1.1.4/src/XKeysymDB 2008-10-24 10:56:13.000000000 +1030 -@@ -331,6 +331,26 @@ XF86WebCam :1008FF8F - XF86MailForward :1008FF90 - XF86Pictures :1008FF91 - XF86Music :1008FF92 -+XF86Battery :1008FF93 -+XF86Bluetooth :1008FF94 -+XF86WLAN :1008FF95 -+XF86UWB :1008FF96 -+XF86AudioForward :1008FF97 -+XF86AudioRepeat :1008FF98 -+XF86AudioRandomPlay :1008FF99 -+XF86Subtitle :1008FF9A -+XF86AudioCycleTrack :1008FF9B -+XF86CycleAngle :1008FF9C -+XF86FrameBack :1008FF9D -+XF86FrameForward :1008FF9E -+XF86Time :1008FF9F -+XF86Select :1008FFA0 -+XF86View :1008FFA1 -+XF86TopMenu :1008FFA2 -+XF86Red :1008FFA3 -+XF86Green :1008FFA4 -+XF86Yellow :1008FFA5 -+XF86Blue :1008FFA6 - - ! XFree86 special action keys - XF86_Switch_VT_1 :1008FE01 diff --git a/libX11-1.1.4-xcb-xreply-leak.patch b/libX11-1.1.4-xcb-xreply-leak.patch deleted file mode 100644 index 6a902b8..0000000 --- a/libX11-1.1.4-xcb-xreply-leak.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -up libX11-1.1.4/src/xcb_io.c.xcb-xreply-leak libX11-1.1.4/src/xcb_io.c ---- libX11-1.1.4/src/xcb_io.c.xcb-xreply-leak 2008-03-06 15:45:06.000000000 -0500 -+++ libX11-1.1.4/src/xcb_io.c 2008-09-17 12:58:05.000000000 -0400 -@@ -396,15 +396,19 @@ Status _XReply(Display *dpy, xReply *rep - { - case X_LookupColor: - case X_AllocNamedColor: -+ free(error); - return 0; - } - break; - case BadFont: -- if(err->majorCode == X_QueryFont) -+ if(err->majorCode == X_QueryFont) { -+ free(error); - return 0; -+ } - break; - case BadAlloc: - case BadAccess: -+ free(error); - return 0; - } - -@@ -413,10 +417,13 @@ Status _XReply(Display *dpy, xReply *rep - * want to suppress the error. - */ - for(ext = dpy->ext_procs; ext; ext = ext->next) -- if(ext->error && ext->error(dpy, err, &ext->codes, &ret_code)) -+ if(ext->error && ext->error(dpy, err, &ext->codes, &ret_code)) { -+ free(error); - return ret_code; -+ } - -- _XError(dpy, (xError *) error); -+ _XError(dpy, err); -+ free(error); - return 0; - } - diff --git a/libX11.spec b/libX11.spec index 283fd86..fe6d98b 100644 --- a/libX11.spec +++ b/libX11.spec @@ -1,13 +1,14 @@ Summary: X.Org X11 libX11 runtime library Name: libX11 -Version: 1.1.4 -Release: 6%{?dist} +Version: 1.1.99.2 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 +#Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 +Source0: http://cgit.freedesktop.org/xorg/lib/libX11/snapshot/libX11-%{version}.tar.bz2 Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch # FIXME: https://bugs.freedesktop.org/show_bug.cgi?id=3646 seems to indicate @@ -15,12 +16,7 @@ Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch # manually confirm each patch hunk before removal. Patch2: dont-forward-keycode-0.patch -Patch3: libX11-1.1.4-xcb-xreply-leak.patch -# Committed upstream, should be in next release -Patch4: libX11-1.1.4-keysyms.patch -Patch5: libX11-1.1.4-XF86Suspend.patch - -BuildRequires: pkgconfig +BuildRequires: pkgconfig autoconf automake libtool # xproto >= 7.0.6 required BuildRequires: xorg-x11-proto-devel >= 7.1-2 BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4 @@ -59,11 +55,9 @@ X.Org X11 libX11 development package # find it later. #%patch0 -p0 -b .datadir-locale-dir-fix %patch2 -p1 -b .dont-forward-keycode-0 -%patch3 -p1 -b .xcb-xreply-leak -%patch4 -p1 -b .keysyms -%patch5 -p1 -b .xf86suspend %build +./autogen.sh %configure \ --disable-dependency-tracking \ --disable-static @@ -89,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README ChangeLog NEWS +%doc AUTHORS COPYING README NEWS %dir %{_datadir}/X11 %{_datadir}/X11/locale/ %{_datadir}/X11/XErrorDB @@ -122,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Dec 18 2008 Adam Jackson 1.1.99.2-1 +- libX11 1.1.99.2 + * Tue Nov 18 2008 Peter Hutterer 1.1.4-6 - libX11-1.1.4-XF86Suspend.patch: add XF86Suspend and XF86Hibernate keysyms. diff --git a/sources b/sources index 971b347..6049f27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1469a5a8aa8d288dce6f4c45d2f68dc3 libX11-1.1.4.tar.bz2 +85aad6e524ac2fc7c97aa63120def2c1 libX11-1.1.99.2.tar.bz2