From 6c97e6f348cb038c6e355cbe70b7fae8f6e3b4ba9430b6aece486efd5a931e18 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 22 Dec 2017 17:50:51 +0000 Subject: [PATCH] - Update to 3.0 rc3 release candidate - Bugfixes only, we are in code freeze - Updated winetricks OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=460 --- wine-3.0-rc2.tar.xz | 3 - wine-3.0-rc2.tar.xz.sign | 16 --- wine-3.0-rc3.tar.xz | 3 + wine-3.0-rc3.tar.xz.sign | 16 +++ wine.changes | 7 ++ wine.spec | 4 +- winetricks | 234 ++++++++++++++++++++++++++++++--------- winetricks.1 | 2 +- 8 files changed, 211 insertions(+), 74 deletions(-) delete mode 100644 wine-3.0-rc2.tar.xz delete mode 100644 wine-3.0-rc2.tar.xz.sign create mode 100644 wine-3.0-rc3.tar.xz create mode 100644 wine-3.0-rc3.tar.xz.sign diff --git a/wine-3.0-rc2.tar.xz b/wine-3.0-rc2.tar.xz deleted file mode 100644 index 7f9f64a..0000000 --- a/wine-3.0-rc2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6d07933d30247d8560c66f3ccea976cbb6f111c8a588a8874425f176abfc4a2 -size 19675444 diff --git a/wine-3.0-rc2.tar.xz.sign b/wine-3.0-rc2.tar.xz.sign deleted file mode 100644 index c8f2176..0000000 --- a/wine-3.0-rc2.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlo0NGAACgkQzvrI6q8X -UZ0uFQ/+ILLXZ7krlyvcHDDKl3HRWfPXlOg2jWCMoa0lOvEJwch8TaC1kMWElbLr -oFoEJ2NWdkTWLu+2NTEei2s8I4X3fJvgIajXMMdbEV8FV1E4DUrsQPnt1NLpvWJK -B/dxkTs1N1Rf1juWBHk1W0YYgvCdNHJf5gzFhILT9atqrwmorplW2qsdVfTehEvJ -d+NgfbHINFqiC3+nw5RkQmrGvZW6UD15cZJPMzz/fzkJBREZyzKP12skUGwrmQqr -UTtibsETnMz4Li7AYTN02dtw/zrCp6fOhF37RpRdsx7FkVsmncDYqESaEjnaCbwT -vitdDFDMrE3xRBodDRtUF9KF5cnq3LtH+xEBOX6cokw+GwvfF3e3aXbsR9FsGDcF -ny+M12nUqRC4yD1fn1Wsdnm1z56Ivv1fduH645PnIkoUDszRxHNqpV+Cvh+4JDQn -iECK4t3W1YTaGh29sBmDMSuzwI9g1ezJAF87p2V9KJGcjIRWYqTcl9mUKGyWSHlL -CFz9uPIbGb0cRHxbq6D7YRuL96uukBpyjUxHEAVKmbzuxfL6q12mY5dDEW7kJEPM -ARqjAPv/HzWb/s9RmoTBRu2GmulZAareF6apoGAAzAo0cULfSzlAvAlg5MpgS9g3 -KWItqCCABN7c3kU9/N0HxUzmxl5lq4GI3XBIAzAhBBZ1HfaTqtE= -=0DMc ------END PGP SIGNATURE----- diff --git a/wine-3.0-rc3.tar.xz b/wine-3.0-rc3.tar.xz new file mode 100644 index 0000000..48033bc --- /dev/null +++ b/wine-3.0-rc3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2fceb1fcfc21a075288e0d4b335fa8730d1014b4ea41deb6cf7d5e2e7eefc73 +size 19703140 diff --git a/wine-3.0-rc3.tar.xz.sign b/wine-3.0-rc3.tar.xz.sign new file mode 100644 index 0000000..63a6059 --- /dev/null +++ b/wine-3.0-rc3.tar.xz.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlo9PU8ACgkQzvrI6q8X +UZ0SwA/+NYZwHkIYaoIyJqxF0iEspl7c7rIag02+44QZQEnX49IaS+vGPnCiAWpd +QfqcqMX0HcSWZxhDhBm4YG1sEhAGQw5Ph7Oz+Bhzxh4N4tPmw1lUVPBXfJltkObF +kBz8fwjByuflGIMr8hQW4OLC2BFkVE8efgE1Atn+pLQo7GCeUGrutbB4Bu1ns84p +a6+64r32Yk9LD6mqyyNEWgS8wOlORCe7WB9POxnFVGDboSHCmKPX37BsW66Orc5n +soAkfXAk9qMsMCAk16YRgeU0a4pUTvNxc0PMb/f7VQHYUfMkrGfxWkRbl7hM/896 +7n+zyvKlstK0U3I4VD69ANcIESPeMHojZag21BKh7HDeI6ZO7OlFvd7/X87EDIIf +vADTh9NBeAaV8m/OK7rBZFriV0yZ93Ks4mpZo/znzTAwH2rvvcdEcCKoInPej2Sc +pg58VEi+9wXu0KqxwYGFZVduPxsyu99MhgwFSsTACFbAHQordALN2q04dXejQuvQ +OzOoeeKwjTU/U7ddSBbJompWvKBgNhw/xLwSuNzNpZ05qGAWuuLTXSiByxVLSLvA +gAyFWESJ1Iwl/JVy8N3kJDGEE/8UvWYlo+AEjO5SqlDnQHPrQsq78FsYxMJGO4wV +g4D/IrxpQ4zTXLeZMe+JJCuouC44w2pU3iBMWdpW+naiNY0dK44= +=QZDQ +-----END PGP SIGNATURE----- diff --git a/wine.changes b/wine.changes index cdf7c06..81d99c1 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 22 17:47:31 UTC 2017 - meissner@suse.com + +- Update to 3.0 rc3 release candidate + - Bugfixes only, we are in code freeze +- Updated winetricks + ------------------------------------------------------------------- Sun Dec 17 18:39:18 UTC 2017 - meissner@suse.com diff --git a/wine.spec b/wine.spec index 422ac47..3ef4c6c 100644 --- a/wine.spec +++ b/wine.spec @@ -79,8 +79,8 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel BuildRequires: pkgconfig(libudev) -%define realver 3.0-rc2 -Version: 3.0~rc2 +%define realver 3.0-rc3 +Version: 3.0~rc3 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ diff --git a/winetricks b/winetricks index bee446a..1fe00b6 100644 --- a/winetricks +++ b/winetricks @@ -6,7 +6,7 @@ # Name of this version of winetricks (YYYYMMDD) # (This doesn't change often, use the sha256sum of the file when reporting problems) -WINETRICKS_VERSION=20171018-next +WINETRICKS_VERSION=20171222-next # This is a UTF-8 file # You should see an o with two dots over it here [รถ] @@ -554,6 +554,9 @@ w_try_cp_font_files() w_try cp -f "$_W_src_file" "$_W_dest_dir/$_W_file_name" done + # Wait for Wine to add the new font to the registry under HKCU\Software\Wine\Fonts\Cache + w_wineserver -w + unset _W_src_files _W_dest_dir _W_src_file _W_file_name } @@ -2645,7 +2648,7 @@ w_conflicts() { for x in $2 do - if grep -qw "$x" "$WINEPREFIX/winetricks.log"; then + if grep -qw "$x" "$WINEPREFIX/winetricks.log" 2>/dev/null; then w_die "error: $1 conflicts with $x, which is already installed." fi done @@ -3958,7 +3961,7 @@ winetricks_is_installed() fi # Test if the verb has been executed before - if ! grep -qw "$1" "$WINEPREFIX/winetricks.log"; then + if ! grep -qw "$1" "$WINEPREFIX/winetricks.log" 2>/dev/null; then unset _W_file return 1 # not installed fi @@ -10123,6 +10126,29 @@ load_cjkfonts() #---------------------------------------------------------------- +w_metadata calibri fonts \ + title="MS Calibri font" \ + publisher="Microsoft" \ + year="2007" \ + media="download" \ + file1="PowerPointViewer.exe" \ + installed_file1="$W_FONTSDIR_WIN/calibri.ttf" + +load_calibri() +{ + # https://www.microsoft.com/en-us/download/details.aspx?id=13 + w_download_to PowerPointViewer "https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423 + w_try_cabextract -d "$W_TMP" -F "ppviewer.cab" "$W_CACHE/PowerPointViewer/$file1" + w_try_cabextract -d "$W_TMP" -F "CALIBRI*.TTF" "$W_TMP/ppviewer.cab" + w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "CALIBRI*.TTF" + w_register_font calibri.ttf "Calibri" + w_register_font calibrib.ttf "Calibri Bold" + w_register_font calibrii.ttf "Calibri Italic" + w_register_font calibriz.ttf "Calibri Bold Italic" +} + +#---------------------------------------------------------------- + w_metadata cambria fonts \ title="MS Cambria font" \ publisher="Microsoft" \ @@ -10138,7 +10164,7 @@ load_cambria() w_try_cabextract -d "$W_TMP" -F "ppviewer.cab" "$W_CACHE/PowerPointViewer/$file1" w_try_cabextract -d "$W_TMP" -F "CAMBRIA*.TT*" "$W_TMP/ppviewer.cab" w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "CAMBRIA*.TT*" - w_register_font cambria.ttc "Cambria" + w_register_font cambria.ttc "Cambria & Cambria Math" w_register_font cambriab.ttf "Cambria Bold" w_register_font cambriai.ttf "Cambria Italic" w_register_font cambriaz.ttf "Cambria Bold Italic" @@ -10146,6 +10172,52 @@ load_cambria() #---------------------------------------------------------------- +w_metadata candara fonts \ + title="MS Candara font" \ + publisher="Microsoft" \ + year="2009" \ + media="download" \ + file1="PowerPointViewer.exe" \ + installed_file1="$W_FONTSDIR_WIN/candara.ttf" + +load_candara() +{ + # https://www.microsoft.com/en-us/download/details.aspx?id=13 + w_download_to PowerPointViewer "https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423 + w_try_cabextract -d "$W_TMP" -F "ppviewer.cab" "$W_CACHE/PowerPointViewer/$file1" + w_try_cabextract -d "$W_TMP" -F "CANDARA*.TTF" "$W_TMP/ppviewer.cab" + w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "CANDARA*.TTF" + w_register_font candara.ttf "Candara" + w_register_font candarab.ttf "Candara Bold" + w_register_font candarai.ttf "Candara Italic" + w_register_font candaraz.ttf "Candara Bold Italic" +} + +#---------------------------------------------------------------- + +w_metadata consolas fonts \ + title="MS Consolas console font" \ + publisher="Microsoft" \ + year="2011" \ + media="download" \ + file1="PowerPointViewer.exe" \ + installed_file1="$W_FONTSDIR_WIN/consola.ttf" + +load_consolas() +{ + # https://www.microsoft.com/en-us/download/details.aspx?id=13 + w_download_to PowerPointViewer "https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423 + w_try_cabextract -d "$W_TMP" -F "ppviewer.cab" "$W_CACHE/PowerPointViewer/$file1" + w_try_cabextract -d "$W_TMP" -F "CONSOLA*.TTF" "$W_TMP/ppviewer.cab" + w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "CONSOLA*.TTF" + w_register_font consola.ttf "Consolas" + w_register_font consolab.ttf "Consolas Bold" + w_register_font consolai.ttf "Consolas Italic" + w_register_font consolaz.ttf "Consolas Bold Italic" +} + +#---------------------------------------------------------------- + w_metadata constantia fonts \ title="MS Constantia font" \ publisher="Microsoft" \ @@ -10169,25 +10241,65 @@ load_constantia() #---------------------------------------------------------------- -w_metadata consolas fonts \ - title="MS Consolas console font" \ +w_metadata corbel fonts \ + title="MS Corbel font" \ publisher="Microsoft" \ - year="2011" \ + year="2009" \ media="download" \ file1="PowerPointViewer.exe" \ - installed_file1="$W_FONTSDIR_WIN/consola.ttf" + installed_file1="$W_FONTSDIR_WIN/corbel.ttf" -load_consolas() +load_corbel() { # https://www.microsoft.com/en-us/download/details.aspx?id=13 w_download_to PowerPointViewer "https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423 w_try_cabextract -d "$W_TMP" -F "ppviewer.cab" "$W_CACHE/PowerPointViewer/$file1" - w_try_cabextract -d "$W_TMP" -F "CONSOLA*.TTF" "$W_TMP/ppviewer.cab" - w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "CONSOLA*.TTF" - w_register_font consola.ttf "Consoleas" - w_register_font consolab.ttf "Consoleas Bold" - w_register_font consolai.ttf "Consoleas Italic" - w_register_font consolaz.ttf "Consoleas Bold Italic" + w_try_cabextract -d "$W_TMP" -F "CORBEL*.TTF" "$W_TMP/ppviewer.cab" + w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "CORBEL*.TTF" + w_register_font corbel.ttf "Corbel" + w_register_font corbelb.ttf "Corbel Bold" + w_register_font corbeli.ttf "Corbel Italic" + w_register_font corbelz.ttf "Corbel Bold Italic" +} + +#---------------------------------------------------------------- + +w_metadata meiryo fonts \ + title="MS Meiryo font" \ + publisher="Microsoft" \ + year="2009" \ + media="download" \ + file1="PowerPointViewer.exe" \ + installed_file1="$W_FONTSDIR_WIN/meiryo.ttc" + +load_meiryo() +{ + # https://www.microsoft.com/en-us/download/details.aspx?id=13 + w_download_to PowerPointViewer "https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe" 249473568eba7a1e4f95498acba594e0f42e6581add4dead70c1dfb908a09423 + w_try_cabextract -d "$W_TMP" -F "ppviewer.cab" "$W_CACHE/PowerPointViewer/$file1" + w_try_cabextract -d "$W_TMP" -F "MEIRYO*.TTC" "$W_TMP/ppviewer.cab" + w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "MEIRYO*.TTC" + w_register_font meiryo.ttc "Meiryo & Meiryo Italic & Meiryo UI & Meiryo UI Italic" + w_register_font meiryob.ttc "Meiryo Bold & Meiryo Bold Italic & Meiryo UI Bold & Meiryo UI Bold Italic" +} + +#---------------------------------------------------------------- + +w_metadata pptfonts fonts \ + title="All MS PowerPoint Viewer fonts" \ + publisher="various" \ + date="2007-2009" \ + media="download" + +load_pptfonts() +{ + w_call calibri + w_call cambria + w_call candara + w_call consolas + w_call constantia + w_call corbel + w_call meiryo } #---------------------------------------------------------------- @@ -10220,10 +10332,10 @@ load_corefonts() w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/arial32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "Arial*.TTF" - w_register_font arial.ttf "Arial" w_register_font arialbd.ttf "Arial Bold" w_register_font arialbi.ttf "Arial Bold Italic" w_register_font ariali.ttf "Arial Italic" + w_register_font arial.ttf "Arial" w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/arialb32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "AriBlk.TTF" @@ -10231,22 +10343,22 @@ load_corefonts() 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 comic.ttf "Comic Sans MS" w_register_font comicbd.ttf "Comic Sans MS Bold" + w_register_font comic.ttf "Comic Sans MS" 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 cour.ttf "Courier New" 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_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 georgia.ttf "Georgia" w_register_font georgiab.ttf "Georgia Bold" - w_register_font georgiaz.ttf "Georgia Bold Italic" w_register_font georgiai.ttf "Georgia Italic" + w_register_font georgia.ttf "Georgia" + w_register_font georgiaz.ttf "Georgia Bold Italic" w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/impact32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "Impact.TTF" @@ -10254,24 +10366,24 @@ load_corefonts() 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 times.ttf "Times New Roman" 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_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 trebuc.ttf "Trebucet MS" - w_register_font trebucbd.ttf "Trebucet MS Bold" - w_register_font trebucbi.ttf "Trebucet MS Bold Italic" - w_register_font trebucit.ttf "Trebucet MS Italic" + 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_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 verdana.ttf "Verdana" w_register_font verdanab.ttf "Verdana Bold" - w_register_font verdanaz.ttf "Verdana Bold Italic" w_register_font verdanai.ttf "Verdana Italic" + w_register_font verdana.ttf "Verdana" + w_register_font verdanaz.ttf "Verdana Bold Italic" w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/webdin32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "Webdings.TTF" @@ -10340,10 +10452,10 @@ load_eufonts() 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_register_font trebucbd.ttf "Trebuchet Bold" - w_register_font trebucbi.ttf "Trebuchet Bold Italic" - w_register_font trebucit.ttf "Trebuchet Italic" - w_register_font trebuc.ttf "Trebuchet" + 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_register_font verdanab.ttf "Verdana Bold" w_register_font verdanai.ttf "Verdana Italian" w_register_font verdana.ttf "Verdana" @@ -10536,7 +10648,7 @@ load_ipamona() #---------------------------------------------------------------- w_metadata liberation fonts \ - title="Red Hat Liberation fonts (Sans, Serif, Mono)" \ + title="Red Hat Liberation fonts (Mono, Sans, SansNarrow, Serif)" \ publisher="Red Hat" \ year="2008" \ media="download" \ @@ -10552,18 +10664,25 @@ load_liberation() w_try tar -zxf "$W_CACHE/$W_PACKAGE/$file1" w_try_cp_font_files "${file1%.tar.gz}" "$W_FONTSDIR_UNIX" - w_register_font liberationmono-bolditalic.ttf "LiberationMono-BoldItalic" - w_register_font liberationmono-bold.ttf "LiberationMono-Bold" - w_register_font liberationmono-italic.ttf "LiberationMono-Italic" - w_register_font liberationmono-regular.ttf "LiberationMono-Regular" - w_register_font liberationsans-bolditalic.ttf "LiberationSans-BoldItalic" - w_register_font liberationsans-bold.ttf "LiberationSans-Bold" - w_register_font liberationsans-italic.ttf "LiberationSans-Italic" - w_register_font liberationsans-regular.ttf "LiberationSans-Regular" - w_register_font liberationserif-bolditalic.ttf "LiberationSerif-BoldItalic" - w_register_font liberationserif-bold.ttf "LiberationSerif-Bold" - w_register_font liberationserif-italic.ttf "LiberationSerif-Italic" - w_register_font liberationserif-regular.ttf "LiberationSerif-Regular" + w_register_font liberationmono-bolditalic.ttf "Liberation Mono Bold Italic" + w_register_font liberationmono-bold.ttf "Liberation Mono Bold" + w_register_font liberationmono-italic.ttf "Liberation Mono Italic" + w_register_font liberationmono-regular.ttf "Liberation Mono" + + w_register_font liberationsans-bolditalic.ttf "Liberation Sans Bold Italic" + w_register_font liberationsans-bold.ttf "Liberation Sans Bold" + w_register_font liberationsans-italic.ttf "Liberation Sans Italic" + w_register_font liberationsans-regular.ttf "Liberation Sans" + + w_register_font liberationsansnarrow-bolditalic.ttf "Liberation Sans Narrow Bold Italic" + w_register_font liberationsansnarrow-bold.ttf "Liberation Sans Narrow Bold" + w_register_font liberationsansnarrow-italic.ttf "Liberation Sans Narrow Italic" + w_register_font liberationsansnarrow-regular.ttf "Liberation Sans Narrow" + + w_register_font liberationserif-bolditalic.ttf "Liberation Serif Bold Italic" + w_register_font liberationserif-bold.ttf "Liberation Serif Bold" + w_register_font liberationserif-italic.ttf "Liberation Serif Italic" + w_register_font liberationserif-regular.ttf "Liberation Serif" } #---------------------------------------------------------------- @@ -10627,7 +10746,6 @@ load_tahoma() w_try_cabextract -d "$W_TMP" "$W_CACHE/$W_PACKAGE/$file1" w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "*.TTF" - # FIXME: Wine seems to nuke the registry entries for Tahoma. Why? Font Xplorer always lists it as 'not installed'. w_register_font tahoma.ttf "Tahoma" w_register_font tahomabd.ttf "Tahoma Bold" } @@ -10665,20 +10783,32 @@ w_metadata uff fonts \ publisher="Ubuntu" \ year="2010" \ media="download" \ - file1="ubuntu-font-family-0.70.1.zip" \ + file1="ubuntu-font-family-0.83.zip" \ installed_file1="$W_FONTSDIR_WIN/ubuntu-r.ttf" \ homepage="https://launchpad.net/ubuntu-font-family" load_uff() { - w_download "http://font.ubuntu.com/download/ubuntu-font-family-0.70.1.zip" c3737665b85e48664feabb8448957bdf17eab26cc320270f1641d9f98b7ea22e - w_try_unzip "$W_TMP" "$W_CACHE"/uff/ubuntu-font-family-0.70.1.zip - w_try_cp_font_files "$W_TMP/ubuntu-font-family-0.70.1" "$W_FONTSDIR_UNIX" + w_download "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip" 456d7d42797febd0d7d4cf1b782a2e03680bb4a5ee43cc9d06bda172bac05b42 ubuntu-font-family-0.83.zip + w_try_unzip "$W_TMP" "$W_CACHE/$W_PACKAGE/$file1" + + w_try_cp_font_files "$W_TMP/$(basename "${file1}" .zip)" "$W_FONTSDIR_UNIX" - w_register_font ubuntu-r.ttf "Ubuntu" - w_register_font ubuntu-i.ttf "Ubuntu Italic" - w_register_font ubuntu-b.ttf "Ubuntu Bold" w_register_font ubuntu-bi.ttf "Ubuntu Bold Italic" + w_register_font ubuntu-b.ttf "Ubuntu Bold" + w_register_font ubuntu-c.ttf "Ubuntu Condensed" + w_register_font ubuntu-i.ttf "Ubuntu Italic" + w_register_font ubuntu-li.ttf "Ubuntu Light Italic" + w_register_font ubuntu-l.ttf "Ubuntu Light" + w_register_font ubuntu-mi.ttf "Ubuntu Medium Italic" + w_register_font ubuntumono-bi.ttf "Ubuntu Mono Bold Italic" + w_register_font ubuntumono-b.ttf "Ubuntu Mono Bold" + w_register_font ubuntumono-ri.ttf "Ubuntu Mono Italic" + w_register_font ubuntumono-r.ttf "Ubuntu Mono" + w_register_font ubuntu-m.ttf "Ubuntu Medium" + w_register_font ubuntu-ri.ttf "Ubuntu Italic" + w_register_font ubuntu-r.ttf "Ubuntu" + } #---------------------------------------------------------------- diff --git a/winetricks.1 b/winetricks.1 index 1069435..fd64c45 100644 --- a/winetricks.1 +++ b/winetricks.1 @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINETRICKS 1 "October 2017" "Winetricks 20171018" "Wine Package Manager" +.TH WINETRICKS 1 "December 2017" "Winetricks 20171222" "Wine Package Manager" .SH NAME winetricks \- manage virtual Windows environments using Wine .SH SYNOPSIS