From patchwork Sun Nov 24 13:50:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 70813 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 19E3627BBEA; Sun, 24 Nov 2024 13:52:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C812827BBE2 for ; Sun, 24 Nov 2024 13:52:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tFD20-0003p0-8o; Sun, 24 Nov 2024 08:52:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tFD1x-0003or-Oq for guix-patches@gnu.org; Sun, 24 Nov 2024 08:52:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tFD1x-0007bi-GJ for guix-patches@gnu.org; Sun, 24 Nov 2024 08:52:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=QykoCN/nsUdO3F00jRypnvuRndYBcwrDyV6u7aaRArY=; b=hQka6okWZaWR/r5XhjB/w2jVr/9N73b8baDKBUn7XXldru5lmrrxPmLz9U5HIPl+8QHifxfpjtIrEKbJ5J4cu3Y67m+16rO/ykpY/d/TyPgdIWqjPlNBSYcvup+wfIc5B/tlNmDYtW+uNGfOqCgPyEHVh5GUZ0d4lENYTTW/2c0l046amEBik1Yc6R4kFIdw5YFIU8Q3px+w7XCIW5+OYiQBeiZZrqfgKuL4/VH5OQBJGSC7h7IvW+zQfS2Kw/jfVjPu/YMheQXBlbQY+10qpMAOzUVs78eF8e+W9Wk8UmRR2tSP5HIjyJNbF44tU5aqu6wVcGuMEzEJ4WIgN63tzw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tFD1u-0005IZ-96; Sun, 24 Nov 2024 08:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74493] [PATCH v1] gnu: geoclue: Update to 2.7.2. References: <4a5f38bd6fd9c4c4a9610067e84675b11120be21.1732370909.git.sarg@sarg.org.ru> In-Reply-To: <4a5f38bd6fd9c4c4a9610067e84675b11120be21.1732370909.git.sarg@sarg.org.ru> Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: sarg@sarg.org.ru, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 13:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74493 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74493@debbugs.gnu.org Cc: Sergey Trofimov , Sergey Trofimov , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus X-Debbugs-Original-Xcc: Sergey Trofimov , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Received: via spool by 74493-submit@debbugs.gnu.org id=B74493.173245627820245 (code B ref 74493); Sun, 24 Nov 2024 13:52:02 +0000 Received: (at 74493) by debbugs.gnu.org; 24 Nov 2024 13:51:18 +0000 Received: from localhost ([127.0.0.1]:33271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFD1B-0005GS-Ra for submit@debbugs.gnu.org; Sun, 24 Nov 2024 08:51:18 -0500 Received: from mail-ed1-f52.google.com ([209.85.208.52]:52376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFD17-0005G3-SD for 74493@debbugs.gnu.org; Sun, 24 Nov 2024 08:51:15 -0500 Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5cfe3686b8eso2234705a12.0 for <74493@debbugs.gnu.org>; Sun, 24 Nov 2024 05:51:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1732456208; x=1733061008; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=QykoCN/nsUdO3F00jRypnvuRndYBcwrDyV6u7aaRArY=; b=g738oLSp6KMyWyjAGop0okr+0L21D6PxVbAY2Ktsb4Q3lkNre4y8RV4VAlBJH2R2zD rq61TuyU3Ce75xGa7p3dmk9bGA+CUG/yhzQBmzDmNurH0yImVR30XMgHBpwISbyvGN2N yOThvxzovbWlLU5RJMLktay67wI7wfgNLkVsDRoKeY8mAc5DzsNepMyz9DzN8OBF4S5F 8y7aSHGZjApCmemyGbW99wRanaiUkJsX69WKWUCDqeNXDxbU7RlFp2n71YncKbChFAD/ fUiHapTAm8KXkC0DFaol/f4Bl8S47SiRBRZR/wiepFNZbIj6BgGZ8j22IHZlfqQ68E2M zE3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732456208; x=1733061008; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QykoCN/nsUdO3F00jRypnvuRndYBcwrDyV6u7aaRArY=; b=bbAEVDrAbodeDXOqURA8o5a/tWIMJw2mPyMExzTEBorP08F8a//H3gjtS4ue6xvkzM YTacsPr7m80JR2vGEg6pF5iRSEoBmF1hS/1MqLZ0f9MGLWdW1++05PyZ8c3enitPGtHd lJ+Os6/cAuXmpnTFj5ncD/lEgOcW+K8nUWciq80sWoM1H4iVA934oTJDcJXQIeZjFBzh 6qN9ezhvq9e75TTQ2Z9rr5m/NaU+EEW3Fd6cwvFG+prvsC9hBEhyu6zFRbWqCR4xDZS/ nsZ8G/kOSvrTt4oEft8QinxpGuZqBdfo3vvHlFRY5kOsO24juZsB0nhU9GDf3Cztlvul lVAQ== X-Gm-Message-State: AOJu0Yz9cCI8By+bxNtwhl+upbHCY9ihhc4o2zqtN42yXGeBT3bePGPv oRjQ5wsdXwY+3mXPxAWmwuzK/t1y5cluZOcpRp22DevWzfwBaScKjtJistbkEoNexvbcYCTJHG5 7 X-Gm-Gg: ASbGnct+oc5ZJ4D82mfAPT7eJ2x9M3b9T4blm9O+doLmg+o1fFXIWLutQCBcmOlZSAH Dy3eKUx6E7SLitct2JC71qRQtAI6sIqybGK2uLNfWa4oLxfYUfKcPS1H6phTZO5+YbktwVmgYfI tmTrvsTiK+YOgrBUsO2tYasD0y2ixUCmNHrF7yWMnZcZmyBfUoB0mTyvZeKkQB/PiOjFTeKsw3V uW9Ys14uotDtDpb/4eikAnAFP6Z+gQVAmSBCPPz6Uqn/rc= X-Google-Smtp-Source: AGHT+IHaSH5BF5QUZVJeC9oRmqCwYWtqSCg6MmF7N1LFjFFqfcBZdMith+MkQ18qiooMbapstSVJ1g== X-Received: by 2002:a05:6402:34c2:b0:5cf:dbc9:4a37 with SMTP id 4fb4d7f45d1cf-5d0207dae87mr10202892a12.31.1732456207548; Sun, 24 Nov 2024 05:50:07 -0800 (PST) Received: from localhost ([2a02:2454:a0a9:e300:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa531d6f0a6sm214169966b.196.2024.11.24.05.50.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Nov 2024 05:50:06 -0800 (PST) From: Sergey Trofimov Date: Sun, 24 Nov 2024 14:50:00 +0100 Message-ID: <40019347f4621bb68afbf6c4ed7883fdce5fdbea.1732456072.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (geoclue): Update to 2.7.2. * gnu/packages/patches/geoclue-config.patch: Adjust. Reviewed-by: Maxim Cournoyer --- gnu/packages/gnome.scm | 6 +- gnu/packages/patches/geoclue-config.patch | 70 ++++++++++++++++------- 2 files changed, 52 insertions(+), 24 deletions(-) base-commit: 36831c2624dffe70307db737c09bae324d6b6b61 prerequisite-patch-id: f9cc903b8048c8c6fde576fbf38ab110263020e3 prerequisite-patch-id: d09c064d38df73405d505b90d222dccfd7be09b9 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b8accb737d..5fb98ff568 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5760,7 +5760,7 @@ (define-public colord (define-public geoclue (package (name "geoclue") - (version "2.6.0") + (version "2.7.2") (source (origin (method url-fetch) @@ -5768,7 +5768,7 @@ (define-public geoclue (string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/" version "/geoclue-" version ".tar.bz2")) (sha256 - (base32 "1854i8lih1jkks5w38xv8k5gs7s8629qjg3cg96ji0ffk35yzjfd")) + (base32 "1ljn4k1zlfx0ymmdz8ycfb976vx8r61sx68q854r0xinl124mlh1")) (patches (search-patches "geoclue-config.patch")))) (build-system meson-build-system) (arguments @@ -5786,7 +5786,7 @@ (define-public geoclue `(,glib "bin") glib-networking json-glib - libsoup-minimal-2)) + libsoup-minimal)) (home-page "https://gitlab.freedesktop.org/geoclue/geoclue/-/wikis/home") (synopsis "Geolocation service") (description "Geoclue is a D-Bus service that provides location diff --git a/gnu/packages/patches/geoclue-config.patch b/gnu/packages/patches/geoclue-config.patch index e4ef6f2d33..8d65dfee5a 100644 --- a/gnu/packages/patches/geoclue-config.patch +++ b/gnu/packages/patches/geoclue-config.patch @@ -1,27 +1,55 @@ Allow the configuration file to be specified via an environment variable. +--- + src/gclue-config.c | 13 ++++++++++--- + src/gclue-static-source.c | 2 +- + 2 files changed, 11 insertions(+), 4 deletions(-) + diff --git a/src/gclue-config.c b/src/gclue-config.c -index 7ab2a67..e41f3df 100644 +index acd6009..3045571 100644 --- a/src/gclue-config.c +++ b/src/gclue-config.c -@@ -332,6 +332,11 @@ static void - gclue_config_init (GClueConfig *config) - { - GError *error = NULL; -+ const char *config_file_path; +@@ -26,8 +26,8 @@ + + #include "gclue-config.h" + +-#define CONFIG_FILE_PATH SYSCONFDIR "/geoclue/geoclue.conf" +-#define CONFIG_D_DIRECTORY SYSCONFDIR "/geoclue/conf.d/" ++#define CONFIG_FILE_PATH "/etc/geoclue/geoclue.conf" ++#define CONFIG_D_DIRECTORY "/etc/geoclue/conf.d/" + + /* This class will be responsible for fetching configuration. */ + +@@ -546,8 +546,15 @@ gclue_config_init (GClueConfig *config) + priv->wifi_submit_url = g_strdup (DEFAULT_WIFI_SUBMIT_URL); + priv->wifi_submit_nick = g_strdup (DEFAULT_WIFI_SUBMIT_NICK); + +- /* Load config file from default path, log all missing parameters */ + priv->key_file = g_key_file_new (); + -+ config_file_path = g_getenv ("GEOCLUE_CONFIG_FILE"); -+ if (!config_file_path) -+ config_file_path = CONFIG_FILE_PATH; - - config->priv = gclue_config_get_instance_private(config); - config->priv->key_file = g_key_file_new (); -@@ -341,7 +346,7 @@ gclue_config_init (GClueConfig *config) - &error); - if (error != NULL) { - g_critical ("Failed to load configuration file '%s': %s", -- CONFIG_FILE_PATH, error->message); -+ config_file_path, error->message); - g_error_free (error); - - return; ++ char *env_config_file = g_getenv ("GEOCLUE_CONFIG_FILE"); ++ if (env_config_file) { ++ load_config_file (config, env_config_file); ++ goto out; // don't load conf.d ++ } ++ ++ /* Load config file from default path, log all missing parameters */ + load_config_file (config, CONFIG_FILE_PATH); + + /* +diff --git a/src/gclue-static-source.c b/src/gclue-static-source.c +index 1c35cea..7957797 100644 +--- a/src/gclue-static-source.c ++++ b/src/gclue-static-source.c +@@ -26,7 +26,7 @@ + #include "gclue-enum-types.h" + + #define GEO_FILE_NAME "geolocation" +-#define GEO_FILE_PATH SYSCONFDIR "/" GEO_FILE_NAME ++#define GEO_FILE_PATH "/etc/" GEO_FILE_NAME + + /* Rate limit of geolocation file monitoring. + * In milliseconds. +-- +2.46.0 +