[pkg-wine-party] [wine] 04/05: Refresh patches.

Jens Reyer jreyer-guest at moszumanska.debian.org
Mon Sep 19 17:31:03 UTC 2016


This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch master
in repository wine.

commit 0ba4b4c576032c822c16359afbd66fecb3050bb8
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Mon Sep 19 18:19:03 2016 +0200

    Refresh patches.
---
 debian/patches/binary-indep/sfnt2fon.patch     | 4 ++--
 debian/patches/debpaths/makefile.patch         | 2 +-
 debian/patches/debsuffix/winemenubuilder.patch | 4 ++--
 debian/patches/disable/tests.patch             | 2 +-
 debian/patches/generate/request.patch          | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/binary-indep/sfnt2fon.patch b/debian/patches/binary-indep/sfnt2fon.patch
index 0bbfb68..083b637 100644
--- a/debian/patches/binary-indep/sfnt2fon.patch
+++ b/debian/patches/binary-indep/sfnt2fon.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3452,7 +3452,6 @@ WINE_CONFIG_TEST(dlls/xmllite/tests)
+@@ -3496,7 +3496,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 at 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])
-@@ -3556,7 +3555,6 @@ WINE_CONFIG_PROGRAM(xcopy,,[clean,instal
+@@ -3601,7 +3600,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/makefile.patch b/debian/patches/debpaths/makefile.patch
index bbe054d..0bf8935 100644
--- a/debian/patches/debpaths/makefile.patch
+++ b/debian/patches/debpaths/makefile.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -670,7 +670,7 @@ AC_CHECK_HEADERS([libprocstat.h],,,
+@@ -671,7 +671,7 @@ AC_CHECK_HEADERS([libprocstat.h],,,
  
  dnl **** Check for working dll ****
  
diff --git a/debian/patches/debsuffix/winemenubuilder.patch b/debian/patches/debsuffix/winemenubuilder.patch
index ccf934c..d5a439b 100644
--- a/debian/patches/debsuffix/winemenubuilder.patch
+++ b/debian/patches/debsuffix/winemenubuilder.patch
@@ -23,7 +23,7 @@ author: Jens Reyer <jre.winesim at gmail.com>
  /* link file formats */
  
  #include "pshpack1.h"
-@@ -1488,8 +1490,8 @@ static BOOL write_desktop_entry(const ch
+@@ -1460,8 +1462,8 @@ static BOOL write_desktop_entry(const ch
  
      fprintf(file, "[Desktop Entry]\n");
      fprintf(file, "Name=%s\n", linkname);
@@ -34,7 +34,7 @@ author: Jens Reyer <jre.winesim at gmail.com>
      fprintf(file, "Type=Application\n");
      fprintf(file, "StartupNotify=true\n");
      if (descr && lstrlenA(descr))
-@@ -2527,7 +2529,8 @@ static BOOL write_freedesktop_associatio
+@@ -2499,7 +2501,8 @@ static BOOL write_freedesktop_associatio
          fprintf(desktop, "Type=Application\n");
          fprintf(desktop, "Name=%s\n", friendlyAppName);
          fprintf(desktop, "MimeType=%s;\n", mimeType);
diff --git a/debian/patches/disable/tests.patch b/debian/patches/disable/tests.patch
index f561deb..d4d6299 100644
--- a/debian/patches/disable/tests.patch
+++ b/debian/patches/disable/tests.patch
@@ -93,7 +93,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  	url.c \
 --- a/dlls/winmm/tests/Makefile.in
 +++ b/dlls/winmm/tests/Makefile.in
-@@ -3,7 +3,6 @@ IMPORTS   = winmm user32 advapi32
+@@ -3,7 +3,6 @@ IMPORTS   = winmm ole32 user32 advapi32
  
  C_SRCS = \
  	capture.c \
diff --git a/debian/patches/generate/request.patch b/debian/patches/generate/request.patch
index 49d60b0..3e94d04 100644
--- a/debian/patches/generate/request.patch
+++ b/debian/patches/generate/request.patch
@@ -50,7 +50,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  
  DECL_HANDLER(new_process);
  DECL_HANDLER(get_new_process_info);
-@@ -2349,9 +2349,8 @@ C_ASSERT( FIELD_OFFSET(struct terminate_
+@@ -2350,9 +2350,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 );
  
@@ -76,7 +76,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  
  static void dump_new_process_request( const struct new_process_request *req )
  {
-@@ -5395,8 +5396,7 @@ static const struct
+@@ -5396,8 +5397,7 @@ static const struct
      { NULL, 0 }
  };
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git



More information about the pkg-wine-party mailing list