Accepting request 622627 from KDE:Applications
KDE Applications 18.04.3 OBS-URL: https://build.opensuse.org/request/show/622627 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kate?expand=0&rev=98
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
6e4491ac33
@ -12,11 +12,11 @@ That way it's only an impact on usability.
|
||||
kwrite/main.cpp | 3 +--
|
||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/kate/main.cpp b/kate/main.cpp
|
||||
index 342cd5db3..4845646aa 100644
|
||||
--- a/kate/main.cpp
|
||||
+++ b/kate/main.cpp
|
||||
@@ -64,9 +64,8 @@ int main(int argc, char **argv)
|
||||
Index: kate-18.04.3/kate/main.cpp
|
||||
===================================================================
|
||||
--- kate-18.04.3.orig/kate/main.cpp
|
||||
+++ kate-18.04.3/kate/main.cpp
|
||||
@@ -65,9 +65,8 @@ int main(int argc, char **argv)
|
||||
* Check whether we are running as root
|
||||
**/
|
||||
if (getuid() == 0) {
|
||||
@ -27,11 +27,11 @@ index 342cd5db3..4845646aa 100644
|
||||
}
|
||||
#endif
|
||||
/**
|
||||
diff --git a/kwrite/main.cpp b/kwrite/main.cpp
|
||||
index 68a055edb..4937f72d3 100644
|
||||
--- a/kwrite/main.cpp
|
||||
+++ b/kwrite/main.cpp
|
||||
@@ -54,9 +54,8 @@ extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
|
||||
Index: kate-18.04.3/kwrite/main.cpp
|
||||
===================================================================
|
||||
--- kate-18.04.3.orig/kwrite/main.cpp
|
||||
+++ kate-18.04.3/kwrite/main.cpp
|
||||
@@ -54,9 +54,8 @@ extern "C" Q_DECL_EXPORT int main(int ar
|
||||
* Check whether we are running as root
|
||||
**/
|
||||
if (getuid() == 0) {
|
||||
@ -42,6 +42,3 @@ index 68a055edb..4937f72d3 100644
|
||||
}
|
||||
#endif
|
||||
/**
|
||||
--
|
||||
2.12.2
|
||||
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
From 291b68994d7c6176dbc1983c956e2bb7135559e0 Mon Sep 17 00:00:00 2001
|
||||
From: Sven Brauch <mail@svenbrauch.de>
|
||||
Date: Wed, 13 Jun 2018 17:25:20 +0200
|
||||
Subject: Fix QuickOpen with Qt 5.11
|
||||
|
||||
It remains to be investigated whether this is a regression in Qt
|
||||
itself, or misuse of the API on our side. There is at least one
|
||||
misuse (the call to mapFromSource) which is wrong in the old version,
|
||||
so this patch improves the situation in either case.
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D13517
|
||||
BUG:395039
|
||||
---
|
||||
kate/katequickopen.cpp | 21 +++++++--------------
|
||||
1 file changed, 7 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/kate/katequickopen.cpp b/kate/katequickopen.cpp
|
||||
index 9e2536a..48452d1 100644
|
||||
--- a/kate/katequickopen.cpp
|
||||
+++ b/kate/katequickopen.cpp
|
||||
@@ -147,7 +147,7 @@ void KateQuickOpen::update()
|
||||
/**
|
||||
* new base mode creation
|
||||
*/
|
||||
- QStandardItemModel *base_model = new QStandardItemModel(0, 2, this);
|
||||
+ m_base_model->clear();
|
||||
|
||||
/**
|
||||
* remember local file names to avoid dupes with project files
|
||||
@@ -186,8 +186,8 @@ void KateQuickOpen::update()
|
||||
|
||||
QStandardItem *itemUrl = new QStandardItem(doc->url().toString());
|
||||
itemUrl->setEditable(false);
|
||||
- base_model->setItem(linecount, 0, itemName);
|
||||
- base_model->setItem(linecount, 1, itemUrl);
|
||||
+ m_base_model->setItem(linecount, 0, itemName);
|
||||
+ m_base_model->setItem(linecount, 1, itemUrl);
|
||||
linecount++;
|
||||
|
||||
if (!doc->url().isEmpty() && doc->url().isLocalFile()) {
|
||||
@@ -224,8 +224,8 @@ void KateQuickOpen::update()
|
||||
|
||||
QStandardItem *itemUrl = new QStandardItem(doc->url().toString());
|
||||
itemUrl->setEditable(false);
|
||||
- base_model->setItem(linecount, 0, itemName);
|
||||
- base_model->setItem(linecount, 1, itemUrl);
|
||||
+ m_base_model->setItem(linecount, 0, itemName);
|
||||
+ m_base_model->setItem(linecount, 1, itemUrl);
|
||||
linecount++;
|
||||
|
||||
if (!doc->url().isEmpty() && doc->url().isLocalFile()) {
|
||||
@@ -255,19 +255,12 @@ void KateQuickOpen::update()
|
||||
|
||||
QStandardItem *itemUrl = new QStandardItem(file);
|
||||
itemUrl->setEditable(false);
|
||||
- base_model->setItem(linecount, 0, itemName);
|
||||
- base_model->setItem(linecount, 1, itemUrl);
|
||||
+ m_base_model->setItem(linecount, 0, itemName);
|
||||
+ m_base_model->setItem(linecount, 1, itemUrl);
|
||||
linecount++;
|
||||
}
|
||||
}
|
||||
|
||||
- /**
|
||||
- * swap models and kill old one
|
||||
- */
|
||||
- m_model->setSourceModel(base_model);
|
||||
- delete m_base_model;
|
||||
- m_base_model = base_model;
|
||||
-
|
||||
if (idxToSelect.isValid()) {
|
||||
m_listView->setCurrentIndex(m_model->mapFromSource(idxToSelect));
|
||||
} else {
|
||||
--
|
||||
cgit v0.11.2
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1678accdb134b02312c03556b07be6184e69db98d7669a4ccef5d4bf3f27c880
|
||||
size 5641048
|
||||
3
kate-18.04.3.tar.xz
Normal file
3
kate-18.04.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e4ac4587881ca4a99ea972ffffd9015ea00a0d14fd1bcb129c1d22b930b02bf0
|
||||
size 5639892
|
||||
15
kate.changes
15
kate.changes
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 13 04:49:51 UTC 2018 - lbeltrame@kde.org
|
||||
|
||||
- Update to 18.04.3
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
* https://www.kde.org/announcements/announce-applications-18.04.3.php
|
||||
- Changes since 18.04.2:
|
||||
* Fix if to actually have a comparison
|
||||
* Fix QuickOpen with Qt 5.11 (kde#395039)
|
||||
- Dropped patches, now upstream:
|
||||
* 0002-Fix-QuickOpen-with-Qt-5.11.patch
|
||||
- Refreshed patches:
|
||||
* 0001-Defuse-root-block.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 14 09:51:26 UTC 2018 - marius.kittler@suse.com
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
%define _appstreamkpackage 0%(cat %{_kf5_cmakedir}/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1)
|
||||
Name: kate
|
||||
Version: 18.04.2
|
||||
Version: 18.04.3
|
||||
Release: 0
|
||||
%define kf5_version 5.26.0
|
||||
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
|
||||
@ -32,8 +32,6 @@ Url: http://www.kde.org
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch0: 0001-Defuse-root-block.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch1: 0002-Fix-QuickOpen-with-Qt-5.11.patch
|
||||
BuildRequires: kactivities5-devel
|
||||
BuildRequires: kconfig-devel
|
||||
BuildRequires: kcrash-devel
|
||||
@ -110,8 +108,7 @@ Provides translations for the "%{name}" package.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user