1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-13 03:09:51 +03:00

testing/lomiri-schemas: remove obsolete patch

The patch was already applied upstream a while ago and is breaking the
schema:

/usr/share/glib-2.0/schemas/com.lomiri.Shell.gschema.xml:295:1  Error on line 295 char 1: <key name='logo-picture-uri'> already specified.  This entire file has been ignored.

At the same time, add a patch to fix compile with newer CMake.
This commit is contained in:
Luca Weiss 2025-06-28 16:44:48 +02:00 committed by achill (fossdd)
parent 048f21619f
commit 085d17eaa0
3 changed files with 30 additions and 34 deletions

View file

@ -0,0 +1,27 @@
From 1ad2b3aae3ec1edf9310932d104073d0b9ae35cd Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@lucaweiss.eu>
Date: Sat, 28 Jun 2025 16:52:19 +0200
Subject: [PATCH] Bump minimum required CMake version
CMake 4.0.3 does not build this project anymore due to "Compatibility
with CMake < 3.5 has been removed from CMake.".
Bump the minimum version to 3.16, being the CMake version from Ubuntu
20.04.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08069f1..51190de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.0)
+cmake_minimum_required(VERSION 3.16.0)
project(lomiri-schemas LANGUAGES NONE)
set(PACKAGE ${CMAKE_PROJECT_NAME})
--
2.50.0

View file

@ -1,31 +0,0 @@
From 533ef3e23f65fb87042a21fde421b6a3a653032b Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Fri, 22 Mar 2024 19:00:35 -0400
Subject: [PATCH] data/schemas/com.lomiri.Shell.gschema.xml.in: Add
logo-picture-uri
---
data/schemas/com.lomiri.Shell.gschema.xml.in | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/data/schemas/com.lomiri.Shell.gschema.xml.in b/data/schemas/com.lomiri.Shell.gschema.xml.in
index 692de37..5ef6947 100644
--- a/data/schemas/com.lomiri.Shell.gschema.xml.in
+++ b/data/schemas/com.lomiri.Shell.gschema.xml.in
@@ -272,6 +272,13 @@
<summary>The position of launcher.</summary>
<description>The position of launcher.</description>
</key>
+ <key name="logo-picture-uri" type="s">
+ <default>'file:///usr/share/lomiri/Launcher/graphics/home.svg'</default>
+ <summary>Logo URI to be displayed on the launcher</summary>
+ <description>
+ URI to use for the launcher's logo. Only .svg files are supported.
+ </description>
+ </key>
</schema>
<schema path="/com/lomiri/shell/devices/" id="com.lomiri.Shell.Devices" gettext-domain="lomiri">
<key type="as" name="blacklist">
--
2.44.0

View file

@ -3,7 +3,7 @@
# Maintainer: Luca Weiss <luca@lucaweiss.eu>
pkgname=lomiri-schemas
pkgver=0.1.8
pkgrel=0
pkgrel=1
pkgdesc="GSettings / AccountsService schema files for Lomiri"
arch="noarch"
url="https://gitlab.com/ubports/development/core/lomiri-schemas"
@ -16,7 +16,7 @@ makedepends="
samurai
"
source="https://gitlab.com/ubports/development/core/lomiri-schemas/-/archive/$pkgver/lomiri-schemas-$pkgver.tar.gz
0001-data-schemas-com.lomiri.Shell.gschema.xml.in-Add-log.patch
0001-Bump-minimum-required-CMake-version.patch
"
options="!check" # No tests
@ -35,5 +35,5 @@ package() {
sha512sums="
1f8887ddf93c2e5b13c5ab0634926394d0c4693ab7d9ab2ff3915de68f9be8d05c00744502d18abb252415ef2f0eab5ac09e057d8ed63b0a108f23165e763527 lomiri-schemas-0.1.8.tar.gz
eeea247f51418741fd01676a460f859042db35bbd7fe275cef9838dec58c8c60f1fbb8d1706cf106c1ad5dfdee285c763590a3ee6eaa170307a16afaf3bf8d2f 0001-data-schemas-com.lomiri.Shell.gschema.xml.in-Add-log.patch
36a13c1c51609aa1e3e49ae5ce941f915c56231df3f324c3295068dedf073f371ee68e7a28de8c6dd7b507e3c068182a0a3b5ce6427e5eaf51d0fd7d9d17c184 0001-Bump-minimum-required-CMake-version.patch
"