diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-02-12 19:54:01 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-02-12 19:54:01 +0000 |
commit | 81e0288fa6d489163a56e22e0731b22680682cc1 (patch) | |
tree | ff7dbff00a7f66435ca546f2e435a2dc598c3d4d /app-emulation | |
parent | Version bump #81688 by Rich. (diff) | |
download | gentoo-2-81e0288fa6d489163a56e22e0731b22680682cc1.tar.gz gentoo-2-81e0288fa6d489163a56e22e0731b22680682cc1.tar.bz2 gentoo-2-81e0288fa6d489163a56e22e0731b22680682cc1.zip |
old
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/wine/files/20041019-load-wrappers.patch | 42 | ||||
-rw-r--r-- | app-emulation/wine/files/QueryActCtxw_Photoshop7.0.diff | 14 | ||||
-rw-r--r-- | app-emulation/wine/files/digest-wine-20040716 | 3 | ||||
-rw-r--r-- | app-emulation/wine/files/digest-wine-20041201 | 1 | ||||
-rw-r--r-- | app-emulation/wine/wine-20040716.ebuild | 127 | ||||
-rw-r--r-- | app-emulation/wine/wine-20041201.ebuild | 107 |
6 files changed, 0 insertions, 294 deletions
diff --git a/app-emulation/wine/files/20041019-load-wrappers.patch b/app-emulation/wine/files/20041019-load-wrappers.patch deleted file mode 100644 index 221dac7f1c0a..000000000000 --- a/app-emulation/wine/files/20041019-load-wrappers.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- wine-20041019/loader/preloader.c.orig 2004-09-23 20:25:32.000000000 -0400 -+++ wine-20041019/loader/preloader.c 2004-10-27 11:06:46.914656000 -0400 -@@ -69,6 +69,7 @@ - #include <string.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <sys/param.h> - #include <fcntl.h> - #ifdef HAVE_SYS_MMAN_H - # include <sys/mman.h> -@@ -495,6 +496,7 @@ - unsigned char buf[0x800]; - ElfW(Ehdr) *header = (ElfW(Ehdr)*)buf; - ElfW(Phdr) *phdr, *ph; -+ char altname[MAXPATHLEN]; - /* Scan the program header table, collecting its load commands. */ - struct loadcmd - { -@@ -503,9 +505,21 @@ - int prot; - } loadcmds[16], *c; - size_t nloadcmds = 0, maplength; -+ int i; - -- fd = wld_open( name, O_RDONLY ); -- if (fd == -1) fatal_error("%s: could not open\n", name ); -+ for (i=0; (i<MAXPATHLEN-5) && (name[i]!='\0'); ++i) -+ altname[i] = name[i]; -+ altname[i++] = '-'; -+ altname[i++] = 'b'; -+ altname[i++] = 'i'; -+ altname[i++] = 'n'; -+ altname[i++] = '\0'; -+ fd = wld_open( altname, O_RDONLY ); -+ if (fd == -1) { -+ fd = wld_open( name, O_RDONLY ); -+ if (fd == -1) -+ fatal_error("%s: could not open\n", name ); -+ } - - if (wld_read( fd, buf, sizeof(buf) ) != sizeof(buf)) - fatal_error("%s: failed to read ELF header\n", name); diff --git a/app-emulation/wine/files/QueryActCtxw_Photoshop7.0.diff b/app-emulation/wine/files/QueryActCtxw_Photoshop7.0.diff deleted file mode 100644 index f9daa7a4212c..000000000000 --- a/app-emulation/wine/files/QueryActCtxw_Photoshop7.0.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur wine-cvs-20040602/dlls/kernel/kernel32.spec wine/dlls/kernel/kernel32.spec ---- wine-cvs-20040602/dlls/kernel/kernel32.spec 2004-06-01 12:35:52.000000000 +0200 -+++ wine/dlls/kernel/kernel32.spec 2004-06-02 12:29:53.000000000 +0200 -@@ -1090,7 +1090,9 @@ - @ stdcall FindActCtxSectionStringA(long ptr long str ptr) - @ stdcall FindActCtxSectionStringW(long ptr long wstr ptr) - @ stdcall GetCurrentActCtx(ptr) --@ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) -+# 20040602, Gismo / Luca Capello <luca@pca.it> -+# Stops Adobe Photoshop 7.0 working, bug #2017 -+#@ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) - @ stdcall ReleaseActCtx(ptr) - @ stdcall ZombifyActCtx(ptr) - diff --git a/app-emulation/wine/files/digest-wine-20040716 b/app-emulation/wine/files/digest-wine-20040716 deleted file mode 100644 index 4da39f42d5f9..000000000000 --- a/app-emulation/wine/files/digest-wine-20040716 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d7e1b17ab3255920e7b34a7512cbefa5 Wine-20040716.tar.gz 10708814 -MD5 af8da46a0e51578ff1e18e399141d628 wine-20040716-fake_windows.tar.bz2 500 -MD5 e85afd5661bfc1b6dffc05db480b52a8 wine-20040716-misc.tar.bz2 5300 diff --git a/app-emulation/wine/files/digest-wine-20041201 b/app-emulation/wine/files/digest-wine-20041201 deleted file mode 100644 index 818f850b8e86..000000000000 --- a/app-emulation/wine/files/digest-wine-20041201 +++ /dev/null @@ -1 +0,0 @@ -MD5 f47c26c012a78a37f22ad56122402f11 Wine-20041201.tar.gz 11264647 diff --git a/app-emulation/wine/wine-20040716.ebuild b/app-emulation/wine/wine-20040716.ebuild deleted file mode 100644 index f253ee2fe23e..000000000000 --- a/app-emulation/wine/wine-20040716.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040716.ebuild,v 1.4 2005/01/01 14:19:55 eradicator Exp $ - -inherit eutils base - -DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot" -HOMEPAGE="http://www.winehq.com/" -SRC_URI="mirror://sourceforge/${PN}/Wine-${PV}.tar.gz - mirror://gentoo/${P}-fake_windows.tar.bz2 - mirror://gentoo/${P}-misc.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="-* x86" -IUSE="X alsa arts cups debug nas nptl opengl tcltk" - -DEPEND="sys-devel/gcc - sys-devel/flex - >=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 ) - >=sys-apps/sed-4" - -src_unpack() { - unpack Wine-${PV}.tar.gz - cd ${S} - epatch ${FILESDIR}/winearts-kdecvs-fix.patch - epatch ${FILESDIR}/QueryActCtxw_Photoshop7.0.diff -} - -src_compile() { - # there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected - - unset CFLAGS CXXFLAGS LDFLAGS - - ac_cv_header_jack_jack_h=no \ - ac_cv_lib_soname_jack= \ - ./configure \ - --prefix=/usr/lib/wine \ - --sysconfdir=/etc/wine \ - --host=${CHOST} \ - --enable-curses \ - `use_enable opengl` \ - `use_with nptl` \ - `use_enable debug trace` \ - `use_enable debug` \ - || die "configure failed" - - cd ${S}/programs/winetest - sed -i 's:wine.pm:include/wine.pm:' 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} - 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 ${DISTDIR}/${P}-fake_windows.tar.bz2 || die - chown root:root fake_windows/ -R - - # Unpacking the miscellaneous files - tar jxvf ${DISTDIR}/${P}-misc.tar.bz2 ||die - chown root:root config - - # moving the wrappers to bin/ - insinto /usr/bin - dobin regedit-wine wine winedbg wine-pthread - rm regedit-wine wine winedbg wine-pthread - - # copying the wine.inf into .data (used to be winedefault.reg) - cd ${S} - dodir /usr/lib/wine/.data - insinto /usr/lib/wine/.data - doins tools/wine.inf - insinto /usr/lib/wine/.data/fake_windows/Windows/System - doins tools/wine.inf - insinto /usr/lib/wine/.data/fake_windows/Windows/Inf - doins tools/wine.inf - - ### 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 "if you have problems with nptl, use wine-pthread to start wine" - einfo "" - einfo "Use /usr/bin/regedit-wine to import registry files into the" - einfo "wine registry." -} diff --git a/app-emulation/wine/wine-20041201.ebuild b/app-emulation/wine/wine-20041201.ebuild deleted file mode 100644 index e1b7603fffd7..000000000000 --- a/app-emulation/wine/wine-20041201.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20041201.ebuild,v 1.3 2005/01/01 14:19:55 eradicator Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot" -HOMEPAGE="http://www.winehq.com/" -SRC_URI="mirror://sourceforge/${PN}/Wine-${PV}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="-* ~x86" -IUSE="X alsa arts cups debug nas opengl gif glut jack jpeg oss ncurses doc lcms" -RESTRICT="maketest" #72375 - -RDEPEND=">=media-libs/freetype-2.0.0 - ncurses? ( >=sys-libs/ncurses-5.2 ) - jack? ( media-sound/jack-audio-connection-kit ) - X? ( virtual/x11 ) - arts? ( kde-base/arts ) - alsa? ( media-libs/alsa-lib ) - nas? ( media-libs/nas ) - cups? ( net-print/cups ) - opengl? ( virtual/opengl ) - gif? ( media-libs/libungif ) - jpeg? ( media-libs/jpeg ) - glut? ( virtual/glut ) - lcms? ( media-libs/lcms )" -DEPEND="${RDEPEND} - >=sys-apps/sed-4 - sys-devel/bison - sys-devel/gcc - doc? ( app-text/docbook-sgml-utils app-text/jadetex ) - sys-devel/flex" - -src_unpack() { - unpack Wine-${PV}.tar.gz - - cd ${S} - epatch ${FILESDIR}/winearts-kdecvs-fix.patch - sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in - - test_flag -fstack-protector && epatch ${FILESDIR}/20041019-no-stack.patch #66002 -} - -config_cache() { - local h ans="no" - use ${1} && ans="yes" - shift - for h in "$@" ; do - export ac_cv_${h}=${ans} - done -} - -src_compile() { - export LDCONFIG=/bin/true - config_cache jack header_jack_jack_h - config_cache cups header_cups_cups_h - config_cache alsa header_alsa_asoundlib_h header_sys_asoundlib_h lib_asound_snd_pcm_open - use arts || export ARTSCCONFIG="/bin/false" - config_cache nas header_audio_audiolib_h header_audio_soundlib_h - config_cache gif header_gif_lib_h - config_cache glut lib_glut_glutMainLoop - config_cache jpeg header_jpeglib_h - config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h - config_cache lcms header_lcms_h - - strip-flags - use lcms && append-flags -I${ROOT}/usr/include/lcms - - # $(use_enable amd64 win64) - # USE=debug is broken in this release - # $(use_enable debug trace) - # $(use_enable debug) - econf \ - --sysconfdir=/etc/wine \ - $(use_with ncurses curses) \ - $(use_with opengl) \ - $(use_with X x) \ - || die "configure failed" - - emake -j1 depend || die "depend" - emake all || die "all" - if use doc ; then - emake -j1 -C documentation doc || die "docs" - fi -} - -src_install() { - make \ - prefix=${D}/usr \ - bindir=${D}/usr/bin \ - datadir=${D}/usr/share \ - includedir=${D}/usr/include/wine \ - sysconfdir=${D}/etc/wine \ - mandir=${D}/usr/share/man \ - libdir=${D}/usr/lib \ - dlldir=${D}/usr/lib/wine \ - install || die - use doc && dodoc documentation/*.pdf - - insinto /usr/share/wine - doins documentation/samples/config || die "doins config" - - dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS README -} |