From 370907bc14fee89eb1c489c2961ca7a35d8387e5 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Feb 20 2024 18:47:36 +0000 Subject: Backport more changes as patches Enable maliit-keyboard by default Provide default mimeapps associations overrides over plasma-desktop --- diff --git a/0001-Rebase-default-mimeapps-associations-over-upstream-s.patch b/0001-Rebase-default-mimeapps-associations-over-upstream-s.patch new file mode 100644 index 0000000..8c9764f --- /dev/null +++ b/0001-Rebase-default-mimeapps-associations-over-upstream-s.patch @@ -0,0 +1,239 @@ +From fca017b4af5ddd09c37a66696e141ca24dfb0167 Mon Sep 17 00:00:00 2001 +From: Alessandro Astone +Date: Tue, 20 Feb 2024 18:58:08 +0100 +Subject: [PATCH] Rebase default mimeapps associations over upstream settings + +plasma-desktop now provides /usr/share/applications/kde-mimeapps.list +--- + usr/share/applications/kde-mimeapps.list | 141 ------------------ + .../kde-profile/default/xdg/kde-mimeapps.list | 70 +++++++++ + 2 files changed, 70 insertions(+), 141 deletions(-) + delete mode 100644 usr/share/applications/kde-mimeapps.list + create mode 100644 usr/share/kde-settings/kde-profile/default/xdg/kde-mimeapps.list + +diff --git a/usr/share/applications/kde-mimeapps.list b/usr/share/applications/kde-mimeapps.list +deleted file mode 100644 +index 464958b..0000000 +--- a/usr/share/applications/kde-mimeapps.list ++++ /dev/null +@@ -1,141 +0,0 @@ +-[Default Applications] +-application/msword=org.kde.calligrawords.desktop; +-application/pdf=okularApplication_pdf.desktop; +-application/postscript=okularApplication_ghostview.desktop.desktop; +-application/rtf=org.kde.calligrawords.desktop +-application/vnd.ms-excel=org.kde.calligrasheets.desktop; +-application/vnd.ms-powerpoint=org.kde.calligrastage.desktop; +-application/vnd.ms-works=org.kde.calligrawords.desktop; +-application/vnd.oasis.opendocument.presentation=org.kde.calligrastage.desktop; +-application/vnd.oasis.opendocument.presentation-template=org.kde.calligrastage.desktop; +-application/vnd.oasis.opendocument.spreadsheet=org.kde.calligrasheets.desktop; +-application/vnd.oasis.opendocument.text=org.kde.calligrawords.deskto; +-application/vnd.oasis.opendocument.text-master=org.kde.calligrawords.desktop; +-application/vnd.oasis.opendocument.text-template=org.kde.calligrawords.desktop; +-application/vnd.openxmlformats-officedocument.presentationml.presentation=org.kde.calligrastage.desktop; +-application/vnd.openxmlformats-officedocument.presentationml.template=org.kde.calligrastage.desktop; +-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=org.kde.calligrasheets.desktop; +-application/vnd.openxmlformats-officedocument.spreadsheetml.template=org.kde.calligrasheets.desktop; +-application/vnd.openxmlformats-officedocument.wordprocessingml.document=org.kde.calligrawords.desktop; +-application/vnd.openxmlformats-officedocument.wordprocessingml.template=org.kde.calligrawords.desktop; +-application/vnd.wordperfect=org.kde.calligrawords.desktop; +-application/x-arj=org.kde.ark.desktop; +-application/x-bittorrent=org.kde.ktorrent.desktop;org.kde.kget.desktop; +-application/x-bzip-compressed-tar=org.kde.ark.desktop; +-application/x-bzip=org.kde.ark.desktop; +-application/x-compressed-tar=org.kde.ark.desktop; +-application/x-compress=org.kde.ark.desktop; +-application/x-dvi=okularApplication_dvi.desktop; +-application/x-extension-m4a=org.kde.dragonplayer.desktop; +-application/x-extension-mp4=org.kde.dragonplayer.desktop; +-application/x-flac=org.kde.dragonplayer.desktop; +-application/x-gzip=org.kde.ark.desktop; +-application/xhtml+xml=firefox.desktop;kfmclient_html.desktop +-application/x-kpresenter=org.kde.calligrastage.desktop; +-application/x-kspread=org.kde.calligrasheets.desktop; +-application/x-lha=org.kde.ark.desktop; +-application/x-lhz=org.kde.ark.desktop; +-application/x-lzop=org.kde.ark.desktop; +-application/x-matroska=org.kde.dragonplayer.desktop; +-application/x-mswrite=org.kde.calligrawords.desktop; +-application/x-netshow-channel=org.kde.dragonplayer.desktop; +-application/x-ogm-audio=kde4-amarok.desktop; +-application/x-quattropro=org.kde.calligrasheets.desktop; +-application/x-quicktime-media-link=org.kde.dragonplayer.desktop; +-application/x-quicktimeplayer=org.kde.dragonplayer.desktop; +-application/x-rar=org.kde.ark.desktop; +-application/x-rpm=org.kde.discover.desktop;gpk-install-local-file.desktop; +-application/x-smil=org.kde.dragonplayer.desktop; +-application/x-tar=org.kde.ark.desktop; +-application/x-tarz=org.kde.ark.desktop; +-application/x-zoo=org.kde.ark.desktop; +-application/zip=org.kde.ark.desktop; +-audio/aac=kde4-amarok.desktop; +-audio/mp4=kde4-amarok.desktop; +-audio/mpeg=kde4-amarok.desktop; +-audio/mpegurl=kde4-amarok.desktop; +-audio/ogg=kde4-amarok.desktop; +-audio/vnd.rn-realaudio=kde4-amarok.desktop; +-audio/vorbis=kde4-amarok.desktop; +-audio/x-flac=kde4-amarok.desktop; +-audio/x-mp3=kde4-amarok.desktop; +-audio/x-mpegurl=kde4-amarok.desktop; +-audio/x-ms-wma=kde4-amarok.desktop; +-audio/x-musepack=kde4-amarok.desktop; +-audio/x-oggflac=kde4-amarok.desktop; +-audio/x-pn-realaudio=kde4-amarok.desktop; +-audio/x-scpls=kde4-amarok.desktop; +-audio/x-speex=kde4-amarok.desktop; +-audio/x-vorbis=kde4-amarok.desktop; +-audio/x-vorbis+ogg=kde4-amarok.desktop; +-audio/x-wav=kde4-amarok.desktop; +-image/bmp=org.kde.gwenview.desktop +-image/gif=org.kde.gwenview.desktop; +-image/jpeg=org.kde.gwenview.desktop; +-image/jpg=org.kde.gwenview.desktop; +-image/pjpeg=org.kde.gwenview.desktop; +-image/png=org.kde.gwenview.desktop; +-image/svg+xml=org.kde.gwenview.desktop; +-image/tiff=org.kde.gwenview.desktop; +-image/x-icb=org.kde.gwenview.desktop; +-image/x-ico=org.kde.gwenview.desktop; +-image/x-pcx=org.kde.gwenview.desktop; +-image/x-portable-anymap=org.kde.gwenview.desktop; +-image/x-portable-bitmap=org.kde.gwenview.desktop; +-image/x-portable-graymap=org.kde.gwenview.desktop; +-image/x-portable-pixmap=org.kde.gwenview.desktop; +-image/x-xbitmap=org.kde.gwenview.desktop; +-image/x-xpixmap=org.kde.gwenview.desktop; +-image/x-xwindowdump=org.kde.gwenview.desktop; +-inode/directory=org.kde.dolphin.desktop; +-text/calendar=org.kde.korganizer.desktop; +-text/csv=org.kde.calligrasheets.desktop; +-text/html=firefox.desktop;kfmclient_html.desktop; +-text/plain=org.kde.kwrite.desktop;org.kde.kate.desktop; +-video/3gpp=org.kde.dragonplayer.desktop; +-video/dv=org.kde.dragonplayer.desktop; +-video/fli=org.kde.dragonplayer.desktop; +-video/flv=org.kde.dragonplayer.desktop; +-video/mp4=org.kde.dragonplayer.desktop; +-video/mp4v-es=org.kde.dragonplayer.desktop; +-video/mpeg=org.kde.dragonplayer.desktop; +-video/msvideo=org.kde.dragonplayer.desktop; +-video/ogg=org.kde.dragonplayer.desktop; +-video/quicktime=org.kde.dragonplayer.desktop; +-video/vivo=org.kde.dragonplayer.desktop; +-video/vnd.divx=org.kde.dragonplayer.desktop; +-video/vnd.vivo=org.kde.dragonplayer.desktop; +-video/x-anim=org.kde.dragonplayer.desktop; +-video/x-avi=org.kde.dragonplayer.desktop; +-video/x-flc=org.kde.dragonplayer.desktop; +-video/x-flic=org.kde.dragonplayer.desktop; +-video/x-fli=org.kde.dragonplayer.desktop; +-video/x-flv=org.kde.dragonplayer.desktop; +-video/x-m4v=org.kde.dragonplayer.desktop; +-video/x-matroska=org.kde.dragonplayer.desktop; +-video/x-mpeg=org.kde.dragonplayer.desktop; +-video/x-ms-asf=org.kde.dragonplayer.desktop; +-video/x-msvideo=org.kde.dragonplayer.desktop; +-video/x-ms-wm=org.kde.dragonplayer.desktop; +-video/x-ms-wmv=org.kde.dragonplayer.desktop; +-video/x-ms-wmx=org.kde.dragonplayer.desktop; +-video/x-ms-wvx=org.kde.dragonplayer.desktop; +-video/x-nsv=org.kde.dragonplayer.desktop; +-video/x-ogm+ogg=org.kde.dragonplayer.desktop; +-video/x-theora+ogg=org.kde.dragonplayer.desktop; +-x-content/audio-cdda=kde4-amarok.desktop;org.kde.juk.desktop; +-x-content/audio-dvd=kde4-amarok.desktop;org.kde.juk.desktop; +-x-content/audio-player=kde4-amarok.desktop;org.kde.juk.desktop; +-x-content/blank-bd=org.kde.k3b.desktop; +-x-content/blank-cd=org.kde.k3b.desktop; +-x-content/blank-dvd=org.kde.k3b.desktop; +-x-content/blank-hddvd=org.kde.k3b.desktop; +-x-content/image-dcf=digikam.desktop;org.kde.gwenview.desktop; +-x-content/image-picturecd=digikam.desktop;org.kde.gwenview.desktop; +-x-content/video-blueray=org.kde.dragonplayer.desktop; +-x-content/video-dvd=org.kde.dragonplayer.desktop; +-x-content/video-hddvd=org.kde.dragonplayer.desktop; +-x-content/video-svcd=org.kde.dragonplayer.desktop; +-x-content/video-vcd=org.kde.dragonplayer.desktop; +-x-scheme-handler/http=firefox.desktop;kfmclient_html.desktop +-x-scheme-handler/https=firefox.desktop;kfmclient_html.desktop +diff --git a/usr/share/kde-settings/kde-profile/default/xdg/kde-mimeapps.list b/usr/share/kde-settings/kde-profile/default/xdg/kde-mimeapps.list +new file mode 100644 +index 0000000..8c1a6bc +--- /dev/null ++++ b/usr/share/kde-settings/kde-profile/default/xdg/kde-mimeapps.list +@@ -0,0 +1,70 @@ ++# This file contains Fedora overrides over the KDE defaults ++# found at /usr/share/applications/kde-mimeapps.list ++ ++[Default Applications] ++# Packages ++application/x-rpm=org.kde.discover.desktop ++application/vnd.debian.binary-package=org.kde.ark.desktop ++ ++# Browser ++x-scheme-handler/http=org.mozilla.firefox.desktop ++x-scheme-handler/https=org.mozilla.firefox.desktop ++application/xhtml+xml=org.mozilla.firefox.desktop ++text/html=org.mozilla.firefox.desktop ++ ++# Video Player ++application/x-extension-m4a=org.kde.dragonplayer.desktop ++application/x-extension-mp4=org.kde.dragonplayer.desktop ++application/x-flac=org.kde.dragonplayer.desktop ++application/x-matroska=org.kde.dragonplayer.desktop ++application/x-netshow-channel=org.kde.dragonplayer.desktop ++application/x-quicktime-media-link=org.kde.dragonplayer.desktop ++application/x-quicktimeplayer=org.kde.dragonplayer.desktop ++application/x-smil=org.kde.dragonplayer.desktop ++video/3gp=org.kde.dragonplayer.desktop ++video/3gpp2=org.kde.dragonplayer.desktop ++video/3gpp=org.kde.dragonplayer.desktop ++video/avi=org.kde.dragonplayer.desktop ++video/divx=org.kde.dragonplayer.desktop ++video/dv=org.kde.dragonplayer.desktop ++video/fli=org.kde.dragonplayer.desktop ++video/flv=org.kde.dragonplayer.desktop ++video/mp2t=org.kde.dragonplayer.desktop ++video/mp4=org.kde.dragonplayer.desktop ++video/mp4v-es=org.kde.dragonplayer.desktop ++video/mpeg=org.kde.dragonplayer.desktop ++video/msvideo=org.kde.dragonplayer.desktop ++video/ogg=org.kde.dragonplayer.desktop ++video/quicktime=org.kde.dragonplayer.desktop ++video/vivo=org.kde.dragonplayer.desktop ++video/vnd.divx=org.kde.dragonplayer.desktop ++video/vnd.mpegurl=org.kde.dragonplayer.desktop ++video/vnd.rn-realvideo=org.kde.dragonplayer.desktop ++video/vnd.vivo=org.kde.dragonplayer.desktop ++video/webm=org.kde.dragonplayer.desktop ++video/x-anim=org.kde.dragonplayer.desktop ++video/x-avi=org.kde.dragonplayer.desktop ++video/x-flc=org.kde.dragonplayer.desktop ++video/x-flic=org.kde.dragonplayer.desktop ++video/x-fli=org.kde.dragonplayer.desktop ++video/x-flv=org.kde.dragonplayer.desktop ++video/x-m4v=org.kde.dragonplayer.desktop ++video/x-matroska=org.kde.dragonplayer.desktop ++video/x-mpeg2=org.kde.dragonplayer.desktop ++video/x-mpeg=org.kde.dragonplayer.desktop ++video/x-ms-asf=org.kde.dragonplayer.desktop ++video/x-msvideo=org.kde.dragonplayer.desktop ++video/x-ms-wm=org.kde.dragonplayer.desktop ++video/x-ms-wmv=org.kde.dragonplayer.desktop ++video/x-ms-wmx=org.kde.dragonplayer.desktop ++video/x-ms-wvx=org.kde.dragonplayer.desktop ++video/x-nsv=org.kde.dragonplayer.desktop ++video/x-ogm+ogg=org.kde.dragonplayer.desktop ++video/x-ogm=org.kde.dragonplayer.desktop ++video/x-theora+ogg=org.kde.dragonplayer.desktop ++video/x-theora=org.kde.dragonplayer.desktop ++x-content/video-blueray=org.kde.dragonplayer.desktop ++x-content/video-dvd=org.kde.dragonplayer.desktop ++x-content/video-hddvd=org.kde.dragonplayer.desktop ++x-content/video-svcd=org.kde.dragonplayer.desktop ++x-content/video-vcd=org.kde.dragonplayer.desktop +-- +2.43.2 + diff --git a/0001-kwinrc-Enable-maliit-keyboard-by-default.patch b/0001-kwinrc-Enable-maliit-keyboard-by-default.patch new file mode 100644 index 0000000..9402a02 --- /dev/null +++ b/0001-kwinrc-Enable-maliit-keyboard-by-default.patch @@ -0,0 +1,22 @@ +From 48904d23a501fb4835170d91c4d2b8f8ab1ae4f5 Mon Sep 17 00:00:00 2001 +From: Alessandro Astone +Date: Fri, 9 Feb 2024 21:40:57 +0100 +Subject: [PATCH] kwinrc: Enable maliit-keyboard by default + +--- + usr/share/kde-settings/kde-profile/default/xdg/kwinrc | 3 +++ + 1 file changed, 3 insertions(+) + create mode 100644 usr/share/kde-settings/kde-profile/default/xdg/kwinrc + +diff --git a/usr/share/kde-settings/kde-profile/default/xdg/kwinrc b/usr/share/kde-settings/kde-profile/default/xdg/kwinrc +new file mode 100644 +index 0000000..558f530 +--- /dev/null ++++ b/usr/share/kde-settings/kde-profile/default/xdg/kwinrc +@@ -0,0 +1,3 @@ ++[Wayland] ++InputMethod[$e]=/usr/share/applications/com.github.maliit.keyboard.desktop ++VirtualKeyboardEnabled=true +-- +2.43.2 + diff --git a/kde-settings.spec b/kde-settings.spec index d1d6aa7..e75c712 100644 --- a/kde-settings.spec +++ b/kde-settings.spec @@ -7,7 +7,7 @@ Summary: Config files for KDE Name: kde-settings Version: 39.1 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT Url: https://pagure.io/fedora-kde/kde-settings @@ -17,6 +17,8 @@ Source1: COPYING # Temporarily as a patch until f40 backgrounds exist to bump to 40 Patch0: 0001-Add-initial-setup-configuration-with-kwin_wayland.patch Patch1: 0001-Revert-kwinrc-Disable-the-Blur-plugin-in-kwin-by-def.patch +Patch2: 0001-kwinrc-Enable-maliit-keyboard-by-default.patch +Patch3: 0001-Rebase-default-mimeapps-associations-over-upstream-s.patch BuildArch: noarch @@ -46,6 +48,8 @@ Requires: pam Requires: xdg-user-dirs ## add breeze deps here? probably, need more too -- rex Requires: breeze-icon-theme +# Baseline mimeapps associations, e.g. LibreOffice +Requires: shared-mime-info %description %{summary}. @@ -206,7 +210,6 @@ test -f %{_datadir}/wallpapers/F%{version_maj} || ls -l %{_datadir}/wallpapers # drop noreplace, so we can be sure to get the new kiosk bits %config %{_sysconfdir}/kderc %config %{_sysconfdir}/kde4rc -%{_datadir}/applications/kde-mimeapps.list %if 0%{?rhel} && 0%{?rhel} <= 7 %exclude %{_datadir}/kde-settings/kde-profile/default/share/apps/plasma-desktop/init/00-defaultLayout.js %endif @@ -246,6 +249,10 @@ test -f %{_datadir}/wallpapers/F%{version_maj} || ls -l %{_datadir}/wallpapers %changelog +* Tue Feb 20 2024 Alessandro Astone - 39.1-7 +- Enable maliit-keyboard by default +- Provide default mimeapps associations overrides over plasma-desktop + * Fri Feb 02 2024 Alessandro Astone - 39.1-6 - Re-enable kwin blur plugin