[pkg-wine-party] [wine] 297/298: Refresh patches.
This is an automated email from the git hooks/post-receive script.
jreyer-guest pushed a commit to branch master
in repository wine.
commit 1d6d2327bb3a165ccbad08c0f4233c95d2a206c2
Author: Jens Reyer <jre.winesim@gmail.com>
Date: Mon Aug 22 15:08:29 2016 +0200
Refresh patches.
---
debian/patches/font-divbyzero.patch | 2 +-
debian/patches/generate/request.patch | 6 +++---
debian/patches/sfnt2fon.patch | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/debian/patches/font-divbyzero.patch b/debian/patches/font-divbyzero.patch
index 7bffe0d..2a197f0 100644
--- a/debian/patches/font-divbyzero.patch
+++ b/debian/patches/font-divbyzero.patch
@@ -2,7 +2,7 @@ description: avoid divide-by-zero condition for certain font files and warn abou
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
-@@ -5679,6 +5679,13 @@ found_face:
+@@ -5713,6 +5713,13 @@ found_face:
if (scale > 2 && scaled_height - height > face->size.height / 4) scale--;
/* The jump between unscaled and doubled is delayed by 1 */
else if (scale == 2 && scaled_height - height > (face->size.height / 4 - 1)) scale--;
diff --git a/debian/patches/generate/request.patch b/debian/patches/generate/request.patch
index 85be4f1..60238fb 100644
--- a/debian/patches/generate/request.patch
+++ b/debian/patches/generate/request.patch
@@ -35,7 +35,7 @@ author: Michael Gilbert <mgilbert@debian.org>
DECL_HANDLER(new_process);
DECL_HANDLER(get_new_process_info);
-@@ -2307,9 +2307,8 @@ C_ASSERT( FIELD_OFFSET(struct terminate_
+@@ -2309,9 +2309,8 @@ C_ASSERT( FIELD_OFFSET(struct terminate_
C_ASSERT( FIELD_OFFSET(struct terminate_job_request, status) == 16 );
C_ASSERT( sizeof(struct terminate_job_request) == 24 );
@@ -49,7 +49,7 @@ author: Michael Gilbert <mgilbert@debian.org>
#endif /* __WINE_SERVER_REQUEST_H */
--- a/server/trace.c
+++ b/server/trace.c
-@@ -1199,8 +1199,9 @@ static void dump_varargs_handle_infos( c
+@@ -1205,8 +1205,9 @@ static void dump_varargs_handle_infos( c
typedef void (*dump_func)( const void *req );
@@ -61,7 +61,7 @@ author: Michael Gilbert <mgilbert@debian.org>
static void dump_new_process_request( const struct new_process_request *req )
{
-@@ -5300,8 +5301,7 @@ static const struct
+@@ -5310,8 +5311,7 @@ static const struct
{ NULL, 0 }
};
diff --git a/debian/patches/sfnt2fon.patch b/debian/patches/sfnt2fon.patch
index 60d1d29..0bbfb68 100644
--- a/debian/patches/sfnt2fon.patch
+++ b/debian/patches/sfnt2fon.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/configure.ac
+++ b/configure.ac
-@@ -3446,7 +3446,6 @@ WINE_CONFIG_TEST(dlls/xmllite/tests)
+@@ -3452,7 +3452,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 <mgilbert@debian.org>
WINE_CONFIG_MAKEFILE([include],,[clean,install-dev])
WINE_CONFIG_MAKEFILE([libs/port])
WINE_CONFIG_MAKEFILE([libs/wine],,[clean,implib,install-dev,install-lib])
-@@ -3550,7 +3549,6 @@ WINE_CONFIG_PROGRAM(xcopy,,[clean,instal
+@@ -3556,7 +3555,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])
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git
Reply to: