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

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

50
debian/tools/patchlist.sh vendored
View File

@@ -1,32 +1,52 @@
#!/bin/sh
PATCH_DATA=$(cat);
PATCH_LINES=$(echo "${PATCH_DATA}" | wc -l);
PATCH_LINES=$((${PATCH_LINES}+20));
PATCH_LINES=$((${PATCH_LINES}+22));
cat <<EOF
From: "FDS-Team" <webmaster@fds-team.de>
From: FDS-Team <webmaster@fds-team.de>
Subject: Autogenerated patch list.
---
include/wine/library.h | 1 +
libs/wine/config.c | 16 ++++++++++++++++
libs/wine/wine.def | 1 +
libs/wine/wine.map | 1 +
4 files changed, 19 insertions(+)
diff --git a/include/wine/library.h b/include/wine/library.h
index 242bb69..fae73fe 100644
--- a/include/wine/library.h
+++ b/include/wine/library.h
@@ -43,6 +43,7 @@ extern const char *wine_get_data_dir(void);
extern const char *wine_get_server_dir(void);
extern const char *wine_get_user_name(void);
extern const char *wine_get_version(void);
+extern const void *wine_get_patches(void);
extern const char *wine_get_build_id(void);
extern void wine_init_argv0_path( const char *argv0 );
extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
diff --git a/libs/wine/config.c b/libs/wine/config.c
index a273502..5fa0cd5 100644
index a273502..d6b0067 100644
--- a/libs/wine/config.c
+++ b/libs/wine/config.c
@@ -478,6 +478,${PATCH_LINES} @@ const char *wine_get_version(void)
return PACKAGE_VERSION;
}
+struct wine_patch {
+ const char *name;
+static const struct
+{
+ const char *author;
+ const char *title;
+} wine_patch_data[] = {
+ const char *subject;
+}
+wine_patch_data[] =
+{
${PATCH_DATA}
+ { NULL, NULL, NULL }
+ { NULL, NULL }
+};
+
+/* return the applied non-standard patches */
+const void * wine_get_patches(void)
+const void *wine_get_patches(void)
+{
+ return &wine_patch_data[0];
+}
@@ -58,16 +78,4 @@ index 2159fac..7cb2918 100644
wine_init;
wine_init_argv0_path;
wine_is_dbcs_leadbyte;
diff --git a/include/wine/library.h b/include/wine/library.h
index 242bb69..aa9e585 100644
--- a/include/wine/library.h
+++ b/include/wine/library.h
@@ -43,6 +43,7 @@ extern const char *wine_get_data_dir(void);
extern const char *wine_get_server_dir(void);
extern const char *wine_get_user_name(void);
extern const char *wine_get_version(void);
+extern const void *wine_get_patches(void);
extern const char *wine_get_build_id(void);
extern void wine_init_argv0_path( const char *argv0 );
extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
EOF

4
debian/tools/patchupdate.py vendored
View File

@@ -500,8 +500,8 @@ def generate_makefile(all_patches):
if len(patch.patches):
fp.write("\t@( \\\n")
for p in _unique(patch.patches, key=lambda p: (p.patch_author, p.patch_subject)):
fp.write("\t\techo '+ { \"%s\", \"%s\", \"%s\" },'; \\\n" % \
(patch.name, _escape(p.patch_author), _escape(p.patch_subject)))
fp.write("\t\techo '+ { \"%s\", \"%s\" },'; \\\n" % \
(_escape(p.patch_author), _escape(p.patch_subject)))
fp.write("\t) > %s.ok\n" % patch.name)
else:
fp.write("\ttouch %s.ok\n" % patch.name)