[bug#41293] Add Pantheon desktop environment

[bug#41293] Add Pantheon desktop environment

[Ryan Prior via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 282 bytes --]

This first patch adds the Granite library in gnu/packages/pantheon.scm.
It begins a patch series (to follow, 6 patches in total) that contains
some core pieces of the Pantheon desktop environment and a few
applications, laying the groundwork for further Pantheon packaging.



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-granite.patch --]
[-- Type: text/x-diff; name="0001-gnu-Add-granite.patch", Size: 3585 bytes --]

From fdfe0c404b41b543eff94bcf96056ffb2f26c6f5 Mon Sep 17 00:00:00 2001
From: Ryan Prior <rprior@protonmail.com>
Date: Fri, 15 May 2020 14:24:23 -0500
Subject: [PATCH 1/6] gnu: Add granite.

* gnu/packages: (pantheon.scm): New File.
* gnu/local.mk: Add gnu/packages/pantheon.scm.
* gnu/packages/pantheon.scm (granite): New Variable.
---
 gnu/local.mk              |  1 +
 gnu/packages/pantheon.scm | 61 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 gnu/packages/pantheon.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index ab2bac9bc5..5758df27be 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -403,6 +403,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/orpheus.scm			\
   %D%/packages/ots.scm				\
   %D%/packages/package-management.scm		\
+  %D%/packages/pantheon.scm			\
   %D%/packages/parallel.scm			\
   %D%/packages/password-utils.scm		\
   %D%/packages/patchutils.scm			\
diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
new file mode 100644
index 0000000000..834ea74f37
--- /dev/null
+++ b/gnu/packages/pantheon.scm
@@ -0,0 +1,61 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages pantheon)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages)
+  #:use-module (guix build-system meson)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) :prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix utils))
+
+(define-public granite
+  (package
+    (name "granite")
+    (version "5.4.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/elementary/granite.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0acicv3f9gksb352v88lwap8ailjsxdrfknl2xql7blasbjzl2q0"))))
+    (build-system meson-build-system)
+    (inputs
+     `(("gtk" ,gtk+)
+       ("gtk+-bin" ,gtk+ "bin"))) ; for gtk-update-icon-cache
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("glib" ,glib)
+       ("gobject-introspection" ,gobject-introspection)
+       ("libgee" ,libgee)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
+    (home-page "https://github.com/elementary/granite")
+    (synopsis "Library that extends GTK with common widgets and utilities")
+    (description "Granite is a companion library for GTK+ and GLib.  Among other
+things, it provides complex widgets and convenience functions designed for use
+in apps built for the Pantheon desktop.")
+    (license license:lgpl3+)))
-- 
2.17.1

[bug#41293] Add Pantheon desktop environment (cont.)

[Ryan Prior via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 85 bytes --]

This patch adds the Sideload application, a graphical handler for
flatpakrefs.



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Add-sideload.patch --]
[-- Type: text/x-diff; name="0002-gnu-Add-sideload.patch", Size: 3307 bytes --]

From 855797d1a637f342c43ac663e07c8bdcd642607b Mon Sep 17 00:00:00 2001
From: Ryan Prior <rprior@protonmail.com>
Date: Fri, 15 May 2020 14:56:34 -0500
Subject: [PATCH 2/6] gnu: Add sideload.

* gnu/packages/pantheon.scm (sideload): New variable.
---
 gnu/packages/pantheon.scm | 57 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 834ea74f37..a5ee6fafce 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -17,11 +17,15 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages pantheon)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages package-management)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xml)
   #:use-module (gnu packages)
   #:use-module (guix build-system meson)
   #:use-module (guix git-download)
@@ -59,3 +63,56 @@
 things, it provides complex widgets and convenience functions designed for use
 in apps built for the Pantheon desktop.")
     (license license:lgpl3+)))
+
+(define-public sideload
+  (package
+    (name "sideload")
+    (version "1.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/elementary/sideload.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1nnaq4vc0aag6pckxhrma5qv8al7i00rrlg95ac4iqqmivja7i92"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:configure-flags (list (string-append "-Dflatpak="
+                                              (assoc-ref %build-inputs "flatpak")
+                                              "/include"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'install-symlinks
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin/io.elementary.sideload"))
+                    (link (string-append out "/bin/sideload")))
+               (symlink bin link)))))))
+    (inputs
+     `(("flatpak" ,flatpak)
+       ("granite" ,granite)
+       ("gtk" ,gtk+)
+       ("libostree" ,libostree)))
+    (propagated-inputs
+     `(("glib-networking" ,glib-networking)))
+    (native-inputs
+     `(("cmake" ,cmake)
+       ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
+       ("gettext" ,gettext-minimal)
+       ("glib" ,glib)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("libgee" ,libgee)
+       ("libxml2" ,libxml2)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
+    (home-page "https://github.com/elementary/sideload")
+    (synopsis "Graphical application to side-load Flatpaks")
+    (description "Sideload handles flatpakref files, like those you might find
+on Flathub or another third-party website providing a Flatpak app for
+download.")
+    (license license:gpl3)))
-- 
2.17.1

[bug#41293] Add Pantheon desktop environment (cont.)

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 633 bytes --]

Hi,

please do not invoke programs like 

  glib-compile-schemas
  update-desktop-database
  update-icon-cache

in individual packages.

The reason is that we are trying to keep packages modular.

If you add an icon cache with some fixed name that will cache just the icons
of that package in two packages, installing those into the same profile will
create a profile merge conflict.

We have profile hooks that will do glib-compile-schemas,
update-desktop-database and update-icon-cache anyway (in guix/profiles.scm),
so all that is required to do is to disable the invocation of these
programs in your package.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#41293] Add Pantheon desktop environment (cont.)

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 82 bytes --]

>   glib-compile-schemas

Ok, maybe that one isn't so bad.  Ok for that one.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#41293] Add Pantheon desktop environment (cont.)

[Ryan Prior via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 63 bytes --]

This patch adds Pantheon Calculator for basic arithmetic.



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0003-gnu-Add-pantheon-calculator.patch --]
[-- Type: text/x-diff; name="0003-gnu-Add-pantheon-calculator.patch", Size: 1841 bytes --]

From 9304e1e98a7da3dc876a304923e590a08803faba Mon Sep 17 00:00:00 2001
From: Ryan Prior <rprior@protonmail.com>
Date: Fri, 15 May 2020 14:57:34 -0500
Subject: [PATCH 3/6] gnu: Add pantheon-calculator.

* gnu/packages/pantheon.scm (pantheon-calculator): New variable.
---
 gnu/packages/pantheon.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index a5ee6fafce..2a15f4316a 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -116,3 +116,36 @@ in apps built for the Pantheon desktop.")
 on Flathub or another third-party website providing a Flatpak app for
 download.")
     (license license:gpl3)))
+
+(define-public pantheon-calculator
+  (package
+    (name "pantheon-calculator")
+    (version "1.5.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/elementary/calculator.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1csxsr2c8qvl97xz9ahwn91z095nzgr0i1mbcb1spljll2sr9lkj"))))
+    (build-system meson-build-system)
+    (arguments '(#:glib-or-gtk? #t))
+    (inputs
+     `(("granite" ,granite)
+       ("gtk" ,gtk+)))
+    (native-inputs
+     `(("glib" ,glib)
+       ("cmake" ,cmake)
+       ("libgee" ,libgee)
+       ("glib:bin" ,glib "bin") ; for glib-compile-schemas
+       ("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
+    (home-page "https://github.com/elementary/calculator")
+    (synopsis "Desktop calculator")
+    (description "Calculator is an application for performing simple arithmatic.
+It is the default calculator application in the Pantheon desktop.")
+    (license license:gpl3)))
-- 
2.17.1

[bug#41293] Add pantheon-calculator

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 93 bytes --]

Hi,

pushed that patch to guix master as commit 969811ad0e51adcbf503e38d9c9265814e3c2e27.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#41293] Add Pantheon desktop environment (cont.)

[Ryan Prior via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 60 bytes --]

This patch adds Appstream to gnu/packages/freedesktop.



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0004-gnu-Add-appstream.patch --]
[-- Type: text/x-diff; name="0004-gnu-Add-appstream.patch", Size: 3632 bytes --]

From 150a9bb0780ac07717245250a4f85c66bf4c8c51 Mon Sep 17 00:00:00 2001
From: Ryan Prior <rprior@protonmail.com>
Date: Fri, 15 May 2020 15:03:51 -0500
Subject: [PATCH 4/6] gnu: Add appstream.

* gnu/packages/freedesktop.scm (appstream): New variable.
---
 gnu/packages/freedesktop.scm | 58 ++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index f00cb1e076..312cc16e0a 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2020 Rene Saavedra <pacoon@protonmail.com>
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -55,8 +56,10 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cryptsetup)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages disk)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
@@ -1874,3 +1877,58 @@ useful with system integration.")
 into the Unity menu bar.  Based on KSNI, it also works in KDE and will
 fallback to generic Systray support if none of those are available.")
     (license license:lgpl2.1+)))
+
+(define-public appstream
+  (package
+    (name "appstream")
+    (version "0.12.10")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/ximion/appstream.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1r4q7xi1xvpjcnyzkzb4pshhvd4agz7cc5nbb3kqb22054zab2qj"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:configure-flags
+       (list "-Dvapi=true"
+             "-Dstemming=false"
+             "-Dapidocs=false"
+             "-Dinstall-docs=false")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-stemmer-inc-dirs
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (substitute* "meson.build"
+                 (("include_directories\\(\\['\\/usr\\/include'\\]\\)")
+                  "''")
+                 (("subdir\\('docs\\/'\\)")
+                  ""))
+               (substitute* "data/meson.build"
+                 (("\\/etc")
+                   (string-append out "/etc")))
+               #t))))))
+    (native-inputs
+     `(("libxml2" ,libxml2)
+       ("gettext" ,gettext-minimal)
+       ("libxslt" ,libxslt)
+       ("glib2" ,glib)
+       ("glib:bin" ,glib "bin") ; for glib-compile-resources
+       ("pkg-config" ,pkg-config)
+       ("libsoup" ,libsoup)
+       ("gobject-introspection" ,gobject-introspection)
+       ("libyaml" ,libyaml)
+       ("vala" ,vala)
+       ("gperf" ,gperf)
+       ("cmake" ,cmake)
+       ("lmdb" ,lmdb)))
+    (home-page "https://www.freedesktop.org/wiki/Distributions/AppStream/")
+    (synopsis "Provides the foundation to build software-center applications")
+    (description "AppStream is a cross-distribution effort for enhancing the way
+we interact with the software repositories provided by GNU/Linux distributions
+by standardizing software component metadata.")
+    (license license:gpl2)))
-- 
2.17.1

[bug#41293] Add Pantheon desktop environment (cont.)

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 61 bytes --]

Why are there only native-inputs ? That doesn't look right.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#41293] Add Pantheon desktop environment (cont.)

[Ryan Prior via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 94 bytes --]

This patch updates GNOME vte to 0.60.2, required for pantheon-terminal
(in next patch.)



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0005-gnu-vte-Update-to-0.60.2.patch --]
[-- Type: text/x-diff; name="0005-gnu-vte-Update-to-0.60.2.patch", Size: 1686 bytes --]

From e1d89c623ffa78125952585470a873ddcc4fe3d5 Mon Sep 17 00:00:00 2001
From: Ryan Prior <rprior@protonmail.com>
Date: Fri, 15 May 2020 15:07:47 -0500
Subject: [PATCH 5/6] gnu: vte: Update to 0.60.2

* gnu/packages/gnome.scm (vte): Update to 0.60.2.
  [arguments]: enables Vala bindings and disables systemd support.
---
 gnu/packages/gnome.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e4bb056e4c..13c7ff2933 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -50,6 +50,7 @@
 ;;; Copyright © 2020 raingloom <raingloom@riseup.net>
 ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3228,7 +3229,7 @@ libraries written in C.")
 (define-public vte
   (package
     (name "vte")
-    (version "0.58.3")
+    (version "0.60.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/vte/"
@@ -3236,8 +3237,12 @@ libraries written in C.")
                                   "vte-" version ".tar.xz"))
               (sha256
                (base32
-                "0xa9ipwic4jnhhbzlnqbhssz10xkzv61cpkl1ammc6mdq95bbp12"))))
+                "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m"))))
     (build-system meson-build-system)
+    (arguments
+     `(#:configure-flags
+       (list "-Dvapi=true"
+             "-D_systemd=false")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
-- 
2.17.1

[bug#41398] vte

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 148 bytes --]

Thanks for that patch!

Pushed to guix master as commits 663def11dfa560066a910ebf290df82bcd72bfbc
and 11491e1b1bdac1255f1f529f13b8eecabdb7cc66.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#41293] Add Pantheon desktop environment (cont.)

[Ryan Prior via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 104 bytes --]

This patch adds pantheon-terminal, a terminal emulator with tabs and
some nice friendly features.



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0006-gnu-Add-pantheon-terminal.patch --]
[-- Type: text/x-diff; name="0006-gnu-Add-pantheon-terminal.patch", Size: 2598 bytes --]

From 5628c0849670beaec087c60b71f31eaba83343d8 Mon Sep 17 00:00:00 2001
From: Ryan Prior <rprior@protonmail.com>
Date: Fri, 15 May 2020 15:12:16 -0500
Subject: [PATCH 6/6] gnu: Add pantheon-terminal.

* gnu/packages/pantheon.scm (pantheon-terminal): New variable.
---
 gnu/packages/pantheon.scm | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 2a15f4316a..0ef2431bf8 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -149,3 +149,48 @@ download.")
     (description "Calculator is an application for performing simple arithmatic.
 It is the default calculator application in the Pantheon desktop.")
     (license license:gpl3)))
+
+(define-public pantheon-terminal
+  (package
+    (name "pantheon-terminal")
+    (version "5.5.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/elementary/terminal.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "119iwmzbpkj4nmxinqfsh73lx23g8gbl6ha6wc4mc4fq9hpnc9c2"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'install-symlinks
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin/io.elementary.terminal"))
+                    (link (string-append out "/bin/pantheon-terminal")))
+               (symlink bin link)))))))
+    (inputs
+     `(("granite" ,granite)
+       ("gtk" ,gtk+)
+       ("vte" ,vte)))
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("glib" ,glib)
+       ("appstream" ,appstream)
+       ("libgee" ,libgee)
+       ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
+       ("glib:bin" ,glib "bin") ; for glib-compile-resources
+       ("pkg-config" ,pkg-config)
+       ("gobject-introspection" ,gobject-introspection)
+       ("vala" ,vala)))
+    (home-page "https://github.com/elementary/terminal")
+    (synopsis "Graphical terminal with opinionated design and thoughtful touches")
+    (description "A lightweight, beautiful, and simple terminal application.
+Comes with sane defaults, browser-like tabs, sudo paste protection, smart
+copy/paste, and little to no configuration.")
+    (license license:lgpl3)))
-- 
2.17.1

[bug#41293] Add Pantheon desktop environment

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

Hi,

thanks for the patch!

Added this one patch to guix master as commit 9f59a9b4bc93b3ef6cd3bd1c9eed04c30ba2d2d4
after removing gtk-update-icon-cache reference.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#41293] [PATCH 0/1] New Appstream patch

[Ryan Prior via Guix-patches via]

Sorry about the all-native-inputs appstream package, I stopped paying
attention to it at some point. Here's a new appstream patch that bumps the
version and uses actual inputs.

Ryan

Ryan Prior (1):
  gnu: Add appstream.

 gnu/packages/freedesktop.scm | 59 ++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

-- 
2.26.2

[bug#41293] [PATCH 1/1] gnu: Add appstream.

[Ryan Prior via Guix-patches via]

* gnu/packages/freedesktop.scm (appstream): New variable.
---
 gnu/packages/freedesktop.scm | 59 ++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index f00cb1e076..2373cc733c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2020 Rene Saavedra <pacoon@protonmail.com>
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -55,8 +56,10 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cryptsetup)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages disk)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
@@ -1874,3 +1877,59 @@ useful with system integration.")
 into the Unity menu bar.  Based on KSNI, it also works in KDE and will
 fallback to generic Systray support if none of those are available.")
     (license license:lgpl2.1+)))
+
+(define-public appstream
+  (package
+    (name "appstream")
+    (version "0.12.11")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/ximion/appstream.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0ma1nldpc01rr2x14q1ymv2fvf7qcs3wp8fdqsnd17qx0hrz483c"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:configure-flags
+       (list "-Dvapi=true"
+             "-Dstemming=false"
+             "-Dapidocs=false"
+             "-Dinstall-docs=false")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-stemmer-inc-dirs
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (substitute* "meson.build"
+                 (("include_directories\\(\\['\\/usr\\/include'\\]\\)")
+                  "''")
+                 (("subdir\\('docs\\/'\\)")
+                  ""))
+               (substitute* "data/meson.build"
+                 (("\\/etc")
+                   (string-append out "/etc")))
+               #t))))))
+    (inputs
+     `(("glib" ,glib)
+       ("gperf" ,gperf)
+       ("libsoup" ,libsoup)
+       ("libxml2" ,libxml2)
+       ("libxslt" ,libxslt)
+       ("libyaml" ,libyaml)
+       ("lmdb" ,lmdb)))
+    (native-inputs
+     `(("cmake" ,cmake)
+       ("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin") ; for glib-compile-resources
+       ("gobject-introspection" ,gobject-introspection)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
+    (home-page "https://www.freedesktop.org/wiki/Distributions/AppStream/")
+    (synopsis "Provides the foundation to build software-center applications")
+    (description "AppStream is a cross-distribution effort for enhancing the way
+we interact with the software repositories provided by GNU/Linux distributions
+by standardizing software component metadata.")
+    (license license:gpl2)))
-- 
2.26.2

[bug#41293] [PATCH 0/3] Updated Pantheon packages

[Ryan Prior via Guix-patches via]

Here are updated patches for Sideload, Appstream, and Pantheon Terminal.

The sideload package is updated to the latest release. (1.1.1)

Sideload & pantheon-terminal packages are modified to disable compiling
schemas and updating desktop database as part of the install process.

These should all apply cleanly on master now. Let me know if there's still
further concerns!

Ryan Prior (3):
  gnu: Add sideload.
  gnu: Add appstream.
  gnu: Add pantheon-terminal.

 gnu/packages/freedesktop.scm |  59 +++++++++++++++++++
 gnu/packages/pantheon.scm    | 110 +++++++++++++++++++++++++++++++++++
 2 files changed, 169 insertions(+)

-- 
2.26.2

[bug#41293] [PATCH 1/3] gnu: Add sideload.

[Ryan Prior via Guix-patches via]

* gnu/packages/pantheon.scm (sideload): New variable.
---
 gnu/packages/pantheon.scm | 60 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 72910e5470..6709cd2d8a 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -18,11 +18,14 @@
 
 (define-module (gnu packages pantheon)
   #:use-module (gnu packages cmake)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages package-management)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xml)
   #:use-module (gnu packages)
   #:use-module (guix build-system meson)
   #:use-module (guix git-download)
@@ -107,3 +110,60 @@ in apps built for the Pantheon desktop.")
 arithmetic.  It is the default calculator application in the Pantheon
 desktop.")
     (license license:gpl3)))
+
+(define-public sideload
+  (package
+    (name "sideload")
+    (version "1.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/elementary/sideload.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0mlc3nm2navzxm8k1rwpbw4w6mv30lmhqybm8jqxd4v8x7my73vq"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:configure-flags (list (string-append "-Dflatpak="
+                                              (assoc-ref %build-inputs "flatpak")
+                                              "/include"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'install 'set-environment-variables
+           (lambda _
+             ;; Disable compiling schemas and updating desktop databases
+             (setenv "DESTDIR" "/")
+             #t))
+         (add-after 'install 'install-symlinks
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin/io.elementary.sideload"))
+                    (link (string-append out "/bin/sideload")))
+               (symlink bin link)))))))
+    (inputs
+     `(("flatpak" ,flatpak)
+       ("granite" ,granite)
+       ("gtk" ,gtk+)
+       ("libostree" ,libostree)))
+    (propagated-inputs
+     `(("glib-networking" ,glib-networking)))
+    (native-inputs
+     `(("cmake" ,cmake)
+       ("gettext" ,gettext-minimal)
+       ("glib" ,glib)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("libgee" ,libgee)
+       ("libxml2" ,libxml2)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
+    (home-page "https://github.com/elementary/sideload")
+    (synopsis "Graphical application to side-load Flatpaks")
+    (description "Sideload handles flatpakref files, like those you might find
+on Flathub or another third-party website providing a Flatpak app for
+download.")
+    (license license:gpl3)))
-- 
2.26.2

[bug#41293] [PATCH 1/3] gnu: Add sideload.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1723 bytes --]

Hello!

Sorry for the slooow response...

Ryan Prior via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/pantheon.scm (sideload): New variable.

[...]

> +       (modify-phases %standard-phases
> +         (add-before 'install 'set-environment-variables
> +           (lambda _
> +             ;; Disable compiling schemas and updating desktop databases
> +             (setenv "DESTDIR" "/")
> +             #t))

That's an unorthodox workaround :-) does the build system ignore it when
DESTDIR is set, or do they just end up in a different location?

Is the "glib:bin" input still needed?

> +    (inputs
> +     `(("flatpak" ,flatpak)
> +       ("granite" ,granite)
> +       ("gtk" ,gtk+)
> +       ("libostree" ,libostree)))
> +    (propagated-inputs
> +     `(("glib-networking" ,glib-networking)))

Can you add a comment about why this needs to be propagated?

> +    (native-inputs
> +     `(("cmake" ,cmake)

Use 'cmake-minimal' if CMake is required (is it?).

> +       ("gettext" ,gettext-minimal)
> +       ("glib" ,glib)
> +       ("glib:bin" ,glib "bin")
> +       ("gobject-introspection" ,gobject-introspection)
> +       ("libgee" ,libgee)
> +       ("libxml2" ,libxml2)
> +       ("pkg-config" ,pkg-config)
> +       ("vala" ,vala)))
> +    (home-page "https://github.com/elementary/sideload")
> +    (synopsis "Graphical application to side-load Flatpaks")
> +    (description "Sideload handles flatpakref files, like those you might find
> +on Flathub or another third-party website providing a Flatpak app for
> +download.")
> +    (license license:gpl3)))

This should be 'gpl3+' because no source files say "GPL 3 only" (in fact
they explicitly mention GPL 3 or any later version).

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#41293] [PATCH 1/3] gnu: Add sideload.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 2438 bytes --]

Hi Ryan,

(+ debbugs, please keep it in CC)

Ryan Prior <rprior@protonmail.com> writes:

> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
> On Monday, June 22, 2020 7:16 PM, Marius Bakke <marius@gnu.org> wrote:
>
>
>> That's an unorthodox workaround :-) does the build system ignore it when
>> DESTDIR is set, or do they just end up in a different location?
>
> This is a common pattern in build systems for Pantheon software, one you'll see come up again and again as I add more Pantheon packages. The post-install script runs extra steps unless the DESTDIR env variable is set. For example: https://github.com/elementary/sideload/blob/master/meson/post_install.py#L9

OK.  Weird, but works.  :-)

>> Is the "glib:bin" input still needed?
>
> Yes, for glib-compile-resources, which is invoked here as it is with many other GNOME packages in Guix.

Right.

>> > -   (propagated-inputs
>> > -       `(("glib-networking" ,glib-networking)))
>> >
>> >
>>
>> Can you add a comment about why this needs to be propagated?
>
> I didn't take good notes, it was basically "it didn't work without this." And now that I try it again, it seems what I really need to propagate is gpgme and not glib-networking. I will add a note. (I want to get good at patching packages to remove the need for propagation but I don't know where to begin with this one.)

At least for GnuPG, substituting all references to 'gpg' with
(string-append gnupg "/bin/gpg") should work.  I guess something similar
will work for GPGME.

>>
>> > -   (native-inputs
>> > -       `(("cmake" ,cmake)
>> >
>> >
>>
>> Use 'cmake-minimal' if CMake is required (is it?).
>
> Nope was never needed, removed. (I think I was adding cmake to a lot of Meson packages for a while because they complain about not having it in their build output, but it's really just a warning.)

Yes, learning to ignore useless warnings is an important packaging
skill.  :-)

>> > -   (license license:gpl3)))
>>
>> This should be 'gpl3+' because no source files say "GPL 3 only" (in fact
>> they explicitly mention GPL 3 or any later version).
>
> Fixed & updated patch follows.

Applied!  I moved 'glib', 'libgee', and 'libxml2' to inputs because they
were referenced by the io.elementary.sideload binary.  Let me know if
you think this was wrong.

Will you submit updated patches for the other two in this series too?

Thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#41293] [PATCH 2/3] gnu: Add appstream.

[Ryan Prior via Guix-patches via]

* gnu/packages/freedesktop.scm (appstream): New variable.
---
 gnu/packages/freedesktop.scm | 59 ++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 90154cbba9..db1b18e4ee 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2020 Rene Saavedra <pacoon@protonmail.com>
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -55,8 +56,10 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cryptsetup)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages disk)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
@@ -1870,3 +1873,59 @@ useful with system integration.")
 into the Unity menu bar.  Based on KSNI, it also works in KDE and will
 fallback to generic Systray support if none of those are available.")
     (license license:lgpl2.1+)))
+
+(define-public appstream
+  (package
+    (name "appstream")
+    (version "0.12.11")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/ximion/appstream.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0ma1nldpc01rr2x14q1ymv2fvf7qcs3wp8fdqsnd17qx0hrz483c"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:configure-flags
+       (list "-Dvapi=true"
+             "-Dstemming=false"
+             "-Dapidocs=false"
+             "-Dinstall-docs=false")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-stemmer-inc-dirs
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (substitute* "meson.build"
+                 (("include_directories\\(\\['\\/usr\\/include'\\]\\)")
+                  "''")
+                 (("subdir\\('docs\\/'\\)")
+                  ""))
+               (substitute* "data/meson.build"
+                 (("\\/etc")
+                   (string-append out "/etc")))
+               #t))))))
+    (inputs
+     `(("glib" ,glib)
+       ("gperf" ,gperf)
+       ("libsoup" ,libsoup)
+       ("libxml2" ,libxml2)
+       ("libxslt" ,libxslt)
+       ("libyaml" ,libyaml)
+       ("lmdb" ,lmdb)))
+    (native-inputs
+     `(("cmake" ,cmake)
+       ("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin") ; for glib-compile-resources
+       ("gobject-introspection" ,gobject-introspection)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)))
+    (home-page "https://www.freedesktop.org/wiki/Distributions/AppStream/")
+    (synopsis "Provides the foundation to build software-center applications")
+    (description "AppStream is a cross-distribution effort for enhancing the way
+we interact with the software repositories provided by GNU/Linux distributions
+by standardizing software component metadata.")
+    (license license:gpl2)))
-- 
2.26.2

[bug#41293] [PATCH 2/3] gnu: Add appstream.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1543 bytes --]

Ryan Prior via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/freedesktop.scm (appstream): New variable.

[...]

> +    (inputs
> +     `(("glib" ,glib)
> +       ("gperf" ,gperf)
> +       ("libsoup" ,libsoup)
> +       ("libxml2" ,libxml2)
> +       ("libxslt" ,libxslt)
> +       ("libyaml" ,libyaml)
> +       ("lmdb" ,lmdb)))
> +    (native-inputs
> +     `(("cmake" ,cmake)

'cmake-minimal' here too.

> +       ("gettext" ,gettext-minimal)
> +       ("glib:bin" ,glib "bin") ; for glib-compile-resources
> +       ("gobject-introspection" ,gobject-introspection)
> +       ("pkg-config" ,pkg-config)
> +       ("vala" ,vala)))
> +    (home-page "https://www.freedesktop.org/wiki/Distributions/AppStream/")
> +    (synopsis "Provides the foundation to build software-center applications")

I think the GitHub tagline is better: "Tools and libraries to work with
AppStream metadata".

> +    (description "AppStream is a cross-distribution effort for enhancing the way
> +we interact with the software repositories provided by GNU/Linux distributions
> +by standardizing software component metadata.")

Who is 'we' in this context?  Maybe we can use the README description:

"AppStream is a collaborative effort for making machine-readable
software metadata available to programs that need it."

Do you know if Guix is supported?  :-)

> +    (license license:gpl2)))

The library portions of this package seems to be 'lgpl2.1+', and the
tools are 'gpl2' (only).  Can you add a comment about it and list both
licenses?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#41293] [PATCH 3/3] gnu: Add pantheon-terminal.

[Ryan Prior via Guix-patches via]

* gnu/packages/pantheon.scm (pantheon-terminal): New variable.
---
 gnu/packages/pantheon.scm | 50 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 6709cd2d8a..250e8e3b2d 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -167,3 +167,53 @@ desktop.")
 on Flathub or another third-party website providing a Flatpak app for
 download.")
     (license license:gpl3)))
+
+(define-public pantheon-terminal
+  (package
+    (name "pantheon-terminal")
+    (version "5.5.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/elementary/terminal.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "119iwmzbpkj4nmxinqfsh73lx23g8gbl6ha6wc4mc4fq9hpnc9c2"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'install 'set-environment-variables
+           (lambda _
+             ;; Disable compiling schemas and updating desktop databases
+             (setenv "DESTDIR" "/")
+             #t))
+         (add-after 'install 'install-symlinks
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin/io.elementary.terminal"))
+                    (link (string-append out "/bin/pantheon-terminal")))
+               (symlink bin link)))))))
+    (inputs
+     `(("granite" ,granite)
+       ("gtk" ,gtk+)
+       ("vte" ,vte)))
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("glib" ,glib)
+       ("appstream" ,appstream)
+       ("libgee" ,libgee)
+       ("desktop-file-utils" ,desktop-file-utils) ; required for tests
+       ("glib:bin" ,glib "bin") ; for glib-compile-resources
+       ("pkg-config" ,pkg-config)
+       ("gobject-introspection" ,gobject-introspection)
+       ("vala" ,vala)))
+    (home-page "https://github.com/elementary/terminal")
+    (synopsis "Graphical terminal with opinionated design and thoughtful touches")
+    (description "A lightweight, beautiful, and simple terminal application.
+Comes with sane defaults, browser-like tabs, sudo paste protection, smart
+copy/paste, and little to no configuration.")
+    (license license:lgpl3)))
-- 
2.26.2

[bug#41293] [PATCH 3/3] gnu: Add pantheon-terminal.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]

Ryan Prior via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/pantheon.scm (pantheon-terminal): New variable.

[...]

> +    (arguments
> +     `(#:glib-or-gtk? #t
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'install 'set-environment-variables
> +           (lambda _
> +             ;; Disable compiling schemas and updating desktop databases
> +             (setenv "DESTDIR" "/")
> +             #t))

Same comment as patch 1/3.

> +    (synopsis "Graphical terminal with opinionated design and thoughtful touches")

This synopsis borders on "marketing language" (see the section about
Synopses and Descriptions in the manual), but maybe it's OK.

> +    (description "A lightweight, beautiful, and simple terminal application.

Can you turn this into a full sentence?  I.e. "pantheon-terminal is a ...".

> +Comes with sane defaults, browser-like tabs, sudo paste protection, smart
> +copy/paste, and little to no configuration.")

Also here, "It comes with a ...".

> +    (license license:lgpl3)))

Indeed LGPL3 only!  Odd choice.  :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#41293] Pantheon packages

[Ryan Prior via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 45 bytes --]

Hey folks, just bumping this patch set!

Ryan

[-- Attachment #2: Type: text/html, Size: 360 bytes --]

[bug#41293] Pantheon packages

[Ludovic Courtès]

Hello Ryan,

Did you have a chance to look at the comments Marius made back in June?

  https://issues.guix.gnu.org/41293

It would be nice to unlock this patch series!  :-)

Ludo’.

[bug#41293] [PATCH 1/2] gnu: Add granite-6.

[altadil via Guix-patches via]

* gnu/packages/pantheon.scm (granite-6): new variable.

This version will be needed to add some pantheon packages.
More precisely, those still using GTK+ 3.
---
guix build --rounds=2 was successfully run on a Zen4 CPU,
for the following --system= options:
- x86_64-linux
- i686-linux
- aarch64-linux.
 gnu/packages/pantheon.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 12892db137..f5b19eb452 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -72,6 +72,22 @@ (define-public granite
 in apps built for the Pantheon desktop.")
     (license license:lgpl3+)))
 
+;; This is required for pantheon apps that have not been ported to GTK4 yet.
+(define-public granite-6
+  (package
+    (inherit granite)
+    (version "6.2.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/elementary/granite")
+                    (commit version)))
+              (file-name (git-file-name "granite" version))
+              (sha256
+               (base32
+                "0ilslmg63hh2x7h5rvs3mhzw1y9ixhhkqnn1j1lzwm12v2iidkaq"))))
+    (propagated-inputs (list glib libgee gtk+))))
+
 (define-public pantheon-calculator
   (package
     (name "pantheon-calculator")

base-commit: 2eb6df537c36da8bf8e81ff698421f6fb1bfd1ab
-- 
2.41.0

[bug#41293] [PATCH 2/2] gnu: Add pantheon-terminal.

[altadil via Guix-patches via]

* gnu/packages/pantheon.scm (pantheon-terminal): New variable.
---
This is an update of the package initially sent by rprior.
guix build --rounds=2 was successfully run on a Zen4 CPU,
for the following --system= options:
- x86_64-linux
- i686-linux
- aarch64-linux.
I’ve been using the app for a couple of days.
I’ve detected one bug: right-clicking a tab (in GNOME) segfaults.
But I think debugging this would be way above my level. :(
Apart from this one, everything seems fine.
 gnu/packages/pantheon.scm | 53 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index f5b19eb452..f01c9778ee 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -26,11 +26,13 @@ (define-module (gnu packages pantheon)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages package-management)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages web)
+  #:use-module (gnu packages xorg)
   #:use-module (gnu packages)
   #:use-module (guix build-system meson)
   #:use-module (guix git-download)
@@ -129,6 +131,57 @@ (define-public pantheon-calculator
 desktop.")
     (license license:gpl3)))
 
+(define-public pantheon-terminal
+  (package
+    (name "pantheon-terminal")
+    (version "6.1.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/elementary/terminal")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0x3gzghnfx4a1q2zhra4dysc0pm1zvlfdxj96qhfb627pz16iv4k"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:tests? #f
+       #:glib-or-gtk? #t
+       #:phases (modify-phases %standard-phases
+                  (add-before 'install 'set-environment-variables
+                    (lambda _
+                      ;; Disable compiling schemas and updating desktop databases
+                      (setenv "DESTDIR" "/") #t))
+                  (add-after 'install 'install-symlinks
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (bin (string-append out
+                                   "/bin/io.elementary.terminal"))
+                             (link (string-append out "/bin/pantheon-terminal")))
+                        (symlink bin link)))))))
+    (native-inputs (list appstream
+                         desktop-file-utils ;required for tests
+                         gettext-minimal ;for msgfmt
+                         `(,glib "bin") ;for glib-compile-resources
+                         gobject-introspection
+                         pkg-config
+                         vala))
+    (inputs (list granite-6
+                  gtk+
+                  libgee
+                  libhandy
+                  pcre2
+                  vte
+                  xvfb-run))
+    (synopsis "Terminal emulator from elementaryOS")
+    (description "pantheon-terminal is a lightweight, beautiful and simple
+terminal.  It comes with sane defaults, browser-class tabs, sudo paste
+protection, smart copy/paste, and little to no configuration.  It is the default
+terminal in the Pantheon desktop.")
+    (home-page "https://elementary.io/open-source")
+    (license license:lgpl3)))
+
 (define-public sideload
   (package
     (name "sideload")
-- 
2.41.0

bug#41293: [PATCH 2/2] gnu: Add pantheon-terminal.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 428 bytes --]

I've added a copyright line for you at the top of the file. I also moved
xvfb-run to native-inputs since the package doesn't retain a reference
to it. I also added a note by the tests.

Thanks! Patches pushed.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#41293] [PATCH 1/5] gnu: Add pantheon-stylesheet.

[altadil via Guix-patches via]

* gnu/packages/pantheon.scm (pantheon-stylesheet): New variable.
---
This package is not very useful by itself, but hopefully will be, once
we manage to get more of Pantheon into Guix. :)
guix build --rounds=2 was successfully run on a Zen4 CPU,
for the following --system= options:
- x86_64-linux
- i686-linux
- aarch64-linux
- armhf-linux
- riscv64-linux.
I am still a packaging noob, so apologies in advance for my mistakes
in this patch series, and thanks for the help!
 gnu/packages/pantheon.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 5b83b96801..55cb65045e 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -132,6 +132,28 @@ (define-public pantheon-calculator
 desktop.")
     (license license:gpl3)))
 
+(define-public pantheon-stylesheet
+  (package
+    (name "pantheon-stylesheet")
+    (version "7.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/elementary/stylesheet")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0l1xv05zl0jfs9kfv3rnz821a442rpywcvxbcnsm6gp4q0kha7b5"))))
+    (build-system meson-build-system)
+    (native-inputs (list gettext-minimal)) ;for msgfmt
+    (inputs (list sassc))
+    (synopsis "GTK stylesheet for the Pantheon desktop")
+    (description "pantheon-stylesheet is the GTK Stylesheet for the Pantheon
+desktop environment (originally from elementary OS).")
+    (home-page "https://elementary.io/open-source")
+    (license license:gpl3+)))
+
 (define-public pantheon-terminal
   (package
     (name "pantheon-terminal")

base-commit: 337dbf6867597b6e3b72b0bdb2152a42a9f41dbc
-- 
2.41.0

[bug#41293] [PATCH 2/5] gnu: Add pantheon-photos.

[altadil via Guix-patches via]

* gnu/packages/pantheon.scm (pantheon-photos): New variable.
---
guix build --rounds=2 was successfully run on a Zen4 CPU,
for the following --system= options:
- x86_64-linux
- i686-linux
- aarch64-linux.
 gnu/packages/pantheon.scm | 59 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 55cb65045e..3465e5cb37 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -25,14 +25,18 @@ (define-module (gnu packages pantheon)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
   #:use-module (gnu packages package-management)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages sqlite)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages web)
+  #:use-module (gnu packages webkit)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages)
   #:use-module (guix build-system meson)
@@ -132,6 +136,61 @@ (define-public pantheon-calculator
 desktop.")
     (license license:gpl3)))
 
+(define-public pantheon-photos
+  (package
+    (name "pantheon-photos")
+    (version "2.8.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/elementary/photos")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1aw77sdh2z7fah3vbi68145wc0xqg2afch1kswvgkmij0f0n04jn"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'disable-schema-cache-generation
+                    (lambda _
+                      (setenv "DESTDIR" "/")))
+                  (add-after 'install 'install-symlinks
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (bin (string-append out
+                                                 "/bin/io.elementary.photos"))
+                             (link (string-append out "/bin/pantheon-photos")))
+                        (symlink bin link)))))))
+    (native-inputs (list desktop-file-utils
+                         `(,glib "bin") intltool pkg-config vala))
+    (inputs (list geocode-glib-with-libsoup2
+                  gexiv2
+                  granite-6
+                  gstreamer
+                  gst-plugins-base
+                  gtk+
+                  json-glib
+                  libexif
+                  libgee
+                  libgphoto2
+                  libgudev
+                  libhandy
+                  libraw
+                  libsoup-minimal-2
+                  libwebp
+                  rest
+                  sqlite
+                  webkitgtk-with-libsoup2))
+    (synopsis "Photo viewer and organizer designed for the Pantheon desktop")
+    (description
+     "Photos is an image viewer and organizer.  It originally comes
+from elementary OS and is designed for the Pantheon desktop environment (but can
+also be used on others.")
+    (home-page "https://elementary.io/open-source")
+    (license license:lgpl2.1+)))
+
 (define-public pantheon-stylesheet
   (package
     (name "pantheon-stylesheet")
-- 
2.41.0

[bug#41293] [PATCH 3/5] gnu: Add pantheon-videos.

[altadil via Guix-patches via]

* gnu/packages/pantheon.scm (pantheon-videos): New variable.
---
guix build --rounds=2 was successfully run on a Zen4 CPU,
for the following --system= options:
- x86_64-linux
- i686-linux
- aarch64-linux.
This one is a work in progress, as there are at least two issues.
First, it is missing some video codecs and I do not know how to fix it.
Second, the trick used in other pantheon packages to prevent the
schemas generation after install won’t work here, as the step is not
made dependent on any condition (if I understand the meson.build file
correctly). Do we have to patch the source for that, or is there a
better way ?
 gnu/packages/pantheon.scm | 49 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 3465e5cb37..ca124f8939 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -35,6 +35,7 @@ (define-module (gnu packages pantheon)
   #:use-module (gnu packages python)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages video)
   #:use-module (gnu packages web)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xorg)
@@ -264,6 +265,54 @@ (define-public pantheon-terminal
     (home-page "https://elementary.io/open-source")
     (license license:lgpl3)))
 
+(define-public pantheon-videos
+  (package
+    (name "pantheon-videos")
+    (version "3.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/elementary/videos")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0873g3mcrpgwmjamy8dhdya7fxki4qpwp8wa6lv5cdipq7pkiprv"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:phases (modify-phases %standard-phases
+                  (add-after 'install 'install-symlinks
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (bin (string-append out
+                                                 "/bin/io.elementary.videos"))
+                             (link (string-append out "/bin/pantheon-videos")))
+                        (symlink bin link)))))))
+    (native-inputs (list gettext-minimal ;for msgfmt.
+                         `(,glib "bin") ;glib-compile-schemas.
+                         pkg-config
+                         vala))
+    (inputs (list flatpak
+                  ffmpeg
+                  granite-6
+                  gst-libav
+                  gst-plugins-bad
+                  gst-plugins-base
+                  gst-plugins-good
+                  gst-plugins-ugly
+                  gstreamer
+                  gtk+
+                  libgee
+                  libhandy))
+    (synopsis "Video player and library app designed for the Pantheon desktop")
+    (description
+     "Videos is a video player and video library application.  It
+originally comes from elementary OS and is designed for the Pantheon desktop
+environment (but can be used with others as well).")
+    (home-page "https://elementary.io/open-source")
+    (license license:gpl3+)))
+
 (define-public sideload
   (package
     (name "sideload")
-- 
2.41.0

[bug#41293] [PATCH 4/5] gnu: Add pantheon-iconbrowser.

[altadil via Guix-patches via]

* gnu/packages/pantheon.scm (pantheon-iconbrowser): New variable.
---
guix build --rounds=2 was successfully run on a Zen4 CPU,
for the following --system= options:
- x86_64-linux
- i686-linux
- aarch64-linux.
 gnu/packages/pantheon.scm | 40 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index ca124f8939..1864dff5eb 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -137,6 +137,46 @@ (define-public pantheon-calculator
 desktop.")
     (license license:gpl3)))
 
+(define-public pantheon-iconbrowser
+  (package
+    (name "pantheon-iconbrowser")
+    (version "2.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/elementary/iconbrowser")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0b1afyizq3c94qkf4cqy5jnb4v3nib5vc88k34r08c604p1z2h8p"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:phases (modify-phases %standard-phases
+                  (add-after 'install 'install-symlinks
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (bin (string-append out
+                                   "/bin/io.elementary.iconbrowser"))
+                             (link (string-append out
+                                                  "/bin/pantheon-iconbrowser")))
+                        (symlink bin link)))))))
+    (native-inputs (list gettext-minimal ;for msgfmt
+                         `(,glib "bin")
+                         `(,gtk "bin")
+                         pkg-config
+                         vala))
+    (inputs (list granite gtk gtksourceview))
+    (synopsis "Browse and search system icons")
+    (description
+     "Icon Browser is an application for browsing system icons by
+category or searching them by name.  It displays icons at different sizes, as
+well as code snippets (to use the icons in your own apps).  It is designed for
+the Pantheon desktop environment (originally from elementary OS).")
+    (home-page "https://elementary.io/open-source")
+    (license license:gpl3+)))
+
 (define-public pantheon-photos
   (package
     (name "pantheon-photos")
-- 
2.41.0

[bug#41293] [PATCH 5/5] gnu: Add pantheon-sound-theme.

[altadil via Guix-patches via]

* gnu/packages/pantheon.scm (pantheon-sound-theme): New variable.
---
guix build --rounds=2 was successfully run on a Zen4 CPU,
for the following --system= options:
- x86_64-linux
- i686-linux
- aarch64-linux
- armhf-linux
- riscv64-linux.
 gnu/packages/pantheon.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 1864dff5eb..8e17101bd9 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -232,6 +232,30 @@ (define-public pantheon-photos
     (home-page "https://elementary.io/open-source")
     (license license:lgpl2.1+)))
 
+(define-public pantheon-sound-theme
+  (package
+    (name "pantheon-sound-theme")
+    (version "1.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/elementary/sound-theme")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0kyqh4y6fk0mhlxc5ary17f1fhg2n6f6gl2v8wval9vxmjsa07kx"))))
+    (build-system meson-build-system)
+    (synopsis "Set of system sounds for the Pantheon desktop")
+    (description
+     "pantheon-sound-theme is a set of system sounds for the
+Pantheon desktop (originally from elementary OS).  It is designed to be light,
+natural/physical, and pleasant.")
+    (home-page "https://elementary.io/open-source")
+    ;; dialog-warning.ogg is licensed under Creative Commons Attribution and
+    ;;  was sourced from notificationsounds.com.
+    (license (list license:unlicense license:cc-by4.0))))
+
 (define-public pantheon-stylesheet
   (package
     (name "pantheon-stylesheet")
-- 
2.41.0