summaryrefslogtreecommitdiff
path: root/packages/xorg-lib/files
diff options
context:
space:
mode:
authorRaymond Danks <raymond@edanks.com>2006-07-24 19:46:41 +0000
committerRaymond Danks <raymond@edanks.com>2006-07-24 19:46:41 +0000
commitdd0c887b669ed5f2fdfa21118f4b32d096e92816 (patch)
tree52a9bb766480ea9983a6e3e5d4ae600e0a482f2c /packages/xorg-lib/files
parentb88c8ee5fdd3c5bda8a7fea778c3d7b09b180622 (diff)
xorg-*: Massive rename to conform to X11R7.x_a.b.c versioning and xorg-* directory structure.
This is the first step for the update to X11R7.1. This will not build and will be followed by more patches and updates.
Diffstat (limited to 'packages/xorg-lib/files')
-rw-r--r--packages/xorg-lib/files/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/files/errordb-keysymdb-path-fix.patch22
-rw-r--r--packages/xorg-lib/files/fix-utf8-wrong-define.patch16
3 files changed, 38 insertions, 0 deletions
diff --git a/packages/xorg-lib/files/.mtn2git_empty b/packages/xorg-lib/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/files/.mtn2git_empty
diff --git a/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
new file mode 100644
index 0000000000..f43d38065e
--- /dev/null
+++ b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
@@ -0,0 +1,22 @@
+--- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200
++++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200
+@@ -56,7 +56,7 @@
+ #include <stdio.h>
+
+ #ifndef ERRORDB
+-#define ERRORDB "/usr/lib/X11/XErrorDB"
++#define ERRORDB "/usr/share/X11/XErrorDB"
+ #endif
+
+ /*
+--- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200
++++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200
+@@ -36,7 +36,7 @@
+ #include "Key.h"
+
+ #ifndef KEYSYMDB
+-#define KEYSYMDB "/usr/lib/X11/XKeysymDB"
++#define KEYSYMDB "/usr/share/X11/XKeysymDB"
+ #endif
+
+ static Bool initialized;
diff --git a/packages/xorg-lib/files/fix-utf8-wrong-define.patch b/packages/xorg-lib/files/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000000..dca88fba92
--- /dev/null
+++ b/packages/xorg-lib/files/fix-utf8-wrong-define.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define
++++ libX11-6.2.1/include/X11/Xlib.h
+@@ -100,7 +100,7 @@
+
+ /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
+ November 2000. Its presence is indicated through the following macro. */
+-#define X_HAVE_UTF8_STRING 1
++#undef X_HAVE_UTF8_STRING
+
+ typedef char *XPointer;
+