Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 x11-libs/wine/DETAILS                                                        
|    2 
 x11-libs/wine/PRE_BUILD                                                      
|    6 +
 x11-libs/wine/patches-stable/0002-server-Fix-missing-include-for-uid_t.patch 
|   33 ++++++++++
 x11-libs/wine/patches/0002-server-Fix-missing-include-for-uid_t.patch        
|   33 ----------
 4 files changed, 39 insertions(+), 35 deletions(-)

New commits:
commit 430dc9abc448782e2cebed870fdfd6eeff50448d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    wine 7.1 (devel)

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 00239a9..86d5874 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -1,7 +1,7 @@
 . "$GRIMOIRE/FUNCTIONS"
            SPELL=wine
 case "$WINE_BRANCH" in
-(devel)  VERSION=7.0 PATCHLEVEL=1;;
+(devel)  VERSION=7.1;;
 (stable) VERSION=7.0 PATCHLEVEL=1;;
 esac; case "$WINE_BRANCH" in
   (scm)
diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
index c230ad1..80e65c0 100755
--- a/x11-libs/wine/PRE_BUILD
+++ b/x11-libs/wine/PRE_BUILD
@@ -1,3 +1,7 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches
+apply_patch_dir patches &&
+case "$WINE_BRANCH" in
+  stable)
+    apply_patch_dir patches-stable ;;
+esac
diff --git 
a/x11-libs/wine/patches-stable/0002-server-Fix-missing-include-for-uid_t.patch
 
b/x11-libs/wine/patches-stable/0002-server-Fix-missing-include-for-uid_t.patch
new file mode 100644
index 0000000..f495818
--- /dev/null
+++ 
b/x11-libs/wine/patches-stable/0002-server-Fix-missing-include-for-uid_t.patch
@@ -0,0 +1,33 @@
+From b9fcfd6e79f3e5169e1ad82d24c6ca2f56ab4e48 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Sun, 10 Oct 2021 22:56:59 +0200
+Subject: [PATCH 2/2] server: Fix missing include for uid_t
+
+Explicitly include <sys/types.h> to make uid_t available to users of
+server/security.h.
+
+This is a problem on musl, and possibly other non-glibc systems.
+
+Fixes: c954e5b9e6a6 ("server: Avoid using wine/port.h.")
+Upstream-Status: Submitted [https://bugs.winehq.org/show_bug.cgi?id=51860]
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ server/security.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/server/security.h b/server/security.h
+index 5388bc9c4195..39e7218ec5fa 100644
+--- a/server/security.h
++++ b/server/security.h
+@@ -21,6 +21,8 @@
+ #ifndef __WINE_SERVER_SECURITY_H
+ #define __WINE_SERVER_SECURITY_H
+ 
++#include <sys/types.h> /* for uid_t */
++
+ extern const LUID SeIncreaseQuotaPrivilege;
+ extern const LUID SeSecurityPrivilege;
+ extern const LUID SeTakeOwnershipPrivilege;
+-- 
+2.33.0
+
diff --git 
a/x11-libs/wine/patches/0002-server-Fix-missing-include-for-uid_t.patch 
b/x11-libs/wine/patches/0002-server-Fix-missing-include-for-uid_t.patch
deleted file mode 100644
index f495818..0000000
--- a/x11-libs/wine/patches/0002-server-Fix-missing-include-for-uid_t.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b9fcfd6e79f3e5169e1ad82d24c6ca2f56ab4e48 Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Sun, 10 Oct 2021 22:56:59 +0200
-Subject: [PATCH 2/2] server: Fix missing include for uid_t
-
-Explicitly include <sys/types.h> to make uid_t available to users of
-server/security.h.
-
-This is a problem on musl, and possibly other non-glibc systems.
-
-Fixes: c954e5b9e6a6 ("server: Avoid using wine/port.h.")
-Upstream-Status: Submitted [https://bugs.winehq.org/show_bug.cgi?id=51860]
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- server/security.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/server/security.h b/server/security.h
-index 5388bc9c4195..39e7218ec5fa 100644
---- a/server/security.h
-+++ b/server/security.h
-@@ -21,6 +21,8 @@
- #ifndef __WINE_SERVER_SECURITY_H
- #define __WINE_SERVER_SECURITY_H
- 
-+#include <sys/types.h> /* for uid_t */
-+
- extern const LUID SeIncreaseQuotaPrivilege;
- extern const LUID SeSecurityPrivilege;
- extern const LUID SeTakeOwnershipPrivilege;
--- 
-2.33.0
-