diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2026-01-23 22:52:45 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-03-06 14:52:04 +0100 |
| commit | a40439873e9ffa641e0c9ee554bb6919d9e0503c (patch) | |
| tree | 1d295e578f90ba2e4a9b51b3262f2204a85da1e1 /gnu/packages/glib.scm | |
| parent | e91af9d8766856dd939ce3a06c2c23f6c37dc00a (diff) | |
gnu: dbus: Update to 1.16.2.
* gnu/packages/glib.scm (dbus): Update to 1.16.2.
[build-system]: Switch to meson-build-system.
[#:configure-flags, #:phases]: Adjust accordingly.
[native-inputs]: Remove autoconf, autoconf-archive and automake.
Add python.
Diffstat (limited to 'gnu/packages/glib.scm')
| -rw-r--r-- | gnu/packages/glib.scm | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index e96239db384..fe54d40864a 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm | |||
| @@ -113,7 +113,7 @@ | |||
| 113 | (define dbus | 113 | (define dbus |
| 114 | (package | 114 | (package |
| 115 | (name "dbus") | 115 | (name "dbus") |
| 116 | (version "1.15.8") | 116 | (version "1.16.2") |
| 117 | (source (origin | 117 | (source (origin |
| 118 | (method url-fetch) | 118 | (method url-fetch) |
| 119 | (uri (string-append | 119 | (uri (string-append |
| @@ -121,21 +121,18 @@ | |||
| 121 | version ".tar.xz")) | 121 | version ".tar.xz")) |
| 122 | (sha256 | 122 | (sha256 |
| 123 | (base32 | 123 | (base32 |
| 124 | "016j3rqc8m62bg0h7z4rpvbvm5bg0hbjrld733f0aby8drz5kz44")) | 124 | "1qmppvb4nf23nvdr1hnywl43ab4ckblrqzn0nb77pzkan6ja38hb")) |
| 125 | (patches (search-patches "dbus-helper-search-path.patch")))) | 125 | (patches (search-patches "dbus-helper-search-path.patch")))) |
| 126 | (build-system gnu-build-system) | 126 | (build-system meson-build-system) |
| 127 | (arguments | 127 | (arguments |
| 128 | (list | 128 | (list |
| 129 | #:configure-flags | 129 | #:configure-flags |
| 130 | #~(list | 130 | #~(list |
| 131 | ;; Install the system bus socket under /var. | 131 | ;; Install the system bus socket under /var. |
| 132 | "--localstatedir=/var" | 132 | "-Dlocalstatedir=/var" |
| 133 | 133 | ||
| 134 | ;; Install the session bus socket under /tmp. | 134 | ;; Install the session bus socket under /tmp. |
| 135 | "--with-session-socket-dir=/tmp" | 135 | "-Dsession_socket_dir=/tmp" |
| 136 | |||
| 137 | ;; Build shared libraries only. | ||
| 138 | "--disable-static" | ||
| 139 | 136 | ||
| 140 | ;; Use /etc/dbus-1 for system-wide config. | 137 | ;; Use /etc/dbus-1 for system-wide config. |
| 141 | ;; Look for configuration file under | 138 | ;; Look for configuration file under |
| @@ -145,7 +142,7 @@ | |||
| 145 | ;; regardless of what '--config-file' was | 142 | ;; regardless of what '--config-file' was |
| 146 | ;; passed to 'dbus-daemon' on the command line; | 143 | ;; passed to 'dbus-daemon' on the command line; |
| 147 | ;; see <https://bugs.freedesktop.org/show_bug.cgi?id=92458>. | 144 | ;; see <https://bugs.freedesktop.org/show_bug.cgi?id=92458>. |
| 148 | "--sysconfdir=/etc") | 145 | "-Dsysconfdir=/etc") |
| 149 | #:phases | 146 | #:phases |
| 150 | #~(modify-phases %standard-phases | 147 | #~(modify-phases %standard-phases |
| 151 | #$@(if (target-hurd?) | 148 | #$@(if (target-hurd?) |
| @@ -158,23 +155,25 @@ | |||
| 158 | (replace 'install | 155 | (replace 'install |
| 159 | (lambda _ | 156 | (lambda _ |
| 160 | ;; Don't try to create /var and /etc. | 157 | ;; Don't try to create /var and /etc. |
| 161 | (invoke "make" | 158 | (invoke "meson" |
| 162 | "localstatedir=/tmp/dummy" | 159 | "install" |
| 163 | "sysconfdir=/tmp/dummy" | 160 | "--destdir=/tmp/dummy") |
| 164 | "install")))))) | 161 | (copy-recursively (string-append "/tmp/dummy/" #$output) |
| 162 | #$output) | ||
| 163 | (mkdir-p (string-append #$output:doc "/share")) | ||
| 164 | (rename-file (string-append #$output "/share/doc") | ||
| 165 | (string-append #$output:doc "/share/doc"))))))) | ||
| 165 | (native-inputs | 166 | (native-inputs |
| 166 | ;; Some dependencies are required to generate the documentation. Also, | 167 | ;; Some dependencies are required to generate the documentation. Also, |
| 167 | ;; quoting NEWS for 1.15.8: “Autotools-generated files are no longer | 168 | ;; quoting NEWS for 1.16.2: “Autotools-generated files are no longer |
| 168 | ;; included in the tarball release.” | 169 | ;; included in the tarball release.” |
| 169 | (list autoconf | 170 | (list docbook-xml-4.4 |
| 170 | autoconf-archive | ||
| 171 | automake | ||
| 172 | docbook-xml-4.4 | ||
| 173 | docbook-xsl | 171 | docbook-xsl |
| 174 | doxygen | 172 | doxygen |
| 175 | libtool | 173 | libtool |
| 176 | libxslt | 174 | libxslt |
| 177 | which | 175 | which |
| 176 | python | ||
| 178 | xmlto | 177 | xmlto |
| 179 | yelp-tools | 178 | yelp-tools |
| 180 | pkg-config)) | 179 | pkg-config)) |
