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 f9e1dbb83d850a2f7cb17079e02de139e2f8b920

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-02-23 09:33:49 +11:00
parent 84fb9656a1
commit 9d84ed42f1
42 changed files with 412 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From e89528274c3aabc85a1e48bbcfe4cb7ff35bad8d Mon Sep 17 00:00:00 2001
From 7ce95ff47cea6dab389a8f7bc7db0d8daddba5e1 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.
@@ -6,13 +6,13 @@ Subject: [PATCH] uxthemegtk: Add configure check and stub dll.
List of functions updated by Ivan Akulinchev <ivan.akulinchev@gmail.com>.
---
aclocal.m4 | 20 ++++
configure.ac | 22 ++++
configure.ac | 24 ++++-
dlls/uxtheme-gtk/Makefile.in | 7 ++
dlls/uxtheme-gtk/uxtheme-gtk.spec | 1 +
dlls/uxtheme-gtk/uxtheme.c | 218 ++++++++++++++++++++++++++++++++++++++
dlls/uxtheme-gtk/uxthemegtk.h | 88 +++++++++++++++
dlls/uxtheme-gtk/version.rc | 21 ++++
7 files changed, 377 insertions(+)
7 files changed, 378 insertions(+), 1 deletion(-)
create mode 100644 dlls/uxtheme-gtk/Makefile.in
create mode 100644 dlls/uxtheme-gtk/uxtheme-gtk.spec
create mode 100644 dlls/uxtheme-gtk/uxtheme.c
@@ -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 334d7a8..b76f58c 100644
index 3688165..fbc5ebf 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 334d7a8..b76f58c 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 16db21f..84e8dd1 100644
index 59d392a..ef9419c 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 16db21f..84e8dd1 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)]))
@@ -1489,6 +1490,26 @@ fi
@@ -1490,6 +1491,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,16 @@ index 16db21f..84e8dd1 100644
dnl **** Check for FreeType 2 ****
if test "x$with_freetype" != "xno"
then
@@ -3709,6 +3730,7 @@ WINE_CONFIG_TEST(dlls/userenv/tests)
WINE_CONFIG_DLL(usp10,,[implib])
@@ -3715,7 +3736,8 @@ WINE_CONFIG_TEST(dlls/userenv/tests)
WINE_CONFIG_DLL(usp10)
WINE_CONFIG_TEST(dlls/usp10/tests)
WINE_CONFIG_LIB(uuid)
-WINE_CONFIG_DLL(uxtheme)
+WINE_CONFIG_DLL(uxtheme-gtk)
WINE_CONFIG_DLL(uxtheme,,[implib])
+WINE_CONFIG_DLL(uxtheme,,[implib])
WINE_CONFIG_TEST(dlls/uxtheme/tests)
WINE_CONFIG_DLL(vbscript)
WINE_CONFIG_TEST(dlls/vbscript/tests)
diff --git a/dlls/uxtheme-gtk/Makefile.in b/dlls/uxtheme-gtk/Makefile.in
new file mode 100644
index 0000000..07cf3a0f