From b07af82eb880ba7014c9330d81e3ad5aecc35725 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 29 Mar 2024 18:36:10 +0100 Subject: [PATCH] automatic version update by autodist [release 24.02.1-1mamba;Mon Mar 25 2024] --- README.md | 2 +- ....1-disable-hunspell-dictionary-build.patch | 11 --- konqueror.spec | 69 ++++++++++--------- 3 files changed, 38 insertions(+), 44 deletions(-) delete mode 100644 konqueror-21.12.1-disable-hunspell-dictionary-build.patch diff --git a/README.md b/README.md index 6adc2c8..997c1bf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # konqueror -KDE Frameworks 5 web browser. +KDE web browser. diff --git a/konqueror-21.12.1-disable-hunspell-dictionary-build.patch b/konqueror-21.12.1-disable-hunspell-dictionary-build.patch deleted file mode 100644 index 1c279e2..0000000 --- a/konqueror-21.12.1-disable-hunspell-dictionary-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- konqueror-21.12.1/CMakeLists.txt.orig 2022-01-08 14:36:00.875739406 +0100 -+++ konqueror-21.12.1/CMakeLists.txt 2022-01-08 14:37:19.107298797 +0100 -@@ -36,7 +36,7 @@ - - find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Activities DocTools) # Optional - --find_package(Hunspell) -+#find_package(Hunspell) - - if(NOT Qt5WebEngineWidgets_VERSION VERSION_LESS "5.13.0") - add_definitions(-DWEBENGINE_PDF_VIEWER) diff --git a/konqueror.spec b/konqueror.spec index bd817bd..21e821f 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -1,16 +1,15 @@ %define majver %(echo %version | cut -d. -f1-2) Name: konqueror -Version: 23.08.5 +Version: 24.02.1 Release: 1mamba -Summary: KDE Frameworks 5 web browser +Summary: KDE web browser Group: Graphical Desktop/Applications/Internet Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://kde.org/ -Source: https://download.kde.org/stable/release-service/%{version}/src/konqueror-%{version}.tar.xz -Patch0: konqueror-21.12.1-disable-hunspell-dictionary-build.patch +Source: https://download.kde.org/%{stable_kde6}/release-service/%{version}/src/konqueror-%{version}.tar.xz License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -57,14 +56,14 @@ BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel ## AUTOBUILDREQ-END BuildRequires: cmake -BuildRequires: rpm-macros-kde5 +BuildRequires: kf6-rpm-macros BuildRequires: extra-cmake-modules Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Provides: konqueror-plugins Obsoletes: konqueror-plugins < 21.04.0 %description -KDE Frameworks 5 web browser. +KDE web browser. %package -n lib%{name} Group: System/Libraries @@ -87,21 +86,21 @@ This package contains libraries and header files for developing applications tha %prep %setup -q -#%patch 0 -p1 %build -%cmake_kde5 -d build \ +%cmake_kf6 \ + -DBUILD_WITH_QT6=OFF \ -DBUILD_TESTING=OFF \ -DUSE_SYSTEM_DICTIONARIES=ON \ -DWEBENGINEPART_DICTIONARY_DIR=%{_datadir}/qt/qtwebengine_dictionaries -%make +%cmake_build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall -C build +%cmake_install -%find_lang %{name}5_qt --with-qt --with-html --all-name || touch %{name}5_qt.lang +%find_lang %{name} --with-qt --with-html --all-name || touch %{name}.lang %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -109,7 +108,7 @@ This package contains libraries and header files for developing applications tha %post -n lib%{name} -p /sbin/ldconfig %postun -n lib%{name} -p /sbin/ldconfig -%files -f %{name}5_qt.lang +%files -f %{name}.lang %defattr(-,root,root) %{_sysconfdir}/xdg/autostart/konqy_preload.desktop %{_sysconfdir}/xdg/translaterc @@ -127,14 +126,10 @@ This package contains libraries and header files for developing applications tha %dir %{_datadir}/konqsidebartng %dir %{_datadir}/konqsidebartng/entries %{_datadir}/konqsidebartng/entries/*.desktop -%dir %{_datadir}/konqsidebartng/plugins -%{_datadir}/konqsidebartng/plugins/*.desktop -%{_datadir}/kxmlgui5/fsview/fsview_part.rc %{_datadir}/kcmcss/template.css %{_datadir}/kconf_update/webenginepart.upd %{_datadir}/kcontrol/pics/onlyone.png %{_datadir}/kcontrol/pics/overlapping.png -%{_kde5_datadir}/kf5/kbookmark/directory_bookmarkbar.desktop %dir %{_datadir}/konqueror %dir %{_datadir}/konqueror/about %{_datadir}/konqueror/about/* @@ -145,8 +140,9 @@ This package contains libraries and header files for developing applications tha %dir %{_datadir}/konqueror/pics %{_datadir}/konqueror/pics/* %{_datadir}/kservices5/*.desktop +%{_kde5_datadir}/kf5/kbookmark/directory_bookmarkbar.desktop +%{_datadir}/kio_bookmarks/kio_bookmarks.css %{_datadir}/webenginepart/* -%{_datadir}/kxmlgui5/webenginepart/webenginepart.rc %{_datadir}/qlogging-categories5/fsview.categories %{_datadir}/qlogging-categories5/akregatorplugin.categories %{_datadir}/qlogging-categories5/konqueror.categories @@ -155,33 +151,42 @@ This package contains libraries and header files for developing applications tha %files -n lib%{name} %defattr(-,root,root) -%{_kde5_libdir}/libKF5Konq.so.* +%{_kf6_libdir}/libKF5Konq.so.* %{_libdir}/libkdeinit5_kfmclient.so %{_libdir}/libkdeinit5_konqueror.so %{_libdir}/libkonquerorprivate.so.* %{_libdir}/libkonqsidebarplugin.so.* %{_libdir}/libkwebenginepart.so -%{_libdir}/qt5/plugins/*.so -%{_libdir}/qt5/plugins/kf5/parts/*.so -%{_libdir}/qt5/plugins/kf5/kfileitemaction/akregatorplugin.so -%{_libdir}/qt5/plugins/dolphinpart/kpartplugins/*.so -%{_libdir}/qt5/plugins/khtml/kpartplugins/*.so -%{_libdir}/qt5/plugins/konqueror/kpartplugins/searchbarplugin.so -%{_libdir}/qt5/plugins/kwebkitpart/kpartplugins/*.so -%{_libdir}/qt5/plugins/webenginepart/kpartplugins/*.so -%dir %{_libdir}/qt5/plugins/konqueror_kcms -%{_libdir}/qt5/plugins/konqueror_kcms/*.so +%{_libdir}/qt6/plugins/*.so +%{_libdir}/qt6/plugins/kf5/parts/*.so +%{_libdir}/qt6/plugins/kf5/kfileitemaction/akregatorplugin.so +%{_libdir}/qt6/plugins/dolphinpart/kpartplugins/*.so +%{_libdir}/qt6/plugins/khtml/kpartplugins/*.so +%{_libdir}/qt6/plugins/konqueror/kpartplugins/searchbarplugin.so +%{_libdir}/qt6/plugins/kwebkitpart/kpartplugins/*.so +%{_libdir}/qt6/plugins/webenginepart/kpartplugins/*.so +%{_qt6_plugindir}/kf5/kio/bookmarks.so +%{_qt6_plugindir}/konqueror/sidebar/konqsidebar_*.so +%dir %{_libdir}/qt6/plugins/konqueror_kcms +%{_libdir}/qt6/plugins/konqueror_kcms/*.so %doc LICENSES %files -n lib%{name}-devel %defattr(-,root,root) -%{_includedir}/konqsidebarplugin.h -%{_kde5_includedir}/*.h +%{_kde5_includedir}/asyncselectorinterface.h +%{_kde5_includedir}/konq*.h +%{_kde5_includedir}/libkonq_export.h %{_libdir}/libkonqsidebarplugin.so -%{_kde5_libdir}/libKF5Konq.so -%{_kde5_libdir}/cmake/KF5Konq/KF5Konq*.cmake +%{_kf6_libdir}/libKF5Konq.so +%{_kf6_libdir}/cmake/KF5Konq/KF5Konq*.cmake %changelog +* Mon Mar 25 2024 Automatic Build System 24.02.1-1mamba +- automatic version update by autodist + +* Thu Mar 07 2024 Automatic Build System 24.02.0-1mamba +- automatic version update by autodist + * Fri Feb 16 2024 Automatic Build System 23.08.5-1mamba - automatic version update by autodist