Browse Source

updated 25 packages

python-qt5-5.15.4-1

qt5-qt3d-5.15.2-1

qt5-qtbase-5.15.2-1

qt5-qtconnectivity-5.15.2-1

qt5-qtdeclarative-5.15.2-1

qt5-qtdoc-5.15.2-1

qt5-qtgraphicaleffects-5.15.2-1

qt5-qtimageformats-5.15.2-1

qt5-qtlocation-5.15.2-1

qt5-qtmultimedia-5.15.2-1

qt5-qtquickcontrols-5.15.2-1

qt5-qtquickcontrols2-5.15.2-1

qt5-qtscript-5.15.2-1

qt5-qtsensors-5.15.2-1

qt5-qtserialport-5.15.2-1

qt5-qtsvg-5.15.2-1

qt5-qttools-5.15.2-1

qt5-qttranslations-5.15.2-1

qt5-qtwebchannel-5.15.2-1

qt5-qtwebengine-5.15.2-1

qt5-qtwebsockets-5.15.2-1

qt5-qtx11extras-5.15.2-1

qt5-qtxmlpatterns-5.15.2-1

qt5-5.15.2-1

sip-4.19.25-1
Tomohiro "Tomo-p" KATO 3 years ago
parent
commit
dc8fcce1e1

+ 6 - 1
p/python-qt5/python-qt5-vl.spec

@@ -45,7 +45,7 @@
 
 
 Summary:        PyQt5 is Python bindings for Qt5
 Summary:        PyQt5 is Python bindings for Qt5
 Name:           python-qt5 
 Name:           python-qt5 
-Version:        5.15.0
+Version:        5.15.4
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Group:          programming
 Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
@@ -93,6 +93,7 @@ BuildRequires: pkgconfig(Qt5Xml) pkgconfig(Qt5XmlPatterns)
 BuildRequires: pkgconfig(Qt5WebChannel)
 BuildRequires: pkgconfig(Qt5WebChannel)
 BuildRequires: pkgconfig(Qt5WebSockets)
 BuildRequires: pkgconfig(Qt5WebSockets)
 BuildRequires: sip-devel >= 4.18
 BuildRequires: sip-devel >= 4.18
+BuildRequires: sip-pyqt5-sip
 %if 0%{?with_python2}
 %if 0%{?with_python2}
 BuildRequires: python-devel python
 BuildRequires: python-devel python
 BuildRequires: python-rpm-macros
 BuildRequires: python-rpm-macros
@@ -102,6 +103,7 @@ BuildRequires: python-enum34
 BuildRequires: python3-devel python3
 BuildRequires: python3-devel python3
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-sip-devel >= 4.18
 BuildRequires: python3-sip-devel >= 4.18
+BuildRequires: python3-pyqt5-sip
 BuildRequires: dbus-python3
 BuildRequires: dbus-python3
 %endif # with_python3
 %endif # with_python3
 
 
@@ -563,6 +565,9 @@ sed -i \
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Wed Apr 14 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.4-1
+- new upstream release.
+
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.0-4
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.0-4
 - new upstream release.
 - new upstream release.
 - built with python-3.8.
 - built with python-3.8.

+ 19 - 7
q/qt5-qt3d/qt5-qt3d-vl.spec

@@ -4,23 +4,23 @@
 
 
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - Qt3D QML bindings and C++ APIs
 Summary: Qt5 - Qt3D QML bindings and C++ APIs
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://doc.qt.io/qt-5/licensing.html
 # See also http://doc.qt.io/qt-5/licensing.html
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
 
 
-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
 
 
 BuildRequires:  cmake
 BuildRequires:  cmake
@@ -41,16 +41,20 @@ Requires:       qt5-qtimageformats%{?_isa} >= %{version}
 Qt 3D provides functionality for near-realtime simulation systems with
 Qt 3D provides functionality for near-realtime simulation systems with
 support for 2D and 3D rendering in both Qt C++ and Qt Quick applications).
 support for 2D and 3D rendering in both Qt C++ and Qt Quick applications).
 
 
+
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtbase-devel%{?_isa}
 %description devel
 %description devel
 %{summary}.
 %{summary}.
 
 
+
 %if 0%{?docs}
 %if 0%{?docs}
 %package doc
 %package doc
 Summary: API documentation for %{name}
 Summary: API documentation for %{name}
+Group: documentation
 License: GFDL
 License: GFDL
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qdoc
@@ -60,13 +64,18 @@ BuildArch: noarch
 %{summary}.
 %{summary}.
 %endif
 %endif
 
 
+
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
@@ -86,6 +95,7 @@ make %{?_smp_mflags} docs
 %endif
 %endif
 popd
 popd
 
 
+
 %install
 %install
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
@@ -105,8 +115,6 @@ for prl_file in libQt5*.prl ; do
 done
 done
 popd
 popd
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 
 %files
 %files
 %license LICENSE.GPL* LICENSE.LGPL*
 %license LICENSE.GPL* LICENSE.LGPL*
@@ -125,6 +133,7 @@ popd
 %{_qt5_qmldir}/Qt3D/
 %{_qt5_qmldir}/Qt3D/
 %{_qt5_qmldir}/QtQuick/Scene3D/
 %{_qt5_qmldir}/QtQuick/Scene3D/
 %{_qt5_qmldir}/QtQuick/Scene2D/
 %{_qt5_qmldir}/QtQuick/Scene2D/
+%{_qt5_plugindir}/renderers/
 %{_qt5_plugindir}/sceneparsers/
 %{_qt5_plugindir}/sceneparsers/
 %{_qt5_plugindir}/renderplugins/
 %{_qt5_plugindir}/renderplugins/
 %{_qt5_plugindir}/geometryloaders/
 %{_qt5_plugindir}/geometryloaders/
@@ -205,6 +214,9 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 102 - 47
q/qt5-qtbase/qt5-qtbase-vl.spec

@@ -60,17 +60,16 @@ BuildRequires: systemd-devel
 %endif
 %endif
 %endif
 %endif
 %global examples 1
 %global examples 1
+%ifarch x86_64
 %global tests 1
 %global tests 1
 %endif
 %endif
-
-%global qt5_version 5.12.8
-%global qt5_minorver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
-#global qt5_patchlevel 1
+%endif
 
 
 Summary:        Qt5 - QtBase components
 Summary:        Qt5 - QtBase components
 Name:           qt5-qtbase
 Name:           qt5-qtbase
-Version:        %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
-Release:        2%{?_dist_release}%{?with_systemd:.systemd}
+Version:        5.15.2%{?qt5_patchlevel:.%{qt5_patchlevel}}
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Group:          system
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
@@ -78,8 +77,9 @@ Distribution:   Vine Linux
 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/
 
 
-
-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
+%global         qt5_minorver %(echo %{version} | cut -d . -f 1-2)
+#global         qt5_patchlevel %(echo %{version} | cut -d . -f 4)
+Source0:        https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{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
@@ -129,6 +129,9 @@ 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
 
 
+# don't use relocatable heuristics to guess prefix when using -no-feature-relocatable
+Patch55:        qtbase-everywhere-src-5.14.2-no_relocatable.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
 
 
@@ -138,11 +141,6 @@ 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
-# 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
 # python3
 Patch68:        qtbase-everywhere-src-5.11.1-python3.patch
 Patch68:        qtbase-everywhere-src-5.11.1-python3.patch
 
 
@@ -153,6 +151,17 @@ 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}
 
 
+# gcc-11
+Patch90: %{name}-gcc11.patch
+
+# glibc stat
+
+## upstream patches
+# see also patch90
+Patch200: qtbase-QTBUG-90395.patch
+Patch201: qtbase-QTBUG-89977.patch
+Patch202: qtbase-filechooser-portal-send-window-id-in-hex.patch
+
 # 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
@@ -173,11 +182,8 @@ BuildRequires: libjpeg-devel
 BuildRequires: libmng-devel
 BuildRequires: libmng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libtiff-devel
 BuildRequires: pkgconfig(alsa)
 BuildRequires: pkgconfig(alsa)
-# http://bugzilla.redhat.com/1196359
-%if 0%{?fedora} || 0%{?rhel} > 6
 %global dbus -dbus-linked
 %global dbus -dbus-linked
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(dbus-1)
-%endif
 BuildRequires: pkgconfig(libdrm)
 BuildRequires: pkgconfig(libdrm)
 BuildRequires: pkgconfig(fontconfig)
 BuildRequires: pkgconfig(fontconfig)
 BuildRequires: pkgconfig(gl)
 BuildRequires: pkgconfig(gl)
@@ -193,19 +199,14 @@ 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 %{with system_xkbcommon}
 %global xkbcommon -xkbcommon
 %global xkbcommon -xkbcommon
 BuildRequires: pkgconfig(libinput)
 BuildRequires: pkgconfig(libinput)
 BuildRequires: pkgconfig(xcb-xkb) >= 1.10
 BuildRequires: pkgconfig(xcb-xkb) >= 1.10
+BuildRequires: pkgconfig(xcb-util)
 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
-# not Fedora
-%global xcb -qt-xcb
-%global xkbcommon -qt-xkbcommon
-Provides: bundled(libxkbcommon) = 0.4.1
-%endif
 BuildRequires: pkgconfig(xkeyboard-config)
 BuildRequires: pkgconfig(xkeyboard-config)
+BuildRequires: pkgconfig(vulkan)
 %define egl 1
 %define egl 1
 BuildRequires: pkgconfig(egl)
 BuildRequires: pkgconfig(egl)
 BuildRequires: pkgconfig(gbm)
 BuildRequires: pkgconfig(gbm)
@@ -218,9 +219,11 @@ 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
 %define pcre -system-pcre
 %define pcre -system-pcre
-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)
 BuildRequires: pkgconfig(zlib)
 BuildRequires: pkgconfig(zlib)
+BuildRequires: perl
+BuildRequires: python3
+BuildRequires: qt5-rpm-macros
 
 
 %if 0%{?tests}
 %if 0%{?tests}
 BuildRequires: dbus-x11
 BuildRequires: dbus-x11
@@ -256,6 +259,7 @@ BuildArch: noarch
 
 
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Provides: %{name}-private-devel = %{version}-%{release}
 Provides: %{name}-private-devel = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}-gui%{?_isa}
 Requires: %{name}-gui%{?_isa}
@@ -263,12 +267,14 @@ Requires: %{name}-gui%{?_isa}
 Requires: pkgconfig(egl)
 Requires: pkgconfig(egl)
 %endif
 %endif
 Requires: pkgconfig(gl)
 Requires: pkgconfig(gl)
+Requires: pkgconfig(vulkan)
 %description devel
 %description devel
 %{summary}.
 %{summary}.
 
 
 %if 0%{?docs}
 %if 0%{?docs}
 %package doc
 %package doc
 Summary: API documentation for %{name}
 Summary: API documentation for %{name}
+Group: documentation
 License: GFDL
 License: GFDL
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 BuildRequires: qt5-qhelpgenerator
 BuildRequires: qt5-qhelpgenerator
@@ -286,6 +292,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %package static
 %package static
 Summary: Static library files for %{name}
 Summary: Static library files for %{name}
+Group: programming
 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)
@@ -300,6 +307,7 @@ Requires: pkgconfig(zlib)
 %if "%{?ibase}" != "-no-sql-ibase"
 %if "%{?ibase}" != "-no-sql-ibase"
 %package ibase
 %package ibase
 Summary: IBase driver for Qt5's SQL classes
 Summary: IBase driver for Qt5's SQL classes
+Group: system
 BuildRequires: firebird-devel
 BuildRequires: firebird-devel
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description ibase
 %description ibase
@@ -308,6 +316,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %package mysql
 %package mysql
 Summary: MySQL driver for Qt5's SQL classes
 Summary: MySQL driver for Qt5's SQL classes
+Group: system
 BuildRequires: libmysqlclient-devel
 BuildRequires: libmysqlclient-devel
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description mysql
 %description mysql
@@ -315,6 +324,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %package odbc
 %package odbc
 Summary: ODBC driver for Qt5's SQL classes
 Summary: ODBC driver for Qt5's SQL classes
+Group: system
 BuildRequires: unixODBC-devel
 BuildRequires: unixODBC-devel
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description odbc
 %description odbc
@@ -322,6 +332,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %package postgresql
 %package postgresql
 Summary: PostgreSQL driver for Qt5's SQL classes
 Summary: PostgreSQL driver for Qt5's SQL classes
+Group: system
 BuildRequires: libpq-devel
 BuildRequires: libpq-devel
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description postgresql
 %description postgresql
@@ -330,6 +341,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %if "%{?tds}" != "-no-sql-tds"
 %if "%{?tds}" != "-no-sql-tds"
 %package tds
 %package tds
 Summary: TDS driver for Qt5's SQL classes
 Summary: TDS driver for Qt5's SQL classes
+Group: system
 BuildRequires: freetds-devel
 BuildRequires: freetds-devel
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description tds
 %description tds
@@ -339,6 +351,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 # debating whether to do 1 subpkg per library or not -- rex
 # debating whether to do 1 subpkg per library or not -- rex
 %package gui
 %package gui
 Summary: Qt5 GUI-related libraries
 Summary: Qt5 GUI-related libraries
+Group: system
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %if 0%{?fedora} > 20
 %if 0%{?fedora} > 20
 Recommends: mesa-dri-drivers
 Recommends: mesa-dri-drivers
@@ -356,39 +369,38 @@ Qt5 libraries used for drawing widgets and OpenGL items.
 
 
 
 
 %prep
 %prep
-%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{version}
+
+## upstream fixes
 
 
-%patch4 -p1 -b .QTBUG-35459
 # omit '-b .tell-the-truth-about-private-api' so it doesn't end up in installed files -- rdieter
 # omit '-b .tell-the-truth-about-private-api' so it doesn't end up in installed files -- rdieter
 %patch8 -p1
 %patch8 -p1
 
 
 %patch50 -p1 -b .QT_VERSION_CHECK
 %patch50 -p1 -b .QT_VERSION_CHECK
-%patch51 -p1 -b .hidpi_scale_at_192
+# FIXME/TODO : rebase or drop -- rdieter
+#patch51 -p1 -b .hidpi_scale_at_192
 %patch52 -p1 -b .moc_macros
 %patch52 -p1 -b .moc_macros
 %patch53 -p1 -b .qt5gui_cmake_isystem_includes
 %patch53 -p1 -b .qt5gui_cmake_isystem_includes
 %patch54 -p1 -b .qmake_LFLAGS
 %patch54 -p1 -b .qmake_LFLAGS
+%patch55 -p1 -b .no_relocatable
 %patch61 -p1 -b .qt5-qtbase-cxxflag
 %patch61 -p1 -b .qt5-qtbase-cxxflag
 %patch64 -p1 -b .firebird
 %patch64 -p1 -b .firebird
-%if 0%{?fedora} > 27
 %patch65 -p1 -b .mysql
 %patch65 -p1 -b .mysql
-%endif
-# FIXME/REBASE
-#patch67 -p1 -b .xcberror_filter
 %patch68 -p1
 %patch68 -p1
 
 
-#if 0%{?fedora} > 30
-#patch80 -p1 -b .use-wayland-on-gnome.patch
-#endif
+%patch80 -p1 -b .use-wayland-on-gnome.patch
+
+%patch90 -p1 -b .gcc11
 
 
-%define platform linux-g++
+## upstream patches
+%patch200 -p1 -b .QTBUG-90395
+%patch201 -p1 -b .QTBUG-89977
 
 
 # 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
 mkdir UNUSED
 mkdir UNUSED
 mv freetype libjpeg libpng zlib UNUSED/
 mv freetype libjpeg libpng zlib UNUSED/
-%if "%{?sqlite}" == "-system-sqlite"
 mv sqlite UNUSED/
 mv sqlite UNUSED/
-%endif
 %if "%{?xcb}" != "-qt-xcb"
 %if "%{?xcb}" != "-qt-xcb"
 mv xcb UNUSED/
 mv xcb UNUSED/
 %endif
 %endif
@@ -407,6 +419,13 @@ sed -i -e "s|^#!/usr/bin/env perl$|#!%{__perl}|" \
 
 
 
 
 %build
 %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:
 ## FIXME/TODO:
 # * for %%ix86, add sse2 enabled builds for Qt5Gui, Qt5Core, QtNetwork, see also:
 # * for %%ix86, add sse2 enabled builds for Qt5Gui, Qt5Core, QtNetwork, see also:
 #   http://anonscm.debian.org/cgit/pkg-kde/qt/qtbase.git/tree/debian/rules (234-249)
 #   http://anonscm.debian.org/cgit/pkg-kde/qt/qtbase.git/tree/debian/rules (234-249)
@@ -421,7 +440,8 @@ export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS"
 export LDFLAGS="$LDFLAGS $RPM_LD_FLAGS"
 export LDFLAGS="$LDFLAGS $RPM_LD_FLAGS"
 export MAKEFLAGS="%{?_smp_mflags}"
 export MAKEFLAGS="%{?_smp_mflags}"
 
 
-./configure -v \
+./configure \
+  -verbose \
   -confirm-license \
   -confirm-license \
   -opensource \
   -opensource \
   -prefix %{_qt5_prefix} \
   -prefix %{_qt5_prefix} \
@@ -442,6 +462,7 @@ export MAKEFLAGS="%{?_smp_mflags}"
   -shared \
   -shared \
   -accessibility \
   -accessibility \
   %{?dbus}%{!?dbus:-dbus-runtime} \
   %{?dbus}%{!?dbus:-dbus-runtime} \
+  %{?egl:-egl} \
   -fontconfig \
   -fontconfig \
   -glib \
   -glib \
   -gtk \
   -gtk \
@@ -453,11 +474,10 @@ export MAKEFLAGS="%{?_smp_mflags}"
   %{!?examples:-nomake examples} \
   %{!?examples:-nomake examples} \
   %{!?tests:-nomake tests} \
   %{!?tests:-nomake tests} \
   -no-pch \
   -no-pch \
+  -no-reduce-relocations \
   -no-rpath \
   -no-rpath \
   -no-separate-debug-info \
   -no-separate-debug-info \
-%ifarch %{ix86}
-  -no-sse2 \
-%endif
+  %{?no_sse2} \
   -no-strip \
   -no-strip \
   -system-libjpeg \
   -system-libjpeg \
   -system-libpng \
   -system-libpng \
@@ -468,10 +488,8 @@ export MAKEFLAGS="%{?_smp_mflags}"
   %{?xcb} \
   %{?xcb} \
   %{?xkbcommon} \
   %{?xkbcommon} \
   -system-zlib \
   -system-zlib \
-  -no-use-gold-linker \
   -no-directfb \
   -no-directfb \
-  -no-feature-renameat2 \
-  -no-feature-statx \
+  -no-feature-relocatable \
   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}"
@@ -652,7 +670,6 @@ fi
 %endif
 %endif
 
 
 %post
 %post
-/sbin/ldconfig
 %if 0%{?qtchooser}
 %if 0%{?qtchooser}
 %{_sbindir}/update-alternatives \
 %{_sbindir}/update-alternatives \
   --install %{_sysconfdir}/xdg/qtchooser/5.conf \
   --install %{_sysconfdir}/xdg/qtchooser/5.conf \
@@ -668,7 +685,6 @@ fi
 %endif
 %endif
 
 
 %postun
 %postun
-/sbin/ldconfig
 %if 0%{?qtchooser}
 %if 0%{?qtchooser}
 if [ $1 -eq 0 ]; then
 if [ $1 -eq 0 ]; then
 %{_sbindir}/update-alternatives  \
 %{_sbindir}/update-alternatives  \
@@ -716,6 +732,7 @@ fi
 %dir %{_qt5_libdir}/cmake/Qt5Xml/
 %dir %{_qt5_libdir}/cmake/Qt5Xml/
 %dir %{_qt5_docdir}/
 %dir %{_qt5_docdir}/
 %{_qt5_docdir}/global/
 %{_qt5_docdir}/global/
+%{_qt5_docdir}/config/
 %{_qt5_importdir}/
 %{_qt5_importdir}/
 %{_qt5_translationdir}/
 %{_qt5_translationdir}/
 %if "%{_qt5_prefix}" != "%{_prefix}"
 %if "%{_qt5_prefix}" != "%{_prefix}"
@@ -791,6 +808,7 @@ fi
 %{_bindir}/qlalr
 %{_bindir}/qlalr
 %{_bindir}/fixqt4headers.pl
 %{_bindir}/fixqt4headers.pl
 %{_bindir}/qvkgen
 %{_bindir}/qvkgen
+%{_bindir}/tracegen
 %{_qt5_bindir}/moc*
 %{_qt5_bindir}/moc*
 %{_qt5_bindir}/qdbuscpp2xml*
 %{_qt5_bindir}/qdbuscpp2xml*
 %{_qt5_bindir}/qdbusxml2cpp*
 %{_qt5_bindir}/qdbusxml2cpp*
@@ -820,6 +838,7 @@ fi
 %{_qt5_headerdir}/QtEglFSDeviceIntegration
 %{_qt5_headerdir}/QtEglFSDeviceIntegration
 %{_qt5_headerdir}/QtInputSupport
 %{_qt5_headerdir}/QtInputSupport
 %{_qt5_headerdir}/QtEdidSupport
 %{_qt5_headerdir}/QtEdidSupport
+%{_qt5_headerdir}/QtXkbCommonSupport
 %{_qt5_archdatadir}/mkspecs/
 %{_qt5_archdatadir}/mkspecs/
 %{_qt5_libdir}/libQt5Concurrent.prl
 %{_qt5_libdir}/libQt5Concurrent.prl
 %{_qt5_libdir}/libQt5Concurrent.so
 %{_qt5_libdir}/libQt5Concurrent.so
@@ -864,6 +883,27 @@ fi
 %{_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}/cmake/Qt5/Qt5ModuleLocation.cmake
+%{_qt5_libdir}/cmake/Qt5AccessibilitySupport/Qt5AccessibilitySupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5DeviceDiscoverySupport/Qt5DeviceDiscoverySupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5EdidSupport/Qt5EdidSupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5EglFSDeviceIntegration/Qt5EglFSDeviceIntegrationConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5EglFsKmsSupport/Qt5EglFsKmsSupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5EglSupport/Qt5EglSupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5EventDispatcherSupport/Qt5EventDispatcherSupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5FbSupport/Qt5FbSupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5FontDatabaseSupport/Qt5FontDatabaseSupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5GlxSupport/Qt5GlxSupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5InputSupport/Qt5InputSupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5KmsSupport/Qt5KmsSupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5PlatformCompositorSupport/Qt5PlatformCompositorSupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5ServiceSupport/Qt5ServiceSupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5ThemeSupport/Qt5ThemeSupportConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5XcbQpa/Qt5XcbQpaConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfig*.cmake
+%{_qt5_libdir}/metatypes/qt5core_metatypes.json
+%{_qt5_libdir}/metatypes/qt5gui_metatypes.json
+%{_qt5_libdir}/metatypes/qt5widgets_metatypes.json
 %{_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
@@ -880,7 +920,11 @@ fi
 %{_qt5_libdir}/libQt5EglFsKmsSupport.prl
 %{_qt5_libdir}/libQt5EglFsKmsSupport.prl
 %{_qt5_libdir}/libQt5EglFsKmsSupport.so
 %{_qt5_libdir}/libQt5EglFsKmsSupport.so
 %endif
 %endif
-%{_qt5_archdatadir}/mkspecs/modules/qt_lib_*_private.pri
+%{_qt5_libdir}/qt5/bin/tracegen
+## private-devel globs
+# keep mkspecs/modules stuff  in -devel for now, https://bugzilla.redhat.com/show_bug.cgi?id=1705280
+#%{_qt5_archdatadir}/mkspecs/modules/qt_lib_*_private.pri
+#%{_qt5_headerdir}/*/%{version}/
 
 
 %files static
 %files static
 %{_qt5_libdir}/libQt5Bootstrap.*a
 %{_qt5_libdir}/libQt5Bootstrap.*a
@@ -930,6 +974,12 @@ fi
 %{_qt5_headerdir}/QtKmsSupport
 %{_qt5_headerdir}/QtKmsSupport
 %{_qt5_libdir}/libQt5EdidSupport.*a
 %{_qt5_libdir}/libQt5EdidSupport.*a
 %{_qt5_libdir}/libQt5EdidSupport.prl
 %{_qt5_libdir}/libQt5EdidSupport.prl
+%{_qt5_libdir}/libQt5XkbCommonSupport.*a
+%{_qt5_libdir}/libQt5XkbCommonSupport.prl
+%{_qt5_headerdir}/QtVulkanSupport/
+%{_qt5_libdir}/cmake/Qt5VulkanSupport/
+%{_qt5_libdir}/libQt5VulkanSupport.*a
+%{_qt5_libdir}/libQt5VulkanSupport.prl
 
 
 %if 0%{?examples}
 %if 0%{?examples}
 %files examples
 %files examples
@@ -1039,6 +1089,11 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+- imported Patch55, 90-202 from rawhide.
+- dropped Patch67.
+
 * Fri Apr 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-2
 * Fri Apr 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-2
 - rebuilt with icu-67.
 - rebuilt with icu-67.
 
 

+ 14 - 38
q/qt5-qtconnectivity/qt5-qtconnectivity-vl.spec

@@ -1,26 +1,24 @@
 
 
 %global qt_module qtconnectivity
 %global qt_module qtconnectivity
 
 
-#define docs 1
-
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - Connectivity components
 Summary: Qt5 - Connectivity components
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 # See LICENSE.GPL3, respectively, for exception details
 # See LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     https://qt.io/
 Url:     https://qt.io/
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 Source0: http://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: http://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
 
 
 BuildRequires: cmake
 BuildRequires: cmake
@@ -35,31 +33,27 @@ BuildRequires: pkgconfig(bluez)
 %description
 %description
 %{summary}.
 %{summary}.
 
 
+
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtbase-devel%{?_isa}
 %description devel
 %description devel
 %{summary}.
 %{summary}.
 
 
-%if 0%{?docs}
-%package doc
-Summary: API documentation for %{name}
-Requires: %{name} = %{version}-%{release}
-BuildRequires: qt5-qdoc
-BuildRequires: qt5-qhelpgenerator
-BuildArch: noarch
-%description doc
-%{summary}.
-%endif
 
 
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
@@ -71,19 +65,10 @@ pushd %{_target_platform}
 
 
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
-%if 0%{?docs}
-make %{?_smp_mflags} docs
-%endif
-popd
-
 
 
 %install
 %install
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
-%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
-%endif
-
 # hardlink files to {_bindir}, add -qt5 postfix to not conflict
 # hardlink files to {_bindir}, add -qt5 postfix to not conflict
 mkdir %{buildroot}%{_bindir}
 mkdir %{buildroot}%{_bindir}
 pushd %{buildroot}%{_qt5_bindir}
 pushd %{buildroot}%{_qt5_bindir}
@@ -109,9 +94,6 @@ done
 popd
 popd
 
 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %files
 %files
 %license LICENSE.GPL* LICENSE.LGPL*
 %license LICENSE.GPL* LICENSE.LGPL*
 %{_bindir}/sdpscanner
 %{_bindir}/sdpscanner
@@ -137,15 +119,6 @@ popd
 %{_qt5_libdir}/pkgconfig/Qt5Nfc.pc
 %{_qt5_libdir}/pkgconfig/Qt5Nfc.pc
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_nfc*.pri
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_nfc*.pri
 
 
-%if 0%{?docs}
-%files doc
-%license LICENSE.FDL
-%{_qt5_docdir}/qtbluetooth.qch
-%{_qt5_docdir}/qtbluetooth/
-%{_qt5_docdir}/qtnfc.qch
-%{_qt5_docdir}/qtnfc/
-%endif
-
 %if 0%{?_qt5_examplesdir:1}
 %if 0%{?_qt5_examplesdir:1}
 %files examples
 %files examples
 %{_qt5_examplesdir}/
 %{_qt5_examplesdir}/
@@ -153,6 +126,9 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 35 - 20
q/qt5-qtdeclarative/qt5-qtdeclarative-vl.spec

@@ -22,39 +22,33 @@
 
 
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
-Summary: Qt5 - QtDeclarative component
-Name:    qt5-%{qt_module}
-Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
-Release: 1%{?_dist_release}
+Summary:        Qt5 - QtDeclarative component
+Name:           qt5-%{qt_module}
+Version:        %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
+Release:        1%{?_dist_release}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
 
 
-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
 
 
 # header file to workaround multilib issue
 # header file to workaround multilib issue
 # https://bugzilla.redhat.com/show_bug.cgi?id=1441343
 # https://bugzilla.redhat.com/show_bug.cgi?id=1441343
 Source5: qv4global_p-multilib.h
 Source5: qv4global_p-multilib.h
 
 
-## upstream patches
-
-## upstreamable patches
-# revert upstream commit that seemingly causes regressions with plasma-5.15.x notifcations applet
-# https://bugzilla.redhat.com/1758263
-Patch126: 0026-Fix-ListView-footer-positioned-wrong-after-last-item.patch
+Patch1: qt5-qtdeclarative-gcc11.patch
 
 
 # filter qml provides
 # filter qml provides
 %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
 %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
 
 
-
 BuildRequires: cmake
 BuildRequires: cmake
 BuildRequires: gcc-c++
 BuildRequires: gcc-c++
 BuildRequires: qt5-rpm-macros >= %{version}
 BuildRequires: qt5-rpm-macros >= %{version}
@@ -77,8 +71,10 @@ BuildRequires: xorg-x11-server-Xvfb
 %description
 %description
 %{summary}.
 %{summary}.
 
 
+
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Obsoletes: qt5-qtjsbackend-devel < 5.2.0
 Obsoletes: qt5-qtjsbackend-devel < 5.2.0
 Provides:  %{name}-private-devel = %{version}-%{release}
 Provides:  %{name}-private-devel = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -86,15 +82,19 @@ Requires: qt5-qtbase-devel%{?_isa}
 %description devel
 %description devel
 %{summary}.
 %{summary}.
 
 
+
 %package static
 %package static
 Summary: Static library files for %{name}
 Summary: Static library files for %{name}
+Group: programming
 Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 %description static
 %description static
 %{summary}.
 %{summary}.
 
 
+
 %if 0%{?docs}
 %if 0%{?docs}
 %package doc
 %package doc
 Summary: API documentation for %{name}
 Summary: API documentation for %{name}
+Group: documentation
 License: GFDL
 License: GFDL
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qdoc
@@ -104,17 +104,22 @@ BuildArch: noarch
 %{summary}.
 %{summary}.
 %endif
 %endif
 
 
+
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
+%autopatch -p1
 
 
-%patch126 -p1 -R
 
 
 %build
 %build
 ln -s %{__python3} python
 ln -s %{__python3} python
@@ -203,13 +208,12 @@ make check -k -C tests ||:
 %endif
 %endif
 
 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %files
 %files
 %{!?_licensedir:%global license %%doc}
 %{!?_licensedir:%global license %%doc}
 %license LICENSE.LGPL*
 %license LICENSE.LGPL*
 %{_qt5_libdir}/libQt5Qml.so.5*
 %{_qt5_libdir}/libQt5Qml.so.5*
+%{_qt5_libdir}/libQt5QmlModels.so.5*
+%{_qt5_libdir}/libQt5QmlWorkerScript.so.5*
 %{_qt5_libdir}/libQt5Quick.so.5*
 %{_qt5_libdir}/libQt5Quick.so.5*
 %{_qt5_libdir}/libQt5QuickWidgets.so.5*
 %{_qt5_libdir}/libQt5QuickWidgets.so.5*
 %{_qt5_libdir}/libQt5QuickParticles.so.5*
 %{_qt5_libdir}/libQt5QuickParticles.so.5*
@@ -224,15 +228,21 @@ make check -k -C tests ||:
 %{_qt5_headerdir}/Qt*/
 %{_qt5_headerdir}/Qt*/
 %{_qt5_libdir}/libQt5Qml.so
 %{_qt5_libdir}/libQt5Qml.so
 %{_qt5_libdir}/libQt5Qml.prl
 %{_qt5_libdir}/libQt5Qml.prl
+%{_qt5_libdir}/libQt5QmlModels.so
+%{_qt5_libdir}/libQt5QmlModels.prl
+%{_qt5_libdir}/libQt5QmlWorkerScript.so
+%{_qt5_libdir}/libQt5QmlWorkerScript.prl
 %{_qt5_libdir}/libQt5Quick*.so
 %{_qt5_libdir}/libQt5Quick*.so
 %{_qt5_libdir}/libQt5Quick*.prl
 %{_qt5_libdir}/libQt5Quick*.prl
 %dir %{_qt5_libdir}/cmake/Qt5Quick*/
 %dir %{_qt5_libdir}/cmake/Qt5Quick*/
 %{_qt5_libdir}/cmake/Qt5*/Qt5*Config*.cmake
 %{_qt5_libdir}/cmake/Qt5*/Qt5*Config*.cmake
+%{_qt5_libdir}/metatypes/qt5*_metatypes.json
 %{_qt5_libdir}/pkgconfig/Qt5*.pc
 %{_qt5_libdir}/pkgconfig/Qt5*.pc
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
 %{_qt5_archdatadir}/mkspecs/features/*.prf
 %{_qt5_archdatadir}/mkspecs/features/*.prf
 %dir %{_qt5_libdir}/cmake/Qt5Qml/
 %dir %{_qt5_libdir}/cmake/Qt5Qml/
 %{_qt5_libdir}/cmake/Qt5Qml/Qt5Qml_*Factory.cmake
 %{_qt5_libdir}/cmake/Qt5Qml/Qt5Qml_*Factory.cmake
+%{_qt5_libdir}/cmake/Qt5QmlImportScanner/
 
 
 %files static
 %files static
 %{_qt5_libdir}/libQt5QmlDevTools.a
 %{_qt5_libdir}/libQt5QmlDevTools.a
@@ -256,6 +266,11 @@ make check -k -C tests ||:
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+- dropped Patch126.
+- imported Patch1 from rawhide.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 11 - 6
q/qt5-qtdoc/qt5-qtdoc-vl.spec

@@ -3,25 +3,24 @@
 
 
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Main Qt5 Reference Documentation
 Summary: Main Qt5 Reference Documentation
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: documentation
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 License: GFDL
 License: GFDL
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
 
 
-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
 
 
 BuildArch: noarch
 BuildArch: noarch
-%global _qt5_qmake %{_bindir}/qmake-qt5
 
 
 BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-qtbase-devel
 BuildRequires: qt5-qtbase-devel
@@ -41,6 +40,7 @@ overviews, Qt topics, and examples not specific to any Qt module.
 %{qmake_qt5}
 %{qmake_qt5}
 make docs %{?_smp_mflags}
 make docs %{?_smp_mflags}
 
 
+
 %install
 %install
 make install_docs INSTALL_ROOT=%{buildroot}
 make install_docs INSTALL_ROOT=%{buildroot}
 
 
@@ -49,9 +49,14 @@ make install_docs INSTALL_ROOT=%{buildroot}
 %doc LICENSE.FDL
 %doc LICENSE.FDL
 %{_qt5_docdir}/qtdoc.qch
 %{_qt5_docdir}/qtdoc.qch
 %{_qt5_docdir}/qtdoc/
 %{_qt5_docdir}/qtdoc/
+%{_qt5_docdir}/qtcmake.qch
+%{_qt5_docdir}/qtcmake/
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 10 - 34
q/qt5-qtgraphicaleffects/qt5-qtgraphicaleffects-vl.spec

@@ -1,26 +1,23 @@
-
 %global qt_module qtgraphicaleffects
 %global qt_module qtgraphicaleffects
 
 
-#define docs 1
-
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - QtGraphicalEffects component
 Summary: Qt5 - QtGraphicalEffects component
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively from qt5-qtbase for details
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively from qt5-qtbase for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
 
 
-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
 
 
 # filter qml provides
 # filter qml provides
@@ -41,17 +38,8 @@ visually impressive and configurable effects to user interfaces. Effects
 are visual items that can be added to Qt Quick user interface as UI
 are visual items that can be added to Qt Quick user interface as UI
 components.
 components.
 
 
-%if 0%{?docs}
-%package doc
-Summary: API documentation for %{name}
-License: GFDL
-Requires: %{name} = %{version}-%{release}
-BuildRequires: qt5-qdoc
-BuildRequires: qt5-qhelpgenerator
-BuildArch: noarch
-%description doc
-%{summary}.
-%endif
+
+%debug_package
 
 
 
 
 %prep
 %prep
@@ -62,35 +50,23 @@ BuildArch: noarch
 mkdir %{_target_platform}
 mkdir %{_target_platform}
 pushd %{_target_platform}
 pushd %{_target_platform}
 %{qmake_qt5} ..
 %{qmake_qt5} ..
-
 make %{?_smp_mflags}
 make %{?_smp_mflags}
-
-%if 0%{?docs}
-make %{?_smp_mflags} docs
-%endif
 popd
 popd
 
 
 
 
 %install
 %install
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
-%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
-%endif
 
 
 %files
 %files
 %license LICENSE.*
 %license LICENSE.*
 %{_qt5_qmldir}/QtGraphicalEffects/
 %{_qt5_qmldir}/QtGraphicalEffects/
 
 
-%if 0%{?docs}
-%files doc
-%license LICENSE.FDL
-%{_qt5_docdir}/qtgraphicaleffects.qch
-%{_qt5_docdir}/qtgraphicaleffects/
-%endif
-
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 13 - 6
q/qt5-qtimageformats/qt5-qtimageformats-vl.spec

@@ -8,22 +8,21 @@
 
 
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - QtImageFormats component
 Summary: Qt5 - QtImageFormats component
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
-
-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
 
 
 BuildRequires: cmake
 BuildRequires: cmake
@@ -56,9 +55,11 @@ ref. Reading and Writing Image Files. The Qt Image Formats add-on module
 provides optional support for other image file formats, including:
 provides optional support for other image file formats, including:
 MNG, TGA, TIFF, WBMP.
 MNG, TGA, TIFF, WBMP.
 
 
+
 %if 0%{?docs}
 %if 0%{?docs}
 %package doc
 %package doc
 Summary: API documentation for %{name}
 Summary: API documentation for %{name}
+Group: documentation
 License: GFDL
 License: GFDL
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qdoc
@@ -69,6 +70,9 @@ BuildArch: noarch
 %endif
 %endif
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %if 0%{?webp}
 %if 0%{?webp}
@@ -117,6 +121,9 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 14 - 10
q/qt5-qtlocation/qt5-qtlocation-vl.spec

@@ -1,4 +1,3 @@
-
 %global qt_module qtlocation
 %global qt_module qtlocation
 
 
 # define to build docs, need to undef this for bootstrapping
 # define to build docs, need to undef this for bootstrapping
@@ -14,22 +13,22 @@
 
 
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - Location component
 Summary: Qt5 - Location component
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
 
 
-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
 
 
 # build failure with gcc10
 # build failure with gcc10
@@ -62,8 +61,10 @@ The Qt Location and Qt Positioning APIs gives developers the ability to
 determine a position by using a variety of possible sources, including
 determine a position by using a variety of possible sources, including
 satellite, or wifi, or text file, and so on.
 satellite, or wifi, or text file, and so on.
 
 
+
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtbase-devel%{?_isa}
 %description devel
 %description devel
@@ -72,6 +73,7 @@ Requires: qt5-qtbase-devel%{?_isa}
 %if 0%{?docs}
 %if 0%{?docs}
 %package doc
 %package doc
 Summary: API documentation for %{name}
 Summary: API documentation for %{name}
+Group: documentation
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qhelpgenerator
 BuildRequires: qt5-qhelpgenerator
@@ -82,6 +84,7 @@ BuildArch: noarch
 
 
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
@@ -127,9 +130,6 @@ done
 popd
 popd
 
 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %files
 %files
 %license LICENSE.GPL* LICENSE.LGPL*
 %license LICENSE.GPL* LICENSE.LGPL*
 %{_qt5_libdir}/libQt5Location.so.5*
 %{_qt5_libdir}/libQt5Location.so.5*
@@ -183,6 +183,10 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+- updated Patch1.
+
 * Fri Apr 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-2
 * Fri Apr 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-2
 - rebuilt with icu-67.
 - rebuilt with icu-67.
 
 

+ 20 - 38
q/qt5-qtmultimedia/qt5-qtmultimedia-vl.spec

@@ -1,4 +1,3 @@
-
 %global qt_module qtmultimedia
 %global qt_module qtmultimedia
 
 
 # define to build docs, need to undef this for bootstrapping
 # define to build docs, need to undef this for bootstrapping
@@ -18,24 +17,26 @@
 
 
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - Multimedia support
 Summary: Qt5 - Multimedia support
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
 
 
-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
 
 
+Patch1: qt5-qtmultimedia-gcc11.patch
+
 BuildRequires: cmake
 BuildRequires: cmake
 BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: qt5-qtbase-devel >= %{version}
@@ -62,8 +63,10 @@ easily take advantage of a platforms multimedia capabilites and hardware.
 This ranges from the playback and recording of audio and video content to
 This ranges from the playback and recording of audio and video content to
 the use of available devices like cameras and radios.
 the use of available devices like cameras and radios.
 
 
+
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtdeclarative-devel%{?_isa}
 Requires: qt5-qtdeclarative-devel%{?_isa}
@@ -71,29 +74,21 @@ Requires: pkgconfig(libpulse-mainloop-glib)
 %description devel
 %description devel
 %{summary}.
 %{summary}.
 
 
-%if 0%{?docs}
-%package doc
-Summary: API documentation for %{name}
-License: GFDL
-Requires: %{name} = %{version}-%{release}
-BuildRequires: qt5-qdoc
-BuildRequires: qt5-qhelpgenerator
-BuildArch: noarch
-%description doc
-%{summary}.
-%endif
 
 
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
-
-# %patch50 -p1 -b .nullptr
+%autopatch -p1
 
 
 
 
 %build
 %build
@@ -105,19 +100,10 @@ pushd %{_target_platform}
 
 
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
-%if 0%{?docs}
-make %{?_smp_mflags} docs
-%endif
-popd
-
 
 
 %install
 %install
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
-%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
-%endif
-
 ## .prl/.la file love
 ## .prl/.la file love
 # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
 # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
 pushd %{buildroot}%{_qt5_libdir}
 pushd %{buildroot}%{_qt5_libdir}
@@ -131,9 +117,6 @@ done
 popd
 popd
 
 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %files
 %files
 %license LICENSE.*
 %license LICENSE.*
 %{_qt5_libdir}/libQt5Multimedia.so.5*
 %{_qt5_libdir}/libQt5Multimedia.so.5*
@@ -166,17 +149,12 @@ popd
 %{_qt5_libdir}/libQt5MultimediaGstTools.prl
 %{_qt5_libdir}/libQt5MultimediaGstTools.prl
 %{_qt5_libdir}/cmake/Qt5Multimedia/Qt5MultimediaConfig*.cmake
 %{_qt5_libdir}/cmake/Qt5Multimedia/Qt5MultimediaConfig*.cmake
 %{_qt5_libdir}/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig*.cmake
 %{_qt5_libdir}/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5MultimediaQuick/Qt5MultimediaQuickConfig*.cmake
 %{_qt5_libdir}/pkgconfig/Qt5Multimedia.pc
 %{_qt5_libdir}/pkgconfig/Qt5Multimedia.pc
 %{_qt5_libdir}/pkgconfig/Qt5MultimediaWidgets.pc
 %{_qt5_libdir}/pkgconfig/Qt5MultimediaWidgets.pc
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
 
 
-%if 0%{?docs}
-%files doc
-%license LICENSE.FDL
-%{_qt5_docdir}/qtmultimedia.qch
-%{_qt5_docdir}/qtmultimedia/
-%endif
-
 %if 0%{?_qt5_examplesdir:1}
 %if 0%{?_qt5_examplesdir:1}
 %files examples
 %files examples
 %{_qt5_examplesdir}/
 %{_qt5_examplesdir}/
@@ -184,6 +162,10 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Wed Apr 14 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+- imported Patch1 from rawhide.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 9 - 31
q/qt5-qtquickcontrols/qt5-qtquickcontrols-vl.spec

@@ -1,25 +1,22 @@
-
 %global qt_module qtquickcontrols
 %global qt_module qtquickcontrols
 
 
-#define docs 1
-
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Summary: Qt5 - module with set of QtQuick controls
 Summary: Qt5 - module with set of QtQuick controls
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 License: LGPLv2 or LGPLv3 and GFDL
 License: LGPLv2 or LGPLv3 and GFDL
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
 
 
-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
 
 
 # filter qml provides
 # filter qml provides
@@ -36,20 +33,10 @@ BuildRequires:  qt5-qtdeclarative-devel
 The Qt Quick Controls module provides a set of controls that can be used to
 The Qt Quick Controls module provides a set of controls that can be used to
 build complete interfaces in Qt Quick.
 build complete interfaces in Qt Quick.
 
 
-%if 0%{?docs}
-%package doc
-Summary: API documentation for %{name}
-License: GFDL
-Requires: %{name} = %{version}-%{release}
-BuildRequires: qt5-qdoc
-BuildRequires: qt5-qhelpgenerator
-BuildArch: noarch
-%description doc
-%{summary}.
-%endif
 
 
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
@@ -63,25 +50,13 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 mkdir %{_target_platform}
 mkdir %{_target_platform}
 pushd %{_target_platform}
 pushd %{_target_platform}
 %{qmake_qt5} ..
 %{qmake_qt5} ..
-
 make %{?_smp_mflags}
 make %{?_smp_mflags}
-
-%if 0%{?docs}
-# HACK to avoid multilib conflicts in noarch content
-# see also https://bugreports.qt-project.org/browse/QTBUG-42071
-QT_HASH_SEED=0; export QT_HASH_SEED
-make %{?_smp_mflags} docs
-%endif
 popd
 popd
 
 
 
 
 %install
 %install
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
-%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
-%endif
-
 
 
 %files
 %files
 %license LICENSE.*
 %license LICENSE.*
@@ -107,6 +82,9 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 13 - 36
q/qt5-qtquickcontrols2/qt5-qtquickcontrols2-vl.spec

@@ -1,25 +1,22 @@
-
 %global qt_module qtquickcontrols2
 %global qt_module qtquickcontrols2
 
 
-#define docs 1
-
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Summary: Qt5 - module with set of QtQuick controls for embedded
 Summary: Qt5 - module with set of QtQuick controls for embedded
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 License: GPLv2+ or LGPLv3 and GFDL
 License: GPLv2+ or LGPLv3 and GFDL
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
 
 
-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
 
 
 # filter qml provides
 # filter qml provides
@@ -47,21 +44,9 @@ Unlike Qt Quick Controls, these controls are optimized for embedded systems
 and so are preferred for hardware with limited resources.
 and so are preferred for hardware with limited resources.
 
 
 
 
-%if 0%{?docs}
-%package doc
-Summary: API documentation for %{name}
-License: GFDL
-Requires: %{name} = %{version}-%{release}
-BuildRequires: qt5-qdoc
-BuildRequires: qt5-qhelpgenerator
-BuildArch: noarch
-%description doc
-%{summary}.
-%endif
-
-
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtdeclarative-devel%{?_isa}
 Requires: qt5-qtdeclarative-devel%{?_isa}
@@ -71,11 +56,15 @@ Requires: qt5-qtdeclarative-devel%{?_isa}
 
 
 %package examples
 %package examples
 Summary:        Examples for %{name}
 Summary:        Examples for %{name}
+Group: programming
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
@@ -91,19 +80,10 @@ pushd %{_target_platform}
 
 
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
-%if 0%{?docs}
-make %{?_smp_mflags} docs
-%endif
-popd
-
 
 
 %install
 %install
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
-%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
-%endif
-
 ## .prl/.la file love
 ## .prl/.la file love
 # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
 # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
 pushd %{buildroot}%{_qt5_libdir}
 pushd %{buildroot}%{_qt5_libdir}
@@ -120,12 +100,6 @@ popd
 rm -f %{buildroot}%{_qt5_libdir}/libQt5*.la
 rm -f %{buildroot}%{_qt5_libdir}/libQt5*.la
 
 
 
 
-%post -p /sbin/ldconfig
-
-
-%postun -p /sbin/ldconfig
-
-
 %files
 %files
 %license LICENSE.LGPLv3 LICENSE.GPLv3
 %license LICENSE.LGPLv3 LICENSE.GPLv3
 %{_qt5_libdir}/libQt5QuickTemplates2.so.5*
 %{_qt5_libdir}/libQt5QuickTemplates2.so.5*
@@ -159,6 +133,9 @@ rm -f %{buildroot}%{_qt5_libdir}/libQt5*.la
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 14 - 38
q/qt5-qtscript/qt5-qtscript-vl.spec

@@ -1,26 +1,23 @@
-
 %global qt_module qtscript
 %global qt_module qtscript
 
 
-#define docs 1
-
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - QtScript component
 Summary: Qt5 - QtScript component
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
 
 
-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
 
 
 BuildRequires: cmake
 BuildRequires: cmake
@@ -45,32 +42,28 @@ BuildRequires: xorg-x11-server-Xvfb
 %description
 %description
 %{summary}.
 %{summary}.
 
 
+
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Provides: %{name}-private-devel = %{version}-%{release}
 Provides: %{name}-private-devel = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtbase-devel%{?_isa}
 %description devel
 %description devel
 %{summary}.
 %{summary}.
 
 
-%if 0%{?docs}
-%package doc
-Summary: API documentation for %{name}
-Requires: %{name} = %{version}-%{release}
-BuildRequires: qt5-qdoc
-BuildRequires: qt5-qhelpgenerator
-BuildArch: noarch
-%description doc
-%{summary}.
-%endif
 
 
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
@@ -79,22 +72,13 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 mkdir %{_target_platform}
 mkdir %{_target_platform}
 pushd %{_target_platform}
 pushd %{_target_platform}
 %{qmake_qt5} ..
 %{qmake_qt5} ..
-
 make %{?_smp_mflags}
 make %{?_smp_mflags}
-
-%if 0%{?docs}
-make %{?_smp_mflags} docs
-%endif
 popd
 popd
 
 
 
 
 %install
 %install
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
-%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
-%endif
-
 ## .prl file love (maybe consider just deleting these -- rex
 ## .prl file love (maybe consider just deleting these -- rex
 # nuke dangling reference(s) to %%buildroot, excessive (.la-like) libs
 # nuke dangling reference(s) to %%buildroot, excessive (.la-like) libs
 sed -i \
 sed -i \
@@ -107,9 +91,6 @@ sed -i \
 rm -fv %{buildroot}%{_qt5_libdir}/lib*.la
 rm -fv %{buildroot}%{_qt5_libdir}/lib*.la
 
 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %files
 %files
 %license LICENSE.LGPL*
 %license LICENSE.LGPL*
 %{_qt5_libdir}/libQt5Script.so.5*
 %{_qt5_libdir}/libQt5Script.so.5*
@@ -128,14 +109,6 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la
 %{_qt5_libdir}/pkgconfig/Qt5*.pc
 %{_qt5_libdir}/pkgconfig/Qt5*.pc
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
 
 
-%if 0%{?docs}
-%files doc
-%{_qt5_docdir}/qtscript.qch
-%{_qt5_docdir}/qtscript/
-%{_qt5_docdir}/qtscripttools.qch
-%{_qt5_docdir}/qtscripttools/
-%endif
-
 %if 0%{?_qt5_examplesdir:1}
 %if 0%{?_qt5_examplesdir:1}
 %files examples
 %files examples
 %{_qt5_examplesdir}/
 %{_qt5_examplesdir}/
@@ -143,6 +116,9 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la
 
 
 
 
 %changelog
 %changelog
+* Wed Apr 14 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 14 - 12
q/qt5-qtsensors/qt5-qtsensors-vl.spec

@@ -14,22 +14,21 @@
 
 
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - Sensors component
 Summary: Qt5 - Sensors component
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
-
-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
 
 
 # filter qml/plugin provides
 # filter qml/plugin provides
@@ -50,6 +49,7 @@ API for devices.
 
 
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtbase-devel%{?_isa}
 %description devel
 %description devel
@@ -58,6 +58,7 @@ Requires: qt5-qtbase-devel%{?_isa}
 %if 0%{?docs}
 %if 0%{?docs}
 %package doc
 %package doc
 Summary: API documentation for %{name}
 Summary: API documentation for %{name}
+Group: documentation
 License: GFDL
 License: GFDL
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qdoc
@@ -69,11 +70,15 @@ BuildArch: noarch
 
 
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
@@ -111,12 +116,6 @@ done
 popd
 popd
 
 
 
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
 %files
 %files
 %license LICENSE.*
 %license LICENSE.*
 %{_qt5_libdir}/libQt5Sensors.so.5*
 %{_qt5_libdir}/libQt5Sensors.so.5*
@@ -148,6 +147,9 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 14 - 40
q/qt5-qtserialport/qt5-qtserialport-vl.spec

@@ -1,26 +1,23 @@
-
 %global qt_module qtserialport
 %global qt_module qtserialport
 
 
-#define docs 1
-
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - SerialPort component
 Summary: Qt5 - SerialPort component
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
 
 
-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
 
 
 BuildRequires: cmake
 BuildRequires: cmake
@@ -35,32 +32,27 @@ BuildRequires: qt5-qtbase-private-devel
 Qt Serial Port provides the basic functionality, which includes configuring,
 Qt Serial Port provides the basic functionality, which includes configuring,
 I/O operations, getting and setting the control signals of the RS-232 pinouts.
 I/O operations, getting and setting the control signals of the RS-232 pinouts.
 
 
+
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtbase-devel%{?_isa}
 %description devel
 %description devel
 %{summary}.
 %{summary}.
 
 
-%if 0%{?docs}
-%package doc
-Summary: API documentation for %{name}
-License: GFDL
-Requires: %{name} = %{version}-%{release}
-BuildRequires: qt5-qdoc
-BuildRequires: qt5-qhelpgenerator
-BuildArch: noarch
-%description doc
-%{summary}.
-%endif
 
 
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
@@ -70,31 +62,13 @@ mkdir %{_target_platform}
 pushd %{_target_platform}
 pushd %{_target_platform}
 %{qmake_qt5} .. \
 %{qmake_qt5} .. \
   %{?_qt5_examplesdir:CONFIG+=qt_example_installs}
   %{?_qt5_examplesdir:CONFIG+=qt_example_installs}
-
 make %{?_smp_mflags}
 make %{?_smp_mflags}
-
-%if 0%{?docs}
-# HACK to avoid multilib conflicts in noarch content
-# see also https://bugreports.qt-project.org/browse/QTBUG-42071
-QT_HASH_SEED=0; export QT_HASH_SEED
-make %{?_smp_mflags} docs
-%endif
 popd
 popd
 
 
 
 
 %install
 %install
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
-%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
-
-# workaround issue where on some archs/releases doc file is named examples-serialport.html or qtserialport-examples.html
-if [ -f %{buildroot}%{_qt5_docdir}/qtserialport/qtserialport-examples.html ]; then
-   mv   %{buildroot}%{_qt5_docdir}/qtserialport/qtserialport-examples.html \
-        %{buildroot}%{_qt5_docdir}/qtserialport/examples-serialport.html
-fi
-%endif
-
 ## .prl/.la file love
 ## .prl/.la file love
 # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
 # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
 pushd %{buildroot}%{_qt5_libdir}
 pushd %{buildroot}%{_qt5_libdir}
@@ -108,9 +82,6 @@ done
 popd
 popd
 
 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %files
 %files
 %license LICENSE.*
 %license LICENSE.*
 %{_qt5_libdir}/libQt5SerialPort.so.5*
 %{_qt5_libdir}/libQt5SerialPort.so.5*
@@ -139,6 +110,9 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Wed Apr 14 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 21 - 10
q/qt5-qtsvg/qt5-qtsvg-vl.spec

@@ -5,24 +5,26 @@
 
 
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - Support for rendering and displaying SVG
 Summary: Qt5 - Support for rendering and displaying SVG
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
-
-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
 
 
+# upstream fix
+Patch0: qtsvg-5.15.2-clamp-parsed-doubles-to-float-representtable-values.patch
+
 BuildRequires: cmake
 BuildRequires: cmake
 BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-srpm-macros
 BuildRequires: qt5-srpm-macros
@@ -37,8 +39,10 @@ Scalable Vector Graphics (SVG) is an XML-based language for describing
 two-dimensional vector graphics. Qt provides classes for rendering and
 two-dimensional vector graphics. Qt provides classes for rendering and
 displaying SVG drawings in widgets and on other paint devices.
 displaying SVG drawings in widgets and on other paint devices.
 
 
+
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtbase-devel%{?_isa}
 %description devel
 %description devel
@@ -47,6 +51,7 @@ Requires: qt5-qtbase-devel%{?_isa}
 %if 0%{?docs}
 %if 0%{?docs}
 %package doc
 %package doc
 Summary: API documentation for %{name}
 Summary: API documentation for %{name}
+Group: documentation
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qhelpgenerator
 BuildRequires: qt5-qhelpgenerator
@@ -57,11 +62,15 @@ BuildArch: noarch
 
 
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
@@ -96,21 +105,20 @@ for prl_file in libQt5*.prl ; do
 done
 done
 popd
 popd
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 
 %files
 %files
 %license LICENSE.*
 %license LICENSE.*
 %{_qt5_libdir}/libQt5Svg.so.5*
 %{_qt5_libdir}/libQt5Svg.so.5*
 %{_qt5_plugindir}/iconengines/libqsvgicon.so
 %{_qt5_plugindir}/iconengines/libqsvgicon.so
 %{_qt5_plugindir}/imageformats/libqsvg.so
 %{_qt5_plugindir}/imageformats/libqsvg.so
-%dir %{_qt5_libdir}/cmake/Qt5Svg/
-%{_qt5_libdir}/cmake/Qt5Svg/Qt5Svg_*Plugin.cmake
+%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QSvg*Plugin.cmake
+
 
 
 %files devel
 %files devel
 %{_qt5_headerdir}/QtSvg/
 %{_qt5_headerdir}/QtSvg/
 %{_qt5_libdir}/libQt5Svg.so
 %{_qt5_libdir}/libQt5Svg.so
 %{_qt5_libdir}/libQt5Svg.prl
 %{_qt5_libdir}/libQt5Svg.prl
+%dir %{_qt5_libdir}/cmake/Qt5Svg/
 %{_qt5_libdir}/cmake/Qt5Svg/Qt5SvgConfig*.cmake
 %{_qt5_libdir}/cmake/Qt5Svg/Qt5SvgConfig*.cmake
 %{_qt5_libdir}/pkgconfig/Qt5Svg.pc
 %{_qt5_libdir}/pkgconfig/Qt5Svg.pc
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_svg*.pri
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_svg*.pri
@@ -129,6 +137,9 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 41 - 76
q/qt5-qttools/qt5-qttools-vl.spec

@@ -17,26 +17,32 @@
 #define prerelease
 #define prerelease
 
 
 %global qt_module qttools
 %global qt_module qttools
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - QtTool components
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Name:    qt5-qttools
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-
-License: LGPLv3 or LGPLv2
-Url:     https://www.qt.io/
-
+Group: system
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
+License: LGPLv3 or LGPLv2
+Url:     https://www.qt.io/
 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
 
 
 # help lrelease/lupdate use/prefer qmake-qt5
 # help lrelease/lupdate use/prefer qmake-qt5
 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893
 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893
-Patch2: qttools-opensource-src-5.5.0-qmake-qt5.patch
+Patch2: qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch
+
+# 32-bit MIPS needs explicit -latomic
+Patch4: qttools-opensource-src-5.7-add-libatomic.patch
+
+# Link against libclang-cpp.so
+# https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package
+Patch5: 0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch
 
 
 ## upstream patches
 ## upstream patches
 
 
@@ -74,6 +80,7 @@ Requires: %{name}-common = %{version}-%{release}
 
 
 %package common
 %package common
 Summary: Common files for %{name}
 Summary: Common files for %{name}
+Group: system
 BuildArch: noarch
 BuildArch: noarch
 Obsoletes: qt5-qttools-libs-clucene < 5.9.0
 Obsoletes: qt5-qttools-libs-clucene < 5.9.0
 %if ! 0%{?webkit}
 %if ! 0%{?webkit}
@@ -84,6 +91,7 @@ Obsoletes: qt5-designer-plugin-webkit < 5.9.0
 
 
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
 Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
 Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
 Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
@@ -97,36 +105,42 @@ Requires: qt5-qtbase-devel%{?_isa}
 
 
 %package static
 %package static
 Summary: Static library files for %{name}
 Summary: Static library files for %{name}
+Group: programming
 Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 %description static
 %description static
 %{summary}.
 %{summary}.
 
 
 %package libs-designer
 %package libs-designer
 Summary: Qt5 Designer runtime library
 Summary: Qt5 Designer runtime library
+Group: system
 Requires: %{name}-common = %{version}-%{release}
 Requires: %{name}-common = %{version}-%{release}
 %description libs-designer
 %description libs-designer
 %{summary}.
 %{summary}.
 
 
 %package libs-designercomponents
 %package libs-designercomponents
 Summary: Qt5 Designer Components runtime library
 Summary: Qt5 Designer Components runtime library
+Group: system
 Requires: %{name}-common = %{version}-%{release}
 Requires: %{name}-common = %{version}-%{release}
 %description libs-designercomponents
 %description libs-designercomponents
 %{summary}.
 %{summary}.
 
 
 %package libs-help
 %package libs-help
 Summary: Qt5 Help runtime library
 Summary: Qt5 Help runtime library
+Group: programming
 Requires: %{name}-common = %{version}-%{release}
 Requires: %{name}-common = %{version}-%{release}
 %description libs-help
 %description libs-help
 %{summary}.
 %{summary}.
 
 
 %package -n qt5-assistant
 %package -n qt5-assistant
 Summary: Documentation browser for Qt5
 Summary: Documentation browser for Qt5
+Group: programming
 Requires: %{name}-common = %{version}-%{release}
 Requires: %{name}-common = %{version}-%{release}
 %description -n qt5-assistant
 %description -n qt5-assistant
 %{summary}.
 %{summary}.
 
 
 %package -n qt5-designer
 %package -n qt5-designer
 Summary: Design GUIs for Qt5 applications
 Summary: Design GUIs for Qt5 applications
+Group: programming
 Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
 Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
 Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
 Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
 %description -n qt5-designer
 %description -n qt5-designer
@@ -135,6 +149,7 @@ Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
 %if 0%{?webkit}
 %if 0%{?webkit}
 %package -n qt5-designer-plugin-webkit
 %package -n qt5-designer-plugin-webkit
 Summary: Qt5 designer plugin for WebKit
 Summary: Qt5 designer plugin for WebKit
+Group: programming
 BuildRequires: pkgconfig(Qt5WebKitWidgets)
 BuildRequires: pkgconfig(Qt5WebKitWidgets)
 Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
 Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
 %description -n qt5-designer-plugin-webkit
 %description -n qt5-designer-plugin-webkit
@@ -143,12 +158,14 @@ Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
 
 
 %package -n qt5-linguist
 %package -n qt5-linguist
 Summary: Qt5 Linguist Tools
 Summary: Qt5 Linguist Tools
+Group: programming
 Requires: %{name}-common = %{version}-%{release}
 Requires: %{name}-common = %{version}-%{release}
 %description -n qt5-linguist
 %description -n qt5-linguist
 Tools to add translations to Qt5 applications.
 Tools to add translations to Qt5 applications.
 
 
 %package -n qt5-qdbusviewer
 %package -n qt5-qdbusviewer
 Summary: D-Bus debugger and viewer
 Summary: D-Bus debugger and viewer
+Group: programming
 Requires: %{name}-common = %{version}-%{release}
 Requires: %{name}-common = %{version}-%{release}
 %{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
 %{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
 %description -n qt5-qdbusviewer
 %description -n qt5-qdbusviewer
@@ -157,6 +174,7 @@ and invoke methods on those objects.
 
 
 %package -n qt5-doctools
 %package -n qt5-doctools
 Summary: Qt5 doc tools package
 Summary: Qt5 doc tools package
+Group: programming
 Provides: qt5-qdoc = %{version}
 Provides: qt5-qdoc = %{version}
 Obsoletes: qt5-qdoc < 5.8.0
 Obsoletes: qt5-qdoc < 5.8.0
 Provides: qt5-qhelpgenerator = %{version}
 Provides: qt5-qhelpgenerator = %{version}
@@ -171,6 +189,7 @@ Requires: qt5-qtattributionsscanner = %{version}
 %if 0%{?docs}
 %if 0%{?docs}
 %package doc
 %package doc
 Summary: API documentation for %{name}
 Summary: API documentation for %{name}
+Group: documentation
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qhelpgenerator
 BuildRequires: qt5-qhelpgenerator
 BuildArch: noarch
 BuildArch: noarch
@@ -182,14 +201,20 @@ Conflicts: qt5-qtbase-doc < 5.6.0
 
 
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}-common = %{version}-%{release}
 Requires: %{name}-common = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{version}
 %setup -q -n %{qt_module}-everywhere-src-%{version}
-%patch2 -p1 -b .qmake-qt5
+%patch2 -p1 -b .runqttools-with-qt5-suffix.patch
+#patch4 -p1 -b .libatomic
+%patch5 -p1 -b .libclang-cpp
 
 
 
 
 %build
 %build
@@ -299,52 +324,22 @@ popd
 %files common
 %files common
 %license LICENSE.LGPL*
 %license LICENSE.LGPL*
 
 
-%post   libs-designer -p /sbin/ldconfig
-%postun libs-designer -p /sbin/ldconfig
 %files  libs-designer
 %files  libs-designer
 %{_qt5_libdir}/libQt5Designer.so.5*
 %{_qt5_libdir}/libQt5Designer.so.5*
 %dir %{_qt5_libdir}/cmake/Qt5Designer/
 %dir %{_qt5_libdir}/cmake/Qt5Designer/
 
 
-%post   libs-designercomponents -p /sbin/ldconfig
-%postun libs-designercomponents -p /sbin/ldconfig
 %files  libs-designercomponents
 %files  libs-designercomponents
 %{_qt5_libdir}/libQt5DesignerComponents.so.5*
 %{_qt5_libdir}/libQt5DesignerComponents.so.5*
 
 
-%post   libs-help -p /sbin/ldconfig
-%postun libs-help -p /sbin/ldconfig
 %files  libs-help
 %files  libs-help
 %{_qt5_libdir}/libQt5Help.so.5*
 %{_qt5_libdir}/libQt5Help.so.5*
 
 
-%post -n qt5-assistant
-touch --no-create %{_datadir}/icons/hicolor ||:
-
-%posttrans -n qt5-assistant
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun -n qt5-assistant
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-fi
-
 %files -n qt5-assistant
 %files -n qt5-assistant
 %{_bindir}/assistant-qt5
 %{_bindir}/assistant-qt5
 %{_qt5_bindir}/assistant*
 %{_qt5_bindir}/assistant*
 %{_datadir}/applications/*assistant.desktop
 %{_datadir}/applications/*assistant.desktop
 %{_datadir}/icons/hicolor/*/apps/assistant*.*
 %{_datadir}/icons/hicolor/*/apps/assistant*.*
 
 
-%post -n qt5-doctools
-touch --no-create %{_datadir}/icons/hicolor ||:
-
-%posttrans -n qt5-doctools
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun -n qt5-doctools
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-fi
-
 %files -n qt5-doctools
 %files -n qt5-doctools
 %{_bindir}/qdoc*
 %{_bindir}/qdoc*
 %{_qt5_bindir}/qdoc*
 %{_qt5_bindir}/qdoc*
@@ -355,43 +350,18 @@ fi
 %{_bindir}/qtattributionsscanner-qt5
 %{_bindir}/qtattributionsscanner-qt5
 %{_qt5_bindir}/qtattributionsscanner*
 %{_qt5_bindir}/qtattributionsscanner*
 
 
-%post -n qt5-designer
-touch --no-create %{_datadir}/icons/hicolor ||:
-
-%posttrans -n qt5-designer
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database -q &> /dev/null ||:
-
-%postun -n qt5-designer
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-fi
-
 %files -n qt5-designer
 %files -n qt5-designer
 %{_bindir}/designer*
 %{_bindir}/designer*
 %{_qt5_bindir}/designer*
 %{_qt5_bindir}/designer*
 %{_datadir}/applications/*designer.desktop
 %{_datadir}/applications/*designer.desktop
 %{_datadir}/icons/hicolor/*/apps/designer*.*
 %{_datadir}/icons/hicolor/*/apps/designer*.*
+%{_qt5_libdir}/cmake/Qt5DesignerComponents/Qt5DesignerComponentsConfig*.cmake
 %if 0%{?webkit}
 %if 0%{?webkit}
 %files -n qt5-designer-plugin-webkit
 %files -n qt5-designer-plugin-webkit
 %{_qt5_plugindir}/designer/libqwebview.so
 %{_qt5_plugindir}/designer/libqwebview.so
 %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
 %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
 %endif
 %endif
 
 
-%post -n qt5-linguist
-touch --no-create %{_datadir}/icons/hicolor ||:
-
-%posttrans -n qt5-linguist
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database -q &> /dev/null ||:
-
-%postun -n qt5-linguist
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-fi
-
 %files -n qt5-linguist
 %files -n qt5-linguist
 %{_bindir}/linguist*
 %{_bindir}/linguist*
 %{_qt5_bindir}/linguist*
 %{_qt5_bindir}/linguist*
@@ -403,26 +373,16 @@ fi
 %{_bindir}/lconvert*
 %{_bindir}/lconvert*
 %{_bindir}/lrelease*
 %{_bindir}/lrelease*
 %{_bindir}/lupdate*
 %{_bindir}/lupdate*
+%{_bindir}/lprodump*
 %{_qt5_bindir}/lconvert*
 %{_qt5_bindir}/lconvert*
 %{_qt5_bindir}/lrelease*
 %{_qt5_bindir}/lrelease*
 %{_qt5_bindir}/lupdate*
 %{_qt5_bindir}/lupdate*
+%{_qt5_bindir}/lprodump*
 # cmake config
 # cmake config
 %dir %{_qt5_libdir}/cmake/Qt5LinguistTools/
 %dir %{_qt5_libdir}/cmake/Qt5LinguistTools/
 %{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake
 %{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake
 %{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
 %{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
 
 
-%post -n qt5-qdbusviewer
-touch --no-create %{_datadir}/icons/hicolor ||:
-
-%posttrans -n qt5-qdbusviewer
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun -n qt5-qdbusviewer
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-fi
-
 %files -n qt5-qdbusviewer
 %files -n qt5-qdbusviewer
 %{_bindir}/qdbusviewer*
 %{_bindir}/qdbusviewer*
 %{_qt5_bindir}/qdbusviewer*
 %{_qt5_bindir}/qdbusviewer*
@@ -463,6 +423,8 @@ fi
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_help.pri
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_help.pri
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_help_private.pri
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_help_private.pri
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri
+%{_qt5_libdir}/cmake/Qt5AttributionsScannerTools/
+%{_qt5_libdir}/cmake/Qt5DocTools/
 
 
 %files static
 %files static
 %{_qt5_headerdir}/QtUiTools/
 %{_qt5_headerdir}/QtUiTools/
@@ -501,6 +463,9 @@ fi
 %changelog
 %changelog
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
+- dropped scriptlets.
+- dropped Patch2.
+- imported Patch2-5 from rawhide.
 
 
 * Mon Mar 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.7-1
 * Mon Mar 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.7-1
 - new upstream release.
 - new upstream release.

+ 9 - 6
q/qt5-qttranslations/qt5-qttranslations-vl.spec

@@ -3,25 +3,24 @@
 
 
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - QtTranslations module
 Summary: Qt5 - QtTranslations module
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 License: LGPLv2 with exceptions or GPLv3 with exceptions and GFDL
 License: LGPLv2 with exceptions or GPLv3 with exceptions and GFDL
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
 
 
-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
 
 
 BuildArch: noarch
 BuildArch: noarch
-%global _qt5_qmake %{_bindir}/qmake-qt5
 
 
 BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: qt5-qtbase-devel >= %{version}
@@ -107,12 +106,16 @@ make install INSTALL_ROOT=%{buildroot}
 %lang(sk) %{_qt5_translationdir}/*_sk.qm
 %lang(sk) %{_qt5_translationdir}/*_sk.qm
 %lang(sl) %{_qt5_translationdir}/*_sl.qm
 %lang(sl) %{_qt5_translationdir}/*_sl.qm
 %lang(sv) %{_qt5_translationdir}/*_sv.qm
 %lang(sv) %{_qt5_translationdir}/*_sv.qm
+%lang(sv) %{_qt5_translationdir}/*_tr.qm
 %lang(uk) %{_qt5_translationdir}/*_uk.qm
 %lang(uk) %{_qt5_translationdir}/*_uk.qm
 %lang(zh_CN) %{_qt5_translationdir}/*_zh_CN.qm
 %lang(zh_CN) %{_qt5_translationdir}/*_zh_CN.qm
 %lang(zh_TW) %{_qt5_translationdir}/*_zh_TW.qm
 %lang(zh_TW) %{_qt5_translationdir}/*_zh_TW.qm
 
 
 
 
 %changelog
 %changelog
+* Wed Apr 14 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 15 - 8
q/qt5-qtwebchannel/qt5-qtwebchannel-vl.spec

@@ -4,23 +4,23 @@
 
 
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - WebChannel component
 Summary: Qt5 - WebChannel component
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://doc.qt.io/qt-5/licensing.html
 # See also http://doc.qt.io/qt-5/licensing.html
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url: https://qt.io/
 Url: https://qt.io/
 
 
-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
 
 
 BuildRequires: cmake
 BuildRequires: cmake
@@ -38,8 +38,10 @@ The Qt WebChannel module provides a library for seamless integration of C++
 and QML applications with HTML/JavaScript clients. Any QObject can be
 and QML applications with HTML/JavaScript clients. Any QObject can be
 published to remote clients, where its public API becomes available.
 published to remote clients, where its public API becomes available.
 
 
+
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtbase-devel%{?_isa}
 %description devel
 %description devel
@@ -48,6 +50,7 @@ Requires: qt5-qtbase-devel%{?_isa}
 %if 0%{?docs}
 %if 0%{?docs}
 %package doc
 %package doc
 Summary: API documentation for %{name}
 Summary: API documentation for %{name}
+Group: documentation
 License: GFDL
 License: GFDL
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qdoc
@@ -59,11 +62,15 @@ BuildArch: noarch
 
 
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
@@ -104,9 +111,6 @@ done
 popd
 popd
 
 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %files
 %files
 %license LICENSE.*
 %license LICENSE.*
 %{_qt5_libdir}/libQt5WebChannel.so.5*
 %{_qt5_libdir}/libQt5WebChannel.so.5*
@@ -135,6 +139,9 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 66 - 33
q/qt5-qtwebengine/qt5-qtwebengine-vl.spec

@@ -1,15 +1,7 @@
-
 %global qt_module qtwebengine
 %global qt_module qtwebengine
 
 
 %global _hardened_build 1
 %global _hardened_build 1
 
 
-# define to build docs, need to undef this for bootstrapping
-# where qt5-qttools builds are not yet available
-# only primary archs (for now), allow secondary to bootstrap
-%ifarch %{arm} %{ix86} x86_64
-#global docs 1
-%endif
-
 %if 0
 %if 0
 # need libvpx >= 1.8.0
 # need libvpx >= 1.8.0
 %global use_system_libvpx 1
 %global use_system_libvpx 1
@@ -19,6 +11,11 @@
 %global use_system_libwebp 1
 %global use_system_libwebp 1
 %endif
 %endif
 
 
+# upstream source does not support icu >= 68
+%if 0
+%global use_system_libicu 1
+%endif
+
 #global prerelease rc
 #global prerelease rc
 
 
 # spellchecking dictionary directory
 # spellchecking dictionary directory
@@ -34,14 +31,17 @@
 # and designer plugins
 # and designer plugins
 %global __provides_exclude_from ^%{_qt5_plugindir}/.*\\.so$
 %global __provides_exclude_from ^%{_qt5_plugindir}/.*\\.so$
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - QtWebEngine components
 Summary: Qt5 - QtWebEngine components
 Name:    qt5-qtwebengine
 Name:    qt5-qtwebengine
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
 # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -49,9 +49,6 @@ Release: 2%{?_dist_release}
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
 URL:     https://www.qt.io/
 URL:     https://www.qt.io/
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 # cleaned tarball with patent-encumbered codecs removed from the bundled FFmpeg
 # cleaned tarball with patent-encumbered codecs removed from the bundled FFmpeg
 # wget https://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtwebengine-everywhere-src-5.6.1-1.tar.xz
 # wget https://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtwebengine-everywhere-src-5.6.1-1.tar.xz
 # ./clean_qtwebengine.sh 5.6.1-1
 # ./clean_qtwebengine.sh 5.6.1-1
@@ -88,7 +85,17 @@ Patch10: qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
 Patch21: qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
 Patch21: qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
 # Fix/workaround FTBFS on aarch64 with newer glibc
 # Fix/workaround FTBFS on aarch64 with newer glibc
 Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
 Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
-
+# Use Python2
+Patch26: qtwebengine-everywhere-5.13.2-use-python2.patch
+# Missing #includes for gcc-11
+Patch27: qtwebengine-gcc11.patch
+# Fix sandbox issue breaking text rendering with glibc >= 2.33 (#1904652)
+Patch28: qtwebengine-everywhere-src-5.15.2-#1904652.patch
+# Fix sandbox issue on 32-bit architectures with glibc >= 2.31 (from Debian)
+Patch29: qtwebengine-everywhere-src-5.15.2-sandbox-time64-syscalls.patch
+
+# from upstream
+Patch1000: icu-68.patch
 
 
 # handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches
 # handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches
 ExclusiveArch: %{qt5_qtwebengine_arches}
 ExclusiveArch: %{qt5_qtwebengine_arches}
@@ -103,6 +110,7 @@ BuildRequires: qt5-qtdeclarative-devel
 BuildRequires: qt5-qtxmlpatterns-devel
 BuildRequires: qt5-qtxmlpatterns-devel
 BuildRequires: qt5-qtlocation-devel
 BuildRequires: qt5-qtlocation-devel
 BuildRequires: qt5-qtsensors-devel
 BuildRequires: qt5-qtsensors-devel
+BuildRequires: qt5-qtsvg-devel
 BuildRequires: qt5-qtwebchannel-devel
 BuildRequires: qt5-qtwebchannel-devel
 BuildRequires: qt5-qttools-static
 BuildRequires: qt5-qttools-static
 # for examples?
 # for examples?
@@ -117,7 +125,9 @@ BuildRequires: libstdc++-static
 BuildRequires: git-core
 BuildRequires: git-core
 BuildRequires: gperf
 BuildRequires: gperf
 BuildRequires: krb5-devel
 BuildRequires: krb5-devel
+%if 0%{?use_system_libicu}
 BuildRequires: libicu-devel
 BuildRequires: libicu-devel
+%endif
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: libjpeg-turbo-devel
 #BuildRequires: re2-devel
 #BuildRequires: re2-devel
 BuildRequires: snappy-devel
 BuildRequires: snappy-devel
@@ -162,9 +172,11 @@ BuildRequires: pciutils-devel
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(nss)
 BuildRequires: pkgconfig(nss)
 BuildRequires: pkgconfig(lcms2)
 BuildRequires: pkgconfig(lcms2)
+BuildRequires: pkgconfig(xkbcommon)
 BuildRequires: perl
 BuildRequires: perl
 BuildRequires: python
 BuildRequires: python
 BuildRequires: python-rpm-macros
 BuildRequires: python-rpm-macros
+BuildRequires: python2-rpm-macros
 %if 0%{?use_system_libvpx}
 %if 0%{?use_system_libvpx}
 BuildRequires: pkgconfig(vpx) >= 1.7.0
 BuildRequires: pkgconfig(vpx) >= 1.7.0
 %endif
 %endif
@@ -342,7 +354,9 @@ mv pulse src/3rdparty/chromium/
 %endif
 %endif
 
 
 %patch0 -p1 -b .linux-pri
 %patch0 -p1 -b .linux-pri
+%if 0%{?use_system_libicu}
 %patch1 -p1 -b .no-icudtl-dat
 %patch1 -p1 -b .no-icudtl-dat
+%endif
 %patch2 -p1 -b .fix-extractcflag
 %patch2 -p1 -b .fix-extractcflag
 %if !0%{?arm_neon}
 %if !0%{?arm_neon}
 %patch3 -p1 -b .no-neon
 %patch3 -p1 -b .no-neon
@@ -351,11 +365,28 @@ mv pulse src/3rdparty/chromium/
 
 
 ## upstream patches
 ## upstream patches
 
 
-%patch10 -p1 -b .openmax-dl-neon
+#patch10 -p1 -b .openmax-dl-neon
 ## NEEDSWORK
 ## NEEDSWORK
 #patch21 -p1 -b .gn-bootstrap-verbose
 #patch21 -p1 -b .gn-bootstrap-verbose
 %patch24 -p1 -b .aarch64-new-stat
 %patch24 -p1 -b .aarch64-new-stat
+%patch26 -p1 -b .use-python2
+%patch27 -p1 -b .gcc11
+%patch28 -p1 -b .rh#1904652
+%patch29 -p1 -b .sandbox-time64-syscalls
 
 
+%if 0%{?use_system_libicu}
+# for ICU-68 or later
+pushd src/3rdparty
+%patch1000 -p1
+sed -i -e 's/TRUE/1/' chromium/third_party/libxml/src/encoding.c
+popd
+%endif
+
+# the xkbcommon config/feature was renamed in 5.12, so need to adjust QT_CONFIG references
+# when building on older Qt releases
+%if "%{_qt5_version}" < "5.12.0"
+sed -i -e 's|QT_CONFIG(xkbcommon)|QT_CONFIG(xkbcommon_evdev)|g' src/core/web_event_factory.cpp
+%endif
 
 
 # fix // in #include in content/renderer/gpu to avoid debugedit failure
 # fix // in #include in content/renderer/gpu to avoid debugedit failure
 #sed -i -e 's!gpu//!gpu/!g' \
 #sed -i -e 's!gpu//!gpu/!g' \
@@ -364,10 +395,12 @@ mv pulse src/3rdparty/chromium/
 sed -i -e 's!audio_processing//!audio_processing/!g' \
 sed -i -e 's!audio_processing//!audio_processing/!g' \
   src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/utility/ooura_fft.cc \
   src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/utility/ooura_fft.cc \
   src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc
   src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc
+
 # remove ./ from #line commands in ANGLE to avoid debugedit failure (?)
 # remove ./ from #line commands in ANGLE to avoid debugedit failure (?)
-sed -i -e 's!\./!!g' \
-  src/3rdparty/chromium/third_party/angle/src/compiler/preprocessor/Tokenizer.cpp \
-  src/3rdparty/chromium/third_party/angle/src/compiler/translator/glslang_lex.cpp
+#sed -i -e 's!\./!!g' \
+#  src/3rdparty/chromium/third_party/angle/src/compiler/preprocessor/Tokenizer.cpp \
+#  src/3rdparty/chromium/third_party/angle/src/compiler/translator/glslang_lex.cpp
+
 # delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
 # delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
 # never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS
 # never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS
 sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \
 sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \
@@ -388,7 +421,7 @@ sed -i -e 's/symbol_level=1/symbol_level=2/g' src/core/config/common.pri
 
 
 # generate qtwebengine-3rdparty.qdoc, it is missing from the tarball
 # generate qtwebengine-3rdparty.qdoc, it is missing from the tarball
 pushd src/3rdparty
 pushd src/3rdparty
-%{__python} chromium/tools/licenses.py \
+%{__python2} chromium/tools/licenses.py \
   --file-template ../../tools/about_credits.tmpl \
   --file-template ../../tools/about_credits.tmpl \
   --entry-template ../../tools/about_credits_entry.tmpl \
   --entry-template ../../tools/about_credits_entry.tmpl \
   credits >../webengine/doc/src/qtwebengine-3rdparty.qdoc
   credits >../webengine/doc/src/qtwebengine-3rdparty.qdoc
@@ -409,7 +442,7 @@ export CFLAGS="%{optflags}"
 # most arches run out of memory with full debuginfo, so use -g1 on non-x86_64
 # most arches run out of memory with full debuginfo, so use -g1 on non-x86_64
 export CFLAGS=`echo "$CFLAGS" | sed -e 's/ -g / -g1 /g'`
 export CFLAGS=`echo "$CFLAGS" | sed -e 's/ -g / -g1 /g'`
 #endif
 #endif
-export CXXFLAGS="%{optflags} -fno-delete-null-pointer-checks"
+export CXXFLAGS="%{optflags}"
 #ifnarch x86_64
 #ifnarch x86_64
 # most arches run out of memory with full debuginfo, so use -g1 on non-x86_64
 # most arches run out of memory with full debuginfo, so use -g1 on non-x86_64
 export CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ -g / -g1 /g'`
 export CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ -g / -g1 /g'`
@@ -420,8 +453,8 @@ pushd %{_target_platform}
 
 
 %{qmake_qt5} \
 %{qmake_qt5} \
   %{?debug_config:CONFIG+="%{debug_config}"} \
   %{?debug_config:CONFIG+="%{debug_config}"} \
-  CONFIG+="link_pulseaudio" \
-  QMAKE_EXTRA_ARGS+="-system-webengine-icu" \
+  CONFIG+="link_pulseaudio use_gold_linker" \
+  %{?use_system_libicu:QMAKE_EXTRA_ARGS+="-system-webengine-icu"} \
   QMAKE_EXTRA_ARGS+="-webengine-kerberos" \
   QMAKE_EXTRA_ARGS+="-webengine-kerberos" \
   ..
   ..
 
 
@@ -434,19 +467,13 @@ export CXXFLAGS
 # workaround, disable parallel compilation as it fails to compile in brew
 # workaround, disable parallel compilation as it fails to compile in brew
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
-%if 0%{?docs}
-make %{?_smp_mflags} docs
-%endif
 popd
 popd
 
 
+
 %install
 %install
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
-%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
-%endif
-
 # rpm macros
 # rpm macros
 install -p -m644 -D %{SOURCE10} \
 install -p -m644 -D %{SOURCE10} \
   %{buildroot}%{rpm_macros_dir}/macros.qt5-qtwebengine
   %{buildroot}%{rpm_macros_dir}/macros.qt5-qtwebengine
@@ -489,9 +516,6 @@ sed -i -e "s|%{version} \${_Qt5WebEngine|%{lesser_version} \${_Qt5WebEngine|" \
   %{buildroot}%{_qt5_libdir}/cmake/Qt5WebEngine*/Qt5WebEngine*Config.cmake
   %{buildroot}%{_qt5_libdir}/cmake/Qt5WebEngine*/Qt5WebEngine*Config.cmake
 
 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %files
 %files
 %license LICENSE.* src/webengine/doc/src/qtwebengine-3rdparty.qdoc
 %license LICENSE.* src/webengine/doc/src/qtwebengine-3rdparty.qdoc
 %{_qt5_libdir}/libQt5*.so.*
 %{_qt5_libdir}/libQt5*.so.*
@@ -505,7 +529,11 @@ sed -i -e "s|%{version} \${_Qt5WebEngine|%{lesser_version} \${_Qt5WebEngine|" \
 %{_qt5_libdir}/qtwebengine/
 %{_qt5_libdir}/qtwebengine/
 %endif
 %endif
 %{_qt5_plugindir}/designer/libqwebengineview.so
 %{_qt5_plugindir}/designer/libqwebengineview.so
+%{_qt5_plugindir}/imageformats/libqpdf.so
 %dir %{_qt5_datadir}/resources/
 %dir %{_qt5_datadir}/resources/
+%if ! 0%{?use_system_libicu}
+%{_qt5_datadir}/resources/icudtl.dat
+%endif
 %{_qt5_datadir}/resources/qtwebengine_resources_100p.pak
 %{_qt5_datadir}/resources/qtwebengine_resources_100p.pak
 %{_qt5_datadir}/resources/qtwebengine_resources_200p.pak
 %{_qt5_datadir}/resources/qtwebengine_resources_200p.pak
 %{_qt5_datadir}/resources/qtwebengine_resources.pak
 %{_qt5_datadir}/resources/qtwebengine_resources.pak
@@ -588,6 +616,11 @@ sed -i -e "s|%{version} \${_Qt5WebEngine|%{lesser_version} \${_Qt5WebEngine|" \
 
 
 
 
 %changelog
 %changelog
+* Wed Apr 14 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+- imported Patch26-29 from rawhide.
+- imported Patch1000 from upstream to build with icu-69.
+
 * Fri Apr 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-2
 * Fri Apr 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-2
 - rebuilt with icu-67.
 - rebuilt with icu-67.
 
 

+ 16 - 10
q/qt5-qtwebsockets/qt5-qtwebsockets-vl.spec

@@ -5,26 +5,25 @@
 
 
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - WebSockets component
 Summary: Qt5 - WebSockets component
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://doc.qt.io/qt-5/licensing.html
 # See also http://doc.qt.io/qt-5/licensing.html
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url: http://qt-project.org/
 Url: http://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
 
 
-Patch1000: CVE-2018-21035.patch
-
 BuildRequires: cmake
 BuildRequires: cmake
 BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-srpm-macros
 BuildRequires: qt5-srpm-macros
@@ -40,6 +39,7 @@ The QtWebSockets module implements the WebSocket protocol as specified in RFC
 
 
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtbase-devel%{?_isa}
 %description devel
 %description devel
@@ -48,6 +48,7 @@ Requires: qt5-qtbase-devel%{?_isa}
 %if 0%{?docs}
 %if 0%{?docs}
 %package doc
 %package doc
 Summary: API documentation for %{name}
 Summary: API documentation for %{name}
+Group: documentation
 License: GFDL
 License: GFDL
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qdoc
@@ -59,10 +60,15 @@ BuildArch: noarch
 
 
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
 
 
+
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
@@ -103,9 +109,6 @@ done
 popd
 popd
 
 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %files
 %files
 %license LICENSE.*
 %license LICENSE.*
 %{_qt5_libdir}/libQt5WebSockets.so.5*
 %{_qt5_libdir}/libQt5WebSockets.so.5*
@@ -134,6 +137,9 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 14 - 8
q/qt5-qtx11extras/qt5-qtx11extras-vl.spec

@@ -5,22 +5,21 @@
 
 
 #define prerelease
 #define prerelease
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - X11 support library
 Summary: Qt5 - X11 support library
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     http://www.qt.io
 Url:     http://www.qt.io
-
-Vendor: Project Vine
-Distribution: Vine Linux
-
 Source0: http://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: http://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
 
 
 BuildRequires: cmake
 BuildRequires: cmake
@@ -35,8 +34,10 @@ The X11 Extras module provides features specific to platforms using X11, e.g.
 Linux and UNIX-like systems including embedded Linux systems that use the X
 Linux and UNIX-like systems including embedded Linux systems that use the X
 Window System.
 Window System.
 
 
+
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtbase-devel%{?_isa}
 %description devel
 %description devel
@@ -45,6 +46,7 @@ Requires: qt5-qtbase-devel%{?_isa}
 %if 0%{?docs}
 %if 0%{?docs}
 %package doc
 %package doc
 Summary: API documentation for %{name}
 Summary: API documentation for %{name}
+Group: documentation
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qhelpgenerator
 BuildRequires: qt5-qhelpgenerator
@@ -54,6 +56,9 @@ BuildArch: noarch
 %endif
 %endif
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
@@ -89,8 +94,6 @@ for prl_file in libQt5*.prl ; do
 done
 done
 popd
 popd
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 
 %files
 %files
 %license LICENSE.GPL3-EXCEPT LICENSE.LGPL* LICENSE.GPL*
 %license LICENSE.GPL3-EXCEPT LICENSE.LGPL* LICENSE.GPL*
@@ -113,6 +116,9 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 15 - 11
q/qt5-qtxmlpatterns/qt5-qtxmlpatterns-vl.spec

@@ -16,21 +16,21 @@
 
 
 #define prerelease rc
 #define prerelease rc
 
 
-%global qt5_minorver 5.12
-%global qt5_version 5.12.8
+%global qt5_minorver 5.15
+%global qt5_version 5.15.2
 #global qt5_patchlevel 1
 #global qt5_patchlevel 1
 
 
 Summary: Qt5 - QtXmlPatterns component
 Summary: Qt5 - QtXmlPatterns component
 Name:    qt5-%{qt_module}
 Name:    qt5-%{qt_module}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Vendor: Project Vine
+Distribution: Vine Linux
+
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     https://www.qt.io/
 Url:     https://www.qt.io/
 
 
-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
 
 
 BuildRequires: cmake
 BuildRequires: cmake
@@ -46,6 +46,7 @@ and XML Schema validation.
 
 
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtbase-devel%{?_isa}
 %description devel
 %description devel
@@ -54,6 +55,7 @@ Requires: qt5-qtbase-devel%{?_isa}
 %if 0%{?docs}
 %if 0%{?docs}
 %package doc
 %package doc
 Summary: API documentation for %{name}
 Summary: API documentation for %{name}
+Group: documentation
 License: GFDL
 License: GFDL
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 BuildRequires: qt5-qdoc
 BuildRequires: qt5-qdoc
@@ -65,11 +67,15 @@ BuildArch: noarch
 
 
 %package examples
 %package examples
 Summary: Programming examples for %{name}
 Summary: Programming examples for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %description examples
 %{summary}.
 %{summary}.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
@@ -86,6 +92,7 @@ make %{?_smp_mflags} docs
 %endif
 %endif
 popd
 popd
 
 
+
 %install
 %install
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
@@ -123,12 +130,6 @@ done
 popd
 popd
 
 
 
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
 %files
 %files
 %license LICENSE.LGPL*
 %license LICENSE.LGPL*
 %{_qt5_libdir}/libQt5XmlPatterns.so.5*
 %{_qt5_libdir}/libQt5XmlPatterns.so.5*
@@ -161,6 +162,9 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 14 - 4
q/qt5/qt5-vl.spec

@@ -1,14 +1,17 @@
 %bcond_with deps
 %bcond_with deps
 
 
+Summary: Qt5 meta package
 Name: qt5
 Name: qt5
-Version: 5.12.8
+Version: 5.15.2
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Summary: Qt5 meta package
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: GPLv3
 License: GPLv3
-URL: https://getfedora.org/
 Source0: macros.qt5
 Source0: macros.qt5
 Source1: macros.qt5-srpm
 Source1: macros.qt5-srpm
 Source2: qmake-qt5.sh
 Source2: qmake-qt5.sh
+
 BuildArch: noarch
 BuildArch: noarch
 
 
 Requires: qt5-qdbusviewer
 Requires: qt5-qdbusviewer
@@ -42,6 +45,7 @@ Requires: qt5-qtxmlpatterns
 %description
 %description
 %{summary}.
 %{summary}.
 
 
+
 %package devel
 %package devel
 Summary: Qt5 meta devel package
 Summary: Qt5 meta devel package
 Requires: qt5-rpm-macros
 Requires: qt5-rpm-macros
@@ -75,14 +79,16 @@ Requires: qt5-qtxmlpatterns-devel
 %description devel
 %description devel
 %{summary}.
 %{summary}.
 
 
+
 %package rpm-macros
 %package rpm-macros
 Summary: RPM macros for building Qt5 packages
 Summary: RPM macros for building Qt5 packages
-Conflicts: qt5-qtbase-devel < 5.12.0
+Conflicts: qt5-qtbase-devel < 5.15.0
 Requires: cmake >= 3
 Requires: cmake >= 3
 Requires: gcc-c++
 Requires: gcc-c++
 %description rpm-macros
 %description rpm-macros
 %{summary}.
 %{summary}.
 
 
+
 %package srpm-macros
 %package srpm-macros
 Summary: RPM macros for source Qt5 packages
 Summary: RPM macros for source Qt5 packages
 %description srpm-macros
 %description srpm-macros
@@ -117,6 +123,7 @@ echo "- Qt5 meta package" > %{buildroot}%{_docdir}/qt5/README
 echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README
 echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README
 %endif
 %endif
 
 
+
 %if %{with deps}
 %if %{with deps}
 %files
 %files
 %{_docdir}/qt5/README
 %{_docdir}/qt5/README
@@ -135,6 +142,9 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README
 
 
 
 
 %changelog
 %changelog
+* Mon Apr 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
+- built for Qt 5.15.2.
+
 * 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
 - built for Qt 5.12.8.
 - built for Qt 5.12.8.
 
 

+ 5 - 1
s/sip/sip-vl.spec

@@ -16,7 +16,7 @@
 Name:           sip
 Name:           sip
 Summary:        Python/C++ Bindings Generator
 Summary:        Python/C++ Bindings Generator
 Summary(ja):    Python/C++ インターフェイス生成ツール
 Summary(ja):    Python/C++ インターフェイス生成ツール
-Version:        4.19.24
+Version:        4.19.25
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Group:          programming
 Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
@@ -233,6 +233,7 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
+
 %files
 %files
 %defattr(-, root, root, 755)
 %defattr(-, root, root, 755)
 %doc NEWS README
 %doc NEWS README
@@ -282,6 +283,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Wed Apr 14 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.25-1
+- new upstream release.
+
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.24-1
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.24-1
 - new upstream release.
 - new upstream release.