* [bug#67582] [PATCH gnome-team 4/4] Revert "gnu: sysprof: Do not propagate libadwaita."
2023-12-02 10:35 [bug#67582] [PATCH gnome-team 0/4] Update python-dbusmock Liliana Marie Prikler
@ 2023-12-01 20:48 ` Liliana Marie Prikler
2023-12-01 23:09 ` [bug#67582] [PATCH gnome-team 2/4] gnu: Add python-dbus-python Liliana Marie Prikler
` (3 subsequent siblings)
4 siblings, 0 replies; 13+ messages in thread
From: Liliana Marie Prikler @ 2023-12-01 20:48 UTC (permalink / raw)
To: 67582; +Cc: liliana.prikler, maxim.cournoyer, rg
This reverts commit e21f0cb7b7a87992004193cd56638ad961fe5928. It was
introduced to fix a build failure in mutter, that no longer occurs with
the updated python-dbusmock.
Change-Id: I781fa2314afb0c1819e30ef404cf2e8da6652e3e
---
gnu/packages/gnome.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 07944b7a3e..43d9997efb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13042,7 +13042,8 @@ (define-public sysprof
(("update_desktop_database: true")
"update_desktop_database: false")))))))
(propagated-inputs
- (list glib json-glib polkit))
+ ;; Listed in sysprof-4.pc or sysprof-ui-5.pc
+ (list glib json-glib libadwaita polkit))
(inputs
(list glib
gtk
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [bug#67582] [PATCH gnome-team 2/4] gnu: Add python-dbus-python.
2023-12-02 10:35 [bug#67582] [PATCH gnome-team 0/4] Update python-dbusmock Liliana Marie Prikler
2023-12-01 20:48 ` [bug#67582] [PATCH gnome-team 4/4] Revert "gnu: sysprof: Do not propagate libadwaita." Liliana Marie Prikler
@ 2023-12-01 23:09 ` Liliana Marie Prikler
2023-12-03 17:19 ` Maxim Cournoyer
2023-12-01 23:09 ` [bug#67582] [PATCH gnome-team 3/4] gnu: python-dbusmock: Update to 0.30.0 Liliana Marie Prikler
` (2 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Liliana Marie Prikler @ 2023-12-01 23:09 UTC (permalink / raw)
To: 67582; +Cc: liliana.prikler, maxim.cournoyer, rg
* gnu/packages/python-xyz.scm (python-dbus-python): New variable.
Change-Id: I7d9ba58466e8a07119073209e47814fc9fc573cb
---
gnu/packages/python-xyz.scm | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3e406cc677..3e23311b80 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -173,6 +173,7 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
+ #:use-module (gnu packages build-tools)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
@@ -186,6 +187,7 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages djvu)
#:use-module (gnu packages docker)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages elf)
#:use-module (gnu packages enchant)
#:use-module (gnu packages file)
#:use-module (gnu packages fonts)
@@ -27300,6 +27302,39 @@ (define-public python-pykwalify
for YAML and JSON.")
(license license:expat)))
+(define-public python-dbus-python
+ (package
+ (name "python-dbus-python")
+ (version "1.3.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "dbus-python" version))
+ (sha256
+ (base32 "1y28h90v2ib8zqhs3r2yr7ycg8ccwvw3gqkvadlm12v1129q2rxd"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-requirements
+ (lambda _
+ (substitute* (list "pyproject.toml" "setup.py")
+ (("'(ninja|patchelf)',?") ""))
+ (substitute* "setup.cfg"
+ (("(ninja|patchelf)") "")))))))
+ (inputs (list dbus glib))
+ (propagated-inputs (list python-pygobject))
+ (native-inputs (list pkg-config
+ python-meson-python
+ meson ninja patchelf
+ python-sphinx python-sphinx-rtd-theme
+ python-tappy
+ python-wheel))
+ (home-page "https://dbus.freedesktop.org/doc/dbus-python/")
+ (synopsis "Python bindings for libdbus")
+ (description "This package provides Python bindings to libdbus, the
+reference implementation of the D-Bus protocol.")
+ (license license:expat)))
+
(define-public python-dbusmock
(package
(name "python-dbusmock")
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [bug#67582] [PATCH gnome-team 2/4] gnu: Add python-dbus-python.
2023-12-01 23:09 ` [bug#67582] [PATCH gnome-team 2/4] gnu: Add python-dbus-python Liliana Marie Prikler
@ 2023-12-03 17:19 ` Maxim Cournoyer
2023-12-03 18:41 ` Liliana Marie Prikler
0 siblings, 1 reply; 13+ messages in thread
From: Maxim Cournoyer @ 2023-12-03 17:19 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 67582
Hello,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/python-xyz.scm (python-dbus-python): New variable.
[...]
> +(define-public python-dbus-python
> + (package
> + (name "python-dbus-python")
> + (version "1.3.2")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (pypi-uri "dbus-python" version))
> + (sha256
> + (base32 "1y28h90v2ib8zqhs3r2yr7ycg8ccwvw3gqkvadlm12v1129q2rxd"))))
> + (build-system pyproject-build-system)
> + (arguments
> + (list #:phases #~(modify-phases %standard-phases
> + (add-after 'unpack 'patch-requirements
> + (lambda _
> + (substitute* (list "pyproject.toml" "setup.py")
> + (("'(ninja|patchelf)',?") ""))
> + (substitute* "setup.cfg"
> + (("(ninja|patchelf)") "")))))))
> + (inputs (list dbus glib))
> + (propagated-inputs (list python-pygobject))
> + (native-inputs (list pkg-config
> + python-meson-python
> + meson ninja patchelf
> + python-sphinx python-sphinx-rtd-theme
> + python-tappy
> + python-wheel))
Is this 'guix style' produced? The convention is to use:
(native-inputs
(list one
two
...))
When there are more than 5 inputs (or if they don't fit on a single
line).
Otherwise,
Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 13+ messages in thread* [bug#67582] [PATCH gnome-team 2/4] gnu: Add python-dbus-python.
2023-12-03 17:19 ` Maxim Cournoyer
@ 2023-12-03 18:41 ` Liliana Marie Prikler
2023-12-03 19:06 ` Maxim Cournoyer
0 siblings, 1 reply; 13+ messages in thread
From: Liliana Marie Prikler @ 2023-12-03 18:41 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: rg, 67582
Am Sonntag, dem 03.12.2023 um 12:19 -0500 schrieb Maxim Cournoyer:
> Hello,
>
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > * gnu/packages/python-xyz.scm (python-dbus-python): New variable.
>
> [...]
>
> > +(define-public python-dbus-python
> > + (package
> > + (name "python-dbus-python")
> > + (version "1.3.2")
> > + (source
> > + (origin
> > + (method url-fetch)
> > + (uri (pypi-uri "dbus-python" version))
> > + (sha256
> > + (base32
> > "1y28h90v2ib8zqhs3r2yr7ycg8ccwvw3gqkvadlm12v1129q2rxd"))))
> > + (build-system pyproject-build-system)
> > + (arguments
> > + (list #:phases #~(modify-phases %standard-phases
> > + (add-after 'unpack 'patch-requirements
> > + (lambda _
> > + (substitute* (list "pyproject.toml"
> > "setup.py")
> > + (("'(ninja|patchelf)',?") ""))
> > + (substitute* "setup.cfg"
> > + (("(ninja|patchelf)") "")))))))
> > + (inputs (list dbus glib))
> > + (propagated-inputs (list python-pygobject))
> > + (native-inputs (list pkg-config
> > + python-meson-python
> > + meson ninja patchelf
> > + python-sphinx python-sphinx-rtd-theme
> > + python-tappy
> > + python-wheel))
>
> Is this 'guix style' produced? The convention is to use:
>
> (native-inputs
> (list one
> two
> ...))
>
> When there are more than 5 inputs (or if they don't fit on a single
> line).
I manually grouped them by theme.
Cheers
^ permalink raw reply [flat|nested] 13+ messages in thread* [bug#67582] [PATCH gnome-team 2/4] gnu: Add python-dbus-python.
2023-12-03 18:41 ` Liliana Marie Prikler
@ 2023-12-03 19:06 ` Maxim Cournoyer
2023-12-19 22:54 ` bug#67582: " Liliana Marie Prikler
0 siblings, 1 reply; 13+ messages in thread
From: Maxim Cournoyer @ 2023-12-03 19:06 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 67582
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Sonntag, dem 03.12.2023 um 12:19 -0500 schrieb Maxim Cournoyer:
>> Hello,
>>
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>>
>> > * gnu/packages/python-xyz.scm (python-dbus-python): New variable.
>>
>> [...]
>>
>> > +(define-public python-dbus-python
>> > + (package
>> > + (name "python-dbus-python")
>> > + (version "1.3.2")
>> > + (source
>> > + (origin
>> > + (method url-fetch)
>> > + (uri (pypi-uri "dbus-python" version))
>> > + (sha256
>> > + (base32
>> > "1y28h90v2ib8zqhs3r2yr7ycg8ccwvw3gqkvadlm12v1129q2rxd"))))
>> > + (build-system pyproject-build-system)
>> > + (arguments
>> > + (list #:phases #~(modify-phases %standard-phases
>> > + (add-after 'unpack 'patch-requirements
>> > + (lambda _
>> > + (substitute* (list "pyproject.toml"
>> > "setup.py")
>> > + (("'(ninja|patchelf)',?") ""))
>> > + (substitute* "setup.cfg"
>> > + (("(ninja|patchelf)") "")))))))
>> > + (inputs (list dbus glib))
>> > + (propagated-inputs (list python-pygobject))
>> > + (native-inputs (list pkg-config
>> > + python-meson-python
>> > + meson ninja patchelf
>> > + python-sphinx python-sphinx-rtd-theme
>> > + python-tappy
>> > + python-wheel))
>>
>> Is this 'guix style' produced? The convention is to use:
>>
>> (native-inputs
>> (list one
>> two
>> ...))
>>
>> When there are more than 5 inputs (or if they don't fit on a single
>> line).
> I manually grouped them by theme.
I see. I'd still prefer the conventional sorted flat list, because the
next person touching it probably won't notice and break that logic.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 13+ messages in thread* bug#67582: [PATCH gnome-team 2/4] gnu: Add python-dbus-python.
2023-12-03 19:06 ` Maxim Cournoyer
@ 2023-12-19 22:54 ` Liliana Marie Prikler
0 siblings, 0 replies; 13+ messages in thread
From: Liliana Marie Prikler @ 2023-12-19 22:54 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: rg, 67582-done
Am Sonntag, dem 03.12.2023 um 14:06 -0500 schrieb Maxim Cournoyer:
> Hi,
>
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > Am Sonntag, dem 03.12.2023 um 12:19 -0500 schrieb Maxim Cournoyer:
> > > Hello,
> > >
> > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> > >
> > > > * gnu/packages/python-xyz.scm (python-dbus-python): New
> > > > variable.
> > >
> > > [...]
> > >
> > > > +(define-public python-dbus-python
> > > > + (package
> > > > + (name "python-dbus-python")
> > > > + (version "1.3.2")
> > > > + (source
> > > > + (origin
> > > > + (method url-fetch)
> > > > + (uri (pypi-uri "dbus-python" version))
> > > > + (sha256
> > > > + (base32
> > > > "1y28h90v2ib8zqhs3r2yr7ycg8ccwvw3gqkvadlm12v1129q2rxd"))))
> > > > + (build-system pyproject-build-system)
> > > > + (arguments
> > > > + (list #:phases #~(modify-phases %standard-phases
> > > > + (add-after 'unpack 'patch-requirements
> > > > + (lambda _
> > > > + (substitute* (list "pyproject.toml"
> > > > "setup.py")
> > > > + (("'(ninja|patchelf)',?") ""))
> > > > + (substitute* "setup.cfg"
> > > > + (("(ninja|patchelf)") "")))))))
> > > > + (inputs (list dbus glib))
> > > > + (propagated-inputs (list python-pygobject))
> > > > + (native-inputs (list pkg-config
> > > > + python-meson-python
> > > > + meson ninja patchelf
> > > > + python-sphinx python-sphinx-rtd-theme
> > > > + python-tappy
> > > > + python-wheel))
> > >
> > > Is this 'guix style' produced? The convention is to use:
> > >
> > > (native-inputs
> > > (list one
> > > two
> > > ...))
> > >
> > > When there are more than 5 inputs (or if they don't fit on a
> > > single line).
> > I manually grouped them by theme.
>
> I see. I'd still prefer the conventional sorted flat list, because
> the next person touching it probably won't notice and break that
> logic.
We can still break it when the next person touches it, so that's fine
by me :)
Pushed, along with the rest.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [bug#67582] [PATCH gnome-team 3/4] gnu: python-dbusmock: Update to 0.30.0.
2023-12-02 10:35 [bug#67582] [PATCH gnome-team 0/4] Update python-dbusmock Liliana Marie Prikler
2023-12-01 20:48 ` [bug#67582] [PATCH gnome-team 4/4] Revert "gnu: sysprof: Do not propagate libadwaita." Liliana Marie Prikler
2023-12-01 23:09 ` [bug#67582] [PATCH gnome-team 2/4] gnu: Add python-dbus-python Liliana Marie Prikler
@ 2023-12-01 23:09 ` Liliana Marie Prikler
2023-12-01 23:38 ` [bug#67582] [PATCH gnome-team 1/4] gnu: Add python-meson-python Liliana Marie Prikler
2023-12-02 14:18 ` [bug#67582] [PATCH gnome-team 0/4] Update python-dbusmock Vivien Kraus via Guix-patches via
4 siblings, 0 replies; 13+ messages in thread
From: Liliana Marie Prikler @ 2023-12-01 23:09 UTC (permalink / raw)
To: 67582; +Cc: liliana.prikler, maxim.cournoyer, rg
* gnu/packages/python-xyz.scm (python-dbusmock): Update to 0.30.0.
[#:phases]<patch-paths>: Adjust accordingly.
[native-inputs]: Add upower.
(python-dbus-minimal): New variable.
* gnu/packages/gnome.scm (upower)[native-inputs]: Replace python-dbusmock
with python-dbusmock-minimal.
* gnu/packages/gtk.scm (at-spi2-core)[native-inputs]: Likewise.
(at-spi2-core-with-documentation)[native-inputs]: Adjust accordingly.
* gnu/packages/polkit.scm (polkit)[native-inputs]: Replace python-dbusmock
with python-dbusmock-minimal.
Change-Id: If0cd76da0495d052f94ee5d654436c4d1dd1e2c3
---
gnu/packages/gnome.scm | 2 +-
gnu/packages/gtk.scm | 5 +++--
gnu/packages/polkit.scm | 2 +-
gnu/packages/python-xyz.scm | 21 +++++++++++++++++----
4 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 900869a80c..07944b7a3e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5810,7 +5810,7 @@ (define-public upower
python
;; For tests.
python-dbus
- python-dbusmock
+ python-dbusmock-minimal
python-packaging
python-pygobject
umockdev
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index b5246c8b3b..761b65fd1f 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -849,7 +849,7 @@ (define-public at-spi2-core
gobject-introspection
gsettings-desktop-schemas
pkg-config
- python-dbusmock
+ python-dbusmock-minimal
python-pytest
python-wrapper))
(synopsis "Assistive Technology Service Provider Interface, core components")
@@ -880,7 +880,8 @@ (define-public at-spi2-core-with-documentation
"/share/doc'\n")))))))))
(native-inputs
(modify-inputs (package-native-inputs at-spi2-core)
- (append gi-docgen python python-sphinx)))
+ (append gi-docgen python python-sphinx)
+ (replace "python-dbusmock" python-dbusmock)))
(properties (alist-delete 'hidden?
(package-properties at-spi2-core)))))
diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 2f733dd703..337d9b9a73 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -158,7 +158,7 @@ (define-public polkit
perl
pkg-config
python
- python-dbusmock))
+ python-dbusmock-minimal))
(home-page "https://www.freedesktop.org/wiki/Software/polkit/")
(synopsis "Authorization API for privilege management")
(description "Polkit is an application-level toolkit for defining and
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3e23311b80..c079efe7ca 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -27338,14 +27338,14 @@ (define-public python-dbus-python
(define-public python-dbusmock
(package
(name "python-dbusmock")
- (version "0.25.0")
+ (version "0.30.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "python-dbusmock" version))
(sha256
(base32
- "1nwl0gzzds2g1w1gfxfzlgrkb5hr1rrdyn619ml25c6b1rjyfk3g"))))
+ "1hanz6x76jq66ypdirga5h15zjs67kwysl6rmsf0i22dbdqrxdfv"))))
(build-system python-build-system)
(arguments
(list #:modules `((guix build python-build-system)
@@ -27356,6 +27356,9 @@ (define-public python-dbusmock
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "tests/test_api.py"
+ (("/usr/bin/python3")
+ (which "python3")))
(substitute* "tests/test_code.py"
(("/bin/bash")
(which "bash")))
@@ -27382,11 +27385,11 @@ (define-public python-dbusmock
status))
(loop)))))))))))))
(native-inputs
- (list dbus python-pytest which))
+ (list dbus python-pytest upower which))
(inputs
(list dbus))
(propagated-inputs
- (list python-dbus python-pygobject))
+ (list python-dbus-python python-pygobject))
(home-page "https://github.com/martinpitt/python-dbusmock")
(synopsis "Python library for mock D-Bus objects")
(description "python-dbusmock allows for the easy creation of mock objects on
@@ -27396,6 +27399,16 @@ (define-public python-dbusmock
services to what you expect in your tests.")
(license license:lgpl3+)))
+(define-public python-dbusmock-minimal
+ (package
+ (inherit python-dbusmock)
+ (name "python-dbusmock-minimal")
+ (arguments
+ (substitute-keyword-arguments (package-arguments python-dbusmock)
+ ((#:tests? _ #t) #f)))
+ (native-inputs (list which))
+ (properties '((hidden? . #t)))))
+
(define-public python-jsonplus
(package
(name "python-jsonplus")
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [bug#67582] [PATCH gnome-team 1/4] gnu: Add python-meson-python.
2023-12-02 10:35 [bug#67582] [PATCH gnome-team 0/4] Update python-dbusmock Liliana Marie Prikler
` (2 preceding siblings ...)
2023-12-01 23:09 ` [bug#67582] [PATCH gnome-team 3/4] gnu: python-dbusmock: Update to 0.30.0 Liliana Marie Prikler
@ 2023-12-01 23:38 ` Liliana Marie Prikler
2023-12-03 17:16 ` Maxim Cournoyer
2023-12-02 14:18 ` [bug#67582] [PATCH gnome-team 0/4] Update python-dbusmock Vivien Kraus via Guix-patches via
4 siblings, 1 reply; 13+ messages in thread
From: Liliana Marie Prikler @ 2023-12-01 23:38 UTC (permalink / raw)
To: 67582; +Cc: liliana.prikler, maxim.cournoyer, rg
* gnu/packages/python-xyz.scm (python-meson-python): New variable.
Change-Id: I43548f7d23b7a2f1c8caedacd72498c868c85ac3
---
gnu/packages/python-xyz.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8e89f61373..3e406cc677 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -274,6 +274,7 @@ (define-module (gnu packages python-xyz)
#:use-module (guix build-system cargo)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
#:use-module (guix download)
@@ -12589,6 +12590,24 @@ (define-public python-pyproject-metadata
(define-public python-pep621
(deprecated-package "python-pep621" python-pyproject-metadata))
+(define-public python-meson-python
+ (package
+ (name "python-meson-python")
+ (version "0.15.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "meson_python" version))
+ (sha256
+ (base32 "0vyjhjabvm41hqijifk33idbdl62i76kfyf884f9rs29rpp77nzx"))))
+ (build-system meson-build-system)
+ (propagated-inputs (list python-pyproject-metadata python-tomli))
+ (home-page "https://github.com/mesonbuild/meson-python")
+ (synopsis "Meson Python build backend (PEP 517)")
+ (description "This package provides a PEP 517 build backend that makes
+use of the Meson build system.")
+ (license license:expat)))
+
(define-public python-pyflakes
(package
(name "python-pyflakes")
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [bug#67582] [PATCH gnome-team 1/4] gnu: Add python-meson-python.
2023-12-01 23:38 ` [bug#67582] [PATCH gnome-team 1/4] gnu: Add python-meson-python Liliana Marie Prikler
@ 2023-12-03 17:16 ` Maxim Cournoyer
2023-12-03 18:41 ` Liliana Marie Prikler
0 siblings, 1 reply; 13+ messages in thread
From: Maxim Cournoyer @ 2023-12-03 17:16 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 67582
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/python-xyz.scm (python-meson-python): New variable.
This should go to gnu/packages/python-build.scm.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 13+ messages in thread
* [bug#67582] [PATCH gnome-team 1/4] gnu: Add python-meson-python.
2023-12-03 17:16 ` Maxim Cournoyer
@ 2023-12-03 18:41 ` Liliana Marie Prikler
2023-12-03 19:04 ` Maxim Cournoyer
0 siblings, 1 reply; 13+ messages in thread
From: Liliana Marie Prikler @ 2023-12-03 18:41 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: rg, 67582
Am Sonntag, dem 03.12.2023 um 12:16 -0500 schrieb Maxim Cournoyer:
> Hi,
>
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > * gnu/packages/python-xyz.scm (python-meson-python): New variable.
>
> This should go to gnu/packages/python-build.scm.
It should, but it can't, because there are requirements from python-xyz
and I'm not going to move them around on-the-go.
Cheers
^ permalink raw reply [flat|nested] 13+ messages in thread
* [bug#67582] [PATCH gnome-team 1/4] gnu: Add python-meson-python.
2023-12-03 18:41 ` Liliana Marie Prikler
@ 2023-12-03 19:04 ` Maxim Cournoyer
0 siblings, 0 replies; 13+ messages in thread
From: Maxim Cournoyer @ 2023-12-03 19:04 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 67582
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Sonntag, dem 03.12.2023 um 12:16 -0500 schrieb Maxim Cournoyer:
>> Hi,
>>
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>>
>> > * gnu/packages/python-xyz.scm (python-meson-python): New variable.
>>
>> This should go to gnu/packages/python-build.scm.
> It should, but it can't, because there are requirements from python-xyz
> and I'm not going to move them around on-the-go.
It doesn't look out of reach if we add a bootstrap (untested) variant of
python-pyproject-metada in (gnu packages python-build), but okay.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 13+ messages in thread
* [bug#67582] [PATCH gnome-team 0/4] Update python-dbusmock
2023-12-02 10:35 [bug#67582] [PATCH gnome-team 0/4] Update python-dbusmock Liliana Marie Prikler
` (3 preceding siblings ...)
2023-12-01 23:38 ` [bug#67582] [PATCH gnome-team 1/4] gnu: Add python-meson-python Liliana Marie Prikler
@ 2023-12-02 14:18 ` Vivien Kraus via Guix-patches via
4 siblings, 0 replies; 13+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-12-02 14:18 UTC (permalink / raw)
To: 67582
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
Hello!
Thank you for this much needed update!
I can however anticipate a QA failure, as accountsservice is too old. I
don’t want to confuse QA, so the patch is an attachment.
Best regards,
Vivien
[-- Attachment #2: 0001-gnu-accountsservice-Update-to-23.13.9.patch --]
[-- Type: text/x-patch, Size: 3616 bytes --]
From bc04d8ddae4cdc7caf2e30df5811b4c94432239a Mon Sep 17 00:00:00 2001
Message-ID: <bc04d8ddae4cdc7caf2e30df5811b4c94432239a.1701526104.git.vivien@planete-kraus.eu>
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sat, 2 Dec 2023 15:04:51 +0100
Subject: [PATCH gnome-team] gnu: accountsservice: Update to 23.13.9.
To: 67582@debbugs.gnu.org
Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name
The style of the C code has changed, so the patch does not apply anymore.
* gnu/packages/freedesktop.scm (accountsservice): Update to 23.13.9.
[native-inuputs]: Add glibc-locales.
* gnu/packages/patches/accountsservice-extensions.patch: Update.
Change-Id: I19678b5ce36549a832099109b13cdaf91539b20a
---
Thank you for this much needed update!
accountsservice fails to build now though, but we can fix it by upgrading it.
Best regards,
Vivien
gnu/packages/freedesktop.scm | 5 +++--
gnu/packages/patches/accountsservice-extensions.patch | 5 ++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 25b7998d05..a934b3ac17 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1746,7 +1746,7 @@ (define-public udisks
(define-public accountsservice
(package
(name "accountsservice")
- (version "22.08.8")
+ (version "23.13.9")
(source
(origin
(method url-fetch)
@@ -1754,7 +1754,7 @@ (define-public accountsservice
"accountsservice/accountsservice-"
version ".tar.xz"))
(sha256
- (base32 "14d3lwik048h62qrzg1djdd2sqmxf3m1r859730pvzhrd6krg6ch"))
+ (base32 "0kwjkff5m7gnzpns6cy27az90w7sxzwzygyzwy90kyi4mvg4rnmd"))
(patches (search-patches "accountsservice-extensions.patch"))))
(build-system meson-build-system)
(arguments
@@ -1795,6 +1795,7 @@ (define-public accountsservice
docbook-xsl
gettext-minimal
`(,glib "bin") ; for gdbus-codegen, etc.
+ glibc-locales ;for tests
gobject-introspection
gtk-doc
libxml2 ;for XML_CATALOG_FILES
diff --git a/gnu/packages/patches/accountsservice-extensions.patch b/gnu/packages/patches/accountsservice-extensions.patch
index 2cfab580e3..8027a28a44 100644
--- a/gnu/packages/patches/accountsservice-extensions.patch
+++ b/gnu/packages/patches/accountsservice-extensions.patch
@@ -5,7 +5,7 @@ diff --git a/src/extensions.c b/src/extensions.c
index 038dcb2..830465d 100644
--- a/src/extensions.c
+++ b/src/extensions.c
-@@ -121,16 +121,7 @@ daemon_read_extension_directory (GHashTable *ifaces,
+@@ -122,15 +122,7 @@ daemon_read_extension_directory (GHashTable *ifaces,
continue;
}
@@ -13,8 +13,7 @@ index 038dcb2..830465d 100644
- const gchar * const prefix = "../../dbus-1/interfaces/";
- if (g_str_has_prefix (symlink, prefix) && g_str_equal (symlink + strlen (prefix), name)) {
- daemon_read_extension_file (ifaces, filename);
-- }
-- else {
+- } else {
- g_warning ("Found accounts service vendor extension symlink %s, but it must be exactly "
- "equal to '../../dbus-1/interfaces/%s' for forwards-compatibility reasons.",
- filename, name);
base-commit: e21f0cb7b7a87992004193cd56638ad961fe5928
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread