Rebase against 981dec4986e7ac1982049dbede1ca2aa72f5e70c.

patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch

@@ -1,4 +1,4 @@
-From 4bf69c6742053c02538bc0a46204701699802cf5 Mon Sep 17 00:00:00 2001
+From 6ac2abea561f3cb10dad4dc39ab758180b440423 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 9 Aug 2015 02:38:18 +0200
 Subject: uxthemegtk: Add configure check and stub dll.
@@ -20,7 +20,7 @@ List of functions updated by Ivan Akulinchev <ivan.akulinchev@gmail.com>.
  create mode 100644 dlls/uxtheme-gtk/version.rc
 
 diff --git a/aclocal.m4 b/aclocal.m4
-index e236c92..4bbf44e 100644
+index 9364188e334..ad6a4f50fca 100644
 --- a/aclocal.m4
 +++ b/aclocal.m4
 @@ -109,6 +109,26 @@ test -z "$ac_libs" || ac_libs=`echo " $ac_libs" | sed 's/ -L\([[^/]]\)/ -L\$(top
@@ -51,7 +51,7 @@ index e236c92..4bbf44e 100644
  dnl
  dnl Usage: WINE_TRY_ASM_LINK(asm-code,includes,function,[action-if-found,[action-if-not-found]])
 diff --git a/configure.ac b/configure.ac
-index bfcf319..97aa018 100644
+index 735dec3cc72..5bd9a75fa18 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -54,6 +54,7 @@ AC_ARG_WITH(gnutls,    AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (sch
@@ -61,8 +61,8 @@ index bfcf319..97aa018 100644
 +AC_ARG_WITH(gtk3,      AS_HELP_STRING([--without-gtk3],[do not use gtk3 (gtk3 theming support)]))
  AC_ARG_WITH(hal,       AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
  AC_ARG_WITH(jpeg,      AS_HELP_STRING([--without-jpeg],[do not use JPEG]))
- AC_ARG_WITH(ldap,      AS_HELP_STRING([--without-ldap],[do not use LDAP]),
-@@ -1487,6 +1488,26 @@ fi
+ AC_ARG_WITH(krb5,      AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)]))
+@@ -1418,6 +1419,26 @@ fi
  WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms2_cmsOpenProfileFromFile" != "yes"],
                   [liblcms2 ${notice_platform}development files not found, Color Management won't be supported.])
  
@@ -89,7 +89,7 @@ index bfcf319..97aa018 100644
  dnl **** Check for FreeType 2 ****
  if test "x$with_freetype" != "xno"
  then
-@@ -3356,6 +3377,7 @@ WINE_CONFIG_TEST(dlls/userenv/tests)
+@@ -3554,6 +3575,7 @@ WINE_CONFIG_TEST(dlls/userenv/tests)
  WINE_CONFIG_DLL(usp10,,[implib])
  WINE_CONFIG_TEST(dlls/usp10/tests)
  WINE_CONFIG_LIB(uuid)
@@ -99,7 +99,7 @@ index bfcf319..97aa018 100644
  WINE_CONFIG_DLL(vbscript,,[clean])
 diff --git a/dlls/uxtheme-gtk/Makefile.in b/dlls/uxtheme-gtk/Makefile.in
 new file mode 100644
-index 0000000..07cf3a0f
+index 00000000000..07cf3a0fb57
 --- /dev/null
 +++ b/dlls/uxtheme-gtk/Makefile.in
 @@ -0,0 +1,7 @@
@@ -112,14 +112,14 @@ index 0000000..07cf3a0f
 +RC_SRCS = version.rc
 diff --git a/dlls/uxtheme-gtk/uxtheme-gtk.spec b/dlls/uxtheme-gtk/uxtheme-gtk.spec
 new file mode 100644
-index 0000000..b7db254
+index 00000000000..b7db25411d0
 --- /dev/null
 +++ b/dlls/uxtheme-gtk/uxtheme-gtk.spec
 @@ -0,0 +1 @@
 +# Empty
 diff --git a/dlls/uxtheme-gtk/uxtheme.c b/dlls/uxtheme-gtk/uxtheme.c
 new file mode 100644
-index 0000000..cd5e3c0
+index 00000000000..cd5e3c04cf1
 --- /dev/null
 +++ b/dlls/uxtheme-gtk/uxtheme.c
 @@ -0,0 +1,218 @@
@@ -343,7 +343,7 @@ index 0000000..cd5e3c0
 +}
 diff --git a/dlls/uxtheme-gtk/uxthemegtk.h b/dlls/uxtheme-gtk/uxthemegtk.h
 new file mode 100644
-index 0000000..42e4784
+index 00000000000..42e47840878
 --- /dev/null
 +++ b/dlls/uxtheme-gtk/uxthemegtk.h
 @@ -0,0 +1,88 @@
@@ -437,7 +437,7 @@ index 0000000..42e4784
 +#endif /* UXTHEMEGTK_H */
 diff --git a/dlls/uxtheme-gtk/version.rc b/dlls/uxtheme-gtk/version.rc
 new file mode 100644
-index 0000000..38db521
+index 00000000000..38db52103be
 --- /dev/null
 +++ b/dlls/uxtheme-gtk/version.rc
 @@ -0,0 +1,21 @@
@@ -463,5 +463,5 @@ index 0000000..38db521
 +
 +#include <wine/wine_common_ver.rc>
 -- 
-2.6.1
+2.14.2