diff options
| -rw-r--r-- | app-emulation/wine/Manifest | 10 | ||||
| -rw-r--r-- | app-emulation/wine/files/corefonts-optional.ebuild.patch | 11 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-0.9.51-valgrind.patch | 56 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-1.0_rc3-openssl.patch | 81 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-1.1.15-configure-host.patch | 13 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-1.1.15-winegcc.patch | 55 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-1.1.4-install-fix.patch | 22 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-gentoo-no-ssp.patch | 16 | ||||
| -rw-r--r-- | app-emulation/wine/wine-1.1.12.ebuild | 153 |
9 files changed, 0 insertions, 417 deletions
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest deleted file mode 100644 index 1ec3538..0000000 --- a/app-emulation/wine/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX corefonts-optional.ebuild.patch 432 RMD160 fa5122221b4f38ba89f07c113d08b3018747deca SHA1 c7ee78af5a155c9e8e176f957ad25d54c5cc7588 SHA256 5bc559406613c0f0840bc3a8ceceac7717d446782affc34d73cc0baa2651488e -AUX wine-0.9.51-valgrind.patch 1754 RMD160 d3b76fe90f1039a01972df378edeb3dc97394a00 SHA1 987cd2cd1b4af770268f8a438d392394af24bc7c SHA256 5b424d67354462fcaa182f905630fd548c272a2c9aa5dbad581281d91592977c -AUX wine-1.0_rc3-openssl.patch 1884 RMD160 6ef2d1ced064a8a6906d89bf2b20e36c37d70011 SHA1 67e2d6a4a393b4f5dd26c9cdd0db12357c962cf0 SHA256 aba9becc2e1e03a2a0284020f2e3f37396d1aff197ad1b665c50c0a26369802b -AUX wine-1.1.15-configure-host.patch 314 RMD160 1c8d09d5265a23b1931eba949a614eaeff251ac7 SHA1 af887b963cf154e8bcf1e9b8b19731bbdda5f487 SHA256 c281217f6e221a6235485918750907b02aa1e40fa68e45133cc4c14ebb40bfe9 -AUX wine-1.1.15-winegcc.patch 1550 RMD160 086fbdd7dbe5da98c3457f00cb30705150d58b1f SHA1 0aa5a9d0947e15af9fe103797a0c993cbb3eedab SHA256 fcf4a0578774d817b8de094abae85e370683a77805a59efe6c5f7b8b87935de9 -AUX wine-1.1.4-install-fix.patch 959 RMD160 b0b642ae38ac95d12af066e8bf466e2a604bbaac SHA1 693dcccf489a93d97c0a01f355aa1881b8e9e9e7 SHA256 5fc22bfa7f06b3f8e7a28fdd65a5209a7a417dfb77b76c2f5318e09d0c683e89 -AUX wine-gentoo-no-ssp.patch 532 RMD160 fd5de0dd965ec58aa53f0ec1fb74ce7cd498a24e SHA1 6fc776bd96438c65a44a03c8adb3fedb0aaa70bf SHA256 6408ae3ed9bacc895677a5b2302bc27afc549ea99f54a9ab4594afb34c629e9e -EBUILD wine-1.1.12.ebuild 3891 RMD160 3f7e64ceeb97ce9b39d9729150d9b66ac7436c5d SHA1 45f7182a413bbbb779f079e34d8b429511cca704 SHA256 1bdc0781cc3d7740413b0e53c282dc94f0eac732e71b7dc1afe79dc8585a494f -DIST wine-1.1.12.tar.bz2 14794095 RMD160 7591294784ecffb92d67b4734712edcfd87c1f2a SHA1 ab93dc886d38a67fcb01223de746cf35ce7fafd5 SHA256 3c43fd3b4a4bb776710052daec5ef239f90c3f74e254fc62fc665adeeb2dc89d -DIST wine_gecko-0.9.0.cab 7806669 RMD160 6cd55a76dea2fa5b50adf98423d0e38a207fde92 SHA1 5cf410ff7fdd3f9d625f481f9d409968728d3d09 SHA256 8ed1aec2b9255cd1baaaf8933b7bdbc1ea20f1f1513797144ec5c9b9482d3d74 diff --git a/app-emulation/wine/files/corefonts-optional.ebuild.patch b/app-emulation/wine/files/corefonts-optional.ebuild.patch deleted file mode 100644 index 3edcffa..0000000 --- a/app-emulation/wine/files/corefonts-optional.ebuild.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wine-1.1.12.ebuild 2009-04-27 07:05:32.000000000 +0100 -+++ wine-1.1.12.ebuild 2009-06-13 03:03:57.000000000 +0100 -@@ -29,7 +29,7 @@ IUSE="alsa cups dbus esd +gecko gnutls h - RESTRICT="test" #72375 - - RDEPEND=">=media-libs/freetype-2.0.0 -- media-fonts/corefonts -+ || ( media-fonts/liberation-fonts media-fonts/corefonts ) - dev-lang/perl - dev-perl/XML-Simple - ncurses? ( >=sys-libs/ncurses-5.2 ) diff --git a/app-emulation/wine/files/wine-0.9.51-valgrind.patch b/app-emulation/wine/files/wine-0.9.51-valgrind.patch deleted file mode 100644 index acd0bb1..0000000 --- a/app-emulation/wine/files/wine-0.9.51-valgrind.patch +++ /dev/null @@ -1,56 +0,0 @@ -http://bugs.gentoo.org/202542 - -fix from Rafal Muzylo building with newer versions of valgrind - ---- dlls/ntdll/heap.c -+++ dlls/ntdll/heap.c -@@ -142,6 +142,8 @@ - if (TRACE_ON(heap) || WARN_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size ); - #ifdef VALGRIND_MAKE_NOACCESS - VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); -+#elif defined(VALGRIND_MAKE_MEM_NOACCESS) -+ VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size )); - #endif - } - -@@ -150,6 +152,8 @@ - { - #ifdef VALGRIND_MAKE_READABLE - VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size )); -+#elif defined(VALGRIND_MAKE_MEM_DEFINED) -+ VALGRIND_DISCARD( VALGRIND_MAKE_MEM_DEFINED( ptr, size )); - #endif - } - -@@ -158,6 +162,8 @@ - { - #ifdef VALGRIND_MAKE_WRITABLE - VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); -+#elif defined(VALGRIND_MAKE_MEM_UNDEFINED) -+ VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); - #endif - if (TRACE_ON(heap) || WARN_ON(heap)) - { -@@ -165,6 +171,8 @@ - #ifdef VALGRIND_MAKE_WRITABLE - /* make it uninitialized to valgrind again */ - VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); -+#elif defined(VALGRIND_MAKE_MEM_UNDEFINED) -+ VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); - #endif - } - } ---- dlls/ntdll/signal_i386.c -+++ dlls/ntdll/signal_i386.c -@@ -936,8 +936,10 @@ - } - - stack--; /* push the stack_layout structure */ --#ifdef HAVE_VALGRIND_MEMCHECK_H -+#ifdef VALGRIND_MAKE_WRITABLE - VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack)); -+#elif defined(VALGRIND_MAKE_MEM_UNDEFINED) -+ VALGRIND_MAKE_MEM_UNDEFINED(stack, sizeof(*stack)); - #endif - stack->ret_addr = (void *)0xdeadbabe; /* raise_func must not return */ - stack->rec_ptr = &stack->rec; diff --git a/app-emulation/wine/files/wine-1.0_rc3-openssl.patch b/app-emulation/wine/files/wine-1.0_rc3-openssl.patch deleted file mode 100644 index b0ef483..0000000 --- a/app-emulation/wine/files/wine-1.0_rc3-openssl.patch +++ /dev/null @@ -1,81 +0,0 @@ -http://bugs.winehq.org/show_bug.cgi?id=13561 -http://bugs.gentoo.org/224049 - -commit 7c616799894faa48ee3277bc276a39bed55780e0 -Author: Alexandre Julliard <julliard@winehq.org> -Date: Mon Jun 2 12:14:37 2008 +0200 - - wininet: Include openssl/ssl.h before Windows headers. - -diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h -index 2645686..43b8d8e 100644 ---- a/dlls/wininet/internet.h -+++ b/dlls/wininet/internet.h -@@ -38,18 +38,6 @@ - # include <sys/types.h> - # include <netinet/in.h> - #endif --#ifdef HAVE_OPENSSL_SSL_H --#define DSA __ssl_DSA /* avoid conflict with commctrl.h */ --#undef FAR --/* avoid conflict with wincrypt.h */ --#undef PKCS7_SIGNER_INFO --#undef X509_NAME --#undef X509_CERT_PAIR --# include <openssl/ssl.h> --#undef FAR --#define FAR do_not_use_this_in_wine --#undef DSA --#endif - #ifdef HAVE_SYS_SOCKET_H - # include <sys/socket.h> - #endif -@@ -69,12 +57,10 @@ typedef struct - { - BOOL useSSL; - int socketFD; --#ifdef HAVE_OPENSSL_SSL_H -- SSL *ssl_s; -+ void *ssl_s; - char *peek_msg; - char *peek_msg_mem; - size_t peek_len; --#endif - } WININET_NETCONNECTION; - - static inline LPWSTR WININET_strdupW( LPCWSTR str ) -diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c -index 9cd7917..f55fbf2 100644 ---- a/dlls/wininet/netconnection.c -+++ b/dlls/wininet/netconnection.c -@@ -23,6 +23,7 @@ - #include "config.h" - #include "wine/port.h" - -+#include <sys/types.h> - #ifdef HAVE_POLL_H - #include <poll.h> - #endif -@@ -42,6 +43,22 @@ - #ifdef HAVE_SYS_IOCTL_H - # include <sys/ioctl.h> - #endif -+#include <time.h> -+#ifdef HAVE_NETDB_H -+# include <netdb.h> -+#endif -+#ifdef HAVE_NETINET_IN_H -+# include <netinet/in.h> -+#endif -+#ifdef HAVE_OPENSSL_SSL_H -+# include <openssl/ssl.h> -+#undef FAR -+#undef DSA -+#endif -+#ifdef HAVE_SYS_SOCKET_H -+# include <sys/socket.h> -+#endif -+ - #include <stdarg.h> - #include <stdlib.h> - #include <string.h> diff --git a/app-emulation/wine/files/wine-1.1.15-configure-host.patch b/app-emulation/wine/files/wine-1.1.15-configure-host.patch deleted file mode 100644 index 47628f6..0000000 --- a/app-emulation/wine/files/wine-1.1.15-configure-host.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/260726 - ---- wine-1.1.15/configure -+++ wine-1.1.15/configure -@@ -3943,7 +3943,7 @@ - $as_echo "$wine_cv_toolsdir" >&6; } - TOOLSDIR=$wine_cv_toolsdir - --if test -n "$host_alias" -+if test -n "$host_alias" -a "$host_alias" != "$build_alias" - then - TARGETFLAGS="-b $host_alias $TARGETFLAGS" - diff --git a/app-emulation/wine/files/wine-1.1.15-winegcc.patch b/app-emulation/wine/files/wine-1.1.15-winegcc.patch deleted file mode 100644 index 6e5bb22..0000000 --- a/app-emulation/wine/files/wine-1.1.15-winegcc.patch +++ /dev/null @@ -1,55 +0,0 @@ -http://bugs.gentoo.org/260726 - ---- wine-1.1.15/tools/winegcc/winegcc.c -+++ wine-1.1.15/tools/winegcc/winegcc.c -@@ -215,10 +215,13 @@ - strarray* files; - }; - -+#undef FORCE_POINTER_SIZE - #ifdef __i386__ - static const enum target_cpu build_cpu = CPU_x86; -+#define FORCE_POINTER_SIZE - #elif defined(__x86_64__) - static const enum target_cpu build_cpu = CPU_x86_64; -+#define FORCE_POINTER_SIZE - #elif defined(__sparc__) - static const enum target_cpu build_cpu = CPU_SPARC; - #elif defined(__ALPHA__) -@@ -968,6 +971,9 @@ - opts.linker_args = strarray_alloc(); - opts.compiler_args = strarray_alloc(); - opts.winebuild_args = strarray_alloc(); -+#ifdef FORCE_POINTER_SIZE -+ opts.force_pointer_size = sizeof(size_t); -+#endif - - /* determine the processor type */ - if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp; ---- wine-1.1.15/tools/winebuild/main.c -+++ wine-1.1.15/tools/winebuild/main.c -@@ -50,10 +50,13 @@ - int link_ext_symbols = 0; - int force_pointer_size = 0; - -+#undef FORCE_POINTER_SIZE - #ifdef __i386__ - enum target_cpu target_cpu = CPU_x86; -+#define FORCE_POINTER_SIZE - #elif defined(__x86_64__) - enum target_cpu target_cpu = CPU_x86_64; -+#define FORCE_POINTER_SIZE - #elif defined(__sparc__) - enum target_cpu target_cpu = CPU_SPARC; - #elif defined(__ALPHA__) -@@ -574,6 +577,10 @@ - signal( SIGTERM, exit_on_signal ); - signal( SIGINT, exit_on_signal ); - -+#ifdef FORCE_POINTER_SIZE -+ force_pointer_size = sizeof(size_t); -+#endif -+ - output_file = stdout; - argv = parse_options( argc, argv, spec ); - diff --git a/app-emulation/wine/files/wine-1.1.4-install-fix.patch b/app-emulation/wine/files/wine-1.1.4-install-fix.patch deleted file mode 100644 index 7ff5771..0000000 --- a/app-emulation/wine/files/wine-1.1.4-install-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Alexandre Julliard <julliard@winehq.org> -Date: Mon, 8 Sep 2008 10:37:56 +0000 (+0200) -Subject: makefile: Fix dependency for programs install. -X-Git-Url: http://source.winehq.org/git/wine.git/?a=commitdiff_plain;h=78c79ba349deea39 - -makefile: Fix dependency for programs install. ---- - -diff --git a/Makefile.in b/Makefile.in -index 0b2c6c0..1dd8ef1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -96,7 +96,8 @@ include/__install__ include/__install-dev__: include libs tools - libs/__install__ libs/__install-lib__ libs/__install-dev__: libs - loader/__install__ loader/__install-lib__: libs tools - server/__install__ server/__install-lib__: libs tools --programs/__install__ programs/__install-lib__: libs tools include dlls/__install-lib__ -+programs/__install__: libs tools include dlls/__install__ -+programs/__install-lib__: libs tools include dlls/__install-lib__ - tools/__install__ tools/__install-lib__ tools/__install-dev__: tools - - RECURSE_TARGETS = \ diff --git a/app-emulation/wine/files/wine-gentoo-no-ssp.patch b/app-emulation/wine/files/wine-gentoo-no-ssp.patch deleted file mode 100644 index ee33c4b..0000000 --- a/app-emulation/wine/files/wine-gentoo-no-ssp.patch +++ /dev/null @@ -1,16 +0,0 @@ -support older ssp (gcc-3.4.x). this ssp was never in mainline gcc, thus -upstream wine wont accept it. can drop once hardened gets a stable gcc-4.x. - -http://bugs.gentoo.org/66002 - ---- loader/preloader.c -+++ loader/preloader.c -@@ -155,6 +155,8 @@ struct wld_link_map { - - /* similar to the above but for -fstack-protector */ - void *__stack_chk_guard = 0; -+void *__guard = 0; -+void __stack_smash_handler(void) { return; } - void __stack_chk_fail(void) { return; } - - * The _start function is the entry and exit point of this program diff --git a/app-emulation/wine/wine-1.1.12.ebuild b/app-emulation/wine/wine-1.1.12.ebuild deleted file mode 100644 index 2671e52..0000000 --- a/app-emulation/wine/wine-1.1.12.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.12.ebuild,v 1.3 2009/04/27 05:59:22 vapier Exp $ - -EAPI="1" - -inherit eutils flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://source.winehq.org/git/wine.git" - inherit git - SRC_URI="" -else - MY_P="${PN}-${PV/_/-}" - SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - S=${WORKDIR}/${MY_P} -fi - -GV="0.9.0" -DESCRIPTION="free implementation of Windows(tm) on Unix" -HOMEPAGE="http://www.winehq.org/" -SRC_URI="${SRC_URI} - gecko? ( mirror://sourceforge/wine/wine_gecko-${GV}.cab )" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="-* amd64 x86 ~x86-fbsd" -IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X" -RESTRICT="test" #72375 - -RDEPEND=">=media-libs/freetype-2.0.0 - || ( media-fonts/liberation-fonts media-fonts/corefonts ) - dev-lang/perl - dev-perl/XML-Simple - ncurses? ( >=sys-libs/ncurses-5.2 ) - jack? ( media-sound/jack-audio-connection-kit ) - dbus? ( sys-apps/dbus ) - gnutls? ( net-libs/gnutls ) - hal? ( sys-apps/hal ) - X? ( - x11-libs/libXcursor - x11-libs/libXrandr - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXxf86vm - x11-apps/xmessage - ) - alsa? ( media-libs/alsa-lib ) - esd? ( media-sound/esound ) - nas? ( media-libs/nas ) - cups? ( net-print/cups ) - opengl? ( virtual/opengl ) - jpeg? ( media-libs/jpeg ) - ldap? ( net-nds/openldap ) - lcms? ( media-libs/lcms ) - samba? ( >=net-fs/samba-3.0.25 ) - xml? ( dev-libs/libxml2 dev-libs/libxslt ) - scanner? ( media-gfx/sane-backends ) - amd64? ( - X? ( - >=app-emulation/emul-linux-x86-xlibs-2.1 - >=app-emulation/emul-linux-x86-soundlibs-2.1 - ) - >=sys-kernel/linux-headers-2.6 - )" -DEPEND="${RDEPEND} - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) - sys-devel/bison - sys-devel/flex" - -pkg_setup() { - use alsa || return 0 - if ! built_with_use --missing true media-libs/alsa-lib midi ; then - eerror "You must build media-libs/alsa-lib with USE=midi" - die "please re-emerge media-libs/alsa-lib with USE=midi" - fi -} - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git_src_unpack - else - unpack ${MY_P}.tar.bz2 - fi - cd "${S}" - - sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die - epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002 - sed -i '/^MimeType/d' tools/wine.desktop || die #117785 -} - -config_cache() { - local h ans="no" - use $1 && ans="yes" - shift - for h in "$@" ; do - [[ ${h} == *.h ]] \ - && h=header_${h} \ - || h=lib_${h} - export ac_cv_${h//[:\/.]/_}=${ans} - done -} - -src_compile() { - export LDCONFIG=/bin/true - use esd || export ac_cv_path_ESDCONFIG="" - use scanner || export ac_cv_path_sane_devel="no" - config_cache jack jack/jack.h - config_cache cups cups/cups.h - config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open - config_cache nas audio/audiolib.h audio/soundlib.h - config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h - config_cache ldap ldap.h lber.h - config_cache dbus dbus/dbus.h - config_cache hal hal/libhal.h - config_cache jpeg jpeglib.h - config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h - config_cache lcms lcms.h - - strip-flags - - use amd64 && multilib_toolchain_setup x86 - - # $(use_enable amd64 win64) - econf \ - --sysconfdir=/etc/wine \ - $(use_with gnutls) \ - $(use_with ncurses curses) \ - $(use_with opengl) \ - $(use_with X x) \ - || die "configure failed" - - emake -j1 depend || die "depend" - emake all || die "all" -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ANNOUNCE AUTHORS README - if use gecko ; then - insinto /usr/share/wine/gecko - doins "${DISTDIR}"/wine_gecko-${GV}.cab || die - fi -} - -pkg_postinst() { - elog "~/.wine/config is now deprecated. For configuration either use" - elog "winecfg or regedit HKCU\\Software\\Wine" -} |