unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#39262] [PATCH] gnu: geoclue: Update to 2.5.5
@ 2020-01-24 12:51 Martin Becze
  2020-01-24 13:44 ` Jonathan Brielmaier
  0 siblings, 1 reply; 4+ messages in thread
From: Martin Becze @ 2020-01-24 12:51 UTC (permalink / raw)
  To: 39262; +Cc: Martin Becze

* gnu/packages/gnome.scm (geoclue): Update to 2.5.5
---
 gnu/packages/gnome.scm | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e843bdfe08..4710eb1db3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -40,7 +40,7 @@
 ;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org>
 ;;; Copyright © 2019 Jonathan Frederickson <jonathan@terracrypt.net>
 ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2019 David Wilson <david@daviwil.com>
 ;;; Copyright © 2019, 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
@@ -4074,40 +4074,29 @@ output devices.")
 (define-public geoclue
   (package
     (name "geoclue")
-    (version "2.4.8")
+    (version "2.5.5")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "https://www.freedesktop.org/software/" name
-                           "/releases/" (version-major+minor version) "/"
-                           name "-" version ".tar.xz"))
+       (uri (string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/" version "/geoclue-" version ".tar.bz2"))
        (sha256
         (base32
-         "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj"))
+         "1b7jqrsn4x7mxjxj8hvb2dl2cmhrpb9vibs4rvkkanky5nsx3sai"))
        (patches (search-patches "geoclue-config.patch"))))
-    (build-system glib-or-gtk-build-system)
+    (build-system meson-build-system)
     (arguments
-     '(;; The tests want to run the system bus.
-       #:tests? #f
-       #:configure-flags (list ;; Disable bits requiring ModemManager.
-                               "--disable-3g-source"
-                               "--disable-cdma-source"
-                               "--disable-modem-gps-source"
-                               "--with-dbus-service-user=geoclue")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'patch-/bin/true
-                     (lambda _
-                       (substitute* "configure"
-                         (("/bin/true") (which "true")))
-                       #t)))))
+     '(#:configure-flags (list "-Dbus-srv-user=geoclue")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("gobject-introspection" ,gobject-introspection)
+       ("modem-manager" ,modem-manager)
+       ("libnotify" ,libnotify)
+       ("gtk-doc", gtk-doc)
        ("intltool" ,intltool)))
     (inputs
      `(("avahi" ,avahi)
-       ("glib" ,glib)
+       ("glib:bin" ,glib "bin")
+       ("glib-networking" ,glib-networking)
        ("json-glib" ,json-glib)
        ("libsoup" ,libsoup)))
     (home-page "https://www.freedesktop.org/wiki/Software/GeoClue/")
-- 
2.25.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#39262] [PATCH] gnu: geoclue: Update to 2.5.5
  2020-01-24 12:51 [bug#39262] [PATCH] gnu: geoclue: Update to 2.5.5 Martin Becze
@ 2020-01-24 13:44 ` Jonathan Brielmaier
  2020-01-24 14:12   ` Martin Becze
  0 siblings, 1 reply; 4+ messages in thread
From: Jonathan Brielmaier @ 2020-01-24 13:44 UTC (permalink / raw)
  To: Martin Becze, 39262

On 24.01.20 13:51, Martin Becze wrote:
> -       (uri (string-append "https://www.freedesktop.org/software/" name
> -                           "/releases/" (version-major+minor version) "/"
> -                           name "-" version ".tar.xz"))
> +       (uri (string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/" version "/geoclue-" version ".tar.bz2"))

Please wrap the lines.


>       (home-page "https://www.freedesktop.org/wiki/Software/GeoClue/")

They moved to Gitlab, so there new homepage would be something like:
https://gitlab.freedesktop.org/geoclue/geoclue Would be good to include.

Did you test if it works together with ModemManager? Maybe with a LTE
card in a laptop or so.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#39262] [PATCH] gnu: geoclue: Update to 2.5.5
  2020-01-24 13:44 ` Jonathan Brielmaier
@ 2020-01-24 14:12   ` Martin Becze
  2020-02-10 22:36     ` bug#39262: " Ludovic Courtès
  0 siblings, 1 reply; 4+ messages in thread
From: Martin Becze @ 2020-01-24 14:12 UTC (permalink / raw)
  To: Jonathan Brielmaier, 39262

[-- Attachment #1: Type: text/plain, Size: 1011 bytes --]



On 1/24/20 8:44 AM, Jonathan Brielmaier wrote:
> On 24.01.20 13:51, Martin Becze wrote:
>> -       (uri (string-append "https://www.freedesktop.org/software/" name
>> -                           "/releases/" (version-major+minor version) 
>> "/"
>> -                           name "-" version ".tar.xz"))
>> +       (uri (string-append 
>> "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/" version 
>> "/geoclue-" version ".tar.bz2"))
> 
> Please wrap the lines.
> 
> 
>>       (home-page "https://www.freedesktop.org/wiki/Software/GeoClue/
> 
> They moved to Gitlab, so there new homepage would be something like:
> https://gitlab.freedesktop.org/geoclue/geoclue Would be good to include.

Updates made and attached

> Did you test if it works together with ModemManager? Maybe with a LTE
> card in a laptop or so.

No, I have the hardware enroute so I should be able to test soonish. I 
can disable again if that is preferred.

[-- Attachment #2: v2-0001-gnu-geoclue-Update-to-2.5.5.patch --]
[-- Type: text/x-patch, Size: 3469 bytes --]

From a97cd8090561a8c596e377c403cbb3081947a28a Mon Sep 17 00:00:00 2001
From: Martin Becze <mjbecze@riseup.net>
Date: Fri, 24 Jan 2020 07:41:35 -0500
Subject: [PATCH v2] gnu: geoclue: Update to 2.5.5

* gnu/packages/gnome.scm (geoclue): Update to 2.5.5
---
 gnu/packages/gnome.scm | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e843bdfe08..571960d73f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -40,7 +40,7 @@
 ;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org>
 ;;; Copyright © 2019 Jonathan Frederickson <jonathan@terracrypt.net>
 ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2019 David Wilson <david@daviwil.com>
 ;;; Copyright © 2019, 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
@@ -4074,43 +4074,34 @@ output devices.")
 (define-public geoclue
   (package
     (name "geoclue")
-    (version "2.4.8")
+    (version "2.5.5")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "https://www.freedesktop.org/software/" name
-                           "/releases/" (version-major+minor version) "/"
-                           name "-" version ".tar.xz"))
+       (uri
+        (string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/"
+                       version "/geoclue-" version ".tar.bz2"))
        (sha256
         (base32
-         "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj"))
+         "1b7jqrsn4x7mxjxj8hvb2dl2cmhrpb9vibs4rvkkanky5nsx3sai"))
        (patches (search-patches "geoclue-config.patch"))))
-    (build-system glib-or-gtk-build-system)
+    (build-system meson-build-system)
     (arguments
-     '(;; The tests want to run the system bus.
-       #:tests? #f
-       #:configure-flags (list ;; Disable bits requiring ModemManager.
-                               "--disable-3g-source"
-                               "--disable-cdma-source"
-                               "--disable-modem-gps-source"
-                               "--with-dbus-service-user=geoclue")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'patch-/bin/true
-                     (lambda _
-                       (substitute* "configure"
-                         (("/bin/true") (which "true")))
-                       #t)))))
+     '(#:configure-flags (list "-Dbus-srv-user=geoclue")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("gobject-introspection" ,gobject-introspection)
+       ("modem-manager" ,modem-manager)
+       ("libnotify" ,libnotify)
+       ("gtk-doc", gtk-doc)
        ("intltool" ,intltool)))
     (inputs
      `(("avahi" ,avahi)
-       ("glib" ,glib)
+       ("glib:bin" ,glib "bin")
+       ("glib-networking" ,glib-networking)
        ("json-glib" ,json-glib)
        ("libsoup" ,libsoup)))
-    (home-page "https://www.freedesktop.org/wiki/Software/GeoClue/")
+    (home-page "https://gitlab.freedesktop.org/geoclue/geoclue/-/wikis/home")
     (synopsis "Geolocation service")
     (description "Geoclue is a D-Bus service that provides location
 information.  The primary goal of the Geoclue project is to make creating
-- 
2.25.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* bug#39262: [PATCH] gnu: geoclue: Update to 2.5.5
  2020-01-24 14:12   ` Martin Becze
@ 2020-02-10 22:36     ` Ludovic Courtès
  0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2020-02-10 22:36 UTC (permalink / raw)
  To: Martin Becze; +Cc: Jonathan Brielmaier, 39262-done

Hi Martin!

Martin Becze <mjbecze@riseup.net> skribis:

>> Did you test if it works together with ModemManager? Maybe with a LTE
>> card in a laptop or so.
>
> No, I have the hardware enroute so I should be able to test soonish. I
> can disable again if that is preferred.
>
>>From a97cd8090561a8c596e377c403cbb3081947a28a Mon Sep 17 00:00:00 2001
> From: Martin Becze <mjbecze@riseup.net>
> Date: Fri, 24 Jan 2020 07:41:35 -0500
> Subject: [PATCH v2] gnu: geoclue: Update to 2.5.5
>
> * gnu/packages/gnome.scm (geoclue): Update to 2.5.5

Pushed as 50e96d25b74ba37193fb102920b446eff03b97ed.

That said, if you have feedback regarding the tests Jonathan suggested
above, we can always adjust!

Ludo’.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-02-10 22:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-24 12:51 [bug#39262] [PATCH] gnu: geoclue: Update to 2.5.5 Martin Becze
2020-01-24 13:44 ` Jonathan Brielmaier
2020-01-24 14:12   ` Martin Becze
2020-02-10 22:36     ` bug#39262: " Ludovic Courtès

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).