This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch stretch in repository wine.
commit 4fb4a5b9c6949db2d761dea53b5d585e412b8afb Author: Jens Reyer <[email protected]> Date: Mon Aug 29 18:14:57 2016 +0200 Refresh patches, drop gnutls.patch (applied upstream). --- debian/patches/gnutls.patch | 23 ----------------------- debian/patches/series | 1 - debian/patches/sfnt2fon.patch | 4 ++-- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/debian/patches/gnutls.patch b/debian/patches/gnutls.patch deleted file mode 100644 index 6d36bea..0000000 --- a/debian/patches/gnutls.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: fix ftbfs against against gnutls 3.5 -Origin: upstream, http://source.winehq.org/git/wine.git/commitdiff/bf5ac531a030bce9e798ab66bc53e84a65ca8fdb -Bug-Debian: https://bugs.debian.org/832275 - ---- a/dlls/secur32/schannel_gnutls.c -+++ b/dlls/secur32/schannel_gnutls.c -@@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); - WINE_DECLARE_DEBUG_CHANNEL(winediag); - - /* Not present in gnutls version < 2.9.10. */ --extern int gnutls_cipher_get_block_size(gnutls_cipher_algorithm_t algorithm); -+static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t algorithm); - - static void *libgnutls_handle; - #define MAKE_FUNCPTR(f) static typeof(f) * p##f -@@ -52,7 +52,6 @@ MAKE_FUNCPTR(gnutls_certificate_allocate - MAKE_FUNCPTR(gnutls_certificate_free_credentials); - MAKE_FUNCPTR(gnutls_certificate_get_peers); - MAKE_FUNCPTR(gnutls_cipher_get); --MAKE_FUNCPTR(gnutls_cipher_get_block_size); - MAKE_FUNCPTR(gnutls_cipher_get_key_size); - MAKE_FUNCPTR(gnutls_credentials_set); - MAKE_FUNCPTR(gnutls_deinit); diff --git a/debian/patches/series b/debian/patches/series index 7657844..2b68b9a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -gnutls.patch fontdir.patch makefile.patch kfreebsd.patch diff --git a/debian/patches/sfnt2fon.patch b/debian/patches/sfnt2fon.patch index 72c6371..71142c8 100644 --- a/debian/patches/sfnt2fon.patch +++ b/debian/patches/sfnt2fon.patch @@ -3,7 +3,7 @@ author: Michael Gilbert <[email protected]> --- a/configure.ac +++ b/configure.ac -@@ -3376,7 +3376,6 @@ WINE_CONFIG_TEST(dlls/xmllite/tests) +@@ -3377,7 +3377,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]) -@@ -3476,7 +3475,6 @@ WINE_CONFIG_PROGRAM(xcopy,,[install,po]) +@@ -3477,7 +3476,6 @@ WINE_CONFIG_PROGRAM(xcopy,,[install,po]) 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 _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
