| 1 |
commit: 2fa21fd6ae2fa715e69e07582fcf70c007e155b2 |
| 2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 30 17:53:28 2017 +0000 |
| 4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 30 19:35:02 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa21fd6 |
| 7 |
|
| 8 |
app-emulation/wine-vanilla: Backport freetype-2.8.1 support |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/631376 |
| 11 |
Bug: https://bugs.gentoo.org/631676 |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
| 14 |
|
| 15 |
app-emulation/wine-vanilla/Manifest | 1 + |
| 16 |
.../wine-vanilla/files/builtin_ms_va_list.c | 9 ---- |
| 17 |
app-emulation/wine-vanilla/files/pr66838.c | 36 ------------- |
| 18 |
app-emulation/wine-vanilla/files/pr69140.c | 37 -------------- |
| 19 |
.../wine-vanilla/files/wine-1.5.26-winegcc.patch | 59 ---------------------- |
| 20 |
.../wine-vanilla/files/wine-1.6-memset-O3.patch | 21 -------- |
| 21 |
.../files/wine-1.9.5-multilib-portage.patch | 31 ------------ |
| 22 |
.../files/wine-2.0-multislot-apploader.patch | 14 ----- |
| 23 |
...nilla-2.2.ebuild => wine-vanilla-2.0-r1.ebuild} | 45 +++++++++++------ |
| 24 |
...a-2.0.1.ebuild => wine-vanilla-2.0.1-r1.ebuild} | 45 +++++++++++------ |
| 25 |
.../wine-vanilla/wine-vanilla-2.0.1.ebuild | 39 +++++++++----- |
| 26 |
...a-2.0.1.ebuild => wine-vanilla-2.0.2-r1.ebuild} | 45 +++++++++++------ |
| 27 |
.../wine-vanilla/wine-vanilla-2.0.2.ebuild | 39 +++++++++----- |
| 28 |
app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild | 39 +++++++++----- |
| 29 |
app-emulation/wine-vanilla/wine-vanilla-2.1.ebuild | 43 +++++++++++----- |
| 30 |
.../wine-vanilla/wine-vanilla-2.10.ebuild | 43 +++++++++++----- |
| 31 |
.../wine-vanilla/wine-vanilla-2.11.ebuild | 43 +++++++++++----- |
| 32 |
.../wine-vanilla/wine-vanilla-2.12.ebuild | 43 +++++++++++----- |
| 33 |
.../wine-vanilla/wine-vanilla-2.13.ebuild | 43 +++++++++++----- |
| 34 |
.../wine-vanilla/wine-vanilla-2.14.ebuild | 43 +++++++++++----- |
| 35 |
.../wine-vanilla/wine-vanilla-2.15.ebuild | 43 +++++++++++----- |
| 36 |
.../wine-vanilla/wine-vanilla-2.16.ebuild | 43 +++++++++++----- |
| 37 |
.../wine-vanilla/wine-vanilla-2.17.ebuild | 43 +++++++++++----- |
| 38 |
.../wine-vanilla/wine-vanilla-2.18.ebuild | 40 ++++++++++----- |
| 39 |
app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild | 43 +++++++++++----- |
| 40 |
app-emulation/wine-vanilla/wine-vanilla-2.3.ebuild | 43 +++++++++++----- |
| 41 |
app-emulation/wine-vanilla/wine-vanilla-2.4.ebuild | 43 +++++++++++----- |
| 42 |
app-emulation/wine-vanilla/wine-vanilla-2.5.ebuild | 43 +++++++++++----- |
| 43 |
app-emulation/wine-vanilla/wine-vanilla-2.6.ebuild | 43 +++++++++++----- |
| 44 |
app-emulation/wine-vanilla/wine-vanilla-2.7.ebuild | 43 +++++++++++----- |
| 45 |
app-emulation/wine-vanilla/wine-vanilla-2.8.ebuild | 43 +++++++++++----- |
| 46 |
app-emulation/wine-vanilla/wine-vanilla-2.9.ebuild | 43 +++++++++++----- |
| 47 |
.../wine-vanilla/wine-vanilla-9999.ebuild | 47 ++++++++++------- |
| 48 |
33 files changed, 715 insertions(+), 563 deletions(-) |
| 49 |
|
| 50 |
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest |
| 51 |
index 14fcc0025fa..6ce2882b142 100644 |
| 52 |
--- a/app-emulation/wine-vanilla/Manifest |
| 53 |
+++ b/app-emulation/wine-vanilla/Manifest |
| 54 |
@@ -1,3 +1,4 @@ |
| 55 |
+DIST gentoo-wine-patches-20170830.tar.xz 58456 SHA256 fb7781d0ae360cbc3860c2d2e81527a1b903da824c01f5d5040e95aaf99a3970 SHA512 5e5159e3252b246bba0ef7fdba345db3ab1071c5b8b8b625f98eda18779d4024c5b76bdbf49ce7bd5c6b01b422807adf76820beddb2b4a6ee9e67d13052cc575 WHIRLPOOL a79be264bab3fcdeee06fef47efd28e6e1125254ac7f82300cb6ba2591ef69cd76b5fed8f778b1849a0659e680e9fc785f0273d55cb2ed95648a74dffa5e22d2 |
| 56 |
DIST wine-2.0.1.tar.xz 18845444 SHA256 6cfb4eaae566dc7afb7ac0f1f2db2c0d69969952acab0debf084ee8f7b071583 SHA512 b32d07443655898768383b7409c21093b60c028fef166a596dad5dfab5a329b9fce4552e612c6d182e4f67eb1f28ed497fe2ed6af55d0000d3e96a124547722d WHIRLPOOL 0fbaf53504e4e40db6227f45f5b92ac388c2bf23d4f573e4d3b60ccaaadeeccb5a696226d1bd4aa8b245f21c8d6a13aac423ead3f4692ebc1e8e613714168501 |
| 57 |
DIST wine-2.0.2.tar.xz 18854952 SHA256 f71884f539928877f4b415309f582825d3d3c9976104e43d566944c710713c9a SHA512 3f37080a951819304cd3475f6012f1d6b5a94879b137cdf816cac4c8fde68ddc777905e92277ec5dce96437d8c32c43d55d3750b582781a9f9774b118f1a5b90 WHIRLPOOL cf21a899c60749c37353abc4ba974b3d6cc369769ace70fde899ff1cb5ac8a97828165cf2dbfbcf0915f5196ac58974948fe3e5b2c9854296a5eea75f8023ae5 |
| 58 |
DIST wine-2.0.tar.bz2 23662707 SHA256 9756f5a2129b6a83ba701e546173cbff86caa671b0af73eb8f72c03b20c066c6 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186 WHIRLPOOL fa9f774d87dae73c7d1f3b86dc3b03ea27065eb6140f1cac13c82fe16f7ebff8f8365ed447220cf5c2788b9f4aae7c482e4f9e2e69f47e5435209e148f5dbdfe |
| 59 |
|
| 60 |
diff --git a/app-emulation/wine-vanilla/files/builtin_ms_va_list.c b/app-emulation/wine-vanilla/files/builtin_ms_va_list.c |
| 61 |
deleted file mode 100644 |
| 62 |
index f36fc2609a0..00000000000 |
| 63 |
--- a/app-emulation/wine-vanilla/files/builtin_ms_va_list.c |
| 64 |
+++ /dev/null |
| 65 |
@@ -1,9 +0,0 @@ |
| 66 |
-/* Taken from Wine's configure script. LGPL 2.1+ */ |
| 67 |
- |
| 68 |
-#include <stdarg.h> |
| 69 |
- |
| 70 |
-int main(void) |
| 71 |
-{ |
| 72 |
- void func(__builtin_ms_va_list *args); |
| 73 |
- return 0; |
| 74 |
-} |
| 75 |
|
| 76 |
diff --git a/app-emulation/wine-vanilla/files/pr66838.c b/app-emulation/wine-vanilla/files/pr66838.c |
| 77 |
deleted file mode 100644 |
| 78 |
index cd616859427..00000000000 |
| 79 |
--- a/app-emulation/wine-vanilla/files/pr66838.c |
| 80 |
+++ /dev/null |
| 81 |
@@ -1,36 +0,0 @@ |
| 82 |
-/* From gcc svn, /branches/gcc-5-branch/gcc/testsuite/gcc.target/i386/pr66838.c */ |
| 83 |
-/* Copyrighted and distributed under the same terms as gcc */ |
| 84 |
- |
| 85 |
-void abort (void); |
| 86 |
- |
| 87 |
-char global; |
| 88 |
- |
| 89 |
-__attribute__((sysv_abi, noinline, noclone)) |
| 90 |
-void sysv_abi_func(char const *desc, void *local) |
| 91 |
-{ |
| 92 |
- register int esi asm ("esi"); |
| 93 |
- register int edi asm ("edi"); |
| 94 |
- |
| 95 |
- if (local != &global) |
| 96 |
- abort (); |
| 97 |
- |
| 98 |
- /* Clobber some of the extra SYSV ABI registers. */ |
| 99 |
- asm volatile ("movl\t%2, %0\n\tmovl\t%2, %1" |
| 100 |
- : "=r" (esi), "=r" (edi) |
| 101 |
- : "i" (0xdeadbeef)); |
| 102 |
-} |
| 103 |
- |
| 104 |
-__attribute__((ms_abi, noinline, noclone)) |
| 105 |
-void ms_abi_func () |
| 106 |
-{ |
| 107 |
- sysv_abi_func ("1st call", &global); |
| 108 |
- sysv_abi_func ("2nd call", &global); |
| 109 |
- sysv_abi_func ("3rd call", &global); |
| 110 |
-} |
| 111 |
- |
| 112 |
-int |
| 113 |
-main(void) |
| 114 |
-{ |
| 115 |
- ms_abi_func(); |
| 116 |
- return 0; |
| 117 |
-} |
| 118 |
|
| 119 |
diff --git a/app-emulation/wine-vanilla/files/pr69140.c b/app-emulation/wine-vanilla/files/pr69140.c |
| 120 |
deleted file mode 100644 |
| 121 |
index 7c9e001f301..00000000000 |
| 122 |
--- a/app-emulation/wine-vanilla/files/pr69140.c |
| 123 |
+++ /dev/null |
| 124 |
@@ -1,37 +0,0 @@ |
| 125 |
-/* { dg-do compile { target lp64 } } */ |
| 126 |
-/* { dg-options "-O2 -mincoming-stack-boundary=3" } */ |
| 127 |
- |
| 128 |
-typedef struct { |
| 129 |
- unsigned int buf[4]; |
| 130 |
- unsigned char in[64]; |
| 131 |
-} MD4_CTX; |
| 132 |
- |
| 133 |
-static void |
| 134 |
-MD4Transform (unsigned int buf[4], const unsigned int in[16]) |
| 135 |
-{ |
| 136 |
- unsigned int a, b, c, d; |
| 137 |
- (b) += ((((c)) & ((d))) | ((~(c)) & ((a)))) + (in[7]); |
| 138 |
- (a) += ((((b)) & ((c))) | ((~(b)) & ((d)))) + (in[8]); |
| 139 |
- (d) += ((((a)) & ((b))) | ((~(a)) & ((c)))) + (in[9]); |
| 140 |
- buf[3] += d; |
| 141 |
-} |
| 142 |
- |
| 143 |
-void __attribute__((ms_abi)) |
| 144 |
-MD4Update (MD4_CTX *ctx, const unsigned char *buf) |
| 145 |
-{ |
| 146 |
- MD4Transform( ctx->buf, (unsigned int *)ctx->in); |
| 147 |
- MD4Transform( ctx->buf, (unsigned int *)ctx->in); |
| 148 |
-} |
| 149 |
- |
| 150 |
-int |
| 151 |
-main(void) |
| 152 |
-{ |
| 153 |
- MD4_CTX ctx_test = |
| 154 |
- { |
| 155 |
- { 0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476 }, |
| 156 |
- { 0, 0 } |
| 157 |
- }; |
| 158 |
- unsigned char buf[64]; |
| 159 |
- |
| 160 |
- MD4Update(&ctx_test, (const unsigned char *) &buf); |
| 161 |
-} |
| 162 |
|
| 163 |
diff --git a/app-emulation/wine-vanilla/files/wine-1.5.26-winegcc.patch b/app-emulation/wine-vanilla/files/wine-1.5.26-winegcc.patch |
| 164 |
deleted file mode 100644 |
| 165 |
index 2045e343401..00000000000 |
| 166 |
--- a/app-emulation/wine-vanilla/files/wine-1.5.26-winegcc.patch |
| 167 |
+++ /dev/null |
| 168 |
@@ -1,59 +0,0 @@ |
| 169 |
-http://bugs.gentoo.org/260726 |
| 170 |
- |
| 171 |
-diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c |
| 172 |
-index 16b4165..5c77267 100644 |
| 173 |
---- a/tools/winebuild/main.c |
| 174 |
-+++ b/tools/winebuild/main.c |
| 175 |
-@@ -48,10 +48,13 @@ int link_ext_symbols = 0; |
| 176 |
- int force_pointer_size = 0; |
| 177 |
- int unwind_tables = 0; |
| 178 |
- |
| 179 |
-+#undef FORCE_POINTER_SIZE |
| 180 |
- #ifdef __i386__ |
| 181 |
- enum target_cpu target_cpu = CPU_x86; |
| 182 |
-+#define FORCE_POINTER_SIZE |
| 183 |
- #elif defined(__x86_64__) |
| 184 |
- enum target_cpu target_cpu = CPU_x86_64; |
| 185 |
-+#define FORCE_POINTER_SIZE |
| 186 |
- #elif defined(__powerpc__) |
| 187 |
- enum target_cpu target_cpu = CPU_POWERPC; |
| 188 |
- #elif defined(__arm__) |
| 189 |
-@@ -611,6 +614,10 @@ int main(int argc, char **argv) |
| 190 |
- signal( SIGTERM, exit_on_signal ); |
| 191 |
- signal( SIGINT, exit_on_signal ); |
| 192 |
- |
| 193 |
-+#ifdef FORCE_POINTER_SIZE |
| 194 |
-+ force_pointer_size = sizeof(size_t); |
| 195 |
-+#endif |
| 196 |
-+ |
| 197 |
- output_file = stdout; |
| 198 |
- argv = parse_options( argc, argv, spec ); |
| 199 |
- |
| 200 |
-diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c |
| 201 |
-index 06aa200..c44d2e3 100644 |
| 202 |
---- a/tools/winegcc/winegcc.c |
| 203 |
-+++ b/tools/winegcc/winegcc.c |
| 204 |
-@@ -213,10 +213,13 @@ struct options |
| 205 |
- strarray* files; |
| 206 |
- }; |
| 207 |
- |
| 208 |
-+#undef FORCE_POINTER_SIZE |
| 209 |
- #ifdef __i386__ |
| 210 |
- static const enum target_cpu build_cpu = CPU_x86; |
| 211 |
-+#define FORCE_POINTER_SIZE |
| 212 |
- #elif defined(__x86_64__) |
| 213 |
- static const enum target_cpu build_cpu = CPU_x86_64; |
| 214 |
-+#define FORCE_POINTER_SIZE |
| 215 |
- #elif defined(__powerpc__) |
| 216 |
- static const enum target_cpu build_cpu = CPU_POWERPC; |
| 217 |
- #elif defined(__arm__) |
| 218 |
-@@ -1258,6 +1261,9 @@ int main(int argc, char **argv) |
| 219 |
- opts.linker_args = strarray_alloc(); |
| 220 |
- opts.compiler_args = strarray_alloc(); |
| 221 |
- opts.winebuild_args = strarray_alloc(); |
| 222 |
-+#ifdef FORCE_POINTER_SIZE |
| 223 |
-+ opts.force_pointer_size = sizeof(size_t); |
| 224 |
-+#endif |
| 225 |
- |
| 226 |
- /* determine the processor type */ |
| 227 |
- if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp; |
| 228 |
|
| 229 |
diff --git a/app-emulation/wine-vanilla/files/wine-1.6-memset-O3.patch b/app-emulation/wine-vanilla/files/wine-1.6-memset-O3.patch |
| 230 |
deleted file mode 100644 |
| 231 |
index 75372f86914..00000000000 |
| 232 |
--- a/app-emulation/wine-vanilla/files/wine-1.6-memset-O3.patch |
| 233 |
+++ /dev/null |
| 234 |
@@ -1,21 +0,0 @@ |
| 235 |
-Avoid "undefined reference to `memset'" error when building with |
| 236 |
-USE=custom-cflags and -O3 in CFLAGS with gcc-4.8. |
| 237 |
- |
| 238 |
-See: |
| 239 |
- |
| 240 |
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56888 |
| 241 |
-http://bugs.winehq.org/show_bug.cgi?id=33521 |
| 242 |
-https://bugs.gentoo.org/show_bug.cgi?id=480508 |
| 243 |
- |
| 244 |
-diff --git a/configure.ac b/configure.ac |
| 245 |
-index d8033cf..fe7cc7d 100644 |
| 246 |
---- a/configure.ac |
| 247 |
-+++ b/configure.ac |
| 248 |
-@@ -1767,6 +1767,7 @@ then |
| 249 |
- |
| 250 |
- dnl Check for some compiler flags |
| 251 |
- WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) |
| 252 |
-+ WINE_TRY_CFLAGS([-fno-tree-loop-distribute-patterns]) |
| 253 |
- WINE_TRY_CFLAGS([-fno-strict-aliasing]) |
| 254 |
- dnl clang needs to be told to fail on unknown options |
| 255 |
- saved_CFLAGS=$CFLAGS |
| 256 |
|
| 257 |
diff --git a/app-emulation/wine-vanilla/files/wine-1.9.5-multilib-portage.patch b/app-emulation/wine-vanilla/files/wine-1.9.5-multilib-portage.patch |
| 258 |
deleted file mode 100644 |
| 259 |
index c19d0d8a0b0..00000000000 |
| 260 |
--- a/app-emulation/wine-vanilla/files/wine-1.9.5-multilib-portage.patch |
| 261 |
+++ /dev/null |
| 262 |
@@ -1,31 +0,0 @@ |
| 263 |
-https://bugs.gentoo.org/show_bug.cgi?id=395615 |
| 264 |
- |
| 265 |
-Explicitly add the required -m32/m64 to *FLAGS; this overrides any |
| 266 |
-arch-specific -m* flags that may have been appended by multilib-portage. |
| 267 |
- |
| 268 |
-Even though -m32/m64 is now added to *FLAGS, -m32/m64 still has to be |
| 269 |
-explicitly added to CC and CXX due to wine's build system. For example, |
| 270 |
-winegcc saves the build-time value of CC and uses it at runtime. |
| 271 |
- |
| 272 |
---- a/configure.ac 2016-03-05 20:53:50.574628728 -0500 |
| 273 |
-+++ b/configure.ac 2016-03-05 20:57:54.945617833 -0500 |
| 274 |
-@@ -141,6 +141,9 @@ |
| 275 |
- then |
| 276 |
- CC="$CC -m32" |
| 277 |
- CXX="$CXX -m32" |
| 278 |
-+ CFLAGS="$CFLAGS -m32" |
| 279 |
-+ LDFLAGS="$LDFLAGS -m32" |
| 280 |
-+ CXXFLAGS="$CXXFLAGS -m32" |
| 281 |
- AC_MSG_CHECKING([whether $CC works]) |
| 282 |
- AC_LINK_IFELSE([AC_LANG_PROGRAM()],AC_MSG_RESULT([yes]), |
| 283 |
- [AC_MSG_RESULT([no]) |
| 284 |
-@@ -160,6 +163,9 @@ |
| 285 |
- fi |
| 286 |
- CC="$CC -m64" |
| 287 |
- CXX="$CXX -m64" |
| 288 |
-+ CFLAGS="$CFLAGS -m64" |
| 289 |
-+ LDFLAGS="$LDFLAGS -m64" |
| 290 |
-+ CXXFLAGS="$CXXFLAGS -m64" |
| 291 |
- host_cpu="x86_64" |
| 292 |
- notice_platform="64-bit " |
| 293 |
- AC_SUBST(TARGETFLAGS,"-m64") |
| 294 |
|
| 295 |
diff --git a/app-emulation/wine-vanilla/files/wine-2.0-multislot-apploader.patch b/app-emulation/wine-vanilla/files/wine-2.0-multislot-apploader.patch |
| 296 |
deleted file mode 100644 |
| 297 |
index b336c4f51e8..00000000000 |
| 298 |
--- a/app-emulation/wine-vanilla/files/wine-2.0-multislot-apploader.patch |
| 299 |
+++ /dev/null |
| 300 |
@@ -1,14 +0,0 @@ |
| 301 |
-diff --git a/tools/wineapploader.in b/tools/wineapploader.in |
| 302 |
-index f48d552..14001a0 100755 |
| 303 |
---- a/tools/wineapploader.in |
| 304 |
-+++ b/tools/wineapploader.in |
| 305 |
-@@ -20,7 +20,8 @@ |
| 306 |
- # |
| 307 |
- |
| 308 |
- # determine the app Winelib library name |
| 309 |
--appname=`basename "$0" .exe`.exe |
| 310 |
-+appname=${0##*/} |
| 311 |
-+appname="${appname%%-*}.exe" |
| 312 |
- |
| 313 |
- # first try explicit WINELOADER |
| 314 |
- if [ -x "$WINELOADER" ]; then exec "$WINELOADER" "$appname" "$@"; fi |
| 315 |
|
| 316 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild |
| 317 |
similarity index 92% |
| 318 |
copy from app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild |
| 319 |
copy to app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild |
| 320 |
index e5940fa17ff..697e0f31fb0 100644 |
| 321 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild |
| 322 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild |
| 323 |
@@ -12,25 +12,25 @@ MY_PN="${PN%%-*}" |
| 324 |
MY_P="${MY_PN}-${PV}" |
| 325 |
|
| 326 |
if [[ ${PV} == "9999" ]] ; then |
| 327 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 328 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 329 |
EGIT_BRANCH="master" |
| 330 |
inherit git-r3 |
| 331 |
SRC_URI="" |
| 332 |
#KEYWORDS="" |
| 333 |
else |
| 334 |
MAJOR_V=$(get_version_component_range 1) |
| 335 |
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" |
| 336 |
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.bz2" |
| 337 |
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 338 |
fi |
| 339 |
S="${WORKDIR}/${MY_P}" |
| 340 |
|
| 341 |
-WDC_V="20150204" |
| 342 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 343 |
+GWP_V="20170830" |
| 344 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 345 |
|
| 346 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 347 |
-HOMEPAGE="http://www.winehq.org/" |
| 348 |
+HOMEPAGE="https://www.winehq.org/" |
| 349 |
SRC_URI="${SRC_URI} |
| 350 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 351 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 352 |
" |
| 353 |
|
| 354 |
LICENSE="LGPL-2.1" |
| 355 |
@@ -131,6 +131,7 @@ RDEPEND="${COMMON_DEPEND} |
| 356 |
|
| 357 |
# tools/make_requests requires perl |
| 358 |
DEPEND="${COMMON_DEPEND} |
| 359 |
+ dev-util/patchbin |
| 360 |
sys-devel/flex |
| 361 |
>=sys-kernel/linux-headers-2.6 |
| 362 |
virtual/pkgconfig |
| 363 |
@@ -158,7 +159,7 @@ wine_compiler_check() { |
| 364 |
# bug #549768 |
| 365 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 366 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 367 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 368 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 369 |
# Run in subshell to prevent "Aborted" message |
| 370 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 371 |
if ! eend $?; then |
| 372 |
@@ -174,7 +175,7 @@ wine_compiler_check() { |
| 373 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 374 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 375 |
# Compile in subshell to prevent "Aborted" message |
| 376 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 377 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 378 |
if ! eend $?; then |
| 379 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 380 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 381 |
@@ -190,7 +191,7 @@ wine_compiler_check() { |
| 382 |
if use abi_x86_64; then |
| 383 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 384 |
# Compile in subshell to prevent "Aborted" message |
| 385 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 386 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 387 |
if ! eend $?; then |
| 388 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 389 |
eerror |
| 390 |
@@ -289,15 +290,29 @@ src_unpack() { |
| 391 |
} |
| 392 |
|
| 393 |
src_prepare() { |
| 394 |
+ |
| 395 |
+ eapply_bin(){ |
| 396 |
+ local patch |
| 397 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 398 |
+ patchbin --nogit < "${patch}" || die |
| 399 |
+ done |
| 400 |
+ } |
| 401 |
+ |
| 402 |
local md5="$(md5sum server/protocol.def)" |
| 403 |
local PATCHES=( |
| 404 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 405 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 406 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 407 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 408 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 409 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 410 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 411 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 412 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 413 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 414 |
+ ) |
| 415 |
+ local PATCHES_BIN=( |
| 416 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 417 |
) |
| 418 |
|
| 419 |
default |
| 420 |
+ eapply_bin |
| 421 |
eautoreconf |
| 422 |
|
| 423 |
# Modification of the server protocol requires regenerating the server requests |
| 424 |
@@ -313,8 +328,8 @@ src_prepare() { |
| 425 |
# Edit wine.desktop to work for specific variant |
| 426 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 427 |
|
| 428 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 429 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 430 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 431 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 432 |
|
| 433 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 434 |
} |
| 435 |
|
| 436 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild |
| 437 |
similarity index 92% |
| 438 |
copy from app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild |
| 439 |
copy to app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild |
| 440 |
index 3956ec1c0a3..72ca9065ccc 100644 |
| 441 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild |
| 442 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild |
| 443 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 444 |
MY_P="${MY_PN}-${PV}" |
| 445 |
|
| 446 |
if [[ ${PV} == "9999" ]] ; then |
| 447 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 448 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 449 |
EGIT_BRANCH="master" |
| 450 |
inherit git-r3 |
| 451 |
SRC_URI="" |
| 452 |
@@ -20,17 +20,17 @@ if [[ ${PV} == "9999" ]] ; then |
| 453 |
else |
| 454 |
MAJOR_V=$(get_version_component_range 1) |
| 455 |
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz" |
| 456 |
- KEYWORDS="-* amd64 x86 ~x86-fbsd" |
| 457 |
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 458 |
fi |
| 459 |
S="${WORKDIR}/${MY_P}" |
| 460 |
|
| 461 |
-WDC_V="20150204" |
| 462 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 463 |
+GWP_V="20170830" |
| 464 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 465 |
|
| 466 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 467 |
-HOMEPAGE="http://www.winehq.org/" |
| 468 |
+HOMEPAGE="https://www.winehq.org/" |
| 469 |
SRC_URI="${SRC_URI} |
| 470 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 471 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 472 |
" |
| 473 |
|
| 474 |
LICENSE="LGPL-2.1" |
| 475 |
@@ -131,6 +131,7 @@ RDEPEND="${COMMON_DEPEND} |
| 476 |
|
| 477 |
# tools/make_requests requires perl |
| 478 |
DEPEND="${COMMON_DEPEND} |
| 479 |
+ dev-util/patchbin |
| 480 |
sys-devel/flex |
| 481 |
>=sys-kernel/linux-headers-2.6 |
| 482 |
virtual/pkgconfig |
| 483 |
@@ -158,7 +159,7 @@ wine_compiler_check() { |
| 484 |
# bug #549768 |
| 485 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 486 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 487 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 488 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 489 |
# Run in subshell to prevent "Aborted" message |
| 490 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 491 |
if ! eend $?; then |
| 492 |
@@ -174,7 +175,7 @@ wine_compiler_check() { |
| 493 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 494 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 495 |
# Compile in subshell to prevent "Aborted" message |
| 496 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 497 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 498 |
if ! eend $?; then |
| 499 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 500 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 501 |
@@ -190,7 +191,7 @@ wine_compiler_check() { |
| 502 |
if use abi_x86_64; then |
| 503 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 504 |
# Compile in subshell to prevent "Aborted" message |
| 505 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 506 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 507 |
if ! eend $?; then |
| 508 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 509 |
eerror |
| 510 |
@@ -289,15 +290,29 @@ src_unpack() { |
| 511 |
} |
| 512 |
|
| 513 |
src_prepare() { |
| 514 |
+ |
| 515 |
+ eapply_bin(){ |
| 516 |
+ local patch |
| 517 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 518 |
+ patchbin --nogit < "${patch}" || die |
| 519 |
+ done |
| 520 |
+ } |
| 521 |
+ |
| 522 |
local md5="$(md5sum server/protocol.def)" |
| 523 |
local PATCHES=( |
| 524 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 525 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 526 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 527 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 528 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 529 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 530 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 531 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 532 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 533 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 534 |
+ ) |
| 535 |
+ local PATCHES_BIN=( |
| 536 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 537 |
) |
| 538 |
|
| 539 |
default |
| 540 |
+ eapply_bin |
| 541 |
eautoreconf |
| 542 |
|
| 543 |
# Modification of the server protocol requires regenerating the server requests |
| 544 |
@@ -313,8 +328,8 @@ src_prepare() { |
| 545 |
# Edit wine.desktop to work for specific variant |
| 546 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 547 |
|
| 548 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 549 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 550 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 551 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 552 |
|
| 553 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 554 |
} |
| 555 |
|
| 556 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild |
| 557 |
index 3956ec1c0a3..4024b479135 100644 |
| 558 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild |
| 559 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild |
| 560 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 561 |
MY_P="${MY_PN}-${PV}" |
| 562 |
|
| 563 |
if [[ ${PV} == "9999" ]] ; then |
| 564 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 565 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 566 |
EGIT_BRANCH="master" |
| 567 |
inherit git-r3 |
| 568 |
SRC_URI="" |
| 569 |
@@ -24,13 +24,13 @@ else |
| 570 |
fi |
| 571 |
S="${WORKDIR}/${MY_P}" |
| 572 |
|
| 573 |
-WDC_V="20150204" |
| 574 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 575 |
+GWP_V="20170830" |
| 576 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 577 |
|
| 578 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 579 |
-HOMEPAGE="http://www.winehq.org/" |
| 580 |
+HOMEPAGE="https://www.winehq.org/" |
| 581 |
SRC_URI="${SRC_URI} |
| 582 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 583 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 584 |
" |
| 585 |
|
| 586 |
LICENSE="LGPL-2.1" |
| 587 |
@@ -158,7 +158,7 @@ wine_compiler_check() { |
| 588 |
# bug #549768 |
| 589 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 590 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 591 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 592 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 593 |
# Run in subshell to prevent "Aborted" message |
| 594 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 595 |
if ! eend $?; then |
| 596 |
@@ -174,7 +174,7 @@ wine_compiler_check() { |
| 597 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 598 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 599 |
# Compile in subshell to prevent "Aborted" message |
| 600 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 601 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 602 |
if ! eend $?; then |
| 603 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 604 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 605 |
@@ -190,7 +190,7 @@ wine_compiler_check() { |
| 606 |
if use abi_x86_64; then |
| 607 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 608 |
# Compile in subshell to prevent "Aborted" message |
| 609 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 610 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 611 |
if ! eend $?; then |
| 612 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 613 |
eerror |
| 614 |
@@ -289,15 +289,26 @@ src_unpack() { |
| 615 |
} |
| 616 |
|
| 617 |
src_prepare() { |
| 618 |
+ |
| 619 |
+ eapply_bin(){ |
| 620 |
+ local patch |
| 621 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 622 |
+ patchbin --nogit < "${patch}" || die |
| 623 |
+ done |
| 624 |
+ } |
| 625 |
+ |
| 626 |
local md5="$(md5sum server/protocol.def)" |
| 627 |
local PATCHES=( |
| 628 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 629 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 630 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 631 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 632 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 633 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 634 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 635 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 636 |
+ ) |
| 637 |
+ local PATCHES_BIN=( |
| 638 |
) |
| 639 |
|
| 640 |
default |
| 641 |
+ eapply_bin |
| 642 |
eautoreconf |
| 643 |
|
| 644 |
# Modification of the server protocol requires regenerating the server requests |
| 645 |
@@ -313,8 +324,8 @@ src_prepare() { |
| 646 |
# Edit wine.desktop to work for specific variant |
| 647 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 648 |
|
| 649 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 650 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 651 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 652 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 653 |
|
| 654 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 655 |
} |
| 656 |
|
| 657 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild |
| 658 |
similarity index 92% |
| 659 |
copy from app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild |
| 660 |
copy to app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild |
| 661 |
index 3956ec1c0a3..72ca9065ccc 100644 |
| 662 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild |
| 663 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild |
| 664 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 665 |
MY_P="${MY_PN}-${PV}" |
| 666 |
|
| 667 |
if [[ ${PV} == "9999" ]] ; then |
| 668 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 669 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 670 |
EGIT_BRANCH="master" |
| 671 |
inherit git-r3 |
| 672 |
SRC_URI="" |
| 673 |
@@ -20,17 +20,17 @@ if [[ ${PV} == "9999" ]] ; then |
| 674 |
else |
| 675 |
MAJOR_V=$(get_version_component_range 1) |
| 676 |
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz" |
| 677 |
- KEYWORDS="-* amd64 x86 ~x86-fbsd" |
| 678 |
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 679 |
fi |
| 680 |
S="${WORKDIR}/${MY_P}" |
| 681 |
|
| 682 |
-WDC_V="20150204" |
| 683 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 684 |
+GWP_V="20170830" |
| 685 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 686 |
|
| 687 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 688 |
-HOMEPAGE="http://www.winehq.org/" |
| 689 |
+HOMEPAGE="https://www.winehq.org/" |
| 690 |
SRC_URI="${SRC_URI} |
| 691 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 692 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 693 |
" |
| 694 |
|
| 695 |
LICENSE="LGPL-2.1" |
| 696 |
@@ -131,6 +131,7 @@ RDEPEND="${COMMON_DEPEND} |
| 697 |
|
| 698 |
# tools/make_requests requires perl |
| 699 |
DEPEND="${COMMON_DEPEND} |
| 700 |
+ dev-util/patchbin |
| 701 |
sys-devel/flex |
| 702 |
>=sys-kernel/linux-headers-2.6 |
| 703 |
virtual/pkgconfig |
| 704 |
@@ -158,7 +159,7 @@ wine_compiler_check() { |
| 705 |
# bug #549768 |
| 706 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 707 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 708 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 709 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 710 |
# Run in subshell to prevent "Aborted" message |
| 711 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 712 |
if ! eend $?; then |
| 713 |
@@ -174,7 +175,7 @@ wine_compiler_check() { |
| 714 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 715 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 716 |
# Compile in subshell to prevent "Aborted" message |
| 717 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 718 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 719 |
if ! eend $?; then |
| 720 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 721 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 722 |
@@ -190,7 +191,7 @@ wine_compiler_check() { |
| 723 |
if use abi_x86_64; then |
| 724 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 725 |
# Compile in subshell to prevent "Aborted" message |
| 726 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 727 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 728 |
if ! eend $?; then |
| 729 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 730 |
eerror |
| 731 |
@@ -289,15 +290,29 @@ src_unpack() { |
| 732 |
} |
| 733 |
|
| 734 |
src_prepare() { |
| 735 |
+ |
| 736 |
+ eapply_bin(){ |
| 737 |
+ local patch |
| 738 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 739 |
+ patchbin --nogit < "${patch}" || die |
| 740 |
+ done |
| 741 |
+ } |
| 742 |
+ |
| 743 |
local md5="$(md5sum server/protocol.def)" |
| 744 |
local PATCHES=( |
| 745 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 746 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 747 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 748 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 749 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 750 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 751 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 752 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 753 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 754 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 755 |
+ ) |
| 756 |
+ local PATCHES_BIN=( |
| 757 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 758 |
) |
| 759 |
|
| 760 |
default |
| 761 |
+ eapply_bin |
| 762 |
eautoreconf |
| 763 |
|
| 764 |
# Modification of the server protocol requires regenerating the server requests |
| 765 |
@@ -313,8 +328,8 @@ src_prepare() { |
| 766 |
# Edit wine.desktop to work for specific variant |
| 767 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 768 |
|
| 769 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 770 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 771 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 772 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 773 |
|
| 774 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 775 |
} |
| 776 |
|
| 777 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2.ebuild |
| 778 |
index 3956ec1c0a3..4024b479135 100644 |
| 779 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2.ebuild |
| 780 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2.ebuild |
| 781 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 782 |
MY_P="${MY_PN}-${PV}" |
| 783 |
|
| 784 |
if [[ ${PV} == "9999" ]] ; then |
| 785 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 786 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 787 |
EGIT_BRANCH="master" |
| 788 |
inherit git-r3 |
| 789 |
SRC_URI="" |
| 790 |
@@ -24,13 +24,13 @@ else |
| 791 |
fi |
| 792 |
S="${WORKDIR}/${MY_P}" |
| 793 |
|
| 794 |
-WDC_V="20150204" |
| 795 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 796 |
+GWP_V="20170830" |
| 797 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 798 |
|
| 799 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 800 |
-HOMEPAGE="http://www.winehq.org/" |
| 801 |
+HOMEPAGE="https://www.winehq.org/" |
| 802 |
SRC_URI="${SRC_URI} |
| 803 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 804 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 805 |
" |
| 806 |
|
| 807 |
LICENSE="LGPL-2.1" |
| 808 |
@@ -158,7 +158,7 @@ wine_compiler_check() { |
| 809 |
# bug #549768 |
| 810 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 811 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 812 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 813 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 814 |
# Run in subshell to prevent "Aborted" message |
| 815 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 816 |
if ! eend $?; then |
| 817 |
@@ -174,7 +174,7 @@ wine_compiler_check() { |
| 818 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 819 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 820 |
# Compile in subshell to prevent "Aborted" message |
| 821 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 822 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 823 |
if ! eend $?; then |
| 824 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 825 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 826 |
@@ -190,7 +190,7 @@ wine_compiler_check() { |
| 827 |
if use abi_x86_64; then |
| 828 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 829 |
# Compile in subshell to prevent "Aborted" message |
| 830 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 831 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 832 |
if ! eend $?; then |
| 833 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 834 |
eerror |
| 835 |
@@ -289,15 +289,26 @@ src_unpack() { |
| 836 |
} |
| 837 |
|
| 838 |
src_prepare() { |
| 839 |
+ |
| 840 |
+ eapply_bin(){ |
| 841 |
+ local patch |
| 842 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 843 |
+ patchbin --nogit < "${patch}" || die |
| 844 |
+ done |
| 845 |
+ } |
| 846 |
+ |
| 847 |
local md5="$(md5sum server/protocol.def)" |
| 848 |
local PATCHES=( |
| 849 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 850 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 851 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 852 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 853 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 854 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 855 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 856 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 857 |
+ ) |
| 858 |
+ local PATCHES_BIN=( |
| 859 |
) |
| 860 |
|
| 861 |
default |
| 862 |
+ eapply_bin |
| 863 |
eautoreconf |
| 864 |
|
| 865 |
# Modification of the server protocol requires regenerating the server requests |
| 866 |
@@ -313,8 +324,8 @@ src_prepare() { |
| 867 |
# Edit wine.desktop to work for specific variant |
| 868 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 869 |
|
| 870 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 871 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 872 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 873 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 874 |
|
| 875 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 876 |
} |
| 877 |
|
| 878 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild |
| 879 |
index 442e17cd864..3ebfd211d13 100644 |
| 880 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild |
| 881 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild |
| 882 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 883 |
MY_P="${MY_PN}-${PV}" |
| 884 |
|
| 885 |
if [[ ${PV} == "9999" ]] ; then |
| 886 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 887 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 888 |
EGIT_BRANCH="master" |
| 889 |
inherit git-r3 |
| 890 |
SRC_URI="" |
| 891 |
@@ -24,13 +24,13 @@ else |
| 892 |
fi |
| 893 |
S="${WORKDIR}/${MY_P}" |
| 894 |
|
| 895 |
-WDC_V="20150204" |
| 896 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 897 |
+GWP_V="20170830" |
| 898 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 899 |
|
| 900 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 901 |
-HOMEPAGE="http://www.winehq.org/" |
| 902 |
+HOMEPAGE="https://www.winehq.org/" |
| 903 |
SRC_URI="${SRC_URI} |
| 904 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 905 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 906 |
" |
| 907 |
|
| 908 |
LICENSE="LGPL-2.1" |
| 909 |
@@ -158,7 +158,7 @@ wine_compiler_check() { |
| 910 |
# bug #549768 |
| 911 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 912 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 913 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 914 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 915 |
# Run in subshell to prevent "Aborted" message |
| 916 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 917 |
if ! eend $?; then |
| 918 |
@@ -174,7 +174,7 @@ wine_compiler_check() { |
| 919 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 920 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 921 |
# Compile in subshell to prevent "Aborted" message |
| 922 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 923 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 924 |
if ! eend $?; then |
| 925 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 926 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 927 |
@@ -190,7 +190,7 @@ wine_compiler_check() { |
| 928 |
if use abi_x86_64; then |
| 929 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 930 |
# Compile in subshell to prevent "Aborted" message |
| 931 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 932 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 933 |
if ! eend $?; then |
| 934 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 935 |
eerror |
| 936 |
@@ -289,15 +289,26 @@ src_unpack() { |
| 937 |
} |
| 938 |
|
| 939 |
src_prepare() { |
| 940 |
+ |
| 941 |
+ eapply_bin(){ |
| 942 |
+ local patch |
| 943 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 944 |
+ patchbin --nogit < "${patch}" || die |
| 945 |
+ done |
| 946 |
+ } |
| 947 |
+ |
| 948 |
local md5="$(md5sum server/protocol.def)" |
| 949 |
local PATCHES=( |
| 950 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 951 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 952 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 953 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 954 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 955 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 956 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 957 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 958 |
+ ) |
| 959 |
+ local PATCHES_BIN=( |
| 960 |
) |
| 961 |
|
| 962 |
default |
| 963 |
+ eapply_bin |
| 964 |
eautoreconf |
| 965 |
|
| 966 |
# Modification of the server protocol requires regenerating the server requests |
| 967 |
@@ -313,8 +324,8 @@ src_prepare() { |
| 968 |
# Edit wine.desktop to work for specific variant |
| 969 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 970 |
|
| 971 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 972 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 973 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 974 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 975 |
|
| 976 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 977 |
} |
| 978 |
|
| 979 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.1.ebuild |
| 980 |
index e5940fa17ff..5d4299bca59 100644 |
| 981 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.1.ebuild |
| 982 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.1.ebuild |
| 983 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 984 |
MY_P="${MY_PN}-${PV}" |
| 985 |
|
| 986 |
if [[ ${PV} == "9999" ]] ; then |
| 987 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 988 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 989 |
EGIT_BRANCH="master" |
| 990 |
inherit git-r3 |
| 991 |
SRC_URI="" |
| 992 |
@@ -24,13 +24,13 @@ else |
| 993 |
fi |
| 994 |
S="${WORKDIR}/${MY_P}" |
| 995 |
|
| 996 |
-WDC_V="20150204" |
| 997 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 998 |
+GWP_V="20170830" |
| 999 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 1000 |
|
| 1001 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 1002 |
-HOMEPAGE="http://www.winehq.org/" |
| 1003 |
+HOMEPAGE="https://www.winehq.org/" |
| 1004 |
SRC_URI="${SRC_URI} |
| 1005 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 1006 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 1007 |
" |
| 1008 |
|
| 1009 |
LICENSE="LGPL-2.1" |
| 1010 |
@@ -131,6 +131,7 @@ RDEPEND="${COMMON_DEPEND} |
| 1011 |
|
| 1012 |
# tools/make_requests requires perl |
| 1013 |
DEPEND="${COMMON_DEPEND} |
| 1014 |
+ dev-util/patchbin |
| 1015 |
sys-devel/flex |
| 1016 |
>=sys-kernel/linux-headers-2.6 |
| 1017 |
virtual/pkgconfig |
| 1018 |
@@ -158,7 +159,7 @@ wine_compiler_check() { |
| 1019 |
# bug #549768 |
| 1020 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 1021 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 1022 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 1023 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 1024 |
# Run in subshell to prevent "Aborted" message |
| 1025 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 1026 |
if ! eend $?; then |
| 1027 |
@@ -174,7 +175,7 @@ wine_compiler_check() { |
| 1028 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 1029 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 1030 |
# Compile in subshell to prevent "Aborted" message |
| 1031 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1032 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1033 |
if ! eend $?; then |
| 1034 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 1035 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 1036 |
@@ -190,7 +191,7 @@ wine_compiler_check() { |
| 1037 |
if use abi_x86_64; then |
| 1038 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 1039 |
# Compile in subshell to prevent "Aborted" message |
| 1040 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1041 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1042 |
if ! eend $?; then |
| 1043 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 1044 |
eerror |
| 1045 |
@@ -289,15 +290,29 @@ src_unpack() { |
| 1046 |
} |
| 1047 |
|
| 1048 |
src_prepare() { |
| 1049 |
+ |
| 1050 |
+ eapply_bin(){ |
| 1051 |
+ local patch |
| 1052 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 1053 |
+ patchbin --nogit < "${patch}" || die |
| 1054 |
+ done |
| 1055 |
+ } |
| 1056 |
+ |
| 1057 |
local md5="$(md5sum server/protocol.def)" |
| 1058 |
local PATCHES=( |
| 1059 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 1060 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 1061 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 1062 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 1063 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 1064 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 1065 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 1066 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 1067 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 1068 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 1069 |
+ ) |
| 1070 |
+ local PATCHES_BIN=( |
| 1071 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 1072 |
) |
| 1073 |
|
| 1074 |
default |
| 1075 |
+ eapply_bin |
| 1076 |
eautoreconf |
| 1077 |
|
| 1078 |
# Modification of the server protocol requires regenerating the server requests |
| 1079 |
@@ -313,8 +328,8 @@ src_prepare() { |
| 1080 |
# Edit wine.desktop to work for specific variant |
| 1081 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 1082 |
|
| 1083 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1084 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1085 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1086 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1087 |
|
| 1088 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 1089 |
} |
| 1090 |
|
| 1091 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.10.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.10.ebuild |
| 1092 |
index 39a904b169a..b79fd64dd9a 100644 |
| 1093 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.10.ebuild |
| 1094 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.10.ebuild |
| 1095 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 1096 |
MY_P="${MY_PN}-${PV}" |
| 1097 |
|
| 1098 |
if [[ ${PV} == "9999" ]] ; then |
| 1099 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 1100 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 1101 |
EGIT_BRANCH="master" |
| 1102 |
inherit git-r3 |
| 1103 |
SRC_URI="" |
| 1104 |
@@ -24,13 +24,13 @@ else |
| 1105 |
fi |
| 1106 |
S="${WORKDIR}/${MY_P}" |
| 1107 |
|
| 1108 |
-WDC_V="20150204" |
| 1109 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 1110 |
+GWP_V="20170830" |
| 1111 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 1112 |
|
| 1113 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 1114 |
-HOMEPAGE="http://www.winehq.org/" |
| 1115 |
+HOMEPAGE="https://www.winehq.org/" |
| 1116 |
SRC_URI="${SRC_URI} |
| 1117 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 1118 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 1119 |
" |
| 1120 |
|
| 1121 |
LICENSE="LGPL-2.1" |
| 1122 |
@@ -132,6 +132,7 @@ RDEPEND="${COMMON_DEPEND} |
| 1123 |
|
| 1124 |
# tools/make_requests requires perl |
| 1125 |
DEPEND="${COMMON_DEPEND} |
| 1126 |
+ dev-util/patchbin |
| 1127 |
sys-devel/flex |
| 1128 |
>=sys-kernel/linux-headers-2.6 |
| 1129 |
virtual/pkgconfig |
| 1130 |
@@ -159,7 +160,7 @@ wine_compiler_check() { |
| 1131 |
# bug #549768 |
| 1132 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 1133 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 1134 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 1135 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 1136 |
# Run in subshell to prevent "Aborted" message |
| 1137 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 1138 |
if ! eend $?; then |
| 1139 |
@@ -175,7 +176,7 @@ wine_compiler_check() { |
| 1140 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 1141 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 1142 |
# Compile in subshell to prevent "Aborted" message |
| 1143 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1144 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1145 |
if ! eend $?; then |
| 1146 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 1147 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 1148 |
@@ -191,7 +192,7 @@ wine_compiler_check() { |
| 1149 |
if use abi_x86_64; then |
| 1150 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 1151 |
# Compile in subshell to prevent "Aborted" message |
| 1152 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1153 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1154 |
if ! eend $?; then |
| 1155 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 1156 |
eerror |
| 1157 |
@@ -290,15 +291,29 @@ src_unpack() { |
| 1158 |
} |
| 1159 |
|
| 1160 |
src_prepare() { |
| 1161 |
+ |
| 1162 |
+ eapply_bin(){ |
| 1163 |
+ local patch |
| 1164 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 1165 |
+ patchbin --nogit < "${patch}" || die |
| 1166 |
+ done |
| 1167 |
+ } |
| 1168 |
+ |
| 1169 |
local md5="$(md5sum server/protocol.def)" |
| 1170 |
local PATCHES=( |
| 1171 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 1172 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 1173 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 1174 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 1175 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 1176 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 1177 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 1178 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 1179 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 1180 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 1181 |
+ ) |
| 1182 |
+ local PATCHES_BIN=( |
| 1183 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 1184 |
) |
| 1185 |
|
| 1186 |
default |
| 1187 |
+ eapply_bin |
| 1188 |
eautoreconf |
| 1189 |
|
| 1190 |
# Modification of the server protocol requires regenerating the server requests |
| 1191 |
@@ -314,8 +329,8 @@ src_prepare() { |
| 1192 |
# Edit wine.desktop to work for specific variant |
| 1193 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 1194 |
|
| 1195 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1196 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1197 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1198 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1199 |
|
| 1200 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 1201 |
} |
| 1202 |
|
| 1203 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.11.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.11.ebuild |
| 1204 |
index 39a904b169a..b79fd64dd9a 100644 |
| 1205 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.11.ebuild |
| 1206 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.11.ebuild |
| 1207 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 1208 |
MY_P="${MY_PN}-${PV}" |
| 1209 |
|
| 1210 |
if [[ ${PV} == "9999" ]] ; then |
| 1211 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 1212 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 1213 |
EGIT_BRANCH="master" |
| 1214 |
inherit git-r3 |
| 1215 |
SRC_URI="" |
| 1216 |
@@ -24,13 +24,13 @@ else |
| 1217 |
fi |
| 1218 |
S="${WORKDIR}/${MY_P}" |
| 1219 |
|
| 1220 |
-WDC_V="20150204" |
| 1221 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 1222 |
+GWP_V="20170830" |
| 1223 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 1224 |
|
| 1225 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 1226 |
-HOMEPAGE="http://www.winehq.org/" |
| 1227 |
+HOMEPAGE="https://www.winehq.org/" |
| 1228 |
SRC_URI="${SRC_URI} |
| 1229 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 1230 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 1231 |
" |
| 1232 |
|
| 1233 |
LICENSE="LGPL-2.1" |
| 1234 |
@@ -132,6 +132,7 @@ RDEPEND="${COMMON_DEPEND} |
| 1235 |
|
| 1236 |
# tools/make_requests requires perl |
| 1237 |
DEPEND="${COMMON_DEPEND} |
| 1238 |
+ dev-util/patchbin |
| 1239 |
sys-devel/flex |
| 1240 |
>=sys-kernel/linux-headers-2.6 |
| 1241 |
virtual/pkgconfig |
| 1242 |
@@ -159,7 +160,7 @@ wine_compiler_check() { |
| 1243 |
# bug #549768 |
| 1244 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 1245 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 1246 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 1247 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 1248 |
# Run in subshell to prevent "Aborted" message |
| 1249 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 1250 |
if ! eend $?; then |
| 1251 |
@@ -175,7 +176,7 @@ wine_compiler_check() { |
| 1252 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 1253 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 1254 |
# Compile in subshell to prevent "Aborted" message |
| 1255 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1256 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1257 |
if ! eend $?; then |
| 1258 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 1259 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 1260 |
@@ -191,7 +192,7 @@ wine_compiler_check() { |
| 1261 |
if use abi_x86_64; then |
| 1262 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 1263 |
# Compile in subshell to prevent "Aborted" message |
| 1264 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1265 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1266 |
if ! eend $?; then |
| 1267 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 1268 |
eerror |
| 1269 |
@@ -290,15 +291,29 @@ src_unpack() { |
| 1270 |
} |
| 1271 |
|
| 1272 |
src_prepare() { |
| 1273 |
+ |
| 1274 |
+ eapply_bin(){ |
| 1275 |
+ local patch |
| 1276 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 1277 |
+ patchbin --nogit < "${patch}" || die |
| 1278 |
+ done |
| 1279 |
+ } |
| 1280 |
+ |
| 1281 |
local md5="$(md5sum server/protocol.def)" |
| 1282 |
local PATCHES=( |
| 1283 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 1284 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 1285 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 1286 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 1287 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 1288 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 1289 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 1290 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 1291 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 1292 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 1293 |
+ ) |
| 1294 |
+ local PATCHES_BIN=( |
| 1295 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 1296 |
) |
| 1297 |
|
| 1298 |
default |
| 1299 |
+ eapply_bin |
| 1300 |
eautoreconf |
| 1301 |
|
| 1302 |
# Modification of the server protocol requires regenerating the server requests |
| 1303 |
@@ -314,8 +329,8 @@ src_prepare() { |
| 1304 |
# Edit wine.desktop to work for specific variant |
| 1305 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 1306 |
|
| 1307 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1308 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1309 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1310 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1311 |
|
| 1312 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 1313 |
} |
| 1314 |
|
| 1315 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.12.ebuild |
| 1316 |
index 39a904b169a..b79fd64dd9a 100644 |
| 1317 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.12.ebuild |
| 1318 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.12.ebuild |
| 1319 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 1320 |
MY_P="${MY_PN}-${PV}" |
| 1321 |
|
| 1322 |
if [[ ${PV} == "9999" ]] ; then |
| 1323 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 1324 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 1325 |
EGIT_BRANCH="master" |
| 1326 |
inherit git-r3 |
| 1327 |
SRC_URI="" |
| 1328 |
@@ -24,13 +24,13 @@ else |
| 1329 |
fi |
| 1330 |
S="${WORKDIR}/${MY_P}" |
| 1331 |
|
| 1332 |
-WDC_V="20150204" |
| 1333 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 1334 |
+GWP_V="20170830" |
| 1335 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 1336 |
|
| 1337 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 1338 |
-HOMEPAGE="http://www.winehq.org/" |
| 1339 |
+HOMEPAGE="https://www.winehq.org/" |
| 1340 |
SRC_URI="${SRC_URI} |
| 1341 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 1342 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 1343 |
" |
| 1344 |
|
| 1345 |
LICENSE="LGPL-2.1" |
| 1346 |
@@ -132,6 +132,7 @@ RDEPEND="${COMMON_DEPEND} |
| 1347 |
|
| 1348 |
# tools/make_requests requires perl |
| 1349 |
DEPEND="${COMMON_DEPEND} |
| 1350 |
+ dev-util/patchbin |
| 1351 |
sys-devel/flex |
| 1352 |
>=sys-kernel/linux-headers-2.6 |
| 1353 |
virtual/pkgconfig |
| 1354 |
@@ -159,7 +160,7 @@ wine_compiler_check() { |
| 1355 |
# bug #549768 |
| 1356 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 1357 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 1358 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 1359 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 1360 |
# Run in subshell to prevent "Aborted" message |
| 1361 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 1362 |
if ! eend $?; then |
| 1363 |
@@ -175,7 +176,7 @@ wine_compiler_check() { |
| 1364 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 1365 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 1366 |
# Compile in subshell to prevent "Aborted" message |
| 1367 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1368 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1369 |
if ! eend $?; then |
| 1370 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 1371 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 1372 |
@@ -191,7 +192,7 @@ wine_compiler_check() { |
| 1373 |
if use abi_x86_64; then |
| 1374 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 1375 |
# Compile in subshell to prevent "Aborted" message |
| 1376 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1377 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1378 |
if ! eend $?; then |
| 1379 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 1380 |
eerror |
| 1381 |
@@ -290,15 +291,29 @@ src_unpack() { |
| 1382 |
} |
| 1383 |
|
| 1384 |
src_prepare() { |
| 1385 |
+ |
| 1386 |
+ eapply_bin(){ |
| 1387 |
+ local patch |
| 1388 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 1389 |
+ patchbin --nogit < "${patch}" || die |
| 1390 |
+ done |
| 1391 |
+ } |
| 1392 |
+ |
| 1393 |
local md5="$(md5sum server/protocol.def)" |
| 1394 |
local PATCHES=( |
| 1395 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 1396 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 1397 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 1398 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 1399 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 1400 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 1401 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 1402 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 1403 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 1404 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 1405 |
+ ) |
| 1406 |
+ local PATCHES_BIN=( |
| 1407 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 1408 |
) |
| 1409 |
|
| 1410 |
default |
| 1411 |
+ eapply_bin |
| 1412 |
eautoreconf |
| 1413 |
|
| 1414 |
# Modification of the server protocol requires regenerating the server requests |
| 1415 |
@@ -314,8 +329,8 @@ src_prepare() { |
| 1416 |
# Edit wine.desktop to work for specific variant |
| 1417 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 1418 |
|
| 1419 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1420 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1421 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1422 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1423 |
|
| 1424 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 1425 |
} |
| 1426 |
|
| 1427 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.13.ebuild |
| 1428 |
index 39a904b169a..b79fd64dd9a 100644 |
| 1429 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.13.ebuild |
| 1430 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.13.ebuild |
| 1431 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 1432 |
MY_P="${MY_PN}-${PV}" |
| 1433 |
|
| 1434 |
if [[ ${PV} == "9999" ]] ; then |
| 1435 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 1436 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 1437 |
EGIT_BRANCH="master" |
| 1438 |
inherit git-r3 |
| 1439 |
SRC_URI="" |
| 1440 |
@@ -24,13 +24,13 @@ else |
| 1441 |
fi |
| 1442 |
S="${WORKDIR}/${MY_P}" |
| 1443 |
|
| 1444 |
-WDC_V="20150204" |
| 1445 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 1446 |
+GWP_V="20170830" |
| 1447 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 1448 |
|
| 1449 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 1450 |
-HOMEPAGE="http://www.winehq.org/" |
| 1451 |
+HOMEPAGE="https://www.winehq.org/" |
| 1452 |
SRC_URI="${SRC_URI} |
| 1453 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 1454 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 1455 |
" |
| 1456 |
|
| 1457 |
LICENSE="LGPL-2.1" |
| 1458 |
@@ -132,6 +132,7 @@ RDEPEND="${COMMON_DEPEND} |
| 1459 |
|
| 1460 |
# tools/make_requests requires perl |
| 1461 |
DEPEND="${COMMON_DEPEND} |
| 1462 |
+ dev-util/patchbin |
| 1463 |
sys-devel/flex |
| 1464 |
>=sys-kernel/linux-headers-2.6 |
| 1465 |
virtual/pkgconfig |
| 1466 |
@@ -159,7 +160,7 @@ wine_compiler_check() { |
| 1467 |
# bug #549768 |
| 1468 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 1469 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 1470 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 1471 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 1472 |
# Run in subshell to prevent "Aborted" message |
| 1473 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 1474 |
if ! eend $?; then |
| 1475 |
@@ -175,7 +176,7 @@ wine_compiler_check() { |
| 1476 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 1477 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 1478 |
# Compile in subshell to prevent "Aborted" message |
| 1479 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1480 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1481 |
if ! eend $?; then |
| 1482 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 1483 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 1484 |
@@ -191,7 +192,7 @@ wine_compiler_check() { |
| 1485 |
if use abi_x86_64; then |
| 1486 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 1487 |
# Compile in subshell to prevent "Aborted" message |
| 1488 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1489 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1490 |
if ! eend $?; then |
| 1491 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 1492 |
eerror |
| 1493 |
@@ -290,15 +291,29 @@ src_unpack() { |
| 1494 |
} |
| 1495 |
|
| 1496 |
src_prepare() { |
| 1497 |
+ |
| 1498 |
+ eapply_bin(){ |
| 1499 |
+ local patch |
| 1500 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 1501 |
+ patchbin --nogit < "${patch}" || die |
| 1502 |
+ done |
| 1503 |
+ } |
| 1504 |
+ |
| 1505 |
local md5="$(md5sum server/protocol.def)" |
| 1506 |
local PATCHES=( |
| 1507 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 1508 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 1509 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 1510 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 1511 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 1512 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 1513 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 1514 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 1515 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 1516 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 1517 |
+ ) |
| 1518 |
+ local PATCHES_BIN=( |
| 1519 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 1520 |
) |
| 1521 |
|
| 1522 |
default |
| 1523 |
+ eapply_bin |
| 1524 |
eautoreconf |
| 1525 |
|
| 1526 |
# Modification of the server protocol requires regenerating the server requests |
| 1527 |
@@ -314,8 +329,8 @@ src_prepare() { |
| 1528 |
# Edit wine.desktop to work for specific variant |
| 1529 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 1530 |
|
| 1531 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1532 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1533 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1534 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1535 |
|
| 1536 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 1537 |
} |
| 1538 |
|
| 1539 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.14.ebuild |
| 1540 |
index 08531aba8cd..ef68ed71111 100644 |
| 1541 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.14.ebuild |
| 1542 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.14.ebuild |
| 1543 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 1544 |
MY_P="${MY_PN}-${PV}" |
| 1545 |
|
| 1546 |
if [[ ${PV} == "9999" ]] ; then |
| 1547 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 1548 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 1549 |
EGIT_BRANCH="master" |
| 1550 |
inherit git-r3 |
| 1551 |
SRC_URI="" |
| 1552 |
@@ -24,13 +24,13 @@ else |
| 1553 |
fi |
| 1554 |
S="${WORKDIR}/${MY_P}" |
| 1555 |
|
| 1556 |
-WDC_V="20150204" |
| 1557 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 1558 |
+GWP_V="20170830" |
| 1559 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 1560 |
|
| 1561 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 1562 |
-HOMEPAGE="http://www.winehq.org/" |
| 1563 |
+HOMEPAGE="https://www.winehq.org/" |
| 1564 |
SRC_URI="${SRC_URI} |
| 1565 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 1566 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 1567 |
" |
| 1568 |
|
| 1569 |
LICENSE="LGPL-2.1" |
| 1570 |
@@ -132,6 +132,7 @@ RDEPEND="${COMMON_DEPEND} |
| 1571 |
|
| 1572 |
# tools/make_requests requires perl |
| 1573 |
DEPEND="${COMMON_DEPEND} |
| 1574 |
+ dev-util/patchbin |
| 1575 |
sys-devel/flex |
| 1576 |
>=sys-kernel/linux-headers-2.6 |
| 1577 |
virtual/pkgconfig |
| 1578 |
@@ -159,7 +160,7 @@ wine_compiler_check() { |
| 1579 |
# bug #549768 |
| 1580 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 1581 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 1582 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 1583 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 1584 |
# Run in subshell to prevent "Aborted" message |
| 1585 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 1586 |
if ! eend $?; then |
| 1587 |
@@ -175,7 +176,7 @@ wine_compiler_check() { |
| 1588 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 1589 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 1590 |
# Compile in subshell to prevent "Aborted" message |
| 1591 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1592 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1593 |
if ! eend $?; then |
| 1594 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 1595 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 1596 |
@@ -191,7 +192,7 @@ wine_compiler_check() { |
| 1597 |
if use abi_x86_64; then |
| 1598 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 1599 |
# Compile in subshell to prevent "Aborted" message |
| 1600 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1601 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1602 |
if ! eend $?; then |
| 1603 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 1604 |
eerror |
| 1605 |
@@ -290,15 +291,29 @@ src_unpack() { |
| 1606 |
} |
| 1607 |
|
| 1608 |
src_prepare() { |
| 1609 |
+ |
| 1610 |
+ eapply_bin(){ |
| 1611 |
+ local patch |
| 1612 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 1613 |
+ patchbin --nogit < "${patch}" || die |
| 1614 |
+ done |
| 1615 |
+ } |
| 1616 |
+ |
| 1617 |
local md5="$(md5sum server/protocol.def)" |
| 1618 |
local PATCHES=( |
| 1619 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 1620 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 1621 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 1622 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 1623 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 1624 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 1625 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 1626 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 1627 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 1628 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 1629 |
+ ) |
| 1630 |
+ local PATCHES_BIN=( |
| 1631 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 1632 |
) |
| 1633 |
|
| 1634 |
default |
| 1635 |
+ eapply_bin |
| 1636 |
eautoreconf |
| 1637 |
|
| 1638 |
# Modification of the server protocol requires regenerating the server requests |
| 1639 |
@@ -314,8 +329,8 @@ src_prepare() { |
| 1640 |
# Edit wine.desktop to work for specific variant |
| 1641 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 1642 |
|
| 1643 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1644 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1645 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1646 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1647 |
|
| 1648 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 1649 |
} |
| 1650 |
|
| 1651 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.15.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.15.ebuild |
| 1652 |
index 08531aba8cd..ef68ed71111 100644 |
| 1653 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.15.ebuild |
| 1654 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.15.ebuild |
| 1655 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 1656 |
MY_P="${MY_PN}-${PV}" |
| 1657 |
|
| 1658 |
if [[ ${PV} == "9999" ]] ; then |
| 1659 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 1660 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 1661 |
EGIT_BRANCH="master" |
| 1662 |
inherit git-r3 |
| 1663 |
SRC_URI="" |
| 1664 |
@@ -24,13 +24,13 @@ else |
| 1665 |
fi |
| 1666 |
S="${WORKDIR}/${MY_P}" |
| 1667 |
|
| 1668 |
-WDC_V="20150204" |
| 1669 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 1670 |
+GWP_V="20170830" |
| 1671 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 1672 |
|
| 1673 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 1674 |
-HOMEPAGE="http://www.winehq.org/" |
| 1675 |
+HOMEPAGE="https://www.winehq.org/" |
| 1676 |
SRC_URI="${SRC_URI} |
| 1677 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 1678 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 1679 |
" |
| 1680 |
|
| 1681 |
LICENSE="LGPL-2.1" |
| 1682 |
@@ -132,6 +132,7 @@ RDEPEND="${COMMON_DEPEND} |
| 1683 |
|
| 1684 |
# tools/make_requests requires perl |
| 1685 |
DEPEND="${COMMON_DEPEND} |
| 1686 |
+ dev-util/patchbin |
| 1687 |
sys-devel/flex |
| 1688 |
>=sys-kernel/linux-headers-2.6 |
| 1689 |
virtual/pkgconfig |
| 1690 |
@@ -159,7 +160,7 @@ wine_compiler_check() { |
| 1691 |
# bug #549768 |
| 1692 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 1693 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 1694 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 1695 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 1696 |
# Run in subshell to prevent "Aborted" message |
| 1697 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 1698 |
if ! eend $?; then |
| 1699 |
@@ -175,7 +176,7 @@ wine_compiler_check() { |
| 1700 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 1701 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 1702 |
# Compile in subshell to prevent "Aborted" message |
| 1703 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1704 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1705 |
if ! eend $?; then |
| 1706 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 1707 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 1708 |
@@ -191,7 +192,7 @@ wine_compiler_check() { |
| 1709 |
if use abi_x86_64; then |
| 1710 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 1711 |
# Compile in subshell to prevent "Aborted" message |
| 1712 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1713 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1714 |
if ! eend $?; then |
| 1715 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 1716 |
eerror |
| 1717 |
@@ -290,15 +291,29 @@ src_unpack() { |
| 1718 |
} |
| 1719 |
|
| 1720 |
src_prepare() { |
| 1721 |
+ |
| 1722 |
+ eapply_bin(){ |
| 1723 |
+ local patch |
| 1724 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 1725 |
+ patchbin --nogit < "${patch}" || die |
| 1726 |
+ done |
| 1727 |
+ } |
| 1728 |
+ |
| 1729 |
local md5="$(md5sum server/protocol.def)" |
| 1730 |
local PATCHES=( |
| 1731 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 1732 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 1733 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 1734 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 1735 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 1736 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 1737 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 1738 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 1739 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 1740 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 1741 |
+ ) |
| 1742 |
+ local PATCHES_BIN=( |
| 1743 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 1744 |
) |
| 1745 |
|
| 1746 |
default |
| 1747 |
+ eapply_bin |
| 1748 |
eautoreconf |
| 1749 |
|
| 1750 |
# Modification of the server protocol requires regenerating the server requests |
| 1751 |
@@ -314,8 +329,8 @@ src_prepare() { |
| 1752 |
# Edit wine.desktop to work for specific variant |
| 1753 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 1754 |
|
| 1755 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1756 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1757 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1758 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1759 |
|
| 1760 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 1761 |
} |
| 1762 |
|
| 1763 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.16.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.16.ebuild |
| 1764 |
index 08531aba8cd..ef68ed71111 100644 |
| 1765 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.16.ebuild |
| 1766 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.16.ebuild |
| 1767 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 1768 |
MY_P="${MY_PN}-${PV}" |
| 1769 |
|
| 1770 |
if [[ ${PV} == "9999" ]] ; then |
| 1771 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 1772 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 1773 |
EGIT_BRANCH="master" |
| 1774 |
inherit git-r3 |
| 1775 |
SRC_URI="" |
| 1776 |
@@ -24,13 +24,13 @@ else |
| 1777 |
fi |
| 1778 |
S="${WORKDIR}/${MY_P}" |
| 1779 |
|
| 1780 |
-WDC_V="20150204" |
| 1781 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 1782 |
+GWP_V="20170830" |
| 1783 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 1784 |
|
| 1785 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 1786 |
-HOMEPAGE="http://www.winehq.org/" |
| 1787 |
+HOMEPAGE="https://www.winehq.org/" |
| 1788 |
SRC_URI="${SRC_URI} |
| 1789 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 1790 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 1791 |
" |
| 1792 |
|
| 1793 |
LICENSE="LGPL-2.1" |
| 1794 |
@@ -132,6 +132,7 @@ RDEPEND="${COMMON_DEPEND} |
| 1795 |
|
| 1796 |
# tools/make_requests requires perl |
| 1797 |
DEPEND="${COMMON_DEPEND} |
| 1798 |
+ dev-util/patchbin |
| 1799 |
sys-devel/flex |
| 1800 |
>=sys-kernel/linux-headers-2.6 |
| 1801 |
virtual/pkgconfig |
| 1802 |
@@ -159,7 +160,7 @@ wine_compiler_check() { |
| 1803 |
# bug #549768 |
| 1804 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 1805 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 1806 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 1807 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 1808 |
# Run in subshell to prevent "Aborted" message |
| 1809 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 1810 |
if ! eend $?; then |
| 1811 |
@@ -175,7 +176,7 @@ wine_compiler_check() { |
| 1812 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 1813 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 1814 |
# Compile in subshell to prevent "Aborted" message |
| 1815 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1816 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1817 |
if ! eend $?; then |
| 1818 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 1819 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 1820 |
@@ -191,7 +192,7 @@ wine_compiler_check() { |
| 1821 |
if use abi_x86_64; then |
| 1822 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 1823 |
# Compile in subshell to prevent "Aborted" message |
| 1824 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1825 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1826 |
if ! eend $?; then |
| 1827 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 1828 |
eerror |
| 1829 |
@@ -290,15 +291,29 @@ src_unpack() { |
| 1830 |
} |
| 1831 |
|
| 1832 |
src_prepare() { |
| 1833 |
+ |
| 1834 |
+ eapply_bin(){ |
| 1835 |
+ local patch |
| 1836 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 1837 |
+ patchbin --nogit < "${patch}" || die |
| 1838 |
+ done |
| 1839 |
+ } |
| 1840 |
+ |
| 1841 |
local md5="$(md5sum server/protocol.def)" |
| 1842 |
local PATCHES=( |
| 1843 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 1844 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 1845 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 1846 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 1847 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 1848 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 1849 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 1850 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 1851 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 1852 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 1853 |
+ ) |
| 1854 |
+ local PATCHES_BIN=( |
| 1855 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 1856 |
) |
| 1857 |
|
| 1858 |
default |
| 1859 |
+ eapply_bin |
| 1860 |
eautoreconf |
| 1861 |
|
| 1862 |
# Modification of the server protocol requires regenerating the server requests |
| 1863 |
@@ -314,8 +329,8 @@ src_prepare() { |
| 1864 |
# Edit wine.desktop to work for specific variant |
| 1865 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 1866 |
|
| 1867 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1868 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1869 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1870 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1871 |
|
| 1872 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 1873 |
} |
| 1874 |
|
| 1875 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.17.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.17.ebuild |
| 1876 |
index 08531aba8cd..ef68ed71111 100644 |
| 1877 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.17.ebuild |
| 1878 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.17.ebuild |
| 1879 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 1880 |
MY_P="${MY_PN}-${PV}" |
| 1881 |
|
| 1882 |
if [[ ${PV} == "9999" ]] ; then |
| 1883 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 1884 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 1885 |
EGIT_BRANCH="master" |
| 1886 |
inherit git-r3 |
| 1887 |
SRC_URI="" |
| 1888 |
@@ -24,13 +24,13 @@ else |
| 1889 |
fi |
| 1890 |
S="${WORKDIR}/${MY_P}" |
| 1891 |
|
| 1892 |
-WDC_V="20150204" |
| 1893 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 1894 |
+GWP_V="20170830" |
| 1895 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 1896 |
|
| 1897 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 1898 |
-HOMEPAGE="http://www.winehq.org/" |
| 1899 |
+HOMEPAGE="https://www.winehq.org/" |
| 1900 |
SRC_URI="${SRC_URI} |
| 1901 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 1902 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 1903 |
" |
| 1904 |
|
| 1905 |
LICENSE="LGPL-2.1" |
| 1906 |
@@ -132,6 +132,7 @@ RDEPEND="${COMMON_DEPEND} |
| 1907 |
|
| 1908 |
# tools/make_requests requires perl |
| 1909 |
DEPEND="${COMMON_DEPEND} |
| 1910 |
+ dev-util/patchbin |
| 1911 |
sys-devel/flex |
| 1912 |
>=sys-kernel/linux-headers-2.6 |
| 1913 |
virtual/pkgconfig |
| 1914 |
@@ -159,7 +160,7 @@ wine_compiler_check() { |
| 1915 |
# bug #549768 |
| 1916 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 1917 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 1918 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 1919 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 1920 |
# Run in subshell to prevent "Aborted" message |
| 1921 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 1922 |
if ! eend $?; then |
| 1923 |
@@ -175,7 +176,7 @@ wine_compiler_check() { |
| 1924 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 1925 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 1926 |
# Compile in subshell to prevent "Aborted" message |
| 1927 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1928 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 1929 |
if ! eend $?; then |
| 1930 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 1931 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 1932 |
@@ -191,7 +192,7 @@ wine_compiler_check() { |
| 1933 |
if use abi_x86_64; then |
| 1934 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 1935 |
# Compile in subshell to prevent "Aborted" message |
| 1936 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1937 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 1938 |
if ! eend $?; then |
| 1939 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 1940 |
eerror |
| 1941 |
@@ -290,15 +291,29 @@ src_unpack() { |
| 1942 |
} |
| 1943 |
|
| 1944 |
src_prepare() { |
| 1945 |
+ |
| 1946 |
+ eapply_bin(){ |
| 1947 |
+ local patch |
| 1948 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 1949 |
+ patchbin --nogit < "${patch}" || die |
| 1950 |
+ done |
| 1951 |
+ } |
| 1952 |
+ |
| 1953 |
local md5="$(md5sum server/protocol.def)" |
| 1954 |
local PATCHES=( |
| 1955 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 1956 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 1957 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 1958 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 1959 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 1960 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 1961 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 1962 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 1963 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 1964 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 1965 |
+ ) |
| 1966 |
+ local PATCHES_BIN=( |
| 1967 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 1968 |
) |
| 1969 |
|
| 1970 |
default |
| 1971 |
+ eapply_bin |
| 1972 |
eautoreconf |
| 1973 |
|
| 1974 |
# Modification of the server protocol requires regenerating the server requests |
| 1975 |
@@ -314,8 +329,8 @@ src_prepare() { |
| 1976 |
# Edit wine.desktop to work for specific variant |
| 1977 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 1978 |
|
| 1979 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1980 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1981 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 1982 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 1983 |
|
| 1984 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 1985 |
} |
| 1986 |
|
| 1987 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.18.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.18.ebuild |
| 1988 |
index 08531aba8cd..8851cfc5ac4 100644 |
| 1989 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.18.ebuild |
| 1990 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.18.ebuild |
| 1991 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 1992 |
MY_P="${MY_PN}-${PV}" |
| 1993 |
|
| 1994 |
if [[ ${PV} == "9999" ]] ; then |
| 1995 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 1996 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 1997 |
EGIT_BRANCH="master" |
| 1998 |
inherit git-r3 |
| 1999 |
SRC_URI="" |
| 2000 |
@@ -24,13 +24,13 @@ else |
| 2001 |
fi |
| 2002 |
S="${WORKDIR}/${MY_P}" |
| 2003 |
|
| 2004 |
-WDC_V="20150204" |
| 2005 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 2006 |
+GWP_V="20170830" |
| 2007 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 2008 |
|
| 2009 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 2010 |
-HOMEPAGE="http://www.winehq.org/" |
| 2011 |
+HOMEPAGE="https://www.winehq.org/" |
| 2012 |
SRC_URI="${SRC_URI} |
| 2013 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 2014 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 2015 |
" |
| 2016 |
|
| 2017 |
LICENSE="LGPL-2.1" |
| 2018 |
@@ -132,6 +132,7 @@ RDEPEND="${COMMON_DEPEND} |
| 2019 |
|
| 2020 |
# tools/make_requests requires perl |
| 2021 |
DEPEND="${COMMON_DEPEND} |
| 2022 |
+ dev-util/patchbin |
| 2023 |
sys-devel/flex |
| 2024 |
>=sys-kernel/linux-headers-2.6 |
| 2025 |
virtual/pkgconfig |
| 2026 |
@@ -159,7 +160,7 @@ wine_compiler_check() { |
| 2027 |
# bug #549768 |
| 2028 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 2029 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 2030 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 2031 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 2032 |
# Run in subshell to prevent "Aborted" message |
| 2033 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 2034 |
if ! eend $?; then |
| 2035 |
@@ -175,7 +176,7 @@ wine_compiler_check() { |
| 2036 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 2037 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 2038 |
# Compile in subshell to prevent "Aborted" message |
| 2039 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2040 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2041 |
if ! eend $?; then |
| 2042 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 2043 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 2044 |
@@ -191,7 +192,7 @@ wine_compiler_check() { |
| 2045 |
if use abi_x86_64; then |
| 2046 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 2047 |
# Compile in subshell to prevent "Aborted" message |
| 2048 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2049 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2050 |
if ! eend $?; then |
| 2051 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 2052 |
eerror |
| 2053 |
@@ -290,15 +291,26 @@ src_unpack() { |
| 2054 |
} |
| 2055 |
|
| 2056 |
src_prepare() { |
| 2057 |
+ |
| 2058 |
+ eapply_bin(){ |
| 2059 |
+ local patch |
| 2060 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 2061 |
+ patchbin --nogit < "${patch}" || die |
| 2062 |
+ done |
| 2063 |
+ } |
| 2064 |
+ |
| 2065 |
local md5="$(md5sum server/protocol.def)" |
| 2066 |
local PATCHES=( |
| 2067 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 2068 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 2069 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 2070 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 2071 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 2072 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 2073 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 2074 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 2075 |
+ ) |
| 2076 |
+ local PATCHES_BIN=( |
| 2077 |
) |
| 2078 |
|
| 2079 |
default |
| 2080 |
+ eapply_bin |
| 2081 |
eautoreconf |
| 2082 |
|
| 2083 |
# Modification of the server protocol requires regenerating the server requests |
| 2084 |
@@ -314,8 +326,8 @@ src_prepare() { |
| 2085 |
# Edit wine.desktop to work for specific variant |
| 2086 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 2087 |
|
| 2088 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2089 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2090 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2091 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2092 |
|
| 2093 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 2094 |
} |
| 2095 |
|
| 2096 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild |
| 2097 |
index e5940fa17ff..5d4299bca59 100644 |
| 2098 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild |
| 2099 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.2.ebuild |
| 2100 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 2101 |
MY_P="${MY_PN}-${PV}" |
| 2102 |
|
| 2103 |
if [[ ${PV} == "9999" ]] ; then |
| 2104 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 2105 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 2106 |
EGIT_BRANCH="master" |
| 2107 |
inherit git-r3 |
| 2108 |
SRC_URI="" |
| 2109 |
@@ -24,13 +24,13 @@ else |
| 2110 |
fi |
| 2111 |
S="${WORKDIR}/${MY_P}" |
| 2112 |
|
| 2113 |
-WDC_V="20150204" |
| 2114 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 2115 |
+GWP_V="20170830" |
| 2116 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 2117 |
|
| 2118 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 2119 |
-HOMEPAGE="http://www.winehq.org/" |
| 2120 |
+HOMEPAGE="https://www.winehq.org/" |
| 2121 |
SRC_URI="${SRC_URI} |
| 2122 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 2123 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 2124 |
" |
| 2125 |
|
| 2126 |
LICENSE="LGPL-2.1" |
| 2127 |
@@ -131,6 +131,7 @@ RDEPEND="${COMMON_DEPEND} |
| 2128 |
|
| 2129 |
# tools/make_requests requires perl |
| 2130 |
DEPEND="${COMMON_DEPEND} |
| 2131 |
+ dev-util/patchbin |
| 2132 |
sys-devel/flex |
| 2133 |
>=sys-kernel/linux-headers-2.6 |
| 2134 |
virtual/pkgconfig |
| 2135 |
@@ -158,7 +159,7 @@ wine_compiler_check() { |
| 2136 |
# bug #549768 |
| 2137 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 2138 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 2139 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 2140 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 2141 |
# Run in subshell to prevent "Aborted" message |
| 2142 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 2143 |
if ! eend $?; then |
| 2144 |
@@ -174,7 +175,7 @@ wine_compiler_check() { |
| 2145 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 2146 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 2147 |
# Compile in subshell to prevent "Aborted" message |
| 2148 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2149 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2150 |
if ! eend $?; then |
| 2151 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 2152 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 2153 |
@@ -190,7 +191,7 @@ wine_compiler_check() { |
| 2154 |
if use abi_x86_64; then |
| 2155 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 2156 |
# Compile in subshell to prevent "Aborted" message |
| 2157 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2158 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2159 |
if ! eend $?; then |
| 2160 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 2161 |
eerror |
| 2162 |
@@ -289,15 +290,29 @@ src_unpack() { |
| 2163 |
} |
| 2164 |
|
| 2165 |
src_prepare() { |
| 2166 |
+ |
| 2167 |
+ eapply_bin(){ |
| 2168 |
+ local patch |
| 2169 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 2170 |
+ patchbin --nogit < "${patch}" || die |
| 2171 |
+ done |
| 2172 |
+ } |
| 2173 |
+ |
| 2174 |
local md5="$(md5sum server/protocol.def)" |
| 2175 |
local PATCHES=( |
| 2176 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 2177 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 2178 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 2179 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 2180 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 2181 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 2182 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 2183 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 2184 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 2185 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 2186 |
+ ) |
| 2187 |
+ local PATCHES_BIN=( |
| 2188 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 2189 |
) |
| 2190 |
|
| 2191 |
default |
| 2192 |
+ eapply_bin |
| 2193 |
eautoreconf |
| 2194 |
|
| 2195 |
# Modification of the server protocol requires regenerating the server requests |
| 2196 |
@@ -313,8 +328,8 @@ src_prepare() { |
| 2197 |
# Edit wine.desktop to work for specific variant |
| 2198 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 2199 |
|
| 2200 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2201 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2202 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2203 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2204 |
|
| 2205 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 2206 |
} |
| 2207 |
|
| 2208 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.3.ebuild |
| 2209 |
index e5940fa17ff..5d4299bca59 100644 |
| 2210 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.3.ebuild |
| 2211 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.3.ebuild |
| 2212 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 2213 |
MY_P="${MY_PN}-${PV}" |
| 2214 |
|
| 2215 |
if [[ ${PV} == "9999" ]] ; then |
| 2216 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 2217 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 2218 |
EGIT_BRANCH="master" |
| 2219 |
inherit git-r3 |
| 2220 |
SRC_URI="" |
| 2221 |
@@ -24,13 +24,13 @@ else |
| 2222 |
fi |
| 2223 |
S="${WORKDIR}/${MY_P}" |
| 2224 |
|
| 2225 |
-WDC_V="20150204" |
| 2226 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 2227 |
+GWP_V="20170830" |
| 2228 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 2229 |
|
| 2230 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 2231 |
-HOMEPAGE="http://www.winehq.org/" |
| 2232 |
+HOMEPAGE="https://www.winehq.org/" |
| 2233 |
SRC_URI="${SRC_URI} |
| 2234 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 2235 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 2236 |
" |
| 2237 |
|
| 2238 |
LICENSE="LGPL-2.1" |
| 2239 |
@@ -131,6 +131,7 @@ RDEPEND="${COMMON_DEPEND} |
| 2240 |
|
| 2241 |
# tools/make_requests requires perl |
| 2242 |
DEPEND="${COMMON_DEPEND} |
| 2243 |
+ dev-util/patchbin |
| 2244 |
sys-devel/flex |
| 2245 |
>=sys-kernel/linux-headers-2.6 |
| 2246 |
virtual/pkgconfig |
| 2247 |
@@ -158,7 +159,7 @@ wine_compiler_check() { |
| 2248 |
# bug #549768 |
| 2249 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 2250 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 2251 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 2252 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 2253 |
# Run in subshell to prevent "Aborted" message |
| 2254 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 2255 |
if ! eend $?; then |
| 2256 |
@@ -174,7 +175,7 @@ wine_compiler_check() { |
| 2257 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 2258 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 2259 |
# Compile in subshell to prevent "Aborted" message |
| 2260 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2261 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2262 |
if ! eend $?; then |
| 2263 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 2264 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 2265 |
@@ -190,7 +191,7 @@ wine_compiler_check() { |
| 2266 |
if use abi_x86_64; then |
| 2267 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 2268 |
# Compile in subshell to prevent "Aborted" message |
| 2269 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2270 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2271 |
if ! eend $?; then |
| 2272 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 2273 |
eerror |
| 2274 |
@@ -289,15 +290,29 @@ src_unpack() { |
| 2275 |
} |
| 2276 |
|
| 2277 |
src_prepare() { |
| 2278 |
+ |
| 2279 |
+ eapply_bin(){ |
| 2280 |
+ local patch |
| 2281 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 2282 |
+ patchbin --nogit < "${patch}" || die |
| 2283 |
+ done |
| 2284 |
+ } |
| 2285 |
+ |
| 2286 |
local md5="$(md5sum server/protocol.def)" |
| 2287 |
local PATCHES=( |
| 2288 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 2289 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 2290 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 2291 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 2292 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 2293 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 2294 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 2295 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 2296 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 2297 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 2298 |
+ ) |
| 2299 |
+ local PATCHES_BIN=( |
| 2300 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 2301 |
) |
| 2302 |
|
| 2303 |
default |
| 2304 |
+ eapply_bin |
| 2305 |
eautoreconf |
| 2306 |
|
| 2307 |
# Modification of the server protocol requires regenerating the server requests |
| 2308 |
@@ -313,8 +328,8 @@ src_prepare() { |
| 2309 |
# Edit wine.desktop to work for specific variant |
| 2310 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 2311 |
|
| 2312 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2313 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2314 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2315 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2316 |
|
| 2317 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 2318 |
} |
| 2319 |
|
| 2320 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.4.ebuild |
| 2321 |
index eedca27e1d2..757d3e9e857 100644 |
| 2322 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.4.ebuild |
| 2323 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.4.ebuild |
| 2324 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 2325 |
MY_P="${MY_PN}-${PV}" |
| 2326 |
|
| 2327 |
if [[ ${PV} == "9999" ]] ; then |
| 2328 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 2329 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 2330 |
EGIT_BRANCH="master" |
| 2331 |
inherit git-r3 |
| 2332 |
SRC_URI="" |
| 2333 |
@@ -24,13 +24,13 @@ else |
| 2334 |
fi |
| 2335 |
S="${WORKDIR}/${MY_P}" |
| 2336 |
|
| 2337 |
-WDC_V="20150204" |
| 2338 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 2339 |
+GWP_V="20170830" |
| 2340 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 2341 |
|
| 2342 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 2343 |
-HOMEPAGE="http://www.winehq.org/" |
| 2344 |
+HOMEPAGE="https://www.winehq.org/" |
| 2345 |
SRC_URI="${SRC_URI} |
| 2346 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 2347 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 2348 |
" |
| 2349 |
|
| 2350 |
LICENSE="LGPL-2.1" |
| 2351 |
@@ -131,6 +131,7 @@ RDEPEND="${COMMON_DEPEND} |
| 2352 |
|
| 2353 |
# tools/make_requests requires perl |
| 2354 |
DEPEND="${COMMON_DEPEND} |
| 2355 |
+ dev-util/patchbin |
| 2356 |
sys-devel/flex |
| 2357 |
>=sys-kernel/linux-headers-2.6 |
| 2358 |
virtual/pkgconfig |
| 2359 |
@@ -158,7 +159,7 @@ wine_compiler_check() { |
| 2360 |
# bug #549768 |
| 2361 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 2362 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 2363 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 2364 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 2365 |
# Run in subshell to prevent "Aborted" message |
| 2366 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 2367 |
if ! eend $?; then |
| 2368 |
@@ -174,7 +175,7 @@ wine_compiler_check() { |
| 2369 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 2370 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 2371 |
# Compile in subshell to prevent "Aborted" message |
| 2372 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2373 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2374 |
if ! eend $?; then |
| 2375 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 2376 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 2377 |
@@ -190,7 +191,7 @@ wine_compiler_check() { |
| 2378 |
if use abi_x86_64; then |
| 2379 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 2380 |
# Compile in subshell to prevent "Aborted" message |
| 2381 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2382 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2383 |
if ! eend $?; then |
| 2384 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 2385 |
eerror |
| 2386 |
@@ -289,15 +290,29 @@ src_unpack() { |
| 2387 |
} |
| 2388 |
|
| 2389 |
src_prepare() { |
| 2390 |
+ |
| 2391 |
+ eapply_bin(){ |
| 2392 |
+ local patch |
| 2393 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 2394 |
+ patchbin --nogit < "${patch}" || die |
| 2395 |
+ done |
| 2396 |
+ } |
| 2397 |
+ |
| 2398 |
local md5="$(md5sum server/protocol.def)" |
| 2399 |
local PATCHES=( |
| 2400 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 2401 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 2402 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 2403 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 2404 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 2405 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 2406 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 2407 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 2408 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 2409 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 2410 |
+ ) |
| 2411 |
+ local PATCHES_BIN=( |
| 2412 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 2413 |
) |
| 2414 |
|
| 2415 |
default |
| 2416 |
+ eapply_bin |
| 2417 |
eautoreconf |
| 2418 |
|
| 2419 |
# Modification of the server protocol requires regenerating the server requests |
| 2420 |
@@ -313,8 +328,8 @@ src_prepare() { |
| 2421 |
# Edit wine.desktop to work for specific variant |
| 2422 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 2423 |
|
| 2424 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2425 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2426 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2427 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2428 |
|
| 2429 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 2430 |
} |
| 2431 |
|
| 2432 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.5.ebuild |
| 2433 |
index eedca27e1d2..757d3e9e857 100644 |
| 2434 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.5.ebuild |
| 2435 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.5.ebuild |
| 2436 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 2437 |
MY_P="${MY_PN}-${PV}" |
| 2438 |
|
| 2439 |
if [[ ${PV} == "9999" ]] ; then |
| 2440 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 2441 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 2442 |
EGIT_BRANCH="master" |
| 2443 |
inherit git-r3 |
| 2444 |
SRC_URI="" |
| 2445 |
@@ -24,13 +24,13 @@ else |
| 2446 |
fi |
| 2447 |
S="${WORKDIR}/${MY_P}" |
| 2448 |
|
| 2449 |
-WDC_V="20150204" |
| 2450 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 2451 |
+GWP_V="20170830" |
| 2452 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 2453 |
|
| 2454 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 2455 |
-HOMEPAGE="http://www.winehq.org/" |
| 2456 |
+HOMEPAGE="https://www.winehq.org/" |
| 2457 |
SRC_URI="${SRC_URI} |
| 2458 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 2459 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 2460 |
" |
| 2461 |
|
| 2462 |
LICENSE="LGPL-2.1" |
| 2463 |
@@ -131,6 +131,7 @@ RDEPEND="${COMMON_DEPEND} |
| 2464 |
|
| 2465 |
# tools/make_requests requires perl |
| 2466 |
DEPEND="${COMMON_DEPEND} |
| 2467 |
+ dev-util/patchbin |
| 2468 |
sys-devel/flex |
| 2469 |
>=sys-kernel/linux-headers-2.6 |
| 2470 |
virtual/pkgconfig |
| 2471 |
@@ -158,7 +159,7 @@ wine_compiler_check() { |
| 2472 |
# bug #549768 |
| 2473 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 2474 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 2475 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 2476 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 2477 |
# Run in subshell to prevent "Aborted" message |
| 2478 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 2479 |
if ! eend $?; then |
| 2480 |
@@ -174,7 +175,7 @@ wine_compiler_check() { |
| 2481 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 2482 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 2483 |
# Compile in subshell to prevent "Aborted" message |
| 2484 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2485 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2486 |
if ! eend $?; then |
| 2487 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 2488 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 2489 |
@@ -190,7 +191,7 @@ wine_compiler_check() { |
| 2490 |
if use abi_x86_64; then |
| 2491 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 2492 |
# Compile in subshell to prevent "Aborted" message |
| 2493 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2494 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2495 |
if ! eend $?; then |
| 2496 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 2497 |
eerror |
| 2498 |
@@ -289,15 +290,29 @@ src_unpack() { |
| 2499 |
} |
| 2500 |
|
| 2501 |
src_prepare() { |
| 2502 |
+ |
| 2503 |
+ eapply_bin(){ |
| 2504 |
+ local patch |
| 2505 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 2506 |
+ patchbin --nogit < "${patch}" || die |
| 2507 |
+ done |
| 2508 |
+ } |
| 2509 |
+ |
| 2510 |
local md5="$(md5sum server/protocol.def)" |
| 2511 |
local PATCHES=( |
| 2512 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 2513 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 2514 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 2515 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 2516 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 2517 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 2518 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 2519 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 2520 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 2521 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 2522 |
+ ) |
| 2523 |
+ local PATCHES_BIN=( |
| 2524 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 2525 |
) |
| 2526 |
|
| 2527 |
default |
| 2528 |
+ eapply_bin |
| 2529 |
eautoreconf |
| 2530 |
|
| 2531 |
# Modification of the server protocol requires regenerating the server requests |
| 2532 |
@@ -313,8 +328,8 @@ src_prepare() { |
| 2533 |
# Edit wine.desktop to work for specific variant |
| 2534 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 2535 |
|
| 2536 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2537 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2538 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2539 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2540 |
|
| 2541 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 2542 |
} |
| 2543 |
|
| 2544 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.6.ebuild |
| 2545 |
index eedca27e1d2..757d3e9e857 100644 |
| 2546 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.6.ebuild |
| 2547 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.6.ebuild |
| 2548 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 2549 |
MY_P="${MY_PN}-${PV}" |
| 2550 |
|
| 2551 |
if [[ ${PV} == "9999" ]] ; then |
| 2552 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 2553 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 2554 |
EGIT_BRANCH="master" |
| 2555 |
inherit git-r3 |
| 2556 |
SRC_URI="" |
| 2557 |
@@ -24,13 +24,13 @@ else |
| 2558 |
fi |
| 2559 |
S="${WORKDIR}/${MY_P}" |
| 2560 |
|
| 2561 |
-WDC_V="20150204" |
| 2562 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 2563 |
+GWP_V="20170830" |
| 2564 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 2565 |
|
| 2566 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 2567 |
-HOMEPAGE="http://www.winehq.org/" |
| 2568 |
+HOMEPAGE="https://www.winehq.org/" |
| 2569 |
SRC_URI="${SRC_URI} |
| 2570 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 2571 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 2572 |
" |
| 2573 |
|
| 2574 |
LICENSE="LGPL-2.1" |
| 2575 |
@@ -131,6 +131,7 @@ RDEPEND="${COMMON_DEPEND} |
| 2576 |
|
| 2577 |
# tools/make_requests requires perl |
| 2578 |
DEPEND="${COMMON_DEPEND} |
| 2579 |
+ dev-util/patchbin |
| 2580 |
sys-devel/flex |
| 2581 |
>=sys-kernel/linux-headers-2.6 |
| 2582 |
virtual/pkgconfig |
| 2583 |
@@ -158,7 +159,7 @@ wine_compiler_check() { |
| 2584 |
# bug #549768 |
| 2585 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 2586 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 2587 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 2588 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 2589 |
# Run in subshell to prevent "Aborted" message |
| 2590 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 2591 |
if ! eend $?; then |
| 2592 |
@@ -174,7 +175,7 @@ wine_compiler_check() { |
| 2593 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 2594 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 2595 |
# Compile in subshell to prevent "Aborted" message |
| 2596 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2597 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2598 |
if ! eend $?; then |
| 2599 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 2600 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 2601 |
@@ -190,7 +191,7 @@ wine_compiler_check() { |
| 2602 |
if use abi_x86_64; then |
| 2603 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 2604 |
# Compile in subshell to prevent "Aborted" message |
| 2605 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2606 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2607 |
if ! eend $?; then |
| 2608 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 2609 |
eerror |
| 2610 |
@@ -289,15 +290,29 @@ src_unpack() { |
| 2611 |
} |
| 2612 |
|
| 2613 |
src_prepare() { |
| 2614 |
+ |
| 2615 |
+ eapply_bin(){ |
| 2616 |
+ local patch |
| 2617 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 2618 |
+ patchbin --nogit < "${patch}" || die |
| 2619 |
+ done |
| 2620 |
+ } |
| 2621 |
+ |
| 2622 |
local md5="$(md5sum server/protocol.def)" |
| 2623 |
local PATCHES=( |
| 2624 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 2625 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 2626 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 2627 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 2628 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 2629 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 2630 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 2631 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 2632 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 2633 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 2634 |
+ ) |
| 2635 |
+ local PATCHES_BIN=( |
| 2636 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 2637 |
) |
| 2638 |
|
| 2639 |
default |
| 2640 |
+ eapply_bin |
| 2641 |
eautoreconf |
| 2642 |
|
| 2643 |
# Modification of the server protocol requires regenerating the server requests |
| 2644 |
@@ -313,8 +328,8 @@ src_prepare() { |
| 2645 |
# Edit wine.desktop to work for specific variant |
| 2646 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 2647 |
|
| 2648 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2649 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2650 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2651 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2652 |
|
| 2653 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 2654 |
} |
| 2655 |
|
| 2656 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.7.ebuild |
| 2657 |
index eedca27e1d2..757d3e9e857 100644 |
| 2658 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.7.ebuild |
| 2659 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.7.ebuild |
| 2660 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 2661 |
MY_P="${MY_PN}-${PV}" |
| 2662 |
|
| 2663 |
if [[ ${PV} == "9999" ]] ; then |
| 2664 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 2665 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 2666 |
EGIT_BRANCH="master" |
| 2667 |
inherit git-r3 |
| 2668 |
SRC_URI="" |
| 2669 |
@@ -24,13 +24,13 @@ else |
| 2670 |
fi |
| 2671 |
S="${WORKDIR}/${MY_P}" |
| 2672 |
|
| 2673 |
-WDC_V="20150204" |
| 2674 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 2675 |
+GWP_V="20170830" |
| 2676 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 2677 |
|
| 2678 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 2679 |
-HOMEPAGE="http://www.winehq.org/" |
| 2680 |
+HOMEPAGE="https://www.winehq.org/" |
| 2681 |
SRC_URI="${SRC_URI} |
| 2682 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 2683 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 2684 |
" |
| 2685 |
|
| 2686 |
LICENSE="LGPL-2.1" |
| 2687 |
@@ -131,6 +131,7 @@ RDEPEND="${COMMON_DEPEND} |
| 2688 |
|
| 2689 |
# tools/make_requests requires perl |
| 2690 |
DEPEND="${COMMON_DEPEND} |
| 2691 |
+ dev-util/patchbin |
| 2692 |
sys-devel/flex |
| 2693 |
>=sys-kernel/linux-headers-2.6 |
| 2694 |
virtual/pkgconfig |
| 2695 |
@@ -158,7 +159,7 @@ wine_compiler_check() { |
| 2696 |
# bug #549768 |
| 2697 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 2698 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 2699 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 2700 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 2701 |
# Run in subshell to prevent "Aborted" message |
| 2702 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 2703 |
if ! eend $?; then |
| 2704 |
@@ -174,7 +175,7 @@ wine_compiler_check() { |
| 2705 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 2706 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 2707 |
# Compile in subshell to prevent "Aborted" message |
| 2708 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2709 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2710 |
if ! eend $?; then |
| 2711 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 2712 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 2713 |
@@ -190,7 +191,7 @@ wine_compiler_check() { |
| 2714 |
if use abi_x86_64; then |
| 2715 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 2716 |
# Compile in subshell to prevent "Aborted" message |
| 2717 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2718 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2719 |
if ! eend $?; then |
| 2720 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 2721 |
eerror |
| 2722 |
@@ -289,15 +290,29 @@ src_unpack() { |
| 2723 |
} |
| 2724 |
|
| 2725 |
src_prepare() { |
| 2726 |
+ |
| 2727 |
+ eapply_bin(){ |
| 2728 |
+ local patch |
| 2729 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 2730 |
+ patchbin --nogit < "${patch}" || die |
| 2731 |
+ done |
| 2732 |
+ } |
| 2733 |
+ |
| 2734 |
local md5="$(md5sum server/protocol.def)" |
| 2735 |
local PATCHES=( |
| 2736 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 2737 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 2738 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 2739 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 2740 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 2741 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 2742 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 2743 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 2744 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 2745 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 2746 |
+ ) |
| 2747 |
+ local PATCHES_BIN=( |
| 2748 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 2749 |
) |
| 2750 |
|
| 2751 |
default |
| 2752 |
+ eapply_bin |
| 2753 |
eautoreconf |
| 2754 |
|
| 2755 |
# Modification of the server protocol requires regenerating the server requests |
| 2756 |
@@ -313,8 +328,8 @@ src_prepare() { |
| 2757 |
# Edit wine.desktop to work for specific variant |
| 2758 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 2759 |
|
| 2760 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2761 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2762 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2763 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2764 |
|
| 2765 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 2766 |
} |
| 2767 |
|
| 2768 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.8.ebuild |
| 2769 |
index eedca27e1d2..757d3e9e857 100644 |
| 2770 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.8.ebuild |
| 2771 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.8.ebuild |
| 2772 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 2773 |
MY_P="${MY_PN}-${PV}" |
| 2774 |
|
| 2775 |
if [[ ${PV} == "9999" ]] ; then |
| 2776 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 2777 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 2778 |
EGIT_BRANCH="master" |
| 2779 |
inherit git-r3 |
| 2780 |
SRC_URI="" |
| 2781 |
@@ -24,13 +24,13 @@ else |
| 2782 |
fi |
| 2783 |
S="${WORKDIR}/${MY_P}" |
| 2784 |
|
| 2785 |
-WDC_V="20150204" |
| 2786 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 2787 |
+GWP_V="20170830" |
| 2788 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 2789 |
|
| 2790 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 2791 |
-HOMEPAGE="http://www.winehq.org/" |
| 2792 |
+HOMEPAGE="https://www.winehq.org/" |
| 2793 |
SRC_URI="${SRC_URI} |
| 2794 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 2795 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 2796 |
" |
| 2797 |
|
| 2798 |
LICENSE="LGPL-2.1" |
| 2799 |
@@ -131,6 +131,7 @@ RDEPEND="${COMMON_DEPEND} |
| 2800 |
|
| 2801 |
# tools/make_requests requires perl |
| 2802 |
DEPEND="${COMMON_DEPEND} |
| 2803 |
+ dev-util/patchbin |
| 2804 |
sys-devel/flex |
| 2805 |
>=sys-kernel/linux-headers-2.6 |
| 2806 |
virtual/pkgconfig |
| 2807 |
@@ -158,7 +159,7 @@ wine_compiler_check() { |
| 2808 |
# bug #549768 |
| 2809 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 2810 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 2811 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 2812 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 2813 |
# Run in subshell to prevent "Aborted" message |
| 2814 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 2815 |
if ! eend $?; then |
| 2816 |
@@ -174,7 +175,7 @@ wine_compiler_check() { |
| 2817 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 2818 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 2819 |
# Compile in subshell to prevent "Aborted" message |
| 2820 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2821 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2822 |
if ! eend $?; then |
| 2823 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 2824 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 2825 |
@@ -190,7 +191,7 @@ wine_compiler_check() { |
| 2826 |
if use abi_x86_64; then |
| 2827 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 2828 |
# Compile in subshell to prevent "Aborted" message |
| 2829 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2830 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2831 |
if ! eend $?; then |
| 2832 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 2833 |
eerror |
| 2834 |
@@ -289,15 +290,29 @@ src_unpack() { |
| 2835 |
} |
| 2836 |
|
| 2837 |
src_prepare() { |
| 2838 |
+ |
| 2839 |
+ eapply_bin(){ |
| 2840 |
+ local patch |
| 2841 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 2842 |
+ patchbin --nogit < "${patch}" || die |
| 2843 |
+ done |
| 2844 |
+ } |
| 2845 |
+ |
| 2846 |
local md5="$(md5sum server/protocol.def)" |
| 2847 |
local PATCHES=( |
| 2848 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 2849 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 2850 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 2851 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 2852 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 2853 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 2854 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 2855 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 2856 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 2857 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 2858 |
+ ) |
| 2859 |
+ local PATCHES_BIN=( |
| 2860 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 2861 |
) |
| 2862 |
|
| 2863 |
default |
| 2864 |
+ eapply_bin |
| 2865 |
eautoreconf |
| 2866 |
|
| 2867 |
# Modification of the server protocol requires regenerating the server requests |
| 2868 |
@@ -313,8 +328,8 @@ src_prepare() { |
| 2869 |
# Edit wine.desktop to work for specific variant |
| 2870 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 2871 |
|
| 2872 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2873 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2874 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2875 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2876 |
|
| 2877 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 2878 |
} |
| 2879 |
|
| 2880 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.9.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.9.ebuild |
| 2881 |
index 39a904b169a..b79fd64dd9a 100644 |
| 2882 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.9.ebuild |
| 2883 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.9.ebuild |
| 2884 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 2885 |
MY_P="${MY_PN}-${PV}" |
| 2886 |
|
| 2887 |
if [[ ${PV} == "9999" ]] ; then |
| 2888 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 2889 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 2890 |
EGIT_BRANCH="master" |
| 2891 |
inherit git-r3 |
| 2892 |
SRC_URI="" |
| 2893 |
@@ -24,13 +24,13 @@ else |
| 2894 |
fi |
| 2895 |
S="${WORKDIR}/${MY_P}" |
| 2896 |
|
| 2897 |
-WDC_V="20150204" |
| 2898 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 2899 |
+GWP_V="20170830" |
| 2900 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 2901 |
|
| 2902 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 2903 |
-HOMEPAGE="http://www.winehq.org/" |
| 2904 |
+HOMEPAGE="https://www.winehq.org/" |
| 2905 |
SRC_URI="${SRC_URI} |
| 2906 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 2907 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 2908 |
" |
| 2909 |
|
| 2910 |
LICENSE="LGPL-2.1" |
| 2911 |
@@ -132,6 +132,7 @@ RDEPEND="${COMMON_DEPEND} |
| 2912 |
|
| 2913 |
# tools/make_requests requires perl |
| 2914 |
DEPEND="${COMMON_DEPEND} |
| 2915 |
+ dev-util/patchbin |
| 2916 |
sys-devel/flex |
| 2917 |
>=sys-kernel/linux-headers-2.6 |
| 2918 |
virtual/pkgconfig |
| 2919 |
@@ -159,7 +160,7 @@ wine_compiler_check() { |
| 2920 |
# bug #549768 |
| 2921 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 2922 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 2923 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 2924 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 2925 |
# Run in subshell to prevent "Aborted" message |
| 2926 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 2927 |
if ! eend $?; then |
| 2928 |
@@ -175,7 +176,7 @@ wine_compiler_check() { |
| 2929 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 2930 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 2931 |
# Compile in subshell to prevent "Aborted" message |
| 2932 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2933 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 2934 |
if ! eend $?; then |
| 2935 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 2936 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 2937 |
@@ -191,7 +192,7 @@ wine_compiler_check() { |
| 2938 |
if use abi_x86_64; then |
| 2939 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 2940 |
# Compile in subshell to prevent "Aborted" message |
| 2941 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2942 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 2943 |
if ! eend $?; then |
| 2944 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 2945 |
eerror |
| 2946 |
@@ -290,15 +291,29 @@ src_unpack() { |
| 2947 |
} |
| 2948 |
|
| 2949 |
src_prepare() { |
| 2950 |
+ |
| 2951 |
+ eapply_bin(){ |
| 2952 |
+ local patch |
| 2953 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 2954 |
+ patchbin --nogit < "${patch}" || die |
| 2955 |
+ done |
| 2956 |
+ } |
| 2957 |
+ |
| 2958 |
local md5="$(md5sum server/protocol.def)" |
| 2959 |
local PATCHES=( |
| 2960 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 2961 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 2962 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 2963 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 2964 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 2965 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 2966 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 2967 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 2968 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 2969 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 2970 |
+ ) |
| 2971 |
+ local PATCHES_BIN=( |
| 2972 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 2973 |
) |
| 2974 |
|
| 2975 |
default |
| 2976 |
+ eapply_bin |
| 2977 |
eautoreconf |
| 2978 |
|
| 2979 |
# Modification of the server protocol requires regenerating the server requests |
| 2980 |
@@ -314,8 +329,8 @@ src_prepare() { |
| 2981 |
# Edit wine.desktop to work for specific variant |
| 2982 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 2983 |
|
| 2984 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2985 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2986 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 2987 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 2988 |
|
| 2989 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 2990 |
} |
| 2991 |
|
| 2992 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 2993 |
index 08531aba8cd..757d3e9e857 100644 |
| 2994 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 2995 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 2996 |
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}" |
| 2997 |
MY_P="${MY_PN}-${PV}" |
| 2998 |
|
| 2999 |
if [[ ${PV} == "9999" ]] ; then |
| 3000 |
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 3001 |
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git" |
| 3002 |
EGIT_BRANCH="master" |
| 3003 |
inherit git-r3 |
| 3004 |
SRC_URI="" |
| 3005 |
@@ -24,13 +24,13 @@ else |
| 3006 |
fi |
| 3007 |
S="${WORKDIR}/${MY_P}" |
| 3008 |
|
| 3009 |
-WDC_V="20150204" |
| 3010 |
-WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" |
| 3011 |
+GWP_V="20170830" |
| 3012 |
+PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
| 3013 |
|
| 3014 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" |
| 3015 |
-HOMEPAGE="http://www.winehq.org/" |
| 3016 |
+HOMEPAGE="https://www.winehq.org/" |
| 3017 |
SRC_URI="${SRC_URI} |
| 3018 |
- https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz |
| 3019 |
+ https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz |
| 3020 |
" |
| 3021 |
|
| 3022 |
LICENSE="LGPL-2.1" |
| 3023 |
@@ -50,7 +50,6 @@ COMMON_DEPEND=" |
| 3024 |
X? ( |
| 3025 |
x11-libs/libXcursor[${MULTILIB_USEDEP}] |
| 3026 |
x11-libs/libXext[${MULTILIB_USEDEP}] |
| 3027 |
- x11-libs/libXfixes[${MULTILIB_USEDEP}] |
| 3028 |
x11-libs/libXrandr[${MULTILIB_USEDEP}] |
| 3029 |
x11-libs/libXi[${MULTILIB_USEDEP}] |
| 3030 |
x11-libs/libXxf86vm[${MULTILIB_USEDEP}] |
| 3031 |
@@ -118,7 +117,7 @@ RDEPEND="${COMMON_DEPEND} |
| 3032 |
!app-emulation/wine:0 |
| 3033 |
dos? ( >=games-emulation/dosbox-0.74_p20160629 ) |
| 3034 |
gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) |
| 3035 |
- mono? ( app-emulation/wine-mono:4.7.1 ) |
| 3036 |
+ mono? ( app-emulation/wine-mono:4.7.0 ) |
| 3037 |
perl? ( |
| 3038 |
dev-lang/perl |
| 3039 |
dev-perl/XML-Simple |
| 3040 |
@@ -132,6 +131,7 @@ RDEPEND="${COMMON_DEPEND} |
| 3041 |
|
| 3042 |
# tools/make_requests requires perl |
| 3043 |
DEPEND="${COMMON_DEPEND} |
| 3044 |
+ dev-util/patchbin |
| 3045 |
sys-devel/flex |
| 3046 |
>=sys-kernel/linux-headers-2.6 |
| 3047 |
virtual/pkgconfig |
| 3048 |
@@ -159,7 +159,7 @@ wine_compiler_check() { |
| 3049 |
# bug #549768 |
| 3050 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
| 3051 |
ebegin "Checking for gcc-5 ms_abi compiler bug" |
| 3052 |
- $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die |
| 3053 |
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
| 3054 |
# Run in subshell to prevent "Aborted" message |
| 3055 |
( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
| 3056 |
if ! eend $?; then |
| 3057 |
@@ -175,7 +175,7 @@ wine_compiler_check() { |
| 3058 |
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
| 3059 |
ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
| 3060 |
# Compile in subshell to prevent "Aborted" message |
| 3061 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 3062 |
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
| 3063 |
if ! eend $?; then |
| 3064 |
eerror "Wine cannot be built with this version of gcc-5.3" |
| 3065 |
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
| 3066 |
@@ -191,7 +191,7 @@ wine_compiler_check() { |
| 3067 |
if use abi_x86_64; then |
| 3068 |
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
| 3069 |
# Compile in subshell to prevent "Aborted" message |
| 3070 |
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 3071 |
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
| 3072 |
if ! eend $?; then |
| 3073 |
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
| 3074 |
eerror |
| 3075 |
@@ -290,15 +290,29 @@ src_unpack() { |
| 3076 |
} |
| 3077 |
|
| 3078 |
src_prepare() { |
| 3079 |
+ |
| 3080 |
+ eapply_bin(){ |
| 3081 |
+ local patch |
| 3082 |
+ for patch in ${PATCHES_BIN[@]}; do |
| 3083 |
+ patchbin --nogit < "${patch}" || die |
| 3084 |
+ done |
| 3085 |
+ } |
| 3086 |
+ |
| 3087 |
local md5="$(md5sum server/protocol.def)" |
| 3088 |
local PATCHES=( |
| 3089 |
- "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 |
| 3090 |
- "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 |
| 3091 |
- "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 |
| 3092 |
- "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch |
| 3093 |
+ "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 |
| 3094 |
+ "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 3095 |
+ "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 3096 |
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" |
| 3097 |
+ "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 |
| 3098 |
+ "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 |
| 3099 |
+ ) |
| 3100 |
+ local PATCHES_BIN=( |
| 3101 |
+ "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 |
| 3102 |
) |
| 3103 |
|
| 3104 |
default |
| 3105 |
+ eapply_bin |
| 3106 |
eautoreconf |
| 3107 |
|
| 3108 |
# Modification of the server protocol requires regenerating the server requests |
| 3109 |
@@ -314,8 +328,8 @@ src_prepare() { |
| 3110 |
# Edit wine.desktop to work for specific variant |
| 3111 |
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die |
| 3112 |
|
| 3113 |
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 3114 |
- cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die |
| 3115 |
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 |
| 3116 |
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die |
| 3117 |
|
| 3118 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 3119 |
} |
| 3120 |
@@ -375,7 +389,6 @@ multilib_src_configure() { |
| 3121 |
$(use_with udev) |
| 3122 |
$(use_with v4l) |
| 3123 |
$(use_with X x) |
| 3124 |
- $(use_with X xfixes) |
| 3125 |
$(use_with xcomposite) |
| 3126 |
$(use_with xinerama) |
| 3127 |
$(use_with xml) |
Archives