diff options
| -rw-r--r-- | .SRCINFO | 138 | ||||
| -rw-r--r-- | 0001-ldap-rename-ldap_connect-to-oldap_connect.patch | 112 | ||||
| -rw-r--r-- | PKGBUILD | 141 |
3 files changed, 172 insertions, 219 deletions
@@ -1,157 +1,165 @@ -pkgbase = wine-stable +pkgbase = wine-stable-next pkgdesc = A compatibility layer for running Windows programs - pkgver = 6.0.2 - pkgrel = 2 + pkgver = 7.0rc6 + pkgrel = 1 url = http://www.winehq.com install = wine.install arch = x86_64 license = LGPL makedepends = alsa-lib + makedepends = lib32-alsa-lib makedepends = fontforge makedepends = giflib + makedepends = lib32-giflib makedepends = gnutls + makedepends = lib32-gnutls makedepends = gsm + makedepends = lib32-gsm makedepends = gst-plugins-base-libs + makedepends = lib32-gst-plugins-base-libs makedepends = libcups - makedepends = libgl + makedepends = lib32-libcups makedepends = libgphoto2 + makedepends = lib32-libgphoto2 + makedepends = libjpeg-turbo + makedepends = lib32-libjpeg-turbo makedepends = libldap + makedepends = lib32-libldap makedepends = libpng + makedepends = lib32-libpng makedepends = libpulse + makedepends = lib32-libpulse makedepends = libxcomposite + makedepends = lib32-libxcomposite makedepends = libxinerama + makedepends = lib32-libxinerama makedepends = libxmu + makedepends = lib32-libxmu makedepends = libxslt + makedepends = lib32-libxslt makedepends = libxxf86vm + makedepends = lib32-libxxf86vm makedepends = mesa + makedepends = lib32-mesa makedepends = mingw-w64-gcc makedepends = mpg123 + makedepends = lib32-mpg123 makedepends = ncurses + makedepends = lib32-ncurses makedepends = ocl-icd + makedepends = lib32-ocl-icd makedepends = openal + makedepends = lib32-openal makedepends = opencl-headers makedepends = perl makedepends = samba makedepends = sane makedepends = sdl2 + makedepends = lib32-sdl2 makedepends = v4l-utils + makedepends = lib32-v4l-utils makedepends = vkd3d + makedepends = lib32-vkd3d makedepends = vulkan-headers makedepends = vulkan-icd-loader - makedepends = lib32-alsa-lib - makedepends = lib32-giflib - makedepends = lib32-gnutls - makedepends = lib32-gst-plugins-base-libs - makedepends = lib32-libcups - makedepends = lib32-libgl - makedepends = lib32-libldap - makedepends = lib32-libpng - makedepends = lib32-libpulse - makedepends = lib32-libxcomposite - makedepends = lib32-libxinerama - makedepends = lib32-libxmu - makedepends = lib32-libxslt - makedepends = lib32-libxxf86vm - makedepends = lib32-mesa - makedepends = lib32-mpg123 - makedepends = lib32-ncurses - makedepends = lib32-ocl-icd - makedepends = lib32-openal - makedepends = lib32-sdl2 - makedepends = lib32-v4l-utils - makedepends = lib32-vkd3d makedepends = lib32-vulkan-icd-loader depends = desktop-file-utils depends = faudio - depends = fontconfig - depends = freetype2 - depends = glu - depends = lcms2 - depends = libpcap - depends = libsm - depends = libxcursor - depends = libxdamage - depends = libxi - depends = libxml2 - depends = libxrandr depends = lib32-faudio + depends = fontconfig depends = lib32-fontconfig + depends = freetype2 depends = lib32-freetype2 + depends = gcc-libs depends = lib32-gcc-libs + depends = gettext depends = lib32-gettext + depends = glu depends = lib32-glu + depends = lcms2 depends = lib32-lcms2 + depends = libpcap depends = lib32-libpcap + depends = libsm depends = lib32-libsm + depends = libxcursor depends = lib32-libxcursor + depends = libxdamage depends = lib32-libxdamage + depends = libxi depends = lib32-libxi + depends = libxml2 depends = lib32-libxml2 + depends = libxrandr depends = lib32-libxrandr optdepends = alsa-lib + optdepends = lib32-alsa-lib optdepends = alsa-plugins + optdepends = lib32-alsa-plugins optdepends = dosbox optdepends = giflib + optdepends = lib32-giflib optdepends = gnutls + optdepends = lib32-gnutls optdepends = gsm + optdepends = lib32-gsm optdepends = gst-plugins-base + optdepends = lib32-gst-plugins-base optdepends = gst-plugins-base-libs + optdepends = lib32-gst-plugins-base-libs optdepends = gst-plugins-good + optdepends = lib32-gst-plugins-good optdepends = libcups + optdepends = lib32-libcups optdepends = libgphoto2 + optdepends = lib32-libgphoto2 optdepends = libjpeg-turbo + optdepends = lib32-libjpeg-turbo optdepends = libldap + optdepends = lib32-libldap optdepends = libpng + optdepends = lib32-libpng optdepends = libpulse + optdepends = lib32-libpulse optdepends = libxcomposite + optdepends = lib32-libxcomposite optdepends = libxinerama + optdepends = lib32-libxinerama optdepends = libxslt + optdepends = lib32-libxslt optdepends = mpg123 + optdepends = lib32-mpg123 optdepends = ncurses + optdepends = lib32-ncurses optdepends = ocl-icd + optdepends = lib32-ocl-icd optdepends = openal + optdepends = lib32-openal optdepends = samba optdepends = sane optdepends = sdl2 - optdepends = v4l-utils - optdepends = vkd3d - optdepends = vulkan-icd-loader - optdepends = lib32-alsa-lib - optdepends = lib32-alsa-plugins - optdepends = lib32-giflib - optdepends = lib32-gnutls - optdepends = lib32-gst-plugins-base - optdepends = lib32-gst-plugins-base-libs - optdepends = lib32-gst-plugins-good - optdepends = lib32-libcups - optdepends = lib32-libjpeg-turbo - optdepends = lib32-libldap - optdepends = lib32-libpng - optdepends = lib32-libpulse - optdepends = lib32-libxcomposite - optdepends = lib32-libxinerama - optdepends = lib32-libxslt - optdepends = lib32-mpg123 - optdepends = lib32-ncurses - optdepends = lib32-ocl-icd - optdepends = lib32-openal optdepends = lib32-sdl2 + optdepends = v4l-utils optdepends = lib32-v4l-utils + optdepends = vkd3d optdepends = lib32-vkd3d + optdepends = vulkan-icd-loader optdepends = lib32-vulkan-icd-loader - provides = wine=6.0.2 + optdepends = wine-mono + provides = wine=7.0rc6 + provides = wine-stable=7.0rc6 conflicts = wine + conflicts = wine-stable options = staticlibs - source = https://dl.winehq.org/wine/source/6.0/wine-6.0.2.tar.xz - source = https://dl.winehq.org/wine/source/6.0/wine-6.0.2.tar.xz.sign + source = https://dl.winehq.org/wine/source/7.0/wine-7.0-rc6.tar.xz + source = https://dl.winehq.org/wine/source/7.0/wine-7.0-rc6.tar.xz.sign source = 30-win32-aliases.conf source = wine-binfmt.conf - source = 0001-ldap-rename-ldap_connect-to-oldap_connect.patch validpgpkeys = DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D - b2sums = 176614736055892b7203313edc52e2926807c93b0bb97d59f65fbf284fd9cb138e4555fb7cd5a6c7c867367fdc50c89f12d7360ca0db947a7f04594f35f14775 + b2sums = ba7a1a58f6cc53f35c522f3c37959a88a7db8b73a6bbb9b9f40436a63758bd5d17ed964cb2ed69857a7a90f2a89c89cc1ce58aa771a02bb8be1c05ac37f25fcc b2sums = SKIP b2sums = 45db34fb35a679dc191b4119603eba37b8008326bd4f7d6bd422fbbb2a74b675bdbc9f0cc6995ed0c564cf088b7ecd9fbe2d06d42ff8a4464828f3c4f188075b b2sums = e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588 b2sums = b3ca0a31ee21f765a526729560a77a62f9e6a10a8a280d7cc6b5f8950542e99116ad26fcceeeb193bc0db92b85ab7d40da3777875f56b9370309993df1dc9a3e -pkgname = wine-stable +pkgname = wine-stable-next diff --git a/0001-ldap-rename-ldap_connect-to-oldap_connect.patch b/0001-ldap-rename-ldap_connect-to-oldap_connect.patch deleted file mode 100644 index bbfd24b7cdc1..000000000000 --- a/0001-ldap-rename-ldap_connect-to-oldap_connect.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 1e396aa28d74467107fd319b00ab96e75a4759e3 Mon Sep 17 00:00:00 2001 -From: Mike Swanson <mikeonthecomputer@gmail.com> -Date: Fri, 7 Jan 2022 14:59:22 -0800 -Subject: [PATCH] =?UTF-8?q?ldap:=20rename=20=E2=80=9Cldap=5Fconnect?= - =?UTF-8?q?=E2=80=9D=20to=20=E2=80=9Coldap=5Fconnect=E2=80=9D?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Avoids a symbol conflict introduced with OpenLDAP 2.6 - -It’s a bit of a brute-force solution compared to cherry-picking -upstream Wine fixes, but the latter do not apply cleanly and 7.0 is -around the corner. This’ll work for now unless 6.0.3 somehow happens -before 7.0. - -Thanks to lilac on the AUR for wine-valve for the patch, 739f2caa0c -for reporting it to me. ---- - dlls/adsldp/adsldp.c | 2 +- - dlls/wldap32/init.c | 4 ++-- - dlls/wldap32/tests/parse.c | 4 ++-- - dlls/wldap32/winldap_private.h | 2 +- - dlls/wldap32/wldap32.spec | 2 +- - 5 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c -index 13bd73c1296..b3b0afb989c 100644 ---- a/dlls/adsldp/adsldp.c -+++ b/dlls/adsldp/adsldp.c -@@ -1021,7 +1021,7 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B - goto fail; - } - -- err = ldap_connect(ld, NULL); -+ err = oldap_connect(ld, NULL); - if (err != LDAP_SUCCESS) - { - hr = HRESULT_FROM_WIN32(map_ldap_error(err)); -diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c -index afaef3b52f2..854c76f0d7c 100644 ---- a/dlls/wldap32/init.c -+++ b/dlls/wldap32/init.c -@@ -305,7 +305,7 @@ exit: - } - - /*********************************************************************** -- * ldap_connect (WLDAP32.@) -+ * oldap_connect (WLDAP32.@) - * - * Connect to an LDAP server. - * -@@ -322,7 +322,7 @@ exit: - * The timeout parameter may be NULL in which case a default timeout - * value will be used. - */ --ULONG CDECL ldap_connect( WLDAP32_LDAP *ld, struct l_timeval *timeout ) -+ULONG CDECL oldap_connect( WLDAP32_LDAP *ld, struct l_timeval *timeout ) - { - TRACE( "(%p, %p)\n", ld, timeout ); - -diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c -index 9fdd4db03ad..78e041771ae 100644 ---- a/dlls/wldap32/tests/parse.c -+++ b/dlls/wldap32/tests/parse.c -@@ -159,7 +159,7 @@ static void test_ldap_bind_sA( void ) - return; - } - -- ret = ldap_connect( ld, NULL ); -+ ret = oldap_connect( ld, NULL ); - ok( !ret, "ldap_connect failed 0x%08x\n", ret ); - - ret = ldap_bind_sA( ld, (char *)"CN=read-only-admin,DC=example,DC=com", (char *)"password", LDAP_AUTH_SIMPLE ); -@@ -190,7 +190,7 @@ static void test_ldap_server_control( void ) - return; - } - -- ret = ldap_connect( ld, NULL ); -+ ret = oldap_connect( ld, NULL ); - ok( !ret, "ldap_connect failed 0x%08x\n", ret ); - - /* test setting a not supported server control */ -diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h -index 69035050961..ba3400b9cd3 100644 ---- a/dlls/wldap32/winldap_private.h -+++ b/dlls/wldap32/winldap_private.h -@@ -320,7 +320,7 @@ ULONG CDECL ldap_compare_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct WLDAP32_b - ULONG CDECL ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*); - ULONG CDECL ldap_compare_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR); - ULONG CDECL ldap_compare_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR); --ULONG CDECL ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*); -+ULONG CDECL oldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*); - WLDAP32_LDAP * CDECL ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); - ULONG CDECL ldap_control_freeA(LDAPControlA*); - ULONG CDECL ldap_control_freeW(LDAPControlW*); -diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec -index 8a8e29fc198..5598b134b11 100644 ---- a/dlls/wldap32/wldap32.spec -+++ b/dlls/wldap32/wldap32.spec -@@ -75,7 +75,7 @@ - 85 cdecl ldap_compare_ext_sW(ptr wstr wstr wstr ptr ptr ptr) - 86 cdecl ldap_compare_sA(ptr str str str) - 87 cdecl ldap_compare_sW(ptr wstr wstr wstr) -- 88 cdecl ldap_connect(ptr ptr) -+ 88 cdecl oldap_connect(ptr ptr) - 89 cdecl ldap_control_free(ptr) ldap_control_freeA - 90 cdecl ldap_control_freeA(ptr) - 91 cdecl ldap_control_freeW(ptr) --- -2.34.1 - @@ -1,18 +1,18 @@ # Maintainer: Mike Swanson <mikeonthecomputer@gmail.com> -# Warning: If you are downgrading from the development branch (Wine ≥ 6.1, +# Warning: If you are downgrading from the development branch (Wine ≥ 7.1, # for example), your WINEPREFIX may break and experience unusual bugs. # Try to make a clean WINEPREFIX, such as by doing “rm -rf ~/.wine” -pkgname=wine-stable -pkgver=6.0.2 -pkgrel=2 +pkgname=wine-stable-next +_pkgver=7.0-rc6 +pkgver=${_pkgver/-/} +pkgrel=1 -source=(https://dl.winehq.org/wine/source/6.0/wine-$pkgver.tar.xz{,.sign} +source=(https://dl.winehq.org/wine/source/7.0/wine-$_pkgver.tar.xz{,.sign} 30-win32-aliases.conf - wine-binfmt.conf - 0001-ldap-rename-ldap_connect-to-oldap_connect.patch) -b2sums=('176614736055892b7203313edc52e2926807c93b0bb97d59f65fbf284fd9cb138e4555fb7cd5a6c7c867367fdc50c89f12d7360ca0db947a7f04594f35f14775' + wine-binfmt.conf) +b2sums=('ba7a1a58f6cc53f35c522f3c37959a88a7db8b73a6bbb9b9f40436a63758bd5d17ed964cb2ed69857a7a90f2a89c89cc1ce58aa771a02bb8be1c05ac37f25fcc' 'SKIP' '45db34fb35a679dc191b4119603eba37b8008326bd4f7d6bd422fbbb2a74b675bdbc9f0cc6995ed0c564cf088b7ecd9fbe2d06d42ff8a4464828f3c4f188075b' 'e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588' @@ -26,43 +26,97 @@ options=(staticlibs) license=(LGPL) install=wine.install -depends=(desktop-file-utils faudio fontconfig freetype2 glu lcms2 - libpcap libsm libxcursor libxdamage libxi libxml2 libxrandr - lib32-faudio lib32-fontconfig lib32-freetype2 lib32-gcc-libs - lib32-gettext lib32-glu lib32-lcms2 lib32-libpcap lib32-libsm - lib32-libxcursor lib32-libxdamage lib32-libxi lib32-libxml2 - lib32-libxrandr) - -makedepends=(alsa-lib fontforge giflib gnutls gsm - gst-plugins-base-libs libcups libgl libgphoto2 libldap libpng - libpulse libxcomposite libxinerama libxmu libxslt libxxf86vm mesa - mingw-w64-gcc mpg123 ncurses ocl-icd openal opencl-headers perl - samba sane sdl2 v4l-utils vkd3d vulkan-headers vulkan-icd-loader - lib32-alsa-lib lib32-giflib lib32-gnutls lib32-gst-plugins-base-libs - lib32-libcups lib32-libgl lib32-libldap lib32-libpng lib32-libpulse - lib32-libxcomposite lib32-libxinerama lib32-libxmu lib32-libxslt - lib32-libxxf86vm lib32-mesa lib32-mpg123 lib32-ncurses lib32-ocl-icd - lib32-openal lib32-sdl2 lib32-v4l-utils lib32-vkd3d - lib32-vulkan-icd-loader) - -optdepends=(alsa-lib alsa-plugins dosbox giflib gnutls gsm - gst-plugins-base gst-plugins-base-libs gst-plugins-good libcups - libgphoto2 libjpeg-turbo libldap libpng libpulse libxcomposite - libxinerama libxslt mpg123 ncurses ocl-icd openal samba sane sdl2 - v4l-utils vkd3d vulkan-icd-loader lib32-alsa-lib lib32-alsa-plugins - lib32-giflib lib32-gnutls lib32-gst-plugins-base - lib32-gst-plugins-base-libs lib32-gst-plugins-good lib32-libcups - lib32-libjpeg-turbo lib32-libldap lib32-libpng lib32-libpulse - lib32-libxcomposite lib32-libxinerama lib32-libxslt lib32-mpg123 - lib32-ncurses lib32-ocl-icd lib32-openal lib32-sdl2 lib32-v4l-utils - lib32-vkd3d lib32-vulkan-icd-loader) - -provides=("wine=$pkgver") -conflicts=("wine") +depends=( + desktop-file-utils + faudio lib32-faudio + fontconfig lib32-fontconfig + freetype2 lib32-freetype2 + gcc-libs lib32-gcc-libs + gettext lib32-gettext + glu lib32-glu + lcms2 lib32-lcms2 + libpcap lib32-libpcap + libsm lib32-libsm + libxcursor lib32-libxcursor + libxdamage lib32-libxdamage + libxi lib32-libxi + libxml2 lib32-libxml2 + libxrandr lib32-libxrandr +) + +makedepends=( + alsa-lib lib32-alsa-lib + fontforge + giflib lib32-giflib + gnutls lib32-gnutls + gsm lib32-gsm + gst-plugins-base-libs lib32-gst-plugins-base-libs + libcups lib32-libcups + libgphoto2 lib32-libgphoto2 + libjpeg-turbo lib32-libjpeg-turbo + libldap lib32-libldap + libpng lib32-libpng + libpulse lib32-libpulse + libxcomposite lib32-libxcomposite + libxinerama lib32-libxinerama + libxmu lib32-libxmu + libxslt lib32-libxslt + libxxf86vm lib32-libxxf86vm + mesa lib32-mesa + mingw-w64-gcc + mpg123 lib32-mpg123 + ncurses lib32-ncurses + ocl-icd lib32-ocl-icd + openal lib32-openal + opencl-headers + perl + samba + sane + sdl2 lib32-sdl2 + v4l-utils lib32-v4l-utils + vkd3d lib32-vkd3d + vulkan-headers + vulkan-icd-loader lib32-vulkan-icd-loader +) + +optdepends=( + alsa-lib lib32-alsa-lib + alsa-plugins lib32-alsa-plugins + dosbox + giflib lib32-giflib + gnutls lib32-gnutls + gsm lib32-gsm + gst-plugins-base lib32-gst-plugins-base + gst-plugins-base-libs lib32-gst-plugins-base-libs + gst-plugins-good lib32-gst-plugins-good + libcups lib32-libcups + libgphoto2 lib32-libgphoto2 + libjpeg-turbo lib32-libjpeg-turbo + libldap lib32-libldap + libpng lib32-libpng + libpulse lib32-libpulse + libxcomposite lib32-libxcomposite + libxinerama lib32-libxinerama + libxslt lib32-libxslt + mpg123 lib32-mpg123 + ncurses lib32-ncurses + ocl-icd lib32-ocl-icd + openal lib32-openal + samba + sane + sdl2 lib32-sdl2 + v4l-utils lib32-v4l-utils + vkd3d lib32-vkd3d + vulkan-icd-loader lib32-vulkan-icd-loader + wine-mono +) + +provides=("wine=$pkgver" "wine-stable=$pkgver") +conflicts=("wine" "wine-stable") prepare() { # Allow ccache to work - mv wine-$pkgver wine + mv wine-$_pkgver wine for patch in *.patch; do if [ ! -f "$patch" ]; then @@ -78,6 +132,9 @@ prepare() { sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i wine/configure* + # Fix openldap 2.5+ detection + sed 's/-lldap_r/-lldap/' -i wine/configure + # Get rid of old build dirs rm -rf wine-{32,64}-build mkdir wine-{32,64}-build |