Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/xdg-desktop-portal-kde/, kde-plasma/xdg-desktop-portal-kde/files/
Date: Tue, 08 Jan 2019 19:18:58
Message-Id: 1546974814.02d3197af6b7100aead777388d915744f690da87.asturm@gentoo
1 commit: 02d3197af6b7100aead777388d915744f690da87
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 8 19:10:53 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 8 19:13:34 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=02d3197a
7
8 kde-plasma/xdg-desktop-portal-kde: 5.14.5 version bump
9
10 Package-Manager: Portage-2.3.54, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 ...dg-desktop-portal-kde-5.14.4-current_name.patch | 42 ----------------------
14 ...ebuild => xdg-desktop-portal-kde-5.14.5.ebuild} | 4 +--
15 2 files changed, 1 insertion(+), 45 deletions(-)
16
17 diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.14.4-current_name.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.14.4-current_name.patch
18 deleted file mode 100644
19 index 6525711fc0..0000000000
20 --- a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.14.4-current_name.patch
21 +++ /dev/null
22 @@ -1,42 +0,0 @@
23 -From ccea985840cf5b05b0359067854abc3da080e737 Mon Sep 17 00:00:00 2001
24 -From: Jan Grulich <jgrulich@××××××.com>
25 -Date: Thu, 13 Dec 2018 07:47:19 +0100
26 -Subject: FileChooser: make use of current_name property in Save dialog
27 -
28 -It's not used in Qt portal implementation, but gtk has API for that and sets it in Save dialog
29 -and we should try to call selectFile() with it to get pre-selected file for the dialog
30 -
31 -BUG: 402077
32 ----
33 - src/filechooser.cpp | 9 ++++-----
34 - 1 file changed, 4 insertions(+), 5 deletions(-)
35 -
36 -diff --git a/src/filechooser.cpp b/src/filechooser.cpp
37 -index 37e7744..19f4d42 100644
38 ---- a/src/filechooser.cpp
39 -+++ b/src/filechooser.cpp
40 -@@ -249,11 +249,6 @@ uint FileChooserPortal::SaveFile(const QDBusObjectPath &handle,
41 - fileDialog->setModal(modalDialog);
42 - fileDialog->setAcceptMode(QFileDialog::AcceptSave);
43 -
44 -- // TODO: Looks Qt doesn't have API for this
45 -- // if (!currentName.isEmpty()) {
46 -- // fileDialog->selectFile(currentName);
47 -- // }
48 --
49 - if (!currentFolder.isEmpty()) {
50 - fileDialog->setDirectoryUrl(QUrl(currentFolder));
51 - }
52 -@@ -262,6 +257,10 @@ uint FileChooserPortal::SaveFile(const QDBusObjectPath &handle,
53 - fileDialog->selectFile(currentFile);
54 - }
55 -
56 -+ if (!currentName.isEmpty()) {
57 -+ fileDialog->selectFile(currentName);
58 -+ }
59 -+
60 - if (!acceptLabel.isEmpty()) {
61 - fileDialog->setLabelText(QFileDialog::Accept, acceptLabel);
62 - }
63 ---
64 -cgit v1.1
65
66 diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.14.4.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.14.5.ebuild
67 similarity index 89%
68 rename from kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.14.4.ebuild
69 rename to kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.14.5.ebuild
70 index ed75658bd6..6dc08c6077 100644
71 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.14.4.ebuild
72 +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.14.5.ebuild
73 @@ -1,4 +1,4 @@
74 -# Copyright 1999-2018 Gentoo Authors
75 +# Copyright 1999-2019 Gentoo Authors
76 # Distributed under the terms of the GNU General Public License v2
77
78 EAPI=6
79 @@ -33,5 +33,3 @@ DEPEND="${COMMON_DEPEND}
80 RDEPEND="${COMMON_DEPEND}
81 x11-misc/xdg-desktop-portal
82 "
83 -
84 -PATCHES=( "${FILESDIR}/${P}-current_name.patch" )