wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

patchupdate.py: Change output format of 'wine --patches' to match the wine ANNOUNCE file.

Browse Source
This commit is contained in:
Sebastian Lackner
2014-11-15 08:31:56 +01:00
parent 972842c50e
commit dc05c7f163
5 changed files with 301 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch
View File

@@ -1,19 +1,19 @@
From d88eb32e40bff9b8279f57b13a5f2cc09a9273ea Mon Sep 17 00:00:00 2001
From 378c383c738f097fd6fa81badca0cde5c6858970 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 29 May 2014 23:43:45 +0200
Subject: loader: Add commandline option --patches to show the patch list.
---
dlls/ntdll/misc.c | 8 ++++++++
dlls/ntdll/ntdll.spec | 1 +
loader/main.c | 19 ++++++++++++++++++-
3 files changed, 27 insertions(+), 1 deletion(-)
dlls/ntdll/misc.c | 8 ++++++++
dlls/ntdll/ntdll.spec | 1 +
loader/main.c | 32 +++++++++++++++++++++++++++++++-
3 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index 8bd4eb7..4b4c318 100644
index ad1b43b..1f985e7 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -60,6 +60,14 @@ const char * CDECL NTDLL_wine_get_version(void)
@@ -55,6 +55,14 @@ const char * CDECL NTDLL_wine_get_version(void)
}
/*********************************************************************
@@ -29,10 +29,10 @@ index 8bd4eb7..4b4c318 100644
*/
const char * CDECL NTDLL_wine_get_build_id(void)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 5bac269..ab50882 100644
index 7e95969..f9483aa 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1419,6 +1419,7 @@
@@ -1421,6 +1421,7 @@
# Version
@ cdecl wine_get_version() NTDLL_wine_get_version
@@ -41,23 +41,10 @@ index 5bac269..ab50882 100644
@ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version
diff --git a/loader/main.c b/loader/main.c
index ac67290..71e5055 100644
index ac67290..db9a176 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -79,6 +79,12 @@ static inline void reserve_area( void *addr, size_t size )
#endif /* __APPLE__ */
+struct wine_patch {
+ const char *name;
+ const char *author;
+ const char *title;
+};
+
/***********************************************************************
* check_command_line
*
@@ -89,7 +95,8 @@ static void check_command_line( int argc, char *argv[] )
@@ -89,7 +89,8 @@ static void check_command_line( int argc, char *argv[] )
static const char usage[] =
"Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n"
" wine --help Display this help and exit\n"
@@ -67,23 +54,42 @@ index ac67290..71e5055 100644
if (argc <= 1)
{
@@ -106,6 +113,16 @@ static void check_command_line( int argc, char *argv[] )
@@ -106,6 +107,35 @@ static void check_command_line( int argc, char *argv[] )
printf( "%s\n", wine_get_build_id() );
exit(0);
}
+ if (!strcmp( argv[1], "--patches" ))
+ {
+ const struct wine_patch *wine_patch_data = wine_get_patches();
+ for(; wine_patch_data->name != NULL; wine_patch_data++)
+ const struct
+ {
+ printf( "%s :: %s :: %s\n", wine_patch_data->name, wine_patch_data->author,
+ wine_patch_data->title );
+ const char *author;
+ const char *subject;
+ }
+ *next, *cur = wine_get_patches();
+
+ while (cur->author)
+ {
+ next = cur + 1;
+ while (next->author)
+ {
+ if (strcmp(cur->author, next->author)) break;
+ next++;
+ }
+
+ printf("%s (%d):\n", cur->author, next - cur);
+ while (cur < next)
+ {
+ printf(" %s\n", cur->subject);
+ cur++;
+ }
+ printf("\n");
+ }
+
+ exit(0);
+ }
}
--
1.7.9.5
2.1.3

6
patches/Staging/0004-loader-Add-commandline-option-check-libs.patch
View File

@@ -250,7 +250,7 @@ index 76bf324..36738f2 100644
#include <pthread.h>
#include "wine/library.h"
@@ -96,7 +102,8 @@ static void check_command_line( int argc, char *argv[] )
@@ -90,7 +96,8 @@ static void check_command_line( int argc, char *argv[] )
"Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n"
" wine --help Display this help and exit\n"
" wine --version Output version information and exit\n"
@@ -260,8 +260,8 @@ index 76bf324..36738f2 100644
if (argc <= 1)
{
@@ -123,6 +130,47 @@ static void check_command_line( int argc, char *argv[] )
}
@@ -135,6 +142,47 @@ static void check_command_line( int argc, char *argv[] )
exit(0);
}
+ if (!strcmp( argv[1], "--check-libs" ))