diff options
author | Martin Holzer <mholzer@gentoo.org> | 2003-06-08 14:16:16 +0000 |
---|---|---|
committer | Martin Holzer <mholzer@gentoo.org> | 2003-06-08 14:16:16 +0000 |
commit | 878ab3a811740f096d6ce73a636d9ccf47fa7206 (patch) | |
tree | e57f450117bd08d55f0298f6d32c4bdc4fae56fd /app-emulation/wine | |
parent | CPAN version bump (diff) | |
download | gentoo-2-878ab3a811740f096d6ce73a636d9ccf47fa7206.tar.gz gentoo-2-878ab3a811740f096d6ce73a636d9ccf47fa7206.tar.bz2 gentoo-2-878ab3a811740f096d6ce73a636d9ccf47fa7206.zip |
cleanup
Diffstat (limited to 'app-emulation/wine')
-rw-r--r-- | app-emulation/wine/Manifest | 7 | ||||
-rw-r--r-- | app-emulation/wine/files/digest-wine-20030411-r1 | 1 | ||||
-rw-r--r-- | app-emulation/wine/files/wine-20030411-fake_windows.tar.bz2 | bin | 500 -> 0 bytes | |||
-rw-r--r-- | app-emulation/wine/files/wine-20030411-misc.tar.bz2 | bin | 4591 -> 0 bytes | |||
-rw-r--r-- | app-emulation/wine/files/wine-20030411-xopenfont.patch | 45 | ||||
-rw-r--r-- | app-emulation/wine/wine-20030411-r1.ebuild | 124 |
6 files changed, 1 insertions, 176 deletions
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index 1a19f5b8f4b0..275a9061a31a 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -1,8 +1,3 @@ -MD5 4791107496b6b4e5ebfbf65031c51f0c wine-20030411-r1.ebuild 3317 -MD5 ed757cad198481d86401836750a5e7a9 wine-20030508.ebuild 3479 MD5 ed840c24a6b50955615eaec73d523daf ChangeLog 8546 -MD5 dcd68f96e0066c424ec1ceb8411c7549 files/digest-wine-20030411-r1 67 -MD5 af8da46a0e51578ff1e18e399141d628 files/wine-20030411-fake_windows.tar.bz2 500 +MD5 ed757cad198481d86401836750a5e7a9 wine-20030508.ebuild 3479 MD5 b0780073e1d513fb7658070bba8d0672 files/digest-wine-20030508 284 -MD5 bb9d5f77ffee8e72cf714aebc874157a files/wine-20030411-xopenfont.patch 1069 -MD5 8052677213b772973d85623012d68e86 files/wine-20030411-misc.tar.bz2 4591 diff --git a/app-emulation/wine/files/digest-wine-20030411-r1 b/app-emulation/wine/files/digest-wine-20030411-r1 deleted file mode 100644 index 389e4f13e451..000000000000 --- a/app-emulation/wine/files/digest-wine-20030411-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 629d3917b551dedbe7a3b9f64a8513e5 wine-20030411.tar.bz2 6853248 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 differdeleted file mode 100644 index d60f11e08ee3..000000000000 --- a/app-emulation/wine/files/wine-20030411-fake_windows.tar.bz2 +++ /dev/null diff --git a/app-emulation/wine/files/wine-20030411-misc.tar.bz2 b/app-emulation/wine/files/wine-20030411-misc.tar.bz2 Binary files differdeleted file mode 100644 index 90b963f8896c..000000000000 --- a/app-emulation/wine/files/wine-20030411-misc.tar.bz2 +++ /dev/null diff --git a/app-emulation/wine/files/wine-20030411-xopenfont.patch b/app-emulation/wine/files/wine-20030411-xopenfont.patch deleted file mode 100644 index 7f83e11ba4e9..000000000000 --- a/app-emulation/wine/files/wine-20030411-xopenfont.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- 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 deleted file mode 100644 index 34b07ac13472..000000000000 --- a/app-emulation/wine/wine-20030411-r1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# 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.1 2003/04/16 14:18:14 mholzer 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 "" -} |