Added patch

This commit is contained in:
2024-08-04 13:44:09 +02:00
parent 88097472d4
commit a22eb04f90
6 changed files with 309 additions and 0 deletions

View File

@@ -0,0 +1,40 @@
From 1e07481d4fd989828a7237c365e5420f50196ddd Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Thu, 14 Mar 2019 09:43:00 +0200
Subject: [PATCH] build: Make wacom optional and controllable via meson_options
---
meson.build | 4 ++--
meson_options.txt | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index a8955a49..0ac4f3ba 100644
--- a/meson.build
+++ b/meson.build
@@ -154,8 +154,8 @@ if enable_wayland
endif
config_h.set10('HAVE_WAYLAND', enable_wayland)
-# wacom (disabled for s390/s390x and non Linux platforms)
-enable_wacom = host_is_linux_not_s390
+# wacom
+enable_wacom = get_option('wacom')
if enable_wacom
assert(enable_gudev, 'GUDev support is required for wacom support.')
libwacom_dep = dependency('libwacom', version: '>= 0.7')
diff --git a/meson_options.txt b/meson_options.txt
index 3e04cf64..010053e2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,6 +9,7 @@ option('network_manager', type: 'boolean', value: true, description: 'build with
option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on Linux platforms)')
option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support')
option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support')
+option('wacom', type: 'boolean', value: true, description: 'build with Wacom devices support')
option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
option('wwan', type: 'boolean', value: true, description: 'build with WWAN support')
option('colord', type: 'boolean', value: true, description: 'build with colord support')
--
2.34.1

View File

@@ -0,0 +1,97 @@
From 1a4d50f4ee611bdede6072c0bfd2a1b2e327c5fc Mon Sep 17 00:00:00 2001
From: Dudemanguy <random342@airmail.cc>
Date: Mon, 25 Mar 2024 10:39:30 -0500
Subject: [PATCH] sharing: fix building without systemd
0bfc60813befb45e3dd4840795839806f5310e39 introduced a bunch of
systemd-specific stuff that broke building without systemd. Guard all of
the relevant things.
---
plugins/sharing/gsd-sharing-manager.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/plugins/sharing/gsd-sharing-manager.c b/plugins/sharing/gsd-sharing-manager.c
index c669e7bde..8b818c4e4 100644
--- a/plugins/sharing/gsd-sharing-manager.c
+++ b/plugins/sharing/gsd-sharing-manager.c
@@ -266,6 +266,7 @@ gsd_sharing_manager_sync_configurable_services (GsdSharingManager *manager)
}
+#if HAVE_SYSTEMD_LIB
static void
on_assigned_service_finished (GPid pid,
int exit_status,
@@ -406,10 +407,12 @@ stop_assigned_service_after_timeout (GsdSharingManager *manager,
timeout_source,
G_SOURCE_FUNC (on_timeout_reached));
}
+#endif
static void
gsd_sharing_manager_sync_assigned_services (GsdSharingManager *manager)
{
+#if HAVE_SYSTEMD_LIB
GList *services, *l;
services = g_hash_table_get_values (manager->assigned_services);
@@ -423,6 +426,7 @@ gsd_sharing_manager_sync_assigned_services (GsdSharingManager *manager)
start_assigned_service (manager, info);
}
g_list_free (services);
+#endif
}
static void
@@ -1004,6 +1008,7 @@ assigned_service_free (gpointer pointer)
g_free (info);
}
+#if HAVE_SYSTEMD_LIB
static void
on_system_bus_name_appeared (GDBusConnection *connection,
const char *system_bus_name,
@@ -1046,6 +1051,7 @@ on_system_bus_name_vanished (GDBusConnection *connection,
stop_assigned_service_after_timeout (manager, info);
}
+#endif
static void
manage_configurable_services (GsdSharingManager *manager)
@@ -1069,6 +1075,7 @@ manage_configurable_services (GsdSharingManager *manager)
static void
manage_assigned_services (GsdSharingManager *manager)
{
+#if HAVE_SYSTEMD_LIB
size_t i;
int ret;
g_autofree char *session_id = NULL;
@@ -1129,12 +1136,13 @@ manage_assigned_services (GsdSharingManager *manager)
g_hash_table_insert (manager->assigned_services, (gpointer) service->system_bus_name, info);
}
+#endif
}
static void
gsd_sharing_manager_init (GsdSharingManager *manager)
{
- int ret;
+ int ret = -1;
g_autofree char *systemd_unit = NULL;
manager->configurable_services = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, configurable_service_free);
@@ -1146,7 +1154,9 @@ gsd_sharing_manager_init (GsdSharingManager *manager)
manager->carrier_type = g_strdup ("");
manager->sharing_status = GSD_SHARING_STATUS_OFFLINE;
+#if HAVE_SYSTEMD_LIB
ret = sd_pid_get_user_unit (getpid (), &systemd_unit);
+#endif
if (ret < 0)
manager->is_systemd_managed = FALSE;
--
GitLab

View File

@@ -0,0 +1,24 @@
From b5b933cf83fc79cc9dd382ddb0ec2567330e24e8 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Sun, 8 Sep 2019 18:07:12 +0300
Subject: [PATCH 2/3] build: Allow NM optional on Linux
---
meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/meson.build b/meson.build
index dce9bfa1..21d9341d 100644
--- a/meson.build
+++ b/meson.build
@@ -223,7 +223,6 @@ endif
# Sharing plugin
enable_network_manager = get_option('network_manager')
-assert(enable_network_manager or not host_is_linux, 'NetworkManager support is not optional on Linux platforms')
if enable_network_manager
# network manager
libnm_dep = dependency('libnm', version: '>= 1.0')
--
2.26.2

View File

@@ -0,0 +1,2 @@
[org.gnome.settings-daemon.plugins.power]
sleep-inactive-ac-type='nothing'