This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch master in repository wine.
commit 2f32a0a053318aed22492bed409bcabf4c6f281c Author: Jens Reyer <[email protected]> Date: Mon Jan 15 19:53:38 2018 +0100 Refresh patches. --- debian/patches/binary-indep/sfnt2fon.patch | 4 ++-- debian/patches/debpaths/addons.patch | 4 ++-- debian/patches/disable/addons-download.patch | 2 +- debian/patches/revert_opengl46.patch | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/binary-indep/sfnt2fon.patch b/debian/patches/binary-indep/sfnt2fon.patch index 969949d..0f03682 100644 --- a/debian/patches/binary-indep/sfnt2fon.patch +++ b/debian/patches/binary-indep/sfnt2fon.patch @@ -3,7 +3,7 @@ author: Michael Gilbert <[email protected]> --- a/configure.ac +++ b/configure.ac -@@ -3732,7 +3732,6 @@ WINE_CONFIG_TEST(dlls/xmllite/tests) +@@ -3733,7 +3733,6 @@ WINE_CONFIG_TEST(dlls/xmllite/tests) WINE_CONFIG_DLL(xolehlp) WINE_CONFIG_DLL(xpsprint) WINE_CONFIG_DLL(xpssvcs) @@ -11,7 +11,7 @@ author: Michael Gilbert <[email protected]> WINE_CONFIG_MAKEFILE([include],,[clean,install-dev]) WINE_CONFIG_MAKEFILE([libs/port]) WINE_CONFIG_MAKEFILE([libs/wine],,[clean,implib,install-dev,install-lib]) -@@ -3839,7 +3838,6 @@ WINE_CONFIG_PROGRAM(xcopy,,[clean,instal +@@ -3840,7 +3839,6 @@ WINE_CONFIG_PROGRAM(xcopy,,[clean,instal WINE_CONFIG_TEST(programs/xcopy/tests) WINE_CONFIG_MAKEFILE([server],,[clean,install-lib]) WINE_CONFIG_TOOL(tools,[clean]) diff --git a/debian/patches/debpaths/addons.patch b/debian/patches/debpaths/addons.patch index 91a0077..f9a43e0 100644 --- a/debian/patches/debpaths/addons.patch +++ b/debian/patches/debpaths/addons.patch @@ -4,7 +4,7 @@ author: Jens Reyer <[email protected]> --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c -@@ -204,8 +204,6 @@ static enum install_res install_from_uni +@@ -207,8 +207,6 @@ static enum install_res install_from_uni return INSTALL_FAILED; memcpy(file_path, dir, len); @@ -13,7 +13,7 @@ author: Jens Reyer <[email protected]> if(*subdir) { strcpy(file_path+len, subdir); len += strlen(subdir); -@@ -315,11 +313,11 @@ static enum install_res install_from_def +@@ -318,11 +316,11 @@ static enum install_res install_from_def return INSTALL_NEXT; } diff --git a/debian/patches/disable/addons-download.patch b/debian/patches/disable/addons-download.patch index aa58c5d..c39fae7 100644 --- a/debian/patches/disable/addons-download.patch +++ b/debian/patches/disable/addons-download.patch @@ -4,7 +4,7 @@ author: Jens Reyer <[email protected]> --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c -@@ -790,9 +790,8 @@ BOOL install_addon(addon_t addon_type) +@@ -793,9 +793,8 @@ BOOL install_addon(addon_t addon_type) */ if (install_from_registered_dir() == INSTALL_NEXT && install_from_default_dir() == INSTALL_NEXT diff --git a/debian/patches/revert_opengl46.patch b/debian/patches/revert_opengl46.patch index 92448fb..b5c5bb7 100644 --- a/debian/patches/revert_opengl46.patch +++ b/debian/patches/revert_opengl46.patch @@ -43,7 +43,7 @@ Forwarded: not-needed }; struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; -@@ -5658,7 +5656,7 @@ HRESULT CDECL wined3d_get_device_caps(co +@@ -5665,7 +5663,7 @@ HRESULT CDECL wined3d_get_device_caps(co WINED3DPRASTERCAPS_SLOPESCALEDEPTHBIAS | WINED3DPRASTERCAPS_DEPTHBIAS; @@ -52,7 +52,7 @@ Forwarded: not-needed { caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY | WINED3DPRASTERCAPS_ZBIAS | -@@ -5777,7 +5775,7 @@ HRESULT CDECL wined3d_get_device_caps(co +@@ -5784,7 +5782,7 @@ HRESULT CDECL wined3d_get_device_caps(co WINED3DPTFILTERCAPS_MIPNEAREST | WINED3DPTFILTERCAPS_NEAREST; @@ -61,7 +61,7 @@ Forwarded: not-needed { caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | WINED3DPTFILTERCAPS_MINFANISOTROPIC; -@@ -5798,7 +5796,7 @@ HRESULT CDECL wined3d_get_device_caps(co +@@ -5805,7 +5803,7 @@ HRESULT CDECL wined3d_get_device_caps(co WINED3DPTFILTERCAPS_MIPNEAREST | WINED3DPTFILTERCAPS_NEAREST; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
