pool/konqueror
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 796977 from KDE:Applications

Browse Source 
KDE release 20.04.0

OBS-URL: https://build.opensuse.org/request/show/796977
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/konqueror?expand=0&rev=47
This commit is contained in:
Dominique Leuenberger 2020-04-29 18:49:35 +00:00 committed by Git OBS Bridge
commit 0a16e79a57
7 changed files with 55 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

3
konqueror-19.12.3.tar.xz
View File

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

11
konqueror-19.12.3.tar.xz.sig
View File

@ -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-----

3
konqueror-20.04.0.tar.xz Normal file
View File

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

11
konqueror-20.04.0.tar.xz.sig Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl6ZB9oACgkQ29LOiT4t
HIeULAgAg9Pq9gyqIP+WHPVR3ZbCCNg6iBjkCzIEx7BIxdSW34FvCr+b2jz2fTIB
arhvrCEQYGfA8KjV3BUe0iDQazAckfihYlDEPHdmIL7vyV+nZYYGke6OQ/yWV1sk
9NnJ6tmVlV9vMgMrqE5DRJudLoKHKq6SJIC6iGKkzp3ho6saYhvFvYVpVdzMLwIZ
6eS2pxoN9Uf2iCheF3JLij0nWee3+6NMNA2VuEgc9rwH0pSdkaYKENng6c4EsBa4
4HARSc8HJT8uwpIABJ3zciuCaBs3qkXMJI2BKJgJRKvwVCU1S+2DdtPkGCGS9+4y
Oja78P9PZQQdKW8YY+ofmXfSEQQiBA==
=raB8
-----END PGP SIGNATURE-----

30
konqueror.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Thu Apr 23 12:22:43 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
- Update to 20.04.0
* New feature release
* For more details please see:
* https://kde.org/announcements/releases/2020-04-apps-update
- Changes since 20.03.90:
* Fix crash due to changes in KBookmarkMenu
-------------------------------------------------------------------
Sun Apr 5 20:30:19 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
- Update to 20.03.90
* New feature release
* For more details please see:
* https://kde.org/announcements/releases/20.04-rc
- No code change since 20.03.80
-------------------------------------------------------------------
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> Thu Mar 5 20:36:22 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>

48
konqueror.spec
View File

@ -21,7 +21,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without lang %bcond_without lang
Name: konqueror Name: konqueror
Version: 19.12.3 Version: 20.04.0
Release: 0 Release: 0
Summary: KDE File Manager and Browser 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 # Note for legal: konqueror-17.04.2/webenginepart/autotests/webengine_testutils.h is Qt commercial OR GPL-3.0
@ -30,12 +30,6 @@ License: GPL-2.0-or-later
Group: System/GUI/KDE Group: System/GUI/KDE
URL: https://www.kde.org/ URL: https://www.kde.org/
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz Source: https://download.kde.org/stable/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: extra-cmake-modules
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem
BuildRequires: libtidy-devel BuildRequires: libtidy-devel
@ -70,14 +64,9 @@ Obsoletes: libKF5Konq6 < 17.04
Provides: libKF5Konq6 = 17.04 Provides: libKF5Konq6 = 17.04
# It can only build on the same platforms as Qt Webengine # It can only build on the same platforms as Qt Webengine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64
# Needed for 42.3 %if %{with lang}
%if 0%{?suse_version} < 1330 Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
# It does not build with the default compiler (GCC 4.8) on Leap 42.x Source2: applications.keyring
%if 0%{?sle_version} < 120300
BuildRequires: gcc6-c++
%else
BuildRequires: gcc7-c++
%endif
%endif %endif
%description %description
@ -123,28 +112,17 @@ Development package for the konqueror libraries.
%prep %prep
%setup -q %setup -q
%autopatch -p1
%build %build
%if 0%{?suse_version} < 1330 %cmake_kf5 -d build
# It does not build with the default compiler (GCC 4.8) on Leap 42.x %cmake_build
%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
%cmake_build
%install %install
%kf5_makeinstall -C build %kf5_makeinstall -C build
%if %{with lang} %if %{with lang}
%find_lang %{name} --with-man --all-name %find_lang %{name} --with-man --all-name
%{kf5_find_htmldocs} %{kf5_find_htmldocs}
%endif %endif
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
@ -160,7 +138,6 @@ Development package for the konqueror libraries.
%dir %{_kf5_datadir} %dir %{_kf5_datadir}
%dir %{_kf5_plugindir} %dir %{_kf5_plugindir}
%dir %{_kf5_servicesdir} %dir %{_kf5_servicesdir}
%dir %{_kf5_servicetypesdir}
%dir %{_kf5_sharedir}/kcontrol %dir %{_kf5_sharedir}/kcontrol
%dir %{_kf5_sharedir}/kcontrol/pics %dir %{_kf5_sharedir}/kcontrol/pics
%dir %{_kf5_sharedir}/khtml %dir %{_kf5_sharedir}/khtml
@ -192,15 +169,12 @@ Development package for the konqueror libraries.
%{_kf5_plugindir}/kcm_konq.so %{_kf5_plugindir}/kcm_konq.so
%{_kf5_plugindir}/kcm_konqhtml.so %{_kf5_plugindir}/kcm_konqhtml.so
%{_kf5_plugindir}/kcm_performance.so %{_kf5_plugindir}/kcm_performance.so
%{_kf5_plugindir}/konq_aboutpage.so
%{_kf5_servicesdir}/bookmarks.desktop %{_kf5_servicesdir}/bookmarks.desktop
%{_kf5_servicesdir}/filebehavior.desktop %{_kf5_servicesdir}/filebehavior.desktop
%{_kf5_servicesdir}/kcmkonqyperformance.desktop %{_kf5_servicesdir}/kcmkonqyperformance.desktop
%{_kf5_servicesdir}/kcmperformance.desktop %{_kf5_servicesdir}/kcmperformance.desktop
%{_kf5_servicesdir}/khtml_*.desktop %{_kf5_servicesdir}/khtml_*.desktop
%{_kf5_servicesdir}/konq_aboutpage.desktop
%{_kf5_servicesdir}/org.kde.konqueror.desktop %{_kf5_servicesdir}/org.kde.konqueror.desktop
%{_kf5_servicetypesdir}/konqaboutpage.desktop
%{_kf5_sharedir}/kcontrol/pics/onlyone.png %{_kf5_sharedir}/kcontrol/pics/onlyone.png
%{_kf5_sharedir}/kcontrol/pics/overlapping.png %{_kf5_sharedir}/kcontrol/pics/overlapping.png
%{_kf5_sharedir}/konqueror/ %{_kf5_sharedir}/konqueror/