[neon/kde/akonadi/Neon/unstable] debian: sync patches and add some build flags for designer, tools & unity build
Carlos De Maine
null at kde.org
Sat Oct 28 04:29:04 BST 2023
Git commit 135a306e1b8a604860c7fb932aedcee653461adc by Carlos De Maine.
Committed on 28/10/2023 at 05:29.
Pushed by carlosdem into branch 'Neon/unstable'.
sync patches and add some build flags for designer, tools & unity build
M +1 -0 debian/control
M +0 -2 debian/not-installed
D +0 -60 debian/patches/0001-neon-hack-to-unbreak-apparmor-profile.patch
A +51 -0 debian/patches/load_local_apparmor_rules.diff
M +1 -0 debian/patches/series
M +13 -0 debian/rules
https://invent.kde.org/neon/kde/akonadi/-/commit/135a306e1b8a604860c7fb932aedcee653461adc
diff --git a/debian/control b/debian/control
index 372f201..7be3415 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Build-Depends: cmake,
libxslt1-dev,
pkg-config,
pkg-kde-tools-neon,
+ qt6-5compat-dev,
qt6-base-dev,
qt6-tools-dev,
shared-mime-info (>= 1.3~),
diff --git a/debian/not-installed b/debian/not-installed
index 1b166b3..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +0,0 @@
-etc/apparmor.d/postgresql_akonadi
-etc/apparmor.d/usr.bin.akonadiserver
diff --git a/debian/patches/0001-neon-hack-to-unbreak-apparmor-profile.patch b/debian/patches/0001-neon-hack-to-unbreak-apparmor-profile.patch
deleted file mode 100644
index 33de2f4..0000000
--- a/debian/patches/0001-neon-hack-to-unbreak-apparmor-profile.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 93c0ee0863cb9a57461a362640f8b5ebc6bb3ec3 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter at kde.org>
-Date: Tue, 7 Jan 2020 14:23:29 +0100
-Subject: [PATCH] neon hack to unbreak apparmor profile
-
-abstractions/qt5 is a generic qt5 rule that is provided by apparmor
-itself. unfortunately the apparmor in 18.04 is just old enough to not
-have it. as a stop-gap measure patch in a verbatim copy of the rules until
-neon moves to a 20.04 base.
-
-this also applies some common profiles from master to akonadi 19.12 to
-reduce conflict complexity
-
-# Conflicts:
-# apparmor/usr.bin.akonadiserver
----
- apparmor/usr.bin.akonadiserver | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-Index: akonadi-20.08.2/apparmor/usr.bin.akonadiserver
-===================================================================
---- akonadi-20.08.2.orig/apparmor/usr.bin.akonadiserver
-+++ akonadi-20.08.2/apparmor/usr.bin.akonadiserver
-@@ -10,9 +10,27 @@
- #include <abstractions/dbus-session-strict>
- #include <abstractions/nameservice>
- #include <abstractions/openssl>
-- #include <abstractions/qt5>
- #include <abstractions/user-tmp>
-
-+ # Verbatim copy of abstractions/qt5 (not available in Ubuntu 18.04).
-+ # Can be replaced for Ubuntu 20.04!
-+ /usr/lib{,64,/@{multiarch}}/qt5/plugins/**.so mr,
-+ /usr/lib{,64,/@{multiarch}}/qt5/qml/**.so mr,
-+ /usr/lib{,64,/@{multiarch}}/qt5/qml/**.{qmlc,jsc} mr, # Precompiled QML/JavaScript modules
-+
-+ # System files
-+
-+ /etc/xdg/QtProject/qtlogging.ini r,
-+ /usr/share/qt5/translations/*.qm r,
-+ /usr/lib{,64,/@{multiarch}}/qt5/plugins/** r,
-+ /usr/lib{,64,/@{multiarch}}/qt5/qml/** r,
-+
-+ # User files
-+
-+ owner @{HOME}/.config/QtProject/qtlogging.ini r,
-+ owner @{HOME}/.config/QtProject.conf r, # common settings for QFileDialog, etc (application might need write access)
-+ owner @{HOME}/.cache/qt_compose_cache_{little,big}_endian_* r, # for "platforminputcontexts" plugins
-+
- signal send set=kill peer=mysqld_akonadi,
- signal send set=term peer=mysqld_akonadi,
- ptrace read peer=mysqld_akonadi,
-@@ -70,6 +88,7 @@
- owner @{xdg_data_home}/akonadi/ rw,
- owner @{xdg_data_home}/akonadi/* rwlk,
- owner @{xdg_data_home}/akonadi/** rwk,
-+ owner /{,var/}run/user/@{uid}/akonadi/** rwk,
- owner @{PROC}/@{pid}/loginuid r,
- owner @{PROC}/@{pid}/mounts r,
- owner @{PROC}/[0-9]*/stat r,
diff --git a/debian/patches/load_local_apparmor_rules.diff b/debian/patches/load_local_apparmor_rules.diff
new file mode 100644
index 0000000..1faacd9
--- /dev/null
+++ b/debian/patches/load_local_apparmor_rules.diff
@@ -0,0 +1,51 @@
+Description: Load Apparmor site-specific additions and overrides.
+ Debian allows users to add site-specific additions and overrides via local
+ apparmor rule files. Those local rule files are created and handled by
+ dh_apparmor.
+Author: Hefee <hefee at debian.org>
+Origin: Debian
+Bug-Debian: https://bugs.debian.org/985080
+Last-Update: 2021-04-13
+Forwarded: Not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/apparmor/mariadbd_akonadi
++++ b/apparmor/mariadbd_akonadi
+@@ -36,4 +36,7 @@ profile mariadbd_akonadi {
+ owner @{xdg_data_home}/akonadi/** rwk,
+ owner @{PROC}/@{pid}/loginuid r,
+ owner /{,var/}run/user/@{uid}/akonadi** rwk,
++
++ # Site-specific additions and overrides. See local/README for details.
++ #include <local/mariadbd_akonadi>
+ }
+--- a/apparmor/mysqld_akonadi
++++ b/apparmor/mysqld_akonadi
+@@ -36,4 +36,7 @@ profile mysqld_akonadi {
+ owner @{xdg_data_home}/akonadi/** rwk,
+ owner @{PROC}/@{pid}/loginuid r,
+ owner /{,var/}run/user/@{uid}/akonadi** rwk,
++
++ # Site-specific additions and overrides. See local/README for details.
++ #include <local/mysqld_akonadi>
+ }
+--- a/apparmor/postgresql_akonadi
++++ b/apparmor/postgresql_akonadi
+@@ -45,4 +45,7 @@ profile postgresql_akonadi flags=(attach_disconnected) {
+ @{postgresqlpath}/bin/psql mrix,
+ @{postgresqlpath}/bin/pg_restore mrix,
+ /{usr/,}bin/cp mrix,
++
++ # Site-specific additions and overrides. See local/README for details.
++ #include <local/postgresql_akonadi>
+ }
+--- a/apparmor/usr.bin.akonadiserver
++++ b/apparmor/usr.bin.akonadiserver
+@@ -77,4 +77,7 @@
+ owner /{,var/}run/user/@{uid}/kdeinit** rwk,
+ owner /{,var/}run/user/@{uid}/kcrash** rwk,
+ owner /tmp/#[0-9]* m,
++
++ # Site-specific additions and overrides. See local/README for details.
++ #include <local/usr.bin.akonadiserver>
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 5f3fc20..8a337cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
postgresql-data-checksums.patch
disable_secure_file_priv_check.diff
+load_local_apparmor_rules.diff
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 3d69b0d..8fa211c 100644
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,16 @@
%:
dh $@ --with kf6 --buildsystem kf6
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ -DBUILD_TOOLS=ON \
+ -DBUILD_DESIGNERPLUGIN=ON \
+ -COMPILE_WITH_UNITY_CMAKE_SUPPORT ON \
+# -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON
+
+execute_after_dh_install:
+ dh_apparmor -pakonadi-server --profile-name=mariadbd_akonadi
+ dh_apparmor -pakonadi-server --profile-name=mysqld_akonadi
+ dh_apparmor -pakonadi-server --profile-name=postgresql_akonadi
+ dh_apparmor -pakonadi-server --profile-name=usr.bin.akonadiserver
More information about the Neon-commits
mailing list