[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/
commit: c467bbb5c5fd80a669c3d52e649f98030b57bddf Author: Mikle Kolyada gentoo org> AuthorDate: Sat Jan 6 10:45:00 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Jan 6 10:45:00 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c467bbb5 app-emulation/wine: remove last rited package app-emulation/wine/Manifest| 14 - app-emulation/wine/files/builtin_ms_va_list.c | 9 - app-emulation/wine/files/pr66838.c | 36 -- app-emulation/wine/files/pr69140.c | 37 -- app-emulation/wine/files/wine-1.5.26-winegcc.patch | 59 --- app-emulation/wine/files/wine-1.6-memset-O3.patch | 21 - .../wine/files/wine-1.7.12-osmesa-check.patch | 38 -- .../wine/files/wine-1.9.5-multilib-portage.patch | 31 -- app-emulation/wine/metadata.xml| 49 -- app-emulation/wine/wine-2.0.ebuild | 453 app-emulation/wine/wine-2.1.ebuild | 582 - app-emulation/wine/wine-2.2.ebuild | 582 - app-emulation/wine/wine-2.3.ebuild | 582 - app-emulation/wine/wine-.ebuild| 581 14 files changed, 3074 deletions(-) diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest deleted file mode 100644 index b5d9c36e93a..000 --- a/app-emulation/wine/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186 -DIST wine-2.1.tar.xz 18887032 BLAKE2B 12d1298899064a46183c84ed13880275321670aa590c1aeb60fbba95baff736ad81342dfe3b31bf94fb7a6493262cb1b9ab20709025e19dad19cb438bff6c5a8 SHA512 03d678ee6e89c2804813f2827255fcf59e96ca9a45b7d8ac441cfc84f835e5e5689c70a79a41a04c631e1add7807fa4a5758acef3bd7aadfb2e92e68958c6ef6 -DIST wine-2.2.tar.xz 18916364 BLAKE2B 69cc104edffa8f017dba1756a15865956983941fb91973eed233f871010c051ac281902f215b88c7ee2969ffea894f68e466ac9ec608f543452c6e965e4acc7d SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 -DIST wine-2.3.tar.xz 18931732 BLAKE2B c4207e755b30e78caa1a870f9867922515e2338a0e8adccbf8250106dcad4b5e7e04e7621f5a02adc3cf51a8fc38050cc0534d353e4a2e11f78812974c8102b3 SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 -DIST wine-d3d9-2.1.tar.gz 48385 BLAKE2B f9541edca520251500b63793468f802395e605baa19051355dbeaa90e0837f2c764cfacf6c651fe3e291d07bed825b72e75b8c47785d9d3eaa5312f28bd82048 SHA512 9234d8227412d940a6befcf79433f1d5ab0634d5e829f3771ffeea235af05be29ffc40438818b1976c77d1e2e79da8a67c4dab2b7d2e822b502fb6e4a1a7f8b7 -DIST wine-d3d9-2.2.tar.gz 48387 BLAKE2B 64e62ff5add2ec7d119697d7909b6d9b7be979b3d9c2d86102b103eb43ff6f22b0488ef847b6c6553ec41c396cb6f402ffcf9e2bcfc925ba4566b5183a78900a SHA512 6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab -DIST wine-d3d9-2.3.tar.gz 48510 BLAKE2B 1d7e4549e10d3b59cabb4db373e72ef6d9933c0b054dc053986657973da92eb13c02a30564104957952c70db36525d80278bc6a7389035d44bf95b5f8c1bc0f8 SHA512 58449f6b7ed7fd8182e2cce92e1d1195bf64a567c1cc92fd3f46af195e7e4039c3b2a128be9d3572d9067be6c1bb020f417c6d558bb551c60096c107067177b8 -DIST wine-gentoo-2015.03.07.tar.bz2 85419 BLAKE2B 5587ac5e24a81165c23e0e29ee34cdf787799aa1092811cc48bbea074d0fcca5246db4a6b7ffaa4cc0bc27a29abc234c7b3eb4701fb22939bc49e03deafa27ba SHA512 bae1d2d5575d340d01f44008104f0e5ec0c4a4982995dec37d501594cd21d07a2b4ad4465c4273646d5bf6521996b4b82471097864be75342abe3e7d478a56bd -DIST wine-mono-4.6.4.msi 45592064 BLAKE2B 30099b7f02276e47e350a96af07bf64b43c857b3b3323d0cab85864b753e9810c0d7b5d496e2f53f5b2c3a434eb440a19f9928707c4127303aa0335928e39097 SHA512 1d50df5d4d000998c74fbee79b8ffc691d88ee3b34db9fd7124e0df68d6f84768ece489ac8c3f5f3141c2073c8666b93ae23ca6cd652a6542a821df3d1b66b6d -DIST wine-staging-2.1.tar.gz 10101781 BLAKE2B 6cbbc4bf2eec6416e7a9a128994dc53fbde6dd62fabdd94df6f675a395c9c7c5d22b2971d254bfb900b3f4cf727c9057c0cd912f1c256bc3b74a295386d420d5 SHA512 c64c48b265f0779c621a643ddbd2d12aaa548e4bff3b2b728280cdb9613214989911ee8ba5e46c7770f5f6430014a5da1c98e95d5008c1174bd14bf9ce5250db -DIST wine-staging-2.2.tar.gz 10078327 BLAKE2B e8391a1005d8c21be24381f1593b0cf37375bc58d0d5028799433d67e5d82bf73c098196c243e3ea978a3f84c0e3fe826273c9f0c9e5cc68a1b576a89b1c548e SHA512 8ad3f8ba4c6439a9ec4884a55018a67c9e2c2384830074646aac7b70cb9f4f5a20f760247ab42dc3d2f697cdac7ea5322be8ed12c435cb0bc185ac08fdd4dd91 -DIST wine-staging-2.3.tar.gz 10071742 BLAKE2B
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/
commit: 0a6710c283b10eb3bb1c359e763f4003d4f81b8e Author: Austin English gentoo org> AuthorDate: Mon Jun 6 01:24:41 2016 + Commit: Austin English gentoo org> CommitDate: Mon Jun 6 02:06:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a6710c2 app-emulation/wine: check if CC supports builtin_ms_va_list when attempting 64-bit support app-emulation/wine/files/builtin_ms_va_list.c | 9 + app-emulation/wine/wine-1.8-r1.ebuild | 9 +++-- app-emulation/wine/wine-1.8.1-r1.ebuild | 9 +++-- app-emulation/wine/wine-1.8.2.ebuild | 9 +++-- app-emulation/wine/wine-1.9.10.ebuild | 9 +++-- app-emulation/wine/wine-1.9.11.ebuild | 9 +++-- app-emulation/wine/wine-1.9.4-r1.ebuild | 9 +++-- app-emulation/wine/wine-1.9.5-r1.ebuild | 11 --- app-emulation/wine/wine-1.9.6-r1.ebuild | 9 +++-- app-emulation/wine/wine-1.9.7-r1.ebuild | 9 +++-- app-emulation/wine/wine-1.9.8.ebuild | 9 +++-- app-emulation/wine/wine-1.9.9.ebuild | 9 +++-- app-emulation/wine/wine-.ebuild | 9 +++-- 13 files changed, 94 insertions(+), 25 deletions(-) diff --git a/app-emulation/wine/files/builtin_ms_va_list.c b/app-emulation/wine/files/builtin_ms_va_list.c new file mode 100644 index 000..f36fc26 --- /dev/null +++ b/app-emulation/wine/files/builtin_ms_va_list.c @@ -0,0 +1,9 @@ +/* Taken from Wine's configure script. LGPL 2.1+ */ + +#include + +int main(void) +{ +void func(__builtin_ms_va_list *args); +return 0; +} diff --git a/app-emulation/wine/wine-1.8-r1.ebuild b/app-emulation/wine/wine-1.8-r1.ebuild index e074f92..bdb29eb 100644 --- a/app-emulation/wine/wine-1.8-r1.ebuild +++ b/app-emulation/wine/wine-1.8-r1.ebuild @@ -189,8 +189,13 @@ wine_build_environment_check() { fi fi - if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then - eerror "You need gcc-4.4+ to build 64-bit wine" + if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \ + ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then + einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit wine" + else + eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" + eerror + eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" eerror return 1 fi diff --git a/app-emulation/wine/wine-1.8.1-r1.ebuild b/app-emulation/wine/wine-1.8.1-r1.ebuild index 0b38bc8..f4681ee 100644 --- a/app-emulation/wine/wine-1.8.1-r1.ebuild +++ b/app-emulation/wine/wine-1.8.1-r1.ebuild @@ -190,8 +190,13 @@ wine_build_environment_check() { fi fi - if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then - eerror "You need gcc-4.4+ to build 64-bit wine" + if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \ + ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then + einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit wine" + else + eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" + eerror + eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" eerror return 1 fi diff --git a/app-emulation/wine/wine-1.8.2.ebuild b/app-emulation/wine/wine-1.8.2.ebuild index 951e2bc..6aa4664 100644 --- a/app-emulation/wine/wine-1.8.2.ebuild +++ b/app-emulation/wine/wine-1.8.2.ebuild @@ -190,8 +190,13 @@ wine_build_environment_check() { fi fi - if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then - eerror "You need gcc-4.4+ to build 64-bit wine" + if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \ + ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then + einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit wine" + else + eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" + eerror + eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" eerror return 1 fi diff --git a/app-emulation/wine/wine-1.9.10.ebuild b/app-emulation/wine/wine-1.9.10.ebuild index 971a77c..35f0ebf 100644 --- a/app-emulation/wine/wine-1.9.10.ebuild +++ b/app-emulation/wine/wine-1.9.10.ebuild @@ -192,8 +192,13 @@
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/
commit: cf6a04d2d7e917b4706d609df527361897c88bcf Author: NP-Hardass gentoo org> AuthorDate: Fri Apr 22 03:06:48 2016 + Commit: NP Hardass gentoo org> CommitDate: Fri Apr 22 04:48:07 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6a04d2 app-emulation/wine: Rename sysmacros patch for 1.9.7 Package-Manager: portage-2.2.26 .../wine/files/wine-1.9.7-sysmacros.patch | 177 - app-emulation/wine/wine-1.9.7.ebuild | 2 +- 2 files changed, 1 insertion(+), 178 deletions(-) diff --git a/app-emulation/wine/files/wine-1.9.7-sysmacros.patch b/app-emulation/wine/files/wine-1.9.7-sysmacros.patch deleted file mode 100644 index 4ea515d..000 --- a/app-emulation/wine/files/wine-1.9.7-sysmacros.patch +++ /dev/null @@ -1,177 +0,0 @@ -From ca8a08606d3f0900b3f4aa8f2e6547882a22dba8 Mon Sep 17 00:00:00 2001 -From: Seong-ho Cho-Date: Mon, 18 Apr 2016 04:25:38 +0900 -Subject: [PATCH] configure: Add AC_HEADER_MAJOR to find where major() is - defined. - -Signed-off-by: Seong-ho Cho -Signed-off-by: Alexandre Julliard - configure | 50 ++ - configure.ac | 1 + - dlls/ntdll/cdrom.c | 5 + - dlls/ntdll/directory.c | 5 + - dlls/ntdll/file.c | 5 + - include/config.h.in| 8 - server/fd.c| 5 + - 7 files changed, 79 insertions(+) - -diff --git a/configure b/configure -index 1cb0e59..ffb1825 100755 a/configure -+++ b/configure -@@ -6836,6 +6836,56 @@ fi - - done - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 -+$as_echo_n "checking whether sys/types.h defines makedev... " >&6; } -+if ${ac_cv_header_sys_types_h_makedev+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+return makedev(0, 0); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_header_sys_types_h_makedev=yes -+else -+ ac_cv_header_sys_types_h_makedev=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+conftest$ac_exeext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5 -+$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; } -+ -+if test $ac_cv_header_sys_types_h_makedev = no; then -+ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : -+ -+$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h -+ -+fi -+ -+ -+ -+ if test $ac_cv_header_sys_mkdev_h = no; then -+ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then : -+ -+$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h -+ -+fi -+ -+ -+ fi -+fi -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 - $as_echo_n "checking whether stat file-mode macros are broken... " >&6; } - if ${ac_cv_header_stat_broken+:} false; then : -diff --git a/configure.ac b/configure.ac -index 6189aa9..201bc77 100644 a/configure.ac -+++ b/configure.ac -@@ -512,6 +512,7 @@ AC_CHECK_HEADERS(\ - valgrind/valgrind.h \ - zlib.h - ) -+AC_HEADER_MAJOR() - AC_HEADER_STAT() - - dnl Checks for headers that depend on other ones -diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c -index ee36045..2c64106 100644 a/dlls/ntdll/cdrom.c -+++ b/dlls/ntdll/cdrom.c -@@ -38,6 +38,11 @@ - #ifdef HAVE_SYS_STAT_H - # include - #endif -+#ifdef MAJOR_IN_MKDEV -+# include -+#elif defined(MAJOR_IN_SYSMACROS) -+# include -+#endif - #include - - #ifdef HAVE_SYS_IOCTL_H -diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c -index 93fe594..4d431c0 100644 a/dlls/ntdll/directory.c -+++ b/dlls/ntdll/directory.c -@@ -47,6 +47,11 @@ - #ifdef HAVE_SYS_ATTR_H - #include - #endif -+#ifdef MAJOR_IN_MKDEV -+# include -+#elif defined(MAJOR_IN_SYSMACROS) -+# include -+#endif - #ifdef HAVE_SYS_VNODE_H - /* Work around a conflict with Solaris' system list defined in sys/list.h. */ - #define list SYSLIST -diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c -index 7e5da59..b3bd9d6 100644 a/dlls/ntdll/file.c -+++ b/dlls/ntdll/file.c -@@ -57,6 +57,11 @@ - #ifdef HAVE_SYS_SOCKET_H - #include - #endif -+#ifdef MAJOR_IN_MKDEV -+# include -+#elif defined(MAJOR_IN_SYSMACROS) -+# include -+#endif - #ifdef HAVE_UTIME_H - # include - #endif -diff --git a/include/config.h.in b/include/config.h.in -index 0650f31..06b192f 100644 a/include/config.h.in -+++ b/include/config.h.in -@@ -1335,6 +1335,14 @@ - /* Define to 1 if you have the `__res_get_state' function. */ - #undef HAVE___RES_GET_STATE - -+/* Define to 1 if
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/
commit: b1b569622234f4889d3f1629ff84d0926bd3ad55 Author: Mike Frysinger gentoo org> AuthorDate: Tue Apr 19 07:20:09 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Tue Apr 19 07:20:09 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b56962 app-emulation/wine: fix build w/newer glibc #580046 .../wine/files/wine-1.9.7-sysmacros.patch | 177 + app-emulation/wine/wine-1.9.7.ebuild | 1 + 2 files changed, 178 insertions(+) diff --git a/app-emulation/wine/files/wine-1.9.7-sysmacros.patch b/app-emulation/wine/files/wine-1.9.7-sysmacros.patch new file mode 100644 index 000..4ea515d --- /dev/null +++ b/app-emulation/wine/files/wine-1.9.7-sysmacros.patch @@ -0,0 +1,177 @@ +From ca8a08606d3f0900b3f4aa8f2e6547882a22dba8 Mon Sep 17 00:00:00 2001 +From: Seong-ho Cho+Date: Mon, 18 Apr 2016 04:25:38 +0900 +Subject: [PATCH] configure: Add AC_HEADER_MAJOR to find where major() is + defined. + +Signed-off-by: Seong-ho Cho +Signed-off-by: Alexandre Julliard +--- + configure | 50 ++ + configure.ac | 1 + + dlls/ntdll/cdrom.c | 5 + + dlls/ntdll/directory.c | 5 + + dlls/ntdll/file.c | 5 + + include/config.h.in| 8 + server/fd.c| 5 + + 7 files changed, 79 insertions(+) + +diff --git a/configure b/configure +index 1cb0e59..ffb1825 100755 +--- a/configure b/configure +@@ -6836,6 +6836,56 @@ fi + + done + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 ++$as_echo_n "checking whether sys/types.h defines makedev... " >&6; } ++if ${ac_cv_header_sys_types_h_makedev+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++return makedev(0, 0); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_header_sys_types_h_makedev=yes ++else ++ ac_cv_header_sys_types_h_makedev=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++conftest$ac_exeext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5 ++$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; } ++ ++if test $ac_cv_header_sys_types_h_makedev = no; then ++ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : ++ ++$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h ++ ++fi ++ ++ ++ ++ if test $ac_cv_header_sys_mkdev_h = no; then ++ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then : ++ ++$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h ++ ++fi ++ ++ ++ fi ++fi ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 + $as_echo_n "checking whether stat file-mode macros are broken... " >&6; } + if ${ac_cv_header_stat_broken+:} false; then : +diff --git a/configure.ac b/configure.ac +index 6189aa9..201bc77 100644 +--- a/configure.ac b/configure.ac +@@ -512,6 +512,7 @@ AC_CHECK_HEADERS(\ + valgrind/valgrind.h \ + zlib.h + ) ++AC_HEADER_MAJOR() + AC_HEADER_STAT() + + dnl Checks for headers that depend on other ones +diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c +index ee36045..2c64106 100644 +--- a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c +@@ -38,6 +38,11 @@ + #ifdef HAVE_SYS_STAT_H + # include + #endif ++#ifdef MAJOR_IN_MKDEV ++# include ++#elif defined(MAJOR_IN_SYSMACROS) ++# include ++#endif + #include + + #ifdef HAVE_SYS_IOCTL_H +diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c +index 93fe594..4d431c0 100644 +--- a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c +@@ -47,6 +47,11 @@ + #ifdef HAVE_SYS_ATTR_H + #include + #endif ++#ifdef MAJOR_IN_MKDEV ++# include ++#elif defined(MAJOR_IN_SYSMACROS) ++# include ++#endif + #ifdef HAVE_SYS_VNODE_H + /* Work around a conflict with Solaris' system list defined in sys/list.h. */ + #define list SYSLIST +diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c +index 7e5da59..b3bd9d6 100644 +--- a/dlls/ntdll/file.c b/dlls/ntdll/file.c +@@ -57,6 +57,11 @@ + #ifdef HAVE_SYS_SOCKET_H + #include + #endif ++#ifdef MAJOR_IN_MKDEV ++# include ++#elif defined(MAJOR_IN_SYSMACROS) ++# include ++#endif + #ifdef HAVE_UTIME_H + # include + #endif +diff --git a/include/config.h.in b/include/config.h.in +index 0650f31..06b192f 100644 +--- a/include/config.h.in b/include/config.h.in +@@ -1335,6 +1335,14 @@ + /* Define to 1 if you have the `__res_get_state' function. */ + #undef HAVE___RES_GET_STATE + ++/* Define to 1 if `major', `minor', and `makedev' are declared
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/
commit: e08eca66f56c895a137a1a7e6cf554d50084c925 Author: NP-Hardass gentoo org> AuthorDate: Mon Mar 14 06:35:39 2016 + Commit: NP Hardass gentoo org> CommitDate: Mon Mar 14 06:37:08 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e08eca66 app-emulation/wine: Update gcc 5.3 test case. #577306. Thanks to Bob Wya Package-Manager: portage-2.2.26 app-emulation/wine/files/pr69140.c | 13 + app-emulation/wine/wine-1.9.5.ebuild | 5 ++--- app-emulation/wine/wine-.ebuild | 5 ++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app-emulation/wine/files/pr69140.c b/app-emulation/wine/files/pr69140.c index 2c345dd..7c9e001 100644 --- a/app-emulation/wine/files/pr69140.c +++ b/app-emulation/wine/files/pr69140.c @@ -22,3 +22,16 @@ MD4Update (MD4_CTX *ctx, const unsigned char *buf) MD4Transform( ctx->buf, (unsigned int *)ctx->in); MD4Transform( ctx->buf, (unsigned int *)ctx->in); } + +int +main(void) +{ + MD4_CTX ctx_test = +{ +{ 0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476 }, +{ 0, 0 } +}; + unsigned char buf[64]; + + MD4Update(_test, (const unsigned char *) ); +} diff --git a/app-emulation/wine/wine-1.9.5.ebuild b/app-emulation/wine/wine-1.9.5.ebuild index e7a9349..509dbfe 100644 --- a/app-emulation/wine/wine-1.9.5.ebuild +++ b/app-emulation/wine/wine-1.9.5.ebuild @@ -176,9 +176,8 @@ wine_build_environment_check() { # bug #574044 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then einfo "Checking for gcc-5-3 stack realignment compiler bug ..." - $(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die - # Run in subshell to prevent "Aborted" message - if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then + # Compile in subshell to prevent "Aborted" message + if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then eerror "Wine cannot be built with this version of gcc-5.3" eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," eerror "or use gcc-config to select a different compiler version." diff --git a/app-emulation/wine/wine-.ebuild b/app-emulation/wine/wine-.ebuild index b29387c..96af59e 100644 --- a/app-emulation/wine/wine-.ebuild +++ b/app-emulation/wine/wine-.ebuild @@ -176,9 +176,8 @@ wine_build_environment_check() { # bug #574044 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then einfo "Checking for gcc-5-3 stack realignment compiler bug ..." - $(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die - # Run in subshell to prevent "Aborted" message - if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then + # Compile in subshell to prevent "Aborted" message + if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then eerror "Wine cannot be built with this version of gcc-5.3" eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," eerror "or use gcc-config to select a different compiler version."
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/
commit: f7ab9735aad27334ff3cca67aa177f24e0fb45df Author: NP-Hardass gentoo org> AuthorDate: Sat Mar 12 21:09:22 2016 + Commit: NP Hardass gentoo org> CommitDate: Sat Mar 12 21:10:00 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ab9735 app-emulation/wine: Check and warn about GCC-5.3 compile bug. #574044 Package-Manager: portage-2.2.26 app-emulation/wine/files/pr69140.c | 24 app-emulation/wine/wine-1.9.4.ebuild | 14 ++ app-emulation/wine/wine-1.9.5.ebuild | 14 ++ app-emulation/wine/wine-.ebuild | 14 ++ 4 files changed, 66 insertions(+) diff --git a/app-emulation/wine/files/pr69140.c b/app-emulation/wine/files/pr69140.c new file mode 100644 index 000..2c345dd --- /dev/null +++ b/app-emulation/wine/files/pr69140.c @@ -0,0 +1,24 @@ +/* { dg-do compile { target lp64 } } */ +/* { dg-options "-O2 -mincoming-stack-boundary=3" } */ + +typedef struct { + unsigned int buf[4]; + unsigned char in[64]; +} MD4_CTX; + +static void +MD4Transform (unsigned int buf[4], const unsigned int in[16]) +{ + unsigned int a, b, c, d; + (b) += c)) & ((d))) | ((~(c)) & ((a + (in[7]); + (a) += b)) & ((c))) | ((~(b)) & ((d + (in[8]); + (d) += a)) & ((b))) | ((~(a)) & ((c + (in[9]); + buf[3] += d; +} + +void __attribute__((ms_abi)) +MD4Update (MD4_CTX *ctx, const unsigned char *buf) +{ + MD4Transform( ctx->buf, (unsigned int *)ctx->in); + MD4Transform( ctx->buf, (unsigned int *)ctx->in); +} diff --git a/app-emulation/wine/wine-1.9.4.ebuild b/app-emulation/wine/wine-1.9.4.ebuild index 6388a5b..e47fe62 100644 --- a/app-emulation/wine/wine-1.9.4.ebuild +++ b/app-emulation/wine/wine-1.9.4.ebuild @@ -174,6 +174,20 @@ wine_build_environment_check() { return 1 fi fi + # bug #574044 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then + einfo "Checking for gcc-5-3 stack realignment compiler bug ..." + $(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die + # Run in subshell to prevent "Aborted" message + if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then + eerror "Wine cannot be built with this version of gcc-5.3" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/574044; + eerror + return 1 + fi + fi if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then eerror "You need gcc-4.4+ to build 64-bit wine" diff --git a/app-emulation/wine/wine-1.9.5.ebuild b/app-emulation/wine/wine-1.9.5.ebuild index 2c75d7b..5abc380 100644 --- a/app-emulation/wine/wine-1.9.5.ebuild +++ b/app-emulation/wine/wine-1.9.5.ebuild @@ -174,6 +174,20 @@ wine_build_environment_check() { return 1 fi fi + # bug #574044 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then + einfo "Checking for gcc-5-3 stack realignment compiler bug ..." + $(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die + # Run in subshell to prevent "Aborted" message + if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then + eerror "Wine cannot be built with this version of gcc-5.3" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/574044; + eerror + return 1 + fi + fi if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then eerror "You need gcc-4.4+ to build 64-bit wine" diff --git a/app-emulation/wine/wine-.ebuild b/app-emulation/wine/wine-.ebuild index 2c75d7b..5abc380 100644 --- a/app-emulation/wine/wine-.ebuild +++ b/app-emulation/wine/wine-.ebuild @@ -174,6 +174,20 @@ wine_build_environment_check() { return 1 fi fi + # bug #574044 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then + einfo "Checking for gcc-5-3 stack realignment compiler bug ..." + $(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die + # Run in subshell to prevent "Aborted" message + if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then +
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/
commit: ffba11ee1a2fe07e65c8ada2531e953ac3239fb5 Author: NP-Hardass gentoo org> AuthorDate: Sun Mar 6 02:54:55 2016 + Commit: NP Hardass gentoo org> CommitDate: Sun Mar 6 02:56:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffba11ee app-emulation/wine: Update , bump mono, fix bug #576360 Package-Manager: portage-2.2.26 app-emulation/wine/Manifest| 1 + .../wine/files/wine-1.9.5-multilib-portage.patch | 22 ++ app-emulation/wine/wine-.ebuild| 34 -- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index 5ebb0d5..c8957fd 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -50,6 +50,7 @@ DIST wine-mono-0.0.8.msi 46967296 SHA256 3dfc23bbc29015e4e538dab8b83cb825d3248a0 DIST wine-mono-4.5.2.msi 52502528 SHA256 d9124edb41ba4418af10eba519dafb25ab4338c567d25ce0eb4ce1e1b4d7eaad SHA512 73c907f63b73836d5afd0753197358aaea43a74a47800f929ef0627112298256f1fa46d1b9ff297b117468d953cdeab21fb5962db13c5debbcb71004462df609 WHIRLPOOL 18d3544c6753c5a01917bfc1b694f31ce45213108527f13317ec0bb8b2d2339ce41800534967e067cd15cd186ef9e186a5d3252275e443dfa1a6ae3641d4d17c DIST wine-mono-4.5.4.msi 53706752 SHA256 20bced7fee01f25279edf07670c5033d25c2c9834a839e7a20410ce1c611d6f2 SHA512 307fab2ac50c4eaa5c3fb8446ceb2df0d95c0a9d7c1e6289ef1ec5cc660fa8fcb26025c9723ce2bc01afcaf7e9c4dd9939d1beba877f4f95f6f80d92d8187221 WHIRLPOOL ccd1fed03158dd309d2a1f88558e5ad0e2e43de5ba61ab82702132bd0cdf75db75dcc1a61b5cb2775fdf0ad51464f34d2b3629538b1737cbedb410b859ef092a DIST wine-mono-4.5.6.msi 53705216 SHA256 ac681f737f83742d786706529eb85f4bc8d6b8dcdfa9e2e336b71973bc25 SHA512 4d8df04c1d0da09d1abe423dd271e5dd14a193d607fb54e214d2e340827f7c33829342d1580b6907d7cf466e70993d743c6e1ca9a026d4b6225dd7c1fc8b1386 WHIRLPOOL 9a68e502da0be6768e92d88f2ccace607300f3a331e0f9e1b6d60e9c6c2d4eb635b902f03e13aad73461dd5f0c2691c7b41958356ebb7f445e8def4282c675d3 +DIST wine-mono-4.6.0.msi 45690368 SHA256 635c6bc88bad8d6bf8c6016a589627142ae56ac2e7368192102a16fdbaa29cc3 SHA512 d2ab7a7b98d18132cc28ffd52352fcc6cdb16b1750a658e9ec961044e808e4e8e1605732f1e87bbb6a275f57fdb94aebaab3760f679472358c7df608b0fa3262 WHIRLPOOL f8f6e83be5bd4eb7bde6e6c0d1f17bd4d4c887c52fa2018f20e51a30ca7ec0a9550884423298bc571587fe3c203f921057d91c3c78c12ebf9e911996bdd7e77d DIST wine-staging-1.7.18-1.tar.gz 874958 SHA256 127b1754928297883ab5423c0814c59afa8a60444603b5c3b74ae726e41442e6 SHA512 ac7e59914436cfd58fe1e5edc94956f8470bbf3f517f8e1017ca3d201b872aca6a277bb3074527b614db8123663cadf4d10faeeb048d011d7e81fdfe5c582819 WHIRLPOOL ac1913deddc127c55d90d9f7c5249f2866757fb86295bf61fed8641a39751dbfbf57d3c6234086f8cff9c5b1ec8c45effeef40f5973e9aa8550412134809938a DIST wine-staging-1.7.20.tar.gz 887293 SHA256 ac55daab4c6062e7c3f7eadd4ea632ddc01702c1abf859bc4928bb9691cc7d22 SHA512 2f5bd5b3bfe85c0dd0d611fc2512f5f4ecac11d639eb578a7319c01a426b8cf788031fd299ecb5b5ff2c0bb7fa72dcfb1541bb9c987913068843a5b712099fc1 WHIRLPOOL 9c19e8e371e121009bed38ffe0e8789e35a4b9629a39aace1b44b8f830bf1e30c0cbca1c3eae45960373bedde39a912b4e1178b7af942c92263c6e4f278148d0 DIST wine-staging-1.7.21.tar.gz 883814 SHA256 d107eba41706adf039befe5a584e45225e7ebc502a11257227c378581ec22b96 SHA512 770ed2d46f5975de4a728314c3c38834c20f8c49bc5fa7eee36c870b9708404c157f6e1ac4b9ec9e5799ed3b14f825c0653d30a17d332f6b805c6255da0ddf28 WHIRLPOOL 898db4f1a3606e5645a7a1132e0b83264fa5d7c00f94a14fce067702ec3accb397db93fa0c0449df7962800c44e00825fa1cac55b76b5abe42670ad412d67e21 diff --git a/app-emulation/wine/files/wine-1.9.5-multilib-portage.patch b/app-emulation/wine/files/wine-1.9.5-multilib-portage.patch new file mode 100644 index 000..2166865 --- /dev/null +++ b/app-emulation/wine/files/wine-1.9.5-multilib-portage.patch @@ -0,0 +1,22 @@ +--- configure.ac.orig 2016-03-05 20:53:50.574628728 -0500 configure.ac 2016-03-05 20:57:54.945617833 -0500 +@@ -141,6 +141,9 @@ + then + CC="$CC -m32" + CXX="$CXX -m32" ++ CFLAGS="$CFLAGS -m32" ++ LDFLAGS="$LDFLAGS -m32" ++ CXXFLAGS="$CXXFLAGS -m32" + AC_MSG_CHECKING([whether $CC works]) + AC_LINK_IFELSE([AC_LANG_PROGRAM()],AC_MSG_RESULT([yes]), + [AC_MSG_RESULT([no]) +@@ -160,6 +163,9 @@ + fi + CC="$CC -m64" + CXX="$CXX -m64" ++ CFLAGS="$CFLAGS -m64" ++ LDFLAGS="$LDFLAGS -m64" ++ CXXFLAGS="$CXXFLAGS -m64" + host_cpu="x86_64" + notice_platform="64-bit " + AC_SUBST(TARGETFLAGS,"-m64") diff --git a/app-emulation/wine/wine-.ebuild b/app-emulation/wine/wine-.ebuild index b44030b..2c75d7b 100644 --- a/app-emulation/wine/wine-.ebuild +++ b/app-emulation/wine/wine-.ebuild @@ -22,12 +22,11 @@ else KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" fi -GV="2.40" -MV="4.5.6" +GV="2.44" +MV="4.6.0" STAGING_P="wine-staging-${PV}"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/
commit: 28604e0c07a3062664926465c294038a9dcdb82f Author: Alexandre Rostovtsev gentoo org> AuthorDate: Sat Oct 3 05:40:26 2015 + Commit: Alexandre Rostovtsev gentoo org> CommitDate: Sat Oct 3 05:41:22 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28604e0c app-emulation/wine: works with gcc-5.2.0 with latest patchset Instead of a simple version check, run the upstream test case to check whether the installed gcc ebuild has the ms_abi bug or not. Gentoo-Bug: 549768 Package-Manager: portage-2.2.22 app-emulation/wine/files/pr66838.c | 36 app-emulation/wine/wine-1.6.2-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.6.2.ebuild | 18 ++-- app-emulation/wine/wine-1.7.10-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.11-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.12-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.13-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.14-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.15-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.16-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.17-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.18-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.19-r2.ebuild | 18 ++-- app-emulation/wine/wine-1.7.20-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.21-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.22-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.28-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.29-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.3-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.33-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.34.ebuild| 18 ++-- app-emulation/wine/wine-1.7.35.ebuild| 18 ++-- app-emulation/wine/wine-1.7.36.ebuild| 18 ++-- app-emulation/wine/wine-1.7.37.ebuild| 18 ++-- app-emulation/wine/wine-1.7.38-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.39-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.4-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.40-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.41.ebuild| 18 ++-- app-emulation/wine/wine-1.7.42.ebuild| 18 ++-- app-emulation/wine/wine-1.7.43.ebuild| 18 ++-- app-emulation/wine/wine-1.7.44.ebuild| 18 ++-- app-emulation/wine/wine-1.7.45.ebuild| 18 ++-- app-emulation/wine/wine-1.7.46.ebuild| 18 ++-- app-emulation/wine/wine-1.7.47.ebuild| 18 ++-- app-emulation/wine/wine-1.7.50.ebuild| 18 ++-- app-emulation/wine/wine-1.7.51.ebuild| 18 ++-- app-emulation/wine/wine-1.7.8-r1.ebuild | 18 ++-- app-emulation/wine/wine-1.7.9-r1.ebuild | 18 ++-- app-emulation/wine/wine-.ebuild | 18 ++-- 40 files changed, 504 insertions(+), 234 deletions(-) diff --git a/app-emulation/wine/files/pr66838.c b/app-emulation/wine/files/pr66838.c new file mode 100644 index 000..cd61685 --- /dev/null +++ b/app-emulation/wine/files/pr66838.c @@ -0,0 +1,36 @@ +/* From gcc svn, /branches/gcc-5-branch/gcc/testsuite/gcc.target/i386/pr66838.c */ +/* Copyrighted and distributed under the same terms as gcc */ + +void abort (void); + +char global; + +__attribute__((sysv_abi, noinline, noclone)) +void sysv_abi_func(char const *desc, void *local) +{ + register int esi asm ("esi"); + register int edi asm ("edi"); + + if (local != ) +abort (); + + /* Clobber some of the extra SYSV ABI registers. */ + asm volatile ("movl\t%2, %0\n\tmovl\t%2, %1" + : "=r" (esi), "=r" (edi) + : "i" (0xdeadbeef)); +} + +__attribute__((ms_abi, noinline, noclone)) +void ms_abi_func () +{ + sysv_abi_func ("1st call", ); + sysv_abi_func ("2nd call", ); + sysv_abi_func ("3rd call", ); +} + +int +main(void) +{ + ms_abi_func(); + return 0; +} diff --git a/app-emulation/wine/wine-1.6.2-r1.ebuild b/app-emulation/wine/wine-1.6.2-r1.ebuild index cd806c0..7890da7 100644 --- a/app-emulation/wine/wine-1.6.2-r1.ebuild +++ b/app-emulation/wine/wine-1.6.2-r1.ebuild @@ -145,12 +145,18 @@ wine_build_environment_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 # bug #549768 - if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then - eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;" - eerror "you may use gcc-config to select an older compiler version." - eerror "See https://bugs.gentoo.org/549768; - eerror - return 1 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then +