wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

winex11-Limited_Resolutions: Temporarily disable patchset.

Browse Source 
The patchset itself should be fine, but statically linking against libXNVCtrl
might be problematic because of the different license. Moreover, on Debian it
is even a bit more complicated because a dynamic library is provided. Since we
do not want to have a fixed dependency on Nvidia-specific packages (winex11
would depend on it) we will have to investigate this a bit more...
This commit is contained in:
Sebastian Lackner 2015-03-07 21:26:33 +01:00
parent fa3bf612ea
commit 8afa18829a
4 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -38,7 +38,7 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
===================================
**Bugfixes and features included in the next upcoming release [20]:**
**Bugfixes and features included in the next upcoming release [19]:**
* Add stub for gdiplus.GdipCreateEffect ([Wine Bug #32163](https://bugs.winehq.org/show_bug.cgi?id=32163))
* Add support for CopyFileEx progress callback ([Wine Bug #22692](https://bugs.winehq.org/show_bug.cgi?id=22692))
@ -57,7 +57,6 @@ Included bug fixes and improvements
* Process APC calls before starting process
* Process Hacker 2.x needs ntoskrnl.ProbeForRead ([Wine Bug #38103](https://bugs.winehq.org/show_bug.cgi?id=38103))
* Properly track handle count of wineserver objects
* Some NVIDIA cards report fake refresh rates ([Wine Bug #34348](https://bugs.winehq.org/show_bug.cgi?id=34348))
* Support for GetFinalPathNameByHandle ([Wine Bug #34851](https://bugs.winehq.org/show_bug.cgi?id=34851))
* Support for shell32 file operation progress dialog

1
debian/control vendored
View File

@ -63,7 +63,6 @@ Build-Depends: autotools-dev,
libxxf86vm-dev,
linux-kernel-headers,
linux-libc-dev,
nvidia-settings,
prelink,
quilt (>= 0.46-7~),
sharutils,

21
patches/patchinstall.sh
View File

@ -210,7 +210,6 @@ patch_enable_all ()
enable_winepulse_PulseAudio_Support="$1"
enable_winex11_CandidateWindowPos="$1"
enable_winex11_Clipboard_HTML="$1"
enable_winex11_Limited_Resolutions="$1"
enable_winex11_Thread_Data="$1"
enable_winex11_Window_Groups="$1"
enable_winex11_Window_Style="$1"
@ -674,9 +673,6 @@ patch_enable ()
winex11-Clipboard_HTML)
enable_winex11_Clipboard_HTML="$2"
;;
winex11-Limited_Resolutions)
enable_winex11_Limited_Resolutions="$2"
;;
winex11-Thread_Data)
enable_winex11_Thread_Data="$2"
;;
@ -4164,23 +4160,6 @@ if test "$enable_winex11_Clipboard_HTML" -eq 1; then
) >> "$patchlist"
fi
# Patchset winex11-Limited_Resolutions
# |
# | This patchset fixes the following Wine bugs:
# | * [#34348] Some NVIDIA cards report fake refresh rates
# |
# | Modified files:
# | * configure.ac, dlls/winex11.drv/xrandr.c
# |
if test "$enable_winex11_Limited_Resolutions" -eq 1; then
patch_apply winex11-Limited_Resolutions/0001-winex11-Display-a-helpful-warning-when-Dynamic-TwinV.patch
patch_apply winex11-Limited_Resolutions/0002-winex11-Return-the-actual-refresh-rate-for-NVIDIA-ca.patch
(
echo '+ { "Erich E. Hoover", "winex11: Display a helpful warning when Dynamic TwinView is enabled.", 1 },';
echo '+ { "Erich E. Hoover", "winex11: Return the actual refresh rate for NVIDIA cards with Dynamic TwinView enabled.", 1 },';
) >> "$patchlist"
fi
# Patchset winex11-Thread_Data
# |
# | This patchset fixes the following Wine bugs:

3
patches/winex11-Limited_Resolutions/definition
View File

@ -1 +1,2 @@
Fixes: [34348] Some NVIDIA cards report fake refresh rates
# Fixes: [34348] Some NVIDIA cards report fake refresh rates
Disabled: true