Djam/wine
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/wine.git synced 2025-02-23 14:22:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 4.21 and 4.0.3

Browse source
This commit is contained in:
survolog (Andrey Grigorev) 2019-12-08 20:59:43 +03:00
parent 7f0e28f5f2
commit 5b8ebb3157
24 changed files with 10219 additions and 4309 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.abf.yml
View file

@ -1,2 +1,8 @@
sources:
"wine-1.3.24.tar.bz2": cc0dfc2255d1bc19e1975e5e2f680740d9c2825a
icons-4.0.tar.xz: 3063b6fcf8d9aeedcb9ecaab9c522bed88a21c0a
rosa-wine-desktop-4.4.1.tar.xz: 299d6a589af1e4db705f0e09190a8b388bb74b95
wine-4.0.3.tar.xz: c8d19a0ee0cb7b5f9b45ef4b8441990b8976dcf8
wine-4.21.tar.xz: 903d4929d5fa5a7b3a4fe33d56b02002f8666764
wine-nine-standalone-0.5.tar.gz: 7d24bac66d34493a725b1c47d7570daf60788532
wine-staging-4.21.tar.gz: a289297bd5f0a56136c5e3bf9bb87f171c3393a6
winetricks-20190912.tar.gz: a0c16b95757bbe67c23ddcf5cb22b1ada69ac914

5
README.install.urpmi.i586.stable Normal file
View file

@ -0,0 +1,5 @@
This is an optional Wine package for running Win32 applications.
=== Russian ===
Это дополнительный пакет Wine для запуска Win32 приложений.

5
README.install.urpmi.i586.staging Normal file
View file

@ -0,0 +1,5 @@
This is an optional Wine package with Staging patches for running Win32 applications.
=== Russian ===
Это дополнительный пакет Wine с патчами Staging для запуска Win32 приложений.

9
README.install.urpmi.x86_64.stable Normal file
View file

@ -0,0 +1,9 @@
This is Wine for running Win64 applications. This version can only be used to
run 64-bit Windows applications as is. For running 32-bit Windows applications,
you need to also install the 'wine32-stable' package from the 32-bit repository.
=== Russian ===
Это Wine для запуска Win64 приложений. Эта версия может запускать только
64-bit Windows приложения. Для запуска 32-bit Windows приложений Вам требуется
установить также и пакет 'wine32-stable' из 32-bit репозитория.

11
README.install.urpmi.x86_64.staging Normal file
View file

@ -0,0 +1,11 @@
This is Wine with Staging patches for running Win64 applications.
This version can only be used to run 64-bit Windows applications as is.
For running 32-bit Windows applications, you need to also install
the 'wine32' package from the 32-bit repository.
=== Russian ===
Это Wine с патчами Staging для запуска Win64 приложений.
Эта версия может запускать только 64-bit Windows приложения.
Для запуска 32-bit Windows приложений Вам требуется
установить также и пакет 'wine32' из 32-bit репозитория.

21
README.urpmi Normal file
View file

@ -0,0 +1,21 @@
To install or update DXVK (DirectX10/DX11->Vulkan) in Wine
run in a terminal:
winetricks --force dxvk96
or (latest, untested):
winetricks --force dxvk
To configure Gallium Nine D3D9 run in a terminal:
wine ninewinecfg
or (for disable)
wine ninewinecfg -d
=== Russian ===
Для установки или обновления DXVK (DirectX10/DX11->Vulkan) в Wine
запустите в терминале:
winetricks --force dxvk96
или (последнее, непроверенное):
winetricks --force dxvk
Для настройки Gallium Nine D3D9 запустите в терминале:
wine ninewinecfg
или (для выключения)
wine ninewinecfg -d

5
mandriva-wine.directory Normal file
View file

@ -0,0 +1,5 @@
[Desktop Entry]
Name=Wine
Icon=wine
Type=Directory

19
mandriva-wine.menu Normal file
View file

@ -0,0 +1,19 @@
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
<Menu>
<Name>Applications</Name>
<Menu>
<Name>Tools</Name>
<Menu>
<Name>Emulators</Name>
<Menu>
<Name>Wine</Name>
<Directory>mandriva-%{name}.directory</Directory>
<Include>
<Category>X-MandrivaLinux-MoreApplications-Emulators-Wine</Category>
</Include>
</Menu>
</Menu>
</Menu>
</Menu>

11
wine-1.0-rc3-fix-conflicts-with-openssl.patch
View file

@ -1,11 +0,0 @@
diff -u dlls/wininet/internet.h.orig dlls/wininet/internet.h
--- dlls/wininet/internet.h.orig 2008-05-30 16:41:29.000000000 +0200
+++ dlls/wininet/internet.h 2008-06-01 22:45:28.000000000 +0200
@@ -45,6 +45,7 @@
#undef PKCS7_SIGNER_INFO
#undef X509_NAME
#undef X509_CERT_PAIR
+#undef X509_EXTENSIONS
# include <openssl/ssl.h>
#undef FAR
#define FAR do_not_use_this_in_wine

13
wine-1.1.7-chinese-font-substitutes.patch
View file

@ -1,13 +0,0 @@
--- tools/wine.inf.in.orig 2008-10-29 06:43:52.000000000 +0100
+++ tools/wine.inf.in 2008-10-29 06:44:00.000000000 +0100
@@ -297,7 +297,10 @@
HKLM,%FontSubStr%,"Courier New TUR,162",,"Courier New,162"
HKLM,%FontSubStr%,"Helv",,"MS Sans Serif"
HKLM,%FontSubStr%,"Helvetica",,"Arial"
+HKLM,%FontSubStr%,"MingLiU","AR PL Uming TW"
HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Tahoma"
+HKLM,%FontSubStr%,"PMingLiU","AR PL Uming TW"
+HKLM,%FontSubStr%,"Simsun","AR PL UMing CN"
HKLM,%FontSubStr%,"Times",,"Times New Roman"
HKLM,%FontSubStr%,"Times New Roman Baltic,186",,"Times New Roman,186"
HKLM,%FontSubStr%,"Times New Roman CE,238",,"Times New Roman,238"

7
wine-1.3.24.tar.bz2.sign
View file

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAk4XTokACgkQ9ebp7rlGHdfS6wCgwKAuSKL6PjD/ivi/t6xip3hu
tcMAoNWk1LkVQ34XEiWIeQZ9nV7Oqkli
=oaEB
-----END PGP SIGNATURE-----

21
wine-mdkconf.patch → wine-3.16-mdkconf.patch
View file

@ -1,13 +1,11 @@
Index: wine-1.0-rc1/dlls/ntdll/server.c
===================================================================
--- wine-1.0-rc1/dlls/ntdll/server.c
+++ wine-1.0-rc1/dlls/ntdll/server.c 2008-05-13 23:02:38.000000000 +0300
@@ -772,6 +772,19 @@
mkdir( "drive_c", 0777 );
diff -rupN wine-3.16.old/dlls/ntdll/server.c wine-3.16/dlls/ntdll/server.c
--- wine-3.16.old/dlls/ntdll/server.c 2018-09-14 21:19:10.000000000 +0200
+++ wine-3.16/dlls/ntdll/server.c 2018-09-17 16:58:46.116353880 +0200
@@ -1165,6 +1165,19 @@ static int setup_config_dir(void)
symlink( "../drive_c", "dosdevices/c:" );
symlink( "/", "dosdevices/z:" );
+
+ /* Mandriva specific */
+ /* Mandriva specific */
+#if @MDKVERSION@ >= 200810
+ symlink( "/media/floppy", "dosdevices/a:" );
+#elif @MDKVERSION@ >= 200800
@ -19,6 +17,7 @@ Index: wine-1.0-rc1/dlls/ntdll/server.c
+#endif
+ symlink( getenv( "HOME" ), "dosdevices/d:" );
+ symlink( "/dev/ttyUSB0", "dosdevices/com4" );
}
+
done:
if (fd_cwd == -1) fd_cwd = open( "dosdevices/c:", O_RDONLY );
fcntl( fd_cwd, F_SETFD, FD_CLOEXEC );

46
wine-3.6-staging-ru-localization.patch Normal file
View file

@ -0,0 +1,46 @@
diff -ur wine-3.6/po/ru.po wine-3.6_patched/po/ru.po
--- wine-3.6/po/ru.po 2018-04-13 23:52:23.000000000 +0300
+++ wine-3.6_patched/po/ru.po 2018-04-15 13:13:40.342277991 +0300
@@ -14438,6 +14438,42 @@
msgid "Menu Bar"
msgstr "Плоское меню - фон"
+#: winecfg.rc:131
+msgid "Staging settings"
+msgstr "Настройки Staging"
+
+#: winecfg.rc:132
+msgid ""
+"The following settings are experimental and may break stuff!\n"
+"Make sure to reset them again in case of a problem."
+msgstr ""
+"Следующие настройки являются экспериментальными!\n"
+"Попробуйте отключить их в случае возникновения проблем"
+
+#: winecfg.rc:133
+msgid "Enable &CSMT for better graphic performance (deprecated)"
+msgstr "Использовать CSMT для ускорения работы (устарело)"
+
+#: winecfg.rc:134
+msgid "Enable &VAAPI as backend for DXVA2 GPU decoding"
+msgstr "Включить VAAPI для GPU-ускорения проигрывания видео"
+
+#: winecfg.rc:135
+msgid "Enable Environmental Audio E&xtensions (EAX)"
+msgstr "Включить EAX (улучшение для звука)"
+
+#: winecfg.rc:136
+msgid "&Hide Wine version from applications"
+msgstr "Скрыть версию Wine от приложений"
+
+#: winecfg.rc:137
+msgid "Enable &GTK3 Theming"
+msgstr "Включить GTK3 тему"
+
+#: winecfg.rc:138
+msgid "Enable Gallium &Nine for better D3D9 graphic performance"
+msgstr "Использовать Gallium Nine для D3D9 ускорения"
+
#: wineconsole.rc:63
msgid "Cursor size"
msgstr "Размер курсора"

47
wine-nine-standalone-0.3-ru-localization.patch Normal file
View file

@ -0,0 +1,47 @@
diff -Naur wine-nine-standalone-0.3/ninewinecfg/ninewinecfg.rc wine-nine-standalone-0.3_patched/ninewinecfg/ninewinecfg.rc
--- wine-nine-standalone-0.3/ninewinecfg/ninewinecfg.rc 2019-02-22 09:05:53.000000000 +0300
+++ wine-nine-standalone-0.3_patched/ninewinecfg/ninewinecfg.rc 2019-03-25 00:35:25.910858949 +0300
@@ -18,6 +18,7 @@
#include "nls/deu.rc"
#include "nls/fra.rc"
#include "nls/hun.rc"
+#include "nls/rus.rc"
IDD_ABOUT DIALOG 0, 0, 260, 196
STYLE WS_CHILD | WS_DISABLED
diff -Naur wine-nine-standalone-0.3/ninewinecfg/nls/rus.rc wine-nine-standalone-0.3_patched/ninewinecfg/nls/rus.rc
--- wine-nine-standalone-0.3/ninewinecfg/nls/rus.rc 1970-01-01 03:00:00.000000000 +0300
+++ wine-nine-standalone-0.3_patched/ninewinecfg/nls/rus.rc 2019-03-25 00:37:57.912817484 +0300
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright 2019 Andrey Grigorev
+ */
+
+#pragma code_page(65001) /* UTF-8 */
+
+STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA
+BEGIN
+ IDS_TAB_MAIN "Настройки"
+ IDS_TAB_ABOUT "О программе"
+
+ IDS_GB_LICENSE "Лицензия"
+ IDS_GB_AUTHORS "Авторы"
+ IDS_TEXT_MESA_DEP "Gallium Nine требует графический драйвер Mesa"
+
+ IDS_TEXT_LOAD_D3DADAPTER "Загрузка d3d9adapter9 выполнена"
+ IDS_TEXT_D3D9_NINE_LOAD "d3d9-nine.dll загружен"
+ IDS_TEXT_CREATE_D3D9_DEV "Создание Direct3D 9 устройства выполнено"
+
+ IDS_BTN_ENABLE_NINE "Использовать &Gallium Nine для D3D9 ускорения"
+
+ IDS_GB_NINE_SETTINGS "Настройки Gallium Nine"
+ IDS_GB_INSTALL_STATE "Статус установки"
+
+ IDS_NINECFG_TITLE "Настройки Nine"
+
+ IDS_ERR_UNKNOWN "Неизвестная ошибка"
+ IDS_ERR_OUTOFMEMORY "Нехватка памяти"
+ IDS_ERR_D3D_NOTAVAILABLE "Не найден совместимый GPU. При настройке гибридной графики может потребоваться выставить DRI_PRIME=1"
+END
+

11
wine-stable.rpmlintrc Normal file
View file

@ -0,0 +1,11 @@
addFilter("E: executable-in-library-package")
addFilter("E: non-versioned-file-in-library-package")
addFilter("E: incoherent-version-in-name")
# Intentional - linking to Linux libc would cause symbol clashes with MS libc
addFilter("E: library-not-linked-against-libc")
addFilter("E: explicit-lib-dependency")
# Required to decipher the abbreviation
addFilter("W: name-repeated-in-summary")
# No libs in there
addFilter("E: incoherent-version-in-name")
addFilter("E: invalid-spec-name")

39
wine-staging-4.5-mock-urpm-broken-pipe.patch Normal file
View file

@ -0,0 +1,39 @@
diff -ur wine-staging-4.5/patches/gitapply.sh wine-staging-4.5_patched/patches/gitapply.sh
--- wine-staging-4.5/patches/gitapply.sh 2019-03-30 08:02:54.000000000 +0300
+++ wine-staging-4.5_patched/patches/gitapply.sh 2019-03-31 14:34:17.458722634 +0300
@@ -309,6 +309,7 @@
patch_binary_size=""
tmpoffset=$((hdroffset - 1))
+ sed -n "$offset,$tmpoffset p" "$tmpfile" > patch_export.txt
while IFS= read -r line; do
if [ "$line" == "GIT binary patch" ]; then
patch_is_binary=1
@@ -332,7 +333,8 @@
patch_binary_size="${BASH_REMATCH[2]}"
fi
- done < <(sed -n "$offset,$tmpoffset p" "$tmpfile")
+ done < patch_export.txt
+ rm -f patch_export.txt
# Remove first path components, which are always a/ and b/ for git patches
if [[ "$patch_oldname" =~ ^a/(.*)$ ]]; then
@@ -426,6 +428,7 @@
patch_binary_complete=0
patch_binary_destsize=0
+ hexdump -v -e '32/1 "%02X" "\n"' "$delta_tmpfile" | gawk "$awk_decode_binarypatch" > patch_export.txt
while read cmd arg1 arg2; do
if [ "$cmd" == "S" ]; then
[ "$arg1" -eq "$(filesize "$patch_oldname")" ] || break
@@ -441,7 +444,8 @@
patch_binary_complete=1
else break; fi
- done < <(hexdump -v -e '32/1 "%02X" "\n"' "$delta_tmpfile" | gawk "$awk_decode_binarypatch")
+ done < patch_export.txt
+ rm -f patch_export.txt
rm "$delta_tmpfile"

0
wine.init Executable file → Normal file
View file

9
wine.rpmlintrc Normal file
View file

@ -0,0 +1,9 @@
addFilter("E: executable-in-library-package")
addFilter("E: non-versioned-file-in-library-package")
addFilter("E: incoherent-version-in-name")
# Intentional - linking to Linux libc would cause symbol clashes with MS libc
addFilter("E: library-not-linked-against-libc")
addFilter("E: explicit-lib-dependency")
# Required to decipher the abbreviation
addFilter("W: name-repeated-in-summary")

2165
wine.spec
View file

File diff suppressed because it is too large Load diff

5
wine.systemd Normal file
View file

@ -0,0 +1,5 @@
# Pre-PE Windows Executables
:windows:M::MZ::/usr/bin/wine:
# PE Windows Executables
:windowsPE:M::PE::/usr/bin/wine:

2669
winepulse-0.39.patch
View file

File diff suppressed because it is too large Load diff

60
winepulse-configure.ac-1.3.22.patch
View file

@ -1,60 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 2e20f24..fe07d5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]),
[if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
[if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
+AC_ARG_WITH(pulse, AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support]))
AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF]),
[if test "x$withval" = "xno"; then ac_cv_header_tiffio_h=no; fi])
@@ -1479,6 +1480,30 @@ then
CFLAGS="$save_CFLAGS"
fi
+dnl **** Check for PulseAudio ****
+AC_SUBST(PULSELIBS,"")
+AC_SUBST(PULSEINCL,"")
+if test "x$with_pulse" != "xno";
+then
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ if test "$PKG_CONFIG" != "false";
+ then
+ ac_pulse_libs="`$PKG_CONFIG --libs libpulse 2>/dev/null`"
+ ac_pulse_cflags="`$PKG_CONFIG --cflags-only-I libpulse 2>/dev/null`"
+
+ CPPFLAGS="$CPPFLAGS $ac_pulse_cflags"
+ AC_CHECK_HEADERS(pulse/pulseaudio.h,
+ [AC_CHECK_LIB(pulse, pa_stream_is_corked,
+ [AC_DEFINE(HAVE_PULSEAUDIO, 1, [Define if you have pulseaudio])
+ PULSELIBS="$ac_pulse_libs"
+ PULSEINCL="$ac_pulse_cflags"],,$ac_pulse_libs)
+ ])
+ fi
+ CPPFLAGS="$ac_save_CPPFLAGS"
+fi
+WINE_WARNING_WITH(pulse, [test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"],
+ [libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.])
+
dnl **** Check for gstreamer ****
if test "x$with_gstreamer" != "xno"
then
@@ -1693,7 +1718,7 @@ test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=$
test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
dnl **** Check for any sound system ****
-if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
+if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_lib_soname_jack" = "x" -a \
"x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
"x$with_alsa$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnononononono
then
@@ -2883,6 +2908,7 @@ WINE_CONFIG_DLL(winenas.drv)
WINE_CONFIG_DLL(wineoss.drv)
WINE_CONFIG_DLL(wineps.drv,,[install-lib])
WINE_CONFIG_DLL(wineps16.drv16,enable_win16)
+WINE_CONFIG_DLL(winepulse.drv)
WINE_CONFIG_DLL(wineqtdecoder)
WINE_CONFIG_DLL(winequartz.drv)
WINE_CONFIG_DLL(winex11.drv)

49
winepulse-winecfg-1.3.11.patch
View file

@ -1,49 +0,0 @@
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 4c90282..fcf3236 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -90,6 +90,7 @@ typedef struct
} AUDIO_DRIVER;
static AUDIO_DRIVER sAudioDrivers[] = {
+ {IDS_DRIVER_PULSE, "pulse"},
{IDS_DRIVER_ALSA, "alsa"},
{IDS_DRIVER_OSS, "oss"},
{IDS_DRIVER_COREAUDIO, "coreaudio"},
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index e402b4e..f0264ca 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -73,6 +73,7 @@ static const char * const builtin_only[] =
"winedos",
"winemp3.acm",
"wineps",
+ "winepulse.drv",
"winmm",
"wintab32",
"wnaspi32",
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 3bed6aa..2f347d9 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -186,7 +186,7 @@
#define IDS_ACCEL_BASIC 8302
#define IDS_ACCEL_EMULATION 8303
#define IDS_DRIVER_ALSA 8304
-
+#define IDS_DRIVER_PULSE 8305
#define IDS_DRIVER_ESOUND 8306
#define IDS_DRIVER_OSS 8307
#define IDS_DRIVER_JACK 8308
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index f98a14d..314bd65 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -97,6 +97,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
IDS_DRIVER_ALSA "ALSA Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"

9293
wisotool Normal file
View file

File diff suppressed because it is too large Load diff