From e51ebcc301b21c9f4668728d0edf65e585361242 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 24 Oct 2015 02:40:56 +0200 Subject: [PATCH] uxtheme-GTK_Theming: Fix configure.ac changes. --- ...egtk-Add-configure-check-and-stub-dll.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch b/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch index 3160d6c7..7a13fc20 100644 --- a/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch +++ b/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch @@ -1,4 +1,4 @@ -From 01290dd262f7cfc9ee7799fb8f20c5b43ce60e86 Mon Sep 17 00:00:00 2001 +From 4bf69c6742053c02538bc0a46204701699802cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= 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 . create mode 100644 dlls/uxtheme-gtk/version.rc diff --git a/aclocal.m4 b/aclocal.m4 -index f7a12f1..770a0d8 100644 +index e236c92..4bbf44e 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 f7a12f1..770a0d8 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 1329786..6fb4ad0 100644 +index bfcf319..97aa018 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 @@ -62,7 +62,7 @@ index 1329786..6fb4ad0 100644 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]), -@@ -1486,6 +1487,26 @@ fi +@@ -1487,6 +1488,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,14 +89,14 @@ index 1329786..6fb4ad0 100644 dnl **** Check for FreeType 2 **** if test "x$with_freetype" != "xno" then -@@ -3319,6 +3340,7 @@ WINE_CONFIG_TEST(dlls/usp10/tests) +@@ -3356,6 +3377,7 @@ WINE_CONFIG_TEST(dlls/userenv/tests) + WINE_CONFIG_DLL(usp10,,[implib]) + WINE_CONFIG_TEST(dlls/usp10/tests) WINE_CONFIG_LIB(uuid) ++WINE_CONFIG_DLL(uxtheme-gtk) WINE_CONFIG_DLL(uxtheme,,[implib]) WINE_CONFIG_TEST(dlls/uxtheme/tests) -+WINE_CONFIG_DLL(uxtheme-gtk) WINE_CONFIG_DLL(vbscript,,[clean]) - WINE_CONFIG_TEST(dlls/vbscript/tests,[clean]) - WINE_CONFIG_DLL(vcomp) diff --git a/dlls/uxtheme-gtk/Makefile.in b/dlls/uxtheme-gtk/Makefile.in new file mode 100644 index 0000000..07cf3a0f @@ -463,5 +463,5 @@ index 0000000..38db521 + +#include -- -2.5.0 +2.6.1