From dad7359295a8af83e73458534a795b8ef923dae955de18721e323d077dcda439 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 10 Nov 2015 19:53:20 +0000 Subject: [PATCH 1/2] update to (15.08.3) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=13 --- dolphin-15.08.2.tar.xz | 3 --- dolphin-15.08.3.tar.xz | 3 +++ dolphin.changes | 9 +++++++++ dolphin.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 dolphin-15.08.2.tar.xz create mode 100644 dolphin-15.08.3.tar.xz diff --git a/dolphin-15.08.2.tar.xz b/dolphin-15.08.2.tar.xz deleted file mode 100644 index 3f3eed7..0000000 --- a/dolphin-15.08.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d9c62b80c2d2041818aeabdcd83848a31679dca41963cb104a87f53e611a1fd -size 656640 diff --git a/dolphin-15.08.3.tar.xz b/dolphin-15.08.3.tar.xz new file mode 100644 index 0000000..ceca67c --- /dev/null +++ b/dolphin-15.08.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5eda2eb0cf3900787013ac7425e89f2f9274f19a2a0a520443c8f34a13f0aa1 +size 656904 diff --git a/dolphin.changes b/dolphin.changes index e1b13bd..8302bbc 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Nov 10 19:53:17 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.08.3 + * KDE Applications 15.08.3 + * https://www.kde.org/announcements/announce-applications-15.08.3.php + * boo#954531 + + ------------------------------------------------------------------- Sun Oct 25 14:02:05 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/dolphin.spec b/dolphin.spec index b283661..d452e40 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -17,7 +17,7 @@ Name: dolphin -Version: 15.08.2 +Version: 15.08.3 Release: 0 Summary: KDE File Manager License: GPL-2.0+ From a81f7489e7c9e679312a32a00d728e37844ab8145de34a582cf7a0e1c9762529 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 10 Nov 2015 20:42:24 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=14 --- ...irectories-with-non-local-file-paths.patch | 162 ------------------ dolphin.changes | 2 + dolphin.spec | 3 - 3 files changed, 2 insertions(+), 165 deletions(-) delete mode 100644 allow-home-directories-with-non-local-file-paths.patch diff --git a/allow-home-directories-with-non-local-file-paths.patch b/allow-home-directories-with-non-local-file-paths.patch deleted file mode 100644 index 526bb5b..0000000 --- a/allow-home-directories-with-non-local-file-paths.patch +++ /dev/null @@ -1,162 +0,0 @@ -From: Emmanuel Pescosta -Date: Sat, 10 Oct 2015 13:09:48 +0000 -Subject: Allow home directories with non-local file paths. -X-Git-Url: http://quickgit.kde.org/?p=dolphin.git&a=commitdiff&h=5dd5eaf08da4b7d11e53c90096c2ea0e6a19e840 ---- -Allow home directories with non-local file paths. - -Paths like file:/home/me work now instead of showing -an error message. - -BUG: 352743 -BUG: 353550 -FIXED-IN: 15.08.3 -REVIEW: 125586 ---- - - ---- a/src/dolphinmainwindow.cpp -+++ b/src/dolphinmainwindow.cpp -@@ -21,6 +21,7 @@ - - #include "dolphinmainwindow.h" - -+#include "global.h" - #include "dolphindockwidget.h" - #include "dolphincontextmenu.h" - #include "dolphinnewfilemenu.h" -@@ -639,7 +640,7 @@ - { - // The default case (left button pressed) is handled in goHome(). - if (buttons == Qt::MiddleButton) { -- openNewTab(GeneralSettings::self()->homeUrl()); -+ openNewTab(Dolphin::homeUrl()); - } - } - - ---- a/src/dolphinviewcontainer.cpp -+++ b/src/dolphinviewcontainer.cpp -@@ -39,6 +39,7 @@ - #ifdef KActivities_FOUND - #endif - -+#include "global.h" - #include "dolphin_generalsettings.h" - #include "filterbar/filterbar.h" - #include "search/dolphinsearchbox.h" -@@ -77,7 +78,7 @@ - const GeneralSettings* settings = GeneralSettings::self(); - m_urlNavigator->setUrlEditable(settings->editableUrl()); - m_urlNavigator->setShowFullPath(settings->showFullPath()); -- m_urlNavigator->setHomeUrl(QUrl::fromLocalFile(settings->homeUrl())); -+ m_urlNavigator->setHomeUrl(Dolphin::homeUrl()); - KUrlComboBox* editor = m_urlNavigator->editor(); - editor->setCompletionMode(KCompletion::CompletionMode(settings->urlCompletionMode())); - -@@ -304,7 +305,7 @@ - // settings of the URL navigator and the filterbar. - m_urlNavigator->setUrlEditable(GeneralSettings::editableUrl()); - m_urlNavigator->setShowFullPath(GeneralSettings::showFullPath()); -- m_urlNavigator->setHomeUrl(QUrl::fromLocalFile(GeneralSettings::homeUrl())); -+ m_urlNavigator->setHomeUrl(Dolphin::homeUrl()); - setFilterBarVisible(GeneralSettings::filterBar()); - } - -@@ -340,7 +341,7 @@ - // started with a search-URL, the home URL is used as fallback. - QUrl url = m_searchBox->searchPath(); - if (url.isEmpty() || !url.isValid() || isSearchUrl(url)) { -- url = QUrl::fromLocalFile(GeneralSettings::self()->homeUrl()); -+ url = Dolphin::homeUrl(); - } - m_urlNavigator->setLocationUrl(url); - } - ---- a/src/global.cpp -+++ b/src/global.cpp -@@ -20,6 +20,8 @@ - #include "global.h" - #include "dolphindebug.h" - -+#include "dolphin_generalsettings.h" -+ - QList Dolphin::validateUris(const QStringList& uriList) - { - QList urls; -@@ -33,3 +35,8 @@ QList Dolphin::validateUris(const - } - return urls; - } -+ -+QUrl Dolphin::homeUrl() -+{ -+ return QUrl::fromUserInput(GeneralSettings::homeUrl(), QString(), QUrl::AssumeLocalFile); -+} ---- a/src/global.h -+++ b/src/global.h -@@ -25,6 +25,11 @@ - - namespace Dolphin { - QList validateUris(const QStringList& uriList); -+ -+ /** -+ * Returns the home url which is defined in General Settings -+ */ -+ QUrl homeUrl(); - } - - #endif //GLOBAL_H - ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -113,8 +113,7 @@ - - if (urls.isEmpty()) { - // We need at least one URL to open Dolphin -- const QUrl homeUrl(QUrl::fromLocalFile(GeneralSettings::homeUrl())); -- urls.append(homeUrl); -+ urls.append(Dolphin::homeUrl()); - } - - const bool splitView = parser.isSet("split") || GeneralSettings::splitView(); - ---- a/src/settings/startup/startupsettingspage.cpp -+++ b/src/settings/startup/startupsettingspage.cpp -@@ -19,6 +19,7 @@ - - #include "startupsettingspage.h" - -+#include "global.h" - #include "dolphinmainwindow.h" - #include "dolphinviewcontainer.h" - -@@ -128,7 +129,7 @@ - { - GeneralSettings* settings = GeneralSettings::self(); - -- const QUrl url(QUrl::fromLocalFile(m_homeUrl->text())); -+ const QUrl url(QUrl::fromUserInput(m_homeUrl->text(), QString(), QUrl::AssumeLocalFile)); - KFileItem fileItem(url); - if ((url.isValid() && fileItem.isDir()) || (url.scheme() == QLatin1String("timeline"))) { - settings->setHomeUrl(url.toDisplayString(QUrl::PreferLocalFile)); -@@ -163,8 +164,8 @@ - - void StartupSettingsPage::selectHomeUrl() - { -- const QString homeUrl = m_homeUrl->text(); -- QUrl url = QFileDialog::getExistingDirectoryUrl(this, QString(), QUrl::fromLocalFile(homeUrl)); -+ const QUrl homeUrl(QUrl::fromUserInput(m_homeUrl->text(), QString(), QUrl::AssumeLocalFile)); -+ QUrl url = QFileDialog::getExistingDirectoryUrl(this, QString(), homeUrl); - if (!url.isEmpty()) { - m_homeUrl->setText(url.toDisplayString(QUrl::PreferLocalFile)); - slotSettingsChanged(); -@@ -183,7 +184,7 @@ - - void StartupSettingsPage::loadSettings() - { -- const QUrl url(QUrl::fromLocalFile(GeneralSettings::homeUrl())); -+ const QUrl url(Dolphin::homeUrl()); - m_homeUrl->setText(url.toDisplayString(QUrl::PreferLocalFile)); - m_splitView->setChecked(GeneralSettings::splitView()); - m_editableUrl->setChecked(GeneralSettings::editableUrl()); diff --git a/dolphin.changes b/dolphin.changes index 8302bbc..9deb858 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -6,6 +6,8 @@ Tue Nov 10 19:53:17 UTC 2015 - tittiatcoke@gmail.com * https://www.kde.org/announcements/announce-applications-15.08.3.php * boo#954531 +- Drop upstreamed patch: + allow-home-directories-with-non-local-file-paths.patch ------------------------------------------------------------------- Sun Oct 25 14:02:05 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/dolphin.spec b/dolphin.spec index d452e40..752cef3 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -26,8 +26,6 @@ Url: http://www.kde.org/ Source: dolphin-%{version}.tar.xz Source1: dolphinsu.desktop Patch0: dolphin-go_up.diff -# PATCH-FIX-UPSTREAM allow-home-directories-with-non-local-file-paths.patch -Patch1: allow-home-directories-with-non-local-file-paths.patch BuildRequires: baloo5-devel BuildRequires: baloo5-widgets-devel BuildRequires: extra-cmake-modules >= 1.6.0 @@ -95,7 +93,6 @@ This package contains the libraries used by Dolphin and Konqueror. %prep %setup -q -n dolphin-%{version} %patch0 -p1 -%patch1 -p1 %build %cmake_kf5 -d build