From daa676bd1febfc4bb0693ddae57a880d45c873b0 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mar 06 2008 21:27:06 +0000 Subject: libX11 1.1.4 --- diff --git a/.cvsignore b/.cvsignore index 0aee062..97523c9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libX11-1.1.3.tar.bz2 +libX11-1.1.4.tar.bz2 diff --git a/brightness-keysyms.patch b/brightness-keysyms.patch deleted file mode 100644 index 4c2392d..0000000 --- a/brightness-keysyms.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 7c996f78914c77fe17e9f4feede980d895d9df51 -Author: Eric Anholt -Date: Tue Aug 28 15:15:11 2007 -0700 - - Add XF86 keyboard/monitor brightness keysyms to the keysymbdb. - -diff --git a/src/XKeysymDB b/src/XKeysymDB -index f146950..5390444 100644 ---- a/src/XKeysymDB -+++ b/src/XKeysymDB -@@ -199,6 +199,11 @@ XeroxPointerButton5 :10070005 - - ! The definitions here should match - XF86ModeLock :1008FF01 -+XF86MonBrightnessUp :1008FF02 -+XF86MonBrightnessDown :1008FF03 -+XF86KbdLightOnOff :1008FF04 -+XF86KbdBrightnessUp :1008FF05 -+XF86KbdBrightnessDown :1008FF06 - XF86Standby :1008FF10 - XF86AudioLowerVolume :1008FF11 - XF86AudioMute :1008FF12 diff --git a/bug-201284.patch b/bug-201284.patch deleted file mode 100644 index 5bc9b6a..0000000 --- a/bug-201284.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- libX11-1.0.3/modules/im/ximcp/imDefLkup.c.bug-201284 2006-10-30 23:58:41.000000000 -0500 -+++ libX11-1.0.3/modules/im/ximcp/imDefLkup.c 2006-10-30 23:58:41.000000000 -0500 -@@ -216,8 +216,13 @@ - Xic ic, - BITMASK16 mode) - { -- if (mode & XimSYNCHRONUS) /* SYNC Request */ -- MARK_NEED_SYNC_REPLY(ic); -+ if (mode & XimSYNCHRONUS) /* SYNC Request */ { -+ if (IS_FOCUSED(ic)) -+ MARK_NEED_SYNC_REPLY(ic); -+ else -+ _XimProcSyncReply(ic->core.im, ic); -+ } -+ - return True; - } - ---- libX11-1.0.3/modules/im/ximcp/imDefIc.c.bug-201284 2006-06-22 17:22:22.000000000 -0400 -+++ libX11-1.0.3/modules/im/ximcp/imDefIc.c 2006-10-30 23:58:41.000000000 -0500 -@@ -949,6 +949,8 @@ - (void)_XimWrite(im, len, (XPointer)buf); - _XimFlush(im); - -+ MARK_FOCUSED(ic); -+ - _XimRegisterFilter(ic); - return; - } -@@ -994,6 +996,8 @@ - (void)_XimWrite(im, len, (XPointer)buf); - _XimFlush(im); - -+ UNMARK_FOCUSED(ic); -+ - _XimUnregisterFilter(ic); - return; - } ---- libX11-1.0.3/src/xlibi18n/XimintP.h.bug-201284 2006-06-22 17:22:23.000000000 -0400 -+++ libX11-1.0.3/src/xlibi18n/XimintP.h 2006-10-31 00:01:30.000000000 -0500 -@@ -244,6 +244,7 @@ - #define IC_CONNECTED (1L) - #define FABLICATED (1L << 1) - #define NEED_SYNC_REPLY (1L << 2) -+#define FOCUSED (1L << 3) - - /* - * macro for the flag of XICPrivateRec -@@ -269,6 +270,13 @@ - #define UNMARK_NEED_SYNC_REPLY(ic) \ - (((Xic)ic)->private.proto.flag &= ~NEED_SYNC_REPLY) - -+#define IS_FOCUSED(ic) \ -+ (((Xic)ic)->private.proto.flag & FOCUSED) -+#define MARK_FOCUSED(ic) \ -+ (((Xic)ic)->private.proto.flag |= FOCUSED) -+#define UNMARK_FOCUSED(ic) \ -+ (((Xic)ic)->private.proto.flag &= ~FOCUSED) -+ - /* - * macro for the filter_event_mask of XICPrivateRec - */ diff --git a/libX11-1.1.3-xkb-lock-fix.patch b/libX11-1.1.3-xkb-lock-fix.patch deleted file mode 100644 index fe7e27e..0000000 --- a/libX11-1.1.3-xkb-lock-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -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; diff --git a/libX11.spec b/libX11.spec index 290179f..748b502 100644 --- a/libX11.spec +++ b/libX11.spec @@ -1,22 +1,19 @@ Summary: X.Org X11 libX11 runtime library Name: libX11 -Version: 1.1.3 -Release: 5%{?dist} +Version: 1.1.4 +Release: 1%{?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: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{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 # this patch is now committed upstream. When libX11-1.0.4 is released, # manually confirm each patch hunk before removal. Patch2: dont-forward-keycode-0.patch -Patch3: bug-201284.patch -Patch4: libX11-1.1.3-xkb-lock-fix.patch -Patch5: brightness-keysyms.patch BuildRequires: pkgconfig # xproto >= 7.0.6 required @@ -57,9 +54,6 @@ 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 .3-bug201284 -%patch4 -p1 -b .jx -%patch5 -p1 -b .brightness-keysyms %build %configure \ @@ -89,136 +83,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog NEWS %dir %{_datadir}/X11 -%dir %{_datadir}/X11/locale -%dir %{_datadir}/X11/locale/C -%{_datadir}/X11/locale/C/* -%dir %{_datadir}/X11/locale/armscii-8 -%{_datadir}/X11/locale/armscii-8/* -%{_datadir}/X11/locale/compose.dir -%dir %{_datadir}/X11/locale/en_US.UTF-8 -%{_datadir}/X11/locale/en_US.UTF-8/* -%dir %{_datadir}/X11/locale/el_GR.UTF-8 -%{_datadir}/X11/locale/el_GR.UTF-8/* -%dir %{_datadir}/X11/locale/georgian-academy -%{_datadir}/X11/locale/georgian-academy/* -%dir %{_datadir}/X11/locale/georgian-ps -%{_datadir}/X11/locale/georgian-ps/* -%dir %{_datadir}/X11/locale/ibm-cp1133 -%{_datadir}/X11/locale/ibm-cp1133/* -%dir %{_datadir}/X11/locale/iscii-dev -%{_datadir}/X11/locale/iscii-dev/* -%dir %{_datadir}/X11/locale/isiri-3342 -%{_datadir}/X11/locale/isiri-3342/* -%dir %{_datadir}/X11/locale/iso8859-* -%{_datadir}/X11/locale/iso8859-*/* -%dir %{_datadir}/X11/locale/ja.* -%{_datadir}/X11/locale/ja.*/* -%dir %{_datadir}/X11/locale/ja -%{_datadir}/X11/locale/ja/* -%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 -%{_datadir}/X11/locale/ja_JP.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/ko -%{_datadir}/X11/locale/ko/Compose -%{_datadir}/X11/locale/ko/XI18N_OBJS -%{_datadir}/X11/locale/ko/XLC_LOCALE -%dir %{_datadir}/X11/locale/ko_KR.UTF-8 -%{_datadir}/X11/locale/ko_KR.UTF-8/Compose -%{_datadir}/X11/locale/ko_KR.UTF-8/XI18N_OBJS -%{_datadir}/X11/locale/ko_KR.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/koi8-c -%{_datadir}/X11/locale/koi8-c/Compose -%{_datadir}/X11/locale/koi8-c/XI18N_OBJS -%{_datadir}/X11/locale/koi8-c/XLC_LOCALE -%dir %{_datadir}/X11/locale/koi8-r -%{_datadir}/X11/locale/koi8-r/Compose -%{_datadir}/X11/locale/koi8-r/XI18N_OBJS -%{_datadir}/X11/locale/koi8-r/XLC_LOCALE -%dir %{_datadir}/X11/locale/koi8-u -%{_datadir}/X11/locale/koi8-u/Compose -%{_datadir}/X11/locale/koi8-u/XI18N_OBJS -%{_datadir}/X11/locale/koi8-u/XLC_LOCALE -%{_datadir}/X11/locale/locale.alias -%{_datadir}/X11/locale/locale.dir -%dir %{_datadir}/X11/locale/microsoft-* -%{_datadir}/X11/locale/microsoft-*/* -%dir %{_datadir}/X11/locale/mulelao-1 -%{_datadir}/X11/locale/mulelao-1/Compose -%{_datadir}/X11/locale/mulelao-1/XI18N_OBJS -%{_datadir}/X11/locale/mulelao-1/XLC_LOCALE -%dir %{_datadir}/X11/locale/nokhchi-1 -%{_datadir}/X11/locale/nokhchi-1/Compose -%{_datadir}/X11/locale/nokhchi-1/XI18N_OBJS -%{_datadir}/X11/locale/nokhchi-1/XLC_LOCALE -%dir %{_datadir}/X11/locale/pt_BR.UTF-8 -%{_datadir}/X11/locale/pt_BR.UTF-8/Compose -%{_datadir}/X11/locale/pt_BR.UTF-8/XI18N_OBJS -%{_datadir}/X11/locale/pt_BR.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/tatar-cyr -%{_datadir}/X11/locale/tatar-cyr/Compose -%{_datadir}/X11/locale/tatar-cyr/XI18N_OBJS -%{_datadir}/X11/locale/tatar-cyr/XLC_LOCALE -%dir %{_datadir}/X11/locale/th_TH.UTF-8 -%{_datadir}/X11/locale/th_TH.UTF-8/Compose -%{_datadir}/X11/locale/th_TH.UTF-8/XI18N_OBJS -%{_datadir}/X11/locale/th_TH.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/th_TH -%{_datadir}/X11/locale/th_TH/Compose -%{_datadir}/X11/locale/th_TH/XI18N_OBJS -%{_datadir}/X11/locale/th_TH/XLC_LOCALE -%dir %{_datadir}/X11/locale/tscii-0 -%{_datadir}/X11/locale/tscii-0/Compose -%{_datadir}/X11/locale/tscii-0/XI18N_OBJS -%{_datadir}/X11/locale/tscii-0/XLC_LOCALE -%dir %{_datadir}/X11/locale/vi_VN.tcvn -%{_datadir}/X11/locale/vi_VN.tcvn/Compose -%{_datadir}/X11/locale/vi_VN.tcvn/XI18N_OBJS -%{_datadir}/X11/locale/vi_VN.tcvn/XLC_LOCALE -%dir %{_datadir}/X11/locale/vi_VN.viscii -%{_datadir}/X11/locale/vi_VN.viscii/Compose -%{_datadir}/X11/locale/vi_VN.viscii/XI18N_OBJS -%{_datadir}/X11/locale/vi_VN.viscii/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_CN.UTF-8 -%{_datadir}/X11/locale/zh_CN.UTF-8/Compose -%{_datadir}/X11/locale/zh_CN.UTF-8/XI18N_OBJS -%{_datadir}/X11/locale/zh_CN.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_CN.gb18030 -%{_datadir}/X11/locale/zh_CN.gb18030/Compose -%{_datadir}/X11/locale/zh_CN.gb18030/XI18N_OBJS -%{_datadir}/X11/locale/zh_CN.gb18030/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_CN.gbk -%{_datadir}/X11/locale/zh_CN.gbk/Compose -%{_datadir}/X11/locale/zh_CN.gbk/XI18N_OBJS -%{_datadir}/X11/locale/zh_CN.gbk/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_CN -%{_datadir}/X11/locale/zh_CN/Compose -%{_datadir}/X11/locale/zh_CN/XI18N_OBJS -%{_datadir}/X11/locale/zh_CN/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_HK.UTF-8 -%{_datadir}/X11/locale/zh_HK.UTF-8/Compose -%{_datadir}/X11/locale/zh_HK.UTF-8/XI18N_OBJS -%{_datadir}/X11/locale/zh_HK.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_HK.big5 -%{_datadir}/X11/locale/zh_HK.big5/Compose -%{_datadir}/X11/locale/zh_HK.big5/XI18N_OBJS -%{_datadir}/X11/locale/zh_HK.big5/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_HK.big5hkscs -%{_datadir}/X11/locale/zh_HK.big5hkscs/Compose -%{_datadir}/X11/locale/zh_HK.big5hkscs/XI18N_OBJS -%{_datadir}/X11/locale/zh_HK.big5hkscs/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_TW.UTF-8 -%{_datadir}/X11/locale/zh_TW.UTF-8/Compose -%{_datadir}/X11/locale/zh_TW.UTF-8/XI18N_OBJS -%{_datadir}/X11/locale/zh_TW.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_TW.big5 -%{_datadir}/X11/locale/zh_TW.big5/Compose -%{_datadir}/X11/locale/zh_TW.big5/XI18N_OBJS -%{_datadir}/X11/locale/zh_TW.big5/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_TW -%{_datadir}/X11/locale/zh_TW/Compose -%{_datadir}/X11/locale/zh_TW/XI18N_OBJS -%{_datadir}/X11/locale/zh_TW/XLC_LOCALE +%{_datadir}/X11/locale/ %{_datadir}/X11/XErrorDB %{_datadir}/X11/XKeysymDB %{_libdir}/libX11.so.6 @@ -249,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Adam Jackson 1.1.4-1 +- libX11 1.1.4 + * Tue Feb 19 2008 Fedora Release Engineering - 1.1.3-5 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index a7d8436..971b347 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d43d3e472c552d2f191ecdd4e75112c libX11-1.1.3.tar.bz2 +1469a5a8aa8d288dce6f4c45d2f68dc3 libX11-1.1.4.tar.bz2