summaryrefslogtreecommitdiffstats
path: root/x11-libs
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs')
-rwxr-xr-xx11-libs/cairo/DEPENDS14
-rwxr-xr-xx11-libs/cairo/DETAILS9
-rw-r--r--x11-libs/cairo/HISTORY38
-rwxr-xr-xx11-libs/cairo/PRE_BUILD6
-rwxr-xr-xx11-libs/cairo/UP_TRIGGERS4
-rw-r--r--x11-libs/cairo/patches-stable/0001-Fix-build-with-external-libexecinfo.patch (renamed from x11-libs/cairo/patches/0001-Fix-build-with-external-libexecinfo.patch)3
-rw-r--r--x11-libs/cairo/patches-stable/0001-Fix-build-with-newer-binutils.patch34
-rw-r--r--x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch12
-rwxr-xr-xx11-libs/fontconfig/DETAILS11
-rw-r--r--x11-libs/fontconfig/HISTORY3
-rw-r--r--x11-libs/unity-greeter/HISTORY3
-rwxr-xr-xx11-libs/wine/DETAILS8
-rw-r--r--x11-libs/wine/HISTORY45
-rwxr-xr-xx11-libs/wine/PRE_BUILD7
-rw-r--r--x11-libs/wine/patches-devel/0001-Fix-run-time-linking-issue.patch76
-rw-r--r--x11-libs/wine/patches-stable/0002-server-Fix-missing-include-for-uid_t.patch33
-rw-r--r--x11-libs/wine/patches-stable/rpath.patch (renamed from x11-libs/wine/patches/rpath.patch)0
17 files changed, 202 insertions, 104 deletions
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index 46892ee9ab..aa317c65eb 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -1,5 +1,7 @@
. "$GRIMOIRE/FUNCTIONS" &&
. "${GRIMOIRE}/MESON_DEPENDS" &&
+list_remove CAIRO_OPTS "xml=enabled" &&
+list_remove CAIRO_OPTS "xml=disabled" &&
case "$HOST" in
(*-musl) depends libexecinfo ;;
@@ -16,9 +18,9 @@ if spell_ok pixman && is_version_less $(installed_version pixman) 0.30.0; then
fi &&
optional_depends zlib \
- "xml=enabled" \
- "xml=disabled" \
- "for XML surface backend" &&
+ "zlib=enabled" \
+ "zlib=disabled" \
+ "for script, ps, pdf and XML surfaces" &&
# uses libbfd-*.so
optional_depends -sub LIBERTY binutils \
@@ -71,12 +73,6 @@ optional_depends libpng \
optional_depends lzo "" "" "for LZO compression support" &&
-optional_depends OPENGL \
- "gl-backend=auto" \
- "gl-backend=disabled" \
- "for OpenGL accelerated graphics" &&
-
-
optional_depends gtk-doc \
"gtk_doc=true" \
"gtk_doc=false" \
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 8271d26ce1..f9f2dc53fa 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -9,10 +9,11 @@ if [[ "${CAIRO_BRANCH}" == "scm" ]]; then
FORCE_DOWNLOAD=1
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
else
- VERSION=1.17.6
- SOURCE_HASH=sha512:1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=https://gitlab.freedesktop.org/cairo/cairo/-/archive/${VERSION}/${SOURCE}
+ VERSION=1.18.0
+ SOURCE_HASH="sha256:243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64:UPSTREAM_HASH"
+ SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE_URL[0]="https://cairographics.org/releases/${SOURCE}"
+# Watch: https://cairographics.org/releases/
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://cairographics.org/
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 5619ce0f80..9f59fcb15b 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,41 @@
+2023-11-07 Thomas Orgis <sobukus@sourcemage.org>
+ * UP_TRIGGERS: added for la removal (after 1.16)
+
+2023-09-29 Pavel Vinogradov <public@sorcemage.org>
+ * patches/0001-Fix-build-with-external-libexecinfo.patch ->
+ patches-stable/0001-Fix-build-with-external-libexecinfo.patch
+
+2023-09-23 Pavel Vinogradov <public@sorcemage.org>
+ * DETAILS: version 1.18.0, updated SOURCE_URL[0], added Watch line
+ * DEPENDS: cleaned up xml flag
+ * patches-scm/0001-Fix-build-against-binutils-2.39.patch,
+ patches-stable/0001-Fix-build-against-binutils-2.39.patch,
+ atches-stable/0001-tee-Fix-cairo-wrapper-functions.patch: removed
+ * patches/0001-Fix-build-against-binutils-2.39.patch: added chunks from scm
+ patch
+
+2023-88-17 Pavel Vinogradov <public@sourcemage.org>
+ * PRE_BUILD, patches{,-{scm,stable}}/
+ 0001-Fix-build-against-binutils-2.39.patch: split the patch across
+ different branches
+
+2023-03-02 Pavel Vinogradov <public@sourcemage.org>
+ * DEPENDS: refactored XML surface backend feature, apllies only for non-scm
+ branches, changed zlib flags
+
+2023-02-27 Ismael Luceno <ismael@sourcemage.org>
+ * 0001-tee-Fix-cairo-wrapper-functions.patch:
+ added build fix for tee surface backend
+
+2023-02-05 Pavel Vinogradov <public@sourcemage.org>
+ * DETAILS: version 1.17.8, updated SOURCE_URL[0], bz2 -> xz, switched to
+ UPSTREAM_HASH
+ * DEPENDS: dropped OPENGL completely
+ * patches-stable/0001-Fix-build-with-newer-binutils.patch: removed, needed no more
+
+2023-02-01 Pavel Vinogradov <public@sourcemage.org>
+ * DEPENDS: OPENGL isn't for scm branch anymore
+
2022-09-17 Pavel Vinogradov <public@sourcemage.org>
* cairo-1.10.0-buggy_gradients.patch: actually removed the patch
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
index 02e1d7d5e9..d2b7e8c66c 100755
--- a/x11-libs/cairo/PRE_BUILD
+++ b/x11-libs/cairo/PRE_BUILD
@@ -3,4 +3,8 @@ cd ${SOURCE_DIRECTORY} &&
apply_patch_dir patches &&
-if [[ "$CAIRO_BRANCH" != "scm" ]]; then apply_patch_dir patches-stable; fi
+if [[ "$CAIRO_BRANCH" != "scm" ]]; then
+ apply_patch_dir patches-stable
+else
+ apply_patch_dir patches-scm
+fi
diff --git a/x11-libs/cairo/UP_TRIGGERS b/x11-libs/cairo/UP_TRIGGERS
new file mode 100755
index 0000000000..3361d40718
--- /dev/null
+++ b/x11-libs/cairo/UP_TRIGGERS
@@ -0,0 +1,4 @@
+if [[ -e "$INSTALL_ROOT/usr/lib/libcairo.la" ]]; then
+ . $GRIMOIRE/la_remove_up_trigger.function
+ la_remove_up_trigger 0
+fi
diff --git a/x11-libs/cairo/patches/0001-Fix-build-with-external-libexecinfo.patch b/x11-libs/cairo/patches-stable/0001-Fix-build-with-external-libexecinfo.patch
index 77a80ade24..a13cc9a645 100644
--- a/x11-libs/cairo/patches/0001-Fix-build-with-external-libexecinfo.patch
+++ b/x11-libs/cairo/patches-stable/0001-Fix-build-with-external-libexecinfo.patch
@@ -7,7 +7,8 @@ The backtracing functions may be implemented on a separate library instead
of in the libc, so try to find it.
Origin: Source Mage GNU/Linux
-Upstream-Status: Pending
+Upstream-Status: Denied
+ [https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/519]
Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
---
util/meson.build | 4 +++-
diff --git a/x11-libs/cairo/patches-stable/0001-Fix-build-with-newer-binutils.patch b/x11-libs/cairo/patches-stable/0001-Fix-build-with-newer-binutils.patch
deleted file mode 100644
index 27d0e0d20d..0000000000
--- a/x11-libs/cairo/patches-stable/0001-Fix-build-with-newer-binutils.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 24996e6ee241ebcd303dd34a2b06b37a6dd0c217 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@debian.org>
-Date: Wed, 13 Jul 2022 21:26:57 +0100
-Subject: [PATCH] Fix build with newer binutils-dev installed
-
-It seems the PTR typedef (or macro?) has been removed from newer versions
-of libbfd.
-
-Resolves: https://gitlab.freedesktop.org/cairo/cairo/-/issues/581
-Signed-off-by: Simon McVittie <smcv@debian.org>
----
- util/cairo-trace/lookup-symbol.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/util/cairo-trace/lookup-symbol.c b/util/cairo-trace/lookup-symbol.c
-index 3934066b9..ca15688c4 100644
---- a/util/cairo-trace/lookup-symbol.c
-+++ b/util/cairo-trace/lookup-symbol.c
-@@ -106,10 +106,10 @@ _symtab_init (struct symtab *symtab, const char *filename)
- if (! bfd_check_format_matches (symtab->bfd, bfd_object, &matching))
- goto BAIL;
-
-- symcount = bfd_read_minisymbols (symtab->bfd, false, (PTR) &symtab->syms, &size);
-+ symcount = bfd_read_minisymbols (symtab->bfd, false, (void **) &symtab->syms, &size);
- if (symcount == 0) {
- symcount = bfd_read_minisymbols (symtab->bfd, true /* dynamic */ ,
-- (PTR) &symtab->syms, &size);
-+ (void **) &symtab->syms, &size);
- }
- if (symcount < 0)
- goto BAIL;
---
-GitLab
-
diff --git a/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch b/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
index f7551e3f18..45ba675071 100644
--- a/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
+++ b/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
@@ -14,16 +14,16 @@ index 970f49a52..14736e12e 100644
deps += [bfd_dep]
elif get_option('symbol-lookup').enabled()
diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build
-index c4a504759..d90a994ea 100644
+index 8d4ac131b..cf05352c5 100644
--- a/util/cairo-trace/meson.build
+++ b/util/cairo-trace/meson.build
-@@ -12,7 +12,8 @@ libcairotrace = library('cairo-trace', cairo_trace_sources,
+@@ -11,7 +11,8 @@ shared_lib_ext = libcairo.full_path().split('.')[-1]
+ libcairotrace = library('cairo-trace', cairo_trace_sources,
include_directories: [incbase, incsrc],
dependencies: deps,
- link_args: extra_link_args,
- c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),] + pthread_c_args,
+ c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),
-+ '-DPACKAGE=cairo -DPACKAGE_VERSION="@0@"'.format(meson.project_version()),] + pthread_c_args,
++ '-DPACKAGE=cairo -DPACKAGE_VERSION="@0@"'.format(meson.project_version()),] + pthread_c_args,
+ link_args: extra_link_args,
+ gnu_symbol_visibility: 'hidden',
install: true,
- install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'cairo'),
- )
diff --git a/x11-libs/fontconfig/DETAILS b/x11-libs/fontconfig/DETAILS
index 617c53c09f..4e95093977 100755
--- a/x11-libs/fontconfig/DETAILS
+++ b/x11-libs/fontconfig/DETAILS
@@ -1,12 +1,7 @@
SPELL=fontconfig
-if [[ "$FONTCONFIG_BRANCH" == "devel" ]]; then
- VERSION=2.13.1
- SOURCE_HASH=sha512:f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
-else
- VERSION=2.13.1
- SOURCE_HASH=sha512:f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
-fi
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=2.14.2
+ SOURCE_HASH=sha512:23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://www.fontconfig.org/release/$SOURCE
WEB_SITE=https://www.fontconfig.org/
diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY
index 8888bbeec5..46047b0ab3 100644
--- a/x11-libs/fontconfig/HISTORY
+++ b/x11-libs/fontconfig/HISTORY
@@ -1,3 +1,6 @@
+2023-03-28 Pavel Vinogradov <public@sourcemage.org>
+ * DETAILS: version 2.14.2, bz2 -> xz
+
2022-07-27 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: switch to PKG-CONFIG provider (automated)
diff --git a/x11-libs/unity-greeter/HISTORY b/x11-libs/unity-greeter/HISTORY
index 9fe63e7744..aa198e2f79 100644
--- a/x11-libs/unity-greeter/HISTORY
+++ b/x11-libs/unity-greeter/HISTORY
@@ -1,3 +1,6 @@
+2023-11-12 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: handle atk deprecation (half-automated)
+
2013-03-15 Florian Franzmann <bwlf@bandrate.org>
* DEPENDS: added dependency on gnome-settings-daemon
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 8262dba65e..7824de3a85 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -1,8 +1,10 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=wine
case "$WINE_BRANCH" in
-(devel) VERSION=7.21;;
-(stable) VERSION=7.0.1;;
+(devel) VERSION=8.20
+ SOURCE_HASH=sha512:86dffc3c9e01506ff2ff75663f48bb3b18a6afaf6381fc3c43c476481cb5c0570129550d2047059f528855e454a629c63e8beb85d5c591d1fdb7a066fbca2623;;
+(stable) VERSION=8.0.2
+ SOURCE_HASH=sha512:e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f;;
esac; case "$WINE_BRANCH" in
(scm)
VERSION=$(get_scm_version)
@@ -27,7 +29,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
;;
esac
LICENSE[0]=LGPL
- WEB_SITE=http://www.winehq.com/
+ WEB_SITE=https://www.winehq.org/
KEYWORDS="emulator x11 libs"
ENTERED=20010925
TMPFS=off
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 37c0bc8a0c..2151d35caf 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,48 @@
+2023-11-14 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated to 8.20 (devel)
+
+2023-10-29 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated to 8.19 (devel)
+
+2023-10-14 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated to 8.18 (devel) and 8.0.2 (stable)
+ fixed WEB_SITE
+
+2023-10-04 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated to 8.17 (devel)
+
+2023-09-17 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated to 8.16 (devel)
+
+2023-07-07 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated to 8.12 (devel)
+
+2023-06-10 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated to 8.10 (devel)
+
+2023-04-28 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated to 8.0.1 (stable)
+ updated to 8.7 (devel)
+
+2023-04-15 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated to 8.6 (devel)
+
+2023-03-18 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated to 8.5 (devel)
+
+2023-03-18 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated to 8.4 (devel)
+ * PRE_BUILD, patches-devel/0001-Fix-run-time-linking-issue.patch,
+ patches-stable/rpath.patch: updated patch
+
+2023-02-23 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated to 8.2 (devel)
+
+2023-02-02 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated to 8.0 (stable) and 8.1 (devel)
+ * patches-stable/0002-server-Fix-missing-include-for-uid_t.patch:
+ removed, no longer needed
+
2022-11-11 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: updated WINE_BRANCH=devel to 7.21
diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
index 80e65c0402..24ce32e6ac 100755
--- a/x11-libs/wine/PRE_BUILD
+++ b/x11-libs/wine/PRE_BUILD
@@ -1,7 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches &&
-case "$WINE_BRANCH" in
- stable)
- apply_patch_dir patches-stable ;;
-esac
+apply_patch_dir patches-common &&
+apply_patch_dir "patches-$WINE_BRANCH"
diff --git a/x11-libs/wine/patches-devel/0001-Fix-run-time-linking-issue.patch b/x11-libs/wine/patches-devel/0001-Fix-run-time-linking-issue.patch
new file mode 100644
index 0000000000..67c7441a56
--- /dev/null
+++ b/x11-libs/wine/patches-devel/0001-Fix-run-time-linking-issue.patch
@@ -0,0 +1,76 @@
+From 0a777847ecb63df3a89f595e6033af7d56364081 Mon Sep 17 00:00:00 2001
+From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
+Date: Sat, 4 Mar 2023 02:02:35 +0100
+Subject: [PATCH] Fix run-time linking issue
+
+Add $ORIGIN to rpath to fix finding of libraries at /usr/lib/wine/...
+
+Origin: Alpine Linux
+Ref: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13249
+Ref: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/27930
+[ismael@sourcemage.org: Added commit message and ported to wine 8.3]
+Signed-off-by: Ismael Luceno <ismael@sourcemage.org>
+Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
+---
+ configure | 31 +++++++++++++++++++++++++++++++
+ configure.ac | 2 ++
+ 2 files changed, 33 insertions(+)
+
+diff --git a/configure b/configure
+index 647a12374691..c8140dea6986 100755
+--- a/configure
++++ b/configure
+@@ -10325,6 +10325,37 @@ then :
+ fi
+ ;;
+ esac
++ # do this at the end because it needs double dollar for makefile
++ as_ac_var=`printf "%s\n" "ac_cv_cflags_-Wl,-rpath,\\\\\\$ORIGIN" | $as_tr_sh`
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-rpath,\\\$ORIGIN" >&5
++printf %s "checking whether the compiler supports -Wl,-rpath,\\\$ORIGIN... " >&6; }
++if eval test \${$as_ac_var+y}
++then :
++ printf %s "(cached) " >&6
++else $as_nop
++ ac_wine_try_cflags_saved=$CFLAGS
++CFLAGS="$CFLAGS -Wl,-rpath,\\\$ORIGIN"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++int main(int argc, char **argv) { return 0; }
++_ACEOF
++if ac_fn_c_try_link "$LINENO"
++then :
++ eval "$as_ac_var=yes"
++else $as_nop
++ eval "$as_ac_var=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.beam \
++ conftest$ac_exeext conftest.$ac_ext
++CFLAGS=$ac_wine_try_cflags_saved
++fi
++eval ac_res=\$$as_ac_var
++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++printf "%s\n" "$ac_res" >&6; }
++if eval test \"x\$"$as_ac_var"\" = x"yes"
++then :
++ UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"
++fi
+ ;;
+ esac
+
+diff --git a/configure.ac b/configure.ac
+index 5ff1bb093f44..4e9d63568288 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -785,6 +785,8 @@ case $host_os in
+ [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"])
+ ;;
+ esac
++ # do this at the end because it needs double dollar for makefile
++ WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"])
+ ;;
+ esac
+
+--
+2.39.2
+
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
deleted file mode 100644
index f4958180b5..0000000000
--- a/x11-libs/wine/patches-stable/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@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@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/rpath.patch b/x11-libs/wine/patches-stable/rpath.patch
index 515a1f045b..515a1f045b 100644
--- a/x11-libs/wine/patches/rpath.patch
+++ b/x11-libs/wine/patches-stable/rpath.patch