wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 4fb840b614691a787c76659f02c163d922f88fba.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-10-22 20:18:05 +02:00
parent 8d0e6ea5c8
commit e64c3bff30
5 changed files with 182 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch
View File

@ -1,4 +1,4 @@
From 0e76401ae2de47285c66ee0b59bdf7449136d060 Mon Sep 17 00:00:00 2001
From 65feac97e132fb25278e7c4c904d2ae831bf8a50 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 2 Oct 2014 19:53:46 +0200
Subject: winelib: Append '(Staging)' at the end of the version string.
@ -8,7 +8,7 @@ Subject: winelib: Append '(Staging)' at the end of the version string.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index c961ba5..776168c 100644
index bc5f6fe..799b032 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -105,7 +105,7 @@ config_EXTRADEFS = \
@ -18,8 +18,8 @@ index c961ba5..776168c 100644
- version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-@PACKAGE_VERSION@") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
+ version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-@PACKAGE_VERSION@") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
# Make sure that make_makefiles sees the generated rules
.PHONY: install install-lib install-dev uninstall
dummy:
--
2.1.1
2.6.1

6
patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch
View File

@ -627,14 +627,14 @@ index 54aab45..c9f48fe 100644
+ {
+ for (i = 0; i < resource_dlls.count; i++)
+ {
+ output( "%s/Makefile: dummy\n", resource_dlls.str[i] );
+ output( "%s/Makefile:\n", resource_dlls.str[i] );
+ output( "\t@cd %s && $(MAKE) %s/Makefile\n", make->top_obj_dir,
+ base_dir_path( make, resource_dlls.str[i] ) );
+ }
+
+ for (i = 0; i < resource_dlls.count; i++)
+ {
+ output( "%s/%s%s: %s/Makefile dummy\n", resource_dlls.str[i],
+ output( "%s/%s%s: %s/Makefile\n", resource_dlls.str[i],
+ resource_dlls.str[i], dll_ext, resource_dlls.str[i] );
+ output( "\t@cd %s && $(MAKE) %s%s\n", resource_dlls.str[i],
+ resource_dlls.str[i], dll_ext );
@ -660,7 +660,7 @@ index 54aab45..c9f48fe 100644
+ for (i = 0; i < resource_dlls.count; i++)
+ {
+ char *name = prepend_extension( resource_dlls.str[i], "_crossres", ".dll" );
+ output( "%s/%s: %s/Makefile dummy\n", resource_dlls.str[i], name, resource_dlls.str[i] );
+ output( "%s/%s: %s/Makefile\n", resource_dlls.str[i], name, resource_dlls.str[i] );
+ output( "\t@cd %s && $(MAKE) %s\n", resource_dlls.str[i], name );
+ free( name );
+ }

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "8075101480df82c5f4280d534f2d76f035653667"
echo "4fb840b614691a787c76659f02c163d922f88fba"
}
# Show version information

342
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

File diff suppressed because it is too large Load Diff

4
patches/wpcap-Dynamic_Linking/0001-wpcap-Load-libpcap-dynamically.patch
View File

@ -19,7 +19,7 @@ index aec53f6..58112de 100644
dnl **** Check for libpcap ****
if test "$ac_cv_header_pcap_pcap_h" = "yes"
then
- AC_CHECK_LIB(pcap,pcap_create,[AC_SUBST(LIBPCAP,["-lpcap"])])
- AC_CHECK_LIB(pcap,pcap_create,[AC_SUBST(PCAP_LIBS,["-lpcap"])])
+ WINE_CHECK_SONAME(pcap,pcap_create,,,)
fi
-WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_create" != xyes],
@ -37,7 +37,7 @@ index e44613f..aeef71a 100644
@@ -1,6 +1,5 @@
MODULE = wpcap.dll
DELAYIMPORTS = ws2_32
-EXTRALIBS = @LIBPCAP@
-EXTRALIBS = $(PCAP_LIBS)
C_SRCS = \
wpcap.c