Initial package
This commit is contained in:
Jan Grulich
parent
217701115e
commit
2ad9816328
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
/qtbase-everywhere-src-6.0.0.tar.xz
|
||||
14
10-qt6-check-opengl2.sh
Executable file
14
10-qt6-check-opengl2.sh
Executable file
@ -0,0 +1,14 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ -z "$QT_XCB_FORCE_SOFTWARE_OPENGL" ]; then
|
||||
|
||||
QT6_CHECK_OPENGL_VERSION=`LANG=C glxinfo 2> /dev/null | grep '^OpenGL version string: ' | head -n 1 | sed -e 's/^OpenGL version string: \([0-9]\).*$/\1/g'` ||:
|
||||
|
||||
if [ "$QT6_CHECK_OPENGL_VERSION" == "1" ]; then
|
||||
QT_XCB_FORCE_SOFTWARE_OPENGL=1
|
||||
export QT_XCB_FORCE_SOFTWARE_OPENGL
|
||||
fi
|
||||
|
||||
unset QT6_CHECK_OPENGL_VERSION
|
||||
|
||||
fi
|
||||
4
macros.qt6-qtbase
Normal file
4
macros.qt6-qtbase
Normal file
@ -0,0 +1,4 @@
|
||||
%_qt6 @@NAME@@
|
||||
%_qt6_epoch @@EPOCH@@
|
||||
%_qt6_version @@VERSION@@
|
||||
%_qt6_evr @@EVR@@
|
||||
23
qconfig-multilib.h
Normal file
23
qconfig-multilib.h
Normal file
@ -0,0 +1,23 @@
|
||||
/* qconfig.h */
|
||||
/* This file is here to prevent a file conflict on multiarch systems. A
|
||||
* conflict will occur because qconfig.h has arch-specific definitions.
|
||||
*
|
||||
* DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
|
||||
|
||||
#ifndef QCONFIG_MULTILIB_H
|
||||
#define QCONFIG_MULTILIB_H
|
||||
|
||||
#ifndef __WORDSIZE
|
||||
#include <bits/wordsize.h>
|
||||
#endif
|
||||
|
||||
#if __WORDSIZE == 32
|
||||
#include "QtCore/qconfig-32.h"
|
||||
#elif __WORDSIZE == 64
|
||||
#include "QtCore/qconfig-64.h"
|
||||
#else
|
||||
#error "unexpected value for __WORDSIZE macro"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
10
qmake-qt6.sh
Executable file
10
qmake-qt6.sh
Executable file
@ -0,0 +1,10 @@
|
||||
#!/bin/sh
|
||||
|
||||
# An attempt at providing a qmake wrapper for projects that
|
||||
# lack native qmake support (ie, qmake is run by buildsystem
|
||||
# instead of developer or fedora packager).
|
||||
|
||||
QMAKE="$(rpm --eval %{_qt6_qmake})"
|
||||
QMAKE_FLAGS="$(rpm --eval %{?_qt6_qmake_flags})"
|
||||
|
||||
eval $QMAKE $QMAKE_FLAGS $@
|
||||
834
qt6-qtbase.spec
Normal file
834
qt6-qtbase.spec
Normal file
@ -0,0 +1,834 @@
|
||||
|
||||
# See http://bugzilla.redhat.com/223663
|
||||
%global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9
|
||||
%global multilib_basearchs x86_64 %{?mips64} ppc64 s390x sparc64
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} < 9
|
||||
%ifarch %{ix86}
|
||||
%global no_sse2 1
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%global platform linux-g++
|
||||
|
||||
%if 0%{?use_clang}
|
||||
%global platform linux-clang
|
||||
%endif
|
||||
|
||||
%global qt_module qtbase
|
||||
|
||||
# use external qt_settings pkg
|
||||
%if 0%{?fedora}
|
||||
%global qt_settings 1
|
||||
%endif
|
||||
|
||||
%global journald 1
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
|
||||
%global examples 1
|
||||
## skip for now, until we're better at it --rex
|
||||
#global tests 1
|
||||
|
||||
Name: qt6-qtbase
|
||||
Summary: Qt6 - QtBase components
|
||||
Version: 6.0.0
|
||||
Release: 1%{?dist}
|
||||
|
||||
# See LGPL_EXCEPTIONS.txt, for exception details
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
Url: http://qt-project.org/
|
||||
%global majmin %(echo %{version} | cut -d. -f1-2)
|
||||
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1227295
|
||||
Source1: qtlogging.ini
|
||||
|
||||
# header file to workaround multilib issue
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1036956
|
||||
Source5: qconfig-multilib.h
|
||||
|
||||
# xinitrc script to check for OpenGL 1 only drivers and automatically set
|
||||
# QT_XCB_FORCE_SOFTWARE_OPENGL for them
|
||||
Source6: 10-qt6-check-opengl2.sh
|
||||
|
||||
# macros
|
||||
Source10: macros.qt6-qtbase
|
||||
|
||||
# borrowed from opensuse
|
||||
# track private api via properly versioned symbols
|
||||
# downside: binaries produced with these differently-versioned symbols are no longer
|
||||
# compatible with qt-project.org's Qt binary releases.
|
||||
Patch1: qtbase-tell-truth-about-private-api.patch
|
||||
|
||||
# upstreamable patches
|
||||
# namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
|
||||
Patch50: qtbase-version-check.patch
|
||||
|
||||
# 1. Workaround moc/multilib issues
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1290020
|
||||
# https://bugreports.qt.io/browse/QTBUG-49972
|
||||
# 2. Workaround sysmacros.h (pre)defining major/minor a breaking stuff
|
||||
Patch51: qtbase-moc-macros.patch
|
||||
|
||||
# respect QMAKE_LFLAGS_RELEASE when building qmake
|
||||
Patch52: qtbase-qmake-lflags.patch
|
||||
|
||||
# don't use relocatable heuristics to guess prefix when using -no-feature-relocatable
|
||||
Patch53: qtbase-no-relocatable.patch
|
||||
|
||||
# drop -O3 and make -O2 by default
|
||||
Patch54: qtbase-cxxflag.patch
|
||||
|
||||
# support firebird version 3.x
|
||||
Patch55: qtbase-firebird.patch
|
||||
|
||||
# fix for new mariadb
|
||||
Patch56: qtbase-mysql.patch
|
||||
|
||||
# python3
|
||||
Patch57: qtbase-python3.patch
|
||||
|
||||
# https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1732129
|
||||
Patch80: qtbase-use-wayland-on-gnome.patch
|
||||
|
||||
# gcc-11
|
||||
Patch90: qtbase-gcc11.patch
|
||||
|
||||
## upstream patches
|
||||
|
||||
# Do not check any files in %%{_qt6_plugindir}/platformthemes/ for requires.
|
||||
# Those themes are there for platform integration. If the required libraries are
|
||||
# not there, the platform to integrate with isn't either. Then Qt will just
|
||||
# silently ignore the plugin that fails to load. Thus, there is no need to let
|
||||
# RPM drag in gtk3 as a dependency for the GTK+3 dialog support.
|
||||
%global __requires_exclude_from ^%{_qt6_plugindir}/platformthemes/.*$
|
||||
# filter plugin provides
|
||||
%global __provides_exclude_from ^%{_qt6_plugindir}/.*\\.so$
|
||||
|
||||
%if 0%{?use_clang}
|
||||
BuildRequires: clang >= 6.0.0
|
||||
%else
|
||||
BuildRequires: gcc-c++
|
||||
%endif
|
||||
BuildRequires: cmake
|
||||
BuildRequires: ninja-build
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: findutils
|
||||
BuildRequires: double-conversion-devel
|
||||
BuildRequires: libb2-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libmng-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: tslib-devel
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
# required for -accessibility
|
||||
BuildRequires: pkgconfig(atspi-2)
|
||||
# http://bugzilla.redhat.com/1196359
|
||||
%global dbus_linked 1
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
BuildRequires: pkgconfig(libdrm)
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
BuildRequires: pkgconfig(gl)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(libproxy-1.0)
|
||||
# xcb-sm
|
||||
BuildRequires: pkgconfig(ice) pkgconfig(sm)
|
||||
BuildRequires: pkgconfig(libpng)
|
||||
BuildRequires: pkgconfig(libudev)
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
|
||||
BuildRequires: pkgconfig(libinput)
|
||||
BuildRequires: pkgconfig(xcb-xkb) >= 1.10
|
||||
BuildRequires: pkgconfig(xcb-util)
|
||||
BuildRequires: pkgconfig(xkbcommon) >= 0.4.1
|
||||
BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1
|
||||
BuildRequires: pkgconfig(xkeyboard-config)
|
||||
%global vulkan 1
|
||||
BuildRequires: pkgconfig(vulkan)
|
||||
%global egl 1
|
||||
BuildRequires: libEGL-devel
|
||||
BuildRequires: pkgconfig(gbm)
|
||||
%global sqlite 1
|
||||
BuildRequires: pkgconfig(sqlite3) >= 3.7
|
||||
BuildRequires: pkgconfig(harfbuzz) >= 0.9.42
|
||||
BuildRequires: pkgconfig(icu-i18n)
|
||||
BuildRequires: pkgconfig(libpcre2-posix) >= 10.20
|
||||
BuildRequires: pkgconfig(libpcre) >= 8.0
|
||||
%global pcre 1
|
||||
BuildRequires: pkgconfig(xcb-xkb)
|
||||
BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
BuildRequires: perl
|
||||
BuildRequires: perl-generators
|
||||
# see patch68
|
||||
BuildRequires: python3
|
||||
BuildRequires: qt6-rpm-macros
|
||||
|
||||
%if 0%{?tests}
|
||||
BuildRequires: dbus-x11
|
||||
BuildRequires: mesa-dri-drivers
|
||||
BuildRequires: time
|
||||
BuildRequires: xorg-x11-server-Xvfb
|
||||
%endif
|
||||
|
||||
Requires: %{name}-common = %{version}-%{release}
|
||||
|
||||
## Sql drivers
|
||||
# FIXME: disable for now, they don't seem to be implemented in Qt 6.0.0
|
||||
# if rhel
|
||||
%global no_ibase 1
|
||||
%global no_tds 1
|
||||
# endif
|
||||
|
||||
# workaround gold linker bug(s) by not using it
|
||||
# https://bugzilla.redhat.com/1458003
|
||||
# https://sourceware.org/bugzilla/show_bug.cgi?id=21074
|
||||
# reportedly fixed or worked-around, re-enable if there's evidence of problems -- rex
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1635973
|
||||
%global use_gold_linker 0
|
||||
|
||||
%description
|
||||
Qt is a software toolkit for developing applications.
|
||||
|
||||
This package contains base tools, like string, xml, and network
|
||||
handling.
|
||||
|
||||
%package common
|
||||
Summary: Common files for Qt6
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
%description common
|
||||
%{summary}.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-gui%{?_isa}
|
||||
%if 0%{?egl}
|
||||
Requires: libEGL-devel
|
||||
%endif
|
||||
Requires: pkgconfig(gl)
|
||||
%if 0%{?vulkan}
|
||||
Requires: pkgconfig(vulkan)
|
||||
%endif
|
||||
Requires: qt6-rpm-macros
|
||||
%if 0%{?use_clang}
|
||||
Requires: clang >= 3.7.0
|
||||
%endif
|
||||
%description devel
|
||||
%{summary}.
|
||||
|
||||
%package private-devel
|
||||
Summary: Development files for %{name} private APIs
|
||||
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
||||
# QtPrintSupport/private requires cups/ppd.h
|
||||
Requires: cups-devel
|
||||
%description private-devel
|
||||
%{summary}.
|
||||
|
||||
%package examples
|
||||
Summary: Programming examples for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description examples
|
||||
%{summary}.
|
||||
|
||||
%package static
|
||||
Summary: Static library files for %{name}
|
||||
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
||||
Requires: pkgconfig(fontconfig)
|
||||
Requires: pkgconfig(glib-2.0)
|
||||
Requires: pkgconfig(libinput)
|
||||
Requires: pkgconfig(xkbcommon)
|
||||
Requires: pkgconfig(zlib)
|
||||
|
||||
%description static
|
||||
%{summary}.
|
||||
|
||||
%if 0%{?no_ibase} == 0
|
||||
%package ibase
|
||||
Summary: IBase driver for Qt6's SQL classes
|
||||
BuildRequires: firebird-devel
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%description ibase
|
||||
%{summary}.
|
||||
%endif
|
||||
|
||||
%package mysql
|
||||
Summary: MySQL driver for Qt6's SQL classes
|
||||
%if 0%{?fedora} > 27 || 0%{?rhel} > 8
|
||||
BuildRequires: mariadb-connector-c-devel
|
||||
%else
|
||||
BuildRequires: mysql-devel
|
||||
%endif
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%description mysql
|
||||
%{summary}.
|
||||
|
||||
%package odbc
|
||||
Summary: ODBC driver for Qt6's SQL classes
|
||||
BuildRequires: unixODBC-devel
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%description odbc
|
||||
%{summary}.
|
||||
|
||||
%package postgresql
|
||||
Summary: PostgreSQL driver for Qt6's SQL classes
|
||||
BuildRequires: libpq-devel
|
||||
BuildRequires: postgresql-server-devel
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%description postgresql
|
||||
%{summary}.
|
||||
|
||||
%if 0%{?no_tds} == 0
|
||||
%package tds
|
||||
Summary: TDS driver for Qt6's SQL classes
|
||||
BuildRequires: freetds-devel
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%description tds
|
||||
%{summary}.
|
||||
%endif
|
||||
|
||||
# debating whether to do 1 subpkg per library or not -- rex
|
||||
%package gui
|
||||
Summary: Qt6 GUI-related libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%if 0%{?fedora} > 20
|
||||
Recommends: mesa-dri-drivers
|
||||
%endif
|
||||
# for Source6: 10-qt6-check-opengl2.sh:
|
||||
# glxinfo
|
||||
Requires: glx-utils
|
||||
%description gui
|
||||
Qt6 libraries used for drawing widgets and OpenGL items.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
|
||||
|
||||
# move some bundled libs to ensure they're not accidentally used
|
||||
pushd src/3rdparty
|
||||
mkdir UNUSED
|
||||
mv harfbuzz-ng freetype libjpeg libpng sqlite xcb zlib UNUSED/
|
||||
popd
|
||||
|
||||
# builds failing mysteriously on f20
|
||||
# ./configure: Permission denied
|
||||
# check to ensure that can't happen -- rex
|
||||
test -x configure || chmod +x configure
|
||||
|
||||
# use proper perl interpretter so autodeps work as expected
|
||||
sed -i -e "s|^#!/usr/bin/env perl$|#!%{__perl}|" \
|
||||
bin/fixqt4headers.pl \
|
||||
bin/syncqt.pl \
|
||||
mkspecs/features/data/unix/findclasslist.pl
|
||||
|
||||
|
||||
%build
|
||||
# QT is known not to work properly with LTO at this point. Some of the issues
|
||||
# are being worked on upstream and disabling LTO should be re-evaluated as
|
||||
# we update this change. Until such time...
|
||||
# Disable LTO
|
||||
# https://bugzilla.redhat.com/1900527
|
||||
%define _lto_cflags %{nil}
|
||||
|
||||
## FIXME/TODO:
|
||||
# * for %%ix86, add sse2 enabled builds for Qt6Gui, Qt6Core, QtNetwork, see also:
|
||||
# http://anonscm.debian.org/cgit/pkg-kde/qt/qtbase.git/tree/debian/rules (234-249)
|
||||
|
||||
## adjust $RPM_OPT_FLAGS
|
||||
# remove -fexceptions
|
||||
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
|
||||
RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?qt6_arm_flag} %{?qt6_deprecated_flag} %{?qt6_null_flag}"
|
||||
|
||||
%if 0%{?use_clang}
|
||||
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fno-delete-null-pointer-checks||g'`
|
||||
%endif
|
||||
|
||||
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
|
||||
export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS"
|
||||
export LDFLAGS="$LDFLAGS $RPM_LD_FLAGS"
|
||||
export MAKEFLAGS="%{?_smp_mflags}"
|
||||
|
||||
%cmake_qt6 \
|
||||
-DQT_FEATURE_accessibility=ON \
|
||||
-DQT_FEATURE_fontconfig=ON \
|
||||
-DQT_FEATURE_glib=ON \
|
||||
-DQT_FEATURE_sse2=%{?no_sse2:OFF}%{!?no_sse2:ON} \
|
||||
-DQT_FEATURE_icu=ON \
|
||||
-DQT_FEATURE_enable_new_dtags=ON \
|
||||
-DQT_FEATURE_journald=%{?journald:ON}%{!?journald:OFF} \
|
||||
-DQT_FEATURE_openssl_linked=ON \
|
||||
-DQT_FEATURE_rpath=OFF \
|
||||
-DQT_FEATURE_separate_debug_info=OFF \
|
||||
-DQT_FEATURE_reduce_relocations=OFF \
|
||||
-DQT_FEATURE_relocatable=OFF \
|
||||
-DQT_FEATURE_system_jpeg=ON \
|
||||
-DQT_FEATURE_system_png=ON \
|
||||
-DQT_FEATURE_system_zlib=ON \
|
||||
-DQT_FEATURE_sql_odbc=ON \
|
||||
-DQT_FEATURE_sql_mysql=ON \
|
||||
-DQT_FEATURE_sql_psql=ON \
|
||||
-DQT_FEATURE_sql_sqlite=ON \
|
||||
%{?dbus_linked:-DQT_FEATURE_dbus_linked=ON} \
|
||||
%{?pcre:-DQT_FEATURE_system_pcre2=ON} \
|
||||
%{?sqlite:-DQT_FEATURE_system_sqlite=ON} \
|
||||
%{?no_tds:-DQT_FEATURE_sql_tds=OFF}%{!?no_tds:-DQT_FEATURE_sql_tds=ON} \
|
||||
%{?no_ibase:-DQT_FEATURE_sql_ibase=OFF}%{!?no_ibase:-DQT_FEATURE_sql_ibase=ON} \
|
||||
%{?use_gold_linker:-DQT_FEATURE_use_gold_linker=OFF} \
|
||||
-DBUILD_SHARED_LIBS=ON \
|
||||
-DQT_BUILD_EXAMPLES=%{?examples:ON}%{!?examples:OFF} \
|
||||
-DQT_BUILD_TESTS=%{?tests:ON}%{!?tests:OFF} \
|
||||
-DQT_QMAKE_TARGET_MKSPEC=%{platform}
|
||||
|
||||
# FIXME
|
||||
# -DQT_FEATURE_directfb=ON \
|
||||
|
||||
%cmake_build
|
||||
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
install -m644 -p -D %{SOURCE1} %{buildroot}%{_qt6_datadir}/qtlogging.ini
|
||||
|
||||
# Thanks OpenSuse
|
||||
# Static library created by an example
|
||||
rm %{buildroot}%{_prefix}/lib/libpnp_basictools.a
|
||||
|
||||
# Qt6.pc
|
||||
mkdir -p %{buildroot}%{_libdir}/pkgconfig
|
||||
cat << EOF > %{buildroot}%{_libdir}/pkgconfig/Qt6.pc
|
||||
prefix=%{_qt6_prefix}
|
||||
archdatadir=%{_qt6_archdatadir}
|
||||
bindir=%{_qt6_bindir}
|
||||
datadir=%{_qt6_datadir}
|
||||
|
||||
docdir=%{_qt6_docdir}
|
||||
examplesdir=%{_qt6_examplesdir}
|
||||
headerdir=%{_qt6_headerdir}
|
||||
importdir=%{_qt6_importdir}
|
||||
libdir=%{_qt6_libdir}
|
||||
libexecdir=%{_qt6_libexecdir}
|
||||
moc=%{_qt6_bindir}/moc
|
||||
plugindir=%{_qt6_plugindir}
|
||||
qmake=%{_qt6_bindir}/qmake
|
||||
settingsdir=%{_qt6_settingsdir}
|
||||
sysconfdir=%{_qt6_sysconfdir}
|
||||
translationdir=%{_qt6_translationdir}
|
||||
|
||||
Name: Qt6
|
||||
Description: Qt6 Configuration
|
||||
Version: %{version}
|
||||
EOF
|
||||
|
||||
# rpm macros
|
||||
install -p -m644 -D %{SOURCE10} \
|
||||
%{buildroot}%{_rpmmacrodir}/macros.qt6-qtbase
|
||||
sed -i \
|
||||
-e "s|@@NAME@@|%{name}|g" \
|
||||
-e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \
|
||||
-e "s|@@VERSION@@|%{version}|g" \
|
||||
-e "s|@@EVR@@|%{?epoch:%{epoch:}}%{version}-%{release}|g" \
|
||||
%{buildroot}%{rpm_macros_dir}/macros.qt6-qtbase
|
||||
|
||||
# create/own dirs
|
||||
mkdir -p %{buildroot}{%{_qt6_archdatadir}/mkspecs/modules,%{_qt6_importdir},%{_qt6_libexecdir},%{_qt6_plugindir}/{designer,iconengines,script,styles},%{_qt6_translationdir}}
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/xdg/QtProject
|
||||
|
||||
# hardlink files to {_bindir}, add -qt6 postfix to not conflict
|
||||
mkdir %{buildroot}%{_bindir}
|
||||
pushd %{buildroot}%{_qt6_bindir}
|
||||
for i in * ; do
|
||||
case "${i}" in
|
||||
moc|qdbuscpp2xml|qdbusxml2cpp|qlalr|qvkgen|qmake|rcc|tracegen|uic)
|
||||
ln -v ${i} %{buildroot}%{_bindir}/${i}-qt6
|
||||
;;
|
||||
*)
|
||||
ln -v ${i} %{buildroot}%{_bindir}/${i}
|
||||
;;
|
||||
esac
|
||||
done
|
||||
popd
|
||||
|
||||
%ifarch %{multilib_archs}
|
||||
# multilib: qconfig.h
|
||||
mv %{buildroot}%{_qt6_headerdir}/QtCore/qconfig.h %{buildroot}%{_qt6_headerdir}/QtCore/qconfig-%{__isa_bits}.h
|
||||
install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt6_headerdir}/QtCore/qconfig.h
|
||||
%endif
|
||||
|
||||
|
||||
## .prl/.la file love
|
||||
# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
|
||||
pushd %{buildroot}%{_qt6_libdir}
|
||||
for prl_file in libQt6*.prl ; do
|
||||
sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file}
|
||||
if [ -f "$(basename ${prl_file} .prl).so" ]; then
|
||||
rm -fv "$(basename ${prl_file} .prl).la"
|
||||
sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file}
|
||||
fi
|
||||
done
|
||||
popd
|
||||
|
||||
install -p -m755 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/10-qt6-check-opengl2.sh
|
||||
|
||||
# install privat headers for qtxcb
|
||||
mkdir -p %{buildroot}%{_qt6_headerdir}/QtXcb
|
||||
install -m 644 src/plugins/platforms/xcb/*.h %{buildroot}%{_qt6_headerdir}/QtXcb/
|
||||
|
||||
# Taken from OpenSUSE
|
||||
# syncqt is installed in both %%_qt6_bindir and %%_qt6_libdir
|
||||
# QtSyncQtHelpers.cmake needs the libexec one...and qmake the other one.
|
||||
# Creating a symlink is not necessary
|
||||
rm %{buildroot}%{_bindir}/syncqt.pl
|
||||
rm %{buildroot}%{_qt6_bindir}/syncqt.pl
|
||||
ln -s %{_qt6_libdir}/syncqt.pl %{buildroot}%{_qt6_bindir}/syncqt.pl
|
||||
|
||||
rm %{buildroot}/%{_bindir}/qt-cmake-private-install.cmake
|
||||
|
||||
%check
|
||||
# verify Qt6.pc
|
||||
export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
|
||||
test "$(pkg-config --modversion Qt6)" = "%{version}"
|
||||
%if 0%{?tests}
|
||||
## see tests/README for expected environment (running a plasma session essentially)
|
||||
## we are not quite there yet
|
||||
export CTEST_OUTPUT_ON_FAILURE=1
|
||||
export PATH=%{buildroot}%{_qt6_bindir}:$PATH
|
||||
export LD_LIBRARY_PATH=%{buildroot}%{_qt6_libdir}
|
||||
# dbus tests error out when building if session bus is not available
|
||||
dbus-launch --exit-with-session \
|
||||
%make_build sub-tests -k ||:
|
||||
xvfb-run -a --server-args="-screen 0 1280x1024x32" \
|
||||
dbus-launch --exit-with-session \
|
||||
time \
|
||||
make check -k ||:
|
||||
%endif
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%license LICENSE.FDL
|
||||
%license LICENSE.GPL*
|
||||
%license LICENSE.LGPL*
|
||||
%dir %{_sysconfdir}/xdg/QtProject/
|
||||
%{_qt6_libdir}/libQt6Concurrent.so.6*
|
||||
%{_qt6_libdir}/libQt6Core.so.6*
|
||||
%{_qt6_libdir}/libQt6DBus.so.6*
|
||||
%{_qt6_libdir}/libQt6Network.so.6*
|
||||
%{_qt6_libdir}/libQt6Sql.so.6*
|
||||
%{_qt6_libdir}/libQt6Test.so.6*
|
||||
%{_qt6_libdir}/libQt6Xml.so.6*
|
||||
%dir %{_qt6_docdir}/
|
||||
%{_qt6_docdir}/global/
|
||||
%{_qt6_docdir}/config/
|
||||
%{_qt6_importdir}/
|
||||
%{_qt6_translationdir}/
|
||||
%if "%{_qt6_prefix}" != "%{_prefix}"
|
||||
%dir %{_qt6_prefix}/
|
||||
%endif
|
||||
%dir %{_qt6_archdatadir}/
|
||||
%dir %{_qt6_datadir}/
|
||||
%{_qt6_datadir}/qtlogging.ini
|
||||
%dir %{_qt6_libexecdir}/
|
||||
%dir %{_qt6_plugindir}/
|
||||
%dir %{_qt6_plugindir}/designer/
|
||||
%dir %{_qt6_plugindir}/generic/
|
||||
%dir %{_qt6_plugindir}/iconengines/
|
||||
%dir %{_qt6_plugindir}/imageformats/
|
||||
%dir %{_qt6_plugindir}/platforminputcontexts/
|
||||
%dir %{_qt6_plugindir}/platforms/
|
||||
%dir %{_qt6_plugindir}/platformthemes/
|
||||
%dir %{_qt6_plugindir}/printsupport/
|
||||
%dir %{_qt6_plugindir}/script/
|
||||
%dir %{_qt6_plugindir}/sqldrivers/
|
||||
%dir %{_qt6_plugindir}/styles/
|
||||
%{_qt6_plugindir}/sqldrivers/libqsqlite.so
|
||||
%{_qt6_libdir}/cmake/Qt6Sql/Qt6QSQLiteDriverPlugin*.cmake
|
||||
|
||||
%files common
|
||||
# mostly empty for now, consider: filesystem/dir ownership, licenses
|
||||
%{_rpmmacrodir}/macros.qt6-qtbase
|
||||
|
||||
%files devel
|
||||
%dir %{_qt6_libdir}/metatypes
|
||||
%dir %{_qt6_libdir}/cmake/Qt6
|
||||
%dir %{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules
|
||||
%dir %{_qt6_libdir}/cmake/Qt6/3rdparty/kwin
|
||||
%dir %{_qt6_libdir}/cmake/Qt6BuildInternals
|
||||
%dir %{_qt6_libdir}/cmake/Qt6Concurrent
|
||||
%dir %{_qt6_libdir}/cmake/Qt6Core
|
||||
%dir %{_qt6_libdir}/cmake/Qt6CoreTools
|
||||
%dir %{_qt6_libdir}/cmake/Qt6Core_qobject
|
||||
%dir %{_qt6_libdir}/cmake/Qt6DBus
|
||||
%dir %{_qt6_libdir}/cmake/Qt6DBusTools
|
||||
%dir %{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupport
|
||||
%dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegration
|
||||
%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupport
|
||||
%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupport
|
||||
%dir %{_qt6_libdir}/cmake/Qt6FbSupport
|
||||
%dir %{_qt6_libdir}/cmake/Qt6Gui
|
||||
%dir %{_qt6_libdir}/cmake/Qt6GuiTools
|
||||
%dir %{_qt6_libdir}/cmake/Qt6HostInfo
|
||||
%dir %{_qt6_libdir}/cmake/Qt6InputSupport
|
||||
%dir %{_qt6_libdir}/cmake/Qt6KmsSupport
|
||||
%dir %{_qt6_libdir}/cmake/Qt6Network
|
||||
%dir %{_qt6_libdir}/cmake/Qt6OpenGL
|
||||
%dir %{_qt6_libdir}/cmake/Qt6OpenGLWidgets
|
||||
%dir %{_qt6_libdir}/cmake/Qt6PrintSupport
|
||||
%dir %{_qt6_libdir}/cmake/Qt6Sql
|
||||
%dir %{_qt6_libdir}/cmake/Qt6Test
|
||||
%dir %{_qt6_libdir}/cmake/Qt6Widgets
|
||||
%dir %{_qt6_libdir}/cmake/Qt6WidgetsTools
|
||||
%dir %{_qt6_libdir}/cmake/Qt6XcbQpa
|
||||
%dir %{_qt6_libdir}/cmake/Qt6Xml
|
||||
%if "%{_qt6_bindir}" != "%{_bindir}"
|
||||
%dir %{_qt6_bindir}
|
||||
%endif
|
||||
%{_bindir}/androiddeployqt
|
||||
%{_bindir}/androidtestrunner
|
||||
%{_bindir}/cmake_automoc_parser
|
||||
%{_bindir}/moc*
|
||||
%{_bindir}/qdbuscpp2xml*
|
||||
%{_bindir}/qdbusxml2cpp*
|
||||
%{_bindir}/qlalr*
|
||||
%{_bindir}/qmake*
|
||||
%{_bindir}/qt-cmake
|
||||
%{_bindir}/qt-cmake-private
|
||||
%{_bindir}/qt-cmake-standalone-test
|
||||
%{_bindir}/qt-configure-module
|
||||
%{_bindir}/qt-internal-configure-tests
|
||||
%{_bindir}/qvkgen*
|
||||
%{_bindir}/rcc*
|
||||
%{_bindir}/tracegen*
|
||||
%{_bindir}/uic*
|
||||
%{_qt6_bindir}/androiddeployqt
|
||||
%{_qt6_bindir}/androidtestrunner
|
||||
%{_qt6_bindir}/cmake_automoc_parser
|
||||
%{_qt6_bindir}/moc
|
||||
%{_qt6_bindir}/qdbuscpp2xml
|
||||
%{_qt6_bindir}/qdbusxml2cpp
|
||||
%{_qt6_bindir}/qlalr
|
||||
%{_qt6_bindir}/qmake
|
||||
%{_qt6_bindir}/qt-cmake
|
||||
%{_qt6_bindir}/qt-cmake-private
|
||||
%{_qt6_bindir}/qt-cmake-private-install.cmake
|
||||
%{_qt6_bindir}/qt-cmake-standalone-test
|
||||
%{_qt6_bindir}/qt-configure-module
|
||||
%{_qt6_bindir}/qt-internal-configure-tests
|
||||
%{_qt6_bindir}/qvkgen
|
||||
%{_qt6_bindir}/rcc
|
||||
%{_qt6_bindir}/syncqt.pl
|
||||
%{_qt6_bindir}/uic
|
||||
%{_qt6_datadir}/modules/*.json
|
||||
%if "%{_qt6_headerdir}" != "%{_includedir}"
|
||||
%dir %{_qt6_headerdir}
|
||||
%endif
|
||||
%{_qt6_headerdir}/QtConcurrent/
|
||||
%{_qt6_headerdir}/QtCore/
|
||||
%{_qt6_headerdir}/QtDBus/
|
||||
%{_qt6_headerdir}/QtInputSupport
|
||||
%{_qt6_headerdir}/QtGui/
|
||||
%{_qt6_headerdir}/QtNetwork/
|
||||
%{_qt6_headerdir}/QtOpenGL/
|
||||
%{_qt6_headerdir}/QtOpenGLWidgets
|
||||
%{_qt6_headerdir}/QtPrintSupport/
|
||||
%{_qt6_headerdir}/QtSql/
|
||||
%{_qt6_headerdir}/QtTest/
|
||||
%{_qt6_headerdir}/QtWidgets/
|
||||
%{_qt6_headerdir}/QtXcb/
|
||||
%{_qt6_headerdir}/QtXml/
|
||||
%{_qt6_headerdir}/QtEglFSDeviceIntegration
|
||||
%{_qt6_headerdir}/QtEglFsKmsGbmSupport
|
||||
%{_qt6_headerdir}/QtEglFsKmsSupport
|
||||
%{_qt6_mkspecsdir}/
|
||||
%{_qt6_libdir}/libQt6Concurrent.prl
|
||||
%{_qt6_libdir}/libQt6Concurrent.so
|
||||
%{_qt6_libdir}/libQt6Core.prl
|
||||
%{_qt6_libdir}/libQt6Core.so
|
||||
# FIXME: Jan: OpenSUSE removes these, do we really need them?
|
||||
%{_qt6_libdir}/libQt6Core_qobject.a
|
||||
%{_qt6_libdir}/libQt6Core_qobject.prl
|
||||
%{_qt6_libdir}/libQt6DBus.prl
|
||||
%{_qt6_libdir}/libQt6DBus.so
|
||||
%{_qt6_libdir}/libQt6Gui.prl
|
||||
%{_qt6_libdir}/libQt6Gui.so
|
||||
%{_qt6_libdir}/libQt6Network.prl
|
||||
%{_qt6_libdir}/libQt6Network.so
|
||||
%{_qt6_libdir}/libQt6OpenGL.prl
|
||||
%{_qt6_libdir}/libQt6OpenGL.so
|
||||
%{_qt6_libdir}/libQt6OpenGLWidgets.prl
|
||||
%{_qt6_libdir}/libQt6OpenGLWidgets.so
|
||||
%{_qt6_libdir}/libQt6PrintSupport.prl
|
||||
%{_qt6_libdir}/libQt6PrintSupport.so
|
||||
%{_qt6_libdir}/libQt6Sql.prl
|
||||
%{_qt6_libdir}/libQt6Sql.so
|
||||
%{_qt6_libdir}/libQt6Test.prl
|
||||
%{_qt6_libdir}/libQt6Test.so
|
||||
%{_qt6_libdir}/libQt6Widgets.prl
|
||||
%{_qt6_libdir}/libQt6Widgets.so
|
||||
%{_qt6_libdir}/libQt6XcbQpa.prl
|
||||
%{_qt6_libdir}/libQt6XcbQpa.so
|
||||
%{_qt6_libdir}/libQt6Xml.prl
|
||||
%{_qt6_libdir}/libQt6Xml.so
|
||||
%{_qt6_libdir}/libQt6EglFSDeviceIntegration.prl
|
||||
%{_qt6_libdir}/libQt6EglFSDeviceIntegration.so
|
||||
%{_qt6_libdir}/libQt6EglFsKmsGbmSupport.prl
|
||||
%{_qt6_libdir}/libQt6EglFsKmsGbmSupport.so
|
||||
%{_qt6_libdir}/cmake/Qt6/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6/*.cmake.in
|
||||
%{_qt6_libdir}/cmake/Qt6/ModuleDescription.json.in
|
||||
%{_qt6_libdir}/cmake/Qt6/QtFileConfigure.txt.in
|
||||
%{_qt6_libdir}/cmake/Qt6/QtSeparateDebugInfo.Info.plist.in
|
||||
%{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/COPYING-CMAKE-SCRIPTS
|
||||
%{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/find-modules/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/modules/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/qt_attribution.json
|
||||
%{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/COPYING-CMAKE-SCRIPTS
|
||||
%{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/qt_attribution.json
|
||||
%{_qt6_libdir}/cmake/Qt6BuildInternals/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6BuildInternals/QtStandaloneTestTemplateProject/CMakeLists.txt
|
||||
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtBaseTestsConfig.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6Concurrent/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6Core/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6Core/Qt6CoreConfigureFileTemplate.in
|
||||
%{_qt6_libdir}/cmake/Qt6CoreTools/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6Core_qobject/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6DBus/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6DBusTools/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupport/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegration/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupport/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6EglFsKmsSupport/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6FbSupport/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6Gui/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6GuiTools/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6HostInfo/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6InputSupport/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6KmsSupport/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6Network/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6OpenGL/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6OpenGLWidgets/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6PrintSupport/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6Sql/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6Test/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6Widgets/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6WidgetsTools/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6XcbQpa/*.cmake
|
||||
%{_qt6_libdir}/cmake/Qt6Xml/*.cmake
|
||||
%{_qt6_libdir}/metatypes/*.json
|
||||
%{_qt6_libdir}/pkgconfig/Qt6.pc
|
||||
%{_qt6_libdir}/syncqt.pl
|
||||
|
||||
%if 0%{?egl}
|
||||
%{_qt6_libdir}/libQt6EglFsKmsSupport.prl
|
||||
%{_qt6_libdir}/libQt6EglFsKmsSupport.so
|
||||
%endif
|
||||
%{_qt6_libdir}/qt6/bin/tracegen
|
||||
## private-devel globs
|
||||
%exclude %{_qt6_headerdir}/*/%{version}/
|
||||
|
||||
%files private-devel
|
||||
%{_qt6_headerdir}/*/%{version}/
|
||||
|
||||
%files static
|
||||
%{_qt6_headerdir}/QtDeviceDiscoverySupport
|
||||
%{_qt6_libdir}/libQt6DeviceDiscoverySupport.*a
|
||||
%{_qt6_libdir}/libQt6DeviceDiscoverySupport.prl
|
||||
%{_qt6_headerdir}/QtFbSupport
|
||||
%{_qt6_libdir}/libQt6FbSupport.*a
|
||||
%{_qt6_libdir}/libQt6FbSupport.prl
|
||||
%{_qt6_libdir}/libQt6InputSupport.*a
|
||||
%{_qt6_libdir}/libQt6InputSupport.prl
|
||||
%{_qt6_headerdir}/QtKmsSupport
|
||||
%{_qt6_libdir}/libQt6KmsSupport.*a
|
||||
%{_qt6_libdir}/libQt6KmsSupport.prl
|
||||
%if 0%{?examples}
|
||||
%files examples
|
||||
%{_qt6_examplesdir}/
|
||||
%endif
|
||||
|
||||
%if 0%{?no_ibase} == 0
|
||||
%files ibase
|
||||
%{_qt6_plugindir}/sqldrivers/libqsqlibase.so
|
||||
|
||||
%endif
|
||||
|
||||
%files mysql
|
||||
%{_qt6_plugindir}/sqldrivers/libqsqlmysql.so
|
||||
%{_qt6_libdir}/cmake/Qt6Sql/Qt6QMYSQLDriverPlugin*.cmake
|
||||
|
||||
%files odbc
|
||||
%{_qt6_plugindir}/sqldrivers/libqsqlodbc.so
|
||||
%{_qt6_libdir}/cmake/Qt6Sql/Qt6QODBCDriverPlugin*.cmake
|
||||
|
||||
%files postgresql
|
||||
%{_qt6_plugindir}/sqldrivers/libqsqlpsql.so
|
||||
%{_qt6_libdir}/cmake/Qt6Sql/Qt6QPSQLDriverPlugin*.cmake
|
||||
|
||||
%if 0%{?no_tds} == 0
|
||||
%files tds
|
||||
%{_qt6_plugindir}/sqldrivers/libqsqltds.so
|
||||
%endif
|
||||
|
||||
%ldconfig_scriptlets gui
|
||||
|
||||
%files gui
|
||||
%dir %{_sysconfdir}/X11/xinit
|
||||
%dir %{_sysconfdir}/X11/xinit/xinitrc.d/
|
||||
%{_sysconfdir}/X11/xinit/xinitrc.d/10-qt6-check-opengl2.sh
|
||||
%{_qt6_libdir}/libQt6Gui.so.6*
|
||||
%{_qt6_libdir}/libQt6OpenGL.so.6*
|
||||
%{_qt6_libdir}/libQt6OpenGLWidgets.so.6*
|
||||
%{_qt6_libdir}/libQt6PrintSupport.so.6*
|
||||
%{_qt6_libdir}/libQt6Widgets.so.6*
|
||||
%{_qt6_libdir}/libQt6XcbQpa.so.6*
|
||||
# Generic
|
||||
%{_qt6_plugindir}/generic/libqevdevkeyboardplugin.so
|
||||
%{_qt6_plugindir}/generic/libqevdevmouseplugin.so
|
||||
%{_qt6_plugindir}/generic/libqevdevtabletplugin.so
|
||||
%{_qt6_plugindir}/generic/libqevdevtouchplugin.so
|
||||
%{_qt6_plugindir}/generic/libqlibinputplugin.so
|
||||
%{_qt6_plugindir}/generic/libqtslibplugin.so
|
||||
%{_qt6_plugindir}/generic/libqtuiotouchplugin.so
|
||||
# Imageformats
|
||||
%{_qt6_plugindir}/imageformats/libqico.so
|
||||
%{_qt6_plugindir}/imageformats/libqjpeg.so
|
||||
%{_qt6_plugindir}/imageformats/libqgif.so
|
||||
# Platforminputcontexts
|
||||
%{_qt6_plugindir}/platforminputcontexts/libcomposeplatforminputcontextplugin.so
|
||||
%{_qt6_plugindir}/platforminputcontexts/libibusplatforminputcontextplugin.so
|
||||
# EGL
|
||||
%if 0%{?egl}
|
||||
%{_qt6_libdir}/libQt6EglFSDeviceIntegration.so.6*
|
||||
%{_qt6_libdir}/libQt6EglFsKmsSupport.so.6*
|
||||
%{_qt6_libdir}/libQt6EglFsKmsGbmSupport.so.6*
|
||||
%{_qt6_plugindir}/platforms/libqeglfs.so
|
||||
%{_qt6_plugindir}/platforms/libqminimalegl.so
|
||||
%dir %{_qt6_plugindir}/egldeviceintegrations/
|
||||
%{_qt6_plugindir}/egldeviceintegrations/libqeglfs-kms-integration.so
|
||||
%{_qt6_plugindir}/egldeviceintegrations/libqeglfs-x11-integration.so
|
||||
%{_qt6_plugindir}/xcbglintegrations/libqxcb-egl-integration.so
|
||||
%{_qt6_plugindir}/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so
|
||||
%{_qt6_plugindir}/egldeviceintegrations/libqeglfs-emu-integration.so
|
||||
%endif
|
||||
# Platforms
|
||||
%{_qt6_plugindir}/platforms/libqlinuxfb.so
|
||||
%{_qt6_plugindir}/platforms/libqminimal.so
|
||||
%{_qt6_plugindir}/platforms/libqoffscreen.so
|
||||
%{_qt6_plugindir}/platforms/libqxcb.so
|
||||
%{_qt6_plugindir}/platforms/libqvnc.so
|
||||
%{_qt6_plugindir}/xcbglintegrations/libqxcb-glx-integration.so
|
||||
# Platformthemes
|
||||
%{_qt6_plugindir}/platformthemes/libqxdgdesktopportal.so
|
||||
%{_qt6_plugindir}/platformthemes/libqgtk3.so
|
||||
%{_qt6_plugindir}/printsupport/libcupsprintersupport.so
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jan 06 2021 Jan Grulich <jgrulich@redhat.com> - 6.0.0-1
|
||||
- 6.0.0
|
||||
13
qtbase-cxxflag.patch
Normal file
13
qtbase-cxxflag.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
|
||||
index e7e6ee1..ff2a939 100644
|
||||
--- a/mkspecs/common/gcc-base.conf
|
||||
+++ b/mkspecs/common/gcc-base.conf
|
||||
@@ -32,7 +32,7 @@
|
||||
#
|
||||
|
||||
QMAKE_CFLAGS_OPTIMIZE = -O2
|
||||
-QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
|
||||
+QMAKE_CFLAGS_OPTIMIZE_FULL = -O2
|
||||
QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
|
||||
QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
|
||||
|
||||
31
qtbase-firebird.patch
Normal file
31
qtbase-firebird.patch
Normal file
@ -0,0 +1,31 @@
|
||||
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
|
||||
index f738e58a..2cd61e9f 100644
|
||||
--- a/src/plugins/sqldrivers/configure.json
|
||||
+++ b/src/plugins/sqldrivers/configure.json
|
||||
@@ -43,10 +43,11 @@
|
||||
"ibase": {
|
||||
"label": "InterBase",
|
||||
"test": {},
|
||||
- "headers": "ibase.h",
|
||||
+ "headers": "firebird/ibase.h",
|
||||
"sources": [
|
||||
{ "libs": "-lgds32_ms", "condition": "config.win32" },
|
||||
- { "libs": "-lgds", "condition": "!config.win32" }
|
||||
+ { "libs": "-lgds", "condition": "!config.win32" },
|
||||
+ { "libs": "-lfbclient", "condition": "!config.win32" }
|
||||
]
|
||||
},
|
||||
"mysql": {
|
||||
diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
|
||||
index 9109c2b4..7477d5ee 100644
|
||||
--- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
|
||||
+++ b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
|
||||
@@ -52,7 +52,7 @@
|
||||
//
|
||||
|
||||
#include <QtSql/qsqldriver.h>
|
||||
-#include <ibase.h>
|
||||
+#include <firebird/ibase.h>
|
||||
|
||||
#ifdef QT_PLUGIN
|
||||
#define Q_EXPORT_SQLDRIVER_IBASE
|
||||
36
qtbase-gcc11.patch
Normal file
36
qtbase-gcc11.patch
Normal file
@ -0,0 +1,36 @@
|
||||
diff --git a/examples/corelib/tools/contiguouscache/randomlistmodel.h b/examples/corelib/tools/contiguouscache/randomlistmodel.h
|
||||
index 1fabb0d9..393ebaa3 100644
|
||||
--- a/examples/corelib/tools/contiguouscache/randomlistmodel.h
|
||||
+++ b/examples/corelib/tools/contiguouscache/randomlistmodel.h
|
||||
@@ -50,6 +50,7 @@
|
||||
#ifndef RANDOMLISTMODEL_H
|
||||
#define RANDOMLISTMODEL_H
|
||||
|
||||
+#include <limits>
|
||||
#include <QContiguousCache>
|
||||
#include <QAbstractListModel>
|
||||
|
||||
diff --git a/src/corelib/text/qanystringview.h b/src/corelib/text/qanystringview.h
|
||||
index a7606253..60747cf0 100644
|
||||
--- a/src/corelib/text/qanystringview.h
|
||||
+++ b/src/corelib/text/qanystringview.h
|
||||
@@ -39,6 +39,7 @@
|
||||
#ifndef QANYSTRINGVIEW_H
|
||||
#define QANYSTRINGVIEW_H
|
||||
|
||||
+#include <limits>
|
||||
#include <QtCore/qstringview.h>
|
||||
#include <QtCore/qutf8stringview.h>
|
||||
|
||||
diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h
|
||||
index 9f646aaa..a5af793c 100644
|
||||
--- a/src/corelib/text/qbytearray.h
|
||||
+++ b/src/corelib/text/qbytearray.h
|
||||
@@ -41,6 +41,7 @@
|
||||
#ifndef QBYTEARRAY_H
|
||||
#define QBYTEARRAY_H
|
||||
|
||||
+#include <limits>
|
||||
#include <QtCore/qrefcount.h>
|
||||
#include <QtCore/qnamespace.h>
|
||||
#include <QtCore/qarraydata.h>
|
||||
16
qtbase-moc-macros.patch
Normal file
16
qtbase-moc-macros.patch
Normal file
@ -0,0 +1,16 @@
|
||||
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
|
||||
index 1cb383c9..6bfdee55 100644
|
||||
--- a/src/tools/moc/main.cpp
|
||||
+++ b/src/tools/moc/main.cpp
|
||||
@@ -230,6 +230,11 @@ int runMoc(int argc, char **argv)
|
||||
Moc moc;
|
||||
pp.macros["Q_MOC_RUN"];
|
||||
pp.macros["__cplusplus"];
|
||||
+ pp.macros["_SYS_SYSMACROS_H_OUTER"];
|
||||
+ Macro macro;
|
||||
+ macro.symbols = Preprocessor::tokenize(QByteArray::number(Q_PROCESSOR_WORDSIZE*8), 1, Preprocessor::TokenizeDefine);
|
||||
+ macro.symbols.removeLast(); // remove the EOF symbol
|
||||
+ pp.macros.insert("__WORDSIZE", macro);
|
||||
|
||||
// Don't stumble over GCC extensions
|
||||
Macro dummyVariadicFunctionMacro;
|
||||
33
qtbase-multilib-optflags.patch
Normal file
33
qtbase-multilib-optflags.patch
Normal file
@ -0,0 +1,33 @@
|
||||
diff -r -u a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf
|
||||
--- a/mkspecs/linux-g++/qmake.conf 2015-10-30 06:20:01.000000000 -0200
|
||||
+++ b/mkspecs/linux-g++/qmake.conf 2015-11-05 11:23:23.230741601 -0200
|
||||
@@ -5,6 +5,7 @@
|
||||
MAKEFILE_GENERATOR = UNIX
|
||||
CONFIG += incremental
|
||||
QMAKE_INCREMENTAL_STYLE = sublib
|
||||
+QMAKE_CFLAGS_RELEASE += -O2
|
||||
|
||||
include(../common/linux.conf)
|
||||
include(../common/gcc-base-unix.conf)
|
||||
diff -r -u a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf
|
||||
--- a/mkspecs/linux-g++-32/qmake.conf 2015-10-30 06:20:01.000000000 -0200
|
||||
+++ b/mkspecs/linux-g++-32/qmake.conf 2015-11-05 11:22:19.761494470 -0200
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
QMAKE_CFLAGS = -m32
|
||||
QMAKE_LFLAGS = -m32
|
||||
+QMAKE_CFLAGS_RELEASE += -O2
|
||||
|
||||
include(../common/gcc-base-unix.conf)
|
||||
include(../common/g++-unix.conf)
|
||||
diff -r -u a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
|
||||
--- a/mkspecs/linux-g++-64/qmake.conf 2015-10-30 06:20:01.000000000 -0200
|
||||
+++ b/mkspecs/linux-g++-64/qmake.conf 2015-11-05 11:22:49.497610248 -0200
|
||||
@@ -13,6 +13,7 @@
|
||||
|
||||
QMAKE_CFLAGS = -m64
|
||||
QMAKE_LFLAGS = -m64
|
||||
+QMAKE_CFLAGS_RELEASE += -O2
|
||||
|
||||
include(../common/gcc-base-unix.conf)
|
||||
include(../common/g++-unix.conf)
|
||||
12
qtbase-mysql.patch
Normal file
12
qtbase-mysql.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.than qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
|
||||
diff -up qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.than qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h
|
||||
--- qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.than 2017-07-14 13:43:50.831203768 +0200
|
||||
+++ qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2017-07-14 13:44:24.364948006 +0200
|
||||
@@ -58,6 +58,7 @@
|
||||
#endif
|
||||
|
||||
#include <mysql.h>
|
||||
+#include <mysql_version.h>
|
||||
|
||||
#ifdef QT_PLUGIN
|
||||
#define Q_EXPORT_SQLDRIVER_MYSQL
|
||||
18
qtbase-no-relocatable.patch
Normal file
18
qtbase-no-relocatable.patch
Normal file
@ -0,0 +1,18 @@
|
||||
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
|
||||
index 301c3ab8..bfb28380 100644
|
||||
--- a/src/corelib/global/qlibraryinfo.cpp
|
||||
+++ b/src/corelib/global/qlibraryinfo.cpp
|
||||
@@ -624,10 +624,11 @@ static QString getPrefix(
|
||||
# if QT_CONFIGURE_CROSSBUILD
|
||||
if (group == QLibraryInfo::DevicePaths)
|
||||
return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH);
|
||||
+# elif 0 //QT_CONFIG(relocatable)
|
||||
+ return getExtPrefixFromHostBinDir();
|
||||
# else
|
||||
- Q_UNUSED(group);
|
||||
+ return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH);
|
||||
# endif
|
||||
- return getExtPrefixFromHostBinDir();
|
||||
#elif QT_CONFIG(relocatable)
|
||||
return getRelocatablePrefix();
|
||||
#else
|
||||
9
qtbase-python3.patch
Normal file
9
qtbase-python3.patch
Normal file
@ -0,0 +1,9 @@
|
||||
diff -up qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py.me qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py
|
||||
--- qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py.me 2018-06-23 11:29:21.750066271 +0200
|
||||
+++ qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py 2018-06-23 11:30:07.457292033 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/python
|
||||
+#!/usr/bin/python3
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
12
qtbase-qmake-lflags.patch
Normal file
12
qtbase-qmake-lflags.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
|
||||
index ea792a7c..5401a5fe 100644
|
||||
--- a/qmake/Makefile.unix
|
||||
+++ b/qmake/Makefile.unix
|
||||
@@ -183,6 +183,7 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
|
||||
CXXFLAGS = $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS)
|
||||
CFLAGS = $(CPPFLAGS) $(CONFIG_CFLAGS)
|
||||
LFLAGS = $(EXTRA_LFLAGS) $(CONFIG_LFLAGS)
|
||||
+LFLAGS = $(EXTRA_LFLAGS) $(CONFIG_LFLAGS) $(QMAKE_LFLAGS_RELEASE)
|
||||
|
||||
first all: $(BUILD_PATH)/bin/qmake$(EXEEXT)
|
||||
qmake: $(BUILD_PATH)/bin/qmake$(EXEEXT)
|
||||
16
qtbase-tell-truth-about-private-api.patch
Normal file
16
qtbase-tell-truth-about-private-api.patch
Normal file
@ -0,0 +1,16 @@
|
||||
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
||||
index 3cacc8df..469e6f50 100644
|
||||
--- a/mkspecs/features/qt_module.prf
|
||||
+++ b/mkspecs/features/qt_module.prf
|
||||
@@ -218,9 +218,9 @@ android: CONFIG += qt_android_deps no_linker_version_script
|
||||
QMAKE_LFLAGS += $${QMAKE_LFLAGS_VERSION_SCRIPT}$$verscript
|
||||
|
||||
internal_module {
|
||||
- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };"
|
||||
+ verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API { *; };"
|
||||
} else {
|
||||
- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \
|
||||
+ verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API {" \
|
||||
" qt_private_api_tag*;"
|
||||
|
||||
private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES
|
||||
22
qtbase-use-wayland-on-gnome.patch
Normal file
22
qtbase-use-wayland-on-gnome.patch
Normal file
@ -0,0 +1,22 @@
|
||||
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
|
||||
index c10b95e2..476e3d3b 100644
|
||||
--- a/src/gui/kernel/qguiapplication.cpp
|
||||
+++ b/src/gui/kernel/qguiapplication.cpp
|
||||
@@ -1412,16 +1412,7 @@ void QGuiApplicationPrivate::createPlatformIntegration()
|
||||
const bool defaultIsWayland = !defaultIsXcb && platformPluginBase.startsWith("wayland");
|
||||
const QByteArray waylandPlatformName = defaultIsWayland ? platformName : "wayland";
|
||||
if (hasWaylandDisplay || isWaylandSessionType) {
|
||||
- const QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP").toLower();
|
||||
- const QByteArray sessionDesktop = qgetenv("XDG_SESSION_DESKTOP").toLower();
|
||||
- const bool isGnome = currentDesktop.contains("gnome") || sessionDesktop.contains("gnome");
|
||||
- if (isGnome) {
|
||||
- qInfo() << "Warning: Ignoring WAYLAND_DISPLAY on Gnome."
|
||||
- << "Use QT_QPA_PLATFORM=wayland to run on Wayland anyway.";
|
||||
- preferredPlatformOrder.append(waylandPlatformName);
|
||||
- } else {
|
||||
- preferredPlatformOrder.prepend(waylandPlatformName);
|
||||
- }
|
||||
+ preferredPlatformOrder.prepend(waylandPlatformName);
|
||||
|
||||
if (defaultIsWayland)
|
||||
platformName.clear();
|
||||
13
qtbase-version-check.patch
Normal file
13
qtbase-version-check.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
|
||||
index c6b5c5a9..bb0076b3 100644
|
||||
--- a/src/corelib/global/qglobal.h
|
||||
+++ b/src/corelib/global/qglobal.h
|
||||
@@ -58,7 +58,7 @@
|
||||
/*
|
||||
can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
|
||||
*/
|
||||
-#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
|
||||
+#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor, qt_version_check_patch) ((qt_version_check_major<<16)|(qt_version_check_minor<<8)|(qt_version_check_patch))
|
||||
|
||||
#ifdef QT_BOOTSTRAPPED
|
||||
#include <QtCore/qconfig-bootstrapped.h>
|
||||
3
qtlogging.ini
Normal file
3
qtlogging.ini
Normal file
@ -0,0 +1,3 @@
|
||||
[Rules]
|
||||
*.debug=false
|
||||
qt.qpa.xcb.xcberror.warning=false
|
||||
Loading…
Reference in New Issue
Block a user