aboutsummaryrefslogtreecommitdiffstats
path: root/x11-servers
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2003-03-19 07:41:24 +0800
committeranholt <anholt@FreeBSD.org>2003-03-19 07:41:24 +0800
commitfc3308cda2632262294c3b33d506b9bba32614a2 (patch)
treee27ce592030d541e5e4fe6066291e0430ad6eca0 /x11-servers
parentdbd1515501fc7194b2150807c08c1dec31f721f2 (diff)
downloadfreebsd-ports-graphics-fc3308cda2632262294c3b33d506b9bba32614a2.tar.gz
freebsd-ports-graphics-fc3308cda2632262294c3b33d506b9bba32614a2.tar.zst
freebsd-ports-graphics-fc3308cda2632262294c3b33d506b9bba32614a2.zip
Add a patch to fix xkb initialization.
Approved by: portmgr (kris) Obtained from: XFree86 CVS
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile4
-rw-r--r--x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c17
-rw-r--r--x11-servers/XFree86-4-Server/Makefile4
-rw-r--r--x11-servers/XFree86-4-Server/files/patch-xkbInit.c17
4 files changed, 38 insertions, 4 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 90266d713a1..ab59d92ae2e 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
@@ -32,7 +32,7 @@ DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files
.for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h patch-radeondri \
- patch-r128_driver.c patch-mga_driver.c
+ patch-r128_driver.c patch-mga_driver.c patch-xkbInit.c
EXTRA_PATCHES+= ${FILESDIR}/${pf}
.endfor
SCRIPTS_ENV= OSVERSION=${OSVERSION} \
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c b/x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c
new file mode 100644
index 00000000000..9b65d4c8b94
--- /dev/null
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c
@@ -0,0 +1,17 @@
+Index: programs/Xserver/xkb/xkbInit.c
+===================================================================
+RCS file: /home/ncvs/xfree/xc/programs/Xserver/xkb/xkbInit.c,v
+retrieving revision 3.26
+retrieving revision 3.27
+diff -u -r3.26 -r3.27
+--- programs/Xserver/xkb/xkbInit.c 9 Feb 2003 06:29:20 -0000 3.26
++++ programs/Xserver/xkb/xkbInit.c 17 Mar 2003 23:52:27 -0000 3.27
+@@ -713,7 +713,7 @@
+ if (names->types) names->types = _XkbDupString(names->types);
+ if (names->compat) names->compat = _XkbDupString(names->compat);
+ if (names->geometry) names->geometry = _XkbDupString(names->geometry);
+- if (names->symbols) names->geometry = _XkbDupString(names->symbols);
++ if (names->symbols) names->symbols = _XkbDupString(names->symbols);
+
+ if (defs.model && defs.layout && rules) {
+ XkbComponentNamesRec rNames;
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 90266d713a1..ab59d92ae2e 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
@@ -32,7 +32,7 @@ DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files
.for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h patch-radeondri \
- patch-r128_driver.c patch-mga_driver.c
+ patch-r128_driver.c patch-mga_driver.c patch-xkbInit.c
EXTRA_PATCHES+= ${FILESDIR}/${pf}
.endfor
SCRIPTS_ENV= OSVERSION=${OSVERSION} \
diff --git a/x11-servers/XFree86-4-Server/files/patch-xkbInit.c b/x11-servers/XFree86-4-Server/files/patch-xkbInit.c
new file mode 100644
index 00000000000..9b65d4c8b94
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-xkbInit.c
@@ -0,0 +1,17 @@
+Index: programs/Xserver/xkb/xkbInit.c
+===================================================================
+RCS file: /home/ncvs/xfree/xc/programs/Xserver/xkb/xkbInit.c,v
+retrieving revision 3.26
+retrieving revision 3.27
+diff -u -r3.26 -r3.27
+--- programs/Xserver/xkb/xkbInit.c 9 Feb 2003 06:29:20 -0000 3.26
++++ programs/Xserver/xkb/xkbInit.c 17 Mar 2003 23:52:27 -0000 3.27
+@@ -713,7 +713,7 @@
+ if (names->types) names->types = _XkbDupString(names->types);
+ if (names->compat) names->compat = _XkbDupString(names->compat);
+ if (names->geometry) names->geometry = _XkbDupString(names->geometry);
+- if (names->symbols) names->geometry = _XkbDupString(names->symbols);
++ if (names->symbols) names->symbols = _XkbDupString(names->symbols);
+
+ if (defs.model && defs.layout && rules) {
+ XkbComponentNamesRec rNames;