diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index 4c14b2d441bc419ad1c9cddb3bd78480015395ca..7ce432a4da5c6fefa131d3a84937b622b7a1298a 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -39,7 +39,7 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine Version: 6.5.2 -Release: 2 +Release: 3 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -363,28 +363,28 @@ mv pulse src/3rdparty/chromium/ pushd src/3rdparty/chromium popd -%patch1 -p1 -b .SIOCGSTAMP -%patch2 -p1 -b .link-pipewire -%patch3 -p1 -b .aarch64-new-stat -%patch4 -p1 -b .qtwebengine-ffmpeg-first_dts +%patch -P1 -p1 -b .SIOCGSTAMP +%patch -P2 -p1 -b .link-pipewire +%patch -P3 -p1 -b .aarch64-new-stat +%patch -P4 -p1 -b .qtwebengine-ffmpeg-first_dts -%patch50 -p1 -b .fix-build.patch +%patch -P50 -p1 -b .fix-build.patch ## upstream patches -%patch100 -p1 -b .webrtc-dlopen-h264 +%patch -P100 -p1 -b .webrtc-dlopen-h264 ## upstreamable patches -%patch110 -p1 -b .blink-dlopen-h264 -%patch111 -p1 +%patch -P110 -p1 -b .blink-dlopen-h264 +%patch -P111 -p1 -%patch120 -p1 +%patch -P120 -p1 ## Add riscv64 patches -%patch1000 -p0 -d src/3rdparty -%patch1001 -p0 -d src/3rdparty -%patch1002 -p0 -d src/3rdparty -%patch1003 -p0 -d src/3rdparty -%patch1004 -p0 -d src/3rdparty +%patch -P1000 -p0 -d src/3rdparty +%patch -P1001 -p0 -d src/3rdparty +%patch -P1002 -p0 -d src/3rdparty +%patch -P1003 -p0 -d src/3rdparty +%patch -P1004 -p0 -d src/3rdparty # delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we # never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS @@ -443,11 +443,11 @@ export NINJA_PATH=%{__ninja} -DFEATURE_webengine_webrtc_pipewire:BOOL=ON \ -DQT_BUILD_EXAMPLES:BOOL=ON -cmake --build . %{?_smp_mflags} --verbose +%cmake_build %install -DESTDIR="%{buildroot}" cmake --install . +%cmake_install # rpm macros install -p -m644 -D %{SOURCE10} \ @@ -664,6 +664,9 @@ done %changelog +* Wed Nov 20 2024 Funda Wang - 6.5.2-3 +- adopt to new cmake macro + * Fri Apr 12 2024 misaka00251 - 6.5.2-2 - Add support for riscv64