From 90f8ce59a7eaef141ebf227b15c1d13e6a4877354d3b1299b6681f444eb05f3b Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 11 Apr 2016 06:31:16 +0000 Subject: [PATCH 01/10] update to (16.03.90) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=37 --- dolphin-15.12.3.tar.xz | 3 --- dolphin-16.03.90.tar.xz | 3 +++ dolphin.changes | 8 ++++++++ dolphin.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 dolphin-15.12.3.tar.xz create mode 100644 dolphin-16.03.90.tar.xz diff --git a/dolphin-15.12.3.tar.xz b/dolphin-15.12.3.tar.xz deleted file mode 100644 index e86a13d..0000000 --- a/dolphin-15.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26c347bbf65ec635162b86564c1f4693334d24afe16448f93fdacf6291d3bddd -size 658572 diff --git a/dolphin-16.03.90.tar.xz b/dolphin-16.03.90.tar.xz new file mode 100644 index 0000000..20b7077 --- /dev/null +++ b/dolphin-16.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b23c04ccbea0f8584c1d08466822225d496e1bfc1bdca132de94d67c2055a8f +size 659788 diff --git a/dolphin.changes b/dolphin.changes index f9b9116..17d7dfd 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 11 06:31:12 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + ------------------------------------------------------------------- Fri Mar 25 16:37:37 UTC 2016 - wbauer@tmo.at diff --git a/dolphin.spec b/dolphin.spec index b70fb7f..83bedb5 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -17,7 +17,7 @@ Name: dolphin -Version: 15.12.3 +Version: 16.03.90 Release: 0 Summary: KDE File Manager License: GPL-2.0+ From a21e54180093140247416de3597c1a4c743f49784ea1f1deb621d527c6a7fc96 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 11 Apr 2016 18:26:25 +0000 Subject: [PATCH 02/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=38 --- dolphin.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/dolphin.changes b/dolphin.changes index 17d7dfd..f934968 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -5,6 +5,7 @@ Mon Apr 11 06:31:12 UTC 2016 - tittiatcoke@gmail.com * KDE Applications 16.04.0 RC * https://www.kde.org/announcements/announce-applications-16.04-rc.php +- Drop upstreamed patch Fix-wrong-path-URL-conversion.patch ------------------------------------------------------------------- Fri Mar 25 16:37:37 UTC 2016 - wbauer@tmo.at From 89d6235f26c66cdc88389c570d9617121f7138d4e8139f9e374150bd7bb26e04 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 11 Apr 2016 18:26:35 +0000 Subject: [PATCH 03/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=39 --- Fix-wrong-path-URL-conversion.patch | 48 ----------------------------- 1 file changed, 48 deletions(-) delete mode 100644 Fix-wrong-path-URL-conversion.patch diff --git a/Fix-wrong-path-URL-conversion.patch b/Fix-wrong-path-URL-conversion.patch deleted file mode 100644 index 465712f..0000000 --- a/Fix-wrong-path-URL-conversion.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: David Faure -Date: Sat, 28 Nov 2015 22:44:47 +0000 -Subject: Fix wrong path->URL conversion. -X-Git-Tag: v16.03.80 -X-Git-Url: http://quickgit.kde.org/?p=dolphin.git&a=commitdiff&h=35b35d0c5f62641a685282d25ea204e7004e09c0 ---- -Fix wrong path->URL conversion. ---- - - ---- a/src/kitemviews/kfileitemmodelrolesupdater.cpp -+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp -@@ -717,7 +717,13 @@ - // the corresponding file has been deleted in the meantime. - return; - } -- -+ applyChangedBalooRolesForItem(item); -+#endif -+} -+ -+void KFileItemModelRolesUpdater::applyChangedBalooRolesForItem(const KFileItem &item) -+{ -+#ifdef HAVE_BALOO - Baloo::File file(item.localPath()); - file.load(); - -@@ -1089,7 +1095,7 @@ - #ifdef HAVE_BALOO - if (m_balooFileMonitor) { - m_balooFileMonitor->addFile(item.localPath()); -- applyChangedBalooRoles(item.localPath()); -+ applyChangedBalooRolesForItem(item); - } - #endif - return data; - ---- a/src/kitemviews/kfileitemmodelrolesupdater.h -+++ b/src/kitemviews/kfileitemmodelrolesupdater.h -@@ -211,6 +211,7 @@ - void resolveRecentlyChangedItems(); - - void applyChangedBalooRoles(const QString& file); -+ void applyChangedBalooRolesForItem(const KFileItem& file); - - void slotDirectoryContentsCountReceived(const QString& path, int count); - - From 4c2f33239da32fb52bfbc742c6356ccef3f6a452ce21c24ac626394d2d447457 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 11 Apr 2016 18:26:56 +0000 Subject: [PATCH 04/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=40 --- dolphin.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/dolphin.spec b/dolphin.spec index 83bedb5..6e09567 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 Fix-wrong-path-URL-conversion.patch boo#970896 -- fixes display of additional file metadata in dolphin's filelist -Patch1: Fix-wrong-path-URL-conversion.patch BuildRequires: baloo5-devel BuildRequires: baloo5-widgets-devel BuildRequires: extra-cmake-modules >= 1.6.0 @@ -96,7 +94,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 From 96bf014e7c3edcc838f01dd88957a486761516a6d0f0189addd3e1f26d888418 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 17 Apr 2016 05:50:42 +0000 Subject: [PATCH 05/10] update to (16.04.0) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=41 --- dolphin-16.03.90.tar.xz | 3 --- dolphin-16.04.0.tar.xz | 3 +++ dolphin.changes | 8 ++++++++ dolphin.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 dolphin-16.03.90.tar.xz create mode 100644 dolphin-16.04.0.tar.xz diff --git a/dolphin-16.03.90.tar.xz b/dolphin-16.03.90.tar.xz deleted file mode 100644 index 20b7077..0000000 --- a/dolphin-16.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b23c04ccbea0f8584c1d08466822225d496e1bfc1bdca132de94d67c2055a8f -size 659788 diff --git a/dolphin-16.04.0.tar.xz b/dolphin-16.04.0.tar.xz new file mode 100644 index 0000000..483b482 --- /dev/null +++ b/dolphin-16.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67783a5e4b7720ca99ae6fa47c0db23bda2d6d433d6d96bbbac13f562ca3dbb2 +size 659996 diff --git a/dolphin.changes b/dolphin.changes index f934968..26f9223 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Apr 17 05:50:36 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + ------------------------------------------------------------------- Mon Apr 11 06:31:12 UTC 2016 - tittiatcoke@gmail.com diff --git a/dolphin.spec b/dolphin.spec index 6e09567..c62d15d 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -17,7 +17,7 @@ Name: dolphin -Version: 16.03.90 +Version: 16.04.0 Release: 0 Summary: KDE File Manager License: GPL-2.0+ From 24f37186037f0a01525b95081bc512cb4ad4c0bfa960b5b311b808b5a831668f Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 28 Apr 2016 12:47:26 +0000 Subject: [PATCH 06/10] Accepting request 391723 from home:wolfi323:branches:KDE:Applications - Added specify-fallback-icon.patch: fixes missing icons for certain filetypes where the specified icon doesn't exist (kde#358958, kde#361034) OBS-URL: https://build.opensuse.org/request/show/391723 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=42 --- dolphin.changes | 7 +++++++ dolphin.spec | 3 +++ specify-fallback-icon.patch | 39 +++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 specify-fallback-icon.patch diff --git a/dolphin.changes b/dolphin.changes index 26f9223..74917f1 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 26 14:32:54 UTC 2016 - wbauer@tmo.at + +- Added specify-fallback-icon.patch: fixes missing icons for + certain filetypes where the specified icon doesn't exist + (kde#358958, kde#361034) + ------------------------------------------------------------------- Sun Apr 17 05:50:36 UTC 2016 - tittiatcoke@gmail.com diff --git a/dolphin.spec b/dolphin.spec index c62d15d..0776007 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -26,6 +26,8 @@ Url: http://www.kde.org/ Source: dolphin-%{version}.tar.xz Source1: dolphinsu.desktop Patch0: dolphin-go_up.diff +# PATCH-FIX-UPSTREAM specify-fallback-icon.patch kde#358958, kde#361034 -- fixes missing icons for certain filetypes where the specified icon doesn't exist +Patch1: specify-fallback-icon.patch BuildRequires: baloo5-devel BuildRequires: baloo5-widgets-devel BuildRequires: extra-cmake-modules >= 1.6.0 @@ -94,6 +96,7 @@ 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 diff --git a/specify-fallback-icon.patch b/specify-fallback-icon.patch new file mode 100644 index 0000000..2c79479 --- /dev/null +++ b/specify-fallback-icon.patch @@ -0,0 +1,39 @@ +From: Wolfgang Bauer +Date: Tue, 26 Apr 2016 14:11:26 +0000 +Subject: Specify a fallback icon to QIcon::fromTheme() +X-Git-Url: http://quickgit.kde.org/?p=dolphin.git&a=commitdiff&h=44d4d2ea715719a08c639541530a5b330647297d +--- +Specify a fallback icon to QIcon::fromTheme() + +The default fallback of QIcon::fromTheme() is QIcon(), i.e. a null icon. +Set the generic "unknown" icon as fallback to prevent missing icons for +filetypes that specify an icon name that doesn't exist. + +This also gets rid of "QPixmap::scaled: Pixmap is a null pixmap" +warnings in that case. + +BUG: 358958 +BUG: 361034 +FIXED-IN: 16.04.1 +REVIEW: 127713 +--- + + +--- a/src/kitemviews/kstandarditemlistwidget.cpp ++++ b/src/kitemviews/kstandarditemlistwidget.cpp +@@ -1440,12 +1440,13 @@ + + QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStringList& overlays, int size) + { ++ static const QIcon fallbackIcon = QIcon::fromTheme(QStringLiteral("unknown")); + size *= qApp->devicePixelRatio(); + const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(QStringLiteral(":")) % ":" % QString::number(size); + QPixmap pixmap; + + if (!QPixmapCache::find(key, pixmap)) { +- const QIcon icon = QIcon::fromTheme(name); ++ const QIcon icon = QIcon::fromTheme(name, fallbackIcon); + + int requestedSize; + if (size <= KIconLoader::SizeSmall) { + From 0f9eb42f272a18f1b7ab631e93e4d1d6c07dd4fa2791a669fa073cd59f5ef4ff Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 7 May 2016 10:11:23 +0000 Subject: [PATCH 07/10] update to (16.04.1) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=43 --- dolphin-16.04.0.tar.xz | 3 --- dolphin-16.04.1.tar.xz | 3 +++ dolphin.changes | 8 ++++++++ dolphin.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 dolphin-16.04.0.tar.xz create mode 100644 dolphin-16.04.1.tar.xz diff --git a/dolphin-16.04.0.tar.xz b/dolphin-16.04.0.tar.xz deleted file mode 100644 index 483b482..0000000 --- a/dolphin-16.04.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67783a5e4b7720ca99ae6fa47c0db23bda2d6d433d6d96bbbac13f562ca3dbb2 -size 659996 diff --git a/dolphin-16.04.1.tar.xz b/dolphin-16.04.1.tar.xz new file mode 100644 index 0000000..c53aa55 --- /dev/null +++ b/dolphin-16.04.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31d90cdcdaecb384068bcaed870f3a1218df2dc4a010f851c15fb168fc28e0a5 +size 659948 diff --git a/dolphin.changes b/dolphin.changes index 74917f1..f9755ec 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat May 7 10:11:20 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + ------------------------------------------------------------------- Tue Apr 26 14:32:54 UTC 2016 - wbauer@tmo.at diff --git a/dolphin.spec b/dolphin.spec index 0776007..44bfabf 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -17,7 +17,7 @@ Name: dolphin -Version: 16.04.0 +Version: 16.04.1 Release: 0 Summary: KDE File Manager License: GPL-2.0+ From 1bb7d67657a15adbceabf634e2d81c9edb68f082a4e17f116848068acb4dca20 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 7 May 2016 10:20:19 +0000 Subject: [PATCH 08/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=44 --- dolphin.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dolphin.changes b/dolphin.changes index f9755ec..4f90202 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -4,6 +4,8 @@ Sat May 7 10:11:20 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 16.04.1 * KDE Applications 16.04.1 * https://www.kde.org/announcements/announce-applications-16.04.1.php + +- Drop upstreamed patch specify-fallback-icon.patch ------------------------------------------------------------------- From e9c22f5402c83732fe2a4f6bc20aff8e842ffc4f84ac39ee70453f81b3b332ff Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 7 May 2016 10:20:27 +0000 Subject: [PATCH 09/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=45 --- specify-fallback-icon.patch | 39 ------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 specify-fallback-icon.patch diff --git a/specify-fallback-icon.patch b/specify-fallback-icon.patch deleted file mode 100644 index 2c79479..0000000 --- a/specify-fallback-icon.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Wolfgang Bauer -Date: Tue, 26 Apr 2016 14:11:26 +0000 -Subject: Specify a fallback icon to QIcon::fromTheme() -X-Git-Url: http://quickgit.kde.org/?p=dolphin.git&a=commitdiff&h=44d4d2ea715719a08c639541530a5b330647297d ---- -Specify a fallback icon to QIcon::fromTheme() - -The default fallback of QIcon::fromTheme() is QIcon(), i.e. a null icon. -Set the generic "unknown" icon as fallback to prevent missing icons for -filetypes that specify an icon name that doesn't exist. - -This also gets rid of "QPixmap::scaled: Pixmap is a null pixmap" -warnings in that case. - -BUG: 358958 -BUG: 361034 -FIXED-IN: 16.04.1 -REVIEW: 127713 ---- - - ---- a/src/kitemviews/kstandarditemlistwidget.cpp -+++ b/src/kitemviews/kstandarditemlistwidget.cpp -@@ -1440,12 +1440,13 @@ - - QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStringList& overlays, int size) - { -+ static const QIcon fallbackIcon = QIcon::fromTheme(QStringLiteral("unknown")); - size *= qApp->devicePixelRatio(); - const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(QStringLiteral(":")) % ":" % QString::number(size); - QPixmap pixmap; - - if (!QPixmapCache::find(key, pixmap)) { -- const QIcon icon = QIcon::fromTheme(name); -+ const QIcon icon = QIcon::fromTheme(name, fallbackIcon); - - int requestedSize; - if (size <= KIconLoader::SizeSmall) { - From f72160aba549a7cab8097fd2cb9cb8cd0a5a6dad018af440fe1d25c27db2f16f Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 7 May 2016 10:20:51 +0000 Subject: [PATCH 10/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=46 --- dolphin.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/dolphin.spec b/dolphin.spec index 44bfabf..8e1914d 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 specify-fallback-icon.patch kde#358958, kde#361034 -- fixes missing icons for certain filetypes where the specified icon doesn't exist -Patch1: specify-fallback-icon.patch BuildRequires: baloo5-devel BuildRequires: baloo5-widgets-devel BuildRequires: extra-cmake-modules >= 1.6.0 @@ -96,7 +94,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