Browse Source

updated 26 packages

python-qt5-5.12.3-1

qt5-qt3d-5.12.5-1

qt5-qtbase-5.12.5-1

qt5-qtcanvas3d-5.12.5-1

qt5-qtconnectivity-5.12.5-1

qt5-qtdeclarative-5.12.5-1

qt5-qtdoc-5.12.5-1

qt5-qtgraphicaleffects-5.12.5-1

qt5-qtimageformats-5.12.5-1

qt5-qtlocation-5.12.5-1

qt5-qtmultimedia-5.12.5-1

qt5-qtquickcontrols-5.12.5-1

qt5-qtquickcontrols2-5.12.5-1

qt5-qtscript-5.12.5-1

qt5-qtsensors-5.12.5-1

qt5-qtserialport-5.12.5-1

qt5-qtsvg-5.12.5-1

qt5-qttools-5.12.5-1

qt5-qttranslations-5.12.5-1

qt5-qtwebchannel-5.12.5-1

qt5-qtwebengine-5.12.5-1

qt5-qtwebsockets-5.12.5-1

qt5-qtx11extras-5.12.5-1

qt5-qtxmlpatterns-5.12.5-1

qt5-5.12.5-2

sip-4.19.19-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12287 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
6085e0956a

+ 208 - 85
p/python-qt5/python-qt5-vl.spec

@@ -1,9 +1,3 @@
-%{!?python3_sitearch: %global python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))")}
-%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python3_version: %global python3_version %(python3 -c "import sys; sys.stdout.write(sys.version[:3])")}
-
-%global __python3 /usr/bin/python3
-
 # prevent anything matching from being scanned for provides
 %define filter_provides_in(P) %{expand: \
 %global __filter_prov_cmd %{?__filter_prov_cmd} %{__grep} -v %{-P} '%*' | \
@@ -35,50 +29,58 @@
 %global with_python3 1
 %global python3_dbus_dir %(%{__python3} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])")
 %global with_python2 1
-%global python2_dbus_dir %(%{__python} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])")
+%global python_dbus_dir %(%{__python} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])")
 
 # enable/disable individual modules
 # drop power64, it's not supported yet (than)
 %ifarch %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el
-%global webengine 1
+%global webengine 0
 %endif
-%global webkit 1
+%global webkit 0
+
+#global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+%global rpm_macros_dir %{_sysconfdir}/rpm
 
-%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+%global py3_sipdir %{_datadir}/sip/PyQt5
 
 Summary: PyQt5 is Python bindings for Qt5
 Name: 	 python-qt5 
-Version: 5.6
-Release: 7%{?_dist_release}
+Version: 5.12.3
+Release: 1%{?_dist_release}
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 # all BSD, except for GPLv2+ dbus bindings and examples
 License: BSD and GPLv2+
-Url:     http://www.riverbankcomputing.com/software/pyqt/
-%if 0%{?snap:1}
-Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt5_gpl-%{version}%{?snap:-snapshot-%{snap}}.tar.gz
-%else
-Source0: http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-%{version}/PyQt5_gpl-%{version}.tar.gz
-%endif
+Url:     https://www.riverbankcomputing.com/software/pyqt/
+Source0: https://www.riverbankcomputing.com/static/Downloads/PyQt5/%{version}/PyQt5_gpl-%{version}.tar.gz
 Source1: macros.pyqt5
 # wrapper, see https://bugzilla.redhat.com/show_bug.cgi?id=1193107#c9
-Source2: pyuic5.sh
+Source2: pylupdate5.sh
+Source3: pyrcc5.sh
+Source4: pyuic5.sh
 
 ## upstream patches
 
 ## upstreamable patches
 Patch0: python-qt5_sipdir.patch
-Patch1: PyQt5_gpl-5.6-dbus_ftbfs.patch
+
+Patch1000: python-qt5-sip-option.patch
+Patch1001: pyqt5-5.12.3-python2.patch
 
 BuildRequires: chrpath
 BuildRequires: findutils
+BuildRequires: qt5-rpm-macros
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(dbus-python)
 BuildRequires: pkgconfig(phonon4qt5)
-BuildRequires: pkgconfig(Qt5Core) >= 5.5
-BuildRequires: pkgconfig(Enginio)
+BuildRequires: pkgconfig(Qt5Core)
+#BuildRequires: pkgconfig(Enginio)
 BuildRequires: pkgconfig(Qt5Bluetooth)
 BuildRequires: pkgconfig(Qt5DBus)
-BuildRequires: pkgconfig(Qt5Declarative)
+#BuildRequires: pkgconfig(Qt5Declarative)
+BuildRequires: qt5-qtdeclarative-devel
 BuildRequires: pkgconfig(Qt5Designer)
 BuildRequires: pkgconfig(Qt5Gui) pkgconfig(Qt5Multimedia)
 BuildRequires: pkgconfig(Qt5Location)
@@ -86,7 +88,7 @@ BuildRequires: pkgconfig(Qt5Nfc)
 BuildRequires: pkgconfig(Qt5Network) pkgconfig(Qt5OpenGL)
 BuildRequires: pkgconfig(Qt5Positioning)
 BuildRequires: pkgconfig(Qt5Quick) pkgconfig(Qt5QuickWidgets)
-BuildRequires: pkgconfig(Qt5Script)
+#BuildRequires: pkgconfig(Qt5Script)
 BuildRequires: pkgconfig(Qt5Sensors)
 BuildRequires: pkgconfig(Qt5SerialPort)
 BuildRequires: pkgconfig(Qt5Sql) pkgconfig(Qt5Svg) pkgconfig(Qt5Test)
@@ -94,10 +96,15 @@ BuildRequires: pkgconfig(Qt5X11Extras)
 BuildRequires: pkgconfig(Qt5Xml) pkgconfig(Qt5XmlPatterns)
 BuildRequires: pkgconfig(Qt5WebChannel)
 BuildRequires: pkgconfig(Qt5WebSockets)
-BuildRequires: python-devel python
 BuildRequires: sip-devel >= 4.18
+%if 0%{?with_python2}
+BuildRequires: python-devel python
+BuildRequires: python-rpm-macros
+BuildRequires: python-enum34
+%endif # with_python2
 %if 0%{?with_python3}
 BuildRequires: python3-devel python3
+BuildRequires: python3-rpm-macros
 BuildRequires: python3-sip-devel >= 4.18
 BuildRequires: dbus-python3
 %endif # with_python3
@@ -108,6 +115,7 @@ Obsoletes: python-qt5 < 5.5.1-10
 %endif
 
 Requires: %{name}-rpm-macros = %{version}-%{release}
+Requires: python-qt5-base = %{version}-%{release}
 Requires: dbus-python
 BuildRequires: qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
@@ -131,16 +139,31 @@ Provides: python2-qt5%{?_isa} = %{version}-%{release}
 %description
 PyQt5 is Python bindings for Qt5.
 
+%if 0%{?with_python2}
+%package base
+Summary: Python bindings for Qt5 base
+Requires: %{name}-rpm-macros = %{version}-%{release}
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+%{?_sip_api:Requires: python-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}}
+Requires: dbus-python
+Obsoletes: python-qt5 < 5.5.1-10
+Provides: python-PyQt5-base = %{version}-%{release}
+Provides: python-PyQt5-base%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python-qt5-base}
+%description base
+%{summary}.
+
 %package devel
 Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel
 Requires: sip-devel
 Provides: PyQt5-devel = %{version}-%{release}
-Provides: python2-PyQt5-devel = %{version}-%{release}
+Provides: python-PyQt5-devel = %{version}-%{release}
 %description devel
 Files needed to build other bindings for C++ classes that inherit from any
 of the Qt5 classes (e.g. KDE or your own).
+%endif
 
 %package rpm-macros
 Summary: RPM macros %{name}
@@ -162,10 +185,23 @@ Obsoletes: python3-qt5 < 5.5.1-10
 Provides: python3-PyQt5 = %{version}-%{release}
 Provides: python3-PyQt5%{?_isa} = %{version}-%{release}
 Requires: %{name}-rpm-macros = %{version}-%{release}
+Requires: python3-qt5-base = %{version}-%{release}
 Requires: dbus-python3
 %description -n python3-qt5
 %{summary}.
 
+%package -n python3-qt5-base
+Summary: Python 3 bindings for Qt5 base
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+%{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}}
+Provides: python3-PyQt5-base = %{version}-%{release}
+Provides: python3-PyQt5-base%{?_isa} = %{version}-%{release}
+Requires: %{name}-rpm-macros = %{version}-%{release}
+Requires: dbus-python3
+%{?python_provide:%python_provide python3-qt5-base}
+%description -n python3-qt5-base
+%{summary}.
+
 %package -n python3-qt5-devel
 Summary: Python 3 bindings for Qt5
 Requires: python3-qt5%{?_isa} = %{version}-%{release}
@@ -187,6 +223,7 @@ BuildArch: noarch
 %package webengine
 Summary: Python bindings for Qt5 WebEngine
 BuildRequires: pkgconfig(Qt5WebEngine)
+BuildRequires: qt5-qtwebengine-devel
 Obsoletes: python-qt5 < 5.5.1-10
 Requires:  %{name}%{?_isa} = %{version}-%{release}
 %description webengine
@@ -220,7 +257,8 @@ Requires:  python3-qt5%{?_isa} = %{version}-%{release}
 %setup -q -n PyQt5_gpl-%{version}%{?snap:-snapshot-%{snap}}
 
 %patch0 -p1
-%patch1 -p1
+%patch1000 -p1
+%patch1001 -p1
 
 
 %build
@@ -233,11 +271,14 @@ pushd %{_target_platform}
 %{__python} ../configure.py \
   --assume-shared \
   --confirm-license \
+  --no-designer-plugin \
+  --no-qml-plugin \
   --qmake=%{_qt5_qmake} \
-  --qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci \
+  %{!?with_python3:--no-qsci-api}%{?with_python3:--qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci} \
   --verbose \
+  --dbus=/usr/include/dbus-1.0/ \
   QMAKE_CFLAGS_RELEASE="%{optflags}" \
-  QMAKE_CXXFLAGS_RELEASE="%{optflags}" \
+  QMAKE_CXXFLAGS_RELEASE="%{optflags} -I/usr/%{_lib}/dbus-1.0/include/" \
   QMAKE_LFLAGS_RELEASE="%{?__global_ldflags}"
 
 make %{?_smp_mflags}
@@ -252,10 +293,14 @@ pushd %{_target_platform}-python3
   --assume-shared \
   --confirm-license \
   --qmake=%{_qt5_qmake} \
-  --no-qsci-api \
+  %{?with_python2:--no-qsci-api}%{!?with_python2:--qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci} \
+  %{?py3_sip:--sip=%{_bindir}/python3-sip} \
+  %{?py3_sipdir:--sipdir=%{py3_sipdir}} \
   --verbose \
+  %{?python3_sip_incdir} \
+  --dbus=/usr/include/dbus-1.0/ \
   QMAKE_CFLAGS_RELEASE="%{optflags}" \
-  QMAKE_CXXFLAGS_RELEASE="%{optflags}" \
+  QMAKE_CXXFLAGS_RELEASE="%{optflags} -I/usr/%{_lib}/dbus-1.0/include/" \
   QMAKE_LFLAGS_RELEASE="%{?__global_ldflags}"
 
 make %{?_smp_mflags}
@@ -267,24 +312,46 @@ popd
 
 # Python 3 build:
 %if 0%{?with_python3}
-make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} -C %{_target_platform}-python3
+%make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-python3
+if [ "%{_prefix}" != "/usr" ]; then
+  cp -ru %{buildroot}/usr/* %{buildroot}%{_prefix}/
+  rm -rf %{buildroot}/usr/*
+fi
+%if "%py3_sipdir" == "%{_datadir}/sip/PyQt5"
+# copy files to old location for compat purposes temporarily
+mkdir -p %{buildroot}%{_datadir}/python3-sip
+cp -alf %{buildroot}%{py3_sipdir} \
+        %{buildroot}%{_datadir}/python3-sip/PyQt5
+%endif
+
+if [ "%{_prefix}" != "/usr" ]; then
+  cp -ru %{buildroot}/usr/* %{buildroot}%{_prefix}/ || echo "Nothing to copy"
+  rm -rf %{buildroot}/usr/*
+fi
+
 # ensure .so modules are executable for proper -debuginfo extraction
-for i in %{buildroot}%{python3_sitearch}/PyQt5/*.so %{buildroot}%{python3_dbus_dir}/pyqt5.so ; do
-chmod a+rx $i
-done
+find %{buildroot} -type f -name '*.so' | xargs chmod a+rx
+#for i in %%{buildroot}%%{python3_sitearch}/PyQt5/*.so %%{buildroot}%%{python3_dbus_dir}/pyqt5.so ; do
+#test -x $i  || chmod a+rx $i
+#done
 %endif # with_python3
 
 # Python 2 build:
 %if 0%{?with_python2}
-make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} -C %{_target_platform}
+%make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
+if [ "%{_prefix}" != "/usr" ]; then
+  cp -ru %{buildroot}/usr/* %{buildroot}%{_prefix}/
+  rm -rf %{buildroot}/usr/*
+fi
 # ensure .so modules are executable for proper -debuginfo extraction
-for i in %{buildroot}%{python_sitearch}/PyQt5/*.so %{buildroot}%{python2_dbus_dir}/pyqt5.so ; do
-chmod a+rx $i
-done
+find %{buildroot} -type f -name '*.so' | xargs chmod a+rx
+#for i in %%{buildroot}%%{python2_sitearch}/PyQt5/*.so %%{buildroot}%%{python2_dbus_dir}/pyqt5.so ; do
+#test -x $i || chmod a+rx $i
+#done
 %endif # with_python2
 
 # remove Python3 code from Python2 directory, fixes FTBFS like PyQt4 (#564633)
-rm -rfv %{buildroot}%{python_sitearch}/PyQt5/uic/port_v3/
+rm -rfv %{buildroot}%{python2_sitearch}/PyQt5/uic/port_v3/
 # remove Python2 code from Python3 directory (for when/if we support python3 here)
 rm -rfv %{buildroot}%{python3_sitearch}/PyQt5/uic/port_v2/
 
@@ -299,63 +366,74 @@ sed -i \
   %{buildroot}%{rpm_macros_dir}/macros.pyqt5
 
 %if 0%{?with_python3}
-# install pyuic5 wrapper to handle both/either python2/python3
-rm -fv %{buildroot}%{_bindir}/pyuic5
-install -p -m755 -D %{SOURCE2} \
-  %{buildroot}%{_bindir}/pyuic5
+# install wrappers to handle both/either python2/python3
+# TODO: consider alternatives? -- rex
+rm -fv %{buildroot}%{_bindir}/{pyrcc5,pylupdate5,pyuic5}
+install -p -m755 -D %{SOURCE2} %{buildroot}%{_bindir}/pylupdate5
+install -p -m755 -D %{SOURCE3} %{buildroot}%{_bindir}/pyrcc5
+install -p -m755 -D %{SOURCE4} %{buildroot}%{_bindir}/pyuic5
 sed -i \
   -e "s|@PYTHON3@|%{__python3}|g" \
-  -e "s|@PYTHON2@|%{__python}|g" \
-  %{buildroot}%{_bindir}/pyuic5
+  -e "s|@PYTHON2@|%{__python2}|g" \
+  %{buildroot}%{_bindir}/{pyrcc5,pylupdate5,pyuic5}
 %endif
 
-
 %if 0%{?with_python2}
 %files
-%doc NEWS README
-%license LICENSE
-%{python2_dbus_dir}/pyqt5.so
-%{_qt5_plugindir}/PyQt5/
-%dir %{python_sitearch}/PyQt5/
-%{python_sitearch}/PyQt5/__init__.py*
-%{python_sitearch}/PyQt5/Enginio.so
-%{python_sitearch}/PyQt5/Qt.so
+#{python_sitearch}/PyQt5/Enginio.so
 %{python_sitearch}/PyQt5/QtBluetooth.so
-%{python_sitearch}/PyQt5/QtCore.so
-%{python_sitearch}/PyQt5/QtDBus.so
 %{python_sitearch}/PyQt5/QtDesigner.so
-%{python_sitearch}/PyQt5/QtGui.so
 %{python_sitearch}/PyQt5/QtHelp.so
 %{python_sitearch}/PyQt5/QtLocation.so
 %{python_sitearch}/PyQt5/QtMultimedia.so
 %{python_sitearch}/PyQt5/QtMultimediaWidgets.so
-%{python_sitearch}/PyQt5/QtNetwork.so
 %{python_sitearch}/PyQt5/QtNfc.so
-%{python_sitearch}/PyQt5/QtOpenGL.so
 %{python_sitearch}/PyQt5/QtPositioning.so
-%{python_sitearch}/PyQt5/QtPrintSupport.so
 %{python_sitearch}/PyQt5/QtQml.so
 %{python_sitearch}/PyQt5/QtQuick.so
 %{python_sitearch}/PyQt5/QtQuickWidgets.so
 %{python_sitearch}/PyQt5/QtSensors.so
 %{python_sitearch}/PyQt5/QtSerialPort.so
-%{python_sitearch}/PyQt5/QtSql.so
 %{python_sitearch}/PyQt5/QtSvg.so
-%{python_sitearch}/PyQt5/QtTest.so
 %{python_sitearch}/PyQt5/QtWebChannel.so
 %{python_sitearch}/PyQt5/QtWebSockets.so
-%{python_sitearch}/PyQt5/QtWidgets.so
 %{python_sitearch}/PyQt5/QtX11Extras.so
-%{python_sitearch}/PyQt5/QtXml.so
 %{python_sitearch}/PyQt5/QtXmlPatterns.so
+
+%files base
+%doc NEWS README
+%license LICENSE
+%{python_dbus_dir}/pyqt5.so
+%dir %{python_sitearch}/PyQt5/
+%{python_sitearch}/PyQt5-%{version}%{?snap:.%{snap}}.dist-info
+%{python_sitearch}/PyQt5/__init__.py*
+%{python_sitearch}/PyQt5/Qt.so
+%{python_sitearch}/PyQt5/QtCore.so
+%{python_sitearch}/PyQt5/QtDBus.so
+%{python_sitearch}/PyQt5/QtGui.so
+%{python_sitearch}/PyQt5/QtNetwork.so
+%{python_sitearch}/PyQt5/QtOpenGL.so
+%{python_sitearch}/PyQt5/QtPrintSupport.so
+%{python_sitearch}/PyQt5/QtSql.so
+%{python_sitearch}/PyQt5/QtTest.so
+%{python_sitearch}/PyQt5/QtWidgets.so
+%{python_sitearch}/PyQt5/QtXml.so
 %{python_sitearch}/PyQt5/_QOpenGLFunctions_2_0.so
 %{python_sitearch}/PyQt5/_QOpenGLFunctions_2_1.so
 %{python_sitearch}/PyQt5/_QOpenGLFunctions_4_1_Core.so
+# *was* in -devel
+%{_bindir}/pylupdate5
+%{_bindir}/pyrcc5
+%{_bindir}/pyuic5
 %{python_sitearch}/PyQt5/uic/
-%{_qt5_plugindir}/designer/libpyqt5.so
+%{python_sitearch}/PyQt5/pylupdate.so
+%{python_sitearch}/PyQt5/pylupdate_main.py*
+%{python_sitearch}/PyQt5/pyrcc.so
+%{python_sitearch}/PyQt5/pyrcc_main.py*
 
 %if 0%{?webengine}
 %files webengine
+%{python_sitearch}/PyQt5/QtWebEngine.*
 %{python_sitearch}/PyQt5/QtWebEngineCore.*
 %{python_sitearch}/PyQt5/QtWebEngineWidgets.*
 %endif
@@ -366,33 +444,75 @@ sed -i \
 %{python_sitearch}/PyQt5/QtWebKitWidgets.*
 %endif
 
-%files rpm-macros
-%{rpm_macros_dir}/macros.pyqt5
-
 %files devel
-%{_bindir}/pylupdate5
-%{_bindir}/pyrcc5
-%{_bindir}/pyuic5
 %{_datadir}/sip/PyQt5/
 %endif
 
+%files rpm-macros
+%{rpm_macros_dir}/macros.pyqt5
+
 %if 0%{?with_python3}
 %files -n python3-qt5
+#{python3_sitearch}/PyQt5/Enginio.*
+%{python3_sitearch}/PyQt5/QtBluetooth.*
+%{python3_sitearch}/PyQt5/QtDesigner.*
+%{python3_sitearch}/PyQt5/QtHelp.*
+%{python3_sitearch}/PyQt5/QtLocation.*
+%{python3_sitearch}/PyQt5/QtMultimedia.*
+%{python3_sitearch}/PyQt5/QtMultimediaWidgets.*
+%{python3_sitearch}/PyQt5/QtNfc.*
+%{python3_sitearch}/PyQt5/QtPositioning.*
+%{python3_sitearch}/PyQt5/QtQml.*
+%{python3_sitearch}/PyQt5/QtQuick.*
+%{python3_sitearch}/PyQt5/QtQuickWidgets.*
+%{python3_sitearch}/PyQt5/QtSensors.*
+%{python3_sitearch}/PyQt5/QtSerialPort.*
+%{python3_sitearch}/PyQt5/QtSvg.*
+%{python3_sitearch}/PyQt5/QtWebChannel.*
+%{python3_sitearch}/PyQt5/QtWebSockets.*
+%{python3_sitearch}/PyQt5/QtX11Extras.*
+%{python3_sitearch}/PyQt5/QtXmlPatterns.*
+
+%files -n python3-qt5-base
 %doc NEWS README
 %license LICENSE
 %{python3_dbus_dir}/pyqt5.so
-%{python3_sitearch}/PyQt5
-%if 0%{?webengine}
-%exclude %{python3_sitearch}/PyQt5/QtWebEngineCore.*
-%exclude %{python3_sitearch}/PyQt5/QtWebEngineWidgets.*
-%endif
-%if 0%{?webkit}
-%exclude %{python3_sitearch}/PyQt5/QtWebKit.*
-%exclude %{python3_sitearch}/PyQt5/QtWebKitWidgets.*
-%endif
+%dir %{python3_sitearch}/PyQt5/
+%{python3_sitearch}/PyQt5-%{version}%{?snap:.%{snap}}.dist-info
+#{python3_sitearch}/PyQt5/__pycache__/__init__.*
+%{python3_sitearch}/PyQt5/__init__.py*
+%{python3_sitearch}/PyQt5/Qt.*
+%{python3_sitearch}/PyQt5/QtCore.*
+%{python3_sitearch}/PyQt5/QtDBus.*
+%{python3_sitearch}/PyQt5/QtGui.*
+%{python3_sitearch}/PyQt5/QtNetwork.*
+%{python3_sitearch}/PyQt5/QtOpenGL.*
+%{python3_sitearch}/PyQt5/QtPrintSupport.*
+%{python3_sitearch}/PyQt5/QtSql.*
+%{python3_sitearch}/PyQt5/QtTest.*
+%{python3_sitearch}/PyQt5/QtWidgets.*
+%{python3_sitearch}/PyQt5/QtXml.*
+%{python3_sitearch}/PyQt5/_QOpenGLFunctions_2_0.*
+%{python3_sitearch}/PyQt5/_QOpenGLFunctions_2_1.*
+%{python3_sitearch}/PyQt5/_QOpenGLFunctions_4_1_Core.*
+# plugins
+%{_qt5_plugindir}/PyQt5/
+%{_qt5_plugindir}/designer/libpyqt5.so
+%{python3_sitearch}/PyQt5/uic/
+# *was* in python3-qt5-devel
+%{_bindir}/pylupdate5
+%{_bindir}/pyrcc5
+%{_bindir}/pyuic5
+%{python3_sitearch}/PyQt5/pylupdate.so
+%{python3_sitearch}/PyQt5/pylupdate_main.py*
+#{python3_sitearch}/PyQt5/__pycache__/pylupdate_main*
+%{python3_sitearch}/PyQt5/pyrcc.so
+%{python3_sitearch}/PyQt5/pyrcc_main.py*
+#{python3_sitearch}/PyQt5/__pycache__/pyrcc_main*
 
 %if 0%{?webengine}
 %files -n python3-qt5-webengine
+%{python3_sitearch}/PyQt5/QtWebEngine.*
 %{python3_sitearch}/PyQt5/QtWebEngineCore.*
 %{python3_sitearch}/PyQt5/QtWebEngineWidgets.*
 %endif
@@ -404,14 +524,14 @@ sed -i \
 %endif
 
 %files -n python3-qt5-devel
-%{_bindir}/pylupdate5
-%{_bindir}/pyrcc5
-%{_bindir}/pyuic5
+%{py3_sipdir}/
+# compat location
+%dir %{_datadir}/python3-sip/
 %{_datadir}/python3-sip/PyQt5/
 %endif # with_python3
 
 %files doc
-%doc doc/*
+#doc doc/*
 %doc examples/
 # avoid dep on qscintilla-python, own %%_qt5_datadir/qsci/... here for now
 %dir %{_qt5_datadir}/qsci/
@@ -421,6 +541,9 @@ sed -i \
 
 
 %changelog
+* Tue Oct 22 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.3-1
+- new upstream release.
+
 * Sat Jan 27 2018 Toshiaki Ara <ara_t@384.jp> - 5.6-7
 - rebuild under current VineSeed
 

+ 60 - 26
q/qt5-qt3d/qt5-qt3d-vl.spec

@@ -1,11 +1,11 @@
 %global qt_module qt3d
 
-%define docs 1
+#define docs 1
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - Qt3D QML bindings and C++ APIs
@@ -16,23 +16,22 @@ Release: 1%{?_dist_release}
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://doc.qt.io/qt-5/licensing.html
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
 
 BuildRequires:  cmake
-BuildRequires:  qt5-qtbase-static >= %{version}
-BuildRequires:  pkgconfig(Qt5Quick)
-BuildRequires:  pkgconfig(Qt5XmlPatterns)
-BuildRequires:  pkgconfig(Qt5Qml)
-BuildRequires:  pkgconfig(Qt5Network)
-BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5XmlPatterns)
-BuildRequires:  pkgconfig(Qt5OpenGL)
-BuildRequires:  pkgconfig(assimp)
+BuildRequires: qt5-rpm-macros >= %{version}
+BuildRequires: qt5-qtbase-static >= %{version}
+BuildRequires: qt5-qtbase-private-devel
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+BuildRequires: qt5-qtdeclarative-devel
+BuildRequires: qt5-qtimageformats
+BuildRequires: qt5-qtxmlpatterns-devel
+#BuildRequires: pkgconfig(assimp) >= 3.3.1
 
 Requires:       qt5-qtimageformats%{?_isa} >= %{version}
 
@@ -69,7 +68,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
 %build
@@ -118,49 +117,81 @@ popd
 %{_qt5_libdir}/libQt53DCore.so.5*
 %{_qt5_libdir}/libQt53DLogic.so.5*
 %{_qt5_libdir}/libQt53DQuickInput.so.5*
-%{_qt5_archdatadir}/qml/Qt3D/
-%{_qt5_archdatadir}/qml/QtQuick/Scene3D
-%{_qt5_plugindir}/sceneparsers/libassimpsceneparser.so
-%{_qt5_plugindir}/sceneparsers/libgltfsceneparser.so
+%{_qt5_libdir}/libQt53DExtras.so.5*
+%{_qt5_libdir}/libQt53DAnimation.so.5*
+%{_qt5_libdir}/libQt53DQuickAnimation.so.5*
+%{_qt5_libdir}/libQt53DQuickScene2D.so.5*
+%{_qt5_libdir}/libQt53DQuickExtras.so.5*
+%{_qt5_qmldir}/Qt3D/
+%{_qt5_qmldir}/QtQuick/Scene3D/
+%{_qt5_qmldir}/QtQuick/Scene2D/
+%{_qt5_plugindir}/sceneparsers/
+%{_qt5_plugindir}/renderplugins/
+%{_qt5_plugindir}/geometryloaders/
 
 %files devel
 %{_qt5_bindir}/qgltf
 %{_qt5_libdir}/libQt53DQuick.so
 %{_qt5_libdir}/libQt53DQuick.prl
 %{_qt5_libdir}/cmake/Qt53DQuick
-%{_qt5_headerdir}/Qt3DQuick
+%{_qt5_includedir}/Qt3DQuick
 %{_qt5_libdir}/pkgconfig/Qt53DQuick.pc
 %{_qt5_libdir}/libQt53DInput.so
 %{_qt5_libdir}/libQt53DInput.prl
 %{_qt5_libdir}/cmake/Qt53DInput
-%{_qt5_headerdir}/Qt3DInput/
+%{_qt5_includedir}/Qt3DInput/
 %{_qt5_libdir}/pkgconfig/Qt53DInput.pc
 %{_qt5_libdir}/libQt53DCore.so
 %{_qt5_libdir}/libQt53DCore.prl
 %{_qt5_libdir}/cmake/Qt53DCore/
-%{_qt5_headerdir}/Qt3DCore/
+%{_qt5_includedir}/Qt3DCore/
 %{_qt5_libdir}/pkgconfig/Qt53DCore.pc
 %{_qt5_libdir}/libQt53DQuickRender.so
 %{_qt5_libdir}/libQt53DQuickRender.prl
 %{_qt5_libdir}/cmake/Qt53DQuickRender/
-%{_qt5_headerdir}/Qt3DQuickRender/
+%{_qt5_includedir}/Qt3DQuickRender/
 %{_qt5_libdir}/pkgconfig/Qt53DQuickRender.pc
 %{_qt5_libdir}/libQt53DRender.so
 %{_qt5_libdir}/libQt53DRender.prl
 %{_qt5_libdir}/cmake/Qt53DRender/
-%{_qt5_headerdir}/Qt3DRender/
+%{_qt5_includedir}/Qt3DRender/
 %{_qt5_libdir}/pkgconfig/Qt53DRender.pc
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
 %{_qt5_libdir}/libQt53DLogic.so
 %{_qt5_libdir}/libQt53DLogic.prl
-%{_qt5_headerdir}/Qt3DLogic/
+%{_qt5_includedir}/Qt3DLogic/
 %{_qt5_libdir}/cmake/Qt53DLogic
 %{_qt5_libdir}/pkgconfig/Qt53DLogic.pc
 %{_qt5_libdir}/libQt53DQuickInput.so
 %{_qt5_libdir}/libQt53DQuickInput.prl
-%{_qt5_headerdir}/Qt3DQuickInput/
+%{_qt5_includedir}/Qt3DQuickInput/
 %{_qt5_libdir}/cmake/Qt53DQuickInput
 %{_qt5_libdir}/pkgconfig/Qt53DQuickInput.pc
+%{_qt5_libdir}/libQt53DExtras.so
+%{_qt5_libdir}/libQt53DExtras.prl
+%{_qt5_libdir}/cmake/Qt53DExtras
+%{_qt5_includedir}/Qt3DExtras
+%{_qt5_libdir}/pkgconfig/Qt53DExtras.pc
+%{_qt5_libdir}/libQt53DQuickExtras.so
+%{_qt5_libdir}/libQt53DQuickExtras.prl
+%{_qt5_libdir}/cmake/Qt53DQuickExtras
+%{_qt5_includedir}/Qt3DQuickExtras
+%{_qt5_libdir}/pkgconfig/Qt53DQuickExtras.pc
+%{_qt5_libdir}/libQt53DAnimation.so
+%{_qt5_libdir}/libQt53DAnimation.prl
+%{_qt5_libdir}/cmake/Qt53DAnimation
+%{_qt5_includedir}/Qt3DAnimation
+%{_qt5_libdir}/pkgconfig/Qt53DAnimation.pc
+%{_qt5_libdir}/libQt53DQuickAnimation.so
+%{_qt5_libdir}/libQt53DQuickAnimation.prl
+%{_qt5_libdir}/cmake/Qt53DQuickAnimation
+%{_qt5_includedir}/Qt3DQuickAnimation
+%{_qt5_libdir}/pkgconfig/Qt53DQuickAnimation.pc
+%{_qt5_libdir}/libQt53DQuickScene2D.so
+%{_qt5_libdir}/libQt53DQuickScene2D.prl
+%{_qt5_libdir}/cmake/Qt53DQuickScene2D
+%{_qt5_includedir}/Qt3DQuickScene2D
+%{_qt5_libdir}/pkgconfig/Qt53DQuickScene2D.pc
 
 %if 0%{?docs}
 %files doc
@@ -174,6 +205,9 @@ popd
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 

+ 205 - 117
q/qt5-qtbase/qt5-qtbase-vl.spec

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

+ 16 - 12
q/qt5-qtcanvas3d/qt5-qtcanvas3d-vl.spec

@@ -1,11 +1,11 @@
 %global qt_module qtcanvas3d
 
-%define docs 1
+#define docs 1
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - Canvas3d component
@@ -14,19 +14,20 @@ Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://www.qt.io
+Url:     https://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}-opensource-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:  qt5-qtbase-devel >= %{version}
-BuildRequires:  qt5-qtbase-static >= %{version}
-BuildRequires:  pkgconfig(Qt5Quick)
-BuildRequires:  pkgconfig(Qt5Qml)
-
-%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
+BuildRequires: qt5-rpm-macros >= %{version}
+BuildRequires: qt5-qtbase-devel >= %{version}
+BuildRequires: qt5-qtbase-static
+BuildRequires: qt5-qtbase-private-devel
+# libQt5Qml.so.5(Qt_5_PRIVATE_API)(64bit)
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+BuildRequires: qt5-qtdeclarative-devel
 
 %description
 Qt5 Canvas3D component
@@ -51,7 +52,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
 %build
@@ -94,6 +95,9 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 

+ 15 - 15
q/qt5-qtconnectivity/qt5-qtconnectivity-vl.spec

@@ -1,12 +1,12 @@
 
 %global qt_module qtconnectivity
 
-%define docs 1
+#define docs 1
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - Connectivity components
@@ -16,24 +16,22 @@ Release: 1%{?_dist_release}
 
 # See LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
-
-## upstreamable patches
-# bswap_16 apparently missing on el6/ppc64
-Patch50: qtconnectivity-opensource-src-5.4.0-bswap_16.patch
+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: qt5-rpm-macros
+BuildRequires: qt5-srpm-macros
 BuildRequires: qt5-qtbase-devel >= %{version}
-BuildRequires: qt5-qtdeclarative-devel
+BuildRequires: qt5-qtbase-private-devel
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+BuildRequires: qt5-qtdeclarative-devel >= %{version}
 BuildRequires: pkgconfig(bluez)
 
-%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
-
 %description
 %{summary}.
 
@@ -63,8 +61,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
-%patch50 -p1 -b .bswap_16
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
 %build
@@ -87,7 +84,7 @@ make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 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}
 pushd %{buildroot}%{_qt5_bindir}
 for i in * ; do
@@ -156,6 +153,9 @@ popd
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 

+ 54 - 81
q/qt5-qtdeclarative/qt5-qtdeclarative-vl.spec

@@ -10,7 +10,7 @@
 
 %if ! 0%{?bootstrap}
 %ifarch %{arm} %{ix86} x86_64
-%global docs 1
+#global docs 1
 #global tests 1
 %endif
 %endif
@@ -22,8 +22,8 @@
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - QtDeclarative component
@@ -33,51 +33,38 @@ Release: 1%{?_dist_release}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
 
-# support no_sse2 CONFIG (fedora i686 builds cannot assume -march=pentium4 -msse2 -mfpmath=sse flags, or the JIT that needs them)
-# https://codereview.qt-project.org/#change,73710
-Patch1: qtdeclarative-opensource-src-5.5.0-no_sse2.patch
-
-# workaround for possible deadlock condition in QQuickShaderEffectSource
-# https://bugzilla.redhat.com/show_bug.cgi?id=1237269
-# https://bugs.kde.org/show_bug.cgi?id=348385
-Patch2: qtdeclarative-QQuickShaderEffectSource_deadlock.patch
+# header file to workaround multilib issue
+# https://bugzilla.redhat.com/show_bug.cgi?id=1441343
+Source5: qv4global_p-multilib.h
 
 ## upstream patches
-Patch27: 0027-Fix-crash-when-using-with-statement-with-an-expressi.patch
 
 ## upstreamable patches
-# use system double-conversation
-%if 0%{?fedora} || 0%{?rhel} > 6
-%global system_doubleconv 1
-BuildRequires: double-conversion-devel
-%endif
-Patch200: qtdeclarative-system_doubleconv.patch
-# https://bugs.kde.org/show_bug.cgi?id=346118#c108
-Patch201: qtdeclarative-kdebug346118.patch
-# additional i686/qml workaround (on top of existing patch135),  https://bugzilla.redhat.com/1331593
-Patch235: qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch
+# 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
 
-## upstream patches under review
-# Check-for-NULL-from-glGetStrin
-Patch500: Check-for-NULL-from-glGetString.patch
+# filter qml provides
+%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
 
-Obsoletes: qt5-qtjsbackend < 5.2.0
 
 BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: qt5-rpm-macros >= %{version}
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 %if ! 0%{?bootstrap}
 BuildRequires: qt5-qtxmlpatterns-devel
 %endif
-BuildRequires: python
+BuildRequires: python3
 
 %if 0%{?tests}
 BuildRequires: dbus-x11
@@ -125,41 +112,22 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
-%if 0%{?nosse2_hack}
-%patch1 -p1 -b .no_sse2
-%endif
-%patch2 -p1 -b .QQuickShaderEffectSource_deadlock
-
-%patch27 -p1 -b .0027
-
-%if 0%{?system_doubleconv}
-%patch200 -p1 -b .system_doubleconv
-rm -rfv src/3rdparty/double-conversion
-%endif
-%patch201 -p0 -b .kdebug346118
-
-%patch500 -p1 -b .Check-for-NULL-from-glGetString
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
+%patch126 -p1 -R
 
 %build
+ln -s %{__python3} python
+export PATH=`pwd`:$PATH
+
 mkdir %{_target_platform}
 pushd %{_target_platform}
+
 %{qmake_qt5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
-%if 0%{?nosse2_hack}
-# build libQt5Qml with no_sse2
-mkdir -p %{_target_platform}-no_sse2
-pushd    %{_target_platform}-no_sse2
-%{qmake_qt5} -config no_sse2 ..
-make sub-src-clean
-make %{?_smp_mflags} -C src/qml
-popd
-%endif
-
 %if 0%{?docs}
 make %{?_smp_mflags} docs -C %{_target_platform}
 %endif
@@ -167,12 +135,21 @@ make %{?_smp_mflags} docs -C %{_target_platform}
 
 %install
 rm -rf %{buildroot}
+
+export PATH=`pwd`:$PATH
+
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
-%if 0%{?nosse2_hack}
-mkdir -p %{buildroot}%{_qt5_libdir}/sse2
-mv %{buildroot}%{_qt5_libdir}/libQt5Qml.so.5* %{buildroot}%{_qt5_libdir}/sse2/
-make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-no_sse2/src/qml
+%if 0
+%ifarch %{multilib_archs}
+# multilib: qv4global_p.h
+  mv %{buildroot}%{_qt5_headerdir}/QtQml/%{version}/QtQml/private/qv4global_p.h
+\
+     %{buildroot}%{_qt5_headerdir}/QtQml/%{version}/QtQml/private/qv4global_p-%{
+__isa_bits}.h
+  install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt5_headerdir}/QtQml/%{version}/
+QtQml/private/qv4global_p.h
+%endif
 %endif
 
 %if 0%{?docs}
@@ -206,33 +183,23 @@ popd
 # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
 pushd %{buildroot}%{_qt5_libdir}
 for prl_file in libQt5*.prl ; do
-  sed -i \
-    -e "/^QMAKE_PRL_BUILD_DIR/d" \
-    -e "/-ldouble-conversion/d" \
-    ${prl_file}
-  if [ -f "$(basename ${prl_file} .prl).so" ]; then
-    rm -fv "$(basename ${prl_file} .prl).la"
-  else
-    sed -i \
-       -e "/^QMAKE_PRL_LIBS/d" \
-       -e "/-ldouble-conversion/d" \
-       $(basename ${prl_file} .prl).la
-  fi
+  sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file}
+  rm -fv "$(basename ${prl_file} .prl).la"
+  sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file}
 done
 popd
 
 
 %check
-test -z "$(grep double-conversion %{buildroot}%{_qt5_libdir}/*.{la,prl})"
 %if 0%{?tests}
 export CTEST_OUTPUT_ON_FAILURE=1
 export PATH=%{buildroot}%{_qt5_bindir}:$PATH
 export LD_LIBRARY_PATH=%{buildroot}%{_qt5_libdir}
-make sub-tests-all %{?_smp_mflags} -C %{_target_platform}
+make sub-tests-all %{?_smp_mflags}
 xvfb-run -a \
 dbus-launch --exit-with-session \
 time \
-make check -k -C %{_target_platform}/tests ||:
+make check -k -C tests ||:
 %endif
 
 
@@ -241,19 +208,15 @@ make check -k -C %{_target_platform}/tests ||:
 
 %files
 %{!?_licensedir:%global license %%doc}
-%license LICENSE.LGPL* LGPL_EXCEPTION.txt
+%license LICENSE.LGPL*
 %{_qt5_libdir}/libQt5Qml.so.5*
-%if 0%{?nosse2_hack}
-%{_qt5_libdir}/sse2/libQt5Qml.so.5*
-%endif
 %{_qt5_libdir}/libQt5Quick.so.5*
 %{_qt5_libdir}/libQt5QuickWidgets.so.5*
 %{_qt5_libdir}/libQt5QuickParticles.so.5*
+%{_qt5_libdir}/libQt5QuickShapes.so.5*
 %{_qt5_libdir}/libQt5QuickTest.so.5*
 %{_qt5_plugindir}/qmltooling/
 %{_qt5_archdatadir}/qml/
-%dir %{_qt5_libdir}/cmake/Qt5Qml/
-%{_qt5_libdir}/cmake/Qt5Qml/Qt5Qml_*Factory.cmake
 
 %files devel
 %{_bindir}/qml*
@@ -267,10 +230,17 @@ make check -k -C %{_target_platform}/tests ||:
 %{_qt5_libdir}/cmake/Qt5*/Qt5*Config*.cmake
 %{_qt5_libdir}/pkgconfig/Qt5*.pc
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
+%{_qt5_archdatadir}/mkspecs/features/*.prf
+%dir %{_qt5_libdir}/cmake/Qt5Qml/
+%{_qt5_libdir}/cmake/Qt5Qml/Qt5Qml_*Factory.cmake
 
 %files static
-%{_qt5_libdir}/libQt5QmlDevTools.*a
+%{_qt5_libdir}/libQt5QmlDevTools.a
 %{_qt5_libdir}/libQt5QmlDevTools.prl
+%{_qt5_libdir}/libQt5PacketProtocol.a
+%{_qt5_libdir}/libQt5PacketProtocol.prl
+%{_qt5_libdir}/libQt5QmlDebug.a
+%{_qt5_libdir}/libQt5QmlDebug.prl
 
 %if 0%{?docs}
 %files doc
@@ -286,7 +256,10 @@ make check -k -C %{_target_platform}/tests ||:
 
 
 %changelog
-* Tue Jan 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.6.3
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
+* Tue Jan 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.6.3-1
 - new upstream release.
 
 * Sun Jul 10 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.6.1.1-1

+ 13 - 8
q/qt5-qtdoc/qt5-qtdoc-vl.spec

@@ -3,8 +3,8 @@
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Main Qt5 Reference Documentation
@@ -13,18 +13,20 @@ Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 
 License: GFDL
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+
 BuildArch: noarch
 %global _qt5_qmake %{_bindir}/qmake-qt5
 
-BuildRequires: qt5-qtbase-devel >= %{version}
-BuildRequires: qt5-qhelpgenerator
-BuildRequires: qt5-qdoc
+BuildRequires: qt5-rpm-macros
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-doctools
+#BuildRequires: qt5-qtbase-doc
 
 %description
 QtDoc contains the main Qt Reference Documentation, which includes
@@ -32,7 +34,7 @@ overviews, Qt topics, and examples not specific to any Qt module.
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
 %build
@@ -50,6 +52,9 @@ make install_docs INSTALL_ROOT=%{buildroot}
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 

+ 18 - 15
q/qt5-qtgraphicaleffects/qt5-qtgraphicaleffects-vl.spec

@@ -1,12 +1,12 @@
 
 %global qt_module qtgraphicaleffects
 
-%define docs 1
+#define docs 1
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - QtGraphicalEffects component
@@ -16,24 +16,25 @@ Release: 1%{?_dist_release}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively from qt5-qtbase for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
 
-# debuginfo.list ends up empty/blank anyway, since the included qml is *basically* noarch
-# todo: look into making this pkg proper noarch instead
-%global debug_package %{nil}
+# filter qml provides
+%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
 
+BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-qtbase-devel >= %{version}
-BuildRequires: pkgconfig(Qt5Quick)
+BuildRequires: qt5-qtbase-private-devel
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+BuildRequires: qt5-qtdeclarative-devel
+
 BuildRequires: libmng-devel
 BuildRequires: libtiff-devel
 
-%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
-
 %description
 The Qt Graphical Effects module provides a set of QML types for adding
 visually impressive and configurable effects to user interfaces. Effects
@@ -54,7 +55,7 @@ BuildArch: noarch
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
 %build
@@ -78,9 +79,8 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 %endif
 
 %files
-%license LGPL_EXCEPTION.txt LICENSE.LGPL*
-%dir %{_qt5_archdatadir}/qml/
-%{_qt5_archdatadir}/qml/QtGraphicalEffects/
+%license LICENSE.*
+%{_qt5_qmldir}/QtGraphicalEffects/
 
 %if 0%{?docs}
 %files doc
@@ -91,6 +91,9 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 

+ 19 - 11
q/qt5-qtimageformats/qt5-qtimageformats-vl.spec

@@ -1,17 +1,15 @@
 
 %global qt_module qtimageformats
 
-%define docs 1
+#define docs 1
 
 # where to enable webp support
-%if 0%{?fedora} || 0%{?rhel} > 6
 %global webp 1
-%endif
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - QtImageFormats component
@@ -21,14 +19,20 @@ Release: 1%{?_dist_release}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
 
+BuildRequires: cmake
+BuildRequires: qt5-rpm-macros
+BuildRequires: qt5-srpm-macros
 BuildRequires: qt5-qtbase-devel >= %{version}
+BuildRequires: qt5-qtbase-private-devel
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+
 BuildRequires: libmng-devel
 BuildRequires: libtiff-devel
 BuildRequires: jasper-devel
@@ -42,7 +46,8 @@ Provides: bundled(libwebp)
 Obsoletes: qt5-qtimageformats-devel < 5.4.0
 Provides:  qt5-qtimageformats-devel = %{version}-%{release}
 
-%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
+# filter plugin provides
+%global __provides_exclude_from ^%{_qt5_plugindir}/.*\\.so$
 
 %description
 The core Qt Gui library by default supports reading and writing image
@@ -65,7 +70,7 @@ BuildArch: noarch
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 %if 0%{?webp}
 rm -rv src/3rdparty
 %endif
@@ -92,12 +97,12 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
 %files
-%license LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL*
+%license LICENSE.GPL*
+%license LICENSE.LGPL*
 %{_qt5_plugindir}/imageformats/libqmng.so
 %{_qt5_plugindir}/imageformats/libqtga.so
 %{_qt5_plugindir}/imageformats/libqtiff.so
 %{_qt5_plugindir}/imageformats/libqwbmp.so
-# %{_qt5_plugindir}/imageformats/libqdds.so
 %{_qt5_plugindir}/imageformats/libqicns.so
 %{_qt5_plugindir}/imageformats/libqjp2.so
 %{_qt5_plugindir}/imageformats/libqwebp.so
@@ -112,6 +117,9 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 - delete %%{_qt5_plugindir}/imageformats/libqdds.so

+ 46 - 23
q/qt5-qtlocation/qt5-qtlocation-vl.spec

@@ -8,14 +8,14 @@
 
 %if ! 0%{?bootstrap}
 %ifarch %{arm} %{ix86} x86_64
-%define docs 1
+#define docs 1
 %endif
 %endif
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - Location component
@@ -25,18 +25,27 @@ Release: 1%{?_dist_release}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
 
-## upstreamable patches
-# try to support older glib2 (like el6)
-Patch50: qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch
+# build failure with gcc10
+# various C++ runtime headers indirectly included <string> which in turn
+# included <local> and <cerrno>.  Those indirect inclusions have been
+# eliminated which in turn forces packages to include the C++ headers they
+# actually need.
+Patch0: qtlocation-gcc10.patch
+
+# filter plugin/qml provides
+%global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugind
+ir}/.*\\.so)$
 
 BuildRequires: cmake
+BuildRequires: qt5-rpm-macros
+BuildRequires: qt5-srpm-macros
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: qt5-qtdeclarative-devel >= %{version}
 
@@ -44,6 +53,10 @@ BuildRequires: qt5-qtdeclarative-devel >= %{version}
 BuildRequires:  qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 
+BuildRequires: pkgconfig(icu-i18n)
+BuildRequires: openssl-devel
+BuildRequires: zlib-devel
+
 %description
 The Qt Location and Qt Positioning APIs gives developers the ability to
 determine a position by using a variety of possible sources, including
@@ -75,10 +88,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
-## G_VALUE_INIT is new in glib-2.30+ only
-%patch50 -p1 -b .G_VALUE_INIT
-
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
+%patch0 -p1 -b .gcc10
 
 %build
 mkdir %{_target_platform}
@@ -117,31 +128,40 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%license LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL*
+%license LICENSE.GPL* LICENSE.LGPL*
 %{_qt5_libdir}/libQt5Location.so.5*
 %{_qt5_archdatadir}/qml/QtLocation/
 %{_qt5_plugindir}/geoservices/
 %{_qt5_libdir}/libQt5Positioning.so.5*
-%{_qt5_archdatadir}/qml/QtPositioning/
+%dir %{_qt5_archdatadir}/qml/QtPositioning
+%{_qt5_archdatadir}/qml/QtPositioning/*
 %{_qt5_plugindir}/position/
-%dir %{_qt5_libdir}/cmake/
-%dir %{_qt5_libdir}/cmake/Qt5Location
-%dir %{_qt5_libdir}/cmake/Qt5Positioning
-%{_qt5_libdir}/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactory*.cmake
-%{_qt5_libdir}/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactory*.cmake
+%{_qt5_libdir}/libQt5PositioningQuick.so.5*
+%dir %{_qt5_archdatadir}/qml/Qt
+%dir %{_qt5_archdatadir}/qml/Qt/labs
+%{_qt5_archdatadir}/qml/Qt/labs/location
 
 %files devel
 %{_qt5_headerdir}/QtLocation/
 %{_qt5_libdir}/libQt5Location.so
 %{_qt5_libdir}/libQt5Location.prl
-%{_qt5_libdir}/pkgconfig/Qt5Location.pc
-%{_qt5_archdatadir}/mkspecs/modules/qt_lib_location*.pri
-%{_qt5_libdir}/cmake/Qt5Location/Qt5LocationConfig*.cmake
 %{_qt5_headerdir}/QtPositioning/
 %{_qt5_libdir}/libQt5Positioning.so
 %{_qt5_libdir}/libQt5Positioning.prl
-%{_qt5_libdir}/cmake/Qt5Positioning/Qt5PositioningConfig*.cmake
+%{_qt5_headerdir}/QtPositioningQuick/
+%{_qt5_libdir}/libQt5PositioningQuick.so
+%{_qt5_libdir}/libQt5PositioningQuick.prl
+%{_qt5_libdir}/pkgconfig/Qt5Location.pc
+%dir %{_qt5_libdir}/cmake/Qt5Location
+%{_qt5_libdir}/cmake/Qt5Location/Qt5Location*.cmake
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_location*.pri
 %{_qt5_libdir}/pkgconfig/Qt5Positioning.pc
+%dir %{_qt5_libdir}/cmake/Qt5Positioning
+%{_qt5_libdir}/cmake/Qt5Positioning/Qt5Positioning*.cmake
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri
+%{_qt5_libdir}/pkgconfig/Qt5PositioningQuick.pc
+%dir %{_qt5_libdir}/cmake/Qt5PositioningQuick/
+%{_qt5_libdir}/cmake/Qt5PositioningQuick/Qt5PositioningQuick*.cmake
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri
 
 %if 0%{?docs}
@@ -160,6 +180,9 @@ popd
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Tue Jan 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.6.3-1
 - new upstream release.
 

+ 22 - 24
q/qt5-qtmultimedia/qt5-qtmultimedia-vl.spec

@@ -8,7 +8,7 @@
 
 %if ! 0%{?bootstrap}
 %ifarch %{arm} %{ix86} x86_64
-%define docs 1
+#define docs 1
 %endif
 %endif
 
@@ -18,8 +18,8 @@
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - Multimedia support
@@ -29,24 +29,20 @@ Release: 1%{?_dist_release}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
-
-## upstreamable paches
-# FTBFS on el6
-Patch50: qtmultimedia-opensource-src-5.6.1-nullptr.patch
+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: qt5-rpm-macros
 BuildRequires: qt5-qtbase-devel >= %{version}
+BuildRequires: qt5-qtbase-private-devel
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 BuildRequires: qt5-qtdeclarative-devel >= %{version}
 BuildRequires: pkgconfig(alsa)
-%if "%{?gst}" == "0.10"
-BuildRequires: pkgconfig(gstreamer-interfaces-0.10)
-%endif
 BuildRequires: pkgconfig(gstreamer-%{gst})
 BuildRequires: pkgconfig(gstreamer-app-%{gst})
 BuildRequires: pkgconfig(gstreamer-audio-%{gst})
@@ -60,9 +56,6 @@ BuildRequires: pkgconfig(openal)
 %endif
 BuildRequires: pkgconfig(xv)
 
-BuildRequires: qt5-qtbase-private-devel
-%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
-
 %description
 The Qt Multimedia module provides a rich feature set that enables you to
 easily take advantage of a platforms multimedia capabilites and hardware.
@@ -74,6 +67,7 @@ Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtdeclarative-devel%{?_isa}
+Requires: pkgconfig(libpulse-mainloop-glib)
 %description devel
 %{summary}.
 
@@ -97,7 +91,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 # %patch50 -p1 -b .nullptr
 
@@ -141,11 +135,11 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%license LGPL_EXCEPTION.txt LICENSE.LGPL*
+%license LICENSE.*
 %{_qt5_libdir}/libQt5Multimedia.so.5*
-%{_qt5_libdir}/libQt5MultimediaQuick_p.so.5*
+%{_qt5_libdir}/libQt5MultimediaQuick.so.5*
 %{_qt5_libdir}/libQt5MultimediaWidgets.so.5*
-%{_qt5_libdir}/libqgsttools_p.so.1*
+%{_qt5_libdir}/libQt5MultimediaGstTools.so.5*
 %if 0%{?openal}
 %{_qt5_archdatadir}/qml/QtAudioEngine/
 %endif
@@ -159,16 +153,17 @@ popd
 
 %files devel
 %{_qt5_headerdir}/QtMultimedia/
-%{_qt5_headerdir}/QtMultimediaQuick_p/
+%{_qt5_headerdir}/QtMultimediaQuick/
 %{_qt5_headerdir}/QtMultimediaWidgets/
+%{_qt5_headerdir}/QtMultimediaGstTools/
 %{_qt5_libdir}/libQt5Multimedia.so
 %{_qt5_libdir}/libQt5Multimedia.prl
-%{_qt5_libdir}/libQt5MultimediaQuick_p.so
-%{_qt5_libdir}/libQt5MultimediaQuick_p.prl
+%{_qt5_libdir}/libQt5MultimediaQuick.so
+%{_qt5_libdir}/libQt5MultimediaQuick.prl
 %{_qt5_libdir}/libQt5MultimediaWidgets.so
 %{_qt5_libdir}/libQt5MultimediaWidgets.prl
-%{_qt5_libdir}/libqgsttools_p.so
-%{_qt5_libdir}/libqgsttools_p.prl
+%{_qt5_libdir}/libQt5MultimediaGstTools.so
+%{_qt5_libdir}/libQt5MultimediaGstTools.prl
 %{_qt5_libdir}/cmake/Qt5Multimedia/Qt5MultimediaConfig*.cmake
 %{_qt5_libdir}/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig*.cmake
 %{_qt5_libdir}/pkgconfig/Qt5Multimedia.pc
@@ -189,6 +184,9 @@ popd
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 - drop Patch50 (fixed in 5.6.3)

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

@@ -1,12 +1,12 @@
 
 %global qt_module qtquickcontrols
 
-%define docs 1
+#define docs 1
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Name:    qt5-%{qt_module}
@@ -15,19 +15,22 @@ Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 
 License: LGPLv2 or LGPLv3 and GFDL
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
 
+# filter qml provides
+%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
+
+BuildRequires: qt5-rpm-macros
 BuildRequires:  qt5-qtbase-devel >= %{version}
 BuildRequires:  qt5-qtbase-static >= %{version}
 BuildRequires:  qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
-BuildRequires:  qt5-qtdeclarative-private-devel
-%{?_qt5:Requires: qt5-qtdeclarative%{?_isa} = %{_qt5_version}}
+BuildRequires:  qt5-qtdeclarative-devel
 
 %description
 The Qt Quick Controls module provides a set of controls that can be used to
@@ -53,7 +56,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
 %build
@@ -81,8 +84,8 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
 %files
+%license LICENSE.*
 %{_qt5_archdatadir}/qml/QtQuick/
-%doc LICENSE.*
 
 %if 0%{?docs}
 %files doc
@@ -104,6 +107,9 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 

+ 40 - 33
q/qt5-qtquickcontrols2/qt5-qtquickcontrols2-vl.spec

@@ -1,12 +1,12 @@
 
 %global qt_module qtquickcontrols2
 
-%define docs 1
+#define docs 1
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Name:    qt5-%{qt_module}
@@ -15,20 +15,29 @@ Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 
 License: GPLv2+ or LGPLv3 and GFDL
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
 
-BuildRequires:  qt5-qtbase-devel >= %{version}
-BuildRequires:  qt5-qtbase-static >= %{version}
-BuildRequires:  qt5-qtbase-private-devel
+# filter qml provides
+%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
+
+BuildRequires: qt5-rpm-macros
+BuildRequires: qt5-qtbase-devel >= %{version}
+BuildRequires: qt5-qtbase-private-devel
+#libQt53DRender.so.5(Qt_5_PRIVATE_API)(64bit)
+#libQt5Core.so.5(Qt_5_PRIVATE_API)(64bit)
+#libQt5Gui.so.5(Qt_5_PRIVATE_API)(64bit)
+#libQt5Qml.so.5(Qt_5_PRIVATE_API)(64bit)
+#libQt5Quick.so.5(Qt_5_PRIVATE_API)(64bit)
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
-BuildRequires:  qt5-qtdeclarative-private-devel
-%{?_qt5:Requires: qt5-qtdeclarative%{?_isa} = %{_qt5_version}}
-%{?_qt5:Requires: qt5-qtgraphicaleffects%{?_isa} = %{_qt5_version}}
+BuildRequires: qt5-qtdeclarative-devel
+
+Requires: qt5-qtdeclarative%{?_isa} >= %{version}
+Requires: qt5-qtgraphicaleffects%{_isa} >= %{version}
 
 %description
 The Qt Labs Controls module provides a set of controls that can be used to
@@ -60,13 +69,6 @@ Requires: qt5-qtdeclarative-devel%{?_isa}
 %{summary}.
 
 
-%package static
-Summary: Static library files for %{name}
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-%description static
-%{summary}.
-
-
 %package examples
 Summary:        Examples for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -75,7 +77,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 %if 0%{?prerelease}
 syncqt.pl -version %{version}
@@ -125,11 +127,13 @@ rm -f %{buildroot}%{_qt5_libdir}/libQt5*.la
 
 
 %files
-%license LICENSE.FDL LICENSE.LGPLv3 LICENSE.GPLv3
-%{_qt5_archdatadir}/qml/Qt/labs/calendar/
-%{_qt5_archdatadir}/qml/Qt/labs/controls/
-%{_qt5_archdatadir}/qml/Qt/labs/templates/
-%{_qt5_libdir}/libQt5LabsTemplates.so.5*
+%license LICENSE.LGPLv3 LICENSE.GPLv3
+%{_qt5_libdir}/libQt5QuickTemplates2.so.5*
+%{_qt5_libdir}/libQt5QuickControls2.so.5*
+%{_qt5_qmldir}/Qt/labs/calendar
+%{_qt5_qmldir}/Qt/labs/platform
+%{_qt5_archdatadir}/qml/QtQuick/Controls.2/
+%{_qt5_archdatadir}/qml/QtQuick/Templates.2/
 
 %if 0%{?docs}
 %files doc
@@ -140,21 +144,24 @@ rm -f %{buildroot}%{_qt5_libdir}/libQt5*.la
 %endif
 
 %files devel
-%{_qt5_headerdir}/QtLabsControls/
-%{_qt5_headerdir}/QtLabsTemplates/
-%{_qt5_libdir}/libQt5LabsControls.prl
-%{_qt5_libdir}/libQt5LabsTemplates.prl
-%{_qt5_libdir}/libQt5LabsTemplates.so
-%{_qt5_archdatadir}/mkspecs/modules/qt_lib_labs*_private.pri
-
-%files static
-%{_qt5_libdir}/libQt5LabsControls.a
+%{_qt5_headerdir}/
+%{_qt5_libdir}/pkgconfig/*.pc
+%{_qt5_libdir}/libQt5QuickTemplates2.so
+%{_qt5_libdir}/libQt5QuickControls2.so
+%{_qt5_libdir}/libQt5QuickTemplates2.prl
+%{_qt5_libdir}/libQt5QuickControls2.prl
+%{_qt5_libdir}/qt5/mkspecs/modules/*
+%{_libdir}/cmake/Qt5QuickControls2/
+%{_libdir}/cmake/Qt5QuickTemplates2/
 
 %files examples
 %{_qt5_examplesdir}/quickcontrols2/
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 

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

@@ -1,12 +1,12 @@
 
 %global qt_module qtscript
 
-%define docs 1
+#define docs 1
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - QtScript component
@@ -16,22 +16,31 @@ Release: 1%{?_dist_release}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
-
-# add s390(x0 support to Platform.h (taken from webkit)
-Patch0: qtscript-opensource-src-5.5.0-s390.patch
+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: qt5-qtbase-devel >= %{version}
+BuildRequires: gcc-c++
+BuildRequires: qt5-rpm-macros
+BuildRequires: qt5-qtbase-devel
 BuildRequires: qt5-qtbase-private-devel
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+
+%if ! 0%{?bootstrap}
+# extra examples
 BuildRequires: pkgconfig(Qt5UiTools)
+%endif
 
-%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+%if 0%{?tests}
+BuildRequires: dbus-x11
+BuildRequires: mesa-dri-drivers
+BuildRequires: time
+BuildRequires: xorg-x11-server-Xvfb
+%endif
 
 %description
 %{summary}.
@@ -63,9 +72,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
-
-%patch0 -p1 -b .s390
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
 %build
@@ -104,7 +111,7 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la
 %postun -p /sbin/ldconfig
 
 %files
-%license LGPL_EXCEPTION.txt LICENSE.LGPL*
+%license LICENSE.LGPL*
 %{_qt5_libdir}/libQt5Script.so.5*
 %{_qt5_libdir}/libQt5ScriptTools.so.5*
 
@@ -136,6 +143,9 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 

+ 16 - 9
q/qt5-qtsensors/qt5-qtsensors-vl.spec

@@ -8,14 +8,14 @@
 
 %if ! 0%{?bootstrap}
 %ifarch %{arm} %{ix86} x86_64
-%define docs 1
+#define docs 1
 %endif
 %endif
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - Sensors component
@@ -25,19 +25,23 @@ Release: 1%{?_dist_release}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://www.qt.io/
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+
+# filter qml/plugin provides
+%global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$
 
 BuildRequires: cmake
+BuildRequires: qt5-rpm-macros
+BuildRequires: qt5-srpm-macros
 BuildRequires: qt5-qtbase-devel >= %{version}
-BuildRequires: qt5-qtdeclarative-devel >= %{version}
-
 BuildRequires: qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+BuildRequires: qt5-qtdeclarative-devel
 
 %description
 The Qt Sensors API provides access to sensor hardware via QML and C++
@@ -71,7 +75,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
 %build
@@ -114,7 +118,7 @@ popd
 /sbin/ldconfig
 
 %files
-%license LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL*
+%license LICENSE.*
 %{_qt5_libdir}/libQt5Sensors.so.5*
 %{_qt5_plugindir}/sensorgestures/
 %{_qt5_plugindir}/sensors/
@@ -144,6 +148,9 @@ popd
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Tue Jan 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.6.3-1
 - new upstream release.
 

+ 12 - 7
q/qt5-qtserialport/qt5-qtserialport-vl.spec

@@ -1,12 +1,12 @@
 
 %global qt_module qtserialport
 
-%define docs 1
+#define docs 1
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - SerialPort component
@@ -16,17 +16,19 @@ Release: 1%{?_dist_release}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
 
 BuildRequires: cmake
+BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: pkgconfig(libudev)
 
+BuildRequires: qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 
 %description
@@ -60,7 +62,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
 %build
@@ -110,7 +112,7 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%license LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL*
+%license LICENSE.*
 %{_qt5_libdir}/libQt5SerialPort.so.5*
 
 %files devel
@@ -137,6 +139,9 @@ popd
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 

+ 13 - 11
q/qt5-qtsvg/qt5-qtsvg-vl.spec

@@ -1,12 +1,12 @@
 
 %global qt_module qtsvg
 
-%define docs 1
+#define docs 1
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - Support for rendering and displaying SVG
@@ -16,18 +16,18 @@ Release: 1%{?_dist_release}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
-
-Patch0:  qtsvg-opensource-src-5.6.0-beta1-example-install.patch
+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: qt5-rpm-macros
+BuildRequires: qt5-srpm-macros
 BuildRequires: qt5-qtbase-devel >= %{version}
-BuildRequires: pkgconfig(zlib)
+BuildRequires: zlib-devel
 
 BuildRequires: qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
@@ -63,8 +63,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
-%patch0 -p1
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 %build
 mkdir %{_target_platform}
@@ -101,7 +100,7 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%license LICENSE.LGPL*
+%license LICENSE.*
 %{_qt5_libdir}/libQt5Svg.so.5*
 %{_qt5_plugindir}/iconengines/libqsvgicon.so
 %{_qt5_plugindir}/imageformats/libqsvg.so
@@ -130,6 +129,9 @@ popd
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 

+ 96 - 88
q/qt5-qttools/qt5-qttools-vl.spec

@@ -1,4 +1,4 @@
-#global system_clucene 1
+%bcond_with docs
 
 ## set to 1 to enable bootstrap
 #global bootstrap 1
@@ -8,15 +8,17 @@
 # only primary archs (for now), allow secondary to bootstrap
 %if ! 0%{?bootstrap}
 %ifarch %{arm} %{ix86} x86_64
-%define docs 1
+%if %{with docs}
+#define docs 1
+%endif
 %endif
 %endif
 
 #define prerelease
 
 %global qt_module qttools
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - QtTool components
@@ -25,14 +27,12 @@ Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 
 License: LGPLv3 or LGPLv2
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
-
-Patch1: qttools-opensource-src-5.3.2-system-clucene.patch
+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
 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893
@@ -46,47 +46,52 @@ Source22: linguist.desktop
 Source23: qdbusviewer.desktop
 
 BuildRequires: cmake
+BuildRequires: qt5-rpm-macros
+BuildRequires: qt5-srpm-macros
 BuildRequires: desktop-file-utils
 ## optional (and deprecated), include in bootstrapping only for now
 %if ! 0%{?bootstrap}
-BuildRequires: pkgconfig(Qt5WebKit)
-%global webkit 1
+#BuildRequires: pkgconfig(Qt5WebKit)
+#global webkit 1
 %endif
 BuildRequires: qt5-qtbase-static >= %{version}
 BuildRequires: qt5-qtdeclarative-static >= %{version}
 
-%if 0%{?system_clucene}
-BuildRequires: clucene09-core-devel >= 0.9.21b-12
+%if 0%{?bootstrap}
+%global no_examples CONFIG-=compile_examples
+Obsoletes: %{name}-examples < %{version}-%{release}
+%else
+# for qdoc
+BuildRequires: clang-devel llvm-devel
 %endif
 
 Requires: %{name}-common = %{version}-%{release}
 
 %{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
 
-# when -libs were split out, for multilib upgrade path
-Obsoletes: qt5-tools < 5.4.0-0.2
-
 %description
 %{summary}.
 
 %package common
 Summary: Common files for %{name}
 BuildArch: noarch
+Obsoletes: qt5-qttools-libs-clucene < 5.9.0
+%if ! 0%{?webkit}
+Obsoletes: qt5-designer-plugin-webkit < 5.9.0
+%endif
 %description common
 %{summary}.
 
 %package devel
 Summary: Development files for %{name}
 Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs-clucene%{?_isa} = %{version}-%{release}
 Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
 Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
 Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
-Requires: qt5-qtbase-devel%{?_isa}
-Requires: qt5-qdoc = %{version}-%{release}
-Requires: qt5-qhelpgenerator = %{version}-%{release}
+Requires: qt5-doctools = %{version}-%{release}
 Requires: qt5-designer = %{version}-%{release}
 Requires: qt5-linguist = %{version}-%{release}
+Requires: qt5-qtbase-devel%{?_isa}
 %description devel
 %{summary}.
 
@@ -96,35 +101,21 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 %description static
 %{summary}.
 
-%package libs-clucene
-Summary: Qt5 CLucene runtime library
-Requires: %{name}-common = %{version}-%{release}
-# when split happened
-Conflicts: qt5-tools < 5.4.0-0.2
-%description libs-clucene
-%{summary}.
-
 %package libs-designer
 Summary: Qt5 Designer runtime library
 Requires: %{name}-common = %{version}-%{release}
-# when split happened
-Conflicts: qt5-tools < 5.4.0-0.2
 %description libs-designer
 %{summary}.
 
 %package libs-designercomponents
 Summary: Qt5 Designer Components runtime library
 Requires: %{name}-common = %{version}-%{release}
-# when split happened
-Conflicts: qt5-tools < 5.4.0-0.2
 %description libs-designercomponents
 %{summary}.
 
 %package libs-help
 Summary: Qt5 Help runtime library
 Requires: %{name}-common = %{version}-%{release}
-# when split happened
-Conflicts: qt5-tools < 5.4.0-0.2
 %description libs-help
 %{summary}.
 
@@ -141,11 +132,14 @@ Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
 %description -n qt5-designer
 %{summary}.
 
+%if 0%{?webkit}
 %package -n qt5-designer-plugin-webkit
 Summary: Qt5 designer plugin for WebKit
+BuildRequires: pkgconfig(Qt5WebKitWidgets)
 Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
 %description -n qt5-designer-plugin-webkit
 %{summary}.
+%endif
 
 %package -n qt5-linguist
 Summary: Qt5 Linguist Tools
@@ -161,16 +155,17 @@ Requires: %{name}-common = %{version}-%{release}
 QDbusviewer can be used to inspect D-Bus objects of running programs
 and invoke methods on those objects.
 
-%package -n qt5-qhelpgenerator
-Summary: Qt5 Help generator tool
-Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
-%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
-%description -n qt5-qhelpgenerator
-
-%package -n qt5-qdoc
-Summary: Qt5 documentation generator
-Requires: %{name}%{?_isa} = %{version}-%{release}
-%description -n qt5-qdoc
+%package -n qt5-doctools
+Summary: Qt5 doc tools package
+Provides: qt5-qdoc = %{version}
+Obsoletes: qt5-qdoc < 5.8.0
+Provides: qt5-qhelpgenerator = %{version}
+Obsoletes: qt5-qhelpgenerator < 5.8.0
+Provides: qt5-qtattributionsscanner = %{version}
+Obsoletes: qt5-qtattributionsscanner < 5.8.0
+Requires: qt5-qtattributionsscanner = %{version}
+
+%description -n qt5-doctools
 %{summary}.
 
 %if 0%{?docs}
@@ -193,20 +188,14 @@ Requires: %{name}-common = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
-
-%if 0%{?system_clucene}
-%patch1 -p1 -b .system_clucene
-# bundled libs
-rm -rf src/assistant/3rdparty/clucene
-%endif
+%setup -q -n %{qt_module}-everywhere-src-%{version}
 %patch2 -p1 -b .qmake-qt5
 
 
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{qmake_qt5} ..
+%{qmake_qt5} %{?no_examples} ..
 
 make %{?_smp_mflags}
 
@@ -233,7 +222,7 @@ desktop-file-install \
 # icons
 install -m644 -p -D src/assistant/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant-qt5.png
 install -m644 -p -D src/assistant/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant-qt5.png
-install -m644 -p -D src/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/designer-qt5.png
+install -m644 -p -D src/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/designer-qt5.png
 install -m644 -p -D src/qdbus/qdbusviewer/images/qdbusviewer.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/qdbusviewer-qt5.png
 install -m644 -p -D src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qdbusviewer-qt5.png
 # linguist icons
@@ -247,7 +236,7 @@ mkdir %{buildroot}%{_bindir}
 pushd %{buildroot}%{_qt5_bindir}
 for i in * ; do
   case "${i}" in
-   assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo)
+   assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo|qtattributionsscanner)
       ln -v  ${i} %{buildroot}%{_bindir}/${i}-qt5
       ln -sv ${i} ${i}-qt5
       ;;
@@ -275,7 +264,6 @@ sed -i -e 's| Qt5UiPlugin||g' %{buildroot}%{_qt5_libdir}/pkgconfig/Qt5Designer.p
 
 
 ## work-in-progress... -- rex
-%if 0%{?fedora} || 0%{?rhel} > 6
 %check
 # verify validity of Qt5Designer.pc
 export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
@@ -283,12 +271,22 @@ pkg-config --print-requires --print-requires-private Qt5Designer
 export CMAKE_PREFIX_PATH=%{buildroot}%{_qt5_prefix}:%{buildroot}%{_prefix}
 export PATH=%{buildroot}%{_qt5_bindir}:%{_qt5_bindir}:$PATH
 export LD_LIBRARY_PATH=%{buildroot}%{_qt5_libdir}
-mkdir tests/auto/cmake/%{_target_platform}
+mkdir -p tests/auto/cmake/%{_target_platform}
 pushd tests/auto/cmake/%{_target_platform}
 cmake ..
 ctest --output-on-failure ||:
 popd
-%endif
+
+# check icon resolutions
+pushd %{buildroot}%{_datadir}/icons
+for RES in $(ls hicolor); do
+  for APP in designer assistant linguist qdbusviewer; do
+    if [ -e hicolor/$RES/apps/${APP}*.* ]; then
+      file hicolor/$RES/apps/${APP}*.* | grep "$(echo $RES | sed 's/x/ x /')"
+    fi
+  done
+done
+popd
 
 
 %files
@@ -301,11 +299,6 @@ popd
 %files common
 %license LICENSE.LGPL*
 
-%post   libs-clucene -p /sbin/ldconfig
-%postun libs-clucene -p /sbin/ldconfig
-%files  libs-clucene
-%{_qt5_libdir}/libQt5CLucene.so.5*
-
 %post   libs-designer -p /sbin/ldconfig
 %postun libs-designer -p /sbin/ldconfig
 %files  libs-designer
@@ -340,6 +333,28 @@ fi
 %{_datadir}/applications/*assistant.desktop
 %{_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
+%{_bindir}/qdoc*
+%{_qt5_bindir}/qdoc*
+%{_bindir}/qdistancefieldgenerator*
+%{_bindir}/qhelpgenerator*
+%{_qt5_bindir}/qdistancefieldgenerator*
+%{_qt5_bindir}/qhelpgenerator*
+%{_bindir}/qtattributionsscanner-qt5
+%{_qt5_bindir}/qtattributionsscanner*
+
 %post -n qt5-designer
 touch --no-create %{_datadir}/icons/hicolor ||:
 
@@ -358,19 +373,6 @@ fi
 %{_qt5_bindir}/designer*
 %{_datadir}/applications/*designer.desktop
 %{_datadir}/icons/hicolor/*/apps/designer*.*
-%dir %{_qt5_libdir}/cmake/Qt5Designer/
-%{_qt5_plugindir}/designer/libqquickwidget.so
-%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake
-%if ! 0%{?bootstrap}
-%{_qt5_plugindir}/designer/libcontainerextension.so
-%{_qt5_plugindir}/designer/libcustomwidgetplugin.so
-%{_qt5_plugindir}/designer/libtaskmenuextension.so
-%{_qt5_plugindir}/designer/libworldtimeclockplugin.so
-%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake
-%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake
-%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake
-%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake
-%endif
 %if 0%{?webkit}
 %files -n qt5-designer-plugin-webkit
 %{_qt5_plugindir}/designer/libqwebview.so
@@ -427,43 +429,40 @@ fi
 %{_datadir}/applications/*qdbusviewer.desktop
 %{_datadir}/icons/hicolor/*/apps/qdbusviewer*.*
 
-%files -n qt5-qdoc
-%{_bindir}/qdoc*
-%{_qt5_bindir}/qdoc*
-
-%files -n qt5-qhelpgenerator
-%{_bindir}/qhelpgenerator*
-%{_qt5_bindir}/qhelpgenerator*
-
 %files devel
 %{_bindir}/pixeltool*
 %{_bindir}/qcollectiongenerator*
-%{_bindir}/qhelpconverter*
+#{_bindir}/qhelpconverter*
 %{_bindir}/qtdiag*
 %{_bindir}/qtplugininfo*
 %{_qt5_bindir}/pixeltool*
 %{_qt5_bindir}/qtdiag*
 %{_qt5_bindir}/qcollectiongenerator*
-%{_qt5_bindir}/qhelpconverter*
+#{_qt5_bindir}/qhelpconverter*
 %{_qt5_bindir}/qtplugininfo*
-%{_qt5_headerdir}/QtCLucene/
 %{_qt5_headerdir}/QtDesigner/
 %{_qt5_headerdir}/QtDesignerComponents/
 %{_qt5_headerdir}/QtHelp/
 %{_qt5_headerdir}/QtUiPlugin
-%{_qt5_libdir}/libQt5CLucene.prl
-%{_qt5_libdir}/libQt5CLucene.so
 %{_qt5_libdir}/libQt5Designer*.prl
 %{_qt5_libdir}/libQt5Designer*.so
 %{_qt5_libdir}/libQt5Help.prl
 %{_qt5_libdir}/libQt5Help.so
+%{_qt5_libdir}/Qt5UiPlugin.la
+%{_qt5_libdir}/libQt5UiPlugin.prl
 %{_qt5_libdir}/cmake/Qt5Designer/Qt5DesignerConfig*.cmake
 %dir %{_qt5_libdir}/cmake/Qt5Help/
 %{_qt5_libdir}/cmake/Qt5Help/Qt5HelpConfig*.cmake
 %{_qt5_libdir}/cmake/Qt5UiPlugin/
 %{_qt5_libdir}/pkgconfig/Qt5Designer.pc
 %{_qt5_libdir}/pkgconfig/Qt5Help.pc
-%{_qt5_archdatadir}/mkspecs/modules/*.pri
+%{_qt5_libdir}/pkgconfig/Qt5UiPlugin.pc
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer_private.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designercomponents_private.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_help.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_help_private.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri
 
 %files static
 %{_qt5_headerdir}/QtUiTools/
@@ -471,6 +470,8 @@ fi
 %{_qt5_libdir}/libQt5UiTools.prl
 %{_qt5_libdir}/cmake/Qt5UiTools/
 %{_qt5_libdir}/pkgconfig/Qt5UiTools.pc
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri
 
 %if 0%{?docs}
 %files doc
@@ -492,9 +493,16 @@ fi
 %if ! 0%{?bootstrap}
 %files examples
 %{_qt5_examplesdir}/
+%{_qt5_plugindir}/designer/*
+%dir %{_qt5_libdir}/cmake/Qt5Designer
+%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_*
 %endif
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+- dropped Patch1.
+
 * Tue Jan 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.6.3-1
 - new upstream release.
 

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

@@ -3,8 +3,8 @@
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - QtTranslations module
@@ -13,16 +13,17 @@ Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 
 License: LGPLv2 with exceptions or GPLv3 with exceptions and GFDL
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
 
 BuildArch: noarch
 %global _qt5_qmake %{_bindir}/qmake-qt5
 
+BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-qtbase-devel >= %{version}
 # for lrelease
 BuildRequires: qt5-linguist
@@ -39,6 +40,7 @@ Provides: %{_qt5}-fa = %{version}-%{release}
 Provides: %{_qt5}-fi = %{version}-%{release}
 Provides: %{_qt5}-fr = %{version}-%{release}
 Provides: %{_qt5}-gl = %{version}-%{release}
+Provides: %{_qt5}-gd = %{version}-%{release}
 Provides: %{_qt5}-he = %{version}-%{release}
 Provides: %{_qt5}-hu = %{version}-%{release}
 Provides: %{_qt5}-it = %{version}-%{release}
@@ -62,7 +64,7 @@ Provides: %{_qt5}-zh_TW = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
 %build
@@ -78,8 +80,9 @@ make install INSTALL_ROOT=%{buildroot}
 
 
 %files
-%doc LICENSE.LGPL* LGPL_EXCEPTION.txt
+%license LICENSE.*
 %lang(ar) %{_qt5_translationdir}/*_ar.qm
+%lang(bg) %{_qt5_translationdir}/*_bg.qm
 %lang(ca) %{_qt5_translationdir}/*_ca.qm
 %lang(cs) %{_qt5_translationdir}/*_cs.qm
 %lang(da) %{_qt5_translationdir}/*_da.qm
@@ -89,6 +92,7 @@ make install INSTALL_ROOT=%{buildroot}
 %lang(fa) %{_qt5_translationdir}/*_fa.qm
 %lang(fi) %{_qt5_translationdir}/*_fi.qm
 %lang(fr) %{_qt5_translationdir}/*_fr.qm
+%lang(gl) %{_qt5_translationdir}/*_gd.qm
 %lang(gl) %{_qt5_translationdir}/*_gl.qm
 %lang(he) %{_qt5_translationdir}/*_he.qm
 %lang(hu) %{_qt5_translationdir}/*_hu.qm
@@ -109,6 +113,9 @@ make install INSTALL_ROOT=%{buildroot}
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 

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

@@ -1,11 +1,11 @@
 %global qt_module qtwebchannel
 
-%define docs 1
+#define docs 1
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - WebChannel component
@@ -16,21 +16,22 @@ Release: 1%{?_dist_release}
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://doc.qt.io/qt-5/licensing.html
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url: http://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
 
 BuildRequires: cmake
+BuildRequires: qt5-rpm-macros
+BuildRequires: qt5-srpm-macros
 BuildRequires: qt5-qtbase-devel >= %{version}
-BuildRequires: qt5-qtdeclarative-devel >= %{version}
-# Qt5WebSockets package is optional and only needed for some examples
-BuildRequires: qt5-qtwebsockets-devel
-
 BuildRequires: qt5-qtbase-private-devel
+#libQt5Core.so.5(Qt_5_PRIVATE_API)(64bit)
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+BuildRequires: qt5-qtdeclarative-devel
+BuildRequires: qt5-qtwebsockets-devel
 
 %description
 The Qt WebChannel module provides a library for seamless integration of C++
@@ -64,7 +65,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
 %build
@@ -107,7 +108,7 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%license LICENSE.GPL* LICENSE.LGPL*
+%license LICENSE.*
 %{_qt5_libdir}/libQt5WebChannel.so.5*
 %{_qt5_archdatadir}/qml/QtWebChannel/
 
@@ -134,6 +135,9 @@ popd
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Tue Jan 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.6.3-1
 - new upstream release.
 

+ 224 - 98
q/qt5-qtwebengine/qt5-qtwebengine-vl.spec

@@ -7,109 +7,121 @@
 # 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
+#global docs 1
 %endif
 
 %if 0
-# need libvpx >= 1.4.0
+# need libvpx >= 1.8.0
 %global use_system_libvpx 1
 %endif
-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0
 # need libwebp >= 0.4.3
 %global use_system_libwebp 1
 %endif
 
 #global prerelease rc
 
+# spellchecking dictionary directory
+%global _qtwebengine_dictionaries_dir %{_qt5_datadir}/qtwebengine_dictionaries
+
+%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+
 # exclude plugins (all architectures) and libv8.so (i686, it's static everywhere
 # else)
 %global __provides_exclude ^lib.*plugin\\.so.*|libv8\\.so$
 # exclude libv8.so (i686, it's static everywhere else)
 %global __requires_exclude ^libv8\\.so$
+# and designer plugins
+%global __provides_exclude_from ^%{_qt5_plugindir}/.*\\.so$
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - QtWebEngine components
 Name:    qt5-qtwebengine
 Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
 # The other licenses are from Chromium and the code it bundles
 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:     http://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
-# wget http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtwebengine-opensource-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
-Source0: %{qt_module}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}-clean.tar.xz
+Source0: %{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}-clean.tar.xz
 
 # cleanup scripts used above
 Source1: clean_qtwebengine.sh
 Source2: clean_ffmpeg.sh
 Source3: get_free_ffmpeg_source_files.py
+# macros
+Source10: macros.qt5-qtwebengine
 
-# some tweaks to linux.pri (system libs, link libpci, run unbundling script)
-Patch1:  qtwebengine-opensource-src-5.6.3-linux-pri.patch
+# pulseaudio headers
+Source20: pulseaudio-12.2-headers.tar.gz
+
+# some tweaks to linux.pri (system yasm, link libpci, run unbundling script)
+Patch0:  qtwebengine-everywhere-src-5.10.0-linux-pri.patch
 # quick hack to avoid checking for the nonexistent icudtl.dat and silence the
 # resulting warnings - not upstreamable as is because it removes the fallback
 # mechanism for the ICU data directory (which is not used in our builds because
 # we use the system ICU, which embeds the data statically) completely
-Patch2:  qtwebengine-opensource-src-5.6.0-no-icudtl-dat.patch
+Patch1:  qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
 # fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE, needed to detect the
 # ARM flags with our %%qmake_qt5 macro, including for the next patch
-Patch3:  qtwebengine-opensource-src-5.6.0-beta-fix-extractcflag.patch
-# use the system NSPR prtime (based on Debian patch)
-# We already depend on NSPR, so it is useless to copy these functions here.
-# Debian uses this just fine, and I don't see relevant modifications either.
-Patch5:  qtwebengine-opensource-src-5.6.3-system-nspr-prtime.patch
-# use the system ICU UTF functions
-# We already depend on ICU, so it is useless to copy these functions here.
-# I checked the history of that directory, and other than the renames I am
-# undoing, there were no modifications at all. Must be applied after Patch5.
-Patch6:  qtwebengine-opensource-src-5.7.0-system-icu-utf.patch
-# do not require SSE2 on i686
-# cumulative revert of upstream reviews 187423002, 308003004, 511773002 (parts
-# relevant to QtWebEngine only), 516543004, 1152053004 and 1161853008, along
-# with some custom fixes and improvements
-# also build V8 shared and twice on i686 (once for x87, once for SSE2)
-Patch7:  qtwebengine-opensource-src-5.7.0-no-sse2.patch
-
-
-# to build with icu > 59
-Patch1000: qtwebengine-5.7.1-icu-59.patch
-Patch1001: qtwebengine-5.6.3-icu60.patch
-
-# the architectures theoretically supported by the version of V8 used (#1298011)
-# You may need some minor patching to build on one of the secondary
-# architectures, e.g., to add to the Qt -> Chromium -> V8 arch translations.
-# If you cannot get this package to build on your secondary architecure, please:
-# * remove your architecture from this list AND
-# * put #1298011 onto your ExcludeArch tracker.
-ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el
-
-BuildRequires: qt5-qtbase-devel >= %{version}
+Patch2:  qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch
+# disable NEON vector instructions on ARM where the NEON code FTBFS due to
+# GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495
+Patch3:  qtwebengine-opensource-src-5.9.0-no-neon.patch
+# workaround FTBFS against kernel-headers-5.2.0+
+Patch4:  qtwebengine-SIOCGSTAMP.patch
+# remove Android dependencies from openmax_dl ARM NEON detection (detect.c)
+Patch10: qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
+# Force verbose output from the GN bootstrap process
+Patch21: qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
+# Fix/workaround FTBFS on aarch64 with newer glibc
+Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
+
+
+# fix build error with libicu-65
+Patch1000: qtwebengine-icu65.patch
+
+# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches
+ExclusiveArch: %{qt5_qtwebengine_arches}
+
+BuildRequires: qt5-rpm-macros
+BuildRequires: qt5-srpm-macros
+BuildRequires: qt5-qtbase-devel
 BuildRequires: qt5-qtbase-private-devel
 # TODO: check of = is really needed or if >= would be good enough -- rex
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
-BuildRequires: qt5-qtdeclarative-devel >= %{version}
-BuildRequires: qt5-qtxmlpatterns-devel >= %{version}
-BuildRequires: qt5-qtlocation-devel >= %{version}
-BuildRequires: qt5-qtsensors-devel >= %{version}
-BuildRequires: qt5-qtwebchannel-devel >= %{version}
-BuildRequires: qt5-qttools-static >= %{version}
+BuildRequires: qt5-qtdeclarative-devel
+BuildRequires: qt5-qtxmlpatterns-devel
+BuildRequires: qt5-qtlocation-devel
+BuildRequires: qt5-qtsensors-devel
+BuildRequires: qt5-qtwebchannel-devel
+BuildRequires: qt5-qttools-static
+# for examples?
+BuildRequires: qt5-qtquickcontrols2-devel
 BuildRequires: ninja
+BuildRequires: cmake
 BuildRequires: bison
-BuildRequires: git
+BuildRequires: flex
+BuildRequires: gcc-c++
+# gn links statically (for now)
+BuildRequires: libstdc++-static
+BuildRequires: git-core
 BuildRequires: gperf
+BuildRequires: krb5-devel
 BuildRequires: libicu-devel
-BuildRequires: libjpeg-devel
+BuildRequires: libjpeg-turbo-devel
 #BuildRequires: re2-devel
 BuildRequires: snappy-devel
 %ifarch %{ix86} x86_64
@@ -122,21 +134,19 @@ BuildRequires: pkgconfig(fontconfig)
 BuildRequires: pkgconfig(freetype2)
 BuildRequires: pkgconfig(gl)
 BuildRequires: pkgconfig(egl)
+BuildRequires: pkgconfig(jsoncpp)
 BuildRequires: pkgconfig(libpng)
 BuildRequires: pkgconfig(libudev)
 %if 0%{?use_system_libwebp}
-BuildRequires: pkgconfig(libwebp) >= 0.4.3
+BuildRequires: pkgconfig(libwebp) >= 0.6.0
 %endif
 BuildRequires: pkgconfig(harfbuzz)
-BuildRequires: pkgconfig(jsoncpp)
-BuildRequires: pkgconfig(protobuf)
 BuildRequires: pkgconfig(libdrm)
-BuildRequires: pkgconfig(opus)
+BuildRequires: opus-devel
+BuildRequires: pkgconfig(protobuf)
 BuildRequires: pkgconfig(libevent)
-BuildRequires: pkgconfig(zlib)
+BuildRequires: zlib-devel
 #BuildRequires: pkgconfig(minizip)
-BuildRequires: pkgconfig(libxml-2.0)
-BuildRequires: pkgconfig(libxslt)
 BuildRequires: pkgconfig(x11)
 BuildRequires: pkgconfig(xi)
 BuildRequires: libXcursor-devel
@@ -154,11 +164,12 @@ BuildRequires: pkgconfig(alsa)
 BuildRequires: pciutils-devel
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(nss)
-BuildRequires: pkgconfig(libsrtp)
+BuildRequires: pkgconfig(lcms2)
 BuildRequires: perl
 BuildRequires: python
+BuildRequires: python-rpm-macros
 %if 0%{?use_system_libvpx}
-BuildRequires: pkgconfig(vpx) >= 1.4.0
+BuildRequires: pkgconfig(vpx) >= 1.7.0
 %endif
 
 # extra (non-upstream) functions needed, see
@@ -180,7 +191,7 @@ BuildRequires: pkgconfig(vpx) >= 1.4.0
 # not a library, but forked (modified) application code.
 # Some security fixes are backported, see:
 # http://code.qt.io/cgit/qt/qtwebengine-chromium.git/log/?h=45-based
-Provides: bundled(chromium) = 45
+Provides: bundled(chromium) = 61.0.3163.140
 
 # Bundled in src/3rdparty/chromium/third_party:
 # Check src/3rdparty/chromium/third_party/*/README.chromium for version numbers,
@@ -199,38 +210,51 @@ Provides: bundled(brotli)
 # Don't get too excited. MPEG and other legally problematic stuff is stripped
 # out. See clean_qtwebengine.sh, clean_ffmpeg.sh, and process_ffmpeg_gyp.py.
 # see src/3rdparty/chromium/third_party/ffmpeg/Changelog for the version number
-Provides: bundled(ffmpeg) = 2.7
+Provides: bundled(ffmpeg) = 3.3
+Provides: bundled(hunspell) = 1.6.0
 Provides: bundled(iccjpeg)
 # bundled as "khronos", headers only
 Provides: bundled(khronos_headers)
 # bundled as "leveldatabase"
-Provides: bundled(leveldb) = r80
-Provides: bundled(libjingle) = 9564
+Provides: bundled(leveldb) = 1.20
+# bundled as "libjingle_xmpp"
+Provides: bundled(libjingle)
+# see src/3rdparty/chromium/third_party/libsrtp/CHANGES for the version number
+Provides: bundled(libsrtp) = 2.1.0
 %if !0%{?use_system_libvpx}
-Provides: bundled(libvpx) = 1.4.0
+# claims "Version: 1.6.0", but according to the fine print, this is actually a
+# snapshot from master from after the 1.6.1 release
+Provides: bundled(libvpx) = 1.6.1
 %endif
 %if !0%{?use_system_libwebp}
-Provides: bundled(libwebp) = 0.4.3
+Provides: bundled(libwebp) = 0.6.0
 %endif
+# bundled as "libxml"
+# see src/3rdparty/chromium/third_party/libxml/linux/include/libxml/xmlversion.h
+
+Provides: bundled(libxml2) = 2.9.4
+# see src/3rdparty/chromium/third_party/libxslt/linux/config.h for version
+Provides: bundled(libxslt) = 1.1.29
 Provides: bundled(libXNVCtrl) = 302.17
-Provides: bundled(libyuv) = 1444
+Provides: bundled(libyuv) = 1658
 Provides: bundled(modp_b64)
-Provides: bundled(mojo)
-# headers only
-Provides: bundled(npapi)
 Provides: bundled(openmax_dl) = 1.0.2
 Provides: bundled(ots)
+# see src/3rdparty/chromium/third_party/protobuf/CHANGES.txt for the version
+#Provides: bundled(protobuf) = 3.0.0-0.1.beta3
 Provides: bundled(qcms) = 4
-Provides: bundled(sfntly) = 0-0.1.svn111
+Provides: bundled(sfntly)
 Provides: bundled(skia)
 # bundled as "smhasher"
 Provides: bundled(SMHasher) = 0-0.1.svn147
-Provides: bundled(sqlite) = 3.8.7.4
-Provides: bundled(usrsctp) = 0-0.1.svn9045
+Provides: bundled(sqlite) = 3.20
+Provides: bundled(usrsctp)
 Provides: bundled(webrtc) = 90
+
 %ifarch %{ix86} x86_64
+# bundled by ffmpeg and libvpx:
 # header (for assembly) only
-Provides: bundled(x86inc) = 0
+Provides: bundled(x86inc)
 %endif
 
 # Bundled in src/3rdparty/chromium/base/third_party:
@@ -259,10 +283,14 @@ Provides: bundled(mozilla_security_manager) = 1.9.2
 Provides: bundled(nsURLParsers)
 
 # Bundled outside of third_party, apparently not considered as such by Chromium:
+
+Provides: bundled(mojo)
 # see src/3rdparty/chromium/v8/include/v8_version.h for the version number
-Provides: bundled(v8) = 4.5.103.35
-# bundled by v8 (src/3rdparty/chromium/v8/src/third_party/fdlibm)
-# see src/3rdparty/chromium/v8/src/third_party/fdlibm/README.v8 for the version
+Provides: bundled(v8) = 6.1.534.44
+# bundled by v8 (src/3rdparty/chromium/v8/src/base/ieee754.cc)
+# The version number is 5.3, the last version that upstream released, years ago:
+
+# http://www.netlib.org/fdlibm/readme
 Provides: bundled(fdlibm) = 5.3
 
 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
@@ -276,9 +304,17 @@ Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
 Requires: qt5-qtdeclarative-devel%{?_isa}
+# not arch'd for now, see if can get away with avoiding multilib'ing -- rex
+Requires: %{name}-devtools = %{version}-%{release}
 %description devel
 %{summary}.
 
+%package devtools
+Summary: WebEngine devtools_resources
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description devtools
+Support for remote debugging.
+
 %package examples
 Summary: Example files for %{name}
 
@@ -298,40 +334,79 @@ BuildArch: noarch
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
+
+%if 0
+tar xvf %{SOURCE20}
+mv pulse src/3rdparty/chromium/
+%endif
+
+%patch0 -p1 -b .linux-pri
+%patch1 -p1 -b .no-icudtl-dat
+%patch2 -p1 -b .fix-extractcflag
+%if !0%{?arm_neon}
+%patch3 -p1 -b .no-neon
+%endif
+%patch4 -p1 -b .SIOCGSTAMP
+
+## upstream patches
 
-%patch1 -p1 -b .linux-pri
-%patch2 -p1 -b .no-icudtl-dat
-%patch3 -p1 -b .fix-extractcflag
-%patch5 -p1 -b .system-nspr-prtime
-%patch6 -p1 -b .system-icu-utf
-%patch7 -p1 -b .no-sse2
+%patch10 -p1 -b .openmax-dl-neon
+## NEEDSWORK
+#patch21 -p1 -b .gn-bootstrap-verbose
+%patch24 -p1 -b .aarch64-new-stat
+
+# enable to build with libicu-65
+%patch1000 -p1 -b .icu65
 
-%patch1000 -p1 -b .icu59
-%patch1001 -p1 -b .icu60
 
 # fix // in #include in content/renderer/gpu to avoid debugedit failure
-sed -i -e 's!gpu//!gpu/!g' \
-  src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc
+#sed -i -e 's!gpu//!gpu/!g' \
+#  src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc
+# and another one in 2 files in WebRTC
+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_sse2.cc
 # 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
+# delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
+# never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS
+sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \
+  src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
 
 # http://bugzilla.redhat.com/1337585
 # can't just delete, but we'll overwrite with system headers to be on the safe side
-#cp -bv /usr/include/re2/*.h src/3rdparty/chromium/third_party/re2/re2/
+#cp -bv /usr/include/re2/*.h src/3rdparty/chromium/third_party/re2/src/re2/
+
+%if 0
+#ifarch x86_64
+# enable this to force -g2 on x86_64 (most arches run out of memory with -g2)
+# DISABLED BECAUSE OF:
+# /usr/lib/rpm/find-debuginfo.sh: line 188:  3619 Segmentation fault
+# (core dumped) eu-strip --remove-comment $r $g -f "$1" "$2"
+sed -i -e 's/symbol_level=1/symbol_level=2/g' src/core/config/common.pri
+%endif
+
+# generate qtwebengine-3rdparty.qdoc, it is missing from the tarball
+pushd src/3rdparty
+%{__python} chromium/tools/licenses.py \
+  --file-template ../../tools/about_credits.tmpl \
+  --entry-template ../../tools/about_credits_entry.tmpl \
+  credits >../webengine/doc/src/qtwebengine-3rdparty.qdoc
+popd
+
+# copy the Chromium license so it is installed with the appropriate name
+cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium
 
-#ifnarch x86_64
-# most arches run out of memory with full debuginfo, so use -g1 on non-x86_64
-sed -i -e 's/=-g$/=-g1/g' src/core/gyp_run.pro
-#endif
 
 %build
 export STRIP=strip
-export NINJAFLAGS="-v %{_smp_mflags}"
+export NINJAFLAGS="%{?__ninja_common_opts}"
 export NINJA_PATH=%{_bindir}/ninja-build
 export RE2_INCLUDE=$(pwd)/src/3rdparty/chromium/third_party/re2
+
 export CFLAGS="%{optflags}"
 #ifnarch x86_64
 # most arches run out of memory with full debuginfo, so use -g1 on non-x86_64
@@ -343,11 +418,15 @@ export CXXFLAGS="%{optflags} -fno-delete-null-pointer-checks"
 export CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ -g / -g1 /g'`
 #endif
 
-
 mkdir %{_target_platform}
 pushd %{_target_platform}
 
-%{qmake_qt5} CONFIG+="webcore_debug v8base_debug force_debug_info" WEBENGINE_CONFIG+="use_system_icu use_system_protobuf" ..
+%{qmake_qt5} \
+  %{?debug_config:CONFIG+="%{debug_config}"} \
+  CONFIG+="link_pulseaudio" \
+  QMAKE_EXTRA_ARGS+="-system-webengine-icu" \
+  QMAKE_EXTRA_ARGS+="-webengine-kerberos" \
+  ..
 
 # if we keep these set here, gyp picks up duplicate flags
 unset CFLAGS
@@ -364,12 +443,31 @@ make %{?_smp_mflags} docs
 popd
 
 %install
+rm -rf %{buildroot}
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 %if 0%{?docs}
 make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 %endif
 
+# rpm macros
+install -p -m644 -D %{SOURCE10} \
+  %{buildroot}%{rpm_macros_dir}/macros.qt5-qtwebengine
+sed -i \
+  -e "s|@@NAME@@|%{name}|g" \
+  -e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \
+  -e "s|@@VERSION@@|%{version}|g" \
+  -e "s|@@EVR@@|%{?epoch:%{epoch:}}%{version}-%{release}|g" \
+  %{buildroot}%{rpm_macros_dir}/macros.qt5-qtwebengine
+
+# hardlink files to {_bindir}
+mkdir -p %{buildroot}%{_bindir}
+pushd %{buildroot}%{_qt5_bindir}
+for i in * ; do
+  ln -v  ${i} %{buildroot}%{_bindir}/${i}
+done
+popd
+
 ## .prl/.la file love
 # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
 pushd %{buildroot}%{_qt5_libdir}
@@ -382,19 +480,39 @@ for prl_file in libQt5*.prl ; do
 done
 popd
 
+# explicitly omit, at least until there's a real library installed associated with it -- rex
+rm -fv %{buildroot}%{_libdir}/Qt5WebEngineCore.la
+
+mkdir -p %{buildroot}%{_qtwebengine_dictionaries_dir}
+
+# adjust cmake dep(s) to allow for using the same Qt5 that was used to build it
+# using the lesser of %%version, %%_qt5_version
+%global lesser_version $(echo -e "%{version}\\n%{_qt5_version}" | sort -V | head -1)
+sed -i -e "s|%{version} \${_Qt5WebEngine|%{lesser_version} \${_Qt5WebEngine|" \
+  %{buildroot}%{_qt5_libdir}/cmake/Qt5WebEngine*/Qt5WebEngine*Config.cmake
+
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
+%license LICENSE.* src/webengine/doc/src/qtwebengine-3rdparty.qdoc
 %{_qt5_libdir}/libQt5*.so.*
+%{_bindir}/qwebengine_convert_dict
+%{_qt5_bindir}/qwebengine_convert_dict
 %{_qt5_libdir}/qt5/qml/*
 %{_qt5_libdir}/qt5/libexec/QtWebEngineProcess
-%ifarch %{ix86}
+#ifarch %{ix86}
+%if 0%{?sse2}
 # shared V8 library and its SSE2 version
 %{_qt5_libdir}/qtwebengine/
 %endif
 %{_qt5_plugindir}/designer/libqwebengineview.so
-%{_qt5_datadir}/resources/
+%dir %{_qt5_datadir}/resources/
+%{_qt5_datadir}/resources/qtwebengine_resources_100p.pak
+%{_qt5_datadir}/resources/qtwebengine_resources_200p.pak
+%{_qt5_datadir}/resources/qtwebengine_resources.pak
+%dir %{_qtwebengine_dictionaries_dir}
 %dir %{_qt5_translationdir}/qtwebengine_locales
 %lang(am) %{_qt5_translationdir}/qtwebengine_locales/am.pak
 %lang(ar) %{_qt5_translationdir}/qtwebengine_locales/ar.pak
@@ -451,13 +569,18 @@ popd
 %lang(zh_TW) %{_qt5_translationdir}/qtwebengine_locales/zh-TW.pak
 
 %files devel
+%{rpm_macros_dir}/macros.qt5-qtwebengine
 %{_qt5_headerdir}/Qt*/
 %{_qt5_libdir}/libQt5*.so
 %{_qt5_libdir}/libQt5*.prl
+#{_qt5_libdir}/Qt5WebEngineCore.la
 %{_qt5_libdir}/cmake/Qt5*/
 %{_qt5_libdir}/pkgconfig/Qt5*.pc
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
 
+%files devtools
+%{_qt5_datadir}/resources/qtwebengine_devtools_resources.pak
+
 %files examples
 %{_qt5_examplesdir}/
 
@@ -468,6 +591,9 @@ popd
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Nov 16 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-2
 - rebuild with libevent-2.1.8
 

+ 12 - 7
q/qt5-qtwebsockets/qt5-qtwebsockets-vl.spec

@@ -1,12 +1,12 @@
 
 %global qt_module qtwebsockets
 
-%define docs 1
+#define docs 1
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - WebSockets component
@@ -21,9 +21,11 @@ Url: http://qt-project.org/
 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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
 
-BuildRequires:  cmake
+BuildRequires: cmake
+BuildRequires: qt5-rpm-macros
+BuildRequires: qt5-srpm-macros
 BuildRequires:  qt5-qtbase-devel >= %{version}
 BuildRequires:  qt5-qtdeclarative-devel >= %{version}
 
@@ -60,7 +62,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %{summary}.
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
 %build
@@ -103,7 +105,7 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%license LICENSE.LGPL*
+%license LICENSE.*
 %{_qt5_libdir}/libQt5WebSockets.so.5*
 %{_qt5_archdatadir}/qml/Qt/WebSockets/
 
@@ -130,6 +132,9 @@ popd
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Tue Jan 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.6.3-1
 - new upstream release.
 

+ 11 - 7
q/qt5-qtx11extras/qt5-qtx11extras-vl.spec

@@ -1,12 +1,12 @@
 
 %global qt_module qtx11extras
 
-%define docs 1
+#define docs 1
 
 #define prerelease
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - X11 support library
@@ -21,11 +21,12 @@ 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}-opensource-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: qt5-rpm-macros
+BuildRequires: qt5-srpm-macros
 BuildRequires: qt5-qtbase-devel >= %{version}
-
 BuildRequires: qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 
@@ -54,7 +55,7 @@ BuildArch: noarch
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 %build
 mkdir %{_target_platform}
@@ -92,7 +93,7 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%license LGPL_EXCEPTION.txt LICENSE.LGPL*
+%license LICENSE.GPL3-EXCEPT LICENSE.LGPL* LICENSE.GPL*
 %{_qt5_libdir}/libQt5X11Extras.so.5*
 
 %files devel
@@ -112,6 +113,9 @@ popd
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> - 5.6.3-1
 - update to 5.6.3
 

+ 17 - 8
q/qt5-qtxmlpatterns/qt5-qtxmlpatterns-vl.spec

@@ -10,14 +10,14 @@
 
 %if ! 0%{?bootstrap}
 %ifarch %{arm} %{ix86} x86_64
-%define docs 1
+#define docs 1
 %endif
 %endif
 
 #define prerelease rc
 
-%global qt5_minorver 5.6
-%global qt5_version 5.6.3
+%global qt5_minorver 5.12
+%global qt5_version 5.12.5
 #global qt5_patchlevel 1
 
 Summary: Qt5 - QtXmlPatterns component
@@ -26,14 +26,16 @@ Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
 Release: 1%{?_dist_release}
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://www.qt.io
+Url:     https://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}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
 
 BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: qt5-rpm-macros >= %{version}
 BuildRequires: qt5-qtbase-devel >= %{version}
 
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
@@ -69,7 +71,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt5_version}
 
 
 %build
@@ -92,7 +94,7 @@ make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 %endif
 
-# put non-conflicting binaries with -qt5 postfix in %{_bindir}
+# put non-conflicting binaries with -qt5 postfix in {_bindir}
 mkdir %{buildroot}%{_bindir}
 pushd %{buildroot}%{_qt5_bindir}
 for i in * ; do
@@ -128,8 +130,12 @@ popd
 /sbin/ldconfig
 
 %files
-%license LICENSE.LGPL* LGPL_EXCEPTION.txt
+%license LICENSE.LGPL*
 %{_qt5_libdir}/libQt5XmlPatterns.so.5*
+# consider subpkg to make boostrapping easier? -- rex
+%if 0%{?qml}
+%{_qt5_archdatadir}/qml/QtQuick/XmlListModel/
+%endif
 
 %files devel
 %{_qt5_bindir}/xmlpatterns*
@@ -155,6 +161,9 @@ popd
 
 
 %changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-1
+- new upstream release.
+
 * Tue Jan 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.6.3-1
 - new upstream release.
 

+ 265 - 0
q/qt5/qt5-vl.spec

@@ -0,0 +1,265 @@
+%bcond_with deps
+
+Name: qt5
+Version: 5.12.5
+Release: 2%{?_dist_release}
+Summary: Qt5 meta package
+License: GPLv3
+URL: https://getfedora.org/
+Source0: macros.qt5
+Source1: macros.qt5-srpm
+Source2: qmake-qt5.sh
+BuildArch: noarch
+
+Requires: qt5-qdbusviewer
+Requires: qt5-qt3d
+Requires: qt5-qtbase
+Requires: qt5-qtbase-gui
+Requires: qt5-qtbase-mysql
+Requires: qt5-qtbase-postgresql
+Requires: qt5-qtconnectivity
+#Requires: qt5-qtdeclarative
+Requires: qt5-qtdoc
+Requires: qt5-qtgraphicaleffects
+Requires: qt5-qtimageformats
+Requires: qt5-qtlocation
+Requires: qt5-qtmultimedia
+Requires: qt5-qtquickcontrols
+Requires: qt5-qtquickcontrols2
+#Requires: qt5-qtscript
+Requires: qt5-qtsensors
+Requires: qt5-qtserialport
+Requires: qt5-qtsvg
+Requires: qt5-qttools
+#Requires: qt5-qtwayland
+Requires: qt5-qtwebchannel
+Requires: qt5-qtwebengine
+#Requires: qt5-qtwebkit
+Requires: qt5-qtwebsockets
+Requires: qt5-qtx11extras
+Requires: qt5-qtxmlpatterns
+
+%description
+%{summary}.
+
+%package devel
+Summary: Qt5 meta devel package
+Requires: qt5-rpm-macros
+Requires: qt5-qttools-static
+#Requires: qt5-qtdeclarative-static
+Requires: qt5-qtbase-static
+Requires: qt5-designer
+Requires: qt5-qdoc
+Requires: qt5-qhelpgenerator
+Requires: qt5-linguist
+Requires: qt5-qt3d-devel
+Requires: qt5-qtbase-devel
+Requires: qt5-qtconnectivity-devel
+#Requires: qt5-qtdeclarative-devel
+#Requires: qt5-qtenginio-devel
+Requires: qt5-qtlocation-devel
+Requires: qt5-qtmultimedia-devel
+#Requires: qt5-qtscript-devel
+Requires: qt5-qtsensors-devel
+Requires: qt5-qtserialport-devel
+Requires: qt5-qtsvg-devel
+Requires: qt5-qttools-devel
+#Requires: qt5-qtwayland-devel
+Requires: qt5-qtwebchannel-devel
+Requires: qt5-qtwebengine-devel
+#Requires: qt5-qtwebkit-devel
+Requires: qt5-qtwebsockets-devel
+Requires: qt5-qtx11extras-devel
+Requires: qt5-qtxmlpatterns-devel
+
+%description devel
+%{summary}.
+
+%package rpm-macros
+Summary: RPM macros for building Qt5 packages
+Conflicts: qt5-qtbase-devel < 5.12.0
+Requires: cmake >= 3
+Requires: gcc-c++
+%description rpm-macros
+%{summary}.
+
+%package srpm-macros
+Summary: RPM macros for source Qt5 packages
+%description srpm-macros
+%{summary}.
+
+
+%install
+install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5
+install -Dpm644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5-srpm
+install -Dpm755 %{SOURCE2} %{buildroot}%{_bindir}/qmake-qt5.sh
+mkdir -p %{buildroot}%{_datadir}/qt5/wrappers
+ln -s %{_bindir}/qmake-qt5.sh %{buildroot}%{_datadir}/qt5/wrappers/qmake-qt5
+ln -s %{_bindir}/qmake-qt5.sh %{buildroot}%{_datadir}/qt5/wrappers/qmake
+
+# substitute custom flags, and the path to binaries: binaries referenced from
+# macros should not change if an application is built with a different prefix.
+# %_libdir is left as /usr/%{_lib} (e.g.) so that the resulting macros are
+# architecture independent, and don't hardcode /usr/lib or /usr/lib64.
+sed -i \
+  -e "s|@@QT5_CFLAGS@@|%{?qt5_cflags}|g" \
+  -e "s|@@QT5_CXXFLAGS@@|%{?qt5_cxxflags}|g" \
+  -e "s|@@QT5_RPM_LD_FLAGS@@|%{?qt5_rpm_ld_flags}|g" \
+  -e "s|@@QT5_RPM_OPT_FLAGS@@|%{?qt5_rpm_opt_flags}|g" \
+  -e "s|@@QMAKE@@|%{_prefix}/%%{_lib}/qt5/bin/qmake|g" \
+  -e "s|@@QMAKE_QT5_WRAPPER@@|%{_bindir}/qmake-qt5.sh|g" \
+  %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5
+
+%if %{with deps}
+mkdir -p %{buildroot}%{_docdir}/qt5
+mkdir -p %{buildroot}%{_docdir}/qt5-devel
+echo "- Qt5 meta package" > %{buildroot}%{_docdir}/qt5/README
+echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README
+%endif
+
+%if %{with deps}
+%files
+%{_docdir}/qt5/README
+
+%files devel
+%{_docdir}/qt5-devel/README
+%endif
+
+%files rpm-macros
+%{_rpmconfigdir}/macros.d/macros.qt5
+%{_bindir}/qmake-qt5.sh
+%{_datadir}/qt5/wrappers/
+
+%files srpm-macros
+%{_rpmconfigdir}/macros.d/macros.qt5-srpm
+
+
+%changelog
+* Sun Oct 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.5-2
+- initial build for Vine Linux.
+
+* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
+- 5.12.5
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jun 11 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-1
+- 5.12.4
+
+* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.3-1
+- 5.12.3
+
+* Thu Feb 14 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-1
+- 5.12.1
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Dec 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-1
+- 5.11.3
+
+* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.2-1
+- 5.11.2
+
+* Tue Aug 21 2018 Owen Taylor <otaylor@redhat.com> - 5.11.1-4
+- rpm-macros: always refer to binaries in their installed location, even if %%_libdir
+  and %%_bindir are redefined.
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 29 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-2
+- %%_qt5_prefix=%%_prefix (was %%_libdir/qt5}
+
+* Tue Jun 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1
+- 5.11.1
+
+* Sat Jun 02 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-2
+- rpm-macros: do not define _qt5_archdatadir, _qt5_bindir in terms of _qt5_prefix anymore
+
+* Sat May 26 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-1
+- 5.11.0
+
+* Wed Mar 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-1
+- 5.10.1
+- rpm-macros: Requires: gcc-c++
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.10.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jan 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.0-4
+- macros.qt5: fix path to qmake-qt5.sh wrapper
+
+* Wed Jan 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.0-3
+- use noarch-friendly paths for qmake-qt5.sh wrapper
+
+* Wed Jan 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.0-2
+- provide qmake-qt5.sh wrapper and new macro: %%qmake_qt5_wrapper
+
+* Wed Jan 03 2018 Rex Dieter <rdieter@fedoraproject.org> 5.10.0-1
+- 5.10.0
+
+* Wed Jan 03 2018 Rex Dieter <rdieter@fedoraproject.org> 5.9.3-1
+- 5.9.3
+
+* Tue Oct 10 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-1
+- 5.9.2
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Jul 19 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-1
+- 5.9.1
+
+* Thu Jun 01 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.0-2
+- drop -fno-delete-null-pointer-checks hack/workaround
+
+* Sat Apr 15 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-1
+- Up to match upcoming 5.9.0
+
+* Fri Mar 31 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-3
+- rebuild
+
+* Fri Jan 27 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-1
+- Tie to new upstream release
+
+* Mon Jan 02 2017 Rex Dieter <rdieter@math.unl.edu> - 5.7.1-2
+- drop Requires: qt5-gstreamer qt5-qtacountsservice qt5-qtconfiguration (not from qtproject.org)
+
+* Wed Nov 09 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.1-1
+- Prepare for new release
+
+* Tue Sep 27 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.0-10
+- s/%%rhel/%%epel/ , cmake3 is only available in epel
+
+* Wed Sep 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.0-9
+- install the right macros.qt5-srpm file
+
+* Wed Sep 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.0-8
+- introduce -srpm-macros (initially defines %%qt5_qtwebengine_arches)
+- -devel: drop Requires: qt5-qtwebengine-devel (since not all archs are supported)
+
+* Sat Jul 23 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.0-7
+- drop Requires: qt5-qtwebengine (not available on all archs)
+
+* Tue Jul 12 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-6
+- Fix macros with invalid substitutions.
+
+* Wed Jul 06 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-5
+- Fix typo. Thanks to Diego Herrera.
+- Add macro qt5_includedir as more logical than headerdir. Old one still available
+
+* Mon Jul 04 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-4
+- Clang is not default anymore. End of experimentation phase
+
+* Wed Jun 15 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-3
+- Move package to be qt5 and create meta packages
+- Add new macro for qml dir
+
+* Mon Jun 13 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-2
+- Test repositories using clang by default
+
+
+* Thu Jun 09 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-1
+- Decouple macros from main qtbase package

+ 93 - 31
s/sip/sip-vl.spec

@@ -13,21 +13,26 @@
 # trim changelog included in binary rpms
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
-Name: 		sip
-Summary: 	Python/C++ Bindings Generator
-Summary(ja): 	Python/C++ インターフェイス生成ツール
-Version: 	4.18
-Release: 	1%{?_dist_release}
+Name:           sip
+Summary:        Python/C++ Bindings Generator
+Summary(ja):    Python/C++ インターフェイス生成ツール
+Version:        4.19.19
+Release:        1%{?_dist_release}
+Group:          Development/Tools
+
+# sipgen/parser.{c.h} is GPLv3+ with exceptions (bison)
+License:        GPLv2 or GPLv3 and (GPLv3+ with exceptions)
+URL:            https://www.riverbankcomputing.co.uk/software/sip/intro
+Source0:        https://www.riverbankcomputing.com/static/Downloads/sip/%{version}/sip-%{version}%{?snap:.%{snap}}.tar.gz
 
-License:	GPLv2 or GPLv3
-Group:		Development/Tools
-URL:		http://www.riverbankcomputing.co.uk/software/sip/intro
+# extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines
+Source1: macros.sip
+%global _sip_api_major 12
+%global _sip_api_minor 7
+%global _sip_api %{_sip_api_major}.%{_sip_api_minor}
 
-Source0:  http://downloads.sourceforge.net/pyqt/sip-%{version}%{?snap:-snapshot-%{snap}}.tar.gz
+Source10: sip-wrapper.sh
 
-## upstream patches
-Patch1: sip-4.18-diamond_inheritance.patch
-Patch2: sip-4.18-shadow_build.patch
 
 ## upstreamable patches
 # make install should not strip (by default), kills -debuginfo
@@ -35,19 +40,15 @@ Patch50: sip-4.18-no_strip.patch
 # try not to rpath the world
 Patch51: sip-4.18-no_rpath.patch
 
-# extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines
-Source1: macros.sip
-%global _sip_api_major 11
-%global _sip_api_minor 3
-%global _sip_api %{_sip_api_major}.%{_sip_api_minor}
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Provides: sip-api(%{_sip_api_major}) = %{_sip_api}
 Provides: sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
 
 BuildRequires:	python3-devel
+BuildRequires:	python3-rpm-macros
 BuildRequires:	python-devel
+BuildRequires:	python-rpm-macros
 BuildRequires:	sed
 
 Vendor:		Project Vine
@@ -79,6 +80,15 @@ This package contains files needed to generate Python bindings for any C++
 classes library.
 
 
+%package pyqt5-sip
+Summary: %summary
+Provides: python-pyqt5-sip-api(%{_sip_api_major}) = %{_sip_api}
+Provides: python-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
+%{?python_provide:%python_provide python-pyqt5-sip}
+%description pyqt5-sip
+%{summary}
+
+
 %package macros
 Summary: RPM macros for use when working with SIP
 Requires: rpm
@@ -122,12 +132,18 @@ This package contains files needed to generate Python 3 bindings for any C++
 classes library.
 
 
+%package -n python3-pyqt5-sip
+Summary: SIP - Python 3/C++ Bindings Generator for pyqt5
+BuildRequires: python3-devel
+Provides: python3-pyqt5-sip-api(%{_sip_api_major}) = %{_sip_api}
+Provides: python3-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
+%description -n python3-pyqt5-sip
+This is the Python 3 build of pyqt5-SIP.
+
+
 %prep
 %setup -q
 
-%patch1 -p1 -b .diamond_inheritance
-%patch2 -p1 -b .shadow_build
-
 %patch50 -p1 -b .no_strip
 %patch51 -p1 -b .no_rpath
 
@@ -143,7 +159,6 @@ mkdir %{_target_platform}-python3
 pushd %{_target_platform}-python3
 %{__python3} ../configure.py \
   -d %{python3_sitearch} \
-  --sipdir=%{_datadir}/python3-sip \
   CXXFLAGS="${OPT_FLAGS}" CFLAGS="${OPT_FLAGS}" LFLAGS="%{?__global_ldflags}"
 
 make %{?_smp_mflags} 
@@ -158,6 +173,26 @@ pushd %{_target_platform}
 make %{?_smp_mflags}
 popd
 
+mkdir %{_target_platform}-python2-pyqt5
+pushd %{_target_platform}-python2-pyqt5
+%{__python} ../configure.py \
+  --sip-module=PyQt5.sip \
+  -b %{_bindir} -d %{python_sitearch} -e %{_includedir}/python%{python_version} \
+  CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}"
+
+make %{?_smp_mflags}
+popd
+
+mkdir %{_target_platform}-python3-pyqt5
+pushd %{_target_platform}-python3-pyqt5
+%{__python3} ../configure.py \
+  --sip-module=PyQt5.sip \
+  -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version}m \
+  CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}"
+
+make %{?_smp_mflags}
+popd
+
 
 %install
 rm -rf %{buildroot}
@@ -165,6 +200,8 @@ rm -rf %{buildroot}
 # Perform the Python 3 installation first, to avoid stomping over the Python 2
 # /usr/bin/sip:
 make install DESTDIR=%{buildroot} -C %{_target_platform}-python3
+make install DESTDIR=%{buildroot} -C %{_target_platform}-python3-pyqt5
+
 mkdir -p %{buildroot}%{_datadir}/python3-sip
 mv %{buildroot}%{_bindir}/sip %{buildroot}%{_bindir}/python3-sip
 
@@ -174,6 +211,12 @@ mkdir -p %{buildroot}%{python3_sitearch}/__pycache__/exclude_rpm_hack
 
 # Python 2 installation:
 make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install DESTDIR=%{buildroot} -C %{_target_platform}-python2-pyqt5
+
+# sip-wrapper
+install %{SOURCE10} %{buildroot}%{_bindir}/sip-pyqt5
+sed -i -e 's|@SIP_MODULE@|PyQt5.sip|g' %{buildroot}%{_bindir}/sip-pyqt5
+
 mkdir -p %{buildroot}%{_datadir}/sip
 
 # Macros used by -devel subpackages:
@@ -188,13 +231,23 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS README
 %license LICENSE LICENSE-GPL2 LICENSE-GPL3
 %{python_sitearch}/sip.so
-%{python_sitearch}/sip*.py*
+%{_datadir}/sip/
+%{python_sitearch}/*.dist-info
 
 %files devel
-%defattr(-, root, root, 755)
 %{_bindir}/sip
-%{_datadir}/sip/
+%{_bindir}/sip-pyqt5
+%{_bindir}/python3-sip
+%defattr(-, root, root, 755)
 %{python_inc}/sip.h
+%{python_sitearch}/sip*.py*
+
+%files pyqt5-sip
+%doc NEWS README
+%license LICENSE LICENSE-GPL2 LICENSE-GPL3
+%dir %{python_sitearch}/PyQt5/
+%{python_sitearch}/PyQt5/sip.*
+%{python_sitearch}/PyQt5_sip-%{version}.dist-info/
 
 %files macros
 %{rpm_macros_dir}/macros.sip
@@ -202,20 +255,29 @@ rm -rf $RPM_BUILD_ROOT
 %files -n python3-sip
 %doc NEWS README
 %license LICENSE LICENSE-GPL2 LICENSE-GPL3
-%{python3_sitearch}/sip.so
-%{python3_sitearch}/sip*.py*
-%{python3_sitearch}/__pycache__/*
-%exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack
+%{python3_sitearch}/sip.*
+%{python3_sitearch}/*.dist-info
 
 %files -n python3-sip-devel
 # Note that the "sip" binary is invoked by name in a few places higher up
 # in the KDE-Python stack; these will need changing to "python3-sip":
-%{_bindir}/python3-sip
-%{_datadir}/python3-sip/
 %{python3_inc}/sip.h
+%{python3_sitearch}/sip*.py*
+%{python3_sitearch}/__pycache__/*
+%exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack
+
+%files -n python3-pyqt5-sip
+%doc NEWS README
+%license LICENSE LICENSE-GPL2 LICENSE-GPL3
+%dir %{python3_sitearch}/PyQt5/
+%{python3_sitearch}/PyQt5/sip.*
+%{python3_sitearch}/PyQt5_sip-%{version}.dist-info/
 
 
 %changelog
+* Tue Oct 22 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.19-1
+- new upstream release.
+
 * Tue Jul 12 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.18-1
 - new upstream release.