guix-wigust/wine-1.9.6-cups.patch

This patch fixes

info.c:779:13: error: ‘cupsGetPPD’ undeclared here (not in a function)
     DO_FUNC(cupsGetPPD); \
             ^
info.c:787:34: note: in definition of macro ‘DO_FUNC’
 #define DO_FUNC(f) static typeof(f) *p##f
                                  ^
info.c:788:1: note: in expansion of macro ‘CUPS_FUNCS’
 CUPS_FUNCS;
 ^
info.c: In function ‘cupsGetPPD3_wrapper’:
info.c:807:11: error: called object ‘pcupsGetPPD’ is not a function or function pointer
     ppd = pcupsGetPPD( name );
           ^
info.c:787:38: note: declared here
 #define DO_FUNC(f) static typeof(f) *p##f
                                      ^
info.c:779:5: note: in expansion of macro ‘DO_FUNC’
     DO_FUNC(cupsGetPPD); \
     ^
info.c:788:1: note: in expansion of macro ‘CUPS_FUNCS’
 CUPS_FUNCS;

See <https://www.winehq.org/pipermail/wine-bugs/2016-June/445574.html>
and <https://bugs.winehq.org/show_bug.cgi?id=40851#c1>.

--- a/configure	
+++ a/configure	
@@ -13067,6 +13067,18 @@ _ACEOF
 
        CUPS_CFLAGS="$ac_cups_cflags"
 fi
+             for ac_header in cups/ppd.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "cups/ppd.h" "ac_cv_header_cups_ppd_h" "$ac_includes_default"
+if test "x$ac_cv_header_cups_ppd_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CUPS_PPD_H 1
+_ACEOF
+
+fi
+
+done
+
 fi
 
 done
--- a/configure.ac	
+++ a/configure.ac	
@@ -1543,7 +1543,8 @@ then
     AC_CHECK_HEADERS(cups/cups.h,
             [WINE_CHECK_SONAME(cups,cupsGetDefault,
                        [CUPS_CFLAGS="$ac_cups_cflags"],,
-                       [$ac_cups_libs])])
+                       [$ac_cups_libs])
+             AC_CHECK_HEADERS(cups/ppd.h)])
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
 WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"],
--- a/dlls/winspool.drv/info.c	
+++ a/dlls/winspool.drv/info.c	
@@ -44,6 +44,9 @@ 
 #ifdef HAVE_CUPS_CUPS_H
 # include <cups/cups.h>
 #endif
+#ifdef HAVE_CUPS_PPD_H
+# include <cups/ppd.h>
+#endif
 
 #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
 #define GetCurrentProcess GetCurrentProcess_Mac
--- a/include/config.h.in	
+++ a/include/config.h.in	
@@ -89,6 +89,9 @@ 
 /* Define to 1 if you have the <cups/cups.h> header file. */
 #undef HAVE_CUPS_CUPS_H
 
+/* Define to 1 if you have the <cups/ppd.h> header file. */
+#undef HAVE_CUPS_PPD_H
+
 /* Define to 1 if you have the <curses.h> header file. */
 #undef HAVE_CURSES_H