This commit is contained in:
Gerben Jan Dijkman 2022-10-03 12:14:49 +02:00
parent 1804a7e5e8
commit b0e49a18f0
4 changed files with 47 additions and 28 deletions

View File

@ -1 +0,0 @@
DIST libwlroots10_0.15.1-3_arm64.deb 242060 BLAKE2B 4dba6971e795e008a512f59f65f1c5695439f2bc2571e06bfdbebd9fe66d760e9d572289ac4eaddbd21348a1316e67eda7e30902eab55ad65420784809d76cca SHA512 2849fe1ca02db853c045ae4b82b37f0e80b6fb99128170efb3181b5536d9a8faf26a8a72c0af1bf12018ba7b4b57807ca974b57bd7dd3c11e8ec5759875b8af3

View File

@ -1,27 +0,0 @@
# Copyright 2011-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit desktop pax-utils unpacker xdg
KEYWORDS="~arm64"
SRC_URI="http://ftp.de.debian.org/debian/pool/main/w/wlroots/libwlroots10_0.15.1-3_arm64.deb"
SLOT="0"
IUSE="selinux"
RESTRICT="bindist mirror strip"
RDEPEND=""
S=${WORKDIR}
src_unpack() {
:
}
src_install() {
dodir /
cd "${ED}" || die
unpacker
}

View File

@ -0,0 +1,45 @@
From 16b46e295b86cbf1beaccf8218cf65ebb4b7a6f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Wed, 13 Jul 2022 17:33:05 +0200
Subject: [PATCH] build: Adjust to polkit version changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
So far it was `0.x` now it's `y` so don't fail if there's
no `.` in the version number. Otherwise we fail like
src/meson.build:295:0: ERROR: Index 1 out of bounds of array of size 1.
Signed-off-by: Guido Günther <guido.gunther@puri.sm>
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1105>
---
src/meson.build | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index 6f00e2d..c41207a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -292,9 +292,17 @@ phosh_deps = [
cc.find_library('rt', required: false),
]
+polkit_version = libpolkit_agent_dep.version().split('.')
+if polkit_version.length() == 1
+ polkit_major = polkit_version[0]
+ polkit_minor = '0'
+else
+ polkit_major = polkit_version[0]
+ polkit_minor = polkit_version[1]
+endif
add_project_arguments([
- '-DPOLKIT_AGENT_MAJOR_VERSION=' + libpolkit_agent_dep.version().split('.')[0],
- '-DPOLKIT_AGENT_MINOR_VERSION=' + libpolkit_agent_dep.version().split('.')[1]
+ '-DPOLKIT_AGENT_MAJOR_VERSION=' + polkit_major,
+ '-DPOLKIT_AGENT_MINOR_VERSION=' + polkit_minor,
], language: 'c')
phosh_inc = include_directories('.')
--
2.35.1

View File

@ -35,8 +35,10 @@ src_install() {
pkg_postinst() { pkg_postinst() {
gnome2_schemas_update gnome2_schemas_update
xdg_icon_cache_update
} }
pkg_postrm() { pkg_postrm() {
gnome2_schemas_update gnome2_schemas_update
xdg_icon_cache_update
} }