From 6722f954b798d108a29de34fa7f1245fdb89b76d Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 18 Jul 2025 09:33:25 -0700 Subject: [PATCH] fix(lomiri-system-settings): Add remote patches locally (#5879) (#5893) * fix(lomiri-system-settings): Add remote patches locally * ? * ? * fix: Drop upstreamed patch (cherry picked from commit 65ff437520fa2b94cb24a4f3be11ae02fe75e4e9) Co-authored-by: Gilver --- ...use-Noto-font-instead-of-Ubuntu-font.patch | 26 ++++ .../2011_build-without-trust-store.patch | 121 ++++++++++++++++++ .../2013_show-hotspot-on-desktop.patch | 24 ++++ .../lomiri-system-settings.spec | 7 +- 4 files changed, 174 insertions(+), 4 deletions(-) create mode 100644 anda/desktops/lomiri-unity/lomiri-system-settings/2002_use-Noto-font-instead-of-Ubuntu-font.patch create mode 100644 anda/desktops/lomiri-unity/lomiri-system-settings/2011_build-without-trust-store.patch create mode 100644 anda/desktops/lomiri-unity/lomiri-system-settings/2013_show-hotspot-on-desktop.patch diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/2002_use-Noto-font-instead-of-Ubuntu-font.patch b/anda/desktops/lomiri-unity/lomiri-system-settings/2002_use-Noto-font-instead-of-Ubuntu-font.patch new file mode 100644 index 0000000000..4b3558641e --- /dev/null +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/2002_use-Noto-font-instead-of-Ubuntu-font.patch @@ -0,0 +1,26 @@ +Description: In Debian, use Noto Sans font, not Ubuntu font. +Author: Mike Gabriel +Forwarded: not needed, Debian-specific + +--- a/plugins/background/Components/ListItemsHeader.qml ++++ b/plugins/background/Components/ListItemsHeader.qml +@@ -44,7 +44,7 @@ + } + + color: theme.palette.normal.foregroundText +- font.family: "Ubuntu" ++ font.family: "Noto Sans" + fontSize: "medium" + elide: Text.ElideRight + textFormat: Text.PlainText +--- a/plugins/battery/PageComponent.qml ++++ b/plugins/battery/PageComponent.qml +@@ -138,7 +138,7 @@ + ctx.lineWidth = units.dp(2) + + var fontHeight = FontUtils.sizeToPixels("small") +- ctx.font="%1px Ubuntu".arg(fontHeight) ++ ctx.font="%1px Noto Sans".arg(fontHeight) + + ctx.translate(0, 1) + diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/2011_build-without-trust-store.patch b/anda/desktops/lomiri-unity/lomiri-system-settings/2011_build-without-trust-store.patch new file mode 100644 index 0000000000..de4dec4b0c --- /dev/null +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/2011_build-without-trust-store.patch @@ -0,0 +1,121 @@ +Description: Disable all trust-store related settings. Not available in Debian. +Author: Mike Gabriel +Forwarded: not needed, Debian-specific + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,7 +53,7 @@ + pkg_check_modules(GIO REQUIRED gio-2.0 gio-unix-2.0) + pkg_check_modules(LIBSYSTEMD REQUIRED libsystemd) + pkg_check_modules(POLKIT_AGENT REQUIRED polkit-agent-1) +-pkg_check_modules(TRUST_STORE REQUIRED trust-store) ++#pkg_check_modules(TRUST_STORE REQUIRED trust-store) + pkg_search_module(UPOWER_GLIB REQUIRED upower-glib) + pkg_search_module(ACCOUNTSSERVICE REQUIRED accountsservice) + if (ENABLE_UBUNTU_ACCOUNTSSERVICE) +--- a/plugins/security-privacy/CMakeLists.txt ++++ b/plugins/security-privacy/CMakeLists.txt +@@ -18,8 +18,8 @@ + ${LIBSYSTEMD_LDFLAGS}) + + set(QML_SOURCES +- AppAccess.qml +- AppAccessControl.qml ++# AppAccess.qml ++# AppAccessControl.qml + here-terms.qml + Location.qml + LockSecurity.qml +@@ -37,8 +37,8 @@ + plugin.h + securityprivacy.cpp + securityprivacy.h +- trust-store-model.cpp +- trust-store-model.h ++# trust-store-model.cpp ++# trust-store-model.h + ) + add_library(LomiriSecurityPrivacyPanel MODULE ${PANEL_SOURCES} ${QML_SOURCES}) + +@@ -47,7 +47,7 @@ + QT_NO_KEYWORDS) + target_include_directories(LomiriSecurityPrivacyPanel PRIVATE + ${Intl_INCLUDE_DIRS} +- ${TRUST_STORE_INCLUDE_DIRS} ++# ${TRUST_STORE_INCLUDE_DIRS} + ${GLIB_INCLUDE_DIRS} + ) + target_link_libraries (LomiriSecurityPrivacyPanel +@@ -58,7 +58,7 @@ + Qt5::Quick + Qt5::DBus + LomiriSystemSettingsPrivate +- ${TRUST_STORE_LDFLAGS} ++# ${TRUST_STORE_LDFLAGS} + ${GLIB_LDFLAGS} + ) + +--- a/plugins/security-privacy/PageComponent.qml ++++ b/plugins/security-privacy/PageComponent.qml +@@ -64,15 +64,15 @@ + case 'location': + page = Qt.resolvedUrl("Location.qml"); + break; +- case 'permissions': +- page = Qt.resolvedUrl("AppAccess.qml") +- break; +- } +- } else if (pluginOptions && pluginOptions['service']) { +- // This whole else if branch will be removed once the +- // camera app asks for [1] as described in lp:1545733. +- // [1] settings:///system/permissions?service=camera +- page = Qt.resolvedUrl("AppAccess.qml"); ++// case 'permissions': ++// page = Qt.resolvedUrl("AppAccess.qml") ++// break; ++ } ++// } else if (pluginOptions && pluginOptions['service']) { ++// // This whole else if branch will be removed once the ++// // camera app asks for [1] as described in lp:1545733. ++// // [1] settings:///system/permissions?service=camera ++// page = Qt.resolvedUrl("AppAccess.qml"); + } + if (page) { + pageStack.addPageToNextColumn(root, page, opts); +@@ -222,10 +222,10 @@ + value: locationActionGroup.enabled.state + } + +- SettingsListItems.SingleValueProgression { +- text: i18n.tr("App permissions") +- onClicked: pageStack.addPageToNextColumn(root, Qt.resolvedUrl("AppAccess.qml"), {pluginManager: pluginManager}) +- } ++// SettingsListItems.SingleValueProgression { ++// text: i18n.tr("App permissions") ++// onClicked: pageStack.addPageToNextColumn(root, Qt.resolvedUrl("AppAccess.qml"), {pluginManager: pluginManager}) ++// } + } + } + } +--- a/plugins/security-privacy/plugin.cpp ++++ b/plugins/security-privacy/plugin.cpp +@@ -37,7 +37,7 @@ + Q_ASSERT(uri == QLatin1String("Lomiri.SystemSettings.SecurityPrivacy")); + qmlRegisterSingletonType(uri, 1, 0, "Connectivity", connectivitySingeltonProvider); + qmlRegisterType(uri, 1, 0, "LomiriSecurityPrivacyPanel"); +- qmlRegisterType(uri, 1, 0, "TrustStoreModel"); ++// qmlRegisterType(uri, 1, 0, "TrustStoreModel"); + } + + void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri) +--- a/tests/plugins/CMakeLists.txt ++++ b/tests/plugins/CMakeLists.txt +@@ -4,7 +4,7 @@ + add_subdirectory(bluetooth) + add_subdirectory(wifi) + add_subdirectory(notifications) +-add_subdirectory(security-privacy) ++#add_subdirectory(security-privacy) + + set(qmltest_DEFAULT_TARGETS qmluitests) + set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C") diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/2013_show-hotspot-on-desktop.patch b/anda/desktops/lomiri-unity/lomiri-system-settings/2013_show-hotspot-on-desktop.patch new file mode 100644 index 0000000000..2325e07504 --- /dev/null +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/2013_show-hotspot-on-desktop.patch @@ -0,0 +1,24 @@ +Description: Show hotspot feature on any device, not just phones. +Author: Mike Gabriel +Forwarded: not yet, Debian-specific for now + +--- a/plugins/hotspot/hotspot.settings ++++ b/plugins/hotspot/hotspot.settings +@@ -6,7 +6,8 @@ + "category": "network", + "priority": 2, + "form-factors": [ +- "phone" ++ "phone", ++ "tablet" + ], + "keywords": [ + "network", +@@ -14,6 +15,6 @@ + "tethering" + ], + "has-dynamic-keywords": false, +- "has-dynamic-visibility": true, ++ "has-dynamic-visibility": false, + "page-component": "PageComponent.qml" + } diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 365fd775f5..f33d0da78a 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -9,10 +9,9 @@ Summary: The system settings application for Lomiri License: GPLv3 URL: https://gitlab.com/ubports/development/core/lomiri-system-settings Source0: %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz -Patch0: https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-4/debian/patches/0001_lib-LomiriSystemSettingsPrivate-accountsservice.cpp-Register-missing-D-Bus-types.patch -Patch1: https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-4/debian/patches/2002_use-Noto-font-instead-of-Ubuntu-font.patch -Patch2: https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-4/debian/patches/2011_build-without-trust-store.patch -Patch3: https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-4/debian/patches/2013_show-hotspot-on-desktop.patch +Patch0: 2002_use-Noto-font-instead-of-Ubuntu-font.patch +Patch1: 2011_build-without-trust-store.patch +Patch2: 2013_show-hotspot-on-desktop.patch BuildRequires: cmake BuildRequires: gcc-c++