|
@@ -1,5 +1,7 @@
|
|
%bcond_with systemd
|
|
%bcond_with systemd
|
|
-%bcond_with gcc6
|
|
|
|
|
|
+%bcond_without gcc6
|
|
|
|
+%bcond_without system_xkbcommon
|
|
|
|
+%bcond_with docs
|
|
|
|
|
|
%define _unpackaged_files_terminate_build 1
|
|
%define _unpackaged_files_terminate_build 1
|
|
|
|
|
|
@@ -19,6 +21,8 @@
|
|
%endif
|
|
%endif
|
|
%endif
|
|
%endif
|
|
|
|
|
|
|
|
+%global platform linux-g++
|
|
|
|
+
|
|
%global qt_module qtbase
|
|
%global qt_module qtbase
|
|
|
|
|
|
%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
|
%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
|
@@ -51,14 +55,16 @@ BuildRequires: pkgconfig(libsystemd)
|
|
# only primary archs (for now), allow secondary to bootstrap
|
|
# only primary archs (for now), allow secondary to bootstrap
|
|
%if ! 0%{?bootstrap}
|
|
%if ! 0%{?bootstrap}
|
|
%ifarch %{arm} %{ix86} x86_64 %{power64} s390 s390x aarch64
|
|
%ifarch %{arm} %{ix86} x86_64 %{power64} s390 s390x aarch64
|
|
|
|
+%if %{with docs}
|
|
%global docs 1
|
|
%global docs 1
|
|
%endif
|
|
%endif
|
|
|
|
+%endif
|
|
%global examples 1
|
|
%global examples 1
|
|
%global tests 1
|
|
%global tests 1
|
|
%endif
|
|
%endif
|
|
|
|
|
|
-%global qt5_minorver 5.6
|
|
|
|
-%global qt5_version 5.6.3
|
|
|
|
|
|
+%global qt5_version 5.12.5
|
|
|
|
+%global qt5_minorver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
|
|
#global qt5_patchlevel 1
|
|
#global qt5_patchlevel 1
|
|
|
|
|
|
Summary: Qt5 - QtBase components
|
|
Summary: Qt5 - QtBase components
|
|
@@ -68,12 +74,12 @@ Release: 1%{?_dist_release}
|
|
|
|
|
|
# See LGPL_EXCEPTIONS.txt, for exception details
|
|
# See LGPL_EXCEPTIONS.txt, for exception details
|
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
|
-Url: http://qt-project.org/
|
|
|
|
|
|
+Url: https://qt-project.org/
|
|
|
|
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
Distribution: Vine Linux
|
|
Distribution: Vine Linux
|
|
|
|
|
|
-Source0: http://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
|
|
|
|
|
|
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
|
|
|
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1227295
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1227295
|
|
Source1: qtlogging.ini
|
|
Source1: qtlogging.ini
|
|
@@ -86,65 +92,81 @@ Source5: qconfig-multilib.h
|
|
# QT_XCB_FORCE_SOFTWARE_OPENGL for them
|
|
# QT_XCB_FORCE_SOFTWARE_OPENGL for them
|
|
Source6: 10-qt5-check-opengl2.sh
|
|
Source6: 10-qt5-check-opengl2.sh
|
|
|
|
|
|
|
|
+# macros
|
|
|
|
+Source10: macros.qt5-qtbase
|
|
|
|
+
|
|
# support multilib optflags
|
|
# support multilib optflags
|
|
Patch2: qtbase-multilib_optflags.patch
|
|
Patch2: qtbase-multilib_optflags.patch
|
|
|
|
|
|
# fix QTBUG-35459 (too low entityCharacterLimit=1024 for CVE-2013-4549)
|
|
# fix QTBUG-35459 (too low entityCharacterLimit=1024 for CVE-2013-4549)
|
|
Patch4: qtbase-opensource-src-5.3.2-QTBUG-35459.patch
|
|
Patch4: qtbase-opensource-src-5.3.2-QTBUG-35459.patch
|
|
|
|
|
|
|
|
+# 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.
|
|
|
|
+Patch8: tell-the-truth-about-private-api.patch
|
|
|
|
+
|
|
# upstreamable patches
|
|
# upstreamable patches
|
|
|
|
+# namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
|
|
|
|
+Patch50: qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch
|
|
|
|
|
|
-# Workaround moc/multilib issues
|
|
|
|
|
|
+# 1381828 - Broken window scaling for some QT5 applications (#1381828)
|
|
|
|
+# This patch moves the threshold for 2x scaling from the DPI of 144 to 192,
|
|
|
|
+# the same value GNOME uses. It's not a complete solution...
|
|
|
|
+Patch51: qtbase-hidpi_scale_at_192.patch
|
|
|
|
+
|
|
|
|
+# 1. Workaround moc/multilib issues
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1290020
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1290020
|
|
# https://bugreports.qt.io/browse/QTBUG-49972
|
|
# https://bugreports.qt.io/browse/QTBUG-49972
|
|
-Patch52: qtbase-opensource-src-5.6.0-moc_WORDSIZE.patch
|
|
|
|
|
|
+# 2. Workaround sysmacros.h (pre)defining major/minor a breaking stuff
|
|
|
|
+Patch52: qtbase-opensource-src-5.7.1-moc_macros.patch
|
|
|
|
|
|
-# arm patch
|
|
|
|
-Patch54: qtbase-opensource-src-5.6.0-arm.patch
|
|
|
|
|
|
+# CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui
|
|
|
|
+# https://bugzilla.redhat.com/1704474
|
|
|
|
+Patch53: qtbase-everywhere-src-5.12.1-qt5gui_cmake_isystem_includes.patch
|
|
|
|
|
|
-# recently passed code review, not integrated yet
|
|
|
|
-# https://codereview.qt-project.org/126102/
|
|
|
|
-Patch60: moc-get-the-system-defines-from-the-compiler-itself.patch
|
|
|
|
|
|
+# respect QMAKE_LFLAGS_RELEASE when building qmake
|
|
|
|
+Patch54: qtbase-qmake_LFLAGS.patch
|
|
|
|
|
|
# drop -O3 and make -O2 by default
|
|
# drop -O3 and make -O2 by default
|
|
Patch61: qt5-qtbase-cxxflag.patch
|
|
Patch61: qt5-qtbase-cxxflag.patch
|
|
|
|
|
|
-## upstream patches
|
|
|
|
|
|
+# support firebird version 3.x
|
|
|
|
+Patch64: qt5-qtbase-5.12.1-firebird.patch
|
|
|
|
+
|
|
|
|
+# fix for new mariadb
|
|
|
|
+Patch65: qtbase-opensource-src-5.9.0-mysql.patch
|
|
|
|
+
|
|
|
|
+# use categorized logging for xcb log entries
|
|
|
|
+# https://bugreports.qt.io/browse/QTBUG-55167
|
|
|
|
+# https://bugzilla.redhat.com/show_bug.cgi?id=1497564
|
|
|
|
+Patch67: https://bugreports.qt.io/secure/attachment/66353/xcberror_filter.patch
|
|
|
|
|
|
|
|
+# python3
|
|
|
|
+Patch68: qtbase-everywhere-src-5.11.1-python3.patch
|
|
|
|
|
|
-# to compile with icu >= 59
|
|
|
|
-Patch1000: qtbase-5.6.3-icu.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
|
|
|
|
|
|
-# macros, be mindful to keep sync'd with macros.qt5
|
|
|
|
-Source10: macros.qt5
|
|
|
|
|
|
+
|
|
|
|
+# macros, be mindful to keep sync'd with macros.qt5-base
|
|
%define _qt5 %{name}
|
|
%define _qt5 %{name}
|
|
-%define _qt5_prefix %{_libdir}/qt5
|
|
|
|
-%define _qt5_archdatadir %{_libdir}/qt5
|
|
|
|
-# -devel bindir items (still) conflict with qt4
|
|
|
|
-# at least until this is all implemented,
|
|
|
|
-# http://lists.qt-project.org/pipermail/development/2012-November/007990.html
|
|
|
|
-%define _qt5_bindir %{_qt5_prefix}/bin
|
|
|
|
-%define _qt5_datadir %{_datadir}/qt5
|
|
|
|
-%define _qt5_docdir %{_docdir}/qt5
|
|
|
|
-%define _qt5_examplesdir %{_qt5_prefix}/examples
|
|
|
|
-%define _qt5_headerdir %{_includedir}/qt5
|
|
|
|
-%define _qt5_importdir %{_qt5_archdatadir}/imports
|
|
|
|
-%define _qt5_libdir %{_libdir}
|
|
|
|
-%define _qt5_libexecdir %{_qt5_archdatadir}/libexec
|
|
|
|
-%define _qt5_plugindir %{_qt5_archdatadir}/plugins
|
|
|
|
-%define _qt5_settingsdir %{_sysconfdir}/xdg
|
|
|
|
-%define _qt5_sysconfdir %{_qt5_settingsdir}
|
|
|
|
-%define _qt5_translationdir %{_datadir}/qt5/translations
|
|
|
|
|
|
|
|
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
|
|
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
|
|
# Those themes are there for platform integration. If the required libraries are
|
|
# 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
|
|
# 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
|
|
# silently ignore the plugin that fails to load. Thus, there is no need to let
|
|
-# RPM drag in gtk2 as a dependency for the GTK+ 2 dialog support.
|
|
|
|
|
|
+# RPM drag in gtk3 as a dependency for the GTK+ 2 dialog support.
|
|
%global __requires_exclude_from ^%{_qt5_plugindir}/platformthemes/.*$
|
|
%global __requires_exclude_from ^%{_qt5_plugindir}/platformthemes/.*$
|
|
|
|
+# filter plugin provides
|
|
|
|
+%global __provides_exclude_from ^%{_qt5_plugindir}/.*\\.so$
|
|
|
|
|
|
# for %%check
|
|
# for %%check
|
|
BuildRequires: cmake
|
|
BuildRequires: cmake
|
|
|
|
+BuildRequires: qt5-rpm-macros
|
|
|
|
+BuildRequires: qt5-srpm-macros
|
|
BuildRequires: cups-devel
|
|
BuildRequires: cups-devel
|
|
BuildRequires: desktop-file-utils
|
|
BuildRequires: desktop-file-utils
|
|
BuildRequires: findutils
|
|
BuildRequires: findutils
|
|
@@ -161,7 +183,7 @@ BuildRequires: pkgconfig(libdrm)
|
|
BuildRequires: pkgconfig(fontconfig)
|
|
BuildRequires: pkgconfig(fontconfig)
|
|
BuildRequires: pkgconfig(gl)
|
|
BuildRequires: pkgconfig(gl)
|
|
BuildRequires: pkgconfig(glib-2.0)
|
|
BuildRequires: pkgconfig(glib-2.0)
|
|
-BuildRequires: pkgconfig(gtk+-2.0)
|
|
|
|
|
|
+BuildRequires: pkgconfig(gtk+-3.0)
|
|
BuildRequires: pkgconfig(libproxy-1.0)
|
|
BuildRequires: pkgconfig(libproxy-1.0)
|
|
# xcb-sm
|
|
# xcb-sm
|
|
BuildRequires: pkgconfig(ice) pkgconfig(sm)
|
|
BuildRequires: pkgconfig(ice) pkgconfig(sm)
|
|
@@ -170,17 +192,15 @@ BuildRequires: pkgconfig(libudev)
|
|
%global openssl -openssl-linked
|
|
%global openssl -openssl-linked
|
|
BuildRequires: pkgconfig(openssl)
|
|
BuildRequires: pkgconfig(openssl)
|
|
BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
|
|
BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
|
|
-%if 0%{?fedora}
|
|
|
|
-%global xkbcommon -system-xkbcommon
|
|
|
|
|
|
+%if %{with system_xkbcommon}
|
|
|
|
+%global xkbcommon -xkbcommon
|
|
BuildRequires: pkgconfig(libinput)
|
|
BuildRequires: pkgconfig(libinput)
|
|
BuildRequires: pkgconfig(xcb-xkb) >= 1.10
|
|
BuildRequires: pkgconfig(xcb-xkb) >= 1.10
|
|
BuildRequires: pkgconfig(xkbcommon) >= 0.4.1
|
|
BuildRequires: pkgconfig(xkbcommon) >= 0.4.1
|
|
BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1
|
|
BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1
|
|
%else
|
|
%else
|
|
# not Fedora
|
|
# not Fedora
|
|
-%if 0%{?rhel} == 6
|
|
|
|
%global xcb -qt-xcb
|
|
%global xcb -qt-xcb
|
|
-%endif
|
|
|
|
%global xkbcommon -qt-xkbcommon
|
|
%global xkbcommon -qt-xkbcommon
|
|
Provides: bundled(libxkbcommon) = 0.4.1
|
|
Provides: bundled(libxkbcommon) = 0.4.1
|
|
%endif
|
|
%endif
|
|
@@ -194,7 +214,8 @@ BuildRequires: pkgconfig(sqlite3) >= 3.7
|
|
%global harfbuzz -system-harfbuzz
|
|
%global harfbuzz -system-harfbuzz
|
|
BuildRequires: pkgconfig(harfbuzz) >= 0.9.42
|
|
BuildRequires: pkgconfig(harfbuzz) >= 0.9.42
|
|
BuildRequires: pkgconfig(icu-i18n)
|
|
BuildRequires: pkgconfig(icu-i18n)
|
|
-BuildRequires: pkgconfig(libpcre) >= 8.30
|
|
|
|
|
|
+BuildRequires: pkgconfig(libpcre2-posix) >= 10.20
|
|
|
|
+BuildRequires: pkgconfig(libpcre) >= 8.0
|
|
%define pcre -system-pcre
|
|
%define pcre -system-pcre
|
|
BuildRequires: pkgconfig(xcb-xkb)
|
|
BuildRequires: pkgconfig(xcb-xkb)
|
|
BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil)
|
|
BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil)
|
|
@@ -241,7 +262,6 @@ Requires: %{name}-gui%{?_isa}
|
|
Requires: pkgconfig(egl)
|
|
Requires: pkgconfig(egl)
|
|
%endif
|
|
%endif
|
|
Requires: pkgconfig(gl)
|
|
Requires: pkgconfig(gl)
|
|
-Requires: qt5-rpm-macros
|
|
|
|
%description devel
|
|
%description devel
|
|
%{summary}.
|
|
%{summary}.
|
|
|
|
|
|
@@ -268,7 +288,7 @@ Summary: Static library files for %{name}
|
|
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
|
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
|
Requires: pkgconfig(fontconfig)
|
|
Requires: pkgconfig(fontconfig)
|
|
Requires: pkgconfig(glib-2.0)
|
|
Requires: pkgconfig(glib-2.0)
|
|
-%if 0%{?fedora}
|
|
|
|
|
|
+%if %{with system_xkbcommon}
|
|
Requires: pkgconfig(libinput)
|
|
Requires: pkgconfig(libinput)
|
|
Requires: pkgconfig(xkbcommon)
|
|
Requires: pkgconfig(xkbcommon)
|
|
%endif
|
|
%endif
|
|
@@ -330,58 +350,34 @@ Requires: glx-utils
|
|
%description gui
|
|
%description gui
|
|
Qt5 libraries used for drawing widgets and OpenGL items.
|
|
Qt5 libraries used for drawing widgets and OpenGL items.
|
|
|
|
|
|
-%package -n qt5-rpm-macros
|
|
|
|
-Summary: RPM macros for Qt5
|
|
|
|
-%if 0%{?fedora} > 22 && 0%{?inject_optflags}
|
|
|
|
-# https://bugzilla.redhat.com/show_bug.cgi?id=1248174
|
|
|
|
-Requires: redhat-rpm-config
|
|
|
|
-%endif
|
|
|
|
-# when qt5-rpm-macros was split out
|
|
|
|
-Conflicts: qt5-qtbase-devel < 5.6.0-0.23
|
|
|
|
-BuildArch: noarch
|
|
|
|
-%description -n qt5-rpm-macros
|
|
|
|
-RPM macros for building Qt5 packages.
|
|
|
|
-
|
|
|
|
|
|
|
|
%prep
|
|
%prep
|
|
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
|
|
|
|
|
|
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
|
|
|
|
|
|
%patch4 -p1 -b .QTBUG-35459
|
|
%patch4 -p1 -b .QTBUG-35459
|
|
-
|
|
|
|
-%patch52 -p1 -b .moc_WORDSIZE
|
|
|
|
-%patch54 -p1 -b .arm
|
|
|
|
-%patch60 -p1 -b .moc_system_defines
|
|
|
|
|
|
+# omit '-b .tell-the-truth-about-private-api' so it doesn't end up in installed files -- rdieter
|
|
|
|
+%patch8 -p1
|
|
|
|
+
|
|
|
|
+%patch50 -p1 -b .QT_VERSION_CHECK
|
|
|
|
+%patch51 -p1 -b .hidpi_scale_at_192
|
|
|
|
+%patch52 -p1 -b .moc_macros
|
|
|
|
+%patch53 -p1 -b .qt5gui_cmake_isystem_includes
|
|
|
|
+%patch54 -p1 -b .qmake_LFLAGS
|
|
%patch61 -p1 -b .qt5-qtbase-cxxflag
|
|
%patch61 -p1 -b .qt5-qtbase-cxxflag
|
|
|
|
+%patch64 -p1 -b .firebird
|
|
|
|
+%if 0%{?fedora} > 27
|
|
|
|
+%patch65 -p1 -b .mysql
|
|
|
|
+%endif
|
|
|
|
+# FIXME/REBASE
|
|
|
|
+#patch67 -p1 -b .xcberror_filter
|
|
|
|
+%patch68 -p1
|
|
|
|
|
|
-%patch1000 -p0 -b .icu59
|
|
|
|
-
|
|
|
|
-%define platform linux-g++
|
|
|
|
-
|
|
|
|
-%if 0%{?inject_optflags}
|
|
|
|
-## adjust $RPM_OPT_FLAGS
|
|
|
|
-# remove -fexceptions
|
|
|
|
-RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
|
|
|
|
-#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -std=c++11"
|
|
|
|
-# these flags are for qtbase build only, no need to propogate elsewhere
|
|
|
|
-#RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?qt5_deprecated_flag} %{?qt5_arm_flag}"
|
|
|
|
-
|
|
|
|
-%patch2 -p1 -b .multilib_optflags
|
|
|
|
-# drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463
|
|
|
|
-rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
|
|
|
|
-
|
|
|
|
-sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" \
|
|
|
|
- mkspecs/%{platform}/qmake.conf
|
|
|
|
-
|
|
|
|
-sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 $RPM_LD_FLAGS|" \
|
|
|
|
- mkspecs/common/g++-unix.conf
|
|
|
|
|
|
+#if 0%{?fedora} > 30
|
|
|
|
+#patch80 -p1 -b .use-wayland-on-gnome.patch
|
|
|
|
+#endif
|
|
|
|
|
|
-# undefine QMAKE_STRIP (and friends), so we get useful -debuginfo pkgs (#1065636)
|
|
|
|
-sed -i -e 's|^\(QMAKE_STRIP.*=\).*$|\1|g' mkspecs/common/linux.conf
|
|
|
|
-%endif
|
|
|
|
|
|
|
|
-%if 0%{?prerelease}
|
|
|
|
-bin/syncqt.pl -version %{version}
|
|
|
|
-%endif
|
|
|
|
|
|
+%define platform linux-g++
|
|
|
|
|
|
# move some bundled libs to ensure they're not accidentally used
|
|
# move some bundled libs to ensure they're not accidentally used
|
|
pushd src/3rdparty
|
|
pushd src/3rdparty
|
|
@@ -400,6 +396,12 @@ popd
|
|
# check to ensure that can't happen -- rex
|
|
# check to ensure that can't happen -- rex
|
|
test -x configure || chmod +x configure
|
|
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
|
|
%build
|
|
## FIXME/TODO:
|
|
## FIXME/TODO:
|
|
@@ -409,7 +411,6 @@ test -x configure || chmod +x configure
|
|
## adjust $RPM_OPT_FLAGS
|
|
## adjust $RPM_OPT_FLAGS
|
|
# remove -fexceptions
|
|
# remove -fexceptions
|
|
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
|
|
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
|
|
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -std=c++11"
|
|
|
|
RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?qt5_arm_flag} %{?qt5_deprecated_flag} %{?qt5_null_flag}"
|
|
RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?qt5_arm_flag} %{?qt5_deprecated_flag} %{?qt5_null_flag}"
|
|
|
|
|
|
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
|
|
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
|
|
@@ -423,13 +424,13 @@ export MAKEFLAGS="%{?_smp_mflags}"
|
|
-prefix %{_qt5_prefix} \
|
|
-prefix %{_qt5_prefix} \
|
|
-archdatadir %{_qt5_archdatadir} \
|
|
-archdatadir %{_qt5_archdatadir} \
|
|
-bindir %{_qt5_bindir} \
|
|
-bindir %{_qt5_bindir} \
|
|
|
|
+ -libdir %{_qt5_libdir} \
|
|
|
|
+ -libexecdir %{_qt5_libexecdir} \
|
|
-datadir %{_qt5_datadir} \
|
|
-datadir %{_qt5_datadir} \
|
|
-docdir %{_qt5_docdir} \
|
|
-docdir %{_qt5_docdir} \
|
|
-examplesdir %{_qt5_examplesdir} \
|
|
-examplesdir %{_qt5_examplesdir} \
|
|
-headerdir %{_qt5_headerdir} \
|
|
-headerdir %{_qt5_headerdir} \
|
|
-importdir %{_qt5_importdir} \
|
|
-importdir %{_qt5_importdir} \
|
|
- -libdir %{_qt5_libdir} \
|
|
|
|
- -libexecdir %{_qt5_libexecdir} \
|
|
|
|
-plugindir %{_qt5_plugindir} \
|
|
-plugindir %{_qt5_plugindir} \
|
|
-sysconfdir %{_qt5_sysconfdir} \
|
|
-sysconfdir %{_qt5_sysconfdir} \
|
|
-translationdir %{_qt5_translationdir} \
|
|
-translationdir %{_qt5_translationdir} \
|
|
@@ -440,13 +441,12 @@ export MAKEFLAGS="%{?_smp_mflags}"
|
|
%{?dbus}%{!?dbus:-dbus-runtime} \
|
|
%{?dbus}%{!?dbus:-dbus-runtime} \
|
|
-fontconfig \
|
|
-fontconfig \
|
|
-glib \
|
|
-glib \
|
|
- -gtkstyle \
|
|
|
|
|
|
+ -gtk \
|
|
%{?ibase} \
|
|
%{?ibase} \
|
|
- -iconv \
|
|
|
|
-icu \
|
|
-icu \
|
|
%{?journald} \
|
|
%{?journald} \
|
|
- %{?openssl} \
|
|
|
|
-optimized-qmake \
|
|
-optimized-qmake \
|
|
|
|
+ %{?openssl} \
|
|
%{!?examples:-nomake examples} \
|
|
%{!?examples:-nomake examples} \
|
|
%{!?tests:-nomake tests} \
|
|
%{!?tests:-nomake tests} \
|
|
-no-pch \
|
|
-no-pch \
|
|
@@ -465,17 +465,21 @@ export MAKEFLAGS="%{?_smp_mflags}"
|
|
%{?xcb} \
|
|
%{?xcb} \
|
|
%{?xkbcommon} \
|
|
%{?xkbcommon} \
|
|
-system-zlib \
|
|
-system-zlib \
|
|
- -no-directfb
|
|
|
|
|
|
+ -no-use-gold-linker \
|
|
|
|
+ -no-directfb \
|
|
|
|
+ -no-feature-renameat2 \
|
|
|
|
+ -no-feature-statx \
|
|
|
|
+ QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \
|
|
|
|
+ QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \
|
|
|
|
+ QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}"
|
|
|
|
|
|
-%if ! 0%{?inject_optflags}
|
|
|
|
# ensure qmake build using optflags (which can happen if not munging qmake.conf defaults)
|
|
# ensure qmake build using optflags (which can happen if not munging qmake.conf defaults)
|
|
make clean -C qmake
|
|
make clean -C qmake
|
|
-make %{?_smp_mflags} -C qmake \
|
|
|
|
|
|
+make %{?_smp_mflags} -C qmake all binary \
|
|
QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \
|
|
QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \
|
|
QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \
|
|
QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \
|
|
QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}" \
|
|
QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}" \
|
|
QMAKE_STRIP=
|
|
QMAKE_STRIP=
|
|
-%endif
|
|
|
|
|
|
|
|
make %{?_smp_mflags}
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
@@ -490,6 +494,8 @@ make qch_docs
|
|
|
|
|
|
|
|
|
|
%install
|
|
%install
|
|
|
|
+rm -rf %{buildroot}
|
|
|
|
+
|
|
make install INSTALL_ROOT=%{buildroot}
|
|
make install INSTALL_ROOT=%{buildroot}
|
|
|
|
|
|
%if 0%{?docs}
|
|
%if 0%{?docs}
|
|
@@ -525,7 +531,7 @@ EOF
|
|
|
|
|
|
# rpm macros
|
|
# rpm macros
|
|
install -p -m644 -D %{SOURCE10} \
|
|
install -p -m644 -D %{SOURCE10} \
|
|
- %{buildroot}%{rpm_macros_dir}/macros.qt5
|
|
|
|
|
|
+ %{buildroot}%{rpm_macros_dir}/macros.qt5-qtbase
|
|
sed -i \
|
|
sed -i \
|
|
-e "s|@@NAME@@|%{name}|g" \
|
|
-e "s|@@NAME@@|%{name}|g" \
|
|
-e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \
|
|
-e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \
|
|
@@ -535,7 +541,7 @@ sed -i \
|
|
-e "s|@@QT5_CXXFLAGS@@|%{?qt5_cxxflags}|g" \
|
|
-e "s|@@QT5_CXXFLAGS@@|%{?qt5_cxxflags}|g" \
|
|
-e "s|@@QT5_RPM_LD_FLAGS@@|%{?qt5_rpm_ld_flags}|g" \
|
|
-e "s|@@QT5_RPM_LD_FLAGS@@|%{?qt5_rpm_ld_flags}|g" \
|
|
-e "s|@@QT5_RPM_OPT_FLAGS@@|%{?qt5_rpm_opt_flags} %{?qt5_null_flag}|g" \
|
|
-e "s|@@QT5_RPM_OPT_FLAGS@@|%{?qt5_rpm_opt_flags} %{?qt5_null_flag}|g" \
|
|
- %{buildroot}%{rpm_macros_dir}/macros.qt5
|
|
|
|
|
|
+ %{buildroot}%{rpm_macros_dir}/macros.qt5-qtbase
|
|
|
|
|
|
# create/own dirs
|
|
# create/own dirs
|
|
mkdir -p %{buildroot}{%{_qt5_archdatadir}/mkspecs/modules,%{_qt5_importdir},%{_qt5_libexecdir},%{_qt5_plugindir}/{designer,iconengines,script,styles},%{_qt5_translationdir}}
|
|
mkdir -p %{buildroot}{%{_qt5_archdatadir}/mkspecs/modules,%{_qt5_importdir},%{_qt5_libexecdir},%{_qt5_plugindir}/{designer,iconengines,script,styles},%{_qt5_translationdir}}
|
|
@@ -567,7 +573,7 @@ popd
|
|
%if 0%{?qtchooser}
|
|
%if 0%{?qtchooser}
|
|
mkdir -p %{buildroot}%{_sysconfdir}/xdg/qtchooser
|
|
mkdir -p %{buildroot}%{_sysconfdir}/xdg/qtchooser
|
|
pushd %{buildroot}%{_sysconfdir}/xdg/qtchooser
|
|
pushd %{buildroot}%{_sysconfdir}/xdg/qtchooser
|
|
- echo "%{_qt5_bindir}" > 5-%{__isa_bits}.conf
|
|
|
|
|
|
+# echo "%{_qt5_bindir}" > 5-%{__isa_bits}.conf
|
|
echo "%{_qt5_prefix}" >> 5-%{__isa_bits}.conf
|
|
echo "%{_qt5_prefix}" >> 5-%{__isa_bits}.conf
|
|
# alternatives targets
|
|
# alternatives targets
|
|
touch default.conf 5.conf
|
|
touch default.conf 5.conf
|
|
@@ -588,8 +594,30 @@ popd
|
|
|
|
|
|
install -p -m755 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/10-qt5-check-opengl2.sh
|
|
install -p -m755 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/10-qt5-check-opengl2.sh
|
|
|
|
|
|
|
|
+# f29+ enables sse2 unconditionally on ix86 -- rex
|
|
|
|
+%if 0%{?fedora} < 29
|
|
|
|
+# fix bz#1442553 multilib issue
|
|
|
|
+privat_header_file=%{buildroot}%{_qt5_headerdir}/QtCore/%{version}/QtCore/private/qconfig_p.h
|
|
|
|
+grep -v QT_FEATURE_sse2 $privat_header_file > ${privat_header_file}.me
|
|
|
|
+mv ${privat_header_file}.me ${privat_header_file}
|
|
|
|
+cat >>${privat_header_file}<<EOF
|
|
|
|
+#if defined(__x86_64__)
|
|
|
|
+#define QT_FEATURE_sse2 1
|
|
|
|
+#elif defined(__i386__)
|
|
|
|
+#define QT_FEATURE_sse2 -1
|
|
|
|
+#endif
|
|
|
|
+EOF
|
|
|
|
+%endif
|
|
|
|
+
|
|
|
|
+# install privat headers for qtxcb
|
|
|
|
+mkdir -p %{buildroot}%{_qt5_headerdir}/QtXcb
|
|
|
|
+install -m 644 src/plugins/platforms/xcb/*.h %{buildroot}%{_qt5_headerdir}/QtXcb/
|
|
|
|
+
|
|
|
|
|
|
%check
|
|
%check
|
|
|
|
+# verify Qt5.pc
|
|
|
|
+export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
|
|
|
|
+test "$(pkg-config --modversion Qt5)" = "%{version}"
|
|
%if 0%{?tests}
|
|
%if 0%{?tests}
|
|
## see tests/README for expected environment (running a plasma session essentially)
|
|
## see tests/README for expected environment (running a plasma session essentially)
|
|
## we are not quite there yet
|
|
## we are not quite there yet
|
|
@@ -652,7 +680,9 @@ fi
|
|
|
|
|
|
%files
|
|
%files
|
|
%{!?_licensedir:%global license %%doc}
|
|
%{!?_licensedir:%global license %%doc}
|
|
-%license LICENSE.LGPL* LGPL_EXCEPTION.txt LICENSE.FDL
|
|
|
|
|
|
+%license LICENSE.FDL
|
|
|
|
+%license LICENSE.GPL*
|
|
|
|
+%license LICENSE.LGPL*
|
|
%if 0%{?qtchooser}
|
|
%if 0%{?qtchooser}
|
|
%dir %{_sysconfdir}/xdg/qtchooser
|
|
%dir %{_sysconfdir}/xdg/qtchooser
|
|
# not editable config files, so not using %%config here
|
|
# not editable config files, so not using %%config here
|
|
@@ -685,7 +715,10 @@ fi
|
|
%{_qt5_docdir}/global/
|
|
%{_qt5_docdir}/global/
|
|
%{_qt5_importdir}/
|
|
%{_qt5_importdir}/
|
|
%{_qt5_translationdir}/
|
|
%{_qt5_translationdir}/
|
|
|
|
+%if "%{_qt5_prefix}" != "%{_prefix}"
|
|
%dir %{_qt5_prefix}/
|
|
%dir %{_qt5_prefix}/
|
|
|
|
+%endif
|
|
|
|
+%dir %{_qt5_archdatadir}/
|
|
%dir %{_qt5_datadir}/
|
|
%dir %{_qt5_datadir}/
|
|
%{_qt5_datadir}/qtlogging.ini
|
|
%{_qt5_datadir}/qtlogging.ini
|
|
%dir %{_qt5_libexecdir}/
|
|
%dir %{_qt5_libexecdir}/
|
|
@@ -712,7 +745,8 @@ fi
|
|
%{_qt5_libdir}/cmake/Qt5Sql/Qt5Sql_QSQLiteDriverPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Sql/Qt5Sql_QSQLiteDriverPlugin.cmake
|
|
|
|
|
|
%files common
|
|
%files common
|
|
-# empty for now, consider: filesystem/dir ownership, licenses
|
|
|
|
|
|
+# mostly empty for now, consider: filesystem/dir ownership, licenses
|
|
|
|
+%{rpm_macros_dir}/macros.qt5-qtbase
|
|
|
|
|
|
%if 0%{?docs}
|
|
%if 0%{?docs}
|
|
%files doc
|
|
%files doc
|
|
@@ -753,6 +787,7 @@ fi
|
|
%{_bindir}/uic*
|
|
%{_bindir}/uic*
|
|
%{_bindir}/qlalr
|
|
%{_bindir}/qlalr
|
|
%{_bindir}/fixqt4headers.pl
|
|
%{_bindir}/fixqt4headers.pl
|
|
|
|
+%{_bindir}/qvkgen
|
|
%{_qt5_bindir}/moc*
|
|
%{_qt5_bindir}/moc*
|
|
%{_qt5_bindir}/qdbuscpp2xml*
|
|
%{_qt5_bindir}/qdbuscpp2xml*
|
|
%{_qt5_bindir}/qdbusxml2cpp*
|
|
%{_qt5_bindir}/qdbusxml2cpp*
|
|
@@ -762,6 +797,7 @@ fi
|
|
%{_qt5_bindir}/uic*
|
|
%{_qt5_bindir}/uic*
|
|
%{_qt5_bindir}/qlalr
|
|
%{_qt5_bindir}/qlalr
|
|
%{_qt5_bindir}/fixqt4headers.pl
|
|
%{_qt5_bindir}/fixqt4headers.pl
|
|
|
|
+%{_qt5_bindir}/qvkgen
|
|
%if "%{_qt5_headerdir}" != "%{_includedir}"
|
|
%if "%{_qt5_headerdir}" != "%{_includedir}"
|
|
%dir %{_qt5_headerdir}
|
|
%dir %{_qt5_headerdir}
|
|
%endif
|
|
%endif
|
|
@@ -776,7 +812,11 @@ fi
|
|
%{_qt5_headerdir}/QtSql/
|
|
%{_qt5_headerdir}/QtSql/
|
|
%{_qt5_headerdir}/QtTest/
|
|
%{_qt5_headerdir}/QtTest/
|
|
%{_qt5_headerdir}/QtWidgets/
|
|
%{_qt5_headerdir}/QtWidgets/
|
|
|
|
+%{_qt5_headerdir}/QtXcb/
|
|
%{_qt5_headerdir}/QtXml/
|
|
%{_qt5_headerdir}/QtXml/
|
|
|
|
+%{_qt5_headerdir}/QtEglFSDeviceIntegration
|
|
|
|
+%{_qt5_headerdir}/QtInputSupport
|
|
|
|
+%{_qt5_headerdir}/QtEdidSupport
|
|
%{_qt5_archdatadir}/mkspecs/
|
|
%{_qt5_archdatadir}/mkspecs/
|
|
%{_qt5_libdir}/libQt5Concurrent.prl
|
|
%{_qt5_libdir}/libQt5Concurrent.prl
|
|
%{_qt5_libdir}/libQt5Concurrent.so
|
|
%{_qt5_libdir}/libQt5Concurrent.so
|
|
@@ -802,6 +842,8 @@ fi
|
|
%{_qt5_libdir}/libQt5XcbQpa.so
|
|
%{_qt5_libdir}/libQt5XcbQpa.so
|
|
%{_qt5_libdir}/libQt5Xml.prl
|
|
%{_qt5_libdir}/libQt5Xml.prl
|
|
%{_qt5_libdir}/libQt5Xml.so
|
|
%{_qt5_libdir}/libQt5Xml.so
|
|
|
|
+%{_qt5_libdir}/libQt5EglFSDeviceIntegration.prl
|
|
|
|
+%{_qt5_libdir}/libQt5EglFSDeviceIntegration.so
|
|
%{_qt5_libdir}/cmake/Qt5/Qt5Config*.cmake
|
|
%{_qt5_libdir}/cmake/Qt5/Qt5Config*.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Concurrent/Qt5ConcurrentConfig*.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Concurrent/Qt5ConcurrentConfig*.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Core/Qt5CoreConfig*.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Core/Qt5CoreConfig*.cmake
|
|
@@ -818,6 +860,7 @@ fi
|
|
%{_qt5_libdir}/cmake/Qt5Widgets/Qt5WidgetsConfig*.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Widgets/Qt5WidgetsConfig*.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Xml/Qt5XmlConfig*.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Xml/Qt5XmlConfig*.cmake
|
|
|
|
+%{_qt5_libdir}/cmake/Qt5/Qt5ModuleLocation.cmake
|
|
%{_qt5_libdir}/pkgconfig/Qt5.pc
|
|
%{_qt5_libdir}/pkgconfig/Qt5.pc
|
|
%{_qt5_libdir}/pkgconfig/Qt5Concurrent.pc
|
|
%{_qt5_libdir}/pkgconfig/Qt5Concurrent.pc
|
|
%{_qt5_libdir}/pkgconfig/Qt5Core.pc
|
|
%{_qt5_libdir}/pkgconfig/Qt5Core.pc
|
|
@@ -831,10 +874,10 @@ fi
|
|
%{_qt5_libdir}/pkgconfig/Qt5Widgets.pc
|
|
%{_qt5_libdir}/pkgconfig/Qt5Widgets.pc
|
|
%{_qt5_libdir}/pkgconfig/Qt5Xml.pc
|
|
%{_qt5_libdir}/pkgconfig/Qt5Xml.pc
|
|
%if 0%{?egl}
|
|
%if 0%{?egl}
|
|
-%{_qt5_libdir}/libQt5EglDeviceIntegration.prl
|
|
|
|
-%{_qt5_libdir}/libQt5EglDeviceIntegration.so
|
|
|
|
|
|
+%{_qt5_libdir}/libQt5EglFsKmsSupport.prl
|
|
|
|
+%{_qt5_libdir}/libQt5EglFsKmsSupport.so
|
|
%endif
|
|
%endif
|
|
-
|
|
|
|
|
|
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_*_private.pri
|
|
|
|
|
|
%files static
|
|
%files static
|
|
%{_qt5_libdir}/libQt5Bootstrap.*a
|
|
%{_qt5_libdir}/libQt5Bootstrap.*a
|
|
@@ -844,9 +887,46 @@ fi
|
|
%{_qt5_libdir}/libQt5OpenGLExtensions.prl
|
|
%{_qt5_libdir}/libQt5OpenGLExtensions.prl
|
|
%{_qt5_libdir}/cmake/Qt5OpenGLExtensions/
|
|
%{_qt5_libdir}/cmake/Qt5OpenGLExtensions/
|
|
%{_qt5_libdir}/pkgconfig/Qt5OpenGLExtensions.pc
|
|
%{_qt5_libdir}/pkgconfig/Qt5OpenGLExtensions.pc
|
|
-%{_qt5_headerdir}/QtPlatformSupport/
|
|
|
|
-%{_qt5_libdir}/libQt5PlatformSupport.*a
|
|
|
|
-%{_qt5_libdir}/libQt5PlatformSupport.prl
|
|
|
|
|
|
+%{_qt5_libdir}/libQt5AccessibilitySupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5AccessibilitySupport.prl
|
|
|
|
+%{_qt5_headerdir}/QtAccessibilitySupport
|
|
|
|
+%{_qt5_libdir}/libQt5DeviceDiscoverySupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5DeviceDiscoverySupport.prl
|
|
|
|
+%{_qt5_headerdir}/QtDeviceDiscoverySupport
|
|
|
|
+%{_qt5_libdir}/libQt5EglSupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5EglSupport.prl
|
|
|
|
+%{_qt5_headerdir}/QtEglSupport
|
|
|
|
+%{_qt5_libdir}/libQt5EventDispatcherSupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5EventDispatcherSupport.prl
|
|
|
|
+%{_qt5_headerdir}/QtEventDispatcherSupport
|
|
|
|
+%{_qt5_libdir}/libQt5FbSupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5FbSupport.prl
|
|
|
|
+%{_qt5_headerdir}/QtFbSupport
|
|
|
|
+%{_qt5_libdir}/libQt5FontDatabaseSupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5FontDatabaseSupport.prl
|
|
|
|
+%{_qt5_headerdir}/QtFontDatabaseSupport
|
|
|
|
+%{_qt5_libdir}/libQt5GlxSupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5GlxSupport.prl
|
|
|
|
+%{_qt5_headerdir}/QtGlxSupport
|
|
|
|
+%{_qt5_libdir}/libQt5InputSupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5InputSupport.prl
|
|
|
|
+%{_qt5_libdir}/libQt5LinuxAccessibilitySupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5LinuxAccessibilitySupport.prl
|
|
|
|
+%{_qt5_headerdir}/QtLinuxAccessibilitySupport
|
|
|
|
+%{_qt5_libdir}/libQt5PlatformCompositorSupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5PlatformCompositorSupport.prl
|
|
|
|
+%{_qt5_headerdir}/QtPlatformCompositorSupport
|
|
|
|
+%{_qt5_libdir}/libQt5ServiceSupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5ServiceSupport.prl
|
|
|
|
+%{_qt5_headerdir}/QtServiceSupport
|
|
|
|
+%{_qt5_libdir}/libQt5ThemeSupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5ThemeSupport.prl
|
|
|
|
+%{_qt5_headerdir}/QtThemeSupport
|
|
|
|
+%{_qt5_libdir}/libQt5KmsSupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5KmsSupport.prl
|
|
|
|
+%{_qt5_headerdir}/QtKmsSupport
|
|
|
|
+%{_qt5_libdir}/libQt5EdidSupport.*a
|
|
|
|
+%{_qt5_libdir}/libQt5EdidSupport.prl
|
|
|
|
|
|
%if 0%{?examples}
|
|
%if 0%{?examples}
|
|
%files examples
|
|
%files examples
|
|
@@ -896,7 +976,7 @@ fi
|
|
%{_qt5_plugindir}/generic/libqevdevmouseplugin.so
|
|
%{_qt5_plugindir}/generic/libqevdevmouseplugin.so
|
|
%{_qt5_plugindir}/generic/libqevdevtabletplugin.so
|
|
%{_qt5_plugindir}/generic/libqevdevtabletplugin.so
|
|
%{_qt5_plugindir}/generic/libqevdevtouchplugin.so
|
|
%{_qt5_plugindir}/generic/libqevdevtouchplugin.so
|
|
-%if 0%{?fedora}
|
|
|
|
|
|
+%if %{with system_xkbcommon}
|
|
%{_qt5_plugindir}/generic/libqlibinputplugin.so
|
|
%{_qt5_plugindir}/generic/libqlibinputplugin.so
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QLibInputPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QLibInputPlugin.cmake
|
|
%endif
|
|
%endif
|
|
@@ -917,41 +997,49 @@ fi
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
|
|
%if 0%{?egl}
|
|
%if 0%{?egl}
|
|
-%{_qt5_libdir}/libQt5EglDeviceIntegration.so.5*
|
|
|
|
|
|
+%{_qt5_libdir}/libQt5EglFSDeviceIntegration.so.5*
|
|
|
|
+%{_qt5_libdir}/libQt5EglFsKmsSupport.so.5*
|
|
%{_qt5_plugindir}/platforms/libqeglfs.so
|
|
%{_qt5_plugindir}/platforms/libqeglfs.so
|
|
%{_qt5_plugindir}/platforms/libqminimalegl.so
|
|
%{_qt5_plugindir}/platforms/libqminimalegl.so
|
|
%dir %{_qt5_plugindir}/egldeviceintegrations/
|
|
%dir %{_qt5_plugindir}/egldeviceintegrations/
|
|
%{_qt5_plugindir}/egldeviceintegrations/libqeglfs-kms-integration.so
|
|
%{_qt5_plugindir}/egldeviceintegrations/libqeglfs-kms-integration.so
|
|
%{_qt5_plugindir}/egldeviceintegrations/libqeglfs-x11-integration.so
|
|
%{_qt5_plugindir}/egldeviceintegrations/libqeglfs-x11-integration.so
|
|
-%{_qt5_plugindir}/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so
|
|
|
|
%{_qt5_plugindir}/xcbglintegrations/libqxcb-egl-integration.so
|
|
%{_qt5_plugindir}/xcbglintegrations/libqxcb-egl-integration.so
|
|
|
|
+%{_qt5_plugindir}/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so
|
|
|
|
+%{_qt5_plugindir}/egldeviceintegrations/libqeglfs-emu-integration.so
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
|
|
-%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSKmsIntegrationPlugin.cmake
|
|
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSX11IntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSX11IntegrationPlugin.cmake
|
|
|
|
+%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSKmsGbmIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSKmsEglDeviceIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSKmsEglDeviceIntegrationPlugin.cmake
|
|
|
|
+%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSEmulatorIntegrationPlugin.cmake
|
|
%endif
|
|
%endif
|
|
%{_qt5_plugindir}/platforms/libqlinuxfb.so
|
|
%{_qt5_plugindir}/platforms/libqlinuxfb.so
|
|
%{_qt5_plugindir}/platforms/libqminimal.so
|
|
%{_qt5_plugindir}/platforms/libqminimal.so
|
|
%{_qt5_plugindir}/platforms/libqoffscreen.so
|
|
%{_qt5_plugindir}/platforms/libqoffscreen.so
|
|
%{_qt5_plugindir}/platforms/libqxcb.so
|
|
%{_qt5_plugindir}/platforms/libqxcb.so
|
|
|
|
+%{_qt5_plugindir}/platforms/libqvnc.so
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
|
|
|
|
+%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QVncIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
|
|
%{_qt5_plugindir}/xcbglintegrations/libqxcb-glx-integration.so
|
|
%{_qt5_plugindir}/xcbglintegrations/libqxcb-glx-integration.so
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
|
|
-%{_qt5_plugindir}/platformthemes/libqgtk2.so
|
|
|
|
-%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake
|
|
|
|
|
|
+%{_qt5_plugindir}/platformthemes/libqxdgdesktopportal.so
|
|
|
|
+%{_qt5_plugindir}/platformthemes/libqgtk3.so
|
|
|
|
+%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXdgDesktopPortalThemePlugin.cmake
|
|
|
|
+%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QGtk3ThemePlugin.cmake
|
|
%{_qt5_plugindir}/printsupport/libcupsprintersupport.so
|
|
%{_qt5_plugindir}/printsupport/libcupsprintersupport.so
|
|
%{_qt5_libdir}/cmake/Qt5PrintSupport/Qt5PrintSupport_QCupsPrinterSupportPlugin.cmake
|
|
%{_qt5_libdir}/cmake/Qt5PrintSupport/Qt5PrintSupport_QCupsPrinterSupportPlugin.cmake
|
|
|
|
|
|
-%files -n qt5-rpm-macros
|
|
|
|
-%{rpm_macros_dir}/macros.qt5
|
|
|
|
-
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
|
|
|
|
+- new upstream release.
|
|
|
|
+- replaced all patches to rawhide's newest.
|
|
|
|
+
|
|
* Tue Jan 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.6.3-1
|
|
* Tue Jan 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.6.3-1
|
|
- new upstream release.
|
|
- new upstream release.
|
|
- dropped Patch12, 101, 111, 132, 133, 148 and 155.
|
|
- dropped Patch12, 101, 111, 132, 133, 148 and 155.
|