Accepting request 1068721 from KDE:Qt:5.15
Drop support for systems without SSE2 to fix boo#1208188. RFC, not built yet (forwarded request 1068677 from favogt) OBS-URL: https://build.opensuse.org/request/show/1068721 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=138
This commit is contained in:
commit
d300c3c276
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 2 11:52:49 UTC 2023 - Fabian Vogt <fvogt@suse.com>
|
||||||
|
|
||||||
|
- Drop the mechanism for supporting systems without SSE2. glibc removed
|
||||||
|
support for looking up libraries in sse2/ subdirectories and
|
||||||
|
qtdeclarative without SSE2 crashes Plasma (boo#1208188)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jan 9 09:14:59 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
|
Mon Jan 9 09:14:59 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
@ -850,11 +850,6 @@ sed -i -e 's|^\(QMAKE_STRIP.*=\).*$|\1|g' mkspecs/common/linux.conf
|
|||||||
-translationdir %{libqt5_translationdir} \
|
-translationdir %{libqt5_translationdir} \
|
||||||
-verbose \
|
-verbose \
|
||||||
-no-reduce-relocations \
|
-no-reduce-relocations \
|
||||||
%ifarch %ix86
|
|
||||||
%if 0%{?sle_version} < 150000
|
|
||||||
-no-sse2 -no-pch \
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
-accessibility \
|
-accessibility \
|
||||||
-no-strip \
|
-no-strip \
|
||||||
-opensource \
|
-opensource \
|
||||||
@ -909,20 +904,6 @@ make %{?_smp_mflags}
|
|||||||
%install
|
%install
|
||||||
make INSTALL_ROOT=%{buildroot} install
|
make INSTALL_ROOT=%{buildroot} install
|
||||||
|
|
||||||
%ifarch %ix86
|
|
||||||
%if 0%{?sle_version} < 150000
|
|
||||||
install -d %{buildroot}%{libqt5_libdir}/sse2/
|
|
||||||
|
|
||||||
pushd src/corelib; make clean ; ../../bin/qmake -config sse2; make %{?_smp_mflags}
|
|
||||||
cp -av ../../lib/libQt5Core.so.* %{buildroot}%{libqt5_libdir}/sse2/
|
|
||||||
popd
|
|
||||||
|
|
||||||
pushd src/gui; ../../bin/qmake -config sse2; make %{?_smp_mflags}
|
|
||||||
cp -av ../../lib/libQt5Gui.so.* %{buildroot}%{libqt5_libdir}/sse2/
|
|
||||||
popd
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
|
|
||||||
install -D -m644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5
|
install -D -m644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5
|
||||||
# argggh, qmake is such a piece of <censored>
|
# argggh, qmake is such a piece of <censored>
|
||||||
find %{buildroot}%{libqt5_libdir} -type f -name '*prl' -exec perl -pi -e "s, -L$RPM_BUILD_DIR/\S+,,g" {} +
|
find %{buildroot}%{libqt5_libdir} -type f -name '*prl' -exec perl -pi -e "s, -L$RPM_BUILD_DIR/\S+,,g" {} +
|
||||||
@ -1039,12 +1020,6 @@ install -Dm644 %{SOURCE4} %{buildroot}%{libqt5_datadir}/qtlogging.ini
|
|||||||
%license LICENSE.*
|
%license LICENSE.*
|
||||||
%doc *.txt
|
%doc *.txt
|
||||||
%{libqt5_libdir}/libQt5Core.so.*
|
%{libqt5_libdir}/libQt5Core.so.*
|
||||||
%ifarch %ix86
|
|
||||||
%if 0%{?sle_version} < 150000
|
|
||||||
%dir %{libqt5_libdir}/sse2
|
|
||||||
%{libqt5_libdir}/sse2/libQt5Core.so.*
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
%dir %{libqt5_datadir}
|
%dir %{libqt5_datadir}
|
||||||
%{libqt5_datadir}/qtlogging.ini
|
%{libqt5_datadir}/qtlogging.ini
|
||||||
|
|
||||||
@ -1193,11 +1168,6 @@ install -Dm644 %{SOURCE4} %{buildroot}%{libqt5_datadir}/qtlogging.ini
|
|||||||
%license LICENSE.*
|
%license LICENSE.*
|
||||||
%doc *.txt
|
%doc *.txt
|
||||||
%{libqt5_libdir}/libQt5Gui.so.*
|
%{libqt5_libdir}/libQt5Gui.so.*
|
||||||
%ifarch %ix86
|
|
||||||
%if 0%{?sle_version:%sle_version} < 150000
|
|
||||||
%{libqt5_libdir}/sse2/libQt5Gui.so.*
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
%{libqt5_libdir}/libQt5EglFSDeviceIntegration.so.*
|
%{libqt5_libdir}/libQt5EglFSDeviceIntegration.so.*
|
||||||
%{libqt5_libdir}/libQt5EglFsKmsSupport.so.*
|
%{libqt5_libdir}/libQt5EglFsKmsSupport.so.*
|
||||||
%{libqt5_libdir}/libQt5XcbQpa.so.*
|
%{libqt5_libdir}/libQt5XcbQpa.so.*
|
||||||
|
Loading…
Reference in New Issue
Block a user