[PATCH] gnu: gnome-tweak-tool: Use glib-or-gtk-build-system

[PATCH] gnu: gnome-tweak-tool: Use glib-or-gtk-build-system

[Christopher Baines]

* gnu/packages/gnome.scm (gnome-tweak-tool): Switch from the gnu build
system to the glib-or-gtk build system, to fix missing gobject
introspection namespaces.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 91da7783a..5f13cdd0e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5288,12 +5288,12 @@ existing databases over the internet.")
               (sha256
                (base32
                 "1fj6wjvnjygzm9br3sw9gya6d18yly1rm69yaiar9spfbkvv4wai"))))
-    (build-system gnu-build-system)
+    (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags '("--localstatedir=/tmp"
                            "--sysconfdir=/tmp")
        #:imported-modules ((guix build python-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%glib-or-gtk-build-system-modules)
        #:phases (modify-phases %standard-phases
                   (add-after 'install 'wrap
                     (@@ (guix build python-build-system) wrap)))))
-- 
2.11.0

Re: [PATCH] gnu: gnome-tweak-tool: Use glib-or-gtk-build-system

[Ludovic Courtès]

Hi!

Christopher Baines <mail@cbaines.net> skribis:

> * gnu/packages/gnome.scm (gnome-tweak-tool): Switch from the gnu build
> system to the glib-or-gtk build system, to fix missing gobject
> introspection namespaces.

Using ‘glib-or-gtk-build-system’ sounds right here, but with this patch,
I get:

--8<---------------cut here---------------start------------->8---
$ ./pre-inst-env guix build gnome-tweak-tool 
/gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1
ludo@pluto ~/src/guix$ /gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/bin/gnome-tweak-tool 
Traceback (most recent call last):
  File "/gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/bin/..gnome-tweak-tool-real-real", line 24, in <module>
    gi.require_version("Gtk", "3.0")
  File "/gnu/store/dhcvv1qczvqwsj7fdi1qpny8myrqydb8-python2-pygobject-3.20.0/lib/python2.7/site-packages/gi/__init__.py", line 102, in require_version
    raise ValueError('Namespace %s not available' % namespace)
ValueError: Namespace Gtk not available
--8<---------------cut here---------------end--------------->8---

and:

--8<---------------cut here---------------start------------->8---
$ ./pre-inst-env guix environment --ad-hoc gnome-tweak-tool -- gnome-tweak-tool

[...]

** (..gnome-tweak-tool-real-real:27638): WARNING **: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files
WARNING : Shell not installed or running
Traceback (most recent call last):
  File "/gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/lib/python2.7/site-packages/gtweak/app.py", line 39, in do_activate
    self.win = Window(self, model)
  File "/gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/lib/python2.7/site-packages/gtweak/tweakview.py", line 58, in __init__
    self._model.load_tweaks(self)
  File "/gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/lib/python2.7/site-packages/gtweak/tweakmodel.py", line 125, in load_tweaks
    mods = __import__("gtweak.tweaks", globals(), locals(), tweak_files, 0)
  File "/gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/lib/python2.7/site-packages/gtweak/tweaks/tweak_group_shell.py", line 98, in <module>
    sw = StaticWorkspaceTweak(size_group=sg, loaded=_shell_loaded)
  File "/gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/lib/python2.7/site-packages/gtweak/tweaks/tweak_group_shell.py", line 50, in __init__
    default = self.STATUS.keys()[self.STATUS.values().index(self.settings[self.key_name])]
ValueError: None is not in list
--8<---------------cut here---------------end--------------->8---

Is this a different error?

Thanks!

Ludo’.

Re: [PATCH] gnu: gnome-tweak-tool: Use glib-or-gtk-build-system

[Christopher Baines]

[-- Attachment #1.1: Type: text/plain, Size: 3132 bytes --]

On 29/12/16 18:05, Ludovic Courtès wrote:
> Hi!
> 
> Christopher Baines <mail@cbaines.net> skribis:
> 
>> * gnu/packages/gnome.scm (gnome-tweak-tool): Switch from the gnu build
>> system to the glib-or-gtk build system, to fix missing gobject
>> introspection namespaces.
> 
> Using ‘glib-or-gtk-build-system’ sounds right here, but with this patch,
> I get:
> 
> --8<---------------cut here---------------start------------->8---
> $ ./pre-inst-env guix build gnome-tweak-tool 
> /gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1
> ludo@pluto ~/src/guix$ /gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/bin/gnome-tweak-tool 
> Traceback (most recent call last):
>   File "/gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/bin/..gnome-tweak-tool-real-real", line 24, in <module>
>     gi.require_version("Gtk", "3.0")
>   File "/gnu/store/dhcvv1qczvqwsj7fdi1qpny8myrqydb8-python2-pygobject-3.20.0/lib/python2.7/site-packages/gi/__init__.py", line 102, in require_version
>     raise ValueError('Namespace %s not available' % namespace)
> ValueError: Namespace Gtk not available
> --8<---------------cut here---------------end--------------->8---
> 
> and:
> 
> --8<---------------cut here---------------start------------->8---
> $ ./pre-inst-env guix environment --ad-hoc gnome-tweak-tool -- gnome-tweak-tool
> 
> [...]
> 
> ** (..gnome-tweak-tool-real-real:27638): WARNING **: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files
> WARNING : Shell not installed or running
> Traceback (most recent call last):
>   File "/gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/lib/python2.7/site-packages/gtweak/app.py", line 39, in do_activate
>     self.win = Window(self, model)
>   File "/gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/lib/python2.7/site-packages/gtweak/tweakview.py", line 58, in __init__
>     self._model.load_tweaks(self)
>   File "/gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/lib/python2.7/site-packages/gtweak/tweakmodel.py", line 125, in load_tweaks
>     mods = __import__("gtweak.tweaks", globals(), locals(), tweak_files, 0)
>   File "/gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/lib/python2.7/site-packages/gtweak/tweaks/tweak_group_shell.py", line 98, in <module>
>     sw = StaticWorkspaceTweak(size_group=sg, loaded=_shell_loaded)
>   File "/gnu/store/p6g06x6l1b3iw7hm447ys9sqr8bh2nbp-gnome-tweak-tool-3.20.1/lib/python2.7/site-packages/gtweak/tweaks/tweak_group_shell.py", line 50, in __init__
>     default = self.STATUS.keys()[self.STATUS.values().index(self.settings[self.key_name])]
> ValueError: None is not in list
> --8<---------------cut here---------------end--------------->8---
> 
> Is this a different error?

I seem to remember this change being sufficient, but I can reproduce the
behavior above when not using GuixSD. I'll send a new set of patches
that attempt to further improve the package.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 988 bytes --]

[PATCH 1/4] gnu: gnome-tweak-tool: Use glib-or-gtk-build-system

[Christopher Baines]

* gnu/packages/gnome.scm (gnome-tweak-tool): Switch from the gnu build
system to the glib-or-gtk build system, to fix missing gobject
introspection namespaces.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 91da7783a..5f13cdd0e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5288,12 +5288,12 @@ existing databases over the internet.")
               (sha256
                (base32
                 "1fj6wjvnjygzm9br3sw9gya6d18yly1rm69yaiar9spfbkvv4wai"))))
-    (build-system gnu-build-system)
+    (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags '("--localstatedir=/tmp"
                            "--sysconfdir=/tmp")
        #:imported-modules ((guix build python-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%glib-or-gtk-build-system-modules)
        #:phases (modify-phases %standard-phases
                   (add-after 'install 'wrap
                     (@@ (guix build python-build-system) wrap)))))
-- 
2.11.0

[PATCH 2/4] gnu: gnome-tweak-tool: Include GI_TYPELIB_PATH

[Christopher Baines]

* gnu/packages/gnome.scm (gnome-tweak-tool): Add another wrap phase to
include GI_TYPELIB_PATH.
---
 gnu/packages/gnome.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5f13cdd0e..12a30d12d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5295,6 +5295,14 @@ existing databases over the internet.")
        #:imported-modules ((guix build python-build-system)
                            ,@%glib-or-gtk-build-system-modules)
        #:phases (modify-phases %standard-phases
+                  (add-after
+                      'install 'wrap-program
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((out               (assoc-ref outputs "out"))
+                            (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
+                        (wrap-program (string-append out "/bin/gnome-tweak-tool")
+                          `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
+                      #t))
                   (add-after 'install 'wrap
                     (@@ (guix build python-build-system) wrap)))))
     (native-inputs
-- 
2.11.0

[PATCH 3/4] gnu: gnome-tweak-tool: Make propagated-inputs just inputs

[Christopher Baines]

* gnu/packages/gnome.scm (gnome-tweak-tool): Just use inputs, as these
are now referenced by the package.
---
 gnu/packages/gnome.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 12a30d12d..a76ec2f4e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5310,9 +5310,8 @@ existing databases over the internet.")
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("python" ,python-2)
-       ("python2-pygobject" ,python2-pygobject)))
-    (propagated-inputs
-     `(("libnotify" ,libnotify)
+       ("python2-pygobject" ,python2-pygobject)
+       ("libnotify" ,libnotify)
        ("gobject-introspection" ,gobject-introspection)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gtk+" ,gtk+)))
-- 
2.11.0

[PATCH 4/4] gnu: gnome-tweak-tool: Add missing inputs

[Christopher Baines]

* gnu/packages/gnome.scm (gnome-tweak-tool)[inputs]: Add gnome-desktop
and libsoup.
---
 gnu/packages/gnome.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a76ec2f4e..3bed2768d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5311,6 +5311,8 @@ existing databases over the internet.")
     (inputs
      `(("python" ,python-2)
        ("python2-pygobject" ,python2-pygobject)
+       ("gnome-desktop" ,gnome-desktop)
+       ("libsoup" ,libsoup)
        ("libnotify" ,libnotify)
        ("gobject-introspection" ,gobject-introspection)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-- 
2.11.0

Re: [PATCH 1/4] gnu: gnome-tweak-tool: Use glib-or-gtk-build-system

[Ludovic Courtès]

Hello!

I pushed all 4 patches with slightly adjusted commit logs (please take
a look :-)).

Thank you, and sorry for the delay!

Ludo’.

Re: [PATCH] gnu: gnome-tweak-tool: Use glib-or-gtk-build-system

[Chris Marusich]

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

Christopher Baines <mail@cbaines.net> writes:

> * gnu/packages/gnome.scm (gnome-tweak-tool): Switch from the gnu build
> system to the glib-or-gtk build system, to fix missing gobject
> introspection namespaces.
> ---
>  gnu/packages/gnome.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 91da7783a..5f13cdd0e 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -5288,12 +5288,12 @@ existing databases over the internet.")
>                (sha256
>                 (base32
>                  "1fj6wjvnjygzm9br3sw9gya6d18yly1rm69yaiar9spfbkvv4wai"))))
> -    (build-system gnu-build-system)
> +    (build-system glib-or-gtk-build-system)
>      (arguments
>       `(#:configure-flags '("--localstatedir=/tmp"
>                             "--sysconfdir=/tmp")
>         #:imported-modules ((guix build python-build-system)
> -                           ,@%gnu-build-system-modules)
> +                           ,@%glib-or-gtk-build-system-modules)
>         #:phases (modify-phases %standard-phases
>                    (add-after 'install 'wrap
>                      (@@ (guix build python-build-system) wrap)))))

When I build this with --rounds=2, I get the following error:

  output ‘/gnu/store/2469sq8ny3f7dffx3v30y27d882hy5k4-module-import-compiled’ of ‘/gnu/store/8frm3y92vlkxjb2x0ljcrzx4qy357wv9-module-import-compiled.drv’ differs from previous round

I don't get that error when building the previous version of
gnome-tweak-tool, but I'm not sure if it indicates a problem with
gnome-tweak-tool or some other component.

I've also noticed that the tool doesn't work in a pure environment -
this occurs both before and after applying your patch:

--8<---------------cut here---------------start------------->8---
$ guix environment --pure --ad-hoc gnome-tweak-tool
substitute: updating list of substitutes from 'https://hydra-mirror.marusich.info'... 100.0%
substitute: updating list of substitutes from 'https://mirror.hydra.gnu.org'... 100.0%
substitute: updating list of substitutes from 'https://hydra.gnu.org'... 100.0%
The following derivations will be built:
   /gnu/store/ww98gqfb4mpfybm667d64jcgkqggadx9-profile.drv
   /gnu/store/sjfdj137hjqiig79hf3y8rz2i4p4s378-gtk-icon-themes.drv
   /gnu/store/pcj6yb9i03dffqqa8qgwhv9fbbgswvdq-fonts-dir.drv
   /gnu/store/jhiq2626lp4k6d2apn7hvb6zfjpn7v3w-xdg-mime-database.drv
   /gnu/store/bq2vhg7lpygfixi473yy1x4n3p3kpxjw-info-dir.drv
   /gnu/store/29kb6zrcy3avc70k08ph39fgmm74fv5h-gtk-im-modules.drv
   /gnu/store/1lb9d7qcrsfwmjkpk55i0yj935hvzwy1-ca-certificate-bundle.drv
warning: collision encountered: /gnu/store/a9w50gcm642akrdd7905jp4f3sw5rs1i-gtk-icon-themes/share/icons/hicolor/icon-theme.cache /gnu/store/2s45v3s71hcnxxgsj2b42kmfqygn0rca-gtk+-3.20.9/share/icons/hicolor/icon-theme.cache 
warning: arbitrarily choosing /gnu/store/a9w50gcm642akrdd7905jp4f3sw5rs1i-gtk-icon-themes/share/icons/hicolor/icon-theme.cache
warning: collision encountered: /gnu/store/vdzbg5rv8glrg7lx1sb62c00r8ll6rkw-gsettings-desktop-schemas-3.20.0/share/glib-2.0/schemas/gschemas.compiled /gnu/store/2s45v3s71hcnxxgsj2b42kmfqygn0rca-gtk+-3.20.9/share/glib-2.0/schemas/gschemas.compiled 
warning: arbitrarily choosing /gnu/store/vdzbg5rv8glrg7lx1sb62c00r8ll6rkw-gsettings-desktop-schemas-3.20.0/share/glib-2.0/schemas/gschemas.compiled
[0] [env] marusich@garuda:~/guix
$ type gnome-tweak-tool 
gnome-tweak-tool is /gnu/store/xmfcs5p27cyfrm7xqvk5dvmglrglqw13-profile/bin/gnome-tweak-tool
[0] [env] marusich@garuda:~/guix
$ gnome-tweak-tool 
WARNING : Shell not installed or running

(.gnome-tweak-tool-real:32567): Gtk-WARNING **: Could not find the icon 'gnome-tweak-tool'. The 'hicolor' theme
was not found either, perhaps you need to install it.
You can get a copy from:
	http://icon-theme.freedesktop.org/releases
GLib-GIO-Message: Using the 'memory' GSettings backend.  Your settings will not be saved or shared with other applications.

(.gnome-tweak-tool-real:32567): GLib-GIO-ERROR **: Settings schema 'org.gnome.settings-daemon.plugins.xsettings' is not installed

Trace/breakpoint trap
[133] [env] marusich@garuda:~/guix
$ 
--8<---------------cut here---------------end--------------->8---

Do you know anything about these issues?

-- 
Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: [PATCH] gnu: gnome-tweak-tool: Use glib-or-gtk-build-system

[Ludovic Courtès]

Chris Marusich <cmmarusich@gmail.com> skribis:

> Christopher Baines <mail@cbaines.net> writes:
>
>> * gnu/packages/gnome.scm (gnome-tweak-tool): Switch from the gnu build
>> system to the glib-or-gtk build system, to fix missing gobject
>> introspection namespaces.
>> ---
>>  gnu/packages/gnome.scm | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
>> index 91da7783a..5f13cdd0e 100644
>> --- a/gnu/packages/gnome.scm
>> +++ b/gnu/packages/gnome.scm
>> @@ -5288,12 +5288,12 @@ existing databases over the internet.")
>>                (sha256
>>                 (base32
>>                  "1fj6wjvnjygzm9br3sw9gya6d18yly1rm69yaiar9spfbkvv4wai"))))
>> -    (build-system gnu-build-system)
>> +    (build-system glib-or-gtk-build-system)
>>      (arguments
>>       `(#:configure-flags '("--localstatedir=/tmp"
>>                             "--sysconfdir=/tmp")
>>         #:imported-modules ((guix build python-build-system)
>> -                           ,@%gnu-build-system-modules)
>> +                           ,@%glib-or-gtk-build-system-modules)
>>         #:phases (modify-phases %standard-phases
>>                    (add-after 'install 'wrap
>>                      (@@ (guix build python-build-system) wrap)))))
>
> When I build this with --rounds=2, I get the following error:
>
>   output ‘/gnu/store/2469sq8ny3f7dffx3v30y27d882hy5k4-module-import-compiled’ of ‘/gnu/store/8frm3y92vlkxjb2x0ljcrzx4qy357wv9-module-import-compiled.drv’ differs from previous round

This is a “known issue”, but the good news is that it’s fixed upstream:

  https://bugs.gnu.org/20272

Ludo’.