diff --git a/.gitignore b/.gitignore index ce37e00..5782806 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /digiKam-7.9.0.tar.xz /digiKam-7.10.0.tar.xz /digiKam-8.0.0.tar.xz +/digiKam-8.1.0.tar.xz diff --git a/digikam-8.0.0-disable-QListView-Batched-optimization-for-the-thumb.patch b/digikam-8.0.0-disable-QListView-Batched-optimization-for-the-thumb.patch deleted file mode 100644 index c6be22d..0000000 --- a/digikam-8.0.0-disable-QListView-Batched-optimization-for-the-thumb.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 28a447a7027ea1e109b60d913dd6128cfb55e6a8 Mon Sep 17 00:00:00 2001 -From: Maik Qualmann -Date: Thu, 20 Apr 2023 08:17:07 +0200 -Subject: [PATCH] disable QListView::Batched optimization for the thumbnail - bars BUGS: 468593 FIXED-IN: 8.1.0 - ---- - NEWS | 3 ++- - core/app/items/thumbbar/itemthumbnailbar.cpp | 5 +++++ - core/showfoto/thumbbar/showfotothumbnailbar.cpp | 5 +++++ - core/utilities/import/views/importthumbnailbar.cpp | 5 +++++ - 4 files changed, 17 insertions(+), 1 deletion(-) - -diff --git a/core/app/items/thumbbar/itemthumbnailbar.cpp b/core/app/items/thumbbar/itemthumbnailbar.cpp -index 4f1d10b8ba..ebfc0c7a95 100644 ---- a/core/app/items/thumbbar/itemthumbnailbar.cpp -+++ b/core/app/items/thumbbar/itemthumbnailbar.cpp -@@ -62,6 +62,11 @@ ItemThumbnailBar::ItemThumbnailBar(QWidget* const parent) - setAcceptDrops(true); - setDropIndicatorShown(false); - -+ // Disable QListView::Batched optimization -+ // for the thumbnail bar, see bug #468593 -+ -+ setLayoutMode(QListView::SinglePass); -+ - setScrollCurrentToCenter(ApplicationSettings::instance()->getScrollItemToCenter()); - setToolTipEnabled(ApplicationSettings::instance()->showToolTipsIsValid()); - -diff --git a/core/showfoto/thumbbar/showfotothumbnailbar.cpp b/core/showfoto/thumbbar/showfotothumbnailbar.cpp -index 1397270367..2a03213010 100644 ---- a/core/showfoto/thumbbar/showfotothumbnailbar.cpp -+++ b/core/showfoto/thumbbar/showfotothumbnailbar.cpp -@@ -66,6 +66,11 @@ ShowfotoThumbnailBar::ShowfotoThumbnailBar(QWidget* const parent) - setAcceptDrops(true); - setDropIndicatorShown(true); - -+ // Disable QListView::Batched optimization -+ // for the thumbnail bar, see bug #468593 -+ -+ setLayoutMode(QListView::SinglePass); -+ - // NOTE: use dynamic binding as this virtual method can be re-implemented in derived classes. - - this->slotSetupChanged(); -diff --git a/core/utilities/import/views/importthumbnailbar.cpp b/core/utilities/import/views/importthumbnailbar.cpp -index cad2feba1f..29bfebc65d 100644 ---- a/core/utilities/import/views/importthumbnailbar.cpp -+++ b/core/utilities/import/views/importthumbnailbar.cpp -@@ -55,6 +55,11 @@ ImportThumbnailBar::ImportThumbnailBar(QWidget* const parent) - setAcceptDrops(true); - setDropIndicatorShown(false); - -+ // Disable QListView::Batched optimization -+ // for the thumbnail bar, see bug #468593 -+ -+ setLayoutMode(QListView::SinglePass); -+ - setScrollCurrentToCenter(ApplicationSettings::instance()->getScrollItemToCenter()); - setToolTipEnabled(ImportSettings::instance()->showToolTipsIsValid()); - --- -2.40.1 - diff --git a/digikam-8.0.0-ffmpeg5.patch b/digikam-8.0.0-ffmpeg5.patch deleted file mode 100644 index d2659d0..0000000 --- a/digikam-8.0.0-ffmpeg5.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- digikam-8.0.0/core/libs/video/qtav/codec/AVDecoder.cpp 2023-04-12 19:24:31.000000000 +0300 -+++ digikam-8.0.0/core/libs/video/qtav/codec/AVDecoder.cpp 2023-04-15 19:43:54.000000000 +0300 -@@ -255,7 +255,7 @@ void AVDecoder::flush() - avcodec_flush_buffers(d_func().codec_ctx); - } - --#if LIBAVCODEC_VERSION_MAJOR >= 59 // ffmpeg >= 5 -+#ifdef HAVE_FFMPEG_VERSION5 // ffmpeg >= 5 - - static QHash ccs; - -@@ -302,9 +302,15 @@ void AVDecoder::setCodecContext(void* co - - if (!ctx) - { -+ -+#ifdef HAVE_FFMPEG_VERSION5 -+ -+ ccs.remove(ccs.key(d.codec_ctx)); -+ -+#endif -+ - avcodec_free_context(&d.codec_ctx); - d.codec_ctx = nullptr; -- - return; - } - diff --git a/digikam.spec b/digikam.spec index 4b6cebc..609b72d 100644 --- a/digikam.spec +++ b/digikam.spec @@ -5,8 +5,8 @@ Name: digikam Summary: A digital camera accessing & photo management application -Version: 8.0.0 -Release: 4%{?beta}%{?dist} +Version: 8.1.0 +Release: 1%{?beta}%{?dist} License: GPL-2.0-or-later URL: http://www.digikam.org/ @@ -24,10 +24,6 @@ Source0: http://download.kde.org/stable/digikam/%{version}/digiKam-%{version}.ta Source10: digikam-import.desktop ## upstream patches -# fix ffmpeg5-related mediaplayer crash https://bugs.kde.org/show_bug.cgi?id=468480 -Patch0: digikam-8.0.0-ffmpeg5.patch -# fix thumbbar scrolls to 100th image https://bugs.kde.org/show_bug.cgi?id=468593 -Patch1: digikam-8.0.0-disable-QListView-Batched-optimization-for-the-thumb.patch ## upstreamable patches @@ -261,6 +257,9 @@ update-desktop-database -q &> /dev/null %changelog +* Thu Jul 06 2023 Alexey Kurov - 8.1.0-1 +- digiKam-8.1.0 + * Fri May 19 2023 Alexey Kurov - 8.0.0-4 - updated rhel conditionals - Recommends: perl-Image-ExifTool diff --git a/sources b/sources index e67d105..3e2307a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (digiKam-8.0.0.tar.xz) = b66195650b52b56f27e3d527cf71672221f5468358ceb27147fa5dabd3b0f3c4b3eb1fd8b3469b05909abb48da0dc00d9a75ce0735464a0dc2d46a059f7e1333 +SHA512 (digiKam-8.1.0.tar.xz) = cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4