[pkg-wine-party] [wine] 390/402: import wine-development 3.0~rc1-1 from the archive

Jens Reyer jreyer-guest at moszumanska.debian.org
Mon Jan 15 22:12:55 UTC 2018


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

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

commit 65bf4cb2733ff39c84152d2bb5992c8fda47b2cd
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Wed Jan 10 23:41:32 2018 +0100

    import wine-development 3.0~rc1-1 from the archive
---
 debian/changelog                           |  8 ++++++--
 debian/clean                               |  3 +++
 debian/patches/binary-indep/sfnt2fon.patch |  4 ++--
 debian/patches/debpaths/makefile.patch     |  2 +-
 debian/patches/font-divbyzero.patch        |  2 +-
 debian/patches/generate/fonts.patch        | 14 ++++++++++++--
 debian/patches/generate/request.patch      |  6 +++---
 debian/patches/gstbase.patch               |  4 ++--
 debian/patches/revert_opengl46.patch       | 20 ++++++++++----------
 debian/rules                               |  1 +
 10 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c13e66b..12b92e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-wine-development (3.0~rc1-1) UNRELEASED; urgency=medium
+wine-development (3.0~rc1-1) unstable; urgency=medium
 
+  [ Jens Reyer ]
   * Build wine64VERSION-preloader also on arm64.
   * Add build-dependendeny on libkrb5-dev for Kerberos support.
+
+  [ Michael Gilbert ]
   * New upstream release 3.0-rc1, released Dec 8, 2017.
+    - Reenables support for armel (closes: #881446).
     - Direct3D 11 enabled by default on AMD and Intel GPUs.
     - AES encryption support on macOS.
     - Implementation of the task scheduler.
@@ -13,7 +17,7 @@ wine-development (3.0~rc1-1) UNRELEASED; urgency=medium
     - Relay debugging improvements.
     - Various bug fixes.
 
- -- Jens Reyer <jre.winesim at gmail.com>  Mon, 15 Jan 2018 18:49:30 +0100
+ -- Michael Gilbert <mgilbert at debian.org>  Sat, 09 Dec 2017 20:31:43 +0000
 
 wine-development (2.22-1) unstable; urgency=medium
 
diff --git a/debian/clean b/debian/clean
index b93fe6c..39f331e 100644
--- a/debian/clean
+++ b/debian/clean
@@ -45,6 +45,9 @@ dlls/opengl32/opengl_ext.c
 dlls/opengl32/opengl_norm.c
 dlls/opengl32/opengl32.spec
 
+# windows help files
+dlls/itss/tests/data.chm
+
 # font files
 fonts/*.fon
 fonts/*.ttf
diff --git a/debian/patches/binary-indep/sfnt2fon.patch b/debian/patches/binary-indep/sfnt2fon.patch
index 43257be..969949d 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
-@@ -3713,7 +3713,6 @@ WINE_CONFIG_TEST(dlls/xmllite/tests)
+@@ -3732,7 +3732,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])
-@@ -3820,7 +3819,6 @@ WINE_CONFIG_PROGRAM(xcopy,,[clean,instal
+@@ -3839,7 +3838,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 a94f963..ea1359d 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
-@@ -682,7 +682,7 @@ AC_CHECK_HEADERS([libprocstat.h],,,
+@@ -699,7 +699,7 @@ AC_CHECK_HEADERS([libprocstat.h],,,
  
  dnl **** Check for working dll ****
  
diff --git a/debian/patches/font-divbyzero.patch b/debian/patches/font-divbyzero.patch
index c781a1d..613671b 100644
--- a/debian/patches/font-divbyzero.patch
+++ b/debian/patches/font-divbyzero.patch
@@ -4,7 +4,7 @@ bug-debian: https://bugs.debian.org/788809
 
 --- a/dlls/gdi32/freetype.c
 +++ b/dlls/gdi32/freetype.c
-@@ -5725,6 +5725,13 @@ found_face:
+@@ -5718,6 +5718,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/fonts.patch b/debian/patches/generate/fonts.patch
index 22e0cb4..ee2d3ab 100644
--- a/debian/patches/generate/fonts.patch
+++ b/debian/patches/generate/fonts.patch
@@ -11,9 +11,19 @@ author: Michael Gilbert <mgilbert at debian.org>
 -RC_SRCS = resource.rc
 --- a/dlls/gdi32/tests/Makefile.in
 +++ b/dlls/gdi32/tests/Makefile.in
-@@ -20,5 +20,3 @@ FONT_SRCS = \
- 	vertical.sfd \
+@@ -21,5 +21,3 @@ FONT_SRCS = \
+ 	wine_longname.sfd \
  	wine_test.sfd \
  	wine_vdmx.sfd
 -
 -RC_SRCS = resource.rc
+--- a/dlls/gdiplus/tests/Makefile.in
++++ b/dlls/gdiplus/tests/Makefile.in
+@@ -15,7 +15,5 @@ C_SRCS = \
+ 	region.c \
+ 	stringformat.c
+ 
+-RC_SRCS = resource.rc
+-
+ FONT_SRCS = \
+ 	wine_longname.sfd
diff --git a/debian/patches/generate/request.patch b/debian/patches/generate/request.patch
index ab01fd8..b15df2f 100644
--- a/debian/patches/generate/request.patch
+++ b/debian/patches/generate/request.patch
@@ -54,7 +54,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  
  DECL_HANDLER(new_process);
  DECL_HANDLER(get_new_process_info);
-@@ -2384,9 +2384,8 @@ C_ASSERT( FIELD_OFFSET(struct terminate_
+@@ -2385,9 +2385,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 );
  
@@ -68,7 +68,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  #endif  /* __WINE_SERVER_REQUEST_H */
 --- a/server/trace.c
 +++ b/server/trace.c
-@@ -1208,8 +1208,9 @@ static void dump_varargs_handle_infos( c
+@@ -1221,8 +1221,9 @@ static void dump_varargs_handle_infos( c
  
  typedef void (*dump_func)( const void *req );
  
@@ -80,7 +80,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  
  static void dump_new_process_request( const struct new_process_request *req )
  {
-@@ -5492,8 +5493,7 @@ static const struct
+@@ -5506,8 +5507,7 @@ static const struct
      { NULL, 0 }
  };
  
diff --git a/debian/patches/gstbase.patch b/debian/patches/gstbase.patch
index f4a2fa1..2ca3776 100644
--- a/debian/patches/gstbase.patch
+++ b/debian/patches/gstbase.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1505,7 +1505,7 @@ WINE_NOTICE_WITH(pulse, [test -z "$PULSE
+@@ -1522,7 +1522,7 @@ WINE_NOTICE_WITH(pulse, [test -z "$PULSE
  dnl **** Check for gstreamer ****
  if test "x$with_gstreamer" != "xno"
  then
@@ -9,7 +9,7 @@
          [ac_gst_incl=""
          for i in $GSTREAMER_CFLAGS
          do
-@@ -1513,6 +1513,7 @@ then
+@@ -1530,6 +1530,7 @@ then
                  -I*) ac_gst_incl="$ac_gst_incl $i";;
              esac
          done
diff --git a/debian/patches/revert_opengl46.patch b/debian/patches/revert_opengl46.patch
index 39ab4d2..92448fb 100644
--- a/debian/patches/revert_opengl46.patch
+++ b/debian/patches/revert_opengl46.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/dlls/wined3d/directx.c
 +++ b/dlls/wined3d/directx.c
-@@ -178,7 +178,6 @@ static const struct wined3d_extension_ma
+@@ -179,7 +179,6 @@ static const struct wined3d_extension_ma
      {"GL_ARB_texture_cube_map_array",       ARB_TEXTURE_CUBE_MAP_ARRAY    },
      {"GL_ARB_texture_env_combine",          ARB_TEXTURE_ENV_COMBINE       },
      {"GL_ARB_texture_env_dot3",             ARB_TEXTURE_ENV_DOT3          },
@@ -14,7 +14,7 @@ Forwarded: not-needed
      {"GL_ARB_texture_float",                ARB_TEXTURE_FLOAT             },
      {"GL_ARB_texture_gather",               ARB_TEXTURE_GATHER            },
      {"GL_ARB_texture_mirrored_repeat",      ARB_TEXTURE_MIRRORED_REPEAT   },
-@@ -237,7 +236,7 @@ static const struct wined3d_extension_ma
+@@ -238,7 +237,7 @@ static const struct wined3d_extension_ma
      {"GL_EXT_texture_compression_s3tc",     EXT_TEXTURE_COMPRESSION_S3TC  },
      {"GL_EXT_texture_env_combine",          EXT_TEXTURE_ENV_COMBINE       },
      {"GL_EXT_texture_env_dot3",             EXT_TEXTURE_ENV_DOT3          },
@@ -23,7 +23,7 @@ Forwarded: not-needed
      {"GL_EXT_texture_integer",              EXT_TEXTURE_INTEGER           },
      {"GL_EXT_texture_lod_bias",             EXT_TEXTURE_LOD_BIAS          },
      {"GL_EXT_texture_mirror_clamp",         EXT_TEXTURE_MIRROR_CLAMP      },
-@@ -3607,9 +3606,9 @@ static void wined3d_adapter_init_limits(
+@@ -3610,9 +3609,9 @@ static void wined3d_adapter_init_limits(
          gl_info->limits.texture3d_size = gl_max;
          TRACE("Max texture3D size: %d.\n", gl_info->limits.texture3d_size);
      }
@@ -35,7 +35,7 @@ Forwarded: not-needed
          gl_info->limits.anisotropy = gl_max;
          TRACE("Max anisotropy: %d.\n", gl_info->limits.anisotropy);
      }
-@@ -3919,7 +3918,6 @@ static BOOL wined3d_adapter_init_gl_caps
+@@ -3923,7 +3922,6 @@ static BOOL wined3d_adapter_init_gl_caps
          {ARB_DERIVATIVE_CONTROL,           MAKEDWORD_VERSION(4, 5)},
  
          {ARB_PIPELINE_STATISTICS_QUERY,    MAKEDWORD_VERSION(4, 6)},
@@ -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;
-@@ -5654,7 +5652,7 @@ HRESULT CDECL wined3d_get_device_caps(co
+@@ -5658,7 +5656,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         |
-@@ -5773,7 +5771,7 @@ HRESULT CDECL wined3d_get_device_caps(co
+@@ -5777,7 +5775,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;
-@@ -5794,7 +5792,7 @@ HRESULT CDECL wined3d_get_device_caps(co
+@@ -5798,7 +5796,7 @@ HRESULT CDECL wined3d_get_device_caps(co
                                         WINED3DPTFILTERCAPS_MIPNEAREST       |
                                         WINED3DPTFILTERCAPS_NEAREST;
  
@@ -85,7 +85,7 @@ Forwarded: not-needed
      GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_COMPARE_FUNC,
 --- a/dlls/wined3d/texture.c
 +++ b/dlls/wined3d/texture.c
-@@ -851,8 +851,8 @@ void wined3d_texture_apply_sampler_desc(
+@@ -860,8 +860,8 @@ void wined3d_texture_apply_sampler_desc(
      state = sampler_desc->max_anisotropy;
      if (state != gl_tex->sampler_desc.max_anisotropy)
      {
@@ -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
-@@ -111,7 +111,6 @@ enum wined3d_gl_extension
+@@ -112,7 +112,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,
-@@ -168,6 +167,7 @@ enum wined3d_gl_extension
+@@ -169,6 +168,7 @@ enum wined3d_gl_extension
      EXT_TEXTURE_COMPRESSION_S3TC,
      EXT_TEXTURE_ENV_COMBINE,
      EXT_TEXTURE_ENV_DOT3,
diff --git a/debian/rules b/debian/rules
index 7928486..c29b4e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,6 +63,7 @@ endif
 
 # on armel build for armv5t
 ifeq ($(DEB_HOST_ARCH), armel)
+CONFLAGS+=--with-float-abi=soft
 export DEB_CFLAGS_MAINT_APPEND+=-march=armv5t
 export DEB_LDFLAGS_MAINT_APPEND+=-march=armv5t
 endif

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