rpms/libX11/OLPC-2 libX11-1.1.3-xkb-lock-fix.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 libX11.spec, 1.36, 1.37 sources, 1.8, 1.9 libX11-1.1.2-GetMotionEvents.patch, 1.1, NONE libX11-cve-2007-1667.patch, 1.1, NONE libX11-fd-leak.patch, 1.1, NONE libX11-nls-indic-locales-bug185376.patch, 1.3, NONE
Bernardo Innocenti (bernie)
fedora-extras-commits at redhat.com
Sat Nov 24 06:25:24 UTC 2007
Author: bernie
Update of /cvs/pkgs/rpms/libX11/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20550/OLPC-2
Modified Files:
.cvsignore libX11.spec sources
Added Files:
libX11-1.1.3-xkb-lock-fix.patch
Removed Files:
libX11-1.1.2-GetMotionEvents.patch libX11-cve-2007-1667.patch
libX11-fd-leak.patch libX11-nls-indic-locales-bug185376.patch
Log Message:
* Fri Nov 23 2007 Bernardo Innocenti <bernie at codewiz.org> - 1.1.3.git20071123-1
- Update to git snapshot 20071123
- Disable some rarely used X11 extensions (EXPERIMENTAL)
* Tue Sep 04 2007 Bernardo Innocenti <bernie at codewiz.org> - 1.1.3-1.git20070822
- Rebuild with default CFLAGS
* Wed Aug 22 2007 Bernardo Innocenti <bernie at codewiz.org> - 1.1.3-0.git20070822
- Upgrade to 1.1.3.
- Disable XCB for OLPC (may negatively affect performance)
libX11-1.1.3-xkb-lock-fix.patch:
--- NEW FILE libX11-1.1.3-xkb-lock-fix.patch ---
diff -up libX11-1.1.3/src/xkb/XKBBind.c.jx libX11-1.1.3/src/xkb/XKBBind.c
--- libX11-1.1.3/src/xkb/XKBBind.c.jx 2007-05-16 11:34:44.000000000 -0400
+++ libX11-1.1.3/src/xkb/XKBBind.c 2007-10-10 15:16:08.000000000 -0400
@@ -368,7 +368,6 @@ XkbRefreshKeyboardMapping(register XkbMa
changes= xkbi->changes;
else bzero(&changes,sizeof(changes));
XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK);
- LockDisplay(dpy);
if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) {
#ifdef DEBUG
fprintf(stderr,"Internal Error! XkbGetMapChanges failed:\n");
@@ -379,7 +378,6 @@ XkbRefreshKeyboardMapping(register XkbMa
xkbi->flags&= ~XkbMapPending;
bzero(&xkbi->changes,sizeof(XkbMapChangesRec));
}
- UnlockDisplay(dpy);
return rtrn;
}
return BadMatch;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/OLPC-2/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 6 Apr 2007 18:31:38 -0000 1.9
+++ .cvsignore 24 Nov 2007 06:24:51 -0000 1.10
@@ -1 +1 @@
-libX11-1.0.3.tar.bz2
+libX11-1.1.3-git20071123.tar.bz2
Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/OLPC-2/libX11.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libX11.spec 18 Sep 2007 14:45:58 -0000 1.36
+++ libX11.spec 24 Nov 2007 06:24:51 -0000 1.37
@@ -1,29 +1,33 @@
+%define gitdate git20071123
+
Summary: X.Org X11 libX11 runtime library
Name: libX11
-Version: 1.0.3
-Release: 10%{?dist}
+Version: 1.1.3
+Release: 1.%{gitdate}%{?dist}
License: MIT/X11
Group: System Environment/Libraries
URL: http://www.x.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+#Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source0: libX11-%{version}-%{gitdate}.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
# this patch is now committed upstream. When libX11-1.0.4 is released,
# manually confirm each patch hunk before removal.
-Patch1: libX11-nls-indic-locales-bug185376.patch
Patch2: dont-forward-keycode-0.patch
Patch3: bug-201284.patch
-Patch4: libX11-fd-leak.patch
-Patch5: libX11-cve-2007-1667.patch
-Patch6: libX11-1.1.2-GetMotionEvents.patch
+Patch4: libX11-1.1.3-xkb-lock-fix.patch
+#bernie: already upstream
+#Patch5: brightness-keysyms.patch
BuildRequires: pkgconfig
# xproto >= 7.0.6 required
BuildRequires: xorg-x11-proto-devel >= 7.1-2
-BuildRequires: xorg-x11-xtrans-devel
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
+#bernie: disable XCB for now
+#BuildRequires: libxcb-devel
BuildRequires: libXau-devel
BuildRequires: libXdmcp-devel
@@ -42,7 +46,7 @@
# xproto >= 7.0.6 required
Requires: xorg-x11-proto-devel >= 7.1-2
-Requires: libXau-devel, libXdmcp-devel
+Requires: libXau-devel, libXdmcp-devel, libxcb-devel
Requires: pkgconfig
Obsoletes: XFree86-devel, xorg-x11-devel
@@ -57,15 +61,19 @@
# of war with these things. It's easier to leave this here than to try and
# find it later.
#%patch0 -p0 -b .datadir-locale-dir-fix
-%patch1 -p1 -b .nls-indic-locales-bug185376
%patch2 -p1 -b .dont-forward-keycode-0
%patch3 -p1 -b .3-bug201284
-%patch4 -p1 -b .xim-fd-leak
-%patch5 -p1 -b .cve-2007-1667
-%patch6 -p1 -b .getmoev
+%patch4 -p1 -b .jx
+#%patch5 -p1 -b .brightness-keysyms
%build
+#bernie: disable XCB for now
+#bernie: XCMS and XF86BIGFONT that should be unused (EXPERIMENTAL)
+#bernie: we can't disavle XTHREAD because libXext needs rebuilding too
%configure \
+ --without-xcb \
+ --disable-xcms \
+ --disable-xf86bigfont \
--disable-dependency-tracking \
--disable-static
@@ -118,6 +126,10 @@
%{_datadir}/X11/locale/ja.*/*
%dir %{_datadir}/X11/locale/ja
%{_datadir}/X11/locale/ja/*
+%dir %{_datadir}/X11/locale/am_ET.UTF-8
+%{_datadir}/X11/locale/am_ET.UTF-8/Compose
+%{_datadir}/X11/locale/am_ET.UTF-8/XI18N_OBJS
+%{_datadir}/X11/locale/am_ET.UTF-8/XLC_LOCALE
%dir %{_datadir}/X11/locale/ja_JP.UTF-8
%{_datadir}/X11/locale/ja_JP.UTF-8/Compose
%{_datadir}/X11/locale/ja_JP.UTF-8/XI18N_OBJS
@@ -226,6 +238,9 @@
%{_datadir}/X11/XKeysymDB
%{_libdir}/libX11.so.6
%{_libdir}/libX11.so.6.2.0
+#bernie: disable XCB for now
+#%{_libdir}/libX11-xcb.so.1
+#%{_libdir}/libX11-xcb.so.1.0.0
%files devel
%defattr(-,root,root,-)
@@ -236,21 +251,61 @@
%{_includedir}/X11/Xlib.h
%{_includedir}/X11/XlibConf.h
%{_includedir}/X11/Xlibint.h
+#bernie: disable XCB for now
+#%{_includedir}/X11/Xlib-xcb.h
%{_includedir}/X11/Xlocale.h
%{_includedir}/X11/Xregion.h
%{_includedir}/X11/Xresource.h
%{_includedir}/X11/Xutil.h
%{_includedir}/X11/cursorfont.h
%{_libdir}/libX11.so
+#bernie: disable XCB for now
+#%{_libdir}/libX11-xcb.so
%{_libdir}/pkgconfig/x11.pc
+#bernie: disable XCB for now
+#%{_libdir}/pkgconfig/x11-xcb.pc
#%dir %{_mandir}/man3x
-%{_mandir}/man3/*.3x*
+%{_mandir}/man3/*.3*
%changelog
-* Tue Sep 18 2007 Adam Jackson <ajax at redhat.com> 1.0.3-10
+* Fri Nov 23 2007 Bernardo Innocenti <bernie at codewiz.org> - 1.1.3.git20071123-1
+- Update to git snapshot 20071123
+- Disable some rarely used X11 extensions (EXPERIMENTAL)
+
+* Fri Oct 19 2007 Kristian Høgsberg <krh at redhat.com> - 1.1.3-4
+- Add patch from upstream to add keysyms for brightness buttons (#330491).
+
+* Tue Oct 16 2007 Adam Jackson <ajax at redhat.com> 1.1.3-3
+- libX11-devel Requires: libxcb-devel.
+
+* Wed Oct 10 2007 Adam Jackson <ajax at redhat.com> 1.1.3-2
+- libX11-1.1.3-xkb-lock-fix.patch: Don't LockDisplay() recursively. Fixes
+ Gnome hang at logout. (#326461)
+
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.1.3-1
+- libX11 1.1.3
+
+* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.1.2-4
+- Update xtrans dep and rebuild.
+
+* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.1.2-3
- libX11-1.1.2-GetMotionEvents.patch: Fix the definition of XGetMotionEvents
to match the argument order in the headers. (#274671)
+* Tue Sep 04 2007 Bernardo Innocenti <bernie at codewiz.org> - 1.1.3-1.git20070822
+- Rebuild with default CFLAGS
+
+* Wed Aug 22 2007 Bernardo Innocenti <bernie at codewiz.org> - 1.1.3-0.git20070822
+- Upgrade to 1.1.3.
+- Disable XCB for OLPC (may negatively affect performance)
+
+* Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.1.2-2
+- Rebuild for build id
+
+* Mon Jul 23 2007 Adam Jackson <ajax at redhat.com> 1.1.2-1
+- libX11 1.1.2.
+- Enable XCB for libX11 transport.
+
* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.3-9
- Don't install INSTALL
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/OLPC-2/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 10 Jul 2006 09:14:31 -0000 1.8
+++ sources 24 Nov 2007 06:24:51 -0000 1.9
@@ -1 +1 @@
-60b787a812c92d33f71860e4e19cb59d libX11-1.0.3.tar.bz2
+4f5e7234482401334a32e9b92eab59c2 libX11-1.1.3-git20071123.tar.bz2
--- libX11-1.1.2-GetMotionEvents.patch DELETED ---
--- libX11-cve-2007-1667.patch DELETED ---
--- libX11-fd-leak.patch DELETED ---
--- libX11-nls-indic-locales-bug185376.patch DELETED ---
More information about the fedora-extras-commits
mailing list