November 2020 - Wine-Commits

Esme Povirk : windowscodes: Move tiff encoding to the unix lib.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 942141d17df78bb6513845f26189db54cfe76168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=942141d17df78bb6513845f2… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Nov 20 14:23:27 2020 -0600 windowscodes: Move tiff encoding to the unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 - dlls/windowscodecs/encoder.c | 6 +- dlls/windowscodecs/libtiff.c | 260 ++++++++- dlls/windowscodecs/main.c | 28 + dlls/windowscodecs/tiffformat.c | 1001 -------------------------------- dlls/windowscodecs/unix_lib.c | 3 + dlls/windowscodecs/wincodecs_private.h | 3 + 7 files changed, 297 insertions(+), 1005 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=942141d17df78bb65138…

1 0

Ziqing Hui : d3dx10/tests: Add tests for D3DX10CreateTextureFromMemory.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 1e6599f7ad3347d919929ab5791bbb37827bebbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e6599f7ad3347d919929ab5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Nov 20 19:28:00 2020 +0100 d3dx10/tests: Add tests for D3DX10CreateTextureFromMemory. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 154 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 5d7ffcfde3f..c8a1f9d7f71 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -542,6 +542,28 @@ test_image[] = static WCHAR temp_dir[MAX_PATH]; +static DXGI_FORMAT block_compressed_formats[] = +{ + DXGI_FORMAT_BC1_TYPELESS, DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC1_UNORM_SRGB, + DXGI_FORMAT_BC2_TYPELESS, DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC2_UNORM_SRGB, + DXGI_FORMAT_BC3_TYPELESS, DXGI_FORMAT_BC3_UNORM, DXGI_FORMAT_BC3_UNORM_SRGB, + DXGI_FORMAT_BC4_TYPELESS, DXGI_FORMAT_BC4_UNORM, DXGI_FORMAT_BC4_SNORM, + DXGI_FORMAT_BC5_TYPELESS, DXGI_FORMAT_BC5_UNORM, DXGI_FORMAT_BC5_SNORM, + DXGI_FORMAT_BC6H_TYPELESS, DXGI_FORMAT_BC6H_UF16, DXGI_FORMAT_BC6H_SF16, + DXGI_FORMAT_BC7_TYPELESS, DXGI_FORMAT_BC7_UNORM, DXGI_FORMAT_BC7_UNORM_SRGB +}; + +static BOOL is_block_compressed(DXGI_FORMAT format) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(block_compressed_formats); ++i) + if (format == block_compressed_formats[i]) + return TRUE; + + return FALSE; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -694,6 +716,93 @@ static void check_image_info(D3DX10_IMAGE_INFO *image_info, unsigned int i, unsi i, image_info->ImageFileFormat, test_image[i].expected.ImageFileFormat); } +static void check_resource_info(ID3D10Resource *resource, unsigned int i, unsigned int line) +{ + unsigned int expected_mip_levels, expected_width, expected_height, max_dimension; + D3D10_RESOURCE_DIMENSION resource_dimension; + D3D10_TEXTURE2D_DESC desc_2d; + D3D10_TEXTURE3D_DESC desc_3d; + ID3D10Texture2D *texture_2d; + ID3D10Texture3D *texture_3d; + HRESULT hr; + + expected_width = test_image[i].expected.Width; + expected_height = test_image[i].expected.Height; + if (is_block_compressed(test_image[i].expected.Format)) + { + expected_width = (expected_width + 3) & ~3; + expected_height = (expected_height + 3) & ~3; + } + expected_mip_levels = 0; + max_dimension = max(expected_width, expected_height); + while (max_dimension) + { + ++expected_mip_levels; + max_dimension >>= 1; + } + + ID3D10Resource_GetType(resource, &resource_dimension); + ok(resource_dimension == test_image[i].expected.ResourceDimension, + "Test %u: Got unexpected ResourceDimension %u, expected %u.\n", + i, resource_dimension, test_image[i].expected.ResourceDimension); + + switch (resource_dimension) + { + case D3D10_RESOURCE_DIMENSION_TEXTURE2D: + hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture_2d); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ID3D10Texture2D_GetDesc(texture_2d, &desc_2d); + ok_(__FILE__, line)(desc_2d.Width == expected_width, + "Test %u: Got unexpected Width %u, expected %u.\n", + i, desc_2d.Width, expected_width); + ok_(__FILE__, line)(desc_2d.Height == expected_height, + "Test %u: Got unexpected Height %u, expected %u.\n", + i, desc_2d.Height, expected_height); + ok_(__FILE__, line)(desc_2d.MipLevels == expected_mip_levels, + "Test %u: Got unexpected MipLevels %u, expected %u.\n", + i, desc_2d.MipLevels, expected_mip_levels); + ok_(__FILE__, line)(desc_2d.ArraySize == test_image[i].expected.ArraySize, + "Test %u: Got unexpected ArraySize %u, expected %u.\n", + i, desc_2d.ArraySize, test_image[i].expected.ArraySize); + ok_(__FILE__, line)(desc_2d.Format == test_image[i].expected.Format, + "Test %u: Got unexpected Format %u, expected %u.\n", + i, desc_2d.Format, test_image[i].expected.Format); + ok_(__FILE__, line)(desc_2d.MiscFlags == test_image[i].expected.MiscFlags, + "Test %u: Got unexpected MiscFlags %u, expected %u.\n", + i, desc_2d.MiscFlags, test_image[i].expected.MiscFlags); + ID3D10Texture2D_Release(texture_2d); + break; + + case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture3D, (void **)&texture_3d); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ID3D10Texture3D_GetDesc(texture_3d, &desc_3d); + ok_(__FILE__, line)(desc_3d.Width == expected_width, + "Test %u: Got unexpected Width %u, expected %u.\n", + i, desc_3d.Width, expected_width); + ok_(__FILE__, line)(desc_3d.Height == expected_height, + "Test %u: Got unexpected Height %u, expected %u.\n", + i, desc_3d.Height, expected_height); + ok_(__FILE__, line)(desc_3d.Depth == test_image[i].expected.Depth, + "Test %u: Got unexpected Depth %u, expected %u.\n", + i, desc_3d.Depth, test_image[i].expected.Depth); + ok_(__FILE__, line)(desc_3d.MipLevels == expected_mip_levels, + "Test %u: Got unexpected MipLevels %u, expected %u.\n", + i, desc_3d.MipLevels, expected_mip_levels); + ok_(__FILE__, line)(desc_3d.Format == test_image[i].expected.Format, + "Test %u: Got unexpected Format %u, expected %u.\n", + i, desc_3d.Format, test_image[i].expected.Format); + ok_(__FILE__, line)(desc_3d.MiscFlags == test_image[i].expected.MiscFlags, + "Test %u: Got unexpected MiscFlags %u, expected %u.\n", + i, desc_3d.MiscFlags, test_image[i].expected.MiscFlags); + ID3D10Texture3D_Release(texture_3d); + break; + + default: + break; + } +} + static void test_D3DX10UnsetAllDeviceObjects(void) { static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = @@ -1491,6 +1600,50 @@ static void test_get_image_info(void) CoUninitialize(); } +static void test_create_texture(void) +{ + ID3D10Resource *resource; + ID3D10Device *device; + unsigned int i; + HRESULT hr; + + device = create_device(); + if (!device) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + CoInitialize(NULL); + + /* D3DX10CreateTextureFromMemory tests */ + + todo_wine + { + hr = D3DX10CreateTextureFromMemory(device, NULL, 0, NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromMemory(device, NULL, sizeof(test_bmp_1bpp), NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromMemory(device, test_bmp_1bpp, 0, NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromMemory(device, test_bmp_1bpp, sizeof(test_bmp_1bpp) - 1, NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + hr = D3DX10CreateTextureFromMemory(device, test_image[i].data, test_image[i].size, NULL, NULL, &resource, NULL); + todo_wine + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == S_OK) + check_resource_info(resource, i, __LINE__); + } + + CoUninitialize(); + + ID3D10Device_Release(device); +} + START_TEST(d3dx10) { test_D3DX10UnsetAllDeviceObjects(); @@ -1498,4 +1651,5 @@ START_TEST(d3dx10) test_D3DX10CreateAsyncFileLoader(); test_D3DX10CreateAsyncResourceLoader(); test_get_image_info(); + test_create_texture(); }

1 0

Gijs Vermeulen : sapi: Fix typo in ISpVoice::SetOutput() trace.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 056e3fc7fdb9363a43c3e2292fb2627e3b4836fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=056e3fc7fdb9363a43c3e229… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Nov 22 15:44:54 2020 +0100 sapi: Fix typo in ISpVoice::SetOutput() trace. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 77e54e079ac..6c5e89de25c 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -517,7 +517,7 @@ static HRESULT WINAPI spvoice_GetInfo(ISpVoice *iface, SPEVENTSOURCEINFO *info) static HRESULT WINAPI spvoice_SetOutput(ISpVoice *iface, IUnknown *unk, BOOL changes) { - FIXME("(%p, %p, %d: stub.\n)", iface, unk, changes); + FIXME("(%p, %p, %d): stub.\n", iface, unk, changes); return E_NOTIMPL; }

1 0

Esme Povirk : windowscodecs: Initialize encoder flags for png encoder.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 97504067059a55674fec419c911f233b63b3edff URL: https://source.winehq.org/git/wine.git/?a=commit;h=97504067059a55674fec419c… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Nov 20 14:23:28 2020 -0600 windowscodecs: Initialize encoder flags for png encoder. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index ee02d493f57..a5068c20349 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -997,6 +997,7 @@ HRESULT CDECL png_encoder_create(struct encoder_info *info, struct encoder **res This->data = NULL; *result = &This->encoder; + info->flags = 0; info->container_format = GUID_ContainerFormatPng; info->clsid = CLSID_WICPngEncoder; info->encoder_options[0] = ENCODER_OPTION_INTERLACE;

1 0

Zebediah Figura : ntdll: Use a dynamically allocated buffer in find_forwarded_export() if necessary.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 74ec9773dd3892f34003811cdee7da3e47a550c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74ec9773dd3892f34003811c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 20 18:10:02 2020 -0600 ntdll: Use a dynamically allocated buffer in find_forwarded_export() if necessary. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50105 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 368448c9f8d..ff5a175027c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -608,19 +608,20 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS const IMAGE_EXPORT_DIRECTORY *exports; DWORD exp_size; WINE_MODREF *wm; - WCHAR mod_name[32]; + WCHAR buffer[32], *mod_name = buffer; const char *end = strrchr(forward, '.'); FARPROC proc = NULL; if (!end) return NULL; - if ((end - forward) * sizeof(WCHAR) >= sizeof(mod_name)) return NULL; + if ((end - forward) * sizeof(WCHAR) > sizeof(buffer) - sizeof(dllW)) + { + if (!(mod_name = RtlAllocateHeap( GetProcessHeap(), 0, (end - forward + sizeof(dllW)) * sizeof(WCHAR) ))) + return NULL; + } ascii_to_unicode( mod_name, forward, end - forward ); mod_name[end - forward] = 0; if (!wcschr( mod_name, '.' )) - { - if ((end - forward) * sizeof(WCHAR) >= sizeof(mod_name) - sizeof(dllW)) return NULL; memcpy( mod_name + (end - forward), dllW, sizeof(dllW) ); - } if (!(wm = find_basename_module( mod_name ))) { @@ -642,6 +643,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (!wm) { + if (mod_name != buffer) RtlFreeHeap( GetProcessHeap(), 0, mod_name ); ERR( "module not found for forward '%s' used by %s\n", forward, debugstr_w(get_modref(module)->ldr.FullDllName.Buffer) ); return NULL; @@ -664,6 +666,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS forward, debugstr_w(get_modref(module)->ldr.FullDllName.Buffer), debugstr_w(get_modref(module)->ldr.BaseDllName.Buffer) ); } + if (mod_name != buffer) RtlFreeHeap( GetProcessHeap(), 0, mod_name ); return proc; }

1 0

Jeff Smith : gdiplus: Fix function name typo in comment.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 4e395ba85bca93a648653000c92e6c06a59a928f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e395ba85bca93a648653000… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 19 10:35:56 2020 -0600 gdiplus: Fix function name typo in comment. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index b0504b5d894..4301fa3aaa3 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1037,7 +1037,7 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily **nativeFamil } /***************************************************************************** - * GdipGetGenericFontFamilySansSerif [GDIPLUS.@] + * GdipNewPrivateFontCollection [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection** fontCollection) {

1 0

Zebediah Figura : quartz/tests: Add some tests for parser streaming.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: b04c0a56e38b1d429163e42d9db049f80d93d1bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b04c0a56e38b1d429163e42d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:24:58 2020 -0600 quartz/tests: Add some tests for parser streaming. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 150 ++++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/mpegsplit.c | 150 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 300 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b04c0a56e38b1d429163…

1 0

Piotr Caban : msvcrt: Update lc_category.wrefcount in __get_current_locale.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: aa8891783046459508f91f47cc588b35ee8dea4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa8891783046459508f91f47… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 23 11:11:49 2020 +0100 msvcrt: Update lc_category.wrefcount in __get_current_locale. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50163 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index f557d10db1b..5971882229c 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1155,7 +1155,11 @@ MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) InterlockedIncrement(&locale->locinfo->refcount); for(i=MSVCRT_LC_MIN+1; i<=MSVCRT_LC_MAX; i++) + { InterlockedIncrement(locale->locinfo->lc_category[i].refcount); + if(locale->locinfo->lc_category[i].wrefcount) + InterlockedIncrement(locale->locinfo->lc_category[i].wrefcount); + } if(locale->locinfo->lconv_intl_refcount) InterlockedIncrement(locale->locinfo->lconv_intl_refcount); if(locale->locinfo->lconv_num_refcount)

1 0

Alexandre Julliard : packaging: Remove Ubuntu 16.04.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: tools Branch: master Commit: 50b0c4ea8e9f69825cf9cee115627850ea4acad1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=50b0c4ea8e9f69825cf9cee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 21 13:15:31 2020 +0100 packaging: Remove Ubuntu 16.04. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ---- packaging/obs/obs-sync | 3 +-- packaging/obs/rsync-filter | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 34532bb..299a524 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -22,10 +22,6 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Deb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_T… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_T… ./ -deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ - deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 54b38c9..6ddbc48 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -180,7 +180,7 @@ publish_files () cd $basedir -distros="32 33 buster bullseye xenial bionic focal groovy" +distros="32 33 buster bullseye bionic focal groovy" dry_run= while [ $# -ge 1 ] @@ -218,7 +218,6 @@ do 3?) add_rpm $i Fedora_$i ;; buster) add_deb debian buster Debian_10 stable ;; bullseye) add_deb debian bullseye Debian_Testing_standard testing ;; - xenial) add_deb ubuntu xenial xUbuntu_16.04 ;; bionic) add_deb ubuntu bionic xUbuntu_18.04 ;; focal) add_deb ubuntu focal xUbuntu_20.04 ;; groovy) add_deb ubuntu groovy xUbuntu_20.10 ;; diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index a20a966..b9eec32 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -17,7 +17,6 @@ + /ubuntu/dists/bionic + /ubuntu/dists/focal + /ubuntu/dists/groovy -+ /ubuntu/dists/xenial - /ubuntu/dists/* - /ubuntu/*

1 0

Alexandre Julliard : packaging: Remove Fedora 31.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: tools Branch: master Commit: 3c79caef504e36dcd6b0521e0bbd5703075cea39 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3c79caef504e36dcd6b0521… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 21 13:14:15 2020 +0100 packaging: Remove Fedora 31. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 2 +- packaging/obs/rsync-filter | 1 - packaging/obs/yum.conf | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index f830afa..54b38c9 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -180,7 +180,7 @@ publish_files () cd $basedir -distros="31 32 33 buster bullseye xenial bionic focal groovy" +distros="32 33 buster bullseye xenial bionic focal groovy" dry_run= while [ $# -ge 1 ] diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 05b659e..a20a966 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,5 +1,4 @@ + /fedora -+ /fedora/31 + /fedora/32 + /fedora/33 - /fedora/* diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index 62fb350..390123d 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -4,10 +4,6 @@ debuglevel=0 logfile=/var/log/yum.log gpgcheck=1 -[fedora-31] -name = Fedora 31 -baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_31 - [fedora-32] name = Fedora 32 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/…

1 0