KDE Applications 20.03.80

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/konqueror?expand=0&rev=135

Restore-ability-to-close-tab-by-clicking-on-close-button.patch

@@ -1,74 +0,0 @@
-From 919076fa77a216c7ad592eb7420d78169d8631b7 Mon Sep 17 00:00:00 2001
-From: Stefano Crocco <stefano.crocco@alice.it>
-Date: Sun, 3 Nov 2019 19:15:24 +0100
-Subject: Restore ability to close tab by clicking on close button
-
-Summary:
-After making KTabBar and KTabWidget part of Konqueror, clicking on the close
-button of a tab didn't make the tab close any longer. This fixes it
-
-Test Plan:
-Open several tabs in Konqueror, then click on their close button and
-check that they close. Check that when only one tab remains, the tab bar is
-hidden
-
-Reviewers: dfaure
-
-Reviewed By: dfaure
-
-Differential Revision: https://phabricator.kde.org/D25662
----
- src/konqtabs.cpp | 8 ++++----
- src/konqtabs.h   | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/konqtabs.cpp b/src/konqtabs.cpp
-index 9858bd6..53a5440 100644
---- a/src/konqtabs.cpp
-+++ b/src/konqtabs.cpp
-@@ -83,7 +83,7 @@ KonqFrameTabs::KonqFrameTabs(QWidget *parent, KonqFrameContainerBase *parentCont
-     if (KonqSettings::tabPosition() == QLatin1String("Bottom")) {
-         setTabPosition(QTabWidget::South);
-     }
--    connect(this, SIGNAL(closeRequest(QWidget*)), SLOT(slotCloseRequest(QWidget*)));
-+    connect(this, &KonqFrameTabs::tabCloseRequested, this, &KonqFrameTabs::slotCloseRequest);
-     connect(this, SIGNAL(removeTabPopup()),
-             m_pViewManager->mainWindow(), SLOT(slotRemoveTabPopup()));
- 
-@@ -352,9 +352,9 @@ void KonqFrameTabs::refreshSubPopupMenuTab()
-                                       m_pViewManager->mainWindow()->action("removeothertabs")->shortcut());
- }
- 
--void KonqFrameTabs::slotCloseRequest(QWidget *w)
-+void KonqFrameTabs::slotCloseRequest(int idx)
- {
--    m_pViewManager->mainWindow()->setWorkingTab(indexOf(w));
-+    m_pViewManager->mainWindow()->setWorkingTab(idx);
-     emit removeTabPopup();
- }
- 
-@@ -614,7 +614,7 @@ bool KonqFrameTabs::eventFilter(QObject *watched, QEvent *event)
-             if (e->button() == Qt::MidButton) {
-                 if (event->type() == QEvent::MouseButtonRelease) {
-                     const int index = bar->tabAt(e->pos());
--                    slotCloseRequest(widget(index));
-+                    slotCloseRequest(index);
-                 }
-                 e->accept();
-                 return true;
-diff --git a/src/konqtabs.h b/src/konqtabs.h
-index 3ce3548..01091ea 100644
---- a/src/konqtabs.h
-+++ b/src/konqtabs.h
-@@ -138,7 +138,7 @@ private:
- private Q_SLOTS:
-     void slotContextMenu(const QPoint &);
-     void slotContextMenu(QWidget *, const QPoint &);
--    void slotCloseRequest(QWidget *);
-+    void slotCloseRequest(int);
-     void slotMovedTab(int, int);
-     void slotMouseMiddleClick();
-     void slotMouseMiddleClick(QWidget *);
--- 
-cgit v1.1
-

konqueror-19.12.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f2b31a1dae1740839232bd646bf22d7cb57e34995584b9a96271ebcb0da7f0e
-size 7369676

konqueror-19.12.3.tar.xz.sig

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl5drXkACgkQ29LOiT4t
-HIeRfwgAmZyBfxSMpxvXjHXdA64kv0/mrXV5w1P2USAOWH6iuPpJ6u6hMc6NFKVh
-6RnZ8ulCgvh13XN3DVpnfHJnvhIrH5JVe2yWne3law5p8kNN+c9d71IDiEWhkgqu
-ZepIOwbpSVE0e6M4zck4yTgmh1pQyupwD7gb6cZBdDo6aepj/zsQ54+vh4CXydub
-4rLAdL7IM2VYVZuTl1GckIHAF67lnzx1RD77bacH+ycfix9JCGqiL+O7s+X8b1SR
-v54J/k7S20L0Em6VQeBKb7QcfsIuro0kz4Z6pTUVDWQuJGtjEBIRx5jznJuZqSY4
-GmgvgeIn2ACUufAkPyfv9wcr0x1Cwg==
-=Y8Ll
------END PGP SIGNATURE-----

konqueror-20.03.80.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3532b9cd70167139d13be51daa82b2b222e75c5b5f09f5f4028ac0bccd24b23a
+size 7383240

konqueror-20.03.80.tar.xz.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl50vBIACgkQOmpNuDnq
+ptdIEQ//dO+8CeV9A8zBMx0i6K2pAHK87SpPczvzuEAOAGkVIOY1EjRlxp7MI+7D
+yvP/V6yaBXag830d/56FASE8tVvHDxd3MNRzVLBBbqgGpU0AQ2J8vKUyQDovfzXB
+g3mJhL9GFgomVa3RmpeLoelwlX0h9iDq8lbSyDjiMbOx9eTUX91mW7tPVUj+rCEM
+hSxlpS8OlxMPoimrDXz9b5uckwo9yQFIaAW/3Y9CjV1DaWZO5mQeOBpCq8d6rpDy
+otsHNBKbPuzd5zltmHwqieqDsjP/2k2A5tbiZ7cOmgcJKnY2aY44nnehhQuTBOmj
+JlfVZTA9ZzWBuIfpEtPfOoNuYR3ZMse/06XIb3yrXVK7AMgMgka/JDD6zUkzt/p8
+vgpelAl7D0F4i8zrzNWUcPsJ2OaG7CZA5iM0Js1wGv18/L+mXc0Aa7u++phcWOUd
++bHcw5WGQKlU9GaZku6CMcmgQIhgXOY0Da1qwSpoRAPs/tSh9iU10IXwZrZZEn5o
+p4+A4ga5NqkoaQiA2YReGek+W8YJaoA3qy9TsVfOrK4ruMJZ+TpscwH3D309tn5G
+hLNflLFO877q9wQFovLGRK91cZlX+piHo6DfgeWs6cyYoSjTrF8wEL/k4yZuhcq+
+wzEp2thPVSyWV29hlZpiakLxHQEzQJotcTNvfH5lMRDbokxnPBA=
+=jxuW
+-----END PGP SIGNATURE-----

konqueror.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Mar 22 09:17:15 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
+
+- Update to 20.03.80
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/releases/20.04-beta
+- Too many changes to list here.
+- Dropped patches, now upstream:
+  * Restore-ability-to-close-tab-by-clicking-on-close-button.patch
+
 -------------------------------------------------------------------
 Thu Mar  5 20:36:22 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
 

konqueror.spec

@@ -21,7 +21,7 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           konqueror
-Version:        19.12.3
+Version:        20.03.80
 Release:        0
 Summary:        KDE File Manager and Browser
 # Note for legal: konqueror-17.04.2/webenginepart/autotests/webengine_testutils.h is Qt commercial OR GPL-3.0
@@ -29,13 +29,7 @@ Summary:        KDE File Manager and Browser
 License:        GPL-2.0-or-later
 Group:          System/GUI/KDE
 URL:            https://www.kde.org/
-Source:         https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
-%if %{with lang}
-Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
-# PATCH-FIX-UPSTREAM
-Patch0:         Restore-ability-to-close-tab-by-clicking-on-close-button.patch
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-filesystem
 BuildRequires:  libtidy-devel
@@ -70,6 +64,10 @@ Obsoletes:      libKF5Konq6 < 17.04
 Provides:       libKF5Konq6 = 17.04
 # It can only build on the same platforms as Qt Webengine
 ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64 mips mips64
+%if %{with lang}
+Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source2:        applications.keyring
+%endif
 # Needed for 42.3
 %if 0%{?suse_version} < 1330
 # It does not build with the default compiler (GCC 4.8) on Leap 42.x
@@ -123,7 +121,6 @@ Development package for the konqueror libraries.
 
 %prep
 %setup -q
-%autopatch -p1
 
 %build
   %if 0%{?suse_version} < 1330
@@ -160,7 +157,6 @@ Development package for the konqueror libraries.
 %dir %{_kf5_datadir}
 %dir %{_kf5_plugindir}
 %dir %{_kf5_servicesdir}
-%dir %{_kf5_servicetypesdir}
 %dir %{_kf5_sharedir}/kcontrol
 %dir %{_kf5_sharedir}/kcontrol/pics
 %dir %{_kf5_sharedir}/khtml
@@ -192,15 +188,12 @@ Development package for the konqueror libraries.
 %{_kf5_plugindir}/kcm_konq.so
 %{_kf5_plugindir}/kcm_konqhtml.so
 %{_kf5_plugindir}/kcm_performance.so
-%{_kf5_plugindir}/konq_aboutpage.so
 %{_kf5_servicesdir}/bookmarks.desktop
 %{_kf5_servicesdir}/filebehavior.desktop
 %{_kf5_servicesdir}/kcmkonqyperformance.desktop
 %{_kf5_servicesdir}/kcmperformance.desktop
 %{_kf5_servicesdir}/khtml_*.desktop
-%{_kf5_servicesdir}/konq_aboutpage.desktop
 %{_kf5_servicesdir}/org.kde.konqueror.desktop
-%{_kf5_servicetypesdir}/konqaboutpage.desktop
 %{_kf5_sharedir}/kcontrol/pics/onlyone.png
 %{_kf5_sharedir}/kcontrol/pics/overlapping.png
 %{_kf5_sharedir}/konqueror/