diff --git a/_service b/_service index 951c622..2ad3dbd 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ @PARENT_TAG@ v(.*) https://github.com/wine-staging/wine-staging.git - refs/tags/v3.14 + refs/tags/v3.15 v*.* git @@ -11,7 +11,7 @@ @PARENT_TAG@ wined3d9(.*) https://github.com/sarnex/wine-d3d9-patches.git - refs/tags/wine-d3d9-3.13 + refs/tags/wine-d3d9-3.14 git diff --git a/wine-3.14.tar.xz b/wine-3.14.tar.xz deleted file mode 100644 index b333c0a..0000000 --- a/wine-3.14.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47896634c255c202d04b85f884b4f1bceb02e1d7bb2ff257b6bc8d69d4b0b005 -size 20583696 diff --git a/wine-3.14.tar.xz.sign b/wine-3.14.tar.xz.sign deleted file mode 100644 index 7c5725c..0000000 --- a/wine-3.14.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlt3Bp4ACgkQzvrI6q8X -UZ1WrA//a61H/PaKC9q2QRfB+3mcPunbNWiBNl7z6tObn5ijS8QVGyjYYSHZkjTs -RJW1hxB1+sD2PZlCN1SoUS7vrnflRJNa9jjRDVzM1CZzM2dosEHz7kfUUcB+4urR -MZze8omt9jHKErjLvCJEhiGjZUuse2VYG4skvPtR44/ORT4CHSw6b3y+c73A6HOS -zdhg9GTR7e2MP3HF/kFt2dW8FPNvikeDCqHsebqMP6l6eKmotz6eRMQATgKX08Gn -IlylGJHSEFrrXuwloXfYNvM41fTp2QLHmOw4RYz0bedJRnzdpnuhJ4+PxdCs/D0e -VIlUOJEpWBiW0VAR8Y7XtYCLFIgw/R6CtWfbPWUznrCxRrXsb7MTTVebi8ESWMpK -cK2+qAiBGONXaLBgq6ugf+4QZ9NCQjgz0KzHu/gN1hgWUfNXr81C3/ZnO414dlAm -0H3wICtBkTbmuDWmKv0yztgYVF4JSHCLliP/SdtV7gSKJQR3OxWjLL+7Rt0kXGZa -ZRQpOnV4rkGBvjV4TdLmZPAAqgXW+/MEPChwNqHcLF2KW0Qxs0yn1I2AsiyYouQ0 -4X2iH3oncJBABJIiD4lfyirwWAy8UTKLks+3vaDawbZKnjOaap1pnDupNhKovtiy -qBcnV3uzVEqB+lbs0GMsPkwGGkQ/103n69rCKtB+5ce0jw4apzw= -=uuji ------END PGP SIGNATURE----- diff --git a/wine-3.15.tar.xz b/wine-3.15.tar.xz new file mode 100644 index 0000000..b954394 --- /dev/null +++ b/wine-3.15.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ca2cd95b69f2d89aaa481db34db20cbb249c6aba28ad77ecf383270326ab51e +size 21402964 diff --git a/wine-3.15.tar.xz.sign b/wine-3.15.tar.xz.sign new file mode 100644 index 0000000..f34531d --- /dev/null +++ b/wine-3.15.tar.xz.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAluJlj0ACgkQzvrI6q8X +UZ0fbw//eDxsJ3pNm7zTYk61V85D2uTxDUgoedLYGi8umxcq/GXUPHQowJZI9Jsw +T6Vw5INMJfNzAm/i+ec66W/CJi/Xwhb+yT6u2s3M5A/A6fDurm272FGsi2e4yKlh +hVVfG5ADB5eE+SFgjJ/NEOfTkTAF4BavOYzD++PRUYVcIJnDPBvRWyWWMEBQ/NwW +fim3jvAVG1ckKEcBADmEOMIRrWAyqPU1RqQr6mIUPtTt+LkJgL9YvEb9+FGd0h0r +wI1Q45JbYumuS8eEMIHsNbi5frC0GR3UJoqsrya/DOmEwB7nHM31RYDyaI8o3jcS +YQ9z+sN8UG23uYCtM9R5rmk3Kq9O9eFlaQ6qy6IFs9FENpLr56kudRk+/5XWI1o9 +pu2F/8YvyPIdozvi1HpZqhPCGSGZHrf2+WVEafqDluSiBgkJx9JPFZrq57EU/xxJ +VhIh3lWtAdqFggCdztn86lqH2HTxOFuyVuNr3hSUcOmoBCvmd7L/5WAEI3Q1SM/T +B5k8eyzUpxupjNqLwLAAEubAJXqRvV1CVRTkCnKH6tVc/edFGQFSmkeSmFt00p8F +Fm9aJMcFB7Q4SttZdVQrKU9OdJIR9gY3zWcFtIs5WSa6rOrHsuBox3v9awi0g2Ze +NgBWtCLuJbiCQCVahA5iewXK5sCb12yuLYubkHttfTlDV0MnVBo= +=ifeX +-----END PGP SIGNATURE----- diff --git a/wine.changes b/wine.changes index 2fd0a80..44f3a58 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Sep 1 06:17:50 UTC 2018 - meissner@suse.com + +- Update to 3.15 development release + - Support for DPI scaling on Android. + - HID device support in Raw Input. + - Many more new icons in Shell32. + - WinHTTP converted to use Windows Sockets. + - Syntax fixes in the command line interpreter. + - Various bug fixes. +- updated winetricks + ------------------------------------------------------------------- Fri Aug 17 19:59:29 UTC 2018 - meissner@suse.com diff --git a/wine.spec b/wine.spec index 81ac834..868b7fc 100644 --- a/wine.spec +++ b/wine.spec @@ -107,8 +107,8 @@ BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -%define realver 3.14 -Version: 3.14 +%define realver 3.15 +Version: 3.15 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1-or-later diff --git a/winetricks b/winetricks index 93ead75..03ae0e3 100644 --- a/winetricks +++ b/winetricks @@ -2750,13 +2750,16 @@ w_declare_exe() } # Checks that a conflicting verb is not already installed in the prefix -# Usage: w_conflicts verb_to_install conflicts +# Usage: w_conflicts verb_to_install conflicting_verbs w_conflicts() { - for x in $2 + verb="$1" + conflicting_verbs="$2" + + for x in $conflicting_verbs do if grep -qw "$x" "$WINEPREFIX/winetricks.log" 2>/dev/null; then - w_die "error: $1 conflicts with $x, which is already installed." + w_die "error: $verb conflicts with $x, which is already installed. You can run \`$0 --force $verb\` to ignore this check and attempt installation." fi done } @@ -4844,6 +4847,18 @@ winetricks_set_unattended() esac } +# Usage: winetricks_print_wineprefix_info +# Print some useful info about $WINEPREFIX if things fail in winetricks_set_wineprefix() +winetricks_print_wineprefix_info() +{ + printf "WINEPREFIX INFO:\\n" + printf "Drive C: %s\\n\\n" "$(ls -al1 "${WINEPREFIX}/drive_c")" + printf "Registry info:\\n" + for regfile in "${WINEPREFIX}"/*.reg; do + printf "%s:%s\\n" "${regfile}" "$(grep '#arch=' "${regfile}")" + done +} + # Usage: winetricks_set_wineprefix [bottlename] # Bottlename must not contain spaces, slashes, or other special characters # If bottlename is omitted, the default bottle (~/.wine) is used. @@ -4863,9 +4878,9 @@ winetricks_set_wineprefix() # The folder-name is localized! W_PROGRAMS_WIN="$(w_expand_env ProgramFiles)" case "$W_PROGRAMS_WIN" in - "") w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned empty string, error message \"$(cat $W_TMP_EARLY/early_wine.err.txt)\" ";; - %*) w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned unexpanded string '$W_PROGRAMS_WIN' ... this can be caused by a corrupt wineprefix, by an old wine, or by not owning $WINEPREFIX" ;; - *unknown*) w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned a string containing the word 'unknown', as if a voice had cried out in terror, and was suddenly silenced." ;; + "") w_info "$(winetricks_print_wineprefix_info)" ; w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned empty string, error message \"$(cat $W_TMP_EARLY/early_wine.err.txt)\" ";; + %*) w_info "$(winetricks_print_wineprefix_info)" ; w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned unexpanded string '$W_PROGRAMS_WIN' ... this can be caused by a corrupt wineprefix, by an old wine, or by not owning $WINEPREFIX" ;; + *unknown*) w_info "$(winetricks_print_wineprefix_info)" ; w_die "$WINE cmd.exe /c echo '%ProgramFiles%' returned a string containing the word 'unknown', as if a voice had cried out in terror, and was suddenly silenced." ;; esac case "$W_PLATFORM" in @@ -11046,36 +11061,36 @@ load_pptfonts() #---------------------------------------------------------------- -w_metadata corefonts fonts \ - title="MS Arial, Courier, Times fonts" \ +w_metadata andale fonts \ + title="MS Andale Mono font" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="andale32.exe" \ + installed_file1="$W_FONTSDIR_WIN/andalemo.ttf" + +load_andale() +{ + w_download_to corefonts "https://mirrors.kernel.org/gentoo/distfiles/andale32.exe" 0524fe42951adc3a7eb870e32f0920313c71f170c859b5f770d82b4ee111e970 + w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/andale32.exe + w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "AndaleMo.TTF" + w_register_font andalemo.ttf "Andale Mono" +} + +#---------------------------------------------------------------- + +w_metadata arial fonts \ + title="MS Arial / Arial Black fonts" \ publisher="Microsoft" \ year="2008" \ media="download" \ file1="arial32.exe" \ installed_file1="$W_FONTSDIR_WIN/arial.ttf" -load_corefonts() +load_arial() { - w_download "https://mirrors.kernel.org/gentoo/distfiles/andale32.exe" 0524fe42951adc3a7eb870e32f0920313c71f170c859b5f770d82b4ee111e970 - w_download "https://mirrors.kernel.org/gentoo/distfiles/arial32.exe" 85297a4d146e9c87ac6f74822734bdee5f4b2a722d7eaa584b7f2cbf76f478f6 - w_download "https://mirrors.kernel.org/gentoo/distfiles/arialb32.exe" a425f0ffb6a1a5ede5b979ed6177f4f4f4fdef6ae7c302a7b7720ef332fec0a8 - w_download "https://mirrors.kernel.org/gentoo/distfiles/comic32.exe" 9c6df3feefde26d4e41d4a4fe5db2a89f9123a772594d7f59afd062625cd204e - w_download "https://mirrors.kernel.org/gentoo/distfiles/courie32.exe" bb511d861655dde879ae552eb86b134d6fae67cb58502e6ff73ec5d9151f3384 - w_download "https://mirrors.kernel.org/gentoo/distfiles/georgi32.exe" 2c2c7dcda6606ea5cf08918fb7cd3f3359e9e84338dc690013f20cd42e930301 - w_download "https://mirrors.kernel.org/gentoo/distfiles/impact32.exe" 6061ef3b7401d9642f5dfdb5f2b376aa14663f6275e60a51207ad4facf2fccfb - w_download "https://mirrors.kernel.org/gentoo/distfiles/times32.exe" db56595ec6ef5d3de5c24994f001f03b2a13e37cee27bc25c58f6f43e8f807ab - w_download "https://mirrors.kernel.org/gentoo/distfiles/trebuc32.exe" 5a690d9bb8510be1b8b4fe49f1f2319651fe51bbe54775ddddd8ef0bd07fdac9 - w_download "https://mirrors.kernel.org/gentoo/distfiles/verdan32.exe" c1cb61255e363166794e47664e2f21af8e3a26cb6346eb8d2ae2fa85dd5aad96 - w_download "https://mirrors.kernel.org/gentoo/distfiles/webdin32.exe" 64595b5abc1080fba8610c5c34fab5863408e806aafe84653ca8575bed17d75a - - # Natively installed versions of these fonts will cause the installers - # to exit silently. Because there are apps out there that depend on the - # files being present in the Windows font directory we use cabextract - # to obtain the files and register the fonts by hand. - - w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/andale32.exe - w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "AndaleMo.TTF" - w_register_font andalemo.ttf "Andale Mono" + w_download_to corefonts "https://mirrors.kernel.org/gentoo/distfiles/arial32.exe" 85297a4d146e9c87ac6f74822734bdee5f4b2a722d7eaa584b7f2cbf76f478f6 + w_download_to corefonts "https://mirrors.kernel.org/gentoo/distfiles/arialb32.exe" a425f0ffb6a1a5ede5b979ed6177f4f4f4fdef6ae7c302a7b7720ef332fec0a8 w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/arial32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "Arial*.TTF" @@ -11087,51 +11102,161 @@ load_corefonts() w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/arialb32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "AriBlk.TTF" w_register_font ariblk.ttf "Arial Black" +} +#---------------------------------------------------------------- + +w_metadata comicsans fonts \ + title="MS Comic Sans fonts" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="comic32.exe" \ + installed_file1="$W_FONTSDIR_WIN/comic.ttf" + +load_comicsans() +{ + w_download_to corefonts "https://mirrors.kernel.org/gentoo/distfiles/comic32.exe" 9c6df3feefde26d4e41d4a4fe5db2a89f9123a772594d7f59afd062625cd204e w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/comic32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "Comic*.TTF" w_register_font comicbd.ttf "Comic Sans MS Bold" w_register_font comic.ttf "Comic Sans MS" +} +#---------------------------------------------------------------- + +w_metadata courier fonts \ + title="MS Courier fonts" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="courie32.exe" \ + installed_file1="$W_FONTSDIR_WIN/cour.ttf" +load_courier() +{ + w_download_to corefonts "https://mirrors.kernel.org/gentoo/distfiles/courie32.exe" bb511d861655dde879ae552eb86b134d6fae67cb58502e6ff73ec5d9151f3384 w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/courie32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "cour*.ttf" w_register_font courbd.ttf "Courier New Bold" w_register_font courbi.ttf "Courier New Bold Italic" w_register_font couri.ttf "Courier New Italic" w_register_font cour.ttf "Courier New" +} +#---------------------------------------------------------------- + +w_metadata georgia fonts \ + title="MS Georgia fonts" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="georgi32.exe" \ + installed_file1="$W_FONTSDIR_WIN/georgia.ttf" +load_georgia() +{ + w_download_to corefonts "https://mirrors.kernel.org/gentoo/distfiles/georgi32.exe" 2c2c7dcda6606ea5cf08918fb7cd3f3359e9e84338dc690013f20cd42e930301 w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/georgi32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "Georgia*.TTF" w_register_font georgiab.ttf "Georgia Bold" w_register_font georgiai.ttf "Georgia Italic" w_register_font georgia.ttf "Georgia" w_register_font georgiaz.ttf "Georgia Bold Italic" +} +#---------------------------------------------------------------- + +w_metadata impact fonts \ + title="MS Impact fonts" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="impact32.exe" \ + installed_file1="$W_FONTSDIR_WIN/impact.ttf" + +load_impact() +{ + w_download_to corefonts "https://mirrors.kernel.org/gentoo/distfiles/impact32.exe" 6061ef3b7401d9642f5dfdb5f2b376aa14663f6275e60a51207ad4facf2fccfb w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/impact32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "Impact.TTF" w_register_font impact.ttf "Impact" +} +#---------------------------------------------------------------- + +w_metadata times fonts \ + title="MS Times fonts" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="times32.exe" \ + installed_file1="$W_FONTSDIR_WIN/times.ttf" + +load_times() +{ + w_download_to corefonts "https://mirrors.kernel.org/gentoo/distfiles/times32.exe" db56595ec6ef5d3de5c24994f001f03b2a13e37cee27bc25c58f6f43e8f807ab w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/times32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "Times*.TTF" w_register_font timesbd.ttf "Times New Roman Bold" w_register_font timesbi.ttf "Times New Roman Bold Italic" w_register_font timesi.ttf "Times New Roman Italic" w_register_font times.ttf "Times New Roman" +} +#---------------------------------------------------------------- + +w_metadata trebuchet fonts \ + title="MS Trebuchet fonts" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="trebuchet32.exe" \ + installed_file1="$W_FONTSDIR_WIN/trebuc.ttf" + +load_trebuchet() +{ + w_download_to corefonts "https://mirrors.kernel.org/gentoo/distfiles/trebuc32.exe" 5a690d9bb8510be1b8b4fe49f1f2319651fe51bbe54775ddddd8ef0bd07fdac9 w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/trebuc32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "[tT]rebuc*.ttf" w_register_font trebucbd.ttf "Trebuchet MS Bold" w_register_font trebucbi.ttf "Trebuchet MS Bold Italic" w_register_font trebucit.ttf "Trebuchet MS Italic" w_register_font trebuc.ttf "Trebuchet MS" +} +#---------------------------------------------------------------- + +w_metadata verdana fonts \ + title="MS Verdana fonts" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="verdan32.exe" \ + installed_file1="$W_FONTSDIR_WIN/verdana.ttf" + +load_verdana() +{ + w_download_to corefonts "https://mirrors.kernel.org/gentoo/distfiles/verdan32.exe" c1cb61255e363166794e47664e2f21af8e3a26cb6346eb8d2ae2fa85dd5aad96 w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/verdan32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "Verdana*.TTF" w_register_font verdanab.ttf "Verdana Bold" w_register_font verdanai.ttf "Verdana Italic" w_register_font verdana.ttf "Verdana" w_register_font verdanaz.ttf "Verdana Bold Italic" +} +#---------------------------------------------------------------- + +w_metadata webdings fonts \ + title="MS Webdings fonts" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="webdin32.exe" \ + installed_file1="$W_FONTSDIR_WIN/webdings.ttf" + +load_webdings() +{ + w_download_to corefonts "https://mirrors.kernel.org/gentoo/distfiles/webdin32.exe" 64595b5abc1080fba8610c5c34fab5863408e806aafe84653ca8575bed17d75a w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/webdin32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "Webdings.TTF" w_register_font webdings.ttf "Webdings" @@ -11139,6 +11264,37 @@ load_corefonts() #---------------------------------------------------------------- +w_metadata corefonts fonts \ + title="MS Arial, Courier, Times fonts" \ + publisher="Microsoft" \ + year="2008" \ + media="download" \ + file1="arial32.exe" \ + installed_file1="$W_FONTSDIR_WIN/corefonts.installed" + +load_corefonts() +{ + # Natively installed versions of these fonts will cause the installers + # to exit silently. Because there are apps out there that depend on the + # files being present in the Windows font directory we use cabextract + # to obtain the files and register the fonts by hand. + + w_call andale + w_call arial + w_call comicsans + w_call courier + w_call georgia + w_call impact + w_call times + w_call trebuchet + w_call verdana + w_call webdings + + touch "$W_FONTSDIR_UNIX/corefonts.installed" +} + +#---------------------------------------------------------------- + w_metadata droid fonts \ title="Droid fonts" \ publisher="Ascender Corporation" \