[pkg-wine-party] [wine] 196/197: Refresh patches.

Jens Reyer jreyer-guest at moszumanska.debian.org
Tue Oct 31 23:26:35 UTC 2017 

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

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

commit e751b130571a247aa2c815418e15a688026a7130
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Tue Oct 31 17:45:21 2017 +0100

    Refresh patches.
---
 debian/patches/binary-indep/sfnt2fon.patch |  4 ++--
 debian/patches/generate/opengl.patch       | 24 ++++++++++++++----------
 debian/patches/generate/request.patch      | 14 +++++++++-----
 debian/patches/revert_opengl46.patch       |  4 ++--
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/debian/patches/binary-indep/sfnt2fon.patch b/debian/patches/binary-indep/sfnt2fon.patch
index 6a82e19..1209e29 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
-@@ -3683,7 +3683,6 @@ WINE_CONFIG_TEST(dlls/xmllite/tests)
+@@ -3684,7 +3684,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])
-@@ -3790,7 +3789,6 @@ WINE_CONFIG_PROGRAM(xcopy,,[clean,instal
+@@ -3791,7 +3790,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/generate/opengl.patch b/debian/patches/generate/opengl.patch
index ecafcab..8bc212c 100644
--- a/debian/patches/generate/opengl.patch
+++ b/debian/patches/generate/opengl.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
 
 --- a/dlls/opengl32/make_opengl
 +++ b/dlls/opengl32/make_opengl
-@@ -399,13 +399,6 @@ if ($version eq "1.0") {
+@@ -314,13 +314,6 @@ if ($version eq "1.0") {
  }
  
  #
@@ -17,20 +17,19 @@ author: Michael Gilbert <mgilbert at debian.org>
  # Then, create the list of all OpenGL functions using the registry
  # files. This will create two hash-tables, one with all the function
  # whose category matches the one listed in '@norm_categories', the other
-@@ -756,20 +749,17 @@ sub parse_file($$)
+@@ -554,21 +547,22 @@ sub parse_file($)
      }
  }
  
--parse_file( "gl.xml", 1 );
--parse_file( "wgl.xml", 0 );
-+parse_file( "/usr/share/khronos-api/gl.xml", 1 );
-+parse_file( "/usr/share/khronos-api/wgl.xml", 0 );
-+
-+my $wgl_version = 16;
+-parse_file( "gl.xml" );
+-parse_file( "wgl.xml" );
++parse_file( "/usr/share/khronos-api/gl.xml" );
++parse_file( "/usr/share/khronos-api/wgl.xml" );
+ parse_file( "winegl.xml" );
  
  #
--# Get the current wgl_driver.h version
-+# Generate the wglext.h file
+ # Get the current wgl_driver.h version
++# Modified by -1, see debian/scripts/import
  #
 -my $wgl_version = 0;
 -open HEADER, "<$wgl_driver_file" or die "cannot open $wgl_driver_file";
@@ -40,6 +39,11 @@ author: Michael Gilbert <mgilbert at debian.org>
 -    $wgl_version = $1;
 -    last;
 -}
++my $wgl_version = 16;
++
++#
++# Generate the wglext.h file
++#
 +my $wglext_file = "../../include/wine/wglext.h";
 +open HEADER, ">$wglext_file" or die "cannot create $wglext_file";
 +print HEADER "#include <khronos-api/GL/wglext.h>";
diff --git a/debian/patches/generate/request.patch b/debian/patches/generate/request.patch
index 8050490..d6898d5 100644
--- a/debian/patches/generate/request.patch
+++ b/debian/patches/generate/request.patch
@@ -3,7 +3,11 @@ author: Michael Gilbert <mgilbert at debian.org>
 
 --- a/tools/make_requests
 +++ b/tools/make_requests
-@@ -269,13 +269,7 @@ sub PARSE_REQUESTS()
+@@ -266,16 +266,11 @@ sub PARSE_REQUESTS()
+ }
+ 
+ ### Retrieve the server protocol version from the existing server_protocol.h file
++# Modified by -1, see debian/scripts/import
  
  sub GET_PROTOCOL_VERSION()
  {
@@ -18,7 +22,7 @@ author: Michael Gilbert <mgilbert at debian.org>
      return $protocol;
  }
  
-@@ -436,7 +430,7 @@ foreach my $err (sort keys %errors)
+@@ -436,7 +431,7 @@ foreach my $err (sort keys %errors)
  push @trace_lines, "    { NULL, 0 }\n";
  push @trace_lines, "};\n";
  
@@ -27,7 +31,7 @@ author: Michael Gilbert <mgilbert at debian.org>
                   "### make_requests begin ###",
                   "### make_requests end ###",
                   @trace_lines );
-@@ -463,7 +457,7 @@ foreach my $type (sort keys %formats)
+@@ -463,7 +458,7 @@ foreach my $type (sort keys %formats)
  push @request_lines, @asserts;
  push @request_lines, "\n#endif  /* WANT_REQUEST_HANDLERS */\n";
  
@@ -50,7 +54,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  
  DECL_HANDLER(new_process);
  DECL_HANDLER(get_new_process_info);
-@@ -2378,9 +2378,8 @@ C_ASSERT( FIELD_OFFSET(struct terminate_
+@@ -2384,9 +2384,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 +80,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  
  static void dump_new_process_request( const struct new_process_request *req )
  {
-@@ -5478,8 +5479,7 @@ static const struct
+@@ -5492,8 +5493,7 @@ static const struct
      { NULL, 0 }
  };
  
diff --git a/debian/patches/revert_opengl46.patch b/debian/patches/revert_opengl46.patch
index d861311..1a6cdab 100644
--- a/debian/patches/revert_opengl46.patch
+++ b/debian/patches/revert_opengl46.patch
@@ -98,7 +98,7 @@ Forwarded: not-needed
          gl_tex->sampler_desc.max_anisotropy = state;
 --- a/dlls/wined3d/wined3d_gl.h
 +++ b/dlls/wined3d/wined3d_gl.h
-@@ -109,7 +109,6 @@ enum wined3d_gl_extension
+@@ -108,7 +108,6 @@ enum wined3d_gl_extension
      ARB_TEXTURE_CUBE_MAP_ARRAY,
      ARB_TEXTURE_ENV_COMBINE,
      ARB_TEXTURE_ENV_DOT3,
@@ -106,7 +106,7 @@ Forwarded: not-needed
      ARB_TEXTURE_FLOAT,
      ARB_TEXTURE_GATHER,
      ARB_TEXTURE_MIRRORED_REPEAT,
-@@ -166,6 +165,7 @@ enum wined3d_gl_extension
+@@ -165,6 +164,7 @@ enum wined3d_gl_extension
      EXT_TEXTURE_COMPRESSION_S3TC,
      EXT_TEXTURE_ENV_COMBINE,
      EXT_TEXTURE_ENV_DOT3,

-- 
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