From 004572349d0e43169f3fdf98e5b5e86774f8234a Mon Sep 17 00:00:00 2001
From: Jose Maldonado aka Yukiteru <josemald89@gmail.com>
Date: Thu, 25 Apr 2024 21:57:42 -0400
Subject: [PATCH] Fix support for Qt5 and Qt6 in Akonadi group

---
 apparmor.d/groups/akonadi/akonadi_akonotes_resource  | 2 +-
 apparmor.d/groups/akonadi/akonadi_birthdays_resource | 2 +-
 apparmor.d/groups/akonadi/akonadi_ical_resource      | 2 +-
 apparmor.d/groups/akonadi/akonadi_mailmerge_agent    | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apparmor.d/groups/akonadi/akonadi_akonotes_resource b/apparmor.d/groups/akonadi/akonadi_akonotes_resource
index 43af2328..aea9bf79 100644
--- a/apparmor.d/groups/akonadi/akonadi_akonotes_resource
+++ b/apparmor.d/groups/akonadi/akonadi_akonotes_resource
@@ -13,12 +13,12 @@ profile akonadi_akonotes_resource @{exec_path} {
   include <abstractions/freedesktop.org>
   include <abstractions/graphics>
   include <abstractions/nameservice-strict>
+  include <abstractions/qt5>
   include <abstractions/X-strict>
 
   @{exec_path} mr,
 
   /usr/share/hwdata/*.ids r,
-  /usr/share/qt/translations/*.qm r,
 
   /etc/xdg/kdeglobals r,
   /etc/xdg/kwinrc r,
diff --git a/apparmor.d/groups/akonadi/akonadi_birthdays_resource b/apparmor.d/groups/akonadi/akonadi_birthdays_resource
index f9868413..bfc042c8 100644
--- a/apparmor.d/groups/akonadi/akonadi_birthdays_resource
+++ b/apparmor.d/groups/akonadi/akonadi_birthdays_resource
@@ -13,6 +13,7 @@ profile akonadi_birthdays_resource @{exec_path} {
   include <abstractions/freedesktop.org>
   include <abstractions/graphics>
   include <abstractions/nameservice-strict>
+  include <abstractions/qt5>
   include <abstractions/X-strict>
 
   @{exec_path} mr,
@@ -20,7 +21,6 @@ profile akonadi_birthdays_resource @{exec_path} {
   /usr/share/akonadi/plugins/{,**} r,
   /usr/share/hwdata/*.ids r,
   /usr/share/icu/@{int}.@{int}/*.dat r,
-  /usr/share/qt{5,}/translations/*.qm r,
 
   /etc/xdg/kdeglobals r,
   /etc/xdg/kwinrc r,
diff --git a/apparmor.d/groups/akonadi/akonadi_ical_resource b/apparmor.d/groups/akonadi/akonadi_ical_resource
index 69bf47b8..7c1b4ea6 100644
--- a/apparmor.d/groups/akonadi/akonadi_ical_resource
+++ b/apparmor.d/groups/akonadi/akonadi_ical_resource
@@ -11,6 +11,7 @@ profile akonadi_ical_resource @{exec_path} {
   include <abstractions/base>
   include <abstractions/graphics>
   include <abstractions/nameservice-strict>
+  include <abstractions/qt5>
   include <abstractions/X-strict>
 
   @{exec_path} mr,
@@ -18,7 +19,6 @@ profile akonadi_ical_resource @{exec_path} {
   /usr/share/hwdata/*.ids r,
   /usr/share/icons/{,**} r,
   /usr/share/mime/{,**} r,
-  /usr/share/qt/translations/*.qm r,
 
   owner @{user_cache_dirs}/akonadi_ical_resource_[0-9]/{,*} rwl,
   owner @{user_cache_dirs}/icon-cache.kcache rw,
diff --git a/apparmor.d/groups/akonadi/akonadi_mailmerge_agent b/apparmor.d/groups/akonadi/akonadi_mailmerge_agent
index 0d8ed4ec..fa663481 100644
--- a/apparmor.d/groups/akonadi/akonadi_mailmerge_agent
+++ b/apparmor.d/groups/akonadi/akonadi_mailmerge_agent
@@ -13,6 +13,7 @@ profile akonadi_mailmerge_agent @{exec_path} {
   include <abstractions/freedesktop.org>
   include <abstractions/graphics>
   include <abstractions/nameservice-strict>
+  include <abstractions/qt5>
   include <abstractions/X-strict>
 
   network inet dgram,
@@ -24,8 +25,6 @@ profile akonadi_mailmerge_agent @{exec_path} {
 
   /usr/share/hwdata/*.ids r,
   /usr/share/icu/@{int}.@{int}/*.dat r,
-  /usr/share/qt{5,}/translations/*.qm r,
-  /usr/share/qt5/qtlogging.ini r,
 
   /etc/xdg/kdeglobals r,
   /etc/xdg/kwinrc r,