From 7ed52e44cdb7665f0c9b35235e2992df27f15f2e Mon Sep 17 00:00:00 2001
From: Jose Maldonado aka Yukiteru <josemald89@gmail.com>
Date: Thu, 25 Apr 2024 23:04:32 -0400
Subject: [PATCH] Fix support for Qt5CT and Qt6CT in profiles-m-r

This fix the next apps/binaries

*megasync
*merkaator
*mkvtoolnix-gui
*pinentry-qt
*psi
*psi-plus
*qnapi
*qpdfview
*qtox
*quiterss
*rpi-imager
---
 apparmor.d/profiles-m-r/megasync       | 5 +----
 apparmor.d/profiles-m-r/merkaartor     | 5 +----
 apparmor.d/profiles-m-r/mkvtoolnix-gui | 4 +---
 apparmor.d/profiles-m-r/pinentry-qt    | 2 --
 apparmor.d/profiles-m-r/psi            | 3 +--
 apparmor.d/profiles-m-r/psi-plus       | 3 +--
 apparmor.d/profiles-m-r/qnapi          | 3 +--
 apparmor.d/profiles-m-r/qpdfview       | 4 +---
 apparmor.d/profiles-m-r/qtox           | 6 +-----
 apparmor.d/profiles-m-r/quiterss       | 5 +----
 apparmor.d/profiles-m-r/rpi-imager     | 3 +--
 11 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/apparmor.d/profiles-m-r/megasync b/apparmor.d/profiles-m-r/megasync
index b619dfd5..35754db8 100644
--- a/apparmor.d/profiles-m-r/megasync
+++ b/apparmor.d/profiles-m-r/megasync
@@ -19,6 +19,7 @@ profile megasync @{exec_path} {
   include <abstractions/dri-enumerate>
   include <abstractions/mesa>
   include <abstractions/nameservice-strict>
+  include <abstractions/qt5>
   include <abstractions/qt5-compose-cache-write>
   include <abstractions/qt5-settings-write>
   include <abstractions/user-download-strict>
@@ -46,10 +47,6 @@ profile megasync @{exec_path} {
   owner "@{user_share_dirs}/data/Mega Limited/" rw,
   owner "@{user_share_dirs}/data/Mega Limited/**" rwkl -> "@{user_share_dirs}/data/Mega Limited/MEGAsync/#@{int}",
 
-  # To configure Qt5 settings (theme, font, icons, etc.) under DE/WM without Qt integration
-  owner @{user_config_dirs}/qt5ct/{,**} r,
-  /usr/share/qt5ct/** r,
-
   owner @{user_config_dirs}/QtProject.conf r,
 
   # Sync folder
diff --git a/apparmor.d/profiles-m-r/merkaartor b/apparmor.d/profiles-m-r/merkaartor
index a0f5d310..52bceb44 100644
--- a/apparmor.d/profiles-m-r/merkaartor
+++ b/apparmor.d/profiles-m-r/merkaartor
@@ -17,6 +17,7 @@ profile merkaartor @{exec_path} {
   include <abstractions/mesa>
   include <abstractions/dri-common>
   include <abstractions/dri-enumerate>
+  include <abstractions/qt5>
   include <abstractions/qt5-settings-write>
   include <abstractions/nameservice-strict>
   include <abstractions/ssl_certs>
@@ -44,10 +45,6 @@ profile merkaartor @{exec_path} {
   /var/lib/dbus/machine-id r,
   /etc/machine-id r,
 
-  # To configure Qt5 settings (theme, font, icons, etc.) under DE/WM without Qt integration
-  owner @{user_config_dirs}/qt5ct/{,**} r,
-  /usr/share/qt5ct/** r,
-
   /usr/share/hwdata/pnp.ids r,
 
   deny owner @{PROC}/@{pid}/cmdline r,
diff --git a/apparmor.d/profiles-m-r/mkvtoolnix-gui b/apparmor.d/profiles-m-r/mkvtoolnix-gui
index 95d9ac8f..ee2c4155 100644
--- a/apparmor.d/profiles-m-r/mkvtoolnix-gui
+++ b/apparmor.d/profiles-m-r/mkvtoolnix-gui
@@ -17,6 +17,7 @@ profile mkvtoolnix-gui @{exec_path} {
   include <abstractions/gtk>
   include <abstractions/mesa>
   include <abstractions/nameservice-strict>
+  include <abstractions/qt5>
   include <abstractions/qt5-compose-cache-write>
   include <abstractions/qt5-settings-write>
   include <abstractions/ssl_certs>
@@ -30,7 +31,6 @@ profile mkvtoolnix-gui @{exec_path} {
   @{bin}/mkvmerge      rPx,
   @{bin}/mediainfo-gui rPx,
 
-  /usr/share/qt5ct/** r,
   /usr/share/hwdata/pnp.ids r,
 
   /etc/fstab r,
@@ -50,8 +50,6 @@ profile mkvtoolnix-gui @{exec_path} {
   owner @{user_cache_dirs}/bunkus.org/mkvtoolnix-gui/**/ rw,
   owner @{user_cache_dirs}/bunkus.org/mkvtoolnix-gui/**/@{hex} rw,
 
-  owner @{user_config_dirs}/qt5ct/{,**} r,
-
   owner /tmp/#@{int} rw,
   owner /tmp/MKVToolNix-GUI-MuxConfig-* rwl -> /tmp/#@{int},
   owner /tmp/MKVToolNix-process-*.json rwl -> /tmp/#@{int},
diff --git a/apparmor.d/profiles-m-r/pinentry-qt b/apparmor.d/profiles-m-r/pinentry-qt
index b8499a11..eecb1364 100644
--- a/apparmor.d/profiles-m-r/pinentry-qt
+++ b/apparmor.d/profiles-m-r/pinentry-qt
@@ -26,7 +26,6 @@ profile pinentry-qt @{exec_path} {
 
   /usr/share/hwdata/pnp.ids r,
   /usr/share/icu/@{int}.@{int}/*.dat r,
-  /usr/share/qt5ct/** r,
 
   /var/lib/dbus/machine-id r,
   /etc/machine-id r,
@@ -38,7 +37,6 @@ profile pinentry-qt @{exec_path} {
 
   owner @{user_config_dirs}/kdeglobals r,
   owner @{user_config_dirs}/kwinrc r,
-  owner @{user_config_dirs}/qt5ct/{,**} r,
 
   owner /tmp/xauth_@{rand6} r,
   owner /dev/shm/#@{int} rw,
diff --git a/apparmor.d/profiles-m-r/psi b/apparmor.d/profiles-m-r/psi
index 7b951185..7e21a206 100644
--- a/apparmor.d/profiles-m-r/psi
+++ b/apparmor.d/profiles-m-r/psi
@@ -19,6 +19,7 @@ profile psi @{exec_path} {
   include <abstractions/gtk>
   include <abstractions/mesa>
   include <abstractions/nameservice-strict>
+  include <abstractions/qt5>
   include <abstractions/qt5-compose-cache-write>
   include <abstractions/qt5-settings-write>
   include <abstractions/ssl_certs>
@@ -44,7 +45,6 @@ profile psi @{exec_path} {
 
   /usr/share/hwdata/pnp.ids r,
   /usr/share/psi/{,**} r,
-  /usr/share/qt5ct/** r,
 
   /etc/debian_version r,
   /etc/fstab r,
@@ -60,7 +60,6 @@ profile psi @{exec_path} {
   owner @{user_config_dirs}/autostart/psi.desktop rw,
   owner @{user_config_dirs}/psi/ rw,
   owner @{user_config_dirs}/psi/** rwkl -> @{user_config_dirs}/psi/#@{int},
-  owner @{user_config_dirs}/qt5ct/{,**} r,
   owner @{user_share_dirs}/psi/ rw,
   owner @{user_share_dirs}/psi/** rwk,
 
diff --git a/apparmor.d/profiles-m-r/psi-plus b/apparmor.d/profiles-m-r/psi-plus
index b2ba57c2..d28dc19c 100644
--- a/apparmor.d/profiles-m-r/psi-plus
+++ b/apparmor.d/profiles-m-r/psi-plus
@@ -19,6 +19,7 @@ profile psi-plus @{exec_path} {
   include <abstractions/gtk>
   include <abstractions/mesa>
   include <abstractions/nameservice-strict>
+  include <abstractions/qt5>
   include <abstractions/qt5-compose-cache-write>
   include <abstractions/qt5-settings-write>
   include <abstractions/ssl_certs>
@@ -44,7 +45,6 @@ profile psi-plus @{exec_path} {
 
   /usr/share/hwdata/pnp.ids r,
   /usr/share/psi-plus/{,**} r,
-  /usr/share/qt5ct/** r,
 
   /etc/debian_version r,
   /etc/fstab r,
@@ -58,7 +58,6 @@ profile psi-plus @{exec_path} {
   owner @{user_config_dirs}/autostart/psi-plus.desktop rw,
   owner @{user_config_dirs}/psi+/ rw,
   owner @{user_config_dirs}/psi+/** rwkl -> @{user_config_dirs}/psi+/#@{int},
-  owner @{user_config_dirs}/qt5ct/{,**} r,
   owner @{user_share_dirs}/psi+/ rw,
   owner @{user_share_dirs}/psi+/** rwk,
 
diff --git a/apparmor.d/profiles-m-r/qnapi b/apparmor.d/profiles-m-r/qnapi
index 4c38c95b..8905cd5d 100644
--- a/apparmor.d/profiles-m-r/qnapi
+++ b/apparmor.d/profiles-m-r/qnapi
@@ -17,6 +17,7 @@ profile qnapi @{exec_path} {
   include <abstractions/gtk>
   include <abstractions/mesa>
   include <abstractions/nameservice-strict>
+  include <abstractions/qt5>
   include <abstractions/qt5-compose-cache-write>
   include <abstractions/qt5-settings-write>
   include <abstractions/user-download-strict>
@@ -42,7 +43,6 @@ profile qnapi @{exec_path} {
   @{bin}/xdg-open  rCx -> open,
   @{lib}/firefox/firefox rPx,
 
-  /usr/share/qt5ct/** r,
   /usr/share/hwdata/pnp.ids r,
 
   /etc/fstab r,
@@ -60,7 +60,6 @@ profile qnapi @{exec_path} {
   owner @{user_config_dirs}/qnapi.ini.* rwl -> @{user_config_dirs}/#@{int},
   owner @{user_config_dirs}/qnapi.ini.mlXXXY rwl -> @{user_config_dirs}/#@{int},
 
-  owner @{user_config_dirs}/qt5ct/{,**} r,
   owner @{user_cache_dirs}/ rw,
 
         /tmp/ r,
diff --git a/apparmor.d/profiles-m-r/qpdfview b/apparmor.d/profiles-m-r/qpdfview
index 8664a54c..28ec6f84 100644
--- a/apparmor.d/profiles-m-r/qpdfview
+++ b/apparmor.d/profiles-m-r/qpdfview
@@ -17,6 +17,7 @@ profile qpdfview @{exec_path} {
   include <abstractions/gtk>
   include <abstractions/mesa>
   include <abstractions/nameservice-strict>
+  include <abstractions/qt5>
   include <abstractions/qt5-compose-cache-write>
   include <abstractions/qt5-settings-write>
   include <abstractions/thumbnails-cache-read>
@@ -35,7 +36,6 @@ profile qpdfview @{exec_path} {
 
   /usr/share/hwdata/pnp.ids r,
   /usr/share/poppler/** r,
-  /usr/share/qt5ct/** r,
   /usr/share/djvu/** r,
 
   /etc/fstab r,
@@ -55,8 +55,6 @@ profile qpdfview @{exec_path} {
   owner @{user_share_dirs}/qpdfview/ rw,
   owner @{user_share_dirs}/qpdfview/** rwk,
 
-  owner @{user_config_dirs}/qt5ct/{,**} r,
-
   owner /dev/shm/#@{int} rw,
   owner /tmp/@{hex} rw,
   owner /tmp/#@{int} rw,
diff --git a/apparmor.d/profiles-m-r/qtox b/apparmor.d/profiles-m-r/qtox
index 74408fe6..8b243e8f 100644
--- a/apparmor.d/profiles-m-r/qtox
+++ b/apparmor.d/profiles-m-r/qtox
@@ -16,6 +16,7 @@ profile qtox @{exec_path} {
   include <abstractions/fontconfig-cache-read>
   include <abstractions/graphics>
   include <abstractions/nameservice-strict>
+  include <abstractions/qt5>
   include <abstractions/qt5-settings-write>
   include <abstractions/user-download-strict>
 
@@ -29,8 +30,6 @@ profile qtox @{exec_path} {
 
   @{open_path}  rPx -> child-open,
 
-  /usr/share/qt5ct/** r,
-
   /var/lib/dbus/machine-id r,
   /etc/machine-id r,
 
@@ -50,9 +49,6 @@ profile qtox @{exec_path} {
   owner @{user_share_dirs}/qTox/ rw,
   owner @{user_share_dirs}/qTox/** rw,
 
-  # To configure Qt5 settings (theme, font, icons, etc.) under DE/WM without Qt integration
-  owner @{user_config_dirs}/qt5ct/{,**} r,
-
   owner @{PROC}/@{pid}/cmdline r,
         @{PROC}/sys/kernel/core_pattern r,  # for KCrash::initialize()
 
diff --git a/apparmor.d/profiles-m-r/quiterss b/apparmor.d/profiles-m-r/quiterss
index 12425d52..c1d7944c 100644
--- a/apparmor.d/profiles-m-r/quiterss
+++ b/apparmor.d/profiles-m-r/quiterss
@@ -15,6 +15,7 @@ profile quiterss @{exec_path} {
   include <abstractions/fonts>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/freedesktop.org>
+  include <abstractions/qt5>
   include <abstractions/qt5-settings-write>
   include <abstractions/qt5-compose-cache-write>
   include <abstractions/mesa>
@@ -37,10 +38,6 @@ profile quiterss @{exec_path} {
 
   @{bin}/xdg-open rCx -> open,
 
-  # To configure Qt5 settings (theme, font, icons, etc.) under DE/WM without Qt integration
-  owner @{user_config_dirs}/qt5ct/{,**} r,
-  /usr/share/qt5ct/** r,
-
   /usr/share/quiterss/** r,
   owner @{user_config_dirs}/QuiteRss/ rw,
   owner @{user_config_dirs}/QuiteRss/** rwkl -> @{user_config_dirs}/QuiteRss/**,
diff --git a/apparmor.d/profiles-m-r/rpi-imager b/apparmor.d/profiles-m-r/rpi-imager
index 75e855f9..946219e9 100644
--- a/apparmor.d/profiles-m-r/rpi-imager
+++ b/apparmor.d/profiles-m-r/rpi-imager
@@ -21,6 +21,7 @@ profile rpi-imager @{exec_path} {
   include <abstractions/mesa>
   include <abstractions/nameservice-strict>
   include <abstractions/opencl>
+  include <abstractions/qt5>
   include <abstractions/qt5-shader-cache>
   include <abstractions/ssl_certs>
   include <abstractions/user-download-strict>
@@ -43,7 +44,6 @@ profile rpi-imager @{exec_path} {
   /etc/fstab r,
   /etc/X11/cursors/*.theme r,
   /usr/share/hwdata/pnp.ids r,
-  /usr/share/qt5ct/** r,
   /usr/share/X11/xkb/{,**} r,
 
   /etc/machine-id r,
@@ -53,7 +53,6 @@ profile rpi-imager @{exec_path} {
   owner "@{user_cache_dirs}/Raspberry Pi/**" rwl -> "@{user_cache_dirs}/Raspberry Pi/**",
   owner "@{user_config_dirs}/Raspberry Pi/{,**}" rw,
   owner @{user_cache_dirs}/ rw,
-  owner @{user_config_dirs}/qt5ct/{,**} r,
   owner @{user_config_dirs}/QtProject.conf r,
 
   owner @{PROC}/@{pid}/cmdline r,