TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: Remove meson-0.59 workarounds.

Browse source 
Mostly automated with the following command:

$ grep --include='*.scm' '#:meson ,meson-0.59' -rl \
    | xargs sed -z 's/#:meson[^\n]*\s*//' -i

* gnu/packages/freedesktop.scm (malcontent)
(accountsservice): Delete #:meson argument.
* gnu/packages/games.scm (gnome-2048): Likewise.
* gnu/packages/geo.scm (gnome-maps): Likewise.
* gnu/packages/gnome.scm (gnome-photos, gnome-music)
(gnome-initial-setup, gnome-user-share, gnome-characters)
(gnome-disk-utility, gnome-font-viewer, evince, glade3)
(gnome-mines, gnome-sudoku, gnome-settings-daemon, devhelp)
(totem, eog, gvfs, simple-scan, epiphany, gnome-session, gedit)
(network-manager-applet, gnome-control-center, gnome-shell, nautilus)
(gnome-default-applications, gnome-weather, gnome-tweaks, cheese, gthumb)
(gitg, polari, gnome-boxes, gtranslator): Likewise.
* gnu/packages/gtk.scm: (gtkmm-3): Likewise.
* gnu/packages/pdf.scm (zathura): Likewise.
* gnu/packages/photo.scm (entangle): Likewise.
* gnu/packages/video.scm (pitivi): Likewise.
* gnu/packages/virtualization.scm (libvirt-glib): Likewise.
This commit is contained in:
Maxim Cournoyer 2021-12-17 12:40:28 -05:00
parent 6f36d0c89e
commit 41ec0573b8
No known key found for this signature in database
GPG key ID: 1260E46482E63562
9 changed files with 29 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/freedesktop.scm
View file

@ -353,8 +353,7 @@ (define-public malcontent
(base32 "0vnf0pk516fwwh41v96c29l2i7h1pnwhivlkbf53kkx1q35g7lb3"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
;; AppInfo not available inside build environment.
@ -1378,8 +1377,7 @@ (define-public accountsservice
(base32 "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;see https://github.com/mesonbuild/meson/issues/6470
#:tests? #f ; XXX: tests require DocBook 4.1.2
`(#:tests? #f ; XXX: tests require DocBook 4.1.2
#:configure-flags
'("--localstatedir=/var"
"-Dsystemdsystemunitdir=/tmp/empty"

1
gnu/packages/games.scm
View file

@ -1757,7 +1757,6 @@ (define-public gnome-2048
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:meson ,meson-0.59
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache

3
gnu/packages/geo.scm
View file

@ -229,8 +229,7 @@ (define-public gnome-maps
"037xmkmcmcw87vb1c1s3y225m8757k331cvk1m8cshf6mx61p0l1"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache

90
gnu/packages/gnome.scm
View file

@ -886,8 +886,7 @@ (define-public gnome-photos
"1bzi79plw6ji6qlckhxnwfnswy6jpnhzmmyanml2i2xg73hp6bg0"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:configure-flags
(list "-Ddogtail=false" ; Not available
;; Required for RUNPATH validation.
@ -958,8 +957,7 @@ (define-public gnome-music
"0lcdal4qdhclr8961p57xf010y92l6wwmkw86lyi9wy224z6gjr0"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-gnome-music
@ -1494,8 +1492,7 @@ (define-public gnome-initial-setup
"06q3p4f8g9zr7a4mw3qr556mi0dg9qzrj8n46ybdz93fxs26aaj1"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:configure-flags '(;; Enable camera support for user selfie.
`(#:configure-flags '(;; Enable camera support for user selfie.
"-Dcheese=auto"
"-Dsystemd=false")
#:phases (modify-phases %standard-phases
@ -1560,8 +1557,7 @@ (define-public gnome-user-share
"04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:configure-flags
`("-Dsystemduserunitdir=/tmp/empty"
;; Enable nautilus extension for file sharing.
@ -2036,8 +2032,7 @@ (define-public gnome-characters
"0z2xa4w921bzpzj6gv88pvbrijcnnwni6jxynwz0ybaravyzaqha"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:phases (modify-phases %standard-phases
(add-after 'install 'wrap
(lambda* (#:key outputs #:allow-other-keys)
@ -2273,8 +2268,7 @@ (define-public gnome-disk-utility
"1rr1ypb89p51b6428yqvczmpmylwjfnhnkgx78hzm3vxm3m15lff"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:configure-flags '("-Dlogind=libelogind")
`(#:configure-flags '("-Dlogind=libelogind")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
@ -2323,8 +2317,7 @@ (define-public gnome-font-viewer
"0hpyi0sz3gcqqs9lkwyk8b6hr39m3n27432x98kxr436jj37dk6j"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:phases
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-post-install-script
(lambda _
@ -2593,8 +2586,7 @@ (define-public evince
"0xrwls1bhvny8vvd7mfjy9p26zjch0pd6x6j9jn9g2ka6xwyrxqg"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:build-type "release"
#:configure-flags
'("-Dnautilus=false"
@ -3187,8 +3179,7 @@ (define-public glade3
"glade-test-widget-null-icon.patch"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59
#:phases
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
@ -5092,7 +5083,6 @@ (define-public gnome-mines
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:meson ,meson-0.59
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
@ -5174,7 +5164,6 @@ (define-public gnome-sudoku
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:meson ,meson-0.59
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
@ -5572,8 +5561,7 @@ (define-public gnome-settings-daemon
(patches (search-patches "gnome-settings-daemon-gc.patch"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:configure-flags
(list (string-append "-Dudev_dir="
(assoc-ref %outputs "out") "/lib/udev")
@ -5746,7 +5734,6 @@ (define-public devhelp
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:meson ,meson-0.59
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
@ -6277,8 +6264,7 @@ (define-public totem
grilo-plugins
vala))
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
;; Disable automatic GStreamer plugin installation via PackageKit and
;; all that.
@ -6430,8 +6416,7 @@ (define-public eog
"0ddjwcd77nw0rxb5x5bz5hd671m8gya9827p8rsnb58x103kpai8"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:configure-flags
`(#:configure-flags
;; Otherwise, the RUNPATH will lack the final 'eog' path component.
(list (string-append "-Dc_link_args=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib/eog"))
@ -6562,8 +6547,7 @@ (define-public gvfs
"1hlxl6368h6nyqp1888szxs9hnpcw98k3h23dgqi29xd38klzsmj"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:configure-flags
(list "-Dsystemduserunitdir=no"
"-Dtmpfilesdir=no"
@ -6682,8 +6666,7 @@ (define-public simple-scan
(build-system meson-build-system)
;; TODO: Fix icons in home screen, About dialogue, and scan menu.
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t))
`(#:glib-or-gtk? #t))
(native-inputs
(list gettext-minimal
itstool
@ -6795,7 +6778,6 @@ (define-public epiphany
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:meson ,meson-0.59
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
@ -7185,8 +7167,7 @@ (define-public gnome-session
(base32
"02z0xr6sv9ibl7awbw9j4y05hf4jk1zgvsbbmh7n27hhjvsvc8pl"))))
(arguments
`(#:meson ,meson-0.59
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-gnome-session
@ -7299,8 +7280,7 @@ (define-public gedit
"149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:configure-flags
;; Otherwise, the RUNPATH will lack the final path component.
(list (string-append "-Dc_link_args=-Wl,-rpath="
@ -8149,8 +8129,7 @@ (define-public network-manager-applet
"1gj6lqqi613j2m49v9i82lqg1rv7kwwc8z4nxjcwpaa0ins803f7"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:configure-flags
'("-Dappindicator=yes")))
(native-inputs
@ -8504,7 +8483,6 @@ (define-public gnome-bluetooth
(base32
"1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c"))))
(build-system meson-build-system)
(arguments `(#:meson ,meson-0.59))
(native-inputs
`(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc.
("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache
@ -8540,8 +8518,7 @@ (define-public gnome-control-center
"0rr4d5m2a72vrb31jgyx49dp0s2pwgyxsrk4hyw5ym66wq63c3v1"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:configure-flags
(list "-Dcheese=false"
(string-append "-Dgnome_session_libexecdir="
@ -8653,8 +8630,7 @@ (define-public gnome-shell
"0ragmcln210zvzhc2br33yprbkj9drjzd7inp5sdxra0a7l73yaj"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:disallowed-references ,(list (gexp-input glib "bin")
(gexp-input libxslt)
(gexp-input ruby-sass))
@ -9095,7 +9071,6 @@ (define-public nautilus
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:meson ,meson-0.59
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'make-extensible
@ -9296,8 +9271,6 @@ (define-public dconf-editor
("vala" ,vala)))
(inputs
(list dconf gtk+ libxml2))
(arguments
`(#:meson ,meson-0.59))
(home-page "https://gitlab.gnome.org/GNOME/dconf-editor")
(synopsis "Graphical editor for GNOME's dconf configuration system")
(description
@ -9394,8 +9367,7 @@ (define-public gnome-weather
libgweather
libhandy))
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:phases
,#~(modify-phases %standard-phases
(add-after 'unpack 'fix-service-file
@ -9755,7 +9727,6 @@ (define-public gnome-calendar
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:meson ,meson-0.59
;; gnome-calendar has to be installed before the tests can be run
;; https://bugzilla.gnome.org/show_bug.cgi?id=788224
#:tests? #f
@ -9895,7 +9866,6 @@ (define-public gnome-tweaks
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:meson ,meson-0.59
#:configure-flags '("-Dlocalstatedir=/tmp"
"-Dsysconfdir=/tmp")
#:imported-modules ((guix build python-build-system)
@ -10683,8 +10653,7 @@ (define-public cheese
"0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"))
(patches (search-patches "cheese-vala-update.patch"))))
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
;; Tests require GDK.
#:tests? #f
#:phases
@ -11100,11 +11069,6 @@ (define-public gthumb
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
;; See
;; <https://github.com/mesonbuild/meson/issues/9492#issuecomment-973117289>.
#:meson ,meson-0.59
#:configure-flags
;; Ensure the RUNPATH contains all installed library locations.
(list (string-append "-Dc_link_args=-Wl,-rpath="
@ -11340,8 +11304,7 @@ (define-public gitg
"0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-post-install-partially
@ -11601,8 +11564,7 @@ (define-public polari
"001h9gppn79gnj7dl61jl9gas5wmbjdx0v8xwsx7v4xsv2hwz91g"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
@ -11665,8 +11627,7 @@ (define-public gnome-boxes
(search-patches "gnome-boxes-add-guix-logo.patch"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
#:glib-or-gtk? #t
`(#:glib-or-gtk? #t
#:configure-flags (list "-Drdp=false"
(string-append "-Dc_link_args=-Wl,-rpath="
(assoc-ref %outputs "out")
@ -12580,8 +12541,7 @@ (define-public gtranslator
(propagated-inputs
(list gtksourceview)) ; required for source view
(arguments
`(#:meson ,meson-0.59
#:build-type "release"
`(#:build-type "release"
#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases

6
gnu/packages/gtk.scm
View file

@ -1809,12 +1809,6 @@ (define-public gtkmm-3
name "-" version ".tar.xz"))
(sha256
(base32 "1ri2msp3cmzi6r65ghwb8gfavfaxv0axpwi3q60nm7v8hvg36qw5"))))
(arguments
(substitute-keyword-arguments (package-arguments gtkmm)
;; Use meson 0.59 to workaround a new issue with meson 0.60 (see:
;; https://github.com/mesonbuild/meson/issues/9350#issuecomment-953799600).
((#:meson _ #f)
meson-0.59)))
(propagated-inputs
`(("atkmm-2.28" ,atkmm-2.28)
("cairomm-1.14" ,cairomm-1.14)

3
gnu/packages/pdf.scm
View file

@ -632,8 +632,7 @@ (define-public zathura
(files '("lib/zathura")))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59
#:phases (modify-phases %standard-phases
`(#:phases (modify-phases %standard-phases
(add-before 'check 'start-xserver
;; Tests require a running X server.
(lambda* (#:key inputs #:allow-other-keys)

1
gnu/packages/photo.scm
View file

@ -622,7 +622,6 @@ (define-public entangle
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:meson ,meson-0.59 ;fails to build with Meson 0.60
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache

3
gnu/packages/video.scm
View file

@ -4387,9 +4387,6 @@ (define-public pitivi
("pkg-config" ,pkg-config)))
(arguments
`(#:glib-or-gtk? #t
;; Pitivi is not yet compatible with Meson 0.60:
;; https://gitlab.gnome.org/GNOME/pitivi/-/issues/2593
#:meson ,meson-0.59
#:phases
(modify-phases %standard-phases
(add-after 'glib-or-gtk-wrap 'wrap-other-dependencies

2
gnu/packages/virtualization.scm
View file

@ -1347,8 +1347,6 @@ (define-public libvirt-glib
(base32
"1gdcvqz88qkp402zra9csc6391f2xki1270x683n6ixakl3gf8w4"))))
(build-system meson-build-system)
(arguments
`(#:meson ,meson-0.59)) ;KeyError: 'install_dir' with meson 0.60
(inputs
(list openssl cyrus-sasl lvm2 ; for libdevmapper
libyajl))