Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 516040 Details for
Bug 644748
[Prefix/Cygwin] Qt5 (5.9.3) Cygwin support patches
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
QtGui specific patches to build and install on cygwin
qtgui-5.9.3-fix_build_on_cygwin_prefix.patch (text/plain), 6.57 KB, created by
Sven Eden
on 2018-01-23 10:44:43 UTC
(
hide
)
Description:
QtGui specific patches to build and install on cygwin
Filename:
MIME Type:
Creator:
Sven Eden
Created:
2018-01-23 10:44:43 UTC
Size:
6.57 KB
patch
obsolete
># ===================================================================== ># === Patches specific to qtgui === ># ===================================================================== >--- a/src/gui/kernel/qwindowsysteminterface.cpp 2018-01-18 11:58:44.277904900 +0100 >+++ b/src/gui/kernel/qwindowsysteminterface.cpp 2018-01-18 11:58:44.621658000 +0100 >@@ -739,6 +739,7 @@ > QGuiApplicationPrivate::processWindowSystemEvent(&e); > } > >+Q_GUI_EXPORT > void QWindowSystemInterfacePrivate::TabletEvent::setPlatformSynthesizesMouse(bool v) > { > platformSynthesizesMouse = v; >--- a/src/platformsupport/eventdispatchers/eventdispatchers.pro 2018-01-18 11:58:44.324783200 +0100 >+++ b/src/platformsupport/eventdispatchers/eventdispatchers.pro 2018-01-18 11:58:44.621658000 +0100 >@@ -26,7 +26,7 @@ > qtConfig(glib) { > SOURCES += qeventdispatcher_glib.cpp > HEADERS += qeventdispatcher_glib_p.h >- QMAKE_USE_PRIVATE += glib >+ QMAKE_USE += glib > } > > load(qt_module) >--- a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri 2018-01-18 11:58:44.387282300 +0100 >+++ b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri 2018-01-18 11:58:44.621658000 +0100 >@@ -3,4 +3,4 @@ > SOURCES += $$PWD/qfontconfigdatabase.cpp \ > $$PWD/qfontenginemultifontconfig.cpp > >-QMAKE_USE_PRIVATE += fontconfig >+QMAKE_USE += fontconfig >--- a/src/platformsupport/fontdatabases/freetype/freetype.pri 2018-01-18 11:58:44.449823900 +0100 >+++ b/src/platformsupport/fontdatabases/freetype/freetype.pri 2018-01-18 11:58:44.637315800 +0100 >@@ -6,4 +6,4 @@ > $$PWD/qfreetypefontdatabase.cpp \ > $$PWD/qfontengine_ft.cpp > >-QMAKE_USE_PRIVATE += freetype >+QMAKE_USE += freetype >--- a/src/platformsupport/services/genericunix/qgenericunixservices.cpp 2018-01-18 11:58:44.885577200 +0100 >+++ b/src/platformsupport/services/genericunix/qgenericunixservices.cpp 2018-01-18 11:58:44.994972600 +0100 >@@ -61,13 +61,16 @@ > { > const QByteArray xdgCurrentDesktop = qgetenv("XDG_CURRENT_DESKTOP"); > if (!xdgCurrentDesktop.isEmpty()) >- return xdgCurrentDesktop.toUpper(); // KDE, GNOME, UNITY, LXDE, MATE, XFCE... >+ return xdgCurrentDesktop.contains("GNOME") ? "GNOME" // GNOME, GNOME Classic, GNOME Flashback >+ : xdgCurrentDesktop.toUpper(); // KDE, UNITY, LXDE, MATE, XFCE... > > // Classic fallbacks > if (!qEnvironmentVariableIsEmpty("KDE_FULL_SESSION")) > return QByteArrayLiteral("KDE"); > if (!qEnvironmentVariableIsEmpty("GNOME_DESKTOP_SESSION_ID")) > return QByteArrayLiteral("GNOME"); >+ if (!qEnvironmentVariableIsEmpty("MATE_DESKTOP_SESSION_ID")) >+ return QByteArrayLiteral("MATE"); > > // Fallback to checking $DESKTOP_SESSION (unreliable) > QByteArray desktopSession = qgetenv("DESKTOP_SESSION"); >@@ -127,8 +130,13 @@ > browser->append(QLatin1String(" exec")); > return true; > } >- } else if (desktop == QByteArray("GNOME")) { >- if (checkExecutable(QStringLiteral("gnome-open"), browser)) >+ } else if (desktop == QByteArray("GNOME") || >+ desktop == QByteArray("LXDE") || >+ desktop == QByteArray("LXQT") || >+ desktop == QByteArray("MATE") || >+ desktop == QByteArray("X-CINNAMON") || >+ desktop == QByteArray("XFCE")) { >+ if (checkExecutable(QStringLiteral("gvfs-open"), browser)) > return true; > } > >--- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp 2018-01-18 11:58:44.932441500 +0100 >+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp 2018-01-18 11:58:44.994972600 +0100 >@@ -212,6 +212,8 @@ > QVariant QGenericUnixTheme::themeHint(ThemeHint hint) const > { > switch (hint) { >+ case QPlatformTheme::SystemIconThemeName: >+ return QVariant(QString(QStringLiteral("oxygen"))); > case QPlatformTheme::SystemIconFallbackThemeName: > return QVariant(QString(QStringLiteral("hicolor"))); > case QPlatformTheme::IconThemeSearchPaths: >@@ -848,6 +850,7 @@ > QList<QByteArray> gtkBasedEnvironments; > gtkBasedEnvironments << "GNOME" > << "X-CINNAMON" >+ << "X-CYGWIN" > << "UNITY" > << "MATE" > << "XFCE" >@@ -859,6 +862,8 @@ > result.push_back(QLatin1String(QKdeTheme::name)); > #endif > } else if (gtkBasedEnvironments.contains(desktopName)) { >+ if (desktopEnvironment == "GNOME") >+ result.push_back(QStringLiteral("qgnomeplatform")); > // prefer the GTK3 theme implementation with native dialogs etc. > result.push_back(QStringLiteral("gtk3")); > // fallback to the generic Gnome theme if loading the GTK3 theme fails >--- a/src/platformsupport/themes/themes.pro 2018-01-18 11:58:44.496690600 +0100 >+++ b/src/platformsupport/themes/themes.pro 2018-01-18 11:58:44.637315800 +0100 >@@ -1,7 +1,7 @@ > TARGET = QtThemeSupport > MODULE = theme_support > >-QT = core-private gui-private >+QT = core-private gui-private dbus-private > CONFIG += static internal_module > > DEFINES += QT_NO_CAST_FROM_ASCII >--- a/src/plugins/platforms/offscreen/offscreen.pro 2018-01-18 11:58:44.559158000 +0100 >+++ b/src/plugins/platforms/offscreen/offscreen.pro 2018-01-18 11:58:44.637315800 +0100 >@@ -21,6 +21,7 @@ > SOURCES += qoffscreenintegration_x11.cpp > HEADERS += qoffscreenintegration_x11.h > QT += glx_support-private >+ LIBS_PRIVATE += -lX11 > system(echo "Using X11 offscreen integration with GLX") > } else { > SOURCES += qoffscreenintegration_dummy.cpp >--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp 2018-01-18 11:58:42.516304200 +0100 >+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp 2018-01-18 11:58:42.594452600 +0100 >@@ -580,7 +580,7 @@ > #if QT_CONFIG(library) > extern const QString qt_gl_library_name(); > // QLibrary lib(qt_gl_library_name()); >- QLibrary lib(QLatin1String("GL")); >+ QLibrary lib(QLatin1String("GL"), 1); > glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); > #endif > } >--- a/src/plugins/platforms/xcb/qxcbscreen.h 2018-01-19 08:21:39.101519900 +0100 >+++ b/src/plugins/platforms/xcb/qxcbscreen.h 2018-01-19 08:21:39.117101300 +0100 >@@ -212,7 +212,7 @@ > }; > > #ifndef QT_NO_DEBUG_STREAM >-Q_GUI_EXPORT QDebug operator<<(QDebug, const QXcbScreen *); >+Q_XCB_EXPORT QDebug operator<<(QDebug, const QXcbScreen *); > #endif > > QT_END_NAMESPACE
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 644748
:
515030
|
515034
|
515138
|
515302
|
515304
|
515306
|
516034
|
516036
| 516040 |
516042
|
516538
|
520668