Skip to content

Fixes related to QT5_GENTOO_CONFIG, QT_FEATURE_* macros, qconfig_p.h header#261

Open
Arfrever wants to merge 12 commits intogentoo:masterfrom
Arfrever:master
Open

Fixes related to QT5_GENTOO_CONFIG, QT_FEATURE_* macros, qconfig_p.h header#261
Arfrever wants to merge 12 commits intogentoo:masterfrom
Arfrever:master

Conversation

@Arfrever
Copy link
Contributor

@Arfrever Arfrever commented Sep 17, 2022

Fixes related to QT5_GENTOO_CONFIG, QT_FEATURE_* macros, qconfig_p.h header.

Problem was accidentally found during work on Qt 5.15.6 version bump (#260), but older versions are also affected.

In Qt 5.15.5:

$ grep -Er '(QT_CONFIG|QT_REQUIRE_CONFIG)\((dbus|dbus_linked)\)' *
src/gui/kernel/qguiapplication.cpp:#if QT_CONFIG(dbus)
src/gui/kernel/qguiapplication.cpp:#endif // QT_CONFIG(dbus)
src/platformsupport/services/genericunix/qgenericunixservices.cpp:#if QT_CONFIG(dbus)
src/platformsupport/services/genericunix/qgenericunixservices.cpp:#endif // QT_CONFIG(dbus)
src/platformsupport/services/genericunix/qgenericunixservices.cpp:#if QT_CONFIG(dbus)
src/platformsupport/services/genericunix/qgenericunixservices.cpp:#endif // QT_CONFIG(dbus)
src/platformsupport/services/genericunix/qgenericunixservices.cpp:#if QT_CONFIG(dbus)
src/platformsupport/services/genericunix/qgenericunixservices.cpp:#if QT_CONFIG(dbus)
src/platformsupport/services/genericunix/qgenericunixservices.cpp:#if QT_CONFIG(dbus)

Both src/gui and src/platformsupport are in QT5_TARGET_SUBDIRS in dev-qt/qtgui ebuilds.
Previously some D-Bus-dependent code was disabled even for dev-qt/qtgui[dbus].

src/platformsupport/services/genericunix/qgenericunixservices.cpp:

#if QT_CONFIG(dbus)
// These QtCore includes are needed for xdg-desktop-portal support
#include <QtCore/private/qcore_unix_p.h>

#include <QtCore/QFileInfo>
#include <QtCore/QUrlQuery>

#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusMessage>
#include <QtDBus/QDBusPendingCall>
#include <QtDBus/QDBusPendingCallWatcher>
#include <QtDBus/QDBusPendingReply>
#include <QtDBus/QDBusUnixFileDescriptor>

#include <fcntl.h>

#endif // QT_CONFIG(dbus)
...

Arfrever Frehtes Taifersar Arahesis added 12 commits September 16, 2022 00:00
dev-qt/qtdbus: Explicitly set components of elements of QT5_GENTOO_CO…
e7a1dba 
…NFIG.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
dev-qt/qtgui: Explicitly set components of elements of QT5_GENTOO_CON…
8cf3462 
…FIG.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
dev-qt/qtprintsupport: Explicitly set components of elements of QT5_G…
2123f77 
…ENTOO_CONFIG.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
dev-qt/qtwidgets: Explicitly set uppercase components of elements of …
f56fcdf 
…QT5_GENTOO_CONFIG.

Undocumented automatic uppercasing will be removed.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
dev-qt/qtwidgets: Pass flag -dbus-linked to configure.
cf5eb51 
This is consistent with dev-qt/qtdbus, dev-qt/qtgui, dev-qt/qtnetwork.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
qt5-build.eclass: Remove automatic uppercasing of macro component of …
30eee34 
…elements of QT5_GENTOO_CONFIG.

This will allow to support macros with lowercase letters such as QT_FEATURE_dbus.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
qt5-build.eclass: Clean parsing of QT5_GENTOO_CONFIG and QT5_GENTOO_P…
d2028db 
…RIVATE_CONFIG.

Remove automatic derivation of feature, macro components of elements of QT5_GENTOO_CONFIG.
Remove automatic derivation of feature component of elements of QT5_GENTOO_PRIVATE_CONFIG.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
qt5-build.eclass: Support QT_FEATURE_* macros in QT5_GENTOO_CONFIG.
786d9dd 
QT_FEATURE_* macros should have values -1 or 1, and are used by QT_CONFIG and QT_REQUIRE_CONFIG macros:
(https://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/global/qglobal.h?h=5.15)
[[[
/*
    The QT_CONFIG macro implements a safe compile time check for features of Qt.
    Features can be in three states:
        0 or undefined: This will lead to a compile error when testing for it
        -1: The feature is not available
        1: The feature is available
*/
#define QT_CONFIG(feature) (1/QT_FEATURE_##feature == 1)
#define QT_REQUIRE_CONFIG(feature) Q_STATIC_ASSERT_X(QT_FEATURE_##feature == 1, "Required feature " #feature " for file " __FILE__ " not available.")
]]]

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
dev-qt/qtdbus: Set QT_FEATURE_dbus and QT_FEATURE_dbus_linked macros.
edbae82 
This does not affect build of qtbase packages themselves, but will allow to fix value returned
by QT_CONFIG(dbus) and QT_CONFIG(dbus_linked) after installation.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
dev-qt/qtgui: Set QT_FEATURE_gui macro.
b5bf69c 
This does not affect build of qtbase packages themselves, but will allow to fix value returned
by QT_CONFIG(gui) after installation.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
dev-qt/qtwidgets: Set QT_FEATURE_widgets macro.
59bf5a5 
This does not affect build of qtbase packages themselves, but will allow to fix value returned
by QT_CONFIG(widgets) after installation.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
qt5-build.eclass: qt5_base_configure(): Copy generated qconfig_p.h to…
6a90fd7 
… appropriate directory.

configure (in all qtbase packages) generates:
  ${QT5_BUILD_DIR}/src/corelib/global/qconfig.h
  ${QT5_BUILD_DIR}/src/corelib/global/qconfig_p.h
  ${QT5_BUILD_DIR}/src/corelib/global/qconfig.cpp

qt5_qmake in src/corelib directory (run only in dev-qt/qtcore) generates:
  ${QT5_BUILD_DIR}/include/QtCore/qconfig.h with content:
    #include "../../src/corelib/global/qconfig.h"
  ${QT5_BUILD_DIR}/include/QtCore/${Qt_Version}/QtCore/private/qconfig_p.h with content:
    #include "../../../../../src/corelib/global/qconfig_p.h"

qconfig.h and qconfig_p.h define various macros with values possibly dependent on flags passed to configure.
Many of these macros are QT_FEATURE_*, which are usually used through QT_CONFIG macro.

/usr/include/qt5/QtCore/${Qt_Version}/QtCore/private/qconfig_p.h installed by dev-qt/qtcore contains e.g.:
  #define QT_FEATURE_dbus -1
  #define QT_FEATURE_dbus_linked -1
  #define QT_FEATURE_gui -1
  #define QT_FEATURE_widgets -1

${QT5_BUILD_DIR}/src/corelib/global/qconfig_p.h generated by configure for dev-qt/qtgui[dbus]
contains desired values such as:
  #define QT_FEATURE_dbus 1
  #define QT_FEATURE_dbus_linked 1
  #define QT_FEATURE_gui 1
  #define QT_FEATURE_widgets -1

However this header is not used and '#include <QtCore/private/qconfig_p.h>' could not include it from this location.
Previously qtbase packages other than dev-qt/qtcore were using /usr/include/qt5/QtCore/${Qt_Version}/QtCore/private/qconfig_p.h
installed by dev-qt/qtcore.

qt5_base_configure() already copies ${QT5_BUILD_DIR}/src/corelib/global/qconfig.h to include/QtCore directory
to prevent using of /usr/include/qt5/QtCore/qconfig.h at build time.
qt5_base_configure() is hereby fixed to also copy ${QT5_BUILD_DIR}/src/corelib/global/qconfig_p.h to include/QtCore/private directory
to prevent using of /usr/include/qt5/QtCore/${Qt_Version}/QtCore/private/qconfig_p.h at build time.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
@thesamesam thesamesam requested review from Pesa and a17r September 17, 2022 03:08
@Arfrever Arfrever force-pushed the master branch 2 times, most recently from eb759b4 to 6a90fd7 Compare September 17, 2022 06:20
a17r
a17r reviewed Sep 17, 2022
View reviewed changes
eclass/qt5-build.eclass
Comment on lines -801 to +805
local flag=${x%%:*}
x=${x#${flag}:}
local feature=${x%%:*}
x=${x#${feature}:}
local macro=${x}
macro=$(tr 'a-z-' 'A-Z_' <<< "${macro}")
IFS=: read -r flag feature macro <<<"${x}"
Copy link
Member

@a17r a17r Sep 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break existing 5.15.5 ebuilds, right?

@a17r
Copy link
Member

a17r commented Sep 17, 2022 •
edited
Loading

fwiw, rebasing 5.15.6 bump on top of this built fine, but I haven't tried 5.15.5.

Correction: Subsequently, dev-qt/qtdeclarative failed ot build, and revdeps too. https://gist.githubusercontent.com/a17r/0b15913b0823f9c7c0b6cc1d402c6d62/raw/3c840963ad062ce1b2582f5b1ed543b1487e04d0/dev-qt:qtdeclarative-5.15.6:20220917-151454.log
Successful build for comparison:
https://gist.githubusercontent.com/a17r/0b15913b0823f9c7c0b6cc1d402c6d62/raw/cf4d1e364f6834e4addd1f0092044c0699792881/dev-qt:qtdeclarative-5.15.6:20220917-154658.log

@a17r a17r mentioned this pull request Nov 29, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Pesa Pesa Awaiting requested review from Pesa

1 more reviewer

@a17r a17r a17r left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Arfrever @a17r