From e88eba680bfc5d3587e38aba52181ac250a48118 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 23 Feb 2016 20:36:03 +0100 Subject: [PATCH] Rebase against 7276d5fac1417dd81344db45b3af904f8f2c7d77. --- ...ort-for-PARENTSPEC-Makefile-variable.patch | 10 +++--- ...ts-Add-initial-driver-testing-framew.patch | 34 +++++++++---------- patches/patchinstall.sh | 4 +-- staging/VERSION | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/patches/makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch b/patches/makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch index c1028c7f..61e758e9 100644 --- a/patches/makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch +++ b/patches/makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch @@ -1,4 +1,4 @@ -From 4d6ccf2ed54cd7816a9eb304d74398cc8cdbea89 Mon Sep 17 00:00:00 2001 +From 8d7b3fda16e6f652e079433ef7653537cdcbe6d1 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 17 Dec 2014 04:11:58 +0100 Subject: makedep: Add support for PARENTSPEC Makefile variable. @@ -8,7 +8,7 @@ Subject: makedep: Add support for PARENTSPEC Makefile variable. 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c -index 9fd704b..71e88e9 100644 +index e1897bc..5540b91 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -169,6 +169,7 @@ struct makefile @@ -19,7 +19,7 @@ index 9fd704b..71e88e9 100644 const char *module; const char *testdll; const char *sharedlib; -@@ -2473,7 +2474,12 @@ static struct strarray output_sources( const struct makefile *make ) +@@ -2541,7 +2542,12 @@ static struct strarray output_sources( const struct makefile *make ) char *spec_file = NULL; if (!make->appmode.count) @@ -32,8 +32,8 @@ index 9fd704b..71e88e9 100644 + } strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 0 )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0 )); - for (i = 0; i < make->delayimports.count; i++) -@@ -3188,6 +3194,7 @@ static void load_sources( struct makefile *make ) + add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ +@@ -3252,6 +3258,7 @@ static void load_sources( struct makefile *make ) strarray_set_value( &make->vars, "srcdir", src_dir_path( make, "" )); make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" ); diff --git a/patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch b/patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch index fc3a64de..ab195702 100644 --- a/patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch +++ b/patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch @@ -1,4 +1,4 @@ -From 94f9145a8c4e06efe46330c75819eb18486965f3 Mon Sep 17 00:00:00 2001 +From 53e679dcc9880ff814feb7776ecf66111da24b18 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 18 Jan 2015 05:42:10 +0100 Subject: ntoskrnl.exe/tests: Add initial driver testing framework and @@ -24,10 +24,10 @@ Subject: ntoskrnl.exe/tests: Add initial driver testing framework and create mode 100644 dlls/ntoskrnl.exe/tests/ntoskrnl.c diff --git a/aclocal.m4 b/aclocal.m4 -index d5a3532..f33846f 100644 +index 99faf92..f880723 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -617,6 +617,28 @@ $ac_dir/crosstest: $ac_dir/Makefile __builddeps__ dummy +@@ -609,6 +609,28 @@ $ac_dir/crosstest: __builddeps__ dummy fi } @@ -56,7 +56,7 @@ index d5a3532..f33846f 100644 wine_fn_config_tool () { ac_dir=$[1] -@@ -722,6 +744,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl +@@ -714,6 +736,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl m4_popdef([ac_suffix])dnl m4_popdef([ac_name])]) @@ -530,7 +530,7 @@ index 0000000..9b8a6a7 + unload_driver(service, filename); +} diff --git a/tools/make_makefiles b/tools/make_makefiles -index 78b6dea..cb77784 100755 +index e65429f..18b33c3 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -204,7 +204,7 @@ sub parse_makefile($) @@ -557,16 +557,16 @@ index 78b6dea..cb77784 100755 { die "MODULE should not be defined as static lib in $file" unless $file =~ /^dlls\//; diff --git a/tools/makedep.c b/tools/makedep.c -index 14a26ef..ad61e99 100644 +index e1897bc..ce33ed3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c -@@ -171,4 +171,5 @@ struct makefile +@@ -172,4 +172,5 @@ struct makefile const char *module; const char *testdll; + const char *resource; const char *sharedlib; const char *staticlib; -@@ -472,6 +473,30 @@ static char *get_extension( char *filename ) +@@ -475,6 +476,30 @@ static char *get_extension( char *filename ) /******************************************************************* @@ -597,7 +597,7 @@ index 14a26ef..ad61e99 100644 * replace_extension */ static char *replace_extension( const char *name, const char *old_ext, const char *new_ext ) -@@ -2044,6 +2069,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar +@@ -2165,6 +2190,7 @@ static struct strarray output_sources( const struct makefile *make ) struct strarray subdirs = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray all_targets = empty_strarray; @@ -605,7 +605,7 @@ index 14a26ef..ad61e99 100644 struct strarray install_rules[NB_INSTALL_RULES]; char *ldrpath_local = get_expanded_make_variable( make, "LDRPATH_LOCAL" ); char *ldrpath_install = get_expanded_make_variable( make, "LDRPATH_INSTALL" ); -@@ -2319,7 +2345,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar +@@ -2440,7 +2466,7 @@ static struct strarray output_sources( const struct makefile *make ) } else { @@ -614,16 +614,16 @@ index 14a26ef..ad61e99 100644 (source->file->flags & FLAG_C_IMPLIB) || (make->module && make->staticlib); -@@ -2333,7 +2359,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar +@@ -2454,7 +2480,7 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames( includes ); output_filenames( make->define_args ); output_filenames( extradefs ); -- if (make->module || make->staticlib || make->testdll) -+ if (make->module || make->staticlib || make->testdll || make->resource) +- if (make->module || make->staticlib || make->sharedlib || make->testdll) ++ if (make->module || make->staticlib || make->sharedlib || make->testdll || make->resource) { output_filenames( dll_flags ); if (make->use_msvcrt) output_filenames( msvcrt_flags ); -@@ -2412,6 +2438,72 @@ static struct strarray output_sources( const struct makefile *make, struct strar +@@ -2533,6 +2559,72 @@ static struct strarray output_sources( const struct makefile *make ) output( "\n" ); } @@ -696,7 +696,7 @@ index 14a26ef..ad61e99 100644 if (make->module && !make->staticlib) { struct strarray all_libs = empty_strarray; -@@ -2806,6 +2898,83 @@ static struct strarray output_sources( const struct makefile *make, struct strar +@@ -2925,6 +3017,83 @@ static struct strarray output_sources( const struct makefile *make ) add_install_rule( make, install_rules, make->scripts.str[i], make->scripts.str[i], strmake( "S$(bindir)/%s", make->scripts.str[i] )); @@ -780,12 +780,12 @@ index 14a26ef..ad61e99 100644 if (all_targets.count) { output( "all:" ); -@@ -3101,4 +3270,5 @@ static void update_makefile( const char *path ) +@@ -3255,4 +3424,5 @@ static void load_sources( struct makefile *make ) make->module = get_expanded_make_variable( make, "MODULE" ); make->testdll = get_expanded_make_variable( make, "TESTDLL" ); + make->resource = get_expanded_make_variable( make, "RESOURCE" ); make->sharedlib = get_expanded_make_variable( make, "SHAREDLIB" ); make->staticlib = get_expanded_make_variable( make, "STATICLIB" ); -- -2.6.2 +2.7.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 5c246c1a..08c6d700 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,13 +51,13 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "f71f7db63caeffdc92ede12bf15e8f7d184addd4" + echo "7276d5fac1417dd81344db45b3af904f8f2c7d77" } # Show version information version() { - echo "Wine Staging 1.9.4" + echo "Wine Staging 1.9.5 (unreleased)" echo "Copyright (C) 2014-2016 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" diff --git a/staging/VERSION b/staging/VERSION index 6654c11e..d32ce40a 100644 --- a/staging/VERSION +++ b/staging/VERSION @@ -1 +1 @@ -Wine Staging 1.9.4 +Wine Staging 1.9.5 (unreleased)