$ git diff --patch-with-stat --summary 2b93026c270be8e59213805109a737216b768c01..c59c65cf8f714cc008963d58b56055300cd01be0
.abf.yml | 2 +-
kio-extras-20.12.2-thumbnailers-avif-jxl.patch | 11 ---------
kio-extras.spec | 32 ++++++++++++--------------
3 files changed, 16 insertions(+), 29 deletions(-)
delete mode 100644 kio-extras-20.12.2-thumbnailers-avif-jxl.patch
diff --git a/.abf.yml b/.abf.yml
index 6f0765a..1b9ccc5 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- kio-extras-21.12.2.tar.xz: 39329e1ff961ccec45a1b96c7ce4f57a5f4c7a51
+ kio-extras-kf5-24.02.2.tar.xz: c15066e5ab9abce1fd61cef344e65360c128357b
diff --git a/kio-extras-20.12.2-thumbnailers-avif-jxl.patch b/kio-extras-20.12.2-thumbnailers-avif-jxl.patch
deleted file mode 100644
index e04736f..0000000
--- a/kio-extras-20.12.2-thumbnailers-avif-jxl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up kio-extras-21.03.80/thumbnail/imagethumbnail.desktop.2~ kio-extras-21.03.80/thumbnail/imagethumbnail.desktop
---- kio-extras-21.03.80/thumbnail/imagethumbnail.desktop.2~ 2021-03-23 01:44:33.848148249 +0100
-+++ kio-extras-21.03.80/thumbnail/imagethumbnail.desktop 2021-03-23 01:55:45.152930428 +0100
-@@ -69,6 +69,6 @@ Name[x-test]=xxImages (GIF, PNG, BMP, ..
- Name[zh_CN]=图像 (GIF、PNG、BMP 等)
- Name[zh_TW]=影像（GIF、PNG、BMP...）
- X-KDE-ServiceTypes=ThumbCreator
--MimeType=image/cgm;image/fax-g3;image/gif;image/jp2;image/png;image/tiff;image/bmp;image/x-dds;image/x-jng;image/x-pcx;image/vnd.zbrush.pcx;image/x-photo-cd;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-rgb;image/x-tga;image/x-xbitmap;image/x-xcf;image/x-xpixmap;image/x-sun-raster;image/vnd.adobe.photoshop;image/x-psd;image/x-hdr;image/x-pic;image/x-icon;image/x-webp;image/webp;image/x-icns;video/x-mng;image/rle;image/avif;
-+MimeType=image/cgm;image/fax-g3;image/gif;image/jp2;image/png;image/tiff;image/bmp;image/x-dds;image/x-jng;image/x-pcx;image/vnd.zbrush.pcx;image/x-photo-cd;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-rgb;image/x-tga;image/x-xbitmap;image/x-xcf;image/x-xpixmap;image/x-sun-raster;image/vnd.adobe.photoshop;image/x-psd;image/x-hdr;image/x-pic;image/x-icon;image/x-webp;image/webp;image/x-icns;video/x-mng;image/rle;image/avif;image/jxl;
- X-KDE-Library=imagethumbnail
- CacheThumbnail=true
diff --git a/kio-extras.spec b/kio-extras.spec
index a259f45..43f444c 100644
--- a/kio-extras.spec
+++ b/kio-extras.spec
@@ -3,14 +3,12 @@
%define plasmaver %(echo %{version} |cut -d. -f1-3)
Name: kio-extras
-Version: 21.12.2
-Release: 1
-Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-%{version}.tar.xz
+Version: 24.02.2
+Release: 1
+Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-kf5-%{version}.tar.xz
Source1000: %{name}.rpmlintrc
# https://bugzilla.samba.org/show_bug.cgi?id=12456
Patch1: kio-extras-smb_anon.patch
-# Teach thumbnailers about AVIF and JXL
-Patch2: kio-extras-20.12.2-thumbnailers-avif-jxl.patch
Summary: KDE 5 I/O Extras
URL: http://kde.org/
License: GPL
@@ -35,6 +33,9 @@ BuildRequires: pkgconfig(libssh) >= 0.8.5
BuildRequires: pkgconfig(smbclient)
BuildRequires: pkgconfig(taglib)
BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(libimobiledevice-1.0)
+BuildRequires: pkgconfig(libplist-2.0)
+BuildRequires: pkgconfig(libappimage)
BuildRequires: cmake(ECM)
BuildRequires: cmake(KF5DNSSD)
BuildRequires: cmake(KF5KDELibs4Support)
@@ -51,6 +52,7 @@ BuildRequires: cmake(KF5Activities)
BuildRequires: cmake(KF5SyntaxHighlighting)
BuildRequires: cmake(KDSoap)
BuildRequires: cmake(KF5ActivitiesStats)
+BuildRequires: cmake(KF5KExiv2)
# There's no point in a separate molletnetwork package.
# This is an internal library that doesn't even ship
# headers or a *.so file, so nothing outside of this
@@ -62,8 +64,10 @@ Obsoletes: %{mklibname molletnetwork5 20} < %{EVRD}
Obsoletes: %{mklibname molletnetwork5 19} < %{EVRD}
Obsoletes: %{mklibname molletnetwork5 18} < %{EVRD}
Obsoletes: %{mklibname molletnetwork5 17} < %{EVRD}
-Requires: %{mklibname kioarchive 5} = %{EVRD}
+Requires: %{mklibname kioarchive} = %{EVRD}
Requires: kio
+# For shared files (desktop files and all)
+Requires: plasma6-kio-extras
%rename kio-mtp
%rename kfileaudiopreview
%define kioarchive_devel %{mklibname -d kioarchive}
@@ -76,13 +80,13 @@ KDE 5 I/O Extras.
%package -n %{kioarchive_devel}
Summary: Development files for the KIO Archive library
Group: Development/KDE and Qt
-Requires: %{mklibname kioarchive 5} = %{EVRD}
+Requires: %{mklibname kioarchive} = %{EVRD}
%description -n %{kioarchive_devel}
Development files for the KIO Archive library
%prep
-%autosetup -n %{name}-%{plasmaver} -p1
+%autosetup -n %{name}-kf5-%{plasmaver} -p1
%cmake_kde5
@@ -99,20 +103,14 @@ Development files for the KIO Archive library
%{_libdir}/qt5/plugins/kf5/kio/*.so
%{_libdir}/qt5/plugins/kf5/kiod/*.so
%{_libdir}/qt5/plugins/kf5/kded/*.so
-%{_datadir}/config.kcfg/*.kcfg
-%{_datadir}/dbus-1/services/*.service
-%{_datadir}/remoteview
-%{_datadir}/kio_bookmarks
-%{_datadir}/kio_docfilter
-%{_datadir}/kio_info
-%{_datadir}/konqueror/dirtree/remote/*.desktop
+%{_libdir}/qt5/plugins/kf5/thumbcreator
%{_datadir}/kservices5/*.desktop
%{_datadir}/kservicetypes5/*.desktop
-%{_datadir}/solid/actions/solid_mtp.desktop
%{_datadir}/qlogging-categories5/kio-extras.renamecategories
%{_libdir}/qt5/plugins/kf5/kfileitemaction/kactivitymanagerd_fileitem_linking_plugin.so
+%{_libdir}/qt5/plugins/kf5/kfileitemaction/forgetfileitemaction.so
%{_libdir}/libexec/kf5/smbnotifier
%files -n %{kioarchive_devel}
-%{_includedir}/KF5/*
+%{_includedir}/KioArchive
%{_libdir}/cmake/KioArchive