Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2018-09-04 22:56:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine" Tue Sep 4 22:56:47 2018 rev:261 rq:632843 version:3.15 Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2018-08-22 14:19:38.498250584 +0200 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2018-09-04 22:57:29.977273238 +0200 @@ -1,0 +2,13 @@ +Sat Sep 1 06:17:50 UTC 2018 - [email protected] + +- 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 staging to 3.15 +- updated winetricks + +------------------------------------------------------------------- Old: ---- wine-3.14.tar.xz wine-3.14.tar.xz.sign wine-d3d9-patches-3.13.tar.xz wine-staging-3.14.tar.xz New: ---- wine-3.15.tar.xz wine-3.15.tar.xz.sign wine-d3d9-patches-3.15.tar.xz wine-staging-3.15.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.lyJ9Xq/_old 2018-09-04 22:57:31.741279257 +0200 +++ /var/tmp/diff_new_pack.lyJ9Xq/_new 2018-09-04 22:57:31.745279270 +0200 @@ -107,8 +107,8 @@ 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 @@ -146,7 +146,7 @@ ExclusiveArch: %{ix86} x86_64 ppc %arm aarch64 %if %{staging} # upstream patch target version -%define staging_version 3.14 +%define staging_version 3.15 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel @@ -154,7 +154,7 @@ %endif %if %{nine} # upstream patch target version -%define nine_version 3.13 +%define nine_version 3.15 BuildRequires: Mesa-libd3d-devel BuildRequires: libOSMesa-devel BuildRequires: pkgconfig(dri2proto) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.lyJ9Xq/_old 2018-09-04 22:57:31.793279434 +0200 +++ /var/tmp/diff_new_pack.lyJ9Xq/_new 2018-09-04 22:57:31.793279434 +0200 @@ -3,7 +3,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="url">https://github.com/wine-staging/wine-staging.git</param> - <param name="revision">refs/tags/v3.14</param> + <param name="revision">refs/tags/v3.15</param> <param name="match-tag">v*.*</param> <param name="scm">git</param> </service> @@ -11,7 +11,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">wined3d9(.*)</param> <param name="url">https://github.com/sarnex/wine-d3d9-patches.git</param> - <param name="revision">refs/tags/wine-d3d9-3.13</param> + <param name="revision">refs/tags/wine-d3d9-3.15</param> <param name="scm">git</param> </service> <service name="recompress" mode="disabled"> ++++++ wine-3.14.tar.xz -> wine-3.15.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-3.14.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-3.15.tar.xz differ: char 27, line 1 ++++++ wine-d3d9-patches-3.13.tar.xz -> wine-d3d9-patches-3.15.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.13/d3d9-helper.patch new/wine-d3d9-patches-3.15/d3d9-helper.patch --- old/wine-d3d9-patches-3.13/d3d9-helper.patch 2018-07-21 18:44:06.000000000 +0200 +++ new/wine-d3d9-patches-3.15/d3d9-helper.patch 2018-09-02 16:29:57.000000000 +0200 @@ -1,6 +1,6 @@ -From 94eeff5b326ee642fef8da60d0b6a9e49f298dbc Mon Sep 17 00:00:00 2001 +From 58190cd8c0e5e9cefe55f3a74c5c2fe223eea3eb Mon Sep 17 00:00:00 2001 From: Nick Sarnie <[email protected]> -Date: Sat, 21 Jul 2018 12:42:55 -0400 +Date: Sun, 2 Sep 2018 10:29:11 -0400 Subject: [PATCH] D3D9 Helper Signed-off-by: Nick Sarnie <[email protected]> @@ -18,7 +18,7 @@ create mode 100644 programs/winecfg/staging.c diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index df206e848d..d208c124d3 100644 +index 26b2431047..de57f5428b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -110,6 +110,7 @@ struct builtin_load_info @@ -859,7 +859,7 @@ * Fill out the (General) PROPSHEETPAGE data structure * for the property sheet diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index 0c0b038ff9..f0e370ecd6 100644 +index 2760e92c00..0584422ab5 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -45,6 +45,7 @@ @@ -878,7 +878,7 @@ #define IDC_WINVER 1012 #define IDC_DESKTOP_WIDTH 1023 #define IDC_DESKTOP_HEIGHT 1024 -@@ -218,3 +220,6 @@ +@@ -219,3 +221,6 @@ #define IDC_ABT_TITLE_TEXT 8436 #define IDC_ABT_WEB_LINK 8437 #define IDC_ABT_LICENSE_TEXT 8438 @@ -997,7 +997,7 @@ /* Drive management */ diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index 5908b491d4..a2da7e6b3a 100644 +index 33f54d43b2..d12522e758 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -39,6 +39,7 @@ BEGIN @@ -1008,7 +1008,7 @@ IDS_TAB_ABOUT "About" IDS_WINECFG_TITLE "Wine configuration" IDS_WINECFG_TITLE_APP "Wine configuration for %s" -@@ -308,6 +309,15 @@ BEGIN +@@ -312,6 +313,15 @@ BEGIN PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.13/staging-helper.patch new/wine-d3d9-patches-3.15/staging-helper.patch --- old/wine-d3d9-patches-3.13/staging-helper.patch 2018-07-21 18:44:06.000000000 +0200 +++ new/wine-d3d9-patches-3.15/staging-helper.patch 2018-09-02 16:29:57.000000000 +0200 @@ -1,6 +1,6 @@ -From c516fcc03ec4129b616f549adf202eed6bb146ac Mon Sep 17 00:00:00 2001 +From 06b73adbbef2336142b48c4497221811cbe6789f Mon Sep 17 00:00:00 2001 From: Nick Sarnie <[email protected]> -Date: Sat, 21 Jul 2018 12:42:00 -0400 +Date: Sun, 2 Sep 2018 10:28:24 -0400 Subject: [PATCH] Staging Helper Signed-off-by: Nick Sarnie <[email protected]> @@ -27,10 +27,10 @@ /* and last the hard-coded default */ ret = NULL; diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index b94e773b60..028dbb730b 100644 +index 96f2429090..06f41f5c70 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h -@@ -218,6 +218,7 @@ +@@ -219,6 +219,7 @@ #define IDC_ENABLE_EAX 9003 #define IDC_ENABLE_HIDEWINE 9004 #define IDC_ENABLE_GTK3 9005 @@ -96,10 +96,10 @@ break; } diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index f838a04a4e..7003bded4a 100644 +index 33f2642ed6..ad9c9d894f 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc -@@ -320,6 +320,7 @@ BEGIN +@@ -324,6 +324,7 @@ BEGIN CONTROL "Enable Environmental Audio E&xtensions (EAX)",IDC_ENABLE_EAX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,70,230,8 CONTROL "&Hide Wine version from applications",IDC_ENABLE_HIDEWINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,85,230,8 CONTROL "Enable >K3 Theming",IDC_ENABLE_GTK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,100,230,8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.13/wine-d3d9.patch new/wine-d3d9-patches-3.15/wine-d3d9.patch --- old/wine-d3d9-patches-3.13/wine-d3d9.patch 2018-07-21 18:44:06.000000000 +0200 +++ new/wine-d3d9-patches-3.15/wine-d3d9.patch 2018-09-02 16:29:57.000000000 +0200 @@ -1,6 +1,6 @@ -From 1f32b80d6f358cd6b34f6f2fb57049ff189f4999 Mon Sep 17 00:00:00 2001 +From 3e70b20d568b404f09415c70375c1bcf9e633878 Mon Sep 17 00:00:00 2001 From: Nick Sarnie <[email protected]> -Date: Sat, 21 Jul 2018 12:42:19 -0400 +Date: Sun, 2 Sep 2018 10:28:41 -0400 Subject: [PATCH] Wine D3D9 Signed-off-by: Nick Sarnie <[email protected]> @@ -41,7 +41,7 @@ create mode 100644 dlls/d3d9-nine/wndproc.h diff --git a/configure.ac b/configure.ac -index 0b89608ff0..ba644b28bb 100644 +index 39185e3dae..3dd1436868 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), @@ -252,7 +252,7 @@ CPPFLAGS="$ac_save_CPPFLAGS" else X_CFLAGS="" -@@ -3259,6 +3446,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8) +@@ -3260,6 +3447,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) WINE_CONFIG_MAKEFILE(dlls/d3d9) WINE_CONFIG_MAKEFILE(dlls/d3d9/tests) ++++++ wine-staging-3.14.tar.xz -> wine-staging-3.15.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-staging-3.14.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-staging-3.15.tar.xz differ: char 26, line 1 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.lyJ9Xq/_old 2018-09-04 22:57:31.933279912 +0200 +++ /var/tmp/diff_new_pack.lyJ9Xq/_new 2018-09-04 22:57:31.933279912 +0200 @@ -2750,13 +2750,16 @@ } # 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 @@ 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 @@ # 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 @@ -6814,6 +6829,25 @@ helper_dxvk "$file1" "d3d10_enabled" "3.10" "1.0.76" } +w_metadata dxvk71 dlls \ + title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.71)" \ + publisher="Philip Rebohle" \ + year="2018" \ + media="download" \ + file1="dxvk-0.71.tar.gz" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \ + installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \ + installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \ + installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \ + installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll" + +load_dxvk71() +{ + # https://github.com/doitsujin/dxvk + w_download "https://github.com/doitsujin/dxvk/releases/download/v0.71/dxvk-0.71.tar.gz"; fbe66337d1450f366961a7699253cd7a96c12a88c2fcda64b79be1cbb13d37d5 + helper_dxvk "$file1" "d3d10_enabled" "3.10" "1.0.76" +} + #---------------------------------------------------------------- @@ -11046,36 +11080,36 @@ #---------------------------------------------------------------- -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="arial32.exe" \ - installed_file1="$W_FONTSDIR_WIN/arial.ttf" + file1="andale32.exe" \ + installed_file1="$W_FONTSDIR_WIN/andalemo.ttf" -load_corefonts() +load_andale() { - 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_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_arial() +{ + 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,57 +11121,198 @@ 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" } #---------------------------------------------------------------- + +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" \
