commit: 100da0ef6553e87ba8997dbdbc61e6991e9019f5 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Sat Sep 30 19:11:43 2017 +0000 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> CommitDate: Sat Sep 30 19:35:05 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=100da0ef
app-emulation/wine-d3d9: Backport freetype-2.8.1 support Bug: https://bugs.gentoo.org/631376 Bug: https://bugs.gentoo.org/631676 Package-Manager: Portage-2.3.10, Repoman-2.3.3 app-emulation/wine-d3d9/Manifest | 2 +- app-emulation/wine-d3d9/files/builtin_ms_va_list.c | 9 ---- app-emulation/wine-d3d9/files/pr66838.c | 36 ------------- app-emulation/wine-d3d9/files/pr69140.c | 37 -------------- .../wine-d3d9/files/wine-1.5.26-winegcc.patch | 59 ---------------------- .../wine-d3d9/files/wine-1.6-memset-O3.patch | 21 -------- .../files/wine-1.9.5-multilib-portage.patch | 31 ------------ .../files/wine-2.0-multislot-apploader.patch | 14 ----- app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.10.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.11.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.12.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.17.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.6.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.7.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.8.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-2.9.ebuild | 39 +++++++++----- app-emulation/wine-d3d9/wine-d3d9-9999.ebuild | 36 ++++++++----- 27 files changed, 511 insertions(+), 436 deletions(-) diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest index f6e6ee9fabb..92a378efcd0 100644 --- a/app-emulation/wine-d3d9/Manifest +++ b/app-emulation/wine-d3d9/Manifest @@ -1,3 +1,4 @@ +DIST gentoo-wine-patches-20170830.tar.xz 58456 SHA256 fb7781d0ae360cbc3860c2d2e81527a1b903da824c01f5d5040e95aaf99a3970 SHA512 5e5159e3252b246bba0ef7fdba345db3ab1071c5b8b8b625f98eda18779d4024c5b76bdbf49ce7bd5c6b01b422807adf76820beddb2b4a6ee9e67d13052cc575 WHIRLPOOL a79be264bab3fcdeee06fef47efd28e6e1125254ac7f82300cb6ba2591ef69cd76b5fed8f778b1849a0659e680e9fc785f0273d55cb2ed95648a74dffa5e22d2 DIST wine-2.0.tar.bz2 23662707 SHA256 9756f5a2129b6a83ba701e546173cbff86caa671b0af73eb8f72c03b20c066c6 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186 WHIRLPOOL fa9f774d87dae73c7d1f3b86dc3b03ea27065eb6140f1cac13c82fe16f7ebff8f8365ed447220cf5c2788b9f4aae7c482e4f9e2e69f47e5435209e148f5dbdfe DIST wine-2.1.tar.xz 18887032 SHA256 bfb9abf63691c93df28d9599aaa866dc2b4e27209b3b7b546df8a37d7d9d1e6e SHA512 03d678ee6e89c2804813f2827255fcf59e96ca9a45b7d8ac441cfc84f835e5e5689c70a79a41a04c631e1add7807fa4a5758acef3bd7aadfb2e92e68958c6ef6 WHIRLPOOL 063d935f1ff0922100641f2f53cdac23d2993a83182d45e028e485fd7d0a13bc5cfb77bca76550b1537b3f42fecacef7fd64785adbf6425af823f56f96973b54 DIST wine-2.10.tar.xz 19209580 SHA256 488df7ffd2e81da455bf428fc9eb784bb4273a890334500895665711bd52f179 SHA512 8807e16a571bf45d99097ad5fdfb9fe755f6dbe84010a330fed82f1d48c76b7f19589bfc0e5dde0b9e49a608fd0501db3f7e3e129e4d9d34bcae03bc51a73139 WHIRLPOOL e9a8248aac31593fbac28a3d8d4e62bfce14a7c41cc416ebfca8606518d28efd31b32196133da211f75f48bd228bd5d21fcbbc0479293e813ed99b258b37126e @@ -34,4 +35,3 @@ DIST wine-d3d9-2.6.tar.gz 48702 SHA256 06ed18f2d5fff04613ea1401c37ad70e163135c15 DIST wine-d3d9-2.7.tar.gz 48708 SHA256 df6ed1e50d8af0624b8f4f658705f75102094f6e17fec53ec8461991ce5dca2a SHA512 d258e81a942f905255a637aa80dd647878691caa79adc52fd79f66ce1320d42d7d36ea776876d6a26a2c711a168da4c64f27fa8744ca6d8318c5526f8a8af75a WHIRLPOOL 2d62cab5e3b14eaf29ecc96ac97555f48845a78c751040a850750d3b19fbc64efb3f3589dd3475a03cb1e3dff3e200528dabd2952b1ee8d0520a5db0d7db154b DIST wine-d3d9-2.8.tar.gz 48700 SHA256 c67de9fee6e97859896aa2326fbc245e8b0f7393a1c6341126607b03afebc964 SHA512 bb933b51d0022ce616331f2550faedeff3058007525b4519833b925c57999ab08b08380b8967d48ad7c56458e812342428388a5eac2ed8fcdd8cfbfee74a8e8c WHIRLPOOL 52c8538e3f4b3be3412ee544efebae69c3de781255e12298d544f47523aba3afaadbffa8dedc463c207b0ae8a0a92599beca17017f266648b9b229847990ae2e DIST wine-d3d9-2.9.tar.gz 48693 SHA256 32b847adf74c293e858800248aa1b164688f98cde89ca4d2cd0808fae7f94340 SHA512 89d06587481f7702b6884c83627a27c7b38a078e2b333bea2612a58840695211c19ab4ca02669c983580f95ae42ef114020f6b6bbb1a17d72449c0ed2212dc49 WHIRLPOOL e32b261f6e87580eec2c2ee57848b08b2487d1f280b8b257403e0722ec1b44cb31dcb240d89757599be2c3c6d958c48f92510bc625e5c05fc08116d13c303168 -DIST wine-desktop-common-20150204.tar.gz 99491 SHA256 444ad6b52b5290ec7d160e2cc40e4ba0910b4c4983dba1ceb054b81b09b24b5e SHA512 1f3d7022c5cff87ed3b8fd3b7cd14397c6f23b98fe6a7c583ac0d2f439ff29d943f57375f23687aa6519ff1d84ff07624a9a712d6f19fa207fd26d01edcb6688 WHIRLPOOL e9810b2952d25c05d831000e00e423de86809ec31b9a033fd4c64a70709da7338a9afc9e632e678f49c789a8a3702fbd0113226770cdb806623f2de371a16f54 diff --git a/app-emulation/wine-d3d9/files/builtin_ms_va_list.c b/app-emulation/wine-d3d9/files/builtin_ms_va_list.c deleted file mode 100644 index f36fc2609a0..00000000000 --- a/app-emulation/wine-d3d9/files/builtin_ms_va_list.c +++ /dev/null @@ -1,9 +0,0 @@ -/* Taken from Wine's configure script. LGPL 2.1+ */ - -#include <stdarg.h> - -int main(void) -{ - void func(__builtin_ms_va_list *args); - return 0; -} diff --git a/app-emulation/wine-d3d9/files/pr66838.c b/app-emulation/wine-d3d9/files/pr66838.c deleted file mode 100644 index cd616859427..00000000000 --- a/app-emulation/wine-d3d9/files/pr66838.c +++ /dev/null @@ -1,36 +0,0 @@ -/* 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 != &global) - 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", &global); - sysv_abi_func ("2nd call", &global); - sysv_abi_func ("3rd call", &global); -} - -int -main(void) -{ - ms_abi_func(); - return 0; -} diff --git a/app-emulation/wine-d3d9/files/pr69140.c b/app-emulation/wine-d3d9/files/pr69140.c deleted file mode 100644 index 7c9e001f301..00000000000 --- a/app-emulation/wine-d3d9/files/pr69140.c +++ /dev/null @@ -1,37 +0,0 @@ -/* { 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); -} - -int -main(void) -{ - MD4_CTX ctx_test = - { - { 0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476 }, - { 0, 0 } - }; - unsigned char buf[64]; - - MD4Update(&ctx_test, (const unsigned char *) &buf); -} diff --git a/app-emulation/wine-d3d9/files/wine-1.5.26-winegcc.patch b/app-emulation/wine-d3d9/files/wine-1.5.26-winegcc.patch deleted file mode 100644 index 2045e343401..00000000000 --- a/app-emulation/wine-d3d9/files/wine-1.5.26-winegcc.patch +++ /dev/null @@ -1,59 +0,0 @@ -http://bugs.gentoo.org/260726 - -diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c -index 16b4165..5c77267 100644 ---- a/tools/winebuild/main.c -+++ b/tools/winebuild/main.c -@@ -48,10 +48,13 @@ int link_ext_symbols = 0; - int force_pointer_size = 0; - int unwind_tables = 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(__powerpc__) - enum target_cpu target_cpu = CPU_POWERPC; - #elif defined(__arm__) -@@ -611,6 +614,10 @@ int main(int argc, char **argv) - 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/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c -index 06aa200..c44d2e3 100644 ---- a/tools/winegcc/winegcc.c -+++ b/tools/winegcc/winegcc.c -@@ -213,10 +213,13 @@ struct options - 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(__powerpc__) - static const enum target_cpu build_cpu = CPU_POWERPC; - #elif defined(__arm__) -@@ -1258,6 +1261,9 @@ int main(int argc, char **argv) - 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; diff --git a/app-emulation/wine-d3d9/files/wine-1.6-memset-O3.patch b/app-emulation/wine-d3d9/files/wine-1.6-memset-O3.patch deleted file mode 100644 index 75372f86914..00000000000 --- a/app-emulation/wine-d3d9/files/wine-1.6-memset-O3.patch +++ /dev/null @@ -1,21 +0,0 @@ -Avoid "undefined reference to `memset'" error when building with -USE=custom-cflags and -O3 in CFLAGS with gcc-4.8. - -See: - -http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56888 -http://bugs.winehq.org/show_bug.cgi?id=33521 -https://bugs.gentoo.org/show_bug.cgi?id=480508 - -diff --git a/configure.ac b/configure.ac -index d8033cf..fe7cc7d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1767,6 +1767,7 @@ then - - dnl Check for some compiler flags - WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) -+ WINE_TRY_CFLAGS([-fno-tree-loop-distribute-patterns]) - WINE_TRY_CFLAGS([-fno-strict-aliasing]) - dnl clang needs to be told to fail on unknown options - saved_CFLAGS=$CFLAGS diff --git a/app-emulation/wine-d3d9/files/wine-1.9.5-multilib-portage.patch b/app-emulation/wine-d3d9/files/wine-1.9.5-multilib-portage.patch deleted file mode 100644 index c19d0d8a0b0..00000000000 --- a/app-emulation/wine-d3d9/files/wine-1.9.5-multilib-portage.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=395615 - -Explicitly add the required -m32/m64 to *FLAGS; this overrides any -arch-specific -m* flags that may have been appended by multilib-portage. - -Even though -m32/m64 is now added to *FLAGS, -m32/m64 still has to be -explicitly added to CC and CXX due to wine's build system. For example, -winegcc saves the build-time value of CC and uses it at runtime. - ---- a/configure.ac 2016-03-05 20:53:50.574628728 -0500 -+++ b/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-d3d9/files/wine-2.0-multislot-apploader.patch b/app-emulation/wine-d3d9/files/wine-2.0-multislot-apploader.patch deleted file mode 100644 index b336c4f51e8..00000000000 --- a/app-emulation/wine-d3d9/files/wine-2.0-multislot-apploader.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/tools/wineapploader.in b/tools/wineapploader.in -index f48d552..14001a0 100755 ---- a/tools/wineapploader.in -+++ b/tools/wineapploader.in -@@ -20,7 +20,8 @@ - # - - # determine the app Winelib library name --appname=`basename "$0" .exe`.exe -+appname=${0##*/} -+appname="${appname%%-*}.exe" - - # first try explicit WINELOADER - if [ -x "$WINELOADER" ]; then exec "$WINELOADER" "$appname" "$@"; fi diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild index 5861b1952dc..768fae6fbaf 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -146,6 +146,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -173,7 +174,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -189,7 +190,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -205,7 +206,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -317,12 +318,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -330,6 +344,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -346,7 +361,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild index 6e3bde0a930..280c1174f31 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -146,6 +146,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -173,7 +174,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -189,7 +190,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -205,7 +206,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -317,12 +318,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -330,6 +344,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -346,7 +361,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.10.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.10.ebuild index a307eff70a4..2b18410a845 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.10.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.10.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -147,6 +147,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -174,7 +175,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -190,7 +191,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -206,7 +207,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -318,12 +319,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -331,6 +345,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -347,7 +362,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.11.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.11.ebuild index a307eff70a4..2b18410a845 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.11.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.11.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -147,6 +147,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -174,7 +175,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -190,7 +191,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -206,7 +207,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -318,12 +319,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -331,6 +345,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -347,7 +362,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.12.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.12.ebuild index a307eff70a4..2b18410a845 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.12.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.12.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -147,6 +147,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -174,7 +175,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -190,7 +191,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -206,7 +207,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -318,12 +319,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -331,6 +345,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -347,7 +362,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild index a307eff70a4..2b18410a845 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -147,6 +147,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -174,7 +175,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -190,7 +191,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -206,7 +207,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -318,12 +319,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -331,6 +345,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -347,7 +362,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild index 8191c3108bb..89a37ab4450 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -147,6 +147,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -174,7 +175,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -190,7 +191,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -206,7 +207,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -318,12 +319,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -331,6 +345,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -347,7 +362,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild index 8191c3108bb..89a37ab4450 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -147,6 +147,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -174,7 +175,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -190,7 +191,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -206,7 +207,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -318,12 +319,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -331,6 +345,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -347,7 +362,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild index 8191c3108bb..89a37ab4450 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -147,6 +147,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -174,7 +175,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -190,7 +191,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -206,7 +207,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -318,12 +319,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -331,6 +345,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -347,7 +362,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.17.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.17.ebuild index 8191c3108bb..89a37ab4450 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.17.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.17.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -147,6 +147,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -174,7 +175,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -190,7 +191,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -206,7 +207,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -318,12 +319,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -331,6 +345,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -347,7 +362,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild index 6e3bde0a930..280c1174f31 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -146,6 +146,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -173,7 +174,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -189,7 +190,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -205,7 +206,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -317,12 +318,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -330,6 +344,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -346,7 +361,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild index 6e3bde0a930..280c1174f31 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -146,6 +146,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -173,7 +174,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -189,7 +190,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -205,7 +206,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -317,12 +318,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -330,6 +344,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -346,7 +361,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild index 6a8e7d81079..6dcd268b951 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -146,6 +146,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -173,7 +174,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -189,7 +190,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -205,7 +206,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -317,12 +318,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -330,6 +344,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -346,7 +361,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild index 6a8e7d81079..6dcd268b951 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -146,6 +146,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -173,7 +174,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -189,7 +190,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -205,7 +206,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -317,12 +318,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -330,6 +344,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -346,7 +361,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.6.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.6.ebuild index 6a8e7d81079..6dcd268b951 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.6.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.6.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -146,6 +146,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -173,7 +174,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -189,7 +190,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -205,7 +206,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -317,12 +318,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -330,6 +344,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -346,7 +361,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.7.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.7.ebuild index 6a8e7d81079..6dcd268b951 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.7.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.7.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -146,6 +146,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -173,7 +174,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -189,7 +190,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -205,7 +206,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -317,12 +318,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -330,6 +344,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -346,7 +361,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.8.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.8.ebuild index 6a8e7d81079..6dcd268b951 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.8.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.8.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -146,6 +146,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -173,7 +174,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -189,7 +190,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -205,7 +206,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -317,12 +318,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -330,6 +344,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -346,7 +361,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.9.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.9.ebuild index a307eff70a4..2b18410a845 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.9.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.9.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -147,6 +147,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -174,7 +175,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -190,7 +191,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -206,7 +207,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -318,12 +319,25 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + ) + local PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -331,6 +345,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -347,7 +362,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS } diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild index 8191c3108bb..e4c7ac02109 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild @@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"; + EGIT_REPO_URI="https://source.winehq.org/git/wine.git"; EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -26,13 +26,13 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -WDC_V="20150204" -WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" HOMEPAGE="https://www.winehq.org/"; SRC_URI="${SRC_URI} - https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " if [[ ${PV} == "9999" ]] ; then @@ -147,6 +147,7 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} + dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -174,7 +175,7 @@ wine_compiler_check() { # bug #549768 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die # Run in subshell to prevent "Aborted" message ( "${T}"/pr66838 || false ) >/dev/null 2>&1 if ! eend $?; then @@ -190,7 +191,7 @@ wine_compiler_check() { if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then ebegin "Checking for gcc-5-3 stack realignment compiler bug" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 if ! eend $?; 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," @@ -206,7 +207,7 @@ wine_compiler_check() { if use abi_x86_64; then ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) if ! eend $?; then eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" eerror @@ -318,12 +319,22 @@ src_unpack() { } src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + local md5="$(md5sum server/protocol.def)" local PATCHES=( - "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 - "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + ) + local PATCHES_BIN=( ) if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) @@ -331,6 +342,7 @@ src_prepare() { fi default + eapply_bin eautoreconf # Modification of the server protocol requires regenerating the server requests @@ -347,7 +359,7 @@ src_prepare() { sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS }
