From 41ec0573b81733e15b70312d81cf7fdf77dd63fe Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Dec 2021 12:40:28 -0500 Subject: gnu: Remove meson-0.59 workarounds. 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. --- gnu/packages/gnome.scm | 90 ++++++++++++++------------------------------------ 1 file changed, 25 insertions(+), 65 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 429b17c00e..74ad58dd32 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -886,8 +886,7 @@ tomorrow, the rest of the week and for special occasions.") "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 @@ cloud integration is offered through GNOME Online Accounts.") "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 @@ extraction, and lookup for applications on the desktop.") "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 @@ tour of all gnome components and allows the user to set them up.") "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 @@ to other formats.") "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 @@ and keep up to date translations of documentation.") "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 @@ and keep up to date translations of documentation.") "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 @@ forgotten when the session ends.") "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 @@ API add-ons to make GTK+ widgets OpenGL-capable.") "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 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") (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 @@ once.") (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 @@ services for numerous locations.") (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 @@ both a traditional UI or a modern UI with a GtkHeaderBar.") (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 @@ discovery protocols.") 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 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") "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 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") "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 @@ USB transfers with your high-level application or system daemon.") (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 @@ a secret password store, an adblocker, and a modern UI.") (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 @@ such as gzip tarballs.") (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 @@ javascript engine and the GObject introspection framework.") "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 @@ Cisco's AnyConnect SSL VPN.") "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 @@ usage and information about running processes.") (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 @@ devices using the GNOME desktop.") "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 @@ properties, screen resolution, and other GNOME parameters.") "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 @@ shared object databases, search tools and indexing.") (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 @@ beautifying border effects.") ("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 @@ associations for GNOME.") 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 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.") (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 @@ existing databases over the internet.") (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 @@ photo-booth-like software, such as 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 @@ functionality.") (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t - - ;; See - ;; . - #: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 @@ higher level porcelain stuff.") "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 @@ environment.") "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 @@ integrate seamlessly with the GNOME desktop.") (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 @@ your data.") (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 -- cgit v1.2.3 From ee16c5a6856a88ebc3921ba258d93da0e3d250c5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Dec 2021 15:19:18 -0500 Subject: gnu: gnome-backgrounds: Update to 41.0. * gnu/packages/gnome.scm (gnome-backgrounds): Update to 41.0. [native-inputs]: Use new style. --- gnu/packages/gnome.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 74ad58dd32..1ac80bb98f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9183,7 +9183,7 @@ is complete it provides a graphical representation of each selected folder.") (define-public gnome-backgrounds (package (name "gnome-backgrounds") - (version "40.1") + (version "41.0") (source (origin (method url-fetch) @@ -9192,10 +9192,9 @@ is complete it provides a graphical representation of each selected folder.") name "-" version ".tar.xz")) (sha256 (base32 - "03m7ldfk00cly9igrq0qizq1y0f45vijmm23f1dl5kh1lc6qmpv0")))) + "0i9id5z72dqddh94648zylyf41amqq5lhny8sbyg1v8v4q6sr88x")))) (build-system meson-build-system) - (native-inputs - `(("gettext" ,gettext-minimal))) + (native-inputs (list gettext-minimal)) (home-page "https://gitlab.gnome.org/GNOME/gnome-backgrounds") (synopsis "Background images for the GNOME desktop") (description -- cgit v1.2.3 From 2080f55590f0a3d8f766754e19999a91a9f71f58 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Dec 2021 21:14:19 -0500 Subject: gnu: gsettings-desktop-schemas: Add python to native inputs. Since commit 5d20d7e1369fc7d93de19c0bd219937d697ceae6, meson no longer propagates Python, which is the reason this change is now needed here. * gnu/packages/gnome.scm (gsettings-desktop-schemas) [phases]{patch-schemas}: Use 'search-input-directory'. [native-inputs]: Use new style and add python. --- gnu/packages/gnome.scm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1ac80bb98f..2779b65666 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2661,25 +2661,24 @@ on the GNOME Desktop with a single simple application.") "1v9jagk679m01nji0acirynxinziv036618c7xc49l4nwmr9ja3p")))) (build-system meson-build-system) (arguments - '(#:phases (modify-phases %standard-phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-schemas (lambda* (#:key inputs #:allow-other-keys) - (let ((theme (assoc-ref inputs "gnome-backgrounds"))) - (substitute* (find-files "schemas" - "\\.gschema\\.xml\\.in$") - ;; Provide the correct file name of the default - ;; GNOME background, 'adwaita-timed.xml'. - (("@datadir@/backgrounds/gnome") - (string-append theme "/share/backgrounds/gnome")) - ;; Do not reference fonts, that may not exist. - (("'Source Code Pro 10'") "'Monospace 11'")))))))) - (inputs - (list glib gnome-backgrounds)) - (native-inputs - `(("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-compile-schemas, etc. - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config))) + (substitute* (find-files "schemas" + "\\.gschema\\.xml\\.in$") + ;; Provide the correct file name of the default + ;; GNOME background, 'adwaita-timed.xml'. + (("@datadir@/backgrounds/gnome") + (search-input-directory inputs + "/share/backgrounds/gnome")) + ;; Do not reference fonts, that may not exist. + (("'Source Code Pro 10'") "'Monospace 11'"))))))) + (inputs (list glib gnome-backgrounds)) + (native-inputs (list gettext-minimal + `(,glib "bin") ;glib-compile-schemas, etc. + gobject-introspection + pkg-config + python)) ;for build-aux/meson/post-install.py (home-page "https://launchpad.net/gsettings-desktop-schemas") (synopsis "GNOME settings for various desktop components") (description "Gsettings-desktop-schemas contains a collection of GSettings -- cgit v1.2.3 From 291c4fa0baf24b9d600872fce99441f5471cdb40 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Dec 2021 22:37:08 -0500 Subject: gnu: epiphany: Update to 41.2. * gnu/packages/gnome.scm (epiphany): Update to 41.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2779b65666..3e143f36e6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6764,7 +6764,7 @@ a secret password store, an adblocker, and a modern UI.") (define-public epiphany (package (name "epiphany") - (version "40.3") + (version "41.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/epiphany/" @@ -6772,7 +6772,7 @@ a secret password store, an adblocker, and a modern UI.") "epiphany-" version ".tar.xz")) (sha256 (base32 - "0r7m34xzz3shdfxf2abxb069izak3yv3ijlg29qy4pfmyawkilfs")))) + "0k7b22zq3z1kllzqxgwsvwb1lp0j6rjb3k1hvhna3i573wc4mpji")))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From 8b1a6ee69d5290e619b3d9115d130c18347efc44 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Dec 2021 23:32:00 -0500 Subject: gnu: gusb: Add python to native inputs. Since commit 5d20d7e1369fc7d93de19c0bd219937d697ceae6, meson no longer propagates Python. * gnu/packages/gnome.scm (gusb)[native-inputs]: Add python. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3e143f36e6..f4983361b4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6625,7 +6625,7 @@ DAV, and others.") "-Dvapi=false") '())))) (native-inputs - (list gobject-introspection pkg-config vala)) + (list gobject-introspection pkg-config python vala)) (propagated-inputs ;; Both of these are required by gusb.pc. (list glib libusb)) -- cgit v1.2.3 From 00ed8c6fe9d1e2242d79db9eb548517336d80e9c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 19 Dec 2021 01:01:42 -0500 Subject: gnu: dconf: Add python to native inputs. Since commit 5d20d7e1369fc7d93de19c0bd219937d697ceae6, meson no longer propagates Python. * gnu/packages/gnome.scm (dconf)[native-inputs]: Add python. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f4983361b4..dba5646f09 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4604,6 +4604,7 @@ and RDP protocols.") ("glib:bin" ,glib "bin") ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) + ("python" ,python) ("vala" ,vala))) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From b925b3c6dca3cf012b9e08f69c624273e53929cb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 19 Dec 2021 01:04:09 -0500 Subject: gnu: tracker: Add python to native inputs. Since commit 5d20d7e1369fc7d93de19c0bd219937d697ceae6, meson no longer propagates Python. * gnu/packages/gnome.scm (tracker)[native-inputs]: Add python. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dba5646f09..029f4f4536 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8907,6 +8907,7 @@ easy, safe, and automatic.") ("intltool" ,intltool) ("dbus" ,dbus) ("pkg-config" ,pkg-config) + ("python" ,python) ("vala" ,vala))) (inputs `(("dbus" ,dbus) -- cgit v1.2.3 From 0bf465c64d60d7179329b3a60cf7a1244646a0eb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 20 Dec 2021 09:46:45 -0500 Subject: gnu: gjs: Build with meson-0.59 to avoid 'install_dir' error. * gnu/packages/gnome.scm (gjs)[meson]: Use meson-0.59. --- gnu/packages/gnome.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 029f4f4536..8d045fa5bc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7234,7 +7234,10 @@ configuration program to choose applications starting on login.") (("☭") "")))))) (build-system meson-build-system) (arguments - '(#:configure-flags '("-Dinstalled_tests=false") + ;; Use meson-0.59, otherwise we'd get "ERROR: "install_dir" must be + ;; specified when installing a target". + `(#:meson ,meson-0.59 + #:configure-flags '("-Dinstalled_tests=false") #:phases (modify-phases %standard-phases (add-before 'check 'pre-check -- cgit v1.2.3 From 0557f781506431581217321e245834955bb05438 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 20 Dec 2021 10:12:09 -0500 Subject: gnu: glade3: Add python to native inputs. Since commit 5d20d7e1369fc7d93de19c0bd219937d697ceae6, meson no longer propagates Python. * gnu/packages/gnome.scm (glade3)[native-inputs]: Add python. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8d045fa5bc..f69f401f95 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3222,6 +3222,7 @@ current/manpages/docbook.xsl") ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("glib:bin" ,glib "bin") + ("python" ,python) ("python-pygobject" ,python-pygobject) ("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 235a0831038d21688dcb8d5080d827a82cd0a5a1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 26 Dec 2021 19:39:59 -0500 Subject: gnu: baobab: Add python to native inputs. * gnu/packages/gnome.scm (baobab)[native-inputs]: Add python. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f69f401f95..47cf6bb955 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9168,6 +9168,7 @@ files.") (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config) + ("python" ,python) ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database ("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("itstool" ,itstool) -- cgit v1.2.3 From ac1f60f4fe20182a4750eaf5e188813a1a25c65e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 26 Dec 2021 19:42:50 -0500 Subject: gnu: libgweather: Add python to native inputs. * gnu/packages/gnome.scm (libgweather)[native-inputs]: Add python. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 47cf6bb955..31fa9287fa 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5526,6 +5526,7 @@ service via the system message bus.") `(("glib:bin" ,glib "bin") ; for glib-mkenums ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) + ("python" ,python) ("vala" ,vala) ("intltool" ,intltool) ("python-pygobject" ,python-pygobject))) -- cgit v1.2.3 From 48baca342d6cd1539b99a7b0f9d36f99c0e388ba Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 26 Dec 2021 19:47:24 -0500 Subject: gnu: mutter: Add python to native inputs. * gnu/packages/gnome.scm (mutter)[native-inputs]: Add python. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 31fa9287fa..9e0b3a4d11 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7526,6 +7526,7 @@ to display dialog boxes from the commandline and shell scripts.") ("adwaita-icon-theme" ,adwaita-icon-theme) ("libxcursor" ,libxcursor) ;for XCURSOR_PATH ("pipewire" ,pipewire-0.3) + ("python" ,python) ("python-dbus" ,python-dbus) ("python-dbusmock" ,python-dbusmock) ("tini" ,tini))) ;acting as init (zombie reaper) -- cgit v1.2.3 From ff9c684ddfc4bd652b5b3bd722cb9f4329efb43d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Dec 2021 23:55:05 -0500 Subject: gnu: file-roller: Add python to native inputs. * gnu/packages/gnome.scm (file-roller)[native-inputs]: Add python. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9e0b3a4d11..bdd6d1b5b0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7137,6 +7137,7 @@ share them with others via social networking and more.") intltool itstool pkg-config + python `(,gtk+ "bin") ; gtk-update-icon-cache `(,glib "bin"))) ;; TODO: Add libnautilus. -- cgit v1.2.3 From 32d38a7142f36c67fd40469add29fad851364496 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Dec 2021 23:59:13 -0500 Subject: gnu: gnome-screenshot: Add python to native inputs. * gnu/packages/gnome.scm (gnome-screenshot)[native-inputs]: Add python. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bdd6d1b5b0..1ce3850079 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9239,14 +9239,14 @@ can add your own files to the collection.") ;; Don't create 'icon-theme.cache'. (lambda _ (substitute* "build-aux/postinstall.py" - (("gtk-update-icon-cache") "true")) - #t))))) + (("gtk-update-icon-cache") "true"))))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database ("intltool" ,intltool) ("appstream-glib" ,appstream-glib) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python" ,python))) (inputs (list gtk+ libcanberra libhandy libx11 libxext)) (home-page "https://gitlab.gnome.org/GNOME/gnome-screenshot") -- cgit v1.2.3 From f353ed53a97eb932088c0cc534290bee58361c5e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 28 Dec 2021 00:05:47 -0500 Subject: gnu: gnome-calculator: Add python to native inputs. * gnu/packages/gnome.scm (gnome-calculator)[native-inputs]: Add python. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1ce3850079..48c74840b2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10130,7 +10130,8 @@ handling the startup notification side.") ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("itstool" ,itstool) ("vala" ,vala) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python" ,python))) (inputs `(("glib" ,glib) ("gtksourceview" ,gtksourceview) -- cgit v1.2.3 From c292cf21f763467edfbc17e633d787361ba452fd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 28 Dec 2021 00:06:58 -0500 Subject: gnu: simple-scan: Add python to native inputs. * gnu/packages/gnome.scm (simple-scan)[native-inputs]: Add python. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 48c74840b2..f08cff21c8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6674,6 +6674,7 @@ USB transfers with your high-level application or system daemon.") itstool `(,glib "bin") ; glib-compile-schemas, etc. pkg-config + python vala libxml2)) (inputs -- cgit v1.2.3 From b8a771d5a50f6f33abd88b1dc8114f95f535131a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 10 Jan 2022 23:08:06 -0500 Subject: gnu: network-manager: Patch dlopen call to libjansson.so. * gnu/packages/gnome.scm (network-manager)[phases] {patch-dlopen-call-to-libjansson}: New phase. {pre-configure}: Reinstate an assertion in test-setting.c. --- gnu/packages/gnome.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f08cff21c8..6c63b8bc59 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7841,6 +7841,13 @@ users.") (string-append "-Ddhclient=" dhclient))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-dlopen-call-to-libjansson.so + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/libnm-glib-aux/nm-json-aux.c" + (("(handle = dlopen\\()soname" _ head) + (string-append + head "\"" (search-input-file inputs + "lib/libjansson.so") "\""))))) (add-before 'configure 'pre-configure (lambda _ ;; These tests try to test aspects of network-manager's @@ -7859,12 +7866,7 @@ users.") ((".*test-link-linux.*") "") ((".*test-lldp.*") "") ((".*test-route-linux.*") "") - ((".*test-tc-linux.*") "")) - ;; FIXME: The jansson check fails (see: - ;; https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/837 - (substitute* "src/libnm-core-impl/tests/test-setting.c" - (("g_assert\\(nm_json_vt\\(\\)\\);") - "return TRUE;")))) + ((".*test-tc-linux.*") "")))) (add-after 'unpack 'patch-docbook-xml (lambda* (#:key inputs #:allow-other-keys) (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") -- cgit v1.2.3