diff options
| author |   Tilman Klar <phoenix@gentoo.org> | 2003-04-06 16:42:53 +0000 |
|---|---|---|
| committer | Tilman Klar <phoenix@gentoo.org> | 2003-04-06 16:42:53 +0000 |
| commit | 810ebfaf2e9a00b7358dbba7769883656027fd75 (patch) | |
| tree | 927afd74e5a1ef818b02cc0aa97149f6b66ae497 /app-emulation/wine | |
| parent | fix digest (diff) | |
| download | gentoo-2-810ebfaf2e9a00b7358dbba7769883656027fd75.tar.gz gentoo-2-810ebfaf2e9a00b7358dbba7769883656027fd75.tar.bz2 gentoo-2-810ebfaf2e9a00b7358dbba7769883656027fd75.zip | |
Incorporated xopenfont patch.
Diffstat (limited to 'app-emulation/wine')
| -rw-r--r-- | app-emulation/wine/files/wine-20030318-xopenfont.patch | 45 | ||||
| -rw-r--r-- | app-emulation/wine/wine-20030318.ebuild | 10 |
2 files changed, 54 insertions, 1 deletions
diff --git a/app-emulation/wine/files/wine-20030318-xopenfont.patch b/app-emulation/wine/files/wine-20030318-xopenfont.patch new file mode 100644 index 000000000000..7f83e11ba4e9 --- /dev/null +++ b/app-emulation/wine/files/wine-20030318-xopenfont.patch @@ -0,0 +1,45 @@ +--- graphics/x11drv/xfont.c.orig 2003-04-06 18:27:44.000000000 +0200 ++++ graphics/x11drv/xfont.c 2003-04-06 18:27:58.000000000 +0200 +@@ -2115,7 +2115,7 @@ + } + else lpstr = x_pattern[i]; + +- if( (x_fs = TSXLoadQueryFont(gdi_display, lpstr)) ) ++ if( (x_fs = XFONT_GetFont(lpstr)) ) + { + XFONT_SetFontMetric( fi, fr, x_fs ); + TSXFreeFont( gdi_display, x_fs ); +@@ -3239,6 +3239,33 @@ + return NULL; + } + ++static int staticXError; ++ ++static int fonterror_handler(Display *display, ++ XErrorEvent *error_evt) ++{ ++ ERR("X error %d\n", error_evt->error_code); ++ return 0; ++} ++ ++static XFontStruct * XFONT_GetFont(char *lpstr) ++{ ++ XFontStruct* x_fs; ++ void *ptr; ++ ++ wine_tsx11_lock(); ++ staticXError = FALSE; ++ ptr = XSetErrorHandler(fonterror_handler); ++ x_fs = XLoadQueryFont(gdi_display, lpstr); ++ XSync(gdi_display, False); ++ XSetErrorHandler(ptr); ++ wine_tsx11_unlock(); ++ if (staticXError) ++ return NULL; ++ else ++ return x_fs; ++} ++ + + + /* X11DRV Interface **************************************************** diff --git a/app-emulation/wine/wine-20030318.ebuild b/app-emulation/wine/wine-20030318.ebuild index 00c646ae7539..03b9e8fb5344 100644 --- a/app-emulation/wine/wine-20030318.ebuild +++ b/app-emulation/wine/wine-20030318.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20030318.ebuild,v 1.1 2003/04/06 16:01:13 phoenix Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20030318.ebuild,v 1.2 2003/04/06 16:42:53 phoenix Exp $ + +inherit eutils base DESCRIPTION="free implementation of Windows(tm) on Unix" SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz" @@ -25,6 +27,12 @@ DEPEND="sys-devel/gcc cups? ( net-print/cups ) opengl? ( virtual/opengl )" +src_unpack() { + base_src_unpack + cd ${S} + epatch ${FILESDIR}/${P}-xopenfont.patch +} + src_compile() { cd ${S} local myconf |