Bug 40189

Summary: XFree86 4.2 doesn't support bg_BG.CP1251 properly
Product: Ports & Packages Reporter: Stanislav Grozev <tacho>
Component: Individual Port(s)Assignee: Eric Anholt <anholt>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   

Description Stanislav Grozev 2002-07-04 16:40:01 UTC
the XFree86-4-libraries (xfree 4.2) is missing a Compose file for the
microsoft-cp1251 (dunno why XFree people choose that alias), thus
breaking some programs when locale bg_BG.CP1251 is set (most notably
Gtk+ apps, like gvim, or some gnome app)
This affects both -current and -stable users.

Fix: apply this diff and rebuild the port.
i will also request the maintainer to submit this to the XFree people
for inclusion in the next release

--- begin diff ---



--- end diff -----NBO2sbc5m8H0Aj2eKyuWWu9CA3ylV5AZ85WUrexusgIDN8Gj
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

diff -urN ../XFree86-4-libraries.orig/Makefile ./Makefile
--- ../XFree86-4-libraries.orig/Makefile	Wed Mar 20 01:33:47 2002
+++ ./Makefile	Thu Jul  4 17:05:43 2002
@@ -7,7 +7,7 @@
 
 PORTNAME=	libraries
 PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE} \
 		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
@@ -90,6 +90,7 @@
 .endif
 
 post-patch:
+	${CP} ${MASTERDIR}/files/nls::Compose::microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251
 	cd ${WRKSRC}/nls; \
 	for i in Compose XI18N_OBJS XLC_LOCALE; do \
 		${LN} -s zh_TW.big5 $$i/zh_TW.Big5; \
diff -urN ../XFree86-4-libraries.orig/files/nls::Compose::microsoft-cp1251 ./files/nls::Compose::microsoft-cp1251
--- ../XFree86-4-libraries.orig/files/nls::Compose::microsoft-cp1251	Thu Jan  1 01:00:00 1970
+++ ./files/nls::Compose::microsoft-cp1251	Thu Jul  4 17:05:43 2002
@@ -0,0 +1,15 @@
+XCOMM
+XCOMM microsoft-cp1251 Compose Sequence
+XCOMM
+XCOMM Sequence Definition
+XCOMM
+XCOMM $XFree86$
+XCOMM
+XCOMM This file currently has no entries.  It appears that a compose file (even
+XCOMM just an empty one) is required for the appropriate keysyms to work for
+XCOMM this encoding.
+XCOMM
+XCOMM <Multi_key> Means <Compose>
+XCOMM Special Character
+
+XCOMM End of Sequence Definition
diff -urN ../XFree86-4-libraries.orig/files/patch-nls::Compose::Imakefile ./files/patch-nls::Compose::Imakefile
--- ../XFree86-4-libraries.orig/files/patch-nls::Compose::Imakefile	Thu Jan  1 01:00:00 1970
+++ ./files/patch-nls::Compose::Imakefile	Thu Jul  4 17:05:43 2002
@@ -0,0 +1,10 @@
+--- nls/Compose/Imakefile.orig	Sat Nov  3 00:29:28 2001
++++ nls/Compose/Imakefile	Thu Jul  4 16:38:00 2002
+@@ -64,6 +64,7 @@
+ ComposeTarget(koi8-r)
+ ComposeTarget(koi8-u)
+ ComposeTarget(koi8-c)
++ComposeTarget(microsoft-cp1251)
+ ComposeTarget(mulelao-1)
+ ComposeTarget(vi_VN.tcvn)
+ ComposeTarget(vi_VN.viscii)
diff -urN ../XFree86-4-libraries.orig/pkg-plist ./pkg-plist
--- ../XFree86-4-libraries.orig/pkg-plist	Sun Mar 17 00:40:17 2002
+++ ./pkg-plist	Thu Jul  4 17:05:43 2002
@@ -487,6 +487,7 @@
 lib/X11/locale/koi8-u/XLC_LOCALE
 lib/X11/locale/locale.alias
 lib/X11/locale/locale.dir
+lib/X11/locale/microsoft-cp1251/Compose
 lib/X11/locale/microsoft-cp1251/XI18N_OBJS
 lib/X11/locale/microsoft-cp1251/XLC_LOCALE
 lib/X11/locale/microsoft-cp1255/XI18N_OBJS
How-To-Repeat: % setenv LANG bg_BG.CP1251
% setenv LC_ALL bg_BG.CP1251
% gvim
Segmentation Fault (core dumped)
Comment 1 Patrick Li freebsd_committer freebsd_triage 2002-07-26 00:06:34 UTC
Responsible Changed
From-To: freebsd-ports->anholt

Over to maintainer
Comment 2 Eric Anholt freebsd_committer freebsd_triage 2002-11-25 00:11:32 UTC
State Changed
From-To: open->closed

Committed, thanks!