wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-03-06 09:29:38 +11:00
parent e09e1fd366
commit fcca2476bf
42 changed files with 395 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 406f6a268d3b4b831e4daaccc5fa2f4877be151b Mon Sep 17 00:00:00 2001
From 198cd3cdddaa7ad98d897444877becfe7a591910 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: [PATCH] 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 3688165..fbc5ebf 100644
index 6ad8363..54e2ccd 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -125,6 +125,26 @@ test -z "$ac_libs" || ac_libs=`echo " $ac_libs" | sed 's/ -L\([[^/]]\)/ -L\$(top
@@ -51,7 +51,7 @@ index 3688165..fbc5ebf 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 7b796ef..e27f922 100644
index 40f96df..a45d5b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,7 @@ AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06
@@ -62,7 +62,7 @@ index 7b796ef..e27f922 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(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)]))
@@ -1441,6 +1442,26 @@ fi
@@ -1491,6 +1492,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,17 +89,17 @@ index 7b796ef..e27f922 100644
dnl **** Check for FreeType 2 ****
if test "x$with_freetype" != "xno"
then
@@ -3627,6 +3648,7 @@ WINE_CONFIG_TEST(dlls/userenv/tests)
WINE_CONFIG_DLL(usp10)
WINE_CONFIG_TEST(dlls/usp10/tests)
WINE_CONFIG_LIB(uuid)
+WINE_CONFIG_DLL(uxtheme-gtk)
WINE_CONFIG_DLL(uxtheme)
WINE_CONFIG_TEST(dlls/uxtheme/tests)
WINE_CONFIG_DLL(vbscript)
@@ -3731,6 +3752,7 @@ WINE_CONFIG_MAKEFILE(dlls/usp10/tests)
WINE_CONFIG_MAKEFILE(dlls/uuid)
WINE_CONFIG_MAKEFILE(dlls/uxtheme)
WINE_CONFIG_MAKEFILE(dlls/uxtheme/tests)
+WINE_CONFIG_MAKEFILE(dlls/uxtheme-gtk)
WINE_CONFIG_MAKEFILE(dlls/vbscript)
WINE_CONFIG_MAKEFILE(dlls/vbscript/tests)
WINE_CONFIG_MAKEFILE(dlls/vcomp)
diff --git a/dlls/uxtheme-gtk/Makefile.in b/dlls/uxtheme-gtk/Makefile.in
new file mode 100644
index 0000000..07cf3a0
index 0000000..07cf3a0f
--- /dev/null
+++ b/dlls/uxtheme-gtk/Makefile.in
@@ -0,0 +1,7 @@
@@ -463,5 +463,5 @@ index 0000000..38db521
+
+#include <wine/wine_common_ver.rc>
--
2.7.4
1.9.1