cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SIGFPE when using Xvfb, backported from Qt 5.6

Browse Source 
OK dcoppa@
This commit is contained in:
jeremy 2016-09-23 15:22:49 +00:00
parent 859d2b2e45
commit f0198480e2
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/qt5/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.53 2016/09/23 09:16:58 sthen Exp $
# $OpenBSD: Makefile,v 1.54 2016/09/23 15:22:49 jeremy Exp $
USE_WXNEEDED = Yes # Qt5WebKit
@ -19,7 +19,7 @@ COMMENT-sqlite2 = SQLite 2.x plugin for Qt5
COMMENT-tds = TDS plugin for Qt5
PKGNAME-main = qt5-${VERSION}
REVISION-main = 2
REVISION-main = 3
PKGNAME-examples = qt5-examples-${VERSION}
REVISION-examples = 0
PKGNAME-html = qt5-html-${VERSION}

17
x11/qt5/patches/patch-qtbase_src_plugins_platforms_xcb_qxcbscreen_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-qtbase_src_plugins_platforms_xcb_qxcbscreen_cpp,v 1.1 2016/09/23 15:22:50 jeremy Exp $
Fix SIGFPE when using Xvfb, backported from Qt 5.6
(https://codereview.qt-project.org/#/c/140411/).
--- qtbase/src/plugins/platforms/xcb/qxcbscreen.cpp.ports.orig Tue Sep 20 15:49:42 2016
+++ qtbase/src/plugins/platforms/xcb/qxcbscreen.cpp Tue Sep 20 15:50:09 2016
@@ -544,7 +544,8 @@ void QXcbScreen::updateRefreshRate(xcb_randr_mode_t mo
for (; modesIter.rem; xcb_randr_mode_info_next(&modesIter)) {
xcb_randr_mode_info_t *modeInfo = modesIter.data;
if (modeInfo->id == mode) {
- m_refreshRate = modeInfo->dot_clock / (modeInfo->htotal * modeInfo->vtotal);
+ const uint32_t dotCount = modeInfo->htotal * modeInfo->vtotal;
+ m_refreshRate = (dotCount != 0) ? modeInfo->dot_clock / dotCount : 0;
m_mode = mode;
break;
}