bug-guix
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#26558: Opening URLs with xdg-open fails (eg. Gajim, Pumpa)


From: Maxim Cournoyer
Subject: bug#26558: Opening URLs with xdg-open fails (eg. Gajim, Pumpa)
Date: Thu, 20 Apr 2017 14:07:29 +0900
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux)

Hello Marius,

Marius Bakke <address@hidden> writes:

> Arun Isaac <address@hidden> writes:
>
>> Thank you for the bug reports!
>>
>> The Guix xdg-utils package is in need of an update. The latest release
>> is 1.1.1. Unlike the 1.0.2 release currently in Guix, the new release
>> has test cases, many of which currently fail in Guix. While trying to
>> get the tests to pass, I noticed that /usr/bin/file is hardcoded into
>> xdg-mime. That, I think, is at least part of the problem. I am working
>> on this, and will hopefully be done this weekend. We will revisit these
>> bugs after that.
>
> Heh, I've had a WIP update for 1.1.1 for some time and decided to finish
> it based on this discussion. This tries "gvfs-open" before "gnome-open".
>
> @Ben (and others), can you try this patch and see if that works for you?
>
> From 6ed7008561eea7b09085a17d6c443ee657a7fc2d Mon Sep 17 00:00:00 2001
> From: Marius Bakke <address@hidden>
> Date: Sat, 8 Apr 2017 03:46:15 +0200
> Subject: [PATCH] gnu: xdg-utils: Update to 1.1.1.
>
> * gnu/packages/freedesktop.scm (xdg-utils): Update to 1.1.1.
> [source]: Adjust file name.
> [native-inputs]: Add DOCBOOK-XSL, DOCBOOK-XML-4.1.2, LIBXSLT, W3M and XMLTO.
> [arguments]<#:phases>: Add 'patch-hardcoded-paths' and 'locate-catalog-files'
> phases. New parameter.
> [home-page]: Update to new home.
> ---
>  gnu/packages/freedesktop.scm | 50 
> +++++++++++++++++++++++++++++++++++++++-----
>  1 file changed, 45 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
> index b912ce026..85a6c8b26 100644
> --- a/gnu/packages/freedesktop.scm
> +++ b/gnu/packages/freedesktop.scm
> @@ -8,6 +8,7 @@
>  ;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
>  ;;; Copyright © 2016 Kei Kebreau <address@hidden>
>  ;;; Copyright © 2017 Mark H Weaver <address@hidden>
> +;;; Copyright © 2017 Marius Bakke <address@hidden>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -55,6 +56,7 @@
>    #:use-module (gnu packages polkit)
>    #:use-module (gnu packages pkg-config)
>    #:use-module (gnu packages python)
> +  #:use-module (gnu packages w3m)
>    #:use-module (gnu packages xml)
>    #:use-module (gnu packages xdisorg)
>    #:use-module (gnu packages xorg))
> @@ -62,23 +64,61 @@
>  (define-public xdg-utils
>    (package
>      (name "xdg-utils")
> -    (version "1.0.2")
> +    (version "1.1.1")
>      (source
>        (origin
>          (method url-fetch)
>            (uri (string-append
>                   "https://portland.freedesktop.org/download/xdg-utils-";
> -                 version ".tgz"))
> +                 version ".tar.gz"))
>            (sha256
>              (base32
> -             "1b019d3r1379b60p33d6z44kx589xjgga62ijz9vha95dg8vgbi1"))))
> +             "09a1pk3ifsndc5qz2kcd1557i137gpgnv3d739pv22vfayi67pdh"))))
>      (build-system gnu-build-system)
> +    (native-inputs
> +     `(("docbook-xsl" ,docbook-xsl)
> +       ("docbook-xml" ,docbook-xml-4.1.2)
> +       ("libxslt" ,libxslt)
> +       ("w3m" ,w3m)
> +       ("xmlto" ,xmlto)))
>      (propagated-inputs
>       `(("xprop" ,xprop) ; for Xfce detecting
>         ("xset" ,xset))) ; for xdg-screensaver
>      (arguments
> -     `(#:tests? #f)) ; no check target
> -    (home-page "http://portland.freedesktop.org/";)
> +     `(#:tests? #f   ; no check target
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'patch-hardcoded-paths
> +           (lambda _
> +             (substitute* "scripts/xdg-mime.in"
> +               (("/usr/bin/file") (which "file")))
> +             (substitute* "scripts/xdg-open.in"
> +               (("/usr/bin/printf") (which "printf")))
> +             #t))
> +         (add-before 'build 'locate-catalog-files
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
> +                                          "/xml/dtd/docbook"))
> +                   (xsldoc (string-append (assoc-ref inputs "docbook-xsl")
> +                                          "/xml/xsl/docbook-xsl-"
> +                                          ,(package-version docbook-xsl))))
> +               (for-each (lambda (file)
> +                           (substitute* file
> +                             (("http://.*/docbookx\\.dtd";)
> +                              (string-append xmldoc "/docbookx.dtd"))))
> +                         (find-files "scripts/desc" "\\.xml$"))
> +               (substitute* "scripts/Makefile"
> +                 ;; Apparently `xmlto' does not bother to looks up the 
> stylesheets
> +                 ;; specified in the XML, unlike the above substitition. 
> Instead it
> +                 ;; uses a hard-coded URL. Work around it here, but if this 
> is
> +                 ;; common perhaps we should hardcode this path in xmlto 
> itself.
> +                 (("\\$\\(XMLTO\\) man")
> +                  (string-append "$(XMLTO) -x " xsldoc
> +                                 "/manpages/docbook.xsl man")))

Have you tried setting the XML_CATALOG_FILES variable? You might be able
to get rid of the substitutions by using it. You can simply add libxml2
as an input, which will define such variable for you (thanks to Ludovic
for pointing this out previously!).

> +               (setenv "STYLESHEET"
> +                       (string-append xsldoc "/html/docbook.xsl"))
> +               #t))))))
> +    (home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/";)
>      (synopsis "Freedesktop.org scripts for desktop integration")
>      (description "The xdg-utils package is a set of simple scripts that
>  provide basic desktop integration functions in the framework of the

Maxim

Attachment: signature.asc
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]