diff --git a/konqueror-18.04.3.tar.xz b/konqueror-18.04.3.tar.xz deleted file mode 100644 index 691b102..0000000 --- a/konqueror-18.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82bd99ef6ca21700fc7e96d934a2265300099174728a192e3799ce53fe1e5c23 -size 7694900 diff --git a/konqueror-18.08.0.tar.xz b/konqueror-18.08.0.tar.xz new file mode 100644 index 0000000..28fa577 --- /dev/null +++ b/konqueror-18.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98fdef25eeac3fa27a7ee06fd7fb7d0e569afa48155e14e1db65b05adf22fc8b +size 7691636 diff --git a/konqueror.changes b/konqueror.changes index 7c77962..3264c40 100644 --- a/konqueror.changes +++ b/konqueror.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Thu Aug 16 22:05:54 UTC 2018 - christophe@krop.fr + +- Update to 18.08.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.08.0.php +- Changes since 18.07.80: + * None + +------------------------------------------------------------------- +Sat Jul 28 22:49:31 UTC 2018 - wbauer@tmo.at + +- Build with gcc7 on Leap 42.3, it doesn't compile with 4.8 anymore + +------------------------------------------------------------------- +Thu Jul 26 13:00:51 UTC 2018 - lbeltrame@kde.org + +- Update to 18.07.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.07.80.php +- Changes since 18.04.3: + * Restore the ability to view man and info pages from Konqueror + * Display an error page for error URLs in WebEnginePart + * Do not duplicate work of KAboutData::setupCommandLine() + * Akregator feed detector plugin: Use new connect() syntax + * Akregator feed detector plugin: Make PluginBase just a namespace + * Akregator feed detector plugin: Restore the popup menu action + * Akregator feed detector plugin: Port away from KDELibs4Support + * Akregator feed detector plugin: Do not crash for an invalid URL + * Fix test failure once D12206 lands + * Fix test failure when D11569 lands + ------------------------------------------------------------------- Fri Jul 13 04:50:03 UTC 2018 - lbeltrame@kde.org diff --git a/konqueror.spec b/konqueror.spec index 876ecb6..55e4749 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -19,11 +19,11 @@ %bcond_without lang Name: konqueror -Version: 18.04.3 +Version: 18.08.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) -%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} # It can only build on the same platforms as Qt Webengine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64 Summary: KDE File Manager and Browser @@ -54,6 +54,15 @@ BuildRequires: pkgconfig(Qt5Script) >= 5.2.0 BuildRequires: pkgconfig(Qt5WebEngine) >= 5.6.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 +# Needed for 42.3 +%if 0%{?suse_version} < 1330 +# It does not build with the default compiler (GCC 4.8) on Leap 42.x +%if 0%{?sle_version} < 120300 +BuildRequires: gcc6-c++ +%else +BuildRequires: gcc7-c++ +%endif +%endif Recommends: dolphin-part Recommends: kwebkitpart Obsoletes: kde-baseapps5-libkonq < %{version} @@ -65,9 +74,7 @@ Provides: %{name}-libkonq = %{version} Obsoletes: kdebase4-libkonq Obsoletes: libKF5Konq6 < 17.04 Provides: libKF5Konq6 = 17.04 -%if %{with lang} Recommends: %{name}-lang -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -109,14 +116,22 @@ Provides: libkonq-devel = %{version} %description devel Development package for the konqueror libraries. -%if %{with lang} %lang_package -%endif %prep %setup -q %build + %if 0%{?suse_version} < 1330 + # It does not build with the default compiler (GCC 4.8) on Leap 42.x + %if 0%{?sle_version} < 120300 + export CC=gcc-6 + export CXX=g++-6 + %else + export CC=gcc-7 + export CXX=g++-7 + %endif + %endif %cmake_kf5 -d build %make_jobs @@ -195,6 +210,8 @@ Development package for the konqueror libraries. %{_kf5_kxmlguidir}/webenginepart/ %{_kf5_plugindir}/kf5/ %{_kf5_servicesdir}/webenginepart.desktop +%dir %{_kf5_sharedir}/webenginepart/ +%{_kf5_sharedir}/webenginepart/error.html %files -n konqueror-plugins %defattr(-,root,root) @@ -243,7 +260,9 @@ Development package for the konqueror libraries. %{_kf5_sharedir}/kwebkitpart/kpartplugins/autorefresh.* %{_kf5_sharedir}/kwebkitpart/kpartplugins/khtmlsettingsplugin.* %{_kf5_servicesdir}/webarchivethumbnail.desktop +%{_kf5_servicesdir}/akregator_konqplugin.desktop %{_kf5_configkcfgdir}/validators.kcfg +%{_kf5_debugdir}/akregatorplugin.categories %config %{_kf5_configdir}/translaterc %dir %{_kf5_sharedir}/dolphinpart %{_kf5_sharedir}/dolphinpart/kpartplugins/