diff options
author | Stanislav Brabec <utx@gentoo.org> | 2003-06-11 21:16:55 +0000 |
---|---|---|
committer | Stanislav Brabec <utx@gentoo.org> | 2003-06-11 21:16:55 +0000 |
commit | 30dafac52e33227b19a86e8b2e034a22ca81bfe3 (patch) | |
tree | 3d7aaa7c7d18721092e722c8ad1e97b7a2d469b6 /app-emulation/wine | |
parent | added aqmoney ebuild (diff) | |
download | gentoo-2-30dafac52e33227b19a86e8b2e034a22ca81bfe3.tar.gz gentoo-2-30dafac52e33227b19a86e8b2e034a22ca81bfe3.tar.bz2 gentoo-2-30dafac52e33227b19a86e8b2e034a22ca81bfe3.zip |
wine-20030411-r1 included back
Diffstat (limited to 'app-emulation/wine')
-rw-r--r-- | app-emulation/wine/files/wine-20030411-fake_windows.tar.bz2 | bin | 0 -> 500 bytes | |||
-rw-r--r-- | app-emulation/wine/files/wine-20030411-misc.tar.bz2 | bin | 0 -> 4591 bytes | |||
-rw-r--r-- | app-emulation/wine/files/wine-20030411-xopenfont.patch | 45 | ||||
-rw-r--r-- | app-emulation/wine/wine-20030411-r1.ebuild | 124 |
4 files changed, 169 insertions, 0 deletions
diff --git a/app-emulation/wine/files/wine-20030411-fake_windows.tar.bz2 b/app-emulation/wine/files/wine-20030411-fake_windows.tar.bz2 Binary files differnew file mode 100644 index 000000000000..d60f11e08ee3 --- /dev/null +++ b/app-emulation/wine/files/wine-20030411-fake_windows.tar.bz2 diff --git a/app-emulation/wine/files/wine-20030411-misc.tar.bz2 b/app-emulation/wine/files/wine-20030411-misc.tar.bz2 Binary files differnew file mode 100644 index 000000000000..90b963f8896c --- /dev/null +++ b/app-emulation/wine/files/wine-20030411-misc.tar.bz2 diff --git a/app-emulation/wine/files/wine-20030411-xopenfont.patch b/app-emulation/wine/files/wine-20030411-xopenfont.patch new file mode 100644 index 000000000000..7f83e11ba4e9 --- /dev/null +++ b/app-emulation/wine/files/wine-20030411-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-20030411-r1.ebuild b/app-emulation/wine/wine-20030411-r1.ebuild new file mode 100644 index 000000000000..1cc0c657406d --- /dev/null +++ b/app-emulation/wine/wine-20030411-r1.ebuild @@ -0,0 +1,124 @@ +# 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-20030411-r1.ebuild,v 1.3 2003/06/11 21:16:55 utx Exp $ + +inherit eutils base + +DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot" +SRC_URI="mirror://gentoo/wine-${PV}.tar.bz2" +HOMEPAGE="http://www.winehq.com/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="x86 -ppc -sparc" +IUSE="nas arts cups opengl alsa tcltk nptl" + +DEPEND="sys-devel/gcc + sys-devel/flex + dev-util/yacc + >=sys-libs/ncurses-5.2 + >=media-libs/freetype-2.0.0 + X? ( virtual/x11 ) + tcltk? ( dev-lang/tcl dev-lang/tk ) + arts? ( kde-base/arts ) + alsa? ( media-libs/alsa-lib ) + nas? ( media-libs/nas ) + 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 + + use opengl && myconf="$myconf --enable-opengl" || myconf="$myconf --disable-opengl" + use nptl && myconf="$myconf --with-nptl" || myconf="$myconf --without-nptl" + + [ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug" + # there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected + + ./configure --prefix=/usr/lib/wine \ + --sysconfdir=/etc/wine \ + --host=${CHOST} \ + --enable-curses \ + ${myconf} || die + + cd ${S}/programs/winetest + cp Makefile 1 + sed -e 's:wine.pm:include/wine.pm:' 1 > Makefile + + # No parallel make + cd ${S} + make depend all || die + cd programs && emake || die +} + +src_install () { + local WINEMAKEOPTS="prefix=${D}/usr/lib/wine" + + ### Install wine to ${D} + cd ${S} + make ${WINEMAKEOPTS} install || die + cd ${S}/programs + make ${WINEMAKEOPTS} install || die + + # Needed for later installation + dodir /usr/bin + + ### Creation of /usr/lib/wine/.data + # Setting up fake_windows + dodir /usr/lib/wine/.data + cd ${D}/usr/lib/wine/.data + tar jxvf ${FILESDIR}/${P}-fake_windows.tar.bz2 + chown root:root fake_windows/ -R + + # Unpacking the miscellaneous files + tar jxvf ${FILESDIR}/${P}-misc.tar.bz2 + chown root:root config + + # moving the wrappers to bin/ + insinto /usr/bin + dobin regedit-wine wine + rm regedit-wine wine + + # copying the winedefault.reg into .data + insinto /usr/lib/wine/.data + doins ${WORKDIR}/${P}/winedefault.reg + + # Set up this dynamic data + cd ${S} + insinto /usr/lib/wine/.data/fake_windows/Windows + doins documentation/samples/system.ini + doins documentation/samples/generic.ppd + ## Setup of .data complete + + ### Misc tasks + # Take care of the documentation + cd ${S} + dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE README + + # Manpage setup + cp ${D}/usr/lib/${PN}/man/man1/wine.1 ${D}/usr/lib/${PN}/man/man1/${PN}.1 + doman ${D}/usr/lib/${PN}/man/man1/${PN}.1 + rm ${D}/usr/lib/${PN}/man/man1/${PN}.1 + doman ${D}/usr/lib/${PN}/man/man5/wine.conf.5 + rm ${D}/usr/lib/${PN}/man/man5/wine.conf.5 + + # Remove the executable flag from those libraries. + cd ${D}/usr/lib/wine/lib/wine + chmod a-x *.so +} + +pkg_postinst() { + einfo "Use /usr/bin/wine to start wine. This is a wrapper-script" + einfo "which will take care of everything else." + einfo "" + einfo "Use /usr/bin/regedit-wine to import registry files into the" + einfo "wine registry." + einfo "" +} |