From ab3db52ddc0c554945d42997e428c8161558a023 Mon Sep 17 00:00:00 2001 From: guibuilder_pel7x64builder0 Date: Wed, 15 Dec 2021 22:28:21 +0100 Subject: [PATCH] falkon web browser Signed-off-by: guibuilder_pel7x64builder0 --- SPECS/falkon.spec | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/SPECS/falkon.spec b/SPECS/falkon.spec index 5b8c21f..0967355 100644 --- a/SPECS/falkon.spec +++ b/SPECS/falkon.spec @@ -1,6 +1,6 @@ Name: falkon Version: 3.1.0 -Release: 1%{?dist} +Release: 10%{?dist} Summary: Modern web browser # Files in src/lib/opensearch and src/lib/3rdparty are GPLv2+ @@ -12,6 +12,14 @@ Source0: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{ver # reenable native scrollbars by default (upstream disabled them in 2.1.2) Patch0: falkon-3.1.0-native-scrollbars.patch +## upstream patches +# fix build with Qt 5.14 (missing #include) +# https://commits.kde.org/falkon/bbde5c6955c43bc744ed2c4024598495de908f2a +Patch100: falkon-3.1.0-qt-5.14.patch +# fix build with Qt 5.15 (another missing #include) +# https://commits.kde.org/falkon/2ca83509dbc72dfdfa9cc7103c2b29db31e07f3a +Patch101: falkon-3.1.0-qt-5.15.patch + # handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches %{?qt5_qtwebengine_arches:ExclusiveArch: %{qt5_qtwebengine_arches}} @@ -62,6 +70,7 @@ BuildRequires: kf5-kio-devel BuildRequires: kf5-kcrash-devel BuildRequires: kf5-kcoreaddons-devel BuildRequires: kf5-purpose-devel +BuildRequires: make Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: qupzilla-kwallet < 2.3 @@ -93,6 +102,8 @@ lightweight and fast and offers advanced functions such as %prep %setup -q %patch0 -p1 -b .native-scrollbars +%patch100 -p1 -b .qt-5.14 +%patch101 -p1 -b .qt-5.15 # delete falkon_hellopython and other Python plugins' and falkon_helloqml # translations, we do not package hellopython etc. yet @@ -103,7 +114,7 @@ rm -rf po %build mkdir %{_target_platform} pushd %{_target_platform} -%cmake3 .. +%cmake_kf5 .. -B. popd make %{?_smp_mflags} -C %{_target_platform} @@ -161,6 +172,34 @@ appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.fa %changelog +* Tue Sep 14 2021 Sahana Prasad - 3.1.0-10 +- Rebuilt with OpenSSL 3.0.0 + +* Wed Jul 21 2021 Fedora Release Engineering - 3.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Feb 01 2021 Kevin Kofler - 3.1.0-8 +- Pass -B. to cmake to work around incompatible RPM macro change (#1863525) + +* Tue Jan 26 2021 Fedora Release Engineering - 3.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering - 3.1.0-6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 3.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Kevin Kofler - 3.1.0-4 +- fix FTBFS with Qt 5.14/5.15 due to missing #includes (thanks to loise) + +* Tue Jan 28 2020 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 3.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Mar 22 2019 Kevin Kofler - 3.1.0-1 - update to 3.1.0 (new upstream feature release) - drop upstreamed mixed-versions and password-migration patches