|
@@ -67,88 +67,88 @@ BuildRequires: systemd-devel
|
|
%global qt5_minorver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
|
|
%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
|
|
-Name: qt5-qtbase
|
|
+Name: qt5-qtbase
|
|
-Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
|
|
+Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
|
|
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
|
+Vendor: Project Vine
|
|
|
|
+Distribution: Vine Linux
|
|
|
|
|
|
# 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: https://qt-project.org/
|
|
+Url: https://qt-project.org/
|
|
|
|
|
|
-Vendor: Project Vine
|
|
|
|
-Distribution: Vine Linux
|
|
|
|
|
|
|
|
-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
|
|
+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
|
|
|
|
|
|
# header file to workaround multilib issue
|
|
# header file to workaround multilib issue
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1036956
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1036956
|
|
-Source5: qconfig-multilib.h
|
|
+Source5: qconfig-multilib.h
|
|
|
|
|
|
# xinitrc script to check for OpenGL 1 only drivers and automatically set
|
|
# xinitrc script to check for OpenGL 1 only drivers and automatically set
|
|
# 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
|
|
# macros
|
|
-Source10: macros.qt5-qtbase
|
|
+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
|
|
# borrowed from opensuse
|
|
# track private api via properly versioned symbols
|
|
# track private api via properly versioned symbols
|
|
# downside: binaries produced with these differently-versioned symbols are no longer
|
|
# downside: binaries produced with these differently-versioned symbols are no longer
|
|
# compatible with qt-project.org's Qt binary releases.
|
|
# compatible with qt-project.org's Qt binary releases.
|
|
-Patch8: tell-the-truth-about-private-api.patch
|
|
+Patch8: tell-the-truth-about-private-api.patch
|
|
|
|
|
|
# upstreamable patches
|
|
# upstreamable patches
|
|
# namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
|
|
# namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
|
|
-Patch50: qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch
|
|
+Patch50: qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch
|
|
|
|
|
|
# 1381828 - Broken window scaling for some QT5 applications (#1381828)
|
|
# 1381828 - Broken window scaling for some QT5 applications (#1381828)
|
|
# This patch moves the threshold for 2x scaling from the DPI of 144 to 192,
|
|
# 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...
|
|
# the same value GNOME uses. It's not a complete solution...
|
|
-Patch51: qtbase-hidpi_scale_at_192.patch
|
|
+Patch51: qtbase-hidpi_scale_at_192.patch
|
|
|
|
|
|
# 1. Workaround moc/multilib issues
|
|
# 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
|
|
# 2. Workaround sysmacros.h (pre)defining major/minor a breaking stuff
|
|
# 2. Workaround sysmacros.h (pre)defining major/minor a breaking stuff
|
|
-Patch52: qtbase-opensource-src-5.7.1-moc_macros.patch
|
|
+Patch52: qtbase-opensource-src-5.7.1-moc_macros.patch
|
|
|
|
|
|
# CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui
|
|
# CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui
|
|
# https://bugzilla.redhat.com/1704474
|
|
# https://bugzilla.redhat.com/1704474
|
|
-Patch53: qtbase-everywhere-src-5.12.1-qt5gui_cmake_isystem_includes.patch
|
|
+Patch53: qtbase-everywhere-src-5.12.1-qt5gui_cmake_isystem_includes.patch
|
|
|
|
|
|
# respect QMAKE_LFLAGS_RELEASE when building qmake
|
|
# respect QMAKE_LFLAGS_RELEASE when building qmake
|
|
-Patch54: qtbase-qmake_LFLAGS.patch
|
|
+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
|
|
|
|
|
|
# support firebird version 3.x
|
|
# support firebird version 3.x
|
|
-Patch64: qt5-qtbase-5.12.1-firebird.patch
|
|
+Patch64: qt5-qtbase-5.12.1-firebird.patch
|
|
|
|
|
|
# fix for new mariadb
|
|
# fix for new mariadb
|
|
-Patch65: qtbase-opensource-src-5.9.0-mysql.patch
|
|
+Patch65: qtbase-opensource-src-5.9.0-mysql.patch
|
|
|
|
|
|
# use categorized logging for xcb log entries
|
|
# use categorized logging for xcb log entries
|
|
# https://bugreports.qt.io/browse/QTBUG-55167
|
|
# https://bugreports.qt.io/browse/QTBUG-55167
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1497564
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1497564
|
|
-Patch67: https://bugreports.qt.io/secure/attachment/66353/xcberror_filter.patch
|
|
+Patch67: https://bugreports.qt.io/secure/attachment/66353/xcberror_filter.patch
|
|
|
|
|
|
# python3
|
|
# python3
|
|
-Patch68: qtbase-everywhere-src-5.11.1-python3.patch
|
|
+Patch68: qtbase-everywhere-src-5.11.1-python3.patch
|
|
|
|
|
|
# https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome
|
|
# https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1732129
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1732129
|
|
-Patch80: qtbase-use-wayland-on-gnome.patch
|
|
+Patch80: qtbase-use-wayland-on-gnome.patch
|
|
|
|
|
|
# macros, be mindful to keep sync'd with macros.qt5-base
|
|
# macros, be mindful to keep sync'd with macros.qt5-base
|
|
%define _qt5 %{name}
|
|
%define _qt5 %{name}
|
|
@@ -213,7 +213,7 @@ BuildRequires: pkgconfig(glesv2)
|
|
%global sqlite -system-sqlite
|
|
%global sqlite -system-sqlite
|
|
BuildRequires: pkgconfig(sqlite3) >= 3.7
|
|
BuildRequires: pkgconfig(sqlite3) >= 3.7
|
|
%global harfbuzz -system-harfbuzz
|
|
%global harfbuzz -system-harfbuzz
|
|
-BuildRequires: pkgconfig(harfbuzz) >= 0.9.42
|
|
+BuildRequires: harfbuzz-devel >= 2.6.4-2
|
|
BuildRequires: pkgconfig(icu-i18n)
|
|
BuildRequires: pkgconfig(icu-i18n)
|
|
BuildRequires: pkgconfig(libpcre2-posix) >= 10.20
|
|
BuildRequires: pkgconfig(libpcre2-posix) >= 10.20
|
|
BuildRequires: pkgconfig(libpcre) >= 8.0
|
|
BuildRequires: pkgconfig(libpcre) >= 8.0
|
|
@@ -352,6 +352,9 @@ Requires: glx-utils
|
|
Qt5 libraries used for drawing widgets and OpenGL items.
|
|
Qt5 libraries used for drawing widgets and OpenGL items.
|
|
|
|
|
|
|
|
|
|
|
|
+%debug_package
|
|
|
|
+
|
|
|
|
+
|
|
%prep
|
|
%prep
|
|
%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
|
|
%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
|
|
|
|
|
|
@@ -1036,6 +1039,9 @@ fi
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Fri Apr 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-2
|
|
|
|
+- rebuilt with icu-67.
|
|
|
|
+
|
|
* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
|
|
* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
|
|
- new upstream release.
|
|
- new upstream release.
|
|
- dropped Patch1000: fixed in upstream.
|
|
- dropped Patch1000: fixed in upstream.
|