rpm/libX11
SHA256
1
0
Fork 0
forked from pool/libX11
Code Pull Requests Activity

Accepting request 104209 from home:jengelh:branches:X11:XOrg

Browse Source 
Replaces xorg-x11-libX11

OBS-URL: https://build.opensuse.org/request/show/104209
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libX11?expand=0&rev=1
This commit is contained in:
Stefan Dirsch 2012-02-13 10:06:31 +00:00 committed by Git OBS Bridge
commit 8e32ba6ef1
20 changed files with 1306 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

96
0001--XIM-Revert-commit-1a1a42a3.patch Normal file
View File

@ -0,0 +1,96 @@
From f0bad274d885da555c25437614aea0882d1a9986 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@freedesktop.org>
Date: Wed, 29 Jun 2011 10:35:58 +0200
Subject: [PATCH] [XIM] Revert commit 1a1a42a3.
Patch-mainline: To be upstreamed
According to https://bugs.freedesktop.org/show_bug.cgi?id=7869
this patch did not resolve the issue.
The ticket suggests another solution to this problem however
this solution has the side effect that a 'FABLICATED' event
may be delivered to the wron input context.
The real problem however seems to reside on the client side:
as comment #12 of this ticket:
"So the client should not change the focus between XNextEvent() and
XFilterEvent(), if they pass the ic client window to XFilterEvent()."
It seems to be wrong to fix a client issue on the library side.
As no more comments have appeard on this bug over the past 2
years I expect that this is what has happened already.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
---
modules/im/ximcp/imDefIc.c | 4 ----
modules/im/ximcp/imDefLkup.c | 8 ++------
src/xlibi18n/XimintP.h | 8 --------
3 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c
index 7b36659..2e71d84 100644
--- a/modules/im/ximcp/imDefIc.c
+++ b/modules/im/ximcp/imDefIc.c
@@ -993,8 +993,6 @@ _XimProtoSetFocus(
(void)_XimWrite(im, len, (XPointer)buf);
_XimFlush(im);
- MARK_FOCUSED(ic);
-
_XimRegisterFilter(ic);
return;
}
@@ -1042,8 +1040,6 @@ _XimProtoUnsetFocus(
(void)_XimWrite(im, len, (XPointer)buf);
_XimFlush(im);
- UNMARK_FOCUSED(ic);
-
_XimUnregisterFilter(ic);
return;
}
diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
index 45c46e6..29b45db 100644
--- a/modules/im/ximcp/imDefLkup.c
+++ b/modules/im/ximcp/imDefLkup.c
@@ -213,12 +213,8 @@ _XimRespSyncReply(
Xic ic,
BITMASK16 mode)
{
- if (mode & XimSYNCHRONUS) /* SYNC Request */ {
- if (IS_FOCUSED(ic))
- MARK_NEED_SYNC_REPLY(ic);
- else
- _XimProcSyncReply((Xim)ic->core.im, ic);
- }
+ if (mode & XimSYNCHRONUS) /* SYNC Request */
+ MARK_NEED_SYNC_REPLY(ic);
return True;
}
diff --git a/src/xlibi18n/XimintP.h b/src/xlibi18n/XimintP.h
index 0e384ab..8ea06ba 100644
--- a/src/xlibi18n/XimintP.h
+++ b/src/xlibi18n/XimintP.h
@@ -261,7 +261,6 @@ typedef struct _XicProtoPrivateRec {
#define IC_CONNECTED (1L)
#define FABLICATED (1L << 1)
#define NEED_SYNC_REPLY (1L << 2)
-#define FOCUSED (1L << 3)
/*
* macro for the flag of XICPrivateRec
@@ -287,13 +286,6 @@ typedef struct _XicProtoPrivateRec {
#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
*/
--
1.6.0.2

24
Xcms.diff Normal file
View File

@ -0,0 +1,24 @@
diff -u -p src/xcms.orig//Makefile.am src/xcms/Makefile.am
--- src/xcms.orig//Makefile.am 2008-08-30 03:53:23.926805061 +0200
+++ src/xcms/Makefile.am 2008-08-30 03:54:57.018919743 +0200
@@ -82,7 +82,7 @@ libxcms_la_SOURCES = \
xyY.c \
Xcmsint.h
-X11dir = $(libdir)/X11
+X11dir = /usr/share/X11
dist_X11_DATA = Xcms.txt
diff -u -p src/xcms.orig//cmsColNm.c src/xcms/cmsColNm.c
--- src/xcms.orig//cmsColNm.c 2008-08-30 03:53:23.390781370 +0200
+++ src/xcms/cmsColNm.c 2008-08-30 03:56:01.505770138 +0200
@@ -56,7 +56,7 @@ static Status LoadColornameDB(void);
* #define declarations local to this package.
*/
#ifndef XCMSDB
-#define XCMSDB "/usr/lib/X11/Xcms.txt"
+#define XCMSDB "/usr/share/X11/Xcms.txt"
#endif
#ifndef isgraph

10
baselibs.conf Normal file
View File

@ -0,0 +1,10 @@
libX11-6
provides "xorg-x11-libX11-<targettype> = 7.6_<version>"
obsoletes "xorg-x11-libX11-<targettype> < 7.6_<version>"
libX11-xcb1
libX11-devel
requires -libX11-<targettype>
requires "libX11-6-<targettype> = <version>"
requires "libX11-xcb1-<targettype> = <version>"
provides "xorg-x11-libX11-devel-<targettype> = 7.6_<version>"
obsoletes "xorg-x11-libX11-devel-<targettype> < 7.6_<version>"

55
bug-221326-xim-sync.patch Normal file
View File

@ -0,0 +1,55 @@
diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c
index cb30ac2..31e9150 100644
--- a/modules/im/ximcp/imDefIc.c
+++ b/modules/im/ximcp/imDefIc.c
@@ -908,6 +908,30 @@ _XimProtoDestroyIC(
return;
}
+/*
+ * Some functions require the request queue from the server to be flushed
+ * so that the ordering of client initiated status changes and those requested
+ * by the server is well defined.
+ * _XimSync() would be the function of choice here as it should get a
+ * XIM_SYNC_REPLY back from the server.
+ * This however isn't implemented in the piece of junk that is used by most
+ * input servers as the server side protocol if to XIM.
+ * Since this code is not shipped as a library together with the client side
+ * XIM code but is duplicated by every input server around the world there
+ * is no easy fix to this but this ugly hack below.
+ * Obtaining an IC value from the server sends a request and empties out the
+ * event/server request queue until the answer to this request is found.
+ * Thus it is guaranteed that any pending server side request gets processed.
+ * This is what the hack below is doing.
+ */
+
+Private void
+BrokenSyncWithServer(XIC xic)
+{
+ CARD32 dummy;
+ XGetICValues(xic, XNFilterEvents, &dummy, NULL);
+}
+
Private void
_XimProtoSetFocus(
XIC xic)
@@ -938,7 +962,8 @@ #else
}
}
#endif /* XIM_CONNECTABLE */
-
+ BrokenSyncWithServer(xic);
+
buf_s[0] = im->private.proto.imid; /* imid */
buf_s[1] = ic->private.proto.icid; /* icid */
@@ -984,6 +1009,8 @@ #else
}
#endif /* XIM_CONNECTABLE */
+ BrokenSyncWithServer(xic);
+
buf_s[0] = im->private.proto.imid; /* imid */
buf_s[1] = ic->private.proto.icid; /* icid */
diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c

23
bug-239698_libx11.diff Normal file
View File

@ -0,0 +1,23 @@
diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
index aa1aaaf..b3b7a9f 100644
--- a/modules/im/ximcp/imDefLkup.c
+++ b/modules/im/ximcp/imDefLkup.c
@@ -661,6 +662,7 @@ _XimProcCommit(
return True;
}
+
Private Bool
_XimCommitRecv(
Xim im,
@@ -704,7 +706,9 @@ _XimCommitRecv(
(void)_XimRespSyncReply(ic, flag);
- MARK_FABLICATED(ic);
+ if (ic->private.proto.registed_filter_event
+ & (KEYPRESS_MASK | KEYRELEASE_MASK))
+ MARK_FABLICATED(ic);
ev.type = KeyPress;
ev.send_event = False;

13
bug153744.diff Normal file
View File

@ -0,0 +1,13 @@
diff -u -r nls.orig/Makefile.am nls/Makefile.am
--- nls.orig/Makefile.am 2006-07-21 14:40:44.000000000 +0200
+++ nls/Makefile.am 2006-07-21 14:41:08.000000000 +0200
@@ -38,9 +38,7 @@
ja \
ja.JIS \
ja_JP.UTF-8 \
- ja.S90 \
ja.SJIS \
- ja.U90 \
ko \
koi8-c \
koi8-r \

10
compose-zh_CN.UTF-8.diff Normal file
View File

@ -0,0 +1,10 @@
--- nls/compose.dir.pre.old 2009-01-28 15:21:23.000000000 +0000
+++ nls/compose.dir.pre 2009-01-28 15:21:51.000000000 +0000
@@ -403,6 +403,7 @@
en_US.UTF-8/Compose: wa_BE.UTF-8
en_US.UTF-8/Compose: yi_US.UTF-8
en_US.UTF-8/Compose: xh_ZA.UTF-8
+en_US.UTF-8/Compose: zh_CN.UTF-8
en_US.UTF-8/Compose: zh_TW.UTF-8
en_US.UTF-8/Compose: zu_ZA.UTF-8
en_US.UTF-8/Compose: bs_BA.UTF-8

107
en-locales.diff Normal file
View File

@ -0,0 +1,107 @@
--- nls/compose.dir.pre.orig 2009-04-08 02:05:06.000000000 +0200
+++ nls/compose.dir.pre 2009-04-08 02:12:44.000000000 +0200
@@ -280,17 +280,25 @@
el_GR.UTF-8/Compose: el_CY.UTF-8
el_GR.UTF-8/Compose: el_GR.UTF-8
en_US.UTF-8/Compose: en_AU.UTF-8
+en_US.UTF-8/Compose: en_BE.UTF-8
+en_US.UTF-8/Compose: en_BW.UTF-8
en_US.UTF-8/Compose: en_BZ.UTF-8
en_US.UTF-8/Compose: en_CA.UTF-8
+en_US.UTF-8/Compose: en_DK.UTF-8
en_US.UTF-8/Compose: en_GB.UTF-8
+en_US.UTF-8/Compose: en_HK.UTF-8
en_US.UTF-8/Compose: en_IE.UTF-8
+en_US.UTF-8/Compose: en_IN.UTF-8
en_US.UTF-8/Compose: en_JM.UTF-8
en_US.UTF-8/Compose: en_MT.UTF-8
en_US.UTF-8/Compose: en_NZ.UTF-8
+en_US.UTF-8/Compose: en_PH.UTF-8
+en_US.UTF-8/Compose: en_SG.UTF-8
en_US.UTF-8/Compose: en_TT.UTF-8
en_US.UTF-8/Compose: en_UK.UTF-8
en_US.UTF-8/Compose: en_US.UTF-8
en_US.UTF-8/Compose: en_ZA.UTF-8
+en_US.UTF-8/Compose: en_ZW.UTF-8
en_US.UTF-8/Compose: eo_XX.UTF-8
en_US.UTF-8/Compose: es_AR.UTF-8
en_US.UTF-8/Compose: es_BO.UTF-8
--- ../libX11-1.1.4.orig//nls/locale.alias.pre 2008-05-09 15:11:32.000000000 +0000
+++ nls/locale.alias.pre 2008-05-09 15:38:41.000000000 +0000
@@ -296,11 +296,13 @@
en_BW: en_BW.ISO8859-1
en_BW.iso88591: en_BW.ISO8859-1
en_BW.ISO-8859-1: en_BW.ISO8859-1
+en_BW.utf8: en_BW.UTF-8
en_CA: en_CA.ISO8859-1
en_CA.iso88591: en_CA.ISO8859-1
en_CA.ISO-8859-1: en_CA.ISO8859-1
en_CA.ISO_8859-1: en_CA.ISO8859-1
en_CA.utf8: en_CA.UTF-8
+en_DK.utf8: en_DK.UTF-8
en_GB: en_GB.ISO8859-1
en_GB.88591: en_GB.ISO8859-1
en_GB.88591.en: en_GB.ISO8859-1
@@ -316,6 +318,7 @@
en_HK: en_HK.ISO8859-1
en_HK.iso88591: en_HK.ISO8859-1
en_HK.ISO-8859-1: en_HK.ISO8859-1
+en_HK.utf8: en_HK.UTF-8
en_IE: en_IE.ISO8859-1
en_IE.iso88591: en_IE.ISO8859-1
en_IE.ISO-8859-1: en_IE.ISO8859-1
@@ -326,6 +329,7 @@
en_IE.UTF-8@euro: en_IE.UTF-8
en_IE.utf8: en_IE.UTF-8
en_IN: en_IN.ISO8859-1
+en_IN.utf8: en_IN.UTF-8
en_NZ: en_NZ.ISO8859-1
en_NZ.iso88591: en_NZ.ISO8859-1
en_NZ.ISO-8859-1: en_NZ.ISO8859-1
@@ -333,9 +337,11 @@
en_PH: en_PH.ISO8859-1
en_PH.iso88591: en_PH.ISO8859-1
en_PH.ISO-8859-1: en_PH.ISO8859-1
+en_PH.utf8: en_PH.UTF-8
en_SG: en_SG.ISO8859-1
en_SG.iso88591: en_SG.ISO8859-1
en_SG.ISO-8859-1: en_SG.ISO8859-1
+en_SG.utf8: en_SG.UTF-8
en_US: en_US.ISO8859-1
EN_US: en_US.ISO8859-1
en_US.88591: en_US.ISO8859-1
@@ -370,6 +376,7 @@
en_ZW: en_ZW.ISO8859-1
en_ZW.iso88591: en_ZW.ISO8859-1
en_ZW.ISO-8859-1: en_ZW.ISO8859-1
+en_ZW.utf8: en_ZW.UTF-8
eo: eo_XX.ISO8859-3
eo_EO: eo_EO.ISO8859-3
eo_EO.ISO8859-3: eo_EO.ISO8859-3
--- nls/locale.dir.pre.orig 2009-04-08 02:05:06.000000000 +0200
+++ nls/locale.dir.pre 2009-04-08 02:16:54.000000000 +0200
@@ -301,17 +301,24 @@
en_US.UTF-8/XLC_LOCALE: el_GR.UTF-8
en_US.UTF-8/XLC_LOCALE: en_AU.UTF-8
en_US.UTF-8/XLC_LOCALE: en_BE.UTF-8
+en_US.UTF-8/XLC_LOCALE: en_BW.UTF-8
en_US.UTF-8/XLC_LOCALE: en_BZ.UTF-8
en_US.UTF-8/XLC_LOCALE: en_CA.UTF-8
+en_US.UTF-8/XLC_LOCALE: en_DK.UTF-8
en_US.UTF-8/XLC_LOCALE: en_GB.UTF-8
+en_US.UTF-8/XLC_LOCALE: en_HK.UTF-8
en_US.UTF-8/XLC_LOCALE: en_IE.UTF-8
+en_US.UTF-8/XLC_LOCALE: en_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: en_JM.UTF-8
en_US.UTF-8/XLC_LOCALE: en_MT.UTF-8
en_US.UTF-8/XLC_LOCALE: en_NZ.UTF-8
+en_US.UTF-8/XLC_LOCALE: en_PH.UTF-8
+en_US.UTF-8/XLC_LOCALE: en_SG.UTF-8
en_US.UTF-8/XLC_LOCALE: en_TT.UTF-8
en_US.UTF-8/XLC_LOCALE: en_UK.UTF-8
en_US.UTF-8/XLC_LOCALE: en_US.UTF-8
en_US.UTF-8/XLC_LOCALE: en_ZA.UTF-8
+en_US.UTF-8/XLC_LOCALE: en_ZW.UTF-8
en_US.UTF-8/XLC_LOCALE: eo_EO.UTF-8
en_US.UTF-8/XLC_LOCALE: eo_XX.UTF-8
en_US.UTF-8/XLC_LOCALE: es_AR.UTF-8

3
libX11-1.4.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5cb3c22a352190e7a426ac5874354ad27e93d994db5518674f2cb60e9c35a94b
size 2086239

472
libX11.changes Normal file
View File

@ -0,0 +1,472 @@
-------------------------------------------------------------------
Sat Feb 11 19:01:37 UTC 2012 - jengelh@medozas.de
- Rename xorg-x11-libX11 to libX11 and utilize shlib policy
-------------------------------------------------------------------
Sun Nov 20 06:48:30 UTC 2011 - coolo@suse.com
- add libtool as buildrequire to avoid implicit dependency
-------------------------------------------------------------------
Wed Jun 29 08:55:03 UTC 2011 - eich@suse.de
- revert code:
* add 0001--XIM-Revert-commit-1a1a42a3.patch,
* remove scim_swallow.diff
This restores Xlib as it was before commit 1a1a42a3 was introduced
upstream.
scim_swallow.diff tried to fix a client problem on the
library side: clients should call XFilterEvent() directly
after calling XNextEvent(). The focus must not change between
these two calls. If we see problems we should fix the clients.
The patch introduces another problem as it causes keyboard events
to be delivered to the wrong IC and window.
-------------------------------------------------------------------
Fri May 20 10:29:18 UTC 2011 - sndirsch@novell.com
- reverted previous change since it still results in a build cycle
-------------------------------------------------------------------
Thu May 19 12:01:44 UTC 2011 - giecrilj@stegny.2a.pl
- Fix bnc#688032 by reintroducing (modified) xmlto
-------------------------------------------------------------------
Tue Mar 22 20:01:19 UTC 2011 - sndirsch@novell.com
- disabled Ignore-user-locks-after-sleeping-in-_XReply-and-_XRe.patch
for now (bnc #679177, comment #6)
-------------------------------------------------------------------
Thu Mar 17 17:29:54 UTC 2011 - sndirsch@novell.com
- Ignore-user-locks-after-sleeping-in-_XReply-and-_XRe.patch
* Ignore user locks after sleeping in _XReply and _XReadEvents
(bnc #679177)
-------------------------------------------------------------------
Tue Jan 18 16:32:18 UTC 2011 - sndirsch@novell.com
- reverted previous change due to creation of a pretty huge build
cycle according to coolo
-------------------------------------------------------------------
Mon Jan 17 14:22:28 UTC 2011 - sndirsch@novell.com
- added xmlto to BuildRequires to generate HTML documentation from
XML sources
-------------------------------------------------------------------
Tue Dec 21 02:42:17 UTC 2010 - sndirsch@novell.com
- bumped version number to 7.6
-------------------------------------------------------------------
Tue Nov 30 22:51:55 UTC 2010 - cristian.rodriguez@opensuse.org
- revert symbol export control patch, other packages
happend to use libX11 private symbols
-------------------------------------------------------------------
Tue Nov 30 15:13:16 UTC 2010 - cristian.rodriguez@opensuse.org
- export only public API symbols
- disable silent rules, defeat the purpose of post build checks
-------------------------------------------------------------------
Sun Nov 21 23:39:31 UTC 2010 - sndirsch@novell.com
- update to release 1.4.0
* After 3 release candidates, it's finally done - libX11 1.4 is
released.
-------------------------------------------------------------------
Sat Oct 30 16:01:11 UTC 2010 - sndirsch@novell.com
- update to release 1.3.99.903
* This is the third release candidate for libX11 1.4. Will the
third time be the charm? Hopefully Dan's fixes to disable
fopping the docs by default will solve the build issues that
many people had with the second RC.
-------------------------------------------------------------------
Wed Sep 22 07:08:05 UTC 2010 - sndirsch@novell.com
- update to release 1.3.99.902
"This is the second (and hopefully last) release candidate for
libX11 1.4. A final release is planned to occur by the end of
September, so that it will be available for inclusion in the
X11R7.6 katamari, since I missed the original goal of releasing
at XDS time."
-------------------------------------------------------------------
Sat Sep 4 06:23:16 CEST 2010 - sndirsch@suse.de
- update to release 1.3.99.901
* This is the first release candidate for libX11 1.4. A final
release is planned to occur around the time of the X Developer
Summit in mid-September, so that it will be available for
inclusion in the X11R7.6 katamari.
- removed p_xauth.diff; obsoleted by
bug-262309_xcb-xauthlocalhostname.diff in xorg-x11-libxcb
package
-------------------------------------------------------------------
Sat Sep 4 06:04:30 CEST 2010 - sndirsch@suse.de
- update to release 1.3.5
- adjusted p_sr_CS-compose.diff
-------------------------------------------------------------------
Fri Apr 2 17:54:37 CEST 2010 - sndirsch@suse.de
- bumped version number to 7.5
-------------------------------------------------------------------
Sat Jan 16 18:49:49 CET 2010 - sndirsch@suse.de
- update to release 1.3.2
- adjusted p_sr_CS-compose.diff
-------------------------------------------------------------------
Mon Dec 14 18:24:50 CET 2009 - jengelh@medozas.de
- add baselibs.conf as a source
-------------------------------------------------------------------
Sat Nov 14 03:03:13 CET 2009 - sndirsch@suse.de
- regenerated p_new-locales.diff
-------------------------------------------------------------------
Fri Jul 10 07:32:06 CEST 2009 - sndirsch@suse.de
- libX11 1.2.2
* various fixes
* support for some locales added
- adjusted p_new-locales.diff
-------------------------------------------------------------------
Thu Apr 30 21:53:45 CEST 2009 - sndirsch@suse.de
- pack .la files in devel package
- move .a files to devel package
-------------------------------------------------------------------
Thu Apr 30 18:27:28 CEST 2009 - sndirsch@suse.de
- reenabled build of static libs on openSUSE <= 11.1
-------------------------------------------------------------------
Tue Apr 28 22:26:17 CEST 2009 - crrodriguez@suse.de
- fix -devel package dependencies
-------------------------------------------------------------------
Tue Apr 21 20:56:15 CEST 2009 - crrodriguez@suse.de
- remove static libraries and "la" files
-------------------------------------------------------------------
Wed Apr 8 01:54:51 CEST 2009 - sndirsch@suse.de
- libX11 1.2.1
* various fixes
* support for some locales added
- adjusted en-locales.diff, p_new-locales.diff
-------------------------------------------------------------------
Tue Mar 3 18:09:23 CET 2009 - sndirsch@suse.de
- fixed and reenabled scim_swallow.diff (bnc #434865)
-------------------------------------------------------------------
Tue Mar 3 12:08:56 CET 2009 - sndirsch@suse.de
- redone scim_swallow.diff (replaces scim_swallow1.diff/
scim_swallow2.diff); disabled for now since it breaks scim
completely
-------------------------------------------------------------------
Sun Mar 1 20:40:21 CET 2009 - sndirsch@suse.de
- libX11 1.2
- obsoletes bug356556-bad_array_index.diff,
p_XFree86-4.2.0-i18n-xlib-20020322.diff.bz2, p_xlc-locale.diff,
p_xlib-threadsafe.diff, xkb-rangefix.diff
- adjusted p_sr_CS-compose.diff, p_xauth.diff, scim_swallow1.diff
-------------------------------------------------------------------
Tue Feb 24 14:13:11 CET 2009 - sndirsch@suse.de
- scim_swallow1.diff/scim_swallow2.diff:
* fix for bnc #434865
-------------------------------------------------------------------
Wed Jan 28 16:23:58 CET 2009 - sndirsch@suse.de
- compose-zh_CN.UTF-8.diff
* added missing entry in compose.dir for zh_CN.UTF-8 (bnc #461243)
-------------------------------------------------------------------
Thu Sep 11 14:20:55 CEST 2008 - sndirsch@suse.de
- bumped release number to 7.4
-------------------------------------------------------------------
Fri Sep 5 04:47:41 CEST 2008 - sndirsch@suse.de
- libX11 1.1.5
* This is just an i18n and bugfix release, essentially. Most of
the fixes bar James's most recent ones have been in 1.1 branch
for a while, and the rest were just cherry-picked from master.
-------------------------------------------------------------------
Sat Aug 30 04:01:50 CEST 2008 - sndirsch@suse.de
- moved Xcms.txt to /usr/share/X11 (bnc #419548)
-------------------------------------------------------------------
Tue Aug 26 23:53:58 CEST 2008 - sndirsch@suse.de
- Xcms.txt apparently needs to be in /usr/lib/X11 (bnc #419548)
-------------------------------------------------------------------
Wed May 14 10:42:49 CEST 2008 - sndirsch@suse.de
- xkb-rangefix.diff
* fixed range in _XKbWriteKeyExplicit (bnc #369263)
- fixed rpmlint warnings
-------------------------------------------------------------------
Fri May 9 17:43:52 CEST 2008 - sndirsch@suse.de
- en-locales.diff
* added missing support for en_XX.UTF-8 locales (bnc #388711)
-------------------------------------------------------------------
Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de
- added baselibs.conf file to build xxbit packages
for multilib support
-------------------------------------------------------------------
Thu Mar 6 22:20:20 CET 2008 - sndirsch@suse.de
- libX11 1.1.4
-------------------------------------------------------------------
Mon Feb 25 18:34:00 CET 2008 - sndirsch@suse.de
- using "-fno-tree-vrp" as workaround for gcc miscompilation no
longer required (bnc #355496)
-------------------------------------------------------------------
Wed Feb 13 11:21:25 CET 2008 - sndirsch@suse.de
- added temporary workaround (-fno-tree-vrp) to fix gcc
miscompilation (bnc#355496)
-------------------------------------------------------------------
Tue Jan 29 15:56:21 CET 2008 - sndirsch@suse.de
- bug356556-bad_array_index.diff
* fixed copy & paste error, which resulted ina bad array index
compiler warning (Bug #356556)
-------------------------------------------------------------------
Wed Jan 2 00:08:05 CET 2008 - crrodriguez@suse.de
- fix library-without-ldconfig-* error
-------------------------------------------------------------------
Fri Oct 26 10:45:58 CEST 2007 - sndirsch@suse.de
- p_khmer-compose.diff/p_khmer-locale.diff
* added missing bits (Bug #335944, comment #17)
-------------------------------------------------------------------
Sat Sep 29 12:22:38 CEST 2007 - sndirsch@suse.de
- bumped version to 7.3
-------------------------------------------------------------------
Thu Aug 2 12:28:48 CEST 2007 - sndirsch@suse.de
- update to release 1.1.3
* libX11 1.1.3 is a maintenance release that fixes a bug
(introduced with libX11 1.1.2) which broke the
XGetMotionEvents function.
-------------------------------------------------------------------
Mon Jun 11 17:36:44 CEST 2007 - sndirsch@suse.de
- libX11-1.1.2-fix-XGetMotionEvents.patch:
* fix argument orders (X.Org Bug #11222)
-------------------------------------------------------------------
Mon Jun 4 11:26:19 CEST 2007 - sndirsch@suse.de
- update to release 1.1.2:
* A variety of bug fixes, new and better documentation, etc.
- obsoletes bug-252958_libX11.diff, bug-248332_lcDB.diff
-------------------------------------------------------------------
Thu May 10 21:40:18 CEST 2007 - sndirsch@suse.de
- create symlinks instead of copies for empty/missing files of some
UTF-8 locales (Bug #273157)
-------------------------------------------------------------------
Thu May 03 16:10:51 CEST 2007 - mfabian@suse.de
- Bugzilla #221326: add Egbert's XIM sync patch.
-------------------------------------------------------------------
Wed Apr 4 22:55:18 CEST 2007 - sndirsch@suse.de
- bug-248332_lcDB.diff:
* fixes a bad pointer calculation type (Bug #248332)
-------------------------------------------------------------------
Thu Mar 29 22:44:44 CEST 2007 - sndirsch@suse.de
- added zlib-devel to Buildrequires
-------------------------------------------------------------------
Mon Mar 26 12:57:33 CEST 2007 - sndirsch@suse.de
- bug-252958_libX11.diff:
* Buffer overflow in XGetPixel() (Bug #252958)
-------------------------------------------------------------------
Thu Feb 22 06:05:08 CET 2007 - sndirsch@suse.de
- build with libxcb again
-------------------------------------------------------------------
Tue Jan 30 00:19:43 CET 2007 - sndirsch@suse.de
- bug-239698_libx11.diff:
* XIM (with SCIM) commits first character after FocusIn
immediately (Bug #239698)
-------------------------------------------------------------------
Sat Dec 30 11:49:22 CET 2006 - sndirsch@suse.de
- force building without libxcb (still was built against it by
accident)
-------------------------------------------------------------------
Sat Dec 16 05:52:49 CET 2006 - sndirsch@suse.de
- no longer build libX11 against libxcb
-------------------------------------------------------------------
Sun Dec 3 16:12:23 CET 2006 - sndirsch@suse.de
- update to release 1.1.1
- build libX11 against libxcb
-------------------------------------------------------------------
Sat Nov 25 12:00:48 CET 2006 - sndirsch@suse.de
- remove nls/{ja.U90,ja.S90}/XLC_LOCALE.pre from sources; no longer
mark sources as NoSource in specfile (Bugs #200471, #153744)
-------------------------------------------------------------------
Wed Oct 18 14:41:08 CEST 2006 - sndirsch@suse.de
- imLcIm.c.diff:
* no longer twice-open the compose file in Xinput setup
-------------------------------------------------------------------
Sun Sep 3 15:12:56 CEST 2006 - dmueller@suse.de
- build parallel
-------------------------------------------------------------------
Sun Aug 20 14:29:43 CEST 2006 - sndirsch@suse.de
- install profile.d files only for SUSE <= 10.1
- Compose and XI18N_OBJS files are missing or empty for some UTF-8
locales; use the ones for en_US.UTF-8
-------------------------------------------------------------------
Mon Aug 7 10:36:38 CEST 2006 - sndirsch@suse.de
- p_khmer-compose.diff:
* added required compose entries for Khmer (Bug #143348)
- p_khmer-locale.diff:
* km_KH locale support (Bug #144397)
- p_xlib_skip_ext_env.diff:
* added support for disabling extensions through environment
variables (Bug #167317)
-------------------------------------------------------------------
Sat Aug 5 22:46:48 CEST 2006 - sndirsch@suse.de
- p_XFree86-4.2.0-i18n-xlib-20020322.diff:
* gb18030 patches from SUN
- p_new-locales.diff:
* support for new indic/african locales (Bug #98262)
- p_xauth.diff:
* Let X authorization be tolerant to hostname changes (Bug #98627)
- p_xlc-locale.diff:
* fixes strange font mixups, when fontsets are still used (#74299)
- p_xlib-threadsafe.diff:
* don't have the input filter wrapped by the display lock (Bug #55962)
- p_sr_CS-compose.diff:
* Serbian specific compose table entries (Bug #95813)
-------------------------------------------------------------------
Wed Aug 2 16:12:02 CEST 2006 - sndirsch@suse.de
- fix setup line
-------------------------------------------------------------------
Fri Jul 28 14:44:18 CEST 2006 - sndirsch@suse.de
- use "-fno-strict-aliasing"
-------------------------------------------------------------------
Thu Jul 27 11:41:16 CEST 2006 - sndirsch@suse.de
- use $RPM_OPT_FLAGS
- remove existing /usr/include/X11 symlink in %pre
-------------------------------------------------------------------
Tue Jul 25 10:14:20 CEST 2006 - sndirsch@suse.de
- added profile scripts to set XKEYSYMDB/XNLSPATH accordingly
-------------------------------------------------------------------
Mon Jul 24 10:47:37 CEST 2006 - sndirsch@suse.de
- fixed locale support
-------------------------------------------------------------------
Fri Jul 21 14:43:54 CEST 2006 - sndirsch@suse.de
- no longer install ja.S90/ja.U90 XLC_LOCALE files; declare libX11
sources as NoSource to make our legal department happy
(Bug #153744)
-------------------------------------------------------------------
Thu Jul 20 12:31:19 CEST 2006 - sndirsch@suse.de
- removed usr/lib/X11 directory from filelist, since it conflicts
with filesystem package
-------------------------------------------------------------------
Thu Jul 20 04:23:37 CEST 2006 - sndirsch@suse.de
- added /usr/%{_lib}/X11 to %files to fix build
-------------------------------------------------------------------
Thu Jun 22 12:35:43 CEST 2006 - sndirsch@suse.de
- created package

191
libX11.spec Normal file
View File

@ -0,0 +1,191 @@
#
# spec file for package libX11
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: libX11
Version: 1.4.0
Release: 0
Summary: Core X11 protocol client library
License: MIT
Group: Development/Libraries/C and C++
URL: http://xorg.freedesktop.org/
#Git-Clone: git://anongit.freedesktop.org/xorg/lib/libX11
#Git-Web: http://cgit.freedesktop.org/xorg/lib/libX11/
Source: %name-%version.tar.bz2
Patch1: bug153744.diff
Patch4: p_new-locales.diff
Patch6: p_sr_CS-compose.diff
Patch7: p_khmer-compose.diff
Patch8: p_khmer-locale.diff
Patch9: p_xlib_skip_ext_env.diff
Patch10: bug-239698_libx11.diff
Patch13: bug-221326-xim-sync.patch
Patch15: en-locales.diff
Patch17: Xcms.diff
Patch18: compose-zh_CN.UTF-8.diff
Patch19: 0001--XIM-Revert-commit-1a1a42a3.patch
BuildRoot: %_tmppath/%name-%version-build
BuildRequires: autoconf >= 2.60, automake, libtool
BuildRequires: pkgconfig, pkgconfig(xorg-macros) >= 1.11
BuildRequires: pkgconfig(xproto) >= 7.0.13, pkgconfig(xextproto)
BuildRequires: pkgconfig(xtrans), pkgconfig(xcb) >= 1.1.92
BuildRequires: pkgconfig(xproto), pkgconfig(xf86bigfontproto)
BuildRequires: pkgconfig(kbproto), pkgconfig(inputproto)
%description
The X Window System is a network-transparent window system that was
designed at MIT. X display servers run on computers with either
monochrome or color bitmap display hardware. The server distributes
user input to and accepts output requests from various client
programs located either on the same machine or elsewhere in the
network. Xlib is a C subroutine library that application programs
(clients) use to interface with the window system by means of a
stream connection.
%package -n libX11-6
Summary: Core X11 protocol client library
Group: System/Libraries
Requires: %name-data >= %version
# O/P added for 12.2. Ideally remove before 12.2 release.
Provides: xorg-x11-libX11 = 7.6_%version-%release
Obsoletes: xorg-x11-libX11 < 7.6_%versino-%release
%description -n libX11-6
The X Window System is a network-transparent window system that was
designed at MIT. X display servers run on computers with either
monochrome or color bitmap display hardware. The server distributes
user input to and accepts output requests from various client
programs located either on the same machine or elsewhere in the
network. Xlib is a C subroutine library that application programs
(clients) use to interface with the window system by means of a
stream connection.
%package -n libX11-xcb1
Summary: XCB X11 protocol client library
Group: System/Libraries
Requires: %name-data >= %version
%description -n libX11-xcb1
The X Window System is a network-transparent window system that was
designed at MIT. X display servers run on computers with either
monochrome or color bitmap display hardware. The server distributes
user input to and accepts output requests from various client
programs located either on the same machine or elsewhere in the
network. Xlib is a C subroutine library that application programs
(clients) use to interface with the window system by means of a
stream connection.
%package data
Summary: Shared data for the Core X11 protocol library
Group: System/Libraries
BuildArch: noarch
%description data
The X Window System is a network-transparent window system that was
designed at MIT. X display servers run on computers with either
monochrome or color bitmap display hardware. The server distributes
user input to and accepts output requests from various client
programs located either on the same machine or elsewhere in the
network. Xlib is a C subroutine library that application programs
(clients) use to interface with the window system by means of a
stream connection.
%package devel
Summary: Development files for the Core X11 protocol library
Group: Development/Libraries/C and C++
Requires: libX11-6 = %version, libX11-xcb1 = %version
# O/P added for 12.2
Provides: xorg-x11-libX11-devel = 7.6_%version-%release
Obsoletes: xorg-x11-libX11-devel < 7.6_%version-%release
%description devel
The X Window System is a network-transparent window system that was
designed at MIT. X display servers run on computers with either
monochrome or color bitmap display hardware. The server distributes
user input to and accepts output requests from various client
programs located either on the same machine or elsewhere in the
network. Xlib is a C subroutine library that application programs
(clients) use to interface with the window system by means of a
stream connection.
This package contains the development headers for the library found
in libX11-6 and libX11-xcb1.
%prep
%setup -q
# make legal department happy (Bug #153744)
test -f nls/ja.U90/XLC_LOCALE.pre && exit 1
test -f nls/ja.S90/XLC_LOCALE.pre && exit 1
%patch -P 1 -P 4 -P 6 -P 7 -P 8 -P 9 -p0
%patch -P 10 -P 13 -p1
%patch -P 15 -P 17 -P 18 -p0
%patch -P 19 -p1
%build
# Got patches which change auto*files
autoreconf -fi
%configure --docdir=%_docdir/%name --disable-static
# "--enable-loadable-i18n" is currently broken
#--datadir=/usr/share
make %{?_smp_mflags}
%install
%makeinstall
rm -f "%buildroot/%_libdir"/*.la
# Some files are empty/missing for some UTF-8 locales
pushd "%buildroot/usr/share/X11/locale"
for i in *.UTF-8; do
echo "$i"
if [ "$i" == "en_US.UTF-8" ]; then
continue
fi
touch "$i/Compose" "$i/XI18N_OBJS"
test -s "$i/Compose" || ln -fns ../en_US.UTF-8/Compose "$i"
test -s "$i/XI18N_OBJS" || ln -fns ../en_US.UTF-8/XI18N_OBJS "$i"
test -s "$i/XLC_LOCALE" || ln -fns ../en_US.UTF-8/XLC_LOCALE "$i"
done
popd
# fdupes
%post -n libX11-6 -p /sbin/ldconfig
%postun -n libX11-6 -p /sbin/ldconfig
%post -n libX11-xcb1 -p /sbin/ldconfig
%postun -n libX11-xcb1 -p /sbin/ldconfig
%files -n libX11-6
%defattr(-,root,root)
%_libdir/libX11.so.6*
%files -n libX11-xcb1
%defattr(-,root,root)
%_libdir/libX11-xcb.so.1*
%files data
%defattr(-,root,root)
%_datadir/X11
%files devel
%defattr(-,root,root)
%_includedir/X11/*
%_libdir/*.so
%_libdir/pkgconfig/*.pc
%_docdir/%name
%_mandir/man?/*
%changelog

22
p_khmer-compose.diff Normal file
View File

@ -0,0 +1,22 @@
--- nls/en_US.UTF-8/Compose.pre.orig 2006-12-03 16:58:03.000000000 +0100
+++ nls/en_US.UTF-8/Compose.pre 2006-12-03 17:00:09.000000000 +0100
@@ -5704,3 +5704,9 @@
<dead_doubleacute> <Cyrillic_u> : "у̏"
<dead_diaeresis> <Cyrillic_U> : "У̏"
<dead_doubleacute> <Cyrillic_U> : "У̏"
+# Khmer digraphs
+<U17ff> : "ាំ"
+<U17fe> : "ោះ"
+<U17fd> : "េះ"
+<U17fc> : "ុំ"
+<U17fb> : "ុះ"
--- nls/compose.dir.pre.orig 2007-10-26 10:38:23.854146750 +0200
+++ nls/compose.dir.pre 2007-10-26 10:38:51.159853250 +0200
@@ -141,6 +141,7 @@
georgian-ps/Compose: ka_GE.GEORGIAN-PS
iso8859-1/Compose: kl_GL.ISO8859-1
iso8859-15/Compose: kl_GL.ISO8859-15
+en_US.UTF-8/Compose: km_KH.UTF-8
iso8859-1/Compose: kw_GB.ISO8859-1
iso8859-14/Compose: kw_GB.ISO8859-14
iso8859-15/Compose: kw_GB.ISO8859-15

21
p_khmer-locale.diff Normal file
View File

@ -0,0 +1,21 @@
--- nls/locale.alias.pre.orig 2006-12-03 17:02:26.000000000 +0100
+++ nls/locale.alias.pre 2006-12-03 17:04:54.000000000 +0100
@@ -693,6 +693,8 @@
kl_GL.ISO-8859-1: kl_GL.ISO8859-1
kl_GL.iso885915: kl_GL.ISO8859-15
kl_GL.utf8: kl_GL.UTF-8
+km_KH: km_KH.UTF-8
+km_KH.utf8: km_KH.UTF-8
kn: kn_IN.UTF-8
kn_IN: kn_IN.UTF-8
kn_IN.utf8: kn_IN.UTF-8
--- nls/locale.dir.pre.orig 2007-10-26 10:38:09.221232250 +0200
+++ nls/locale.dir.pre 2007-10-26 10:38:14.929589000 +0200
@@ -155,6 +155,7 @@
georgian-academy/XLC_LOCALE: ka_GE.GEORGIAN-ACADEMY
georgian-ps/XLC_LOCALE: ka_GE.GEORGIAN-PS
iso8859-1/XLC_LOCALE: kl_GL.ISO8859-1
+en_US.UTF-8/XLC_LOCALE: km_KH.UTF-8
ko/XLC_LOCALE: ko_KR.eucKR
iso8859-1/XLC_LOCALE: kw_GB.ISO8859-1
iso8859-14/XLC_LOCALE: kw_GB.ISO8859-14

55
p_new-locales.diff Normal file
View File

@ -0,0 +1,55 @@
diff -u -r -p ../libX11-1.2.2.orig//nls/compose.dir.pre ./nls/compose.dir.pre
--- ../libX11-1.2.2.orig//nls/compose.dir.pre 2009-11-14 02:01:41.000000000 +0000
+++ ./nls/compose.dir.pre 2009-11-14 02:01:54.000000000 +0000
@@ -342,6 +342,7 @@ en_US.UTF-8/Compose: iu_CA.UTF-8
en_US.UTF-8/Compose: ja_JP.UTF-8
en_US.UTF-8/Compose: ka_GE.UTF-8
en_US.UTF-8/Compose: kl_GL.UTF-8
+en_US.UTF-8/Compose: kn_IN.UTF-8
en_US.UTF-8/Compose: kk_KZ.UTF-8
en_US.UTF-8/Compose: kn_IN.UTF-8
en_US.UTF-8/Compose: ko_KR.UTF-8
Only in ./nls: compose.dir.pre.orig
diff -u -r -p ../libX11-1.2.2.orig//nls/locale.alias.pre ./nls/locale.alias.pre
--- ../libX11-1.2.2.orig//nls/locale.alias.pre 2009-11-14 02:01:41.000000000 +0000
+++ ./nls/locale.alias.pre 2009-11-14 02:01:54.000000000 +0000
@@ -131,8 +131,8 @@ bg_BG.iso88595: bg_BG.ISO8859-5
bg_BG.ISO-8859-5: bg_BG.ISO8859-5
bg_BG.koi8r: bg_BG.KOI8-R
be_BG.utf8: bg_BG.UTF-8
+bn_IN: bn_IN.UTF-8
bn_IN.utf8: bn_IN.UTF-8
-bn_IN.UTF-8: bn_IN.UTF-8
bo_IN.utf8: bo_IN.UTF-8
bo_IN.UTF-8: bo_IN.UTF-8
br: br_FR.ISO8859-1
@@ -607,8 +607,8 @@ gl_ES.ISO-8859-15@euro: gl_ES.ISO8859
gl_ES@euro: gl_ES.ISO8859-15
gl_ES.UTF-8@euro: gl_ES.UTF-8
gl_ES.utf8: gl_ES.UTF-8
+gu_IN: gu_IN.UTF-8
gu_IN.utf8: gu_IN.UTF-8
-gu_IN.UTF-8: gu_IN.UTF-8
gv: gv_GB.ISO8859-1
gv_GB: gv_GB.ISO8859-1
gv_GB.iso88591: gv_GB.ISO8859-1
@@ -729,8 +729,8 @@ kl_GL.ISO-8859-1: kl_GL.ISO8859-1
kl_GL.iso885915: kl_GL.ISO8859-15
kl_GL.utf8: kl_GL.UTF-8
kn: kn_IN.UTF-8
+kn_IN: kn_IN.UTF-8
kn_IN.utf8: kn_IN.UTF-8
-kn_IN.UTF-8: kn_IN.UTF-8
ko: ko_KR.eucKR
ko.UTF-8: ko_KR.UTF-8
ko_KR: ko_KR.eucKR
@@ -896,8 +896,8 @@ or: or_IN.UTF-8
or_IN.utf8: or_IN.UTF-8
or_IN.UTF-8: or_IN.UTF-8
pa: pa_IN.UTF-8
+pa_IN: pa_IN.UTF-8
pa_IN.utf8: pa_IN.UTF-8
-pa_IN.UTF-8: pa_IN.UTF-8
pa_PK.utf8: pa_PK.UTF-8
pd: pd_US.ISO8859-1
pd_DE: pd_DE.ISO8859-1

133
p_sr_CS-compose.diff Normal file
View File

@ -0,0 +1,133 @@
--- nls/en_US.UTF-8/Compose.pre.orig 2010-08-11 02:42:18.000000000 +0200
+++ nls/en_US.UTF-8/Compose.pre 2010-09-04 05:52:23.000000000 +0200
@@ -5379,3 +5379,130 @@
<Multi_key> <asciicircum> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
<Multi_key> <backslash> <o> <slash> : "🙌" # PERSON RAISING BOTH HANDS IN CELEBRATION
+
+# Serbian accented Cyrillic
+# а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A
+# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E
+# о О - U+043E, U+041E Cyrillic_o, Cyrillic_O
+# у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U
+# и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I
+#
+# ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
+# ́ - U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
+# ̂ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
+# ̏ - U+030F <dead_diaeresis>, <dead_doubleacute>
+# ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
+<dead_grave> <Cyrillic_a> : "а̀"
+<combining_grave> <Cyrillic_a> : "а̀"
+<Multi_key> <grave> <Cyrillic_a> : "а̀"
+<dead_grave> <Cyrillic_A> : "А̀"
+<combining_grave> <Cyrillic_A> : "А̀"
+<Multi_key> <grave> <Cyrillic_A> : "А̀"
+<dead_grave> <Cyrillic_e> : "ѐ"
+<combining_grave> <Cyrillic_e> : "ѐ"
+<Multi_key> <grave> <Cyrillic_e> : "ѐ"
+<dead_grave> <Cyrillic_E> : "Ѐ"
+<combining_grave> <Cyrillic_E> : "Ѐ"
+<Multi_key> <grave> <Cyrillic_E> : "Ѐ"
+<dead_grave> <Cyrillic_i> : "ѝ"
+<combining_grave> <Cyrillic_i> : "ѝ"
+<Multi_key> <grave> <Cyrillic_i> : "ѝ"
+<dead_grave> <Cyrillic_I> : "Ѝ"
+<combining_grave> <Cyrillic_I> : "Ѝ"
+<Multi_key> <grave> <Cyrillic_I> : "Ѝ"
+<dead_grave> <Cyrillic_o> : "о̀"
+<combining_grave> <Cyrillic_o> : "о̀"
+<Multi_key> <grave> <Cyrillic_o> : "о̀"
+<dead_grave> <Cyrillic_O> : "О̀"
+<combining_grave> <Cyrillic_O> : "О̀"
+<Multi_key> <grave> <Cyrillic_O> : "О̀"
+<dead_grave> <Cyrillic_u> : "у̀"
+<combining_grave> <Cyrillic_u> : "у̀"
+<Multi_key> <grave> <Cyrillic_u> : "у̀"
+<dead_grave> <Cyrillic_U> : "У̀"
+<combining_grave> <Cyrillic_U> : "У̀"
+<Multi_key> <grave> <Cyrillic_U> : "У̀"
+# ́ - dugouzlazni, U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
+<dead_acute> <Cyrillic_a> : "а́"
+<combining_acute> <Cyrillic_a> : "а́"
+<Multi_key> <acute> <Cyrillic_a> : "а́"
+<Multi_key> <apostrophe> <Cyrillic_a> : "а́"
+<dead_acute> <Cyrillic_A> : "А́"
+<combining_acute> <Cyrillic_A> : "А́"
+<Multi_key> <acute> <Cyrillic_A> : "А́"
+<Multi_key> <apostrophe> <Cyrillic_A> : "А́"
+<dead_acute> <Cyrillic_e> : "е́"
+<combining_acute> <Cyrillic_e> : "е́"
+<Multi_key> <acute> <Cyrillic_e> : "е́"
+<Multi_key> <apostrophe> <Cyrillic_e> : "е́"
+<dead_acute> <Cyrillic_E> : "Е́"
+<combining_acute> <Cyrillic_E> : "Е́"
+<Multi_key> <acute> <Cyrillic_E> : "Е́"
+<Multi_key> <apostrophe> <Cyrillic_E> : "Е́"
+<dead_acute> <Cyrillic_i> : "и́"
+<combining_acute> <Cyrillic_i> : "и́"
+<Multi_key> <acute> <Cyrillic_i> : "и́"
+<Multi_key> <apostrophe> <Cyrillic_i> : "и́"
+<dead_acute> <Cyrillic_I> : "И́"
+<combining_acute> <Cyrillic_I> : "И́"
+<Multi_key> <acute> <Cyrillic_I> : "И́"
+<Multi_key> <apostrophe> <Cyrillic_I> : "И́"
+<dead_acute> <Cyrillic_o> : "о́"
+<combining_acute> <Cyrillic_o> : "о́"
+<Multi_key> <acute> <Cyrillic_o> : "о́"
+<Multi_key> <apostrophe> <Cyrillic_o> : "о́"
+<dead_acute> <Cyrillic_O> : "О́"
+<combining_acute> <Cyrillic_O> : "О́"
+<Multi_key> <acute> <Cyrillic_O> : "О́"
+<Multi_key> <apostrophe> <Cyrillic_O> : "О́"
+<dead_acute> <Cyrillic_u> : "у́"
+<combining_acute> <Cyrillic_u> : "у́"
+<Multi_key> <acute> <Cyrillic_u> : "у́"
+<Multi_key> <apostrophe> <Cyrillic_u> : "у́"
+<dead_acute> <Cyrillic_U> : "У́"
+<combining_acute> <Cyrillic_U> : "У́"
+<Multi_key> <acute> <Cyrillic_U> : "У́"
+<Multi_key> <apostrophe> <Cyrillic_U> : "У́"
+# ̂ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
+<dead_circumflex> <Cyrillic_a> : "а̂"
+<Multi_key> <asciicircum> <Cyrillic_a> : "а̂"
+<dead_circumflex> <Cyrillic_A> : "А̂"
+<Multi_key> <asciicircum> <Cyrillic_A> : "А̂"
+<dead_circumflex> <Cyrillic_e> : "е̂"
+<Multi_key> <asciicircum> <Cyrillic_e> : "е̂"
+<dead_circumflex> <Cyrillic_E> : "Е̂"
+<Multi_key> <asciicircum> <Cyrillic_E> : "Е̂"
+<dead_circumflex> <Cyrillic_i> : "и̂"
+<Multi_key> <asciicircum> <Cyrillic_i> : "и̂"
+<dead_circumflex> <Cyrillic_I> : "И̂"
+<Multi_key> <asciicircum> <Cyrillic_I> : "И̂"
+<dead_circumflex> <Cyrillic_o> : "о̂"
+<Multi_key> <asciicircum> <Cyrillic_o> : "о̂"
+<dead_circumflex> <Cyrillic_O> : "О̂"
+<Multi_key> <asciicircum> <Cyrillic_O> : "О̂"
+<dead_circumflex> <Cyrillic_u> : "у̂"
+<Multi_key> <asciicircum> <Cyrillic_u> : "у̂"
+<dead_circumflex> <Cyrillic_U> : "У̂"
+<Multi_key> <asciicircum> <Cyrillic_U> : "У̂"
+# ̏ - kratkosilazni, U+030F <dead_diaeresis>, <dead_doubleacute>
+# there's no appropriate dead_doublegrave, so we use these two dead keys
+<dead_diaeresis> <Cyrillic_a> : "а̏"
+<dead_doubleacute> <Cyrillic_a> : "а̏"
+<dead_diaeresis> <Cyrillic_A> : "А̏"
+<dead_doubleacute> <Cyrillic_A> : "А̏"
+<dead_diaeresis> <Cyrillic_e> : "е̏"
+<dead_doubleacute> <Cyrillic_e> : "е̏"
+<dead_diaeresis> <Cyrillic_E> : "Е̏"
+<dead_doubleacute> <Cyrillic_E> : "Е̏"
+<dead_diaeresis> <Cyrillic_i> : "и̏"
+<dead_doubleacute> <Cyrillic_i> : "и̏"
+<dead_diaeresis> <Cyrillic_I> : "И̏"
+<dead_doubleacute> <Cyrillic_I> : "И̏"
+<dead_diaeresis> <Cyrillic_o> : "о̏"
+<dead_doubleacute> <Cyrillic_o> : "о̏"
+<dead_diaeresis> <Cyrillic_O> : "О̏"
+<dead_doubleacute> <Cyrillic_O> : "О̏"
+<dead_diaeresis> <Cyrillic_u> : "у̏"
+<dead_doubleacute> <Cyrillic_u> : "у̏"
+<dead_diaeresis> <Cyrillic_U> : "У̏"
+<dead_doubleacute> <Cyrillic_U> : "У̏"

23
p_xlib_skip_ext_env.diff Normal file
View File

@ -0,0 +1,23 @@
--- QuExt.c 2006-05-12 20:46:51.000000000 +0200
+++ src/QuExt.c 2006-05-20 21:07:13.000000000 +0200
@@ -43,6 +43,20 @@
xQueryExtensionReply rep;
register xQueryExtensionReq *req;
+ if (name && strlen (name) < 256)
+ {
+ char var[256 + 15];
+ int i;
+
+ strcpy (var, "XLIB_SKIP_EXT_");
+ for (i = 0; name[i]; i++)
+ var[i + 14] = name[i] == '-' ? '_' : name[i];
+
+ var[i + 14] = 0;
+ if (getenv (var))
+ return False;
+ }
+
LockDisplay(dpy);
GetReq(QueryExtension, req);
req->nbytes = name ? strlen(name) : 0;

12
xorg-x11-libX11.csh Normal file
View File

@ -0,0 +1,12 @@
#!/bin/csh
if ( -r /usr/share/X11/XKeysymDB ) then
setenv XKEYSYMDB /usr/share/X11/XKeysymDB
else
setenv XKEYSYMDB /usr/X11R6/lib/X11/XKeysymDB
endif
if ( -d /usr/share/X11/nls ) then
setenv XNLSPATH /usr/share/X11/nls
else
setenv XNLSPATH /usr/X11R6/lib/X11/nls
endif

12
xorg-x11-libX11.sh Normal file
View File

@ -0,0 +1,12 @@
#!/bin/sh
if [ -r /usr/share/X11/XKeysymDB ]; then
export XKEYSYMDB=/usr/share/X11/XKeysymDB
else
export XKEYSYMDB=/usr/X11R6/lib/X11/XKeysymDB
fi
if [ -d /usr/share/X11/nls ]; then
export XNLSPATH=/usr/share/X11/nls
else
export XNLSPATH=/usr/X11R6/lib/X11/nls
fi