qt5: accommodate libxkbcommon change in 53af2206
This commit is contained in:
parent
3a7390456e
commit
237fc29dbe
GPG Key ID:
42F8B4E30B673606
@ -7317,14 +7317,6 @@ drwxr-xr-x root/root usr/include/qt5/QtWidgets/5.15.10/QtWidgets/private/
|
||||
-rw-r--r-- root/root usr/include/qt5/QtWidgets/qwidget.h
|
||||
-rw-r--r-- root/root usr/include/qt5/QtWidgets/qwidgetaction.h
|
||||
-rw-r--r-- root/root usr/include/qt5/QtWidgets/qwizard.h
|
||||
drwxr-xr-x root/root usr/include/qt5/QtX11Extras/
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/QX11Info
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/QtX11Extras
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/QtX11ExtrasDepends
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/QtX11ExtrasVersion
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/qtx11extrasglobal.h
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/qtx11extrasversion.h
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/qx11info_x11.h
|
||||
drwxr-xr-x root/root usr/include/qt5/QtXkbCommonSupport/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtXkbCommonSupport/5.15.10/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtXkbCommonSupport/5.15.10/QtXkbCommonSupport/
|
||||
@ -7946,9 +7938,6 @@ drwxr-xr-x root/root usr/lib/cmake/Qt5Gui/
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QWbmpPlugin.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QWebGLIntegrationPlugin.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QWebpPlugin.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QXdgDesktopPortalThemePlugin.cmake
|
||||
drwxr-xr-x root/root usr/lib/cmake/Qt5Help/
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Help/Qt5HelpConfig.cmake
|
||||
@ -8187,12 +8176,6 @@ drwxr-xr-x root/root usr/lib/cmake/Qt5Widgets/
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake
|
||||
drwxr-xr-x root/root usr/lib/cmake/Qt5X11Extras/
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5X11Extras/Qt5X11ExtrasConfig.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5X11Extras/Qt5X11ExtrasConfigVersion.cmake
|
||||
drwxr-xr-x root/root usr/lib/cmake/Qt5XcbQpa/
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5XcbQpa/Qt5XcbQpaConfig.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5XcbQpa/Qt5XcbQpaConfigVersion.cmake
|
||||
drwxr-xr-x root/root usr/lib/cmake/Qt5XkbCommonSupport/
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfig.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfigVersion.cmake
|
||||
@ -8681,18 +8664,6 @@ lrwxrwxrwx root/root usr/lib/libQt5Widgets.so -> libQt5Widgets.so.5.15.10
|
||||
lrwxrwxrwx root/root usr/lib/libQt5Widgets.so.5 -> libQt5Widgets.so.5.15.10
|
||||
lrwxrwxrwx root/root usr/lib/libQt5Widgets.so.5.15 -> libQt5Widgets.so.5.15.10
|
||||
-rwxr-xr-x root/root usr/lib/libQt5Widgets.so.5.15.10
|
||||
-rw-r--r-- root/root usr/lib/libQt5X11Extras.la
|
||||
-rw-r--r-- root/root usr/lib/libQt5X11Extras.prl
|
||||
lrwxrwxrwx root/root usr/lib/libQt5X11Extras.so -> libQt5X11Extras.so.5.15.10
|
||||
lrwxrwxrwx root/root usr/lib/libQt5X11Extras.so.5 -> libQt5X11Extras.so.5.15.10
|
||||
lrwxrwxrwx root/root usr/lib/libQt5X11Extras.so.5.15 -> libQt5X11Extras.so.5.15.10
|
||||
-rwxr-xr-x root/root usr/lib/libQt5X11Extras.so.5.15.10
|
||||
-rw-r--r-- root/root usr/lib/libQt5XcbQpa.la
|
||||
-rw-r--r-- root/root usr/lib/libQt5XcbQpa.prl
|
||||
lrwxrwxrwx root/root usr/lib/libQt5XcbQpa.so -> libQt5XcbQpa.so.5.15.10
|
||||
lrwxrwxrwx root/root usr/lib/libQt5XcbQpa.so.5 -> libQt5XcbQpa.so.5.15.10
|
||||
lrwxrwxrwx root/root usr/lib/libQt5XcbQpa.so.5.15 -> libQt5XcbQpa.so.5.15.10
|
||||
-rwxr-xr-x root/root usr/lib/libQt5XcbQpa.so.5.15.10
|
||||
-rw-r--r-- root/root usr/lib/libQt5XkbCommonSupport.a
|
||||
-rw-r--r-- root/root usr/lib/libQt5XkbCommonSupport.la
|
||||
-rw-r--r-- root/root usr/lib/libQt5XkbCommonSupport.prl
|
||||
@ -8786,7 +8757,6 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebSockets.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebView.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5Widgets.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5X11Extras.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5Xml.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5XmlPatterns.pc
|
||||
drwxr-xr-x root/root usr/lib/qt5/
|
||||
@ -9550,9 +9520,6 @@ drwxr-xr-x root/root usr/lib/qt5/mkspecs/modules/
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_webview_private.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_widgets.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_widgets_private.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_x11extras.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_x11extras_private.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_xml.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_xml_private.pri
|
||||
@ -9753,7 +9720,6 @@ drwxr-xr-x root/root usr/lib/qt5/plugins/platforms/
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/platforms/libqoffscreen.so
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/platforms/libqvnc.so
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/platforms/libqwebgl.so
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/platforms/libqxcb.so
|
||||
drwxr-xr-x root/root usr/lib/qt5/plugins/platformthemes/
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/platformthemes/libqxdgdesktopportal.so
|
||||
drwxr-xr-x root/root usr/lib/qt5/plugins/playlistformats/
|
||||
@ -9798,9 +9764,6 @@ drwxr-xr-x root/root usr/lib/qt5/plugins/virtualkeyboard/
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/virtualkeyboard/libqtvirtualkeyboard_pinyin.so
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/virtualkeyboard/libqtvirtualkeyboard_tcime.so
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/virtualkeyboard/libqtvirtualkeyboard_thai.so
|
||||
drwxr-xr-x root/root usr/lib/qt5/plugins/xcbglintegrations/
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/xcbglintegrations/libqxcb-egl-integration.so
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/xcbglintegrations/libqxcb-glx-integration.so
|
||||
drwxr-xr-x root/root usr/lib/qt5/qml/
|
||||
drwxr-xr-x root/root usr/lib/qt5/qml/Qt/
|
||||
drwxr-xr-x root/root usr/lib/qt5/qml/Qt/WebSockets/
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/Z9WYshoaOUYs1tPTyvOAwS9/HLX43+qMhzZi4imj+dXvCh7Ok+BTKxdvrXJg4brlRzUetPPLnmg9AWJKHAJFwg=
|
||||
SHA256 (Pkgfile) = 950d0edb3da34511a65e0d5b82706215c7b57556ba0fc9fafec6d01f1e8bb7de
|
||||
SHA256 (.footprint) = e72dc6f23b94c784cddf0522243a1c822bc7c46c431cd236253c8129b35a23ea
|
||||
RWSE3ohX2g5d/cvHmtY3vnrONQCMuHdh2X3ZffQNPt8DSCx/TCnPnaHWwyObh5NoESyaFn+WR+0TttLsjTck6sJ7vZpA8QpqbgY=
|
||||
SHA256 (Pkgfile) = da35d0946f4e65453d9b855723f8611a2d23cc65f07d2b675b89eefcb8ba038c
|
||||
SHA256 (.footprint) = 6727647eede586bf5661eb3960d705d2271ac99f6e23f57543624810fd4fe173
|
||||
SHA256 (qt-everywhere-opensource-src-5.15.10.tar.xz) = b545cb83c60934adc9a6bbd27e2af79e5013de77d46f5b9f5bb2a3c762bf55ca
|
||||
SHA256 (qt-everywhere-opensource-src-5.15.10-kf5-1.patch) = 39848ffa81817b251db5f122b6942362174274e670ce51443878d4012c7ebf53
|
||||
SHA256 (qtbase-5.15.8-fix-missing-qtsan-include.patch) = 65b435d09220fc66584f9613cdf7518367185af4e166c5b670301be6af98e8b1
|
||||
|
||||
14
qt5/Pkgfile
14
qt5/Pkgfile
@ -1,8 +1,8 @@
|
||||
# Description: Qt Free Edition, version 5.x.
|
||||
# URL: http://www.qt.io/
|
||||
# Maintainer: Danny Rawlins, crux at romster dot me
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
# Depends on: dbus gdk-pixbuf gst-plugins-base libepoxy libmng libwebp libxkbcommon xorg-libxcomposite xorg-libxcursor xorg-libxi xorg-libxinerama xorg-xcb-util-image xorg-xcb-util-keysyms xorg-xcb-util-renderutil xorg-xcb-util-wm
|
||||
# Optional: assimp icu
|
||||
# Optional: assimp bluez cups double-conversion gtk3 ibus icu libinput libsdl2 mariadb mtdev openal pulseaudio unixodbc vulkan-headers wayland-protocols xkeyboard-config
|
||||
|
||||
name=qt5
|
||||
version=5.15.10
|
||||
@ -17,6 +17,12 @@ source=(https://download.qt.io/archive/qt/5.15/$version/single/qt-everywhere-ope
|
||||
qtbase-use-wayland-on-gnome.patch)
|
||||
|
||||
build() {
|
||||
if [[ ! -e /usr/include/xkbcommon/xkbcommon-x11.h ]]; then
|
||||
printf '\e[31m%s\e[m\n' "libxkbcommon is not built with x11 support!"
|
||||
printf '\e[31m%s\e[m\n' "qtx11extras will not be built!"
|
||||
printf '\e[33m%s\e[m\n' "Install xkeyboard-config and rebuild libxkbcommon if you need that"
|
||||
fi
|
||||
|
||||
cd qt-everywhere-src-$version
|
||||
|
||||
patch -p1 -i $SRC/qt-everywhere-opensource-src-$version-kf5-1.patch
|
||||
@ -38,8 +44,8 @@ build() {
|
||||
prt-get isinst ccache && PKGMK_QT5+=' -ccache' && \
|
||||
PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
|
||||
prt-get isinst assimp && PKGMK_QT5+=' -system-assimp'
|
||||
prt-get isinst clang && PKGMK_QT5+=' -platform linux-clang'
|
||||
prt-get isinst clang lld && PKGMK_QT5+=' -linker lld' || PKGMK_QT5+=' -linker gold'
|
||||
#prt-get isinst clang && PKGMK_QT5+=' -platform linux-clang'
|
||||
#prt-get isinst clang lld && PKGMK_QT5+=' -linker lld' || PKGMK_QT5+=' -linker gold'
|
||||
|
||||
sed -i '/utility/a #include <limits>' qtbase/src/corelib/global/qglobal.h
|
||||
sed -i '/string/a #include <limits>' qtbase/src/corelib/global/qfloat16.h
|
||||
|
||||
Loading…
Reference in New Issue
Block a user