From 3b1bac3b97da98111e409e0544967c0514b3de53 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 23 Jun 2022 16:17:23 +0200 Subject: gnu: Add cambalache. * gnu/packages/gnome.scm (cambalache): New variable. --- gnu/packages/gnome.scm | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 55fbe583ef..f4a4744633 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3204,6 +3204,98 @@ the GNOME desktop environment.") (variable "GLADE_MODULE_SEARCH_PATH") (files '("lib/glade/modules"))))))) +(define-public cambalache + (package + (name "cambalache") + (version "0.10.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/jpu/cambalache") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mw5gk98zx03yal3p8slaqwhwkc9p2vnh0cssnmg6ivxsjscqhgz")))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:imported-modules `((guix build python-build-system) + ,@%meson-build-system-modules) + #:modules '((guix build meson-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cambalache/cmb_view.py" + (("GLib\\.find_program_in_path\\('(.*)'\\)" all cmd) + (string-append "'" + (search-input-file inputs + (string-append "/bin/" cmd)) + "'"))))) + (add-after 'unpack 'patch-build + (lambda _ + (substitute* "postinstall.py" + (("update-desktop-database") "true")))) + (add-after 'wrap 'python-wrap (assoc-ref python:%standard-phases 'wrap)) + (delete 'check) + (add-after 'install 'add-install-to-pythonpath + (assoc-ref python:%standard-phases 'add-install-to-pythonpath)) + (add-after 'add-install-to-pythonpath 'pre-check + (lambda _ + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1"))) + (add-after 'pre-check 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion ".." + (invoke "python3" "-m" "pytest"))))) + (add-after 'glib-or-gtk-wrap 'wrap-typelib + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (prog) + (unless (wrapped-program? prog) + (wrap-program prog + `("GI_TYPELIB_PATH" suffix + (,(string-append out "/lib/girepository-1.0") + ,(getenv "GI_TYPELIB_PATH"))) + ;; icons and schemas + `("XDG_DATA_DIRS" suffix + #$(map + (lambda (input) + (file-append (this-package-input input) "/share")) + '("adwaita-icon-theme" "hicolor-icon-theme" + "gsettings-desktop-schemas"))) + ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Cambalache to + ;; load its own icons in pure environments. + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE")))))) + (find-files (string-append out "/bin"))))))))) + (inputs (list bash-minimal + adwaita-icon-theme hicolor-icon-theme + gsettings-desktop-schemas + gtk + `(,gtk+ "bin") ; broadwayd + `(,gtk "bin") + libadwaita + libhandy + (librsvg-for-system) + python python-pygobject python-lxml + webkitgtk-with-libsoup2)) + (native-inputs (list `(,glib "bin") gobject-introspection + gettext-minimal pkg-config + python-pytest xorg-server-for-tests)) + (home-page "https://gitlab.gnome.org/jpu/cambalache") + (synopsis "Rapid application development tool") + (description "Cambalache is a rapid application development (RAD) tool for +Gtk 4 and 3 with a clear model-view-controller (MVC) design and +data model first philosophy.") + (license (list license:lgpl2.1 + license:gpl2)))) ; tools + (define-public libcroco (package (name "libcroco") -- cgit v1.2.3 From f3d33ba9f78d0367404a9bc434349f5d7b535d5b Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Thu, 4 Aug 2022 10:51:55 +0800 Subject: gnu: workrave: Update to 1.10.50. * gnu/packages/gnome.scm (workrave): Update to 1.10.50. --- 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 f4a4744633..0044bb33fb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10943,7 +10943,7 @@ configurable file renaming.") (define-public workrave (package (name "workrave") - (version "1.10.48") + (version "1.10.50") (source (origin (method git-fetch) @@ -10954,7 +10954,7 @@ configurable file renaming.") version))))) (file-name (git-file-name name version)) (sha256 - (base32 "0qcknxylk9mr0xzszsd1rkgh2zpnix20m998dfclkm9x8zh9pvyr")))) + (base32 "0fj3fqmdn4nsjgvbbvzpxw2mgiihcr1zpb08amg2p6hg9n11y9bx")))) (build-system glib-or-gtk-build-system) (arguments ;; The only tests are maintainer tests (in po/), which fail. -- cgit v1.2.3 From 8b6c4eddedc1b4e4a4a2519cf3ed213f3fa8cb0d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 6 Aug 2022 00:36:01 +0200 Subject: gnu: komikku: Update to 0.40.0. * gnu/packages/gnome.scm (komikku): Update to 0.40.0. --- 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 0044bb33fb..6a6b3edca9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12437,7 +12437,7 @@ profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "0.39.0") + (version "0.40.0") (source (origin (method git-fetch) @@ -12447,7 +12447,7 @@ profiler via Sysprof, debugging support, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "1g765kbgimfpvma67j1gscj046n2q9a9nr2pczlw65qwlm0418c5")))) + "12l6qks4kwi75ss61yx1f515nb30d987qw3yhi4a36w5xz721p5z")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From bb5afc5b9ebcea94bc083f14fbc83cab9f86adfe Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 6 Aug 2022 21:52:16 -0400 Subject: gnu: gnome-system-monitor: Update to 42.0. * gnu/packages/gnome.scm (gnome-system-monitor): Update to 42.0. --- 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 6a6b3edca9..3c4251286b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10388,7 +10388,7 @@ Bluefish supports many programming and markup languages.") (define-public gnome-system-monitor (package (name "gnome-system-monitor") - (version "41.0") + (version "42.0") (source (origin (method url-fetch) @@ -10397,7 +10397,7 @@ Bluefish supports many programming and markup languages.") name "-" version ".tar.xz")) (sha256 (base32 - "0pwy2c95rm0ym3x5pr6rqg7zh58crjxyns4r52q99ds937349z67")))) + "1p3mq32pfd9260aql5nys806g0c4nrswacwqs8ms40920ci9s8qk")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 1a43e0067b6754b2b1305376c66e8c59eccc89ea Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 10 Aug 2022 13:14:51 -0400 Subject: gnu: gnome-themes-standard: Deprecate in favor of gnome-themes-extra. * gnu/packages/gnome.scm (gnome-themes-standard): Mark as deprecated by gnome-themes-extra. (gnome)[inputs]: Remove gnome-themes-extra. --- gnu/packages/gnome.scm | 40 +++------------------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3c4251286b..291bd8c3ac 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4321,42 +4321,6 @@ engineering.") "Drawing is a basic image editor aiming at the GNOME desktop.") (license license:gpl3+))) -(define-public gnome-themes-standard - (package - (name "gnome-themes-standard") - (version "3.22.3") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" name "-" - version ".tar.xz")) - (sha256 - (base32 - "0smmiamrgcgf5sa88bsn8hwmvsyx4gczzs359nwxbkv14b2qgp31")))) - (build-system gnu-build-system) - (arguments - '(#:configure-flags - ;; Don't create 'icon-theme.cache'. - (let* ((coreutils (assoc-ref %build-inputs "coreutils")) - (true (string-append coreutils "/bin/true"))) - (list (string-append "GTK_UPDATE_ICON_CACHE=" true))))) - (inputs - `(("gtk+" ,gtk+) - ("gtk+-2" ,gtk+-2) - ("librsvg" ,librsvg) - ("libxml2" ,libxml2) - ("glib" ,glib))) - (native-inputs - `(("intltool" ,intltool) - ("glib:bin" ,glib "bin") - ("pkg-config" ,pkg-config))) - (home-page "https://launchpad.net/gnome-themes-standard") - (synopsis "Default GNOME 3 themes") - (description - "The default GNOME 3 themes (Adwaita and some accessibility themes).") - (license license:lgpl2.1+))) - (define-public seahorse (package (name "seahorse") @@ -9565,7 +9529,6 @@ world.") ("dconf" ,dconf) ("desktop-file-utils" ,desktop-file-utils) ("gnome-default-applications" ,gnome-default-applications) - ("gnome-themes-standard" ,gnome-themes-standard) ("gst-plugins-base" ,gst-plugins-base) ("gst-plugins-good" ,gst-plugins-good) ("gucharmap" ,gucharmap) @@ -11579,6 +11542,9 @@ versions of Adwaita, Adwaita-dark and HighContrast themes. It also provides index files needed for Adwaita to be used outside of GNOME.") (license license:lgpl2.1+))) +(define-public gnome-themes-standard + (deprecated-package "gnome-themes-standard" gnome-themes-extra)) + (define-public gnote (package (name "gnote") -- cgit v1.2.3 From 691d4657b7431847069198ce8f4276bc1de49e41 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Aug 2022 18:35:19 +0200 Subject: gnu: folks: Update to 0.15.5. * gnu/packages/gnome.scm (folks): Update to 0.15.5. [native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL. --- gnu/packages/gnome.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 291bd8c3ac..cbdf638abd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9999,7 +9999,7 @@ functionality and behavior.") (define-public folks (package (name "folks") - (version "0.15.3") + (version "0.15.5") (source (origin (method url-fetch) (uri (string-append @@ -10008,7 +10008,7 @@ functionality and behavior.") "folks-" version ".tar.xz")) (sha256 (base32 - "19a4qp9ry8y24jx1v5456qn9lnw843571vkkah3bxx4ky3x3gmr1")))) + "11lhfn6b7gml4ckj2dkm6g889j21wpvj90srwjp85k9hcf4qmzqg")))) (build-system meson-build-system) (arguments '(#:phases @@ -10027,10 +10027,10 @@ functionality and behavior.") readline telepathy-glib)) (native-inputs - (list `(,glib "bin") + (list gettext-minimal + `(,glib "bin") gobject-introspection python-dbusmock - intltool pkg-config python vala)) -- cgit v1.2.3 From f441a149b400d289224a78a7c13c8690080d0926 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Aug 2022 18:35:54 +0200 Subject: gnu: tracker: Update to 3.3.3. * gnu/packages/gnome.scm (tracker): Update to 3.3.3. [native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL. --- gnu/packages/gnome.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cbdf638abd..ae46e55c51 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8888,7 +8888,7 @@ easy, safe, and automatic.") (define-public tracker (package (name "tracker") - (version "3.3.1") + (version "3.3.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/tracker/" @@ -8896,7 +8896,7 @@ easy, safe, and automatic.") "tracker-" version ".tar.xz")) (sha256 (base32 - "1lkf353xvwc0hfyi03aq2qjikx3zmva7r56nxiavy7kqjyygbmjs")))) + "0r144kdqxdzs51qn495vablzf1zxkhkk6imrlrzj9wiqwc2gg520")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -8927,7 +8927,8 @@ easy, safe, and automatic.") (invoke "dbus-run-session" "--" "meson" "test" "--print-errorlogs"))))))) (native-inputs - (list `(,glib "bin") + (list gettext-minimal + `(,glib "bin") gobject-introspection docbook-xsl docbook-xml @@ -8937,7 +8938,6 @@ easy, safe, and automatic.") cmake-minimal python-pygobject gtk-doc/stable - intltool dbus pkg-config python -- cgit v1.2.3